@dxos/echo-pipeline 0.8.3 → 0.8.4-main.1c7ec43d41

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

@@ -1 +1 @@
-{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/pipeline/pipeline.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"pipeline.d.ts","sourceRoot":"","sources":["../../../../src/pipeline/pipeline.ts"],"names":[],"mappings":"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"}

package/dist/types/src/pipeline/timeframe-clock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"timeframe-clock.d.ts","sourceRoot":"","sources":["../../../../src/pipeline/timeframe-clock.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,yBAAyB,GAAI,WAAW,SAAS,KAAG,SAAS,EACN,CAAC;AAErE,eAAO,MAAM,yBAAyB,GAAI,SAAS,SAAS,EAAE,KAAG,SACK,CAAC;AAEvE,eAAO,MAAM,UAAU,GAAI,WAAW,SAAS,KAAG,SAAS,EACoB,CAAC;AAEhF;;GAEG;AACH,qBAAa,cAAc;IAKb,OAAO,CAAC,UAAU;IAJ9B,QAAQ,CAAC,MAAM,mBAA0B;IAEzC,OAAO,CAAC,iBAAiB,CAAY;gBAEjB,UAAU,YAAkB;IAIhD;;OAEG;IACH,IAAI,SAAS,cAEZ;IAED;;;OAGG;IACH,IAAI,gBAAgB,cAEnB;IAED,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI;IAMxC,sBAAsB,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI;IAIzD,eAAe,IAAI,IAAI;IAKvB,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO;IAMhC,gBAAgB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;CAYzD"}
+{"version":3,"file":"timeframe-clock.d.ts","sourceRoot":"","sources":["../../../../src/pipeline/timeframe-clock.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,KAAK,SAAS,EAAE,MAAM,YAAY,CAAC;AAE5C,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,eAAO,MAAM,yBAAyB,cAAe,SAAS,KAAG,SAAS,EACN,CAAC;AAErE,eAAO,MAAM,yBAAyB,YAAa,SAAS,EAAE,KAAG,SACK,CAAC;AAEvE,eAAO,MAAM,UAAU,cAAe,SAAS,KAAG,SAAS,EACoB,CAAC;AAEhF;;GAEG;AACH,qBAAa,cAAc;IAKb,OAAO,CAAC,UAAU;IAJ9B,QAAQ,CAAC,MAAM,mBAA0B;IAEzC,OAAO,CAAC,iBAAiB,CAAY;IAErC,YAAoB,UAAU,YAAkB,EAE/C;IAED;;OAEG;IACH,IAAI,SAAS,cAEZ;IAED;;;OAGG;IACH,IAAI,gBAAgB,cAEnB;IAED,YAAY,CAAC,SAAS,EAAE,SAAS,GAAG,IAAI,CAIvC;IAED,sBAAsB,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,IAAI,CAExD;IAED,eAAe,IAAI,IAAI,CAGtB;IAED,OAAO,CAAC,SAAS,EAAE,SAAS,GAAG,OAAO,CAGrC;IAGK,gBAAgB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,CAWvD;CACF"}

package/dist/types/src/query/errors.d.ts

@@ -1,23 +1,35 @@
 import { BaseError } from '@dxos/errors';
 declare const QueryError_base: {
-    new (message: string, options?: import("@dxos/errors").BaseErrorOptions): {
-        "__#1@#code": string;
-        "__#1@#context": Record<string, unknown>;
-        readonly name: string;
-        readonly code: string;
-        readonly context: Record<string, unknown>;
-        message: string;
-        stack?: string;
+    new (options?: import("@dxos/errors").BaseErrorOptions): {
         cause?: unknown;
+        stack?: string;
+        name: "QueryError";
+        context: Record<string, unknown>;
+        readonly message: string;
+        readonly _tag: "QueryError";
     };
-    code: string;
+    isError(error: unknown): error is Error;
+    name: "QueryError";
     is(error: unknown): error is BaseError;
-    extend(code: string): any;
+    wrap(options?: Omit<import("@dxos/errors").BaseErrorOptions, 'cause'> & {
+        ifTypeDiffers?: boolean;
+    }): (error: unknown) => {
+        cause?: unknown;
+        stack?: string;
+        name: "QueryError";
+        context: Record<string, unknown>;
+        readonly message: string;
+        readonly _tag: "QueryError";
+    };
+    extend<Name extends string = string>(name: Name, message?: string): any;
     captureStackTrace(targetObject: object, constructorOpt?: Function): void;
     prepareStackTrace?: ((err: Error, stackTraces: NodeJS.CallSite[]) => any) | undefined;
     stackTraceLimit: number;
 };
 export declare class QueryError extends QueryError_base {
 }
+declare const InvalidQueryError_base: any;
+export declare class InvalidQueryError extends InvalidQueryError_base {
+}
 export {};
 //# sourceMappingURL=errors.d.ts.map

package/dist/types/src/query/errors.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/query/errors.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;;;;;;;;;aAG8c,CAAC;aAA2B,CAAC;;;;;;;;;AADphB,qBAAa,UAAW,SAAQ,eAA+B;CAAG"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../../../src/query/errors.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEzC,qBAAa,UAAW,SAAQ,eAA8B;CAAG;;AAEjE,qBAAa,iBAAkB,SAAQ,sBAAsC;CAAG"}

package/dist/types/src/query/plan.d.ts

@@ -1,6 +1,6 @@
 import type { QueryAST } from '@dxos/echo-protocol';
-import type { EscapedPropPath } from '@dxos/indexing';
-import type { DXN, ObjectId, SpaceId } from '@dxos/keys';
+import type { EscapedPropPath } from '@dxos/index-core';
+import type { DXN, ObjectId } from '@dxos/keys';
 export declare namespace QueryPlan {
     type TextSearchKind = 'full-text' | 'vector' | 'hybrid';
     /**
@@ -17,7 +17,7 @@ export declare namespace QueryPlan {
     const Plan: Readonly<{
         make: (steps: Step[]) => Plan;
     }>;
-    type Step = ClearWorkingSetStep | SelectStep | FilterStep | FilterDeletedStep | TraverseStep | UnionStep | SetDifferenceStep;
+    type Step = ClearWorkingSetStep | SelectStep | FilterStep | FilterDeletedStep | TraverseStep | UnionStep | SetDifferenceStep | OrderStep | LimitStep;
     /**
      * Clear the current working set.
      */
@@ -26,18 +26,30 @@ export declare namespace QueryPlan {
     };
     /**
      * Select objects based on id, typename, or other predicates.
-     * Specifies the spaces to select from.
+     * Specifies the spaces and/or queues to select from.
+     * The results from spaces and queues are unioned together.
      */
     type SelectStep = {
         _tag: 'SelectStep';
-        spaces: readonly SpaceId[];
+        /**
+         * What to select from the scope.
+         */
         selector: Selector;
+        /**
+         * Where to select from.
+         */
+        scope: QueryAST.Scope;
+        /**
+         * Optional limit on the number of results to select.
+         * When set, the index scan can be optimized to stop early.
+         */
+        limit?: number;
     };
     /**
      * Specifier to scan the database for objects.
      * Optimized to utilize database indexes.
      */
-    type Selector = WildcardSelector | IdSelector | TypeSelector | TextSelector;
+    type Selector = WildcardSelector | IdSelector | TypeSelector | TextSelector | TimestampSelector;
     type WildcardSelector = {
         _tag: 'WildcardSelector';
     };
@@ -64,6 +76,21 @@ export declare namespace QueryPlan {
         _tag: 'TextSelector';
         text: string;
         searchKind: TextSearchKind;
+        /**
+         * Optionally select only objects of the given typenames.
+         */
+        typename: DXN.String[] | null;
+    };
+    /**
+     * Select objects by timestamp range (createdAt / updatedAt).
+     * Uses the ObjectMetaIndex timestamp columns.
+     */
+    type TimestampSelector = {
+        _tag: 'TimestampSelector';
+        updatedAfter?: number;
+        updatedBefore?: number;
+        createdAfter?: number;
+        createdBefore?: number;
     };
     /**
      * Filter objects in the current working set based on a predicate.
@@ -92,7 +119,7 @@ export declare namespace QueryPlan {
     /**
      * Describes a traversal of the object graph.
      */
-    type Traversal = ReferenceTraversal | RelationTraversal;
+    type Traversal = ReferenceTraversal | RelationTraversal | HierarchyTraversal;
     /**
      * Traverse a reference connection.
      */
@@ -100,8 +127,9 @@ export declare namespace QueryPlan {
         _tag: 'ReferenceTraversal';
         /**
          * Property path where the reference is located.
+         * If null, matches references from any property (only valid for incoming direction).
          */
-        property: EscapedPropPath;
+        property: EscapedPropPath | null;
         /**
          * outgoing: the reference points from the anchor object to the target.
          * incoming: the reference points to the anchor object from the target.
@@ -119,6 +147,17 @@ export declare namespace QueryPlan {
          */
         direction: 'source-to-relation' | 'relation-to-source' | 'target-to-relation' | 'relation-to-target';
     };
+    /**
+     * Traverse parent-child hierarchy.
+     */
+    type HierarchyTraversal = {
+        _tag: 'HierarchyTraversal';
+        /**
+         * to-parent: traverse from child to parent.
+         * to-children: traverse from parent to children.
+         */
+        direction: 'to-parent' | 'to-children';
+    };
     /**
      * Combine results from multiple plans.
      * Each of the plans starts with a copy of the current working set.
@@ -136,5 +175,24 @@ export declare namespace QueryPlan {
         source: Plan;
         exclude: Plan;
     };
+    /**
+     * Order the results of the plan.
+     */
+    type OrderStep = {
+        _tag: 'OrderStep';
+        order: readonly QueryAST.Order[];
+        /**
+         * Optional limit on the number of results to return after ordering.
+         * When set, the sorting can be optimized to only track the top N elements.
+         */
+        limit?: number;
+    };
+    /**
+     * Limit the number of results.
+     */
+    type LimitStep = {
+        _tag: 'LimitStep';
+        limit: number;
+    };
 }
 //# sourceMappingURL=plan.d.ts.map

package/dist/types/src/query/plan.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../../src/query/plan.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"plan.d.ts","sourceRoot":"","sources":["../../../../src/query/plan.ts"],"names":[],"mappings":"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"}

package/dist/types/src/query/query-executor.d.ts

@@ -1,12 +1,15 @@
-import { Context, Resource } from '@dxos/context';
+import type * as SqlClient from '@effect/sql/SqlClient';
+import { Resource } from '@dxos/context';
 import { type QueryAST } from '@dxos/echo-protocol';
-import { type Indexer } from '@dxos/indexing';
+import { type RuntimeProvider } from '@dxos/effect';
+import { type IndexEngine } from '@dxos/index-core';
 import { type QueryReactivity, type QueryResult } from '@dxos/protocols/proto/dxos/echo/query';
-import type { QueryPlan } from './plan';
 import type { AutomergeHost } from '../automerge';
-import type { SpaceStateManager } from '../db-host';
+import type { InvalidationHint, SpaceStateManager } from '../db-host';
+import type { QueryPlan } from './plan';
 type QueryExecutorOptions = {
-    indexer: Indexer;
+    indexEngine: IndexEngine;
+    runtime: RuntimeProvider.RuntimeProvider<SqlClient.SqlClient>;
     automergeHost: AutomergeHost;
     spaceStateManager: SpaceStateManager;
     queryId: string;
@@ -28,6 +31,8 @@ export type ExecutionTrace = {
     objectCount: number;
     documentsLoaded: number;
     indexHits: number;
+    beginTs: number;
+    endTs: number;
     executionTime: number;
     indexQueryTime: number;
     documentLoadTime: number;
@@ -35,10 +40,20 @@ export type ExecutionTrace = {
 };
 export declare const ExecutionTrace: Readonly<{
     makeEmpty: () => ExecutionTrace;
+    markEnd: (trace: ExecutionTrace) => void;
+    putOnPerformanceTimeline: (trace: ExecutionTrace) => void;
     format: (trace: ExecutionTrace) => string;
 }>;
+declare global {
+    interface ImportMeta {
+        env: ImportMetaEnv;
+    }
+    interface ImportMetaEnv {
+        DX_TRACE_QUERY_EXECUTION: string;
+    }
+}
 /**
- * Executes query plans against the Indexer and AutomergeHost.
+ * Executes query plans against the IndexEngine and AutomergeHost.
  *
  * The QueryExecutor is responsible for:
  * - Executing query plans step by step
@@ -48,7 +63,9 @@ export declare const ExecutionTrace: Readonly<{
  * - Handling different types of query operations (select, filter, traverse, etc.)
  */
 export declare class QueryExecutor extends Resource {
-    private readonly _indexer;
+    #private;
+    private readonly _indexEngine;
+    private readonly _runtime;
     private readonly _automergeHost;
     private readonly _spaceStateManager;
     /**
@@ -61,24 +78,62 @@ export declare class QueryExecutor extends Resource {
     private _trace;
     private _lastResultSet;
     constructor(options: QueryExecutorOptions);
+    get queryId(): string;
     get query(): QueryAST.Query;
     get plan(): QueryPlan.Plan;
     get trace(): ExecutionTrace;
-    protected _open(ctx: Context): Promise<void>;
-    protected _close(ctx: Context): Promise<void>;
     getResults(): QueryResult[];
+    /**
+     * Returns true if the given invalidation hint could affect this query's result set.
+     * When false, the query can safely be skipped for this invalidation cycle.
+     *
+     * Conservative: returns true for complex queries (traversals, text-search, unions) and
+     * for any dimension where either the hint or the query is unconstrained.
+     */
+    matchesHint(hint: InvalidationHint): boolean;
     execQuery(): Promise<QueryExecutionResult>;
     private _execPlan;
     private _execStep;
     private _execSelectStep;
     private _execFilterStep;
+    private _execTimestampFilterStep;
     private _execFilterDeletedStep;
+    private _execChildOfFilterStep;
+    private _isChildOfAny;
     private _execTraverseStep;
     private _execUnionStep;
     private _execSetDifferenceStep;
-    private _loadDocumentsAfterIndexQuery;
-    private _loadFromIndexHit;
+    private _execOrderStep;
+    private _execLimitStep;
+    private _compareMultiOrder;
+    private _compareByOrder;
+    private _compareByProperty;
+    private _runInRuntime;
+    private _queryAllFromSqlIndex;
+    private _queryTypesFromSqlIndex;
+    private _queryIncomingReferencesFromSqlIndex;
+    /**
+     * Matches a reverse-reference row path against a query property path.
+     * Allows numeric segments in the row path (array indices) that are not present in the query.
+     *
+     * Examples:
+     * - query: ['assignee'] matches row: ['assignee'] and ['assignee', '0'].
+     * - query: ['items', 'assignee'] matches row: ['items', '0', 'assignee'].
+     * - query: ['a', 'b'] does NOT match row: ['a'].
+     * - query: ['a'] does NOT match row: ['a', 'b'].
+     */
+    private static _matchesReferencePropertyPath;
+    private _queryRelationsFromSqlIndex;
+    private _loadDocumentsAfterSqlQuery;
+    private _loadQueueSnapshotMap;
+    /**
+     * Loads a queue-backed object from an indexed snapshot (by `recordId`).
+     * Returns `null` when the snapshot is missing or is not a JSON object.
+     */
+    private _loadFromQueue;
+    private _loadFromAutomerge;
     private _loadFromDXN;
+    private _getTransitiveDeletionState;
 }
 export {};
 //# sourceMappingURL=query-executor.d.ts.map

package/dist/types/src/query/query-executor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-executor.d.ts","sourceRoot":"","sources":["../../../../src/query/query-executor.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAwC,QAAQ,EAAE,MAAM,eAAe,CAAC;AACxF,OAAO,EAA0D,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC5G,OAAO,EAAoC,KAAK,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAKhF,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,WAAW,EAAE,MAAM,uCAAuC,CAAC;AAG/F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAGpD,KAAK,oBAAoB,GAAG;IAC1B,OAAO,EAAE,OAAO,CAAC;IACjB,aAAa,EAAE,aAAa,CAAC;IAC7B,iBAAiB,EAAE,iBAAiB,CAAC;IAErC,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC;IACtB,UAAU,EAAE,eAAe,CAAC;CAC7B,CAAC;AAEF,KAAK,oBAAoB,GAAG;IAC1B;;OAEG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAYF;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAEhB,WAAW,EAAE,MAAM,CAAC;IACpB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAElB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,EAAE,MAAM,CAAC;IAEzB,QAAQ,EAAE,cAAc,EAAE,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,cAAc;qBACV,cAAc;oBAWb,cAAc,KAAG,MAAM;EAWvC,CAAC;AASH;;;;;;;;;GASG;AACH,qBAAa,aAAc,SAAQ,QAAQ;IACzC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAgB;IAC/C,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IACvD;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IAExC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAkB;IAE9C,OAAO,CAAC,KAAK,CAAiB;IAC9B,OAAO,CAAC,MAAM,CAA8C;IAC5D,OAAO,CAAC,cAAc,CAAmB;gBAE7B,OAAO,EAAE,oBAAoB;IAezC,IAAI,KAAK,IAAI,QAAQ,CAAC,KAAK,CAE1B;IAED,IAAI,IAAI,IAAI,SAAS,CAAC,IAAI,CAEzB;IAED,IAAI,KAAK,IAAI,cAAc,CAE1B;cAEwB,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;cAElC,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAE5D,UAAU,IAAI,WAAW,EAAE;IAarB,SAAS,IAAI,OAAO,CAAC,oBAAoB,CAAC;YA6BlC,SAAS;YAiBT,SAAS;YAsCT,eAAe;YA0Gf,eAAe;YAmBf,sBAAsB;YAsBtB,iBAAiB;YA+IjB,cAAc;YAyBd,sBAAsB;YAsBtB,6BAA6B;YAQ7B,iBAAiB;YA2BjB,YAAY;CAqD3B"}
+{"version":3,"file":"query-executor.d.ts","sourceRoot":"","sources":["../../../../src/query/query-executor.ts"],"names":[],"mappings":"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"}

package/dist/types/src/query/query-planner.d.ts

@@ -1,4 +1,4 @@
-import { type QueryAST } from '@dxos/echo-protocol';
+import { QueryAST } from '@dxos/echo-protocol';
 import { QueryPlan } from './plan';
 export type QueryPlannerOptions = {
     defaultTextSearchKind: QueryPlan.TextSearchKind;
@@ -12,6 +12,7 @@ export declare class QueryPlanner {
     createPlan(query: QueryAST.Query): QueryPlan.Plan;
     private _generate;
     private _generateOptionsClause;
+    private _generateFromClause;
     private _generateSelectClause;
     private _generateSelectionFromFilter;
     private _generateDeletedHandlingSteps;
@@ -22,6 +23,8 @@ export declare class QueryPlanner {
     private _generateRelationTraversalClause;
     private _generateRelationClause;
     private _generateFilterClause;
+    private _generateHierarchyTraversalClause;
+    private _validateQueryScoped;
     /**
      * Removes filter steps that have no predicates.
      */
@@ -30,5 +33,13 @@ export declare class QueryPlanner {
      * Removes union steps that have only one child.
      */
     private _optimizeSoloUnions;
+    private _generateOrderClause;
+    private _generateLimitClause;
+    private _ensureOrderStep;
+    /**
+     * Propagates limits from LimitStep to SelectStep and OrderStep when possible.
+     * Limits can only be propagated if there are no unions or traversals between the LimitStep and SelectStep/OrderStep.
+     */
+    private _optimizeLimits;
 }
 //# sourceMappingURL=query-planner.d.ts.map

package/dist/types/src/query/query-planner.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-planner.d.ts","sourceRoot":"","sources":["../../../../src/query/query-planner.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAKpD,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAEnC,MAAM,MAAM,mBAAmB,GAAG;IAChC,qBAAqB,EAAE,SAAS,CAAC,cAAc,CAAC;CACjD,CAAC;AAMF;;GAEG;AAEH,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;gBAEnC,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC;IAOlD,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI;IAOjD,OAAO,CAAC,SAAS;IA2BjB,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,4BAA4B;IAkIpC,OAAO,CAAC,6BAA6B;IAqBrC,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,4BAA4B;IAapC,OAAO,CAAC,iCAAiC;IAkBzC,OAAO,CAAC,iCAAiC;IA0BzC,OAAO,CAAC,gCAAgC;IAoCxC,OAAO,CAAC,uBAAuB;IA6C/B,OAAO,CAAC,qBAAqB;IAU7B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAuB7B;;OAEG;IACH,OAAO,CAAC,mBAAmB;CAI5B"}
+{"version":3,"file":"query-planner.d.ts","sourceRoot":"","sources":["../../../../src/query/query-planner.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAK/C,OAAO,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAmBnC,MAAM,MAAM,mBAAmB,GAAG;IAChC,qBAAqB,EAAE,SAAS,CAAC,cAAc,CAAC;CACjD,CAAC;AAMF;;GAEG;AAEH,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAsB;IAE/C,YAAY,OAAO,CAAC,EAAE,OAAO,CAAC,mBAAmB,CAAC,EAKjD;IAED,UAAU,CAAC,KAAK,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC,IAAI,CAQhD;IAED,OAAO,CAAC,SAAS;IAoCjB,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,mBAAmB;IAa3B,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,4BAA4B;IAwRpC,OAAO,CAAC,6BAA6B;IAqBrC,OAAO,CAAC,oBAAoB;IAS5B,OAAO,CAAC,4BAA4B;IAapC,OAAO,CAAC,iCAAiC;IAkBzC,OAAO,CAAC,iCAAiC;IA0BzC,OAAO,CAAC,gCAAgC;IAoCxC,OAAO,CAAC,uBAAuB;IA6C/B,OAAO,CAAC,qBAAqB;IAU7B,OAAO,CAAC,iCAAiC;IAiBzC,OAAO,CAAC,oBAAoB;IAe5B;;OAEG;IACH,OAAO,CAAC,qBAAqB;IAuB7B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAK3B,OAAO,CAAC,oBAAoB;IAU5B,OAAO,CAAC,oBAAoB;IAe5B,OAAO,CAAC,gBAAgB;IAkDxB;;;OAGG;IACH,OAAO,CAAC,eAAe;CA0FxB"}

package/dist/types/src/space/admission-discovery-extension.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admission-discovery-extension.d.ts","sourceRoot":"","sources":["../../../../src/space/admission-discovery-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,OAAO,EAAE,MAAM,aAAa,CAAC;AAIzD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EACL,KAAK,yBAAyB,EAE9B,KAAK,6BAA6B,EACnC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,KAAK,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;GAEG;AACH,qBAAa,4BAA6B,SAAQ,YAAY,CAC5D;IAAE,yBAAyB,EAAE,yBAAyB,CAAA;CAAE,EACxD,EAAE,CACH;IAIG,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAJ5B,OAAO,CAAC,IAAI,CAAiB;gBAGV,QAAQ,EAAE,6BAA6B,EACvC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC;cASxB,WAAW,IAAI,OAAO,CAAC,EAAE,CAAC;IAIpC,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAYhD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAIxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAGxC;AAED,qBAAa,yBAA0B,SAAQ,YAAY,CACzD,EAAE,EACF;IAAE,yBAAyB,EAAE,yBAAyB,CAAA;CAAE,CACzD;IACa,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAAN,MAAM,EAAE,KAAK;cAQjB,WAAW,IAAI,OAAO,CAAC;QAAE,yBAAyB,EAAE,yBAAyB,CAAA;KAAE,CAAC;CAe1G"}
+{"version":3,"file":"admission-discovery-extension.d.ts","sourceRoot":"","sources":["../../../../src/space/admission-discovery-extension.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,OAAO,EAAgB,MAAM,aAAa,CAAC;AAIzD,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EACL,KAAK,yBAAyB,EAC9B,KAAK,6BAA6B,EAEnC,MAAM,0CAA0C,CAAC;AAClD,OAAO,EAAE,KAAK,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAErE,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,SAAS,CAAC;AAErC;;GAEG;AACH,qBAAa,4BAA6B,SAAQ,YAAY,CAC5D;IAAE,yBAAyB,EAAE,yBAAyB,CAAA;CAAE,EACxD,EAAE,CACH;IAIG,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAJ5B,OAAO,CAAC,IAAI,CAAiB;IAE7B,YACmB,QAAQ,EAAE,6BAA6B,EACvC,SAAS,EAAE,OAAO,CAAC,UAAU,CAAC,EAOhD;IAED,UAAyB,WAAW,IAAI,OAAO,CAAC,EAAE,CAAC,CAElD;IAEc,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAU9D;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAEtC;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAEtC;CACF;AAED,qBAAa,yBAA0B,SAAQ,YAAY,CACzD,EAAE,EACF;IAAE,yBAAyB,EAAE,yBAAyB,CAAA;CAAE,CACzD;IACa,OAAO,CAAC,QAAQ,CAAC,MAAM;IAAnC,YAA6B,MAAM,EAAE,KAAK,EAMzC;IAED,UAAyB,WAAW,IAAI,OAAO,CAAC;QAAE,yBAAyB,EAAE,yBAAyB,CAAA;KAAE,CAAC,CAcxG;CACF"}

package/dist/types/src/space/auth.d.ts

@@ -2,16 +2,16 @@ import { type AuthService } from '@dxos/protocols/proto/dxos/mesh/teleport/auth'
 import { type ExtensionContext, RpcExtension } from '@dxos/teleport';
 export type AuthProvider = (nonce: Uint8Array) => Promise<Uint8Array | undefined>;
 export type AuthVerifier = (nonce: Uint8Array, credential: Uint8Array) => Promise<boolean>;
-export type AuthExtensionParams = {
+export type AuthExtensionProps = {
     provider: AuthProvider;
     verifier: AuthVerifier;
     onAuthSuccess: () => void;
     onAuthFailure: () => void;
 };
 export declare class AuthExtension extends RpcExtension<Services, Services> {
-    private readonly _authParams;
+    private readonly _authProps;
     private readonly _ctx;
-    constructor(_authParams: AuthExtensionParams);
+    constructor(_authProps: AuthExtensionProps);
     protected getHandlers(): Promise<Services>;
     onOpen(context: ExtensionContext): Promise<void>;
     onClose(): Promise<void>;

package/dist/types/src/space/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/space/auth.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,+CAA+C,CAAC;AACjF,OAAO,EAAE,KAAK,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAElF,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE3F,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAC;AAEF,qBAAa,aAAc,SAAQ,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAOrD,OAAO,CAAC,QAAQ,CAAC,WAAW;IANxC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAIlB;gBAE0B,WAAW,EAAE,mBAAmB;cAY7C,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC;IAmBjC,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBhD,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAKxB,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;CAIxC;AAED,KAAK,QAAQ,GAAG;IAAE,WAAW,EAAE,WAAW,CAAA;CAAE,CAAC"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../../../src/space/auth.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,+CAA+C,CAAC;AACjF,OAAO,EAAE,KAAK,gBAAgB,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAErE,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,UAAU,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,CAAC;AAElF,MAAM,MAAM,YAAY,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;AAE3F,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,YAAY,CAAC;IACvB,QAAQ,EAAE,YAAY,CAAC;IACvB,aAAa,EAAE,MAAM,IAAI,CAAC;IAC1B,aAAa,EAAE,MAAM,IAAI,CAAC;CAC3B,CAAC;AAEF,qBAAa,aAAc,SAAQ,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAOrD,OAAO,CAAC,QAAQ,CAAC,UAAU;IANvC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAIlB;IAEH,YAA6B,UAAU,EAAE,kBAAkB,EAU1D;IAED,UAAgB,WAAW,IAAI,OAAO,CAAC,QAAQ,CAAC,CAiB/C;IAEc,MAAM,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB9D;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAGtC;IAEc,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAGtC;CACF;AAED,KAAK,QAAQ,GAAG;IAAE,WAAW,EAAE,WAAW,CAAA;CAAE,CAAC"}

package/dist/types/src/space/control-pipeline.d.ts

@@ -1,4 +1,5 @@
-import { type SpaceState, type MemberInfo, type FeedInfo, type DelegateInvitationCredential } from '@dxos/credentials';
+import { Context } from '@dxos/context';
+import { type DelegateInvitationCredential, type FeedInfo, type MemberInfo, type SpaceState } from '@dxos/credentials';
 import { type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
@@ -6,7 +7,7 @@ import { type Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type AsyncCallback, Callback } from '@dxos/util';
 import { type MetadataStore } from '../metadata';
 import { type PipelineAccessor } from '../pipeline';
-export type ControlPipelineParams = {
+export type ControlPipelineProps = {
     spaceKey: PublicKey;
     genesisFeed: FeedWrapper<FeedMessage>;
     feedProvider: (feedKey: PublicKey) => Promise<FeedWrapper<FeedMessage>>;
@@ -31,11 +32,11 @@ export declare class ControlPipeline {
     private _usage;
     private _mutations;
     private _snapshotTask;
-    constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }: ControlPipelineParams);
+    constructor({ spaceKey, genesisFeed, feedProvider, metadataStore }: ControlPipelineProps);
     get spaceState(): SpaceState;
     get pipeline(): PipelineAccessor;
     setWriteFeed(feed: FeedWrapper<FeedMessage>): Promise<void>;
-    start(): Promise<void>;
+    start(ctx: Context): Promise<void>;
     private _processSnapshot;
     private _saveSnapshot;
     private _consumePipeline;

package/dist/types/src/space/control-pipeline.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control-pipeline.d.ts","sourceRoot":"","sources":["../../../../src/space/control-pipeline.ts"],"names":[],"mappings":"AAMA,OAAO,EAEL,KAAK,UAAU,EACf,KAAK,UAAU,EACf,KAAK,QAAQ,EACb,KAAK,4BAA4B,EAClC,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAG5F,OAAO,EAAE,KAAK,aAAa,EAAE,QAAQ,EAAU,MAAM,YAAY,CAAC;AAElE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAY,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE9D,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,SAAS,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;IACxE,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAQF;;GAEG;AACH,qBAEa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IAEvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,gBAAgB,CAAC,CAAY;IACrC,OAAO,CAAC,sBAAsB,CAAsB;IAEpD,SAAgB,cAAc,oCAA2C;IACzE,SAAgB,mBAAmB,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC3E,SAAgB,qBAAqB,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3E,SAAgB,qBAAqB,EAAE,QAAQ,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC7F,SAAgB,4BAA4B,EAAE,QAAQ,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAGpG,OAAO,CAAC,MAAM,CAA0B;IAGxC,OAAO,CAAC,UAAU,CAA2B;IAE7C,OAAO,CAAC,aAAa,CAGlB;gBAES,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,qBAAqB;IAkCzF,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,IAAI,QAAQ,IAAI,gBAAgB,CAE/B;IAEK,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAM3D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAgBd,gBAAgB;YAehB,aAAa;YAgBb,gBAAgB;YAgBhB,eAAe;YAmBf,wBAAwB;IAUhC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;YAQb,oBAAoB;CASnC"}
+{"version":3,"file":"control-pipeline.d.ts","sourceRoot":"","sources":["../../../../src/space/control-pipeline.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACxC,OAAO,EACL,KAAK,4BAA4B,EACjC,KAAK,QAAQ,EACb,KAAK,UAAU,EACf,KAAK,UAAU,EAEhB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AAExE,OAAO,EAAgB,KAAK,UAAU,EAAE,MAAM,6CAA6C,CAAC;AAG5F,OAAO,EAAE,KAAK,aAAa,EAAE,QAAQ,EAAU,MAAM,YAAY,CAAC;AAElE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAY,KAAK,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE9D,MAAM,MAAM,oBAAoB,GAAG;IACjC,QAAQ,EAAE,SAAS,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC,WAAW,CAAC,CAAC;IACtC,YAAY,EAAE,CAAC,OAAO,EAAE,SAAS,KAAK,OAAO,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC,CAAC;IACxE,aAAa,EAAE,aAAa,CAAC;CAC9B,CAAC;AAQF;;GAEG;AACH,qBAEa,eAAe;IAC1B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAiB;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAW;IACrC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAoB;IAGvD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAY;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAgB;IAC1C,OAAO,CAAC,gBAAgB,CAAC,CAAY;IACrC,OAAO,CAAC,sBAAsB,CAAsB;IAEpD,SAAgB,cAAc,oCAA2C;IACzE,SAAgB,mBAAmB,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC3E,SAAgB,qBAAqB,EAAE,QAAQ,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC,CAAC;IAC3E,SAAgB,qBAAqB,EAAE,QAAQ,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAC7F,SAAgB,4BAA4B,EAAE,QAAQ,CAAC,aAAa,CAAC,4BAA4B,CAAC,CAAC,CAAC;IAGpG,OAAO,CAAC,MAAM,CAA0B;IAGxC,OAAO,CAAC,UAAU,CAA2B;IAE7C,OAAO,CAAC,aAAa,CAGlB;IAEH,YAAY,EAAE,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,aAAa,EAAE,EAAE,oBAAoB,EAmCvF;IAED,IAAI,UAAU,IAAI,UAAU,CAE3B;IAED,IAAI,QAAQ,IAAI,gBAAgB,CAE/B;IAEK,YAAY,CAAC,IAAI,EAAE,WAAW,CAAC,WAAW,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhE;IAGK,KAAK,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAcvC;YAEa,gBAAgB;YAehB,aAAa;YAeb,gBAAgB;YAgBhB,eAAe;YAmBf,wBAAwB;IAUhC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC,CAM1B;YAEa,oBAAoB;CASnC"}

package/dist/types/src/space/space-manager.d.ts

@@ -1,3 +1,4 @@
+import { Context } from '@dxos/context';
 import { type DelegateInvitationCredential, type MemberInfo } from '@dxos/credentials';
 import { type FeedStore } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
@@ -8,17 +9,17 @@ import type { Credential } from '@dxos/protocols/proto/dxos/halo/credentials';
 import { type Teleport } from '@dxos/teleport';
 import { type BlobStore } from '@dxos/teleport-extension-object-sync';
 import { ComplexMap } from '@dxos/util';
+import { type MetadataStore } from '../metadata';
 import { Space } from './space';
 import { type SwarmIdentity } from './space-protocol';
-import { type MetadataStore } from '../metadata';
-export type SpaceManagerParams = {
+export type SpaceManagerProps = {
     feedStore: FeedStore<FeedMessage>;
     networkManager: SwarmNetworkManager;
     metadataStore: MetadataStore;
     blobStore: BlobStore;
     disableP2pReplication?: boolean;
 };
-export type ConstructSpaceParams = {
+export type ConstructSpaceProps = {
     metadata: SpaceMetadata;
     swarmIdentity: SwarmIdentity;
     memberKey: PublicKey;
@@ -30,7 +31,7 @@ export type ConstructSpaceParams = {
     onDelegatedInvitationStatusChange: (invitation: DelegateInvitationCredential, isActive: boolean) => Promise<void>;
     onMemberRolesChanged: (member: MemberInfo[]) => Promise<void>;
 };
-export type RequestSpaceAdmissionCredentialParams = {
+export type RequestSpaceAdmissionCredentialProps = {
     spaceKey: PublicKey;
     identityKey: PublicKey;
     swarmIdentity: SwarmIdentity;
@@ -45,14 +46,13 @@ export declare class SpaceManager {
     private readonly _networkManager;
     private readonly _metadataStore;
     private readonly _blobStore;
-    private readonly _instanceId;
     private readonly _disableP2pReplication;
-    constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }: SpaceManagerParams);
+    constructor({ feedStore, networkManager, metadataStore, blobStore, disableP2pReplication }: SpaceManagerProps);
     get spaces(): ComplexMap<PublicKey, Space>;
     open(): Promise<void>;
     close(): Promise<void>;
-    constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, onDelegatedInvitationStatusChange, onMemberRolesChanged, memberKey, }: ConstructSpaceParams): Promise<Space>;
-    requestSpaceAdmissionCredential(params: RequestSpaceAdmissionCredentialParams): Promise<Credential>;
+    constructSpace({ metadata, swarmIdentity, onAuthorizedConnection, onAuthFailure, onDelegatedInvitationStatusChange, onMemberRolesChanged, memberKey }: ConstructSpaceProps): Promise<Space>;
+    requestSpaceAdmissionCredential(ctx: Context, params: RequestSpaceAdmissionCredentialProps): Promise<Credential>;
     findSpaceByRootDocumentId(documentId: string): Space | undefined;
 }
 //# sourceMappingURL=space-manager.d.ts.map

package/dist/types/src/space/space-manager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"space-manager.d.ts","sourceRoot":"","sources":["../../../../src/space/space-manager.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"space-manager.d.ts","sourceRoot":"","sources":["../../../../src/space/space-manager.ts"],"names":[],"mappings":"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"}

package/dist/types/src/space/space-protocol.d.ts

@@ -1,12 +1,13 @@
 import { type Event } from '@dxos/async';
+import { Context } from '@dxos/context';
 import { type FeedWrapper } from '@dxos/feed-store';
 import { PublicKey } from '@dxos/keys';
-import { type SwarmNetworkManager, type WireProtocol, type WireProtocolParams } from '@dxos/network-manager';
+import { type SwarmNetworkManager, type WireProtocol, type WireProtocolProps } from '@dxos/network-manager';
 import type { FeedMessage } from '@dxos/protocols/proto/dxos/echo/feed';
 import { type MuxerStats, Teleport } from '@dxos/teleport';
 import { type BlobStore, BlobSync } from '@dxos/teleport-extension-object-sync';
 import { ReplicatorExtension } from '@dxos/teleport-extension-replicator';
-import { CallbackCollection, type AsyncCallback } from '@dxos/util';
+import { type AsyncCallback, CallbackCollection } from '@dxos/util';
 import { type AuthProvider, type AuthVerifier } from './auth';
 export declare const MOCK_AUTH_PROVIDER: AuthProvider;
 export declare const MOCK_AUTH_VERIFIER: AuthVerifier;
@@ -50,15 +51,15 @@ export declare class SpaceProtocol {
     get sessions(): ReadonlyMap<PublicKey, SpaceProtocolSession>;
     get feeds(): ReadonlySet<FeedWrapper<FeedMessage>>;
     private get _ownPeerKey();
-    constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication, }: SpaceProtocolOptions);
+    constructor({ topic, swarmIdentity, networkManager, onSessionAuth, onAuthFailure, blobStore, disableP2pReplication }: SpaceProtocolOptions);
     addFeed(feed: FeedWrapper<FeedMessage>): Promise<void>;
-    start(): Promise<void>;
+    start(ctx: Context): Promise<void>;
     updateTopology(): void;
-    stop(): Promise<void>;
+    stop(ctx: Context): Promise<void>;
     private _createProtocolProvider;
 }
-export type SpaceProtocolSessionParams = {
-    wireParams: WireProtocolParams;
+export type SpaceProtocolSessionProps = {
+    wireProps: WireProtocolProps;
     swarmIdentity: SwarmIdentity;
     blobSync: BlobSync;
     /**
@@ -78,7 +79,7 @@ export declare enum AuthStatus {
  * Represents a single connection to a remote peer
  */
 export declare class SpaceProtocolSession implements WireProtocol {
-    private readonly _wireParams;
+    private readonly _wireProps;
     private readonly _disableP2pReplication;
     private readonly _onSessionAuth?;
     private readonly _onAuthFailure?;
@@ -89,7 +90,7 @@ export declare class SpaceProtocolSession implements WireProtocol {
     private _authStatus;
     get authStatus(): AuthStatus;
     get stats(): Event<MuxerStats>;
-    constructor({ wireParams, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication, }: SpaceProtocolSessionParams);
+    constructor({ wireProps, swarmIdentity, onSessionAuth, onAuthFailure, blobSync, disableP2pReplication }: SpaceProtocolSessionProps);
     get stream(): import("stream").Duplex;
     open(sessionId?: PublicKey): Promise<void>;
     close(): Promise<void>;