@dxos/client-services 0.1.25-next.3c6b542 → 0.1.26

package/dist/lib/node/index.cjs

@@ -49,13 +49,10 @@ __export(src_exports, {
   IdentityManager: () => IdentityManager,
   InvitationEncoder: () => InvitationEncoder,
   InvitationObservableProvider: () => InvitationObservableProvider,
-  MemoryShellRuntime: () => MemoryShellRuntime,
   ON_CLOSE_DELAY: () => ON_CLOSE_DELAY,
   ProfileServiceImpl: () => ProfileServiceImpl,
   ServiceContext: () => ServiceContext,
   ServiceRegistry: () => ServiceRegistry,
-  ShellController: () => ShellController,
-  ShellRuntimeImpl: () => ShellRuntimeImpl,
   SpaceInvitationsHandler: () => SpaceInvitationsHandler,
   SpaceInvitationsProxy: () => SpaceInvitationsProxy,
   SpaceInvitationsServiceImpl: () => SpaceInvitationsServiceImpl,
@@ -66,14 +63,12 @@ __export(src_exports, {
   VaultResourceLock: () => VaultResourceLock,
   WorkerRuntime: () => WorkerRuntime,
   WorkerSession: () => WorkerSession,
-  appServiceBundle: () => appServiceBundle,
   clientServiceBundle: () => clientServiceBundle,
   createAuthProvider: () => createAuthProvider,
   createDefaultModelFactory: () => createDefaultModelFactory,
   createStorageObjects: () => createStorageObjects,
   getNetworkPeers: () => getNetworkPeers,
   iframeServiceBundle: () => iframeServiceBundle,
-  shellServiceBundle: () => shellServiceBundle,
   subscribeToFeedBlocks: () => subscribeToFeedBlocks,
   subscribeToFeeds: () => subscribeToFeeds,
   subscribeToNetworkStatus: () => subscribeToNetworkStatus,
@@ -2272,7 +2267,7 @@ var SpaceInvitationsServiceImpl = class extends AbstractInvitationsService {
 var import_async13 = require("@dxos/async");
 var import_credentials11 = require("@dxos/credentials");
 var import_debug5 = require("@dxos/debug");
-var import_echo_pipeline3 = require("@dxos/echo-pipeline");
+var import_echo_db3 = require("@dxos/echo-db");
 var import_feed_store4 = require("@dxos/feed-store");
 var import_keyring = require("@dxos/keyring");
 var import_log11 = require("@dxos/log");
@@ -2282,7 +2277,7 @@ var import_node_assert12 = __toESM(require("node:assert"));
 var import_async12 = require("@dxos/async");
 var import_context7 = require("@dxos/context");
 var import_credentials10 = require("@dxos/credentials");
-var import_echo_pipeline2 = require("@dxos/echo-pipeline");
+var import_echo_db2 = require("@dxos/echo-db");
 var import_keys8 = require("@dxos/keys");
 var import_log10 = require("@dxos/log");
 var import_teleport_extension_presence = require("@dxos/teleport-extension-presence");
@@ -2292,7 +2287,7 @@ var import_util6 = require("@dxos/util");
 var import_async11 = require("@dxos/async");
 var import_context6 = require("@dxos/context");
 var import_debug4 = require("@dxos/debug");
-var import_echo_pipeline = require("@dxos/echo-pipeline");
+var import_echo_db = require("@dxos/echo-db");
 var import_keys7 = require("@dxos/keys");
 var import_credentials9 = require("@dxos/protocols/proto/dxos/halo/credentials");
 var import_util5 = require("@dxos/util");
@@ -2555,7 +2550,7 @@ var DataSpace = class DataSpace2 {
     this._feedStore = params.feedStore;
     this._metadataStore = params.metadataStore;
     this._signingContext = params.signingContext;
-    this._dataPipelineController = new import_echo_pipeline.DataPipelineControllerImpl({
+    this._dataPipelineController = new import_echo_db.DataPipelineControllerImpl({
       modelFactory: params.modelFactory,
       metadataStore: params.metadataStore,
       snapshotManager: params.snapshotManager,
@@ -2611,7 +2606,7 @@ var DataSpace = class DataSpace2 {
       timeout: CONTROL_PIPELINE_READY_TIMEFRAME
     });
     await this._createWritableFeeds();
-    this.notarizationPlugin.setWriter((0, import_echo_pipeline.createMappedFeedWriter)((credential) => ({
+    this.notarizationPlugin.setWriter((0, import_echo_db.createMappedFeedWriter)((credential) => ({
       credential: {
         credential
       }
@@ -2761,7 +2756,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       callSite: (f, a) => f(...a)
     });
     const space = await this._constructSpace(metadata);
-    const credentials = await (0, import_echo_pipeline2.spaceGenesis)(this._keyring, this._signingContext, space.inner);
+    const credentials = await (0, import_echo_db2.spaceGenesis)(this._keyring, this._signingContext, space.inner);
     await this._metadataStore.addSpace(metadata);
     const memberCredential = credentials[1];
     (0, import_node_assert12.default)((0, import_credentials10.getCredentialAssertion)(memberCredential)["@type"] === "dxos.halo.credentials.SpaceMember");
@@ -2792,7 +2787,7 @@ var DataSpaceManager = class DataSpaceManager2 {
       offlineTimeout: 3e4,
       identityKey: this._signingContext.identityKey
     });
-    const snapshotManager = new import_echo_pipeline2.SnapshotManager(this._snapshotStore);
+    const snapshotManager = new import_echo_db2.SnapshotManager(this._snapshotStore);
     const controlFeed = metadata.controlFeedKey && await this._feedStore.openFeed(metadata.controlFeedKey, {
       writable: true
     });
@@ -2857,20 +2852,20 @@ var ServiceContext = class {
     this.networkManager = networkManager;
     this.modelFactory = modelFactory;
     this.initialized = new import_async13.Trigger();
-    this.dataServiceSubscriptions = new import_echo_pipeline3.DataServiceSubscriptions();
-    this.metadataStore = new import_echo_pipeline3.MetadataStore(storage.createDirectory("metadata"));
-    this.snapshotStore = new import_echo_pipeline3.SnapshotStore(storage.createDirectory("snapshots"));
+    this.dataServiceSubscriptions = new import_echo_db3.DataServiceSubscriptions();
+    this.metadataStore = new import_echo_db3.MetadataStore(storage.createDirectory("metadata"));
+    this.snapshotStore = new import_echo_db3.SnapshotStore(storage.createDirectory("snapshots"));
     this.keyring = new import_keyring.Keyring(storage.createDirectory("keyring"));
     this.feedStore = new import_feed_store4.FeedStore({
       factory: new import_feed_store4.FeedFactory({
         root: storage.createDirectory("feeds"),
         signer: this.keyring,
         hypercore: {
-          valueEncoding: import_echo_pipeline3.valueEncoding
+          valueEncoding: import_echo_db3.valueEncoding
         }
       })
     });
-    this.spaceManager = new import_echo_pipeline3.SpaceManager({
+    this.spaceManager = new import_echo_db3.SpaceManager({
       feedStore: this.feedStore,
       networkManager: this.networkManager
     });
@@ -3059,8 +3054,8 @@ var clientServiceBundle = (0, import_rpc.createServiceBundle)({
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 var import_debug7 = require("@dxos/debug");
 var import_document_model = require("@dxos/document-model");
-var import_echo_pipeline5 = require("@dxos/echo-pipeline");
-var import_log17 = require("@dxos/log");
+var import_echo_db5 = require("@dxos/echo-db");
+var import_log16 = require("@dxos/log");
 var import_model_factory = require("@dxos/model-factory");
 var import_client2 = require("@dxos/protocols/proto/dxos/client");
 var import_text_model = require("@dxos/text-model");
@@ -3133,7 +3128,7 @@ var NetworkServiceImpl = class {
 var import_async15 = require("@dxos/async");
 var import_codec_protobuf11 = require("@dxos/codec-protobuf");
 var import_debug6 = require("@dxos/debug");
-var import_echo_pipeline4 = require("@dxos/echo-pipeline");
+var import_echo_db4 = require("@dxos/echo-db");
 var SpacesServiceImpl = class {
   constructor(_spaceManager) {
     this._spaceManager = _spaceManager;
@@ -3150,7 +3145,7 @@ var SpacesServiceImpl = class {
   queryCredentials({ spaceKey }) {
     return new import_codec_protobuf11.Stream(({ ctx, next }) => {
       var _a;
-      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline4.SpaceNotFoundError(spaceKey));
+      const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_db4.SpaceNotFoundError(spaceKey));
       const processor = space.spaceState.registerProcessor({
         process: async (credential) => {
           next(credential);
@@ -3162,7 +3157,7 @@ var SpacesServiceImpl = class {
   }
   async writeCredentials({ spaceKey, credentials }) {
     var _a;
-    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_pipeline4.SpaceNotFoundError(spaceKey));
+    const space = (_a = this._spaceManager.spaces.get(spaceKey)) != null ? _a : (0, import_debug6.raise)(new import_echo_db4.SpaceNotFoundError(spaceKey));
     for (const credential of credentials != null ? credentials : []) {
       await space.controlPipeline.writer.write({
         credential: {
@@ -3219,130 +3214,11 @@ var toStorageType = (type) => {
 };
 
 // packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
-var import_async17 = require("@dxos/async");
+var import_async16 = require("@dxos/async");
 var import_log12 = require("@dxos/log");
 var import_messaging = require("@dxos/messaging");
 var import_network_manager3 = require("@dxos/network-manager");
-var import_rpc3 = require("@dxos/rpc");
-var import_util7 = require("@dxos/util");
-
-// packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
-var import_node_assert13 = __toESM(require("node:assert"));
-var import_async16 = require("@dxos/async");
-var import_iframe = require("@dxos/protocols/proto/dxos/iframe");
 var import_rpc2 = require("@dxos/rpc");
-
-// packages/sdk/client-services/src/packlets/vault/services.ts
-var import_protocols7 = require("@dxos/protocols");
-var iframeServiceBundle = {
-  IframeService: import_protocols7.schema.getService("dxos.iframe.IframeService"),
-  BridgeService: import_protocols7.schema.getService("dxos.mesh.bridge.BridgeService")
-};
-var workerServiceBundle = {
-  WorkerService: import_protocols7.schema.getService("dxos.iframe.WorkerService")
-};
-var appServiceBundle = {
-  AppService: import_protocols7.schema.getService("dxos.iframe.AppService")
-};
-var shellServiceBundle = {
-  ShellService: import_protocols7.schema.getService("dxos.iframe.ShellService")
-};
-
-// packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
-var ShellRuntimeImpl = class {
-  constructor(_port) {
-    this._port = _port;
-    this.layoutUpdate = new import_async16.Event();
-    this._layout = import_iframe.ShellLayout.DEFAULT;
-  }
-  get layout() {
-    return this._layout;
-  }
-  get invitationCode() {
-    return this._invitationCode;
-  }
-  get spaceKey() {
-    return this._spaceKey;
-  }
-  setLayout(layout, options = {}) {
-    this._layout = layout;
-    this._invitationCode = options.invitationCode;
-    this._spaceKey = options.spaceKey;
-    this.layoutUpdate.emit({
-      layout,
-      ...options
-    });
-  }
-  async setAppContext(context) {
-    (0, import_node_assert13.default)(this._appRpc, "runtime not open");
-    if (context.spaceKey) {
-      this._spaceKey = context.spaceKey;
-    }
-    if (context.invitationCode) {
-      this._invitationCode = context.invitationCode;
-    }
-    await this._appRpc.rpc.AppService.setContext({
-      ...context,
-      spaceKey: this._spaceKey,
-      invitationCode: this._invitationCode
-    });
-  }
-  async open() {
-    this._appRpc = (0, import_rpc2.createProtoRpcPeer)({
-      requested: appServiceBundle,
-      exposed: shellServiceBundle,
-      handlers: {
-        ShellService: {
-          setLayout: async (request) => {
-            this._layout = request.layout;
-            this._invitationCode = request.invitationCode;
-            this._spaceKey = request.spaceKey;
-            this.layoutUpdate.emit(request);
-          }
-        }
-      },
-      port: this._port
-    });
-    await this._appRpc.open();
-  }
-  async close() {
-    var _a;
-    await ((_a = this._appRpc) == null ? void 0 : _a.close());
-    this._appRpc = void 0;
-  }
-};
-var MemoryShellRuntime = class {
-  constructor({ layout, invitationCode, spaceKey } = {}) {
-    this.layoutUpdate = new import_async16.Event();
-    this.contextUpdate = new import_async16.Event();
-    this._layout = layout != null ? layout : import_iframe.ShellLayout.DEFAULT;
-    this._invitationCode = invitationCode;
-    this._spaceKey = spaceKey;
-  }
-  get layout() {
-    return this._layout;
-  }
-  get invitationCode() {
-    return this._invitationCode;
-  }
-  get spaceKey() {
-    return this._spaceKey;
-  }
-  setLayout(layout, options = {}) {
-    this._layout = layout;
-    this._invitationCode = options.invitationCode;
-    this._spaceKey = options.spaceKey;
-    this.layoutUpdate.emit({
-      layout,
-      ...options
-    });
-  }
-  async setAppContext(context) {
-    this.contextUpdate.emit(context);
-  }
-};
-
-// packages/sdk/client-services/src/packlets/vault/iframe-host-runtime.ts
 var __decorate3 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -3355,12 +3231,11 @@ var __decorate3 = function(decorators, target, key, desc) {
 };
 var LOCK_KEY = "DXOS_RESOURCE_LOCK";
 var IFrameHostRuntime = class {
-  constructor({ configProvider, appPort, shellPort }) {
+  constructor({ configProvider, appPort }) {
     this._transportFactory = (0, import_network_manager3.createWebRTCTransportFactory)();
-    this._ready = new import_async17.Trigger();
+    this._ready = new import_async16.Trigger();
     this._configProvider = configProvider;
     this._appPort = appPort;
-    this._shellPort = shellPort;
     this._getService = async (find) => {
       const error = await this._ready.wait();
       if (error) {
@@ -3372,26 +3247,16 @@ var IFrameHostRuntime = class {
       }
       return service;
     };
-    if (this._shellPort) {
-      this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
-    }
-  }
-  get services() {
-    return this._clientServices;
-  }
-  get shell() {
-    return this._shellRuntime;
   }
   async start() {
-    var _a;
     (0, import_log12.log)("starting...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 81,
+      line: 63,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     try {
-      this._config = await (0, import_util7.getAsyncValue)(this._configProvider);
+      this._config = await this._configProvider();
       const signalServer = this._config.get("runtime.services.signal.server");
       this._clientServices = new ClientServicesHost({
         lockKey: LOCK_KEY,
@@ -3404,7 +3269,7 @@ var IFrameHostRuntime = class {
           transportFactory: this._transportFactory
         })
       });
-      this._clientRpc = (0, import_rpc3.createProtoRpcPeer)({
+      this._clientRpc = (0, import_rpc2.createProtoRpcPeer)({
         exposed: clientServiceBundle,
         handlers: {
           DataService: async () => await this._getService((services) => services.DataService),
@@ -3423,13 +3288,12 @@ var IFrameHostRuntime = class {
       });
       await Promise.all([
         this._clientServices.open(),
-        this._clientRpc.open(),
-        (_a = this._shellRuntime) == null ? void 0 : _a.open()
+        this._clientRpc.open()
       ]);
       this._ready.wake(void 0);
       (0, import_log12.log)("started", {}, {
         file: "iframe-host-runtime.ts",
-        line: 117,
+        line: 99,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3437,26 +3301,24 @@ var IFrameHostRuntime = class {
       this._ready.wake(err);
       import_log12.log.catch(err, {}, {
         file: "iframe-host-runtime.ts",
-        line: 120,
+        line: 102,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     }
   }
   async stop() {
-    var _a;
     (0, import_log12.log)("stopping...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 125,
+      line: 107,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._clientRpc.close();
     await this._clientServices.close();
-    await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
     (0, import_log12.log)("stopped", {}, {
       file: "iframe-host-runtime.ts",
-      line: 129,
+      line: 110,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3468,15 +3330,26 @@ __decorate3([
 
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
 var import_network_manager4 = require("@dxos/network-manager");
-var import_rpc4 = require("@dxos/rpc");
+var import_rpc3 = require("@dxos/rpc");
+
+// packages/sdk/client-services/src/packlets/vault/services.ts
+var import_protocols7 = require("@dxos/protocols");
+var iframeServiceBundle = {
+  IframeService: import_protocols7.schema.getService("dxos.iframe.IframeService"),
+  BridgeService: import_protocols7.schema.getService("dxos.mesh.bridge.BridgeService")
+};
+var workerServiceBundle = {
+  WorkerService: import_protocols7.schema.getService("dxos.iframe.WorkerService")
+};
+
+// packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
 var IFrameProxyRuntime = class {
-  constructor({ systemPort, workerAppPort, windowAppPort, shellPort }) {
+  constructor({ systemPort, workerAppPort, windowAppPort }) {
     this._transportService = new import_network_manager4.WebRTCTransportService();
     this._systemPort = systemPort;
     this._windowAppPort = windowAppPort;
     this._workerAppPort = workerAppPort;
-    this._shellPort = shellPort;
-    this._systemRpc = (0, import_rpc4.createProtoRpcPeer)({
+    this._systemRpc = (0, import_rpc3.createProtoRpcPeer)({
       requested: workerServiceBundle,
       exposed: iframeServiceBundle,
       handlers: {
@@ -3491,109 +3364,22 @@ var IFrameProxyRuntime = class {
     });
     this._workerAppPort.subscribe((msg) => this._windowAppPort.send(msg));
     this._windowAppPort.subscribe((msg) => this._workerAppPort.send(msg));
-    if (this._shellPort) {
-      this._shellRuntime = new ShellRuntimeImpl(this._shellPort);
-    }
-  }
-  get shell() {
-    return this._shellRuntime;
   }
   async open(origin) {
-    var _a;
     await this._systemRpc.open();
     await this._systemRpc.rpc.WorkerService.start({
       origin
     });
-    await ((_a = this._shellRuntime) == null ? void 0 : _a.open());
   }
   async close() {
-    var _a;
-    await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
     await this._systemRpc.rpc.WorkerService.stop();
     await this._systemRpc.close();
   }
 };
 
-// packages/sdk/client-services/src/packlets/vault/shell-controller.ts
-var import_async18 = require("@dxos/async");
-var import_log13 = require("@dxos/log");
-var import_iframe2 = require("@dxos/protocols/proto/dxos/iframe");
-var import_rpc5 = require("@dxos/rpc");
-var ShellController = class {
-  constructor(_port) {
-    this._port = _port;
-    this.contextUpdate = new import_async18.Event();
-    this._display = import_iframe2.ShellDisplay.NONE;
-  }
-  get display() {
-    return this._display;
-  }
-  get spaceKey() {
-    return this._spaceKey;
-  }
-  setSpace(key) {
-    this._spaceKey = key;
-    this._emitUpdate();
-  }
-  async setLayout(layout, options = {}) {
-    var _a;
-    (0, import_log13.log)("set layout", {
-      layout,
-      ...options
-    }, {
-      file: "shell-controller.ts",
-      line: 39,
-      scope: this,
-      callSite: (f, a) => f(...a)
-    });
-    this._display = import_iframe2.ShellDisplay.FULLSCREEN;
-    this._emitUpdate();
-    await ((_a = this._shellRpc) == null ? void 0 : _a.rpc.ShellService.setLayout({
-      layout,
-      ...options
-    }));
-  }
-  async open() {
-    this._shellRpc = (0, import_rpc5.createProtoRpcPeer)({
-      requested: shellServiceBundle,
-      exposed: appServiceBundle,
-      handlers: {
-        AppService: {
-          setContext: async (request) => {
-            (0, import_log13.log)("set context", request, {
-              file: "shell-controller.ts",
-              line: 52,
-              scope: this,
-              callSite: (f, a) => f(...a)
-            });
-            this._display = request.display;
-            this._spaceKey = request.spaceKey;
-            this._invitationCode = request.invitationCode;
-            this.contextUpdate.emit(request);
-          }
-        }
-      },
-      port: this._port
-    });
-    await this._shellRpc.open();
-  }
-  async close() {
-    var _a;
-    await ((_a = this._shellRpc) == null ? void 0 : _a.close());
-    this._shellRpc = void 0;
-  }
-  _emitUpdate() {
-    this.contextUpdate.emit({
-      display: this._display,
-      spaceKey: this._spaceKey,
-      invitationCode: this._invitationCode
-    });
-  }
-};
-
 // packages/sdk/client-services/src/packlets/vault/vault-resource-lock.ts
-var import_async19 = require("@dxos/async");
-var import_log14 = require("@dxos/log");
+var import_async17 = require("@dxos/async");
+var import_log13 = require("@dxos/log");
 var Message;
 (function(Message2) {
   Message2["ACQUIRING"] = "acquiring";
@@ -3601,7 +3387,7 @@ var Message;
 var VaultResourceLock = class {
   constructor({ lockKey, onAcquire, onRelease }) {
     this._broadcastChannel = new BroadcastChannel("vault-resource-lock");
-    this._releaseTrigger = new import_async19.Trigger();
+    this._releaseTrigger = new import_async17.Trigger();
     this._lockKey = lockKey;
     this._onAcquire = onAcquire;
     this._onRelease = onRelease;
@@ -3612,7 +3398,7 @@ var VaultResourceLock = class {
       message: Message.ACQUIRING
     });
     try {
-      await (0, import_async19.asyncTimeout)(this._requestLock(), 3e3);
+      await (0, import_async17.asyncTimeout)(this._requestLock(), 3e3);
     } catch (e) {
       await this._requestLock(true);
     }
@@ -3626,7 +3412,7 @@ var VaultResourceLock = class {
     }
   }
   async _requestLock(steal = false) {
-    (0, import_log14.log)("requesting lock...", {
+    (0, import_log13.log)("requesting lock...", {
       steal
     }, {
       file: "vault-resource-lock.ts",
@@ -3634,23 +3420,23 @@ var VaultResourceLock = class {
       scope: this,
       callSite: (f, a) => f(...a)
     });
-    const acquired = new import_async19.Trigger();
+    const acquired = new import_async17.Trigger();
     void navigator.locks.request(this._lockKey, {
       steal
     }, async () => {
       var _a, _b;
       await ((_a = this._onAcquire) == null ? void 0 : _a.call(this));
       acquired.wake();
-      this._releaseTrigger = new import_async19.Trigger();
+      this._releaseTrigger = new import_async17.Trigger();
       await this._releaseTrigger.wait();
-      (0, import_log14.log)("releasing lock...", {}, {
+      (0, import_log13.log)("releasing lock...", {}, {
         file: "vault-resource-lock.ts",
         line: 65,
         scope: this,
         callSite: (f, a) => f(...a)
       });
       await ((_b = this._onRelease) == null ? void 0 : _b.call(this));
-      (0, import_log14.log)("released lock", {}, {
+      (0, import_log13.log)("released lock", {}, {
         file: "vault-resource-lock.ts",
         line: 67,
         scope: this,
@@ -3661,7 +3447,7 @@ var VaultResourceLock = class {
       await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
     });
     await acquired.wait();
-    (0, import_log14.log)("recieved lock", {
+    (0, import_log13.log)("recieved lock", {
       steal
     }, {
       file: "vault-resource-lock.ts",
@@ -3673,17 +3459,17 @@ var VaultResourceLock = class {
 };
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
-var import_async21 = require("@dxos/async");
-var import_log16 = require("@dxos/log");
+var import_async19 = require("@dxos/async");
+var import_log15 = require("@dxos/log");
 var import_messaging2 = require("@dxos/messaging");
 var import_network_manager5 = require("@dxos/network-manager");
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
-var import_node_assert14 = __toESM(require("node:assert"));
-var import_async20 = require("@dxos/async");
-var import_log15 = require("@dxos/log");
-var import_rpc6 = require("@dxos/rpc");
-var import_util8 = require("@dxos/util");
+var import_node_assert13 = __toESM(require("node:assert"));
+var import_async18 = require("@dxos/async");
+var import_log14 = require("@dxos/log");
+var import_rpc4 = require("@dxos/rpc");
+var import_util7 = require("@dxos/util");
 var __decorate4 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -3695,39 +3481,33 @@ var __decorate4 = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var WorkerSession = class {
-  constructor({ getService, systemPort, appPort, shellPort, options = {
+  constructor({ getService, systemPort, appPort, options = {
     heartbeatInterval: 1e3
   } }) {
-    this._startTrigger = new import_async20.Trigger();
-    this.onClose = new import_util8.Callback();
-    (0, import_node_assert14.default)(options);
-    (0, import_node_assert14.default)(getService);
+    this._startTrigger = new import_async18.Trigger();
+    this.onClose = new import_util7.Callback();
+    (0, import_node_assert13.default)(options);
+    (0, import_node_assert13.default)(getService);
     this._options = options;
     this._getService = getService;
-    const handlers = {
-      DataService: async () => await this._getService((services) => services.DataService),
-      DevicesService: async () => await this._getService((services) => services.DevicesService),
-      DevtoolsHost: async () => await this._getService((services) => services.DevtoolsHost),
-      HaloInvitationsService: async () => await this._getService((services) => services.HaloInvitationsService),
-      NetworkService: async () => await this._getService((services) => services.NetworkService),
-      ProfileService: async () => await this._getService((services) => services.ProfileService),
-      SpaceInvitationsService: async () => await this._getService((services) => services.SpaceInvitationsService),
-      SpaceService: async () => await this._getService((services) => services.SpaceService),
-      SpacesService: async () => await this._getService((services) => services.SpacesService),
-      SystemService: async () => await this._getService((services) => services.SystemService),
-      TracingService: async () => await this._getService((services) => services.TracingService)
-    };
-    this._clientRpc = (0, import_rpc6.createProtoRpcPeer)({
+    this._clientRpc = (0, import_rpc4.createProtoRpcPeer)({
       exposed: clientServiceBundle,
-      handlers,
+      handlers: {
+        DataService: async () => await this._getService((services) => services.DataService),
+        DevicesService: async () => await this._getService((services) => services.DevicesService),
+        DevtoolsHost: async () => await this._getService((services) => services.DevtoolsHost),
+        HaloInvitationsService: async () => await this._getService((services) => services.HaloInvitationsService),
+        NetworkService: async () => await this._getService((services) => services.NetworkService),
+        ProfileService: async () => await this._getService((services) => services.ProfileService),
+        SpaceInvitationsService: async () => await this._getService((services) => services.SpaceInvitationsService),
+        SpaceService: async () => await this._getService((services) => services.SpaceService),
+        SpacesService: async () => await this._getService((services) => services.SpacesService),
+        SystemService: async () => await this._getService((services) => services.SystemService),
+        TracingService: async () => await this._getService((services) => services.TracingService)
+      },
       port: appPort
     });
-    this._shellClientRpc = (0, import_rpc6.createProtoRpcPeer)({
-      exposed: clientServiceBundle,
-      handlers,
-      port: shellPort
-    });
-    this._iframeRpc = (0, import_rpc6.createProtoRpcPeer)({
+    this._iframeRpc = (0, import_rpc4.createProtoRpcPeer)({
       requested: iframeServiceBundle,
       exposed: workerServiceBundle,
       handlers: {
@@ -3741,9 +3521,9 @@ var WorkerSession = class {
               try {
                 await this.close();
               } catch (err) {
-                import_log15.log.catch(err, {}, {
+                import_log14.log.catch(err, {}, {
                   file: "worker-session.ts",
-                  line: 92,
+                  line: 90,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -3759,16 +3539,15 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    import_log15.log.info("opening..", {}, {
+    import_log14.log.info("opening..", {}, {
       file: "worker-session.ts",
-      line: 106,
+      line: 104,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await Promise.all([
       this._clientRpc.open(),
-      this._iframeRpc.open(),
-      this._maybeOpenShell()
+      this._iframeRpc.open()
     ]);
     await this._startTrigger.wait({
       timeout: 3e3
@@ -3777,20 +3556,20 @@ var WorkerSession = class {
       try {
         await this._iframeRpc.rpc.IframeService.heartbeat();
       } catch (err1) {
-        import_log15.log.warn("Heartbeat failed", {
+        import_log14.log.warn("Heartbeat failed", {
           err: err1
         }, {
           file: "worker-session.ts",
-          line: 118,
+          line: 116,
           scope: this,
           callSite: (f, a) => f(...a)
         });
         try {
           await this.close();
         } catch (err) {
-          import_log15.log.catch(err, {}, {
+          import_log14.log.catch(err, {}, {
             file: "worker-session.ts",
-            line: 122,
+            line: 120,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3799,18 +3578,18 @@ var WorkerSession = class {
     }, this._options.heartbeatInterval);
   }
   async close() {
-    import_log15.log.info("closing..", {}, {
+    import_log14.log.info("closing..", {}, {
       file: "worker-session.ts",
-      line: 129,
+      line: 127,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     try {
       await this.onClose.callIfSet();
     } catch (err) {
-      import_log15.log.catch(err, {}, {
+      import_log14.log.catch(err, {}, {
         file: "worker-session.ts",
-        line: 133,
+        line: 131,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3823,21 +3602,9 @@ var WorkerSession = class {
       this._iframeRpc.close()
     ]);
   }
-  async _maybeOpenShell() {
-    try {
-      await (0, import_async20.asyncTimeout)(this._shellClientRpc.open(), 1e3);
-    } catch (e) {
-      import_log15.log.info("No shell connected.", {}, {
-        file: "worker-session.ts",
-        line: 147,
-        scope: this,
-        callSite: (f, a) => f(...a)
-      });
-    }
-  }
 };
 __decorate4([
-  import_log15.logInfo
+  import_log14.logInfo
 ], WorkerSession.prototype, "origin", void 0);
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
@@ -3846,13 +3613,13 @@ var WorkerRuntime = class {
   constructor(_configProvider) {
     this._configProvider = _configProvider;
     this._transportFactory = new import_network_manager5.WebRTCTransportProxyFactory();
-    this._ready = new import_async21.Trigger();
+    this._ready = new import_async19.Trigger();
     this.sessions = /* @__PURE__ */ new Set();
   }
   async start() {
-    (0, import_log16.log)("starting...", {}, {
+    (0, import_log15.log)("starting...", {}, {
       file: "worker-runtime.ts",
-      line: 42,
+      line: 41,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3871,17 +3638,17 @@ var WorkerRuntime = class {
       });
       await this._clientServices.open();
       this._ready.wake(void 0);
-      (0, import_log16.log)("started", {}, {
+      (0, import_log15.log)("started", {}, {
         file: "worker-runtime.ts",
-        line: 59,
+        line: 58,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     } catch (err) {
       this._ready.wake(err);
-      import_log16.log.catch(err, {}, {
+      import_log15.log.catch(err, {}, {
         file: "worker-runtime.ts",
-        line: 62,
+        line: 61,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3893,7 +3660,7 @@ var WorkerRuntime = class {
   /**
   * Create a new session.
   */
-  async createSession({ appPort, systemPort, shellPort }) {
+  async createSession({ appPort, systemPort }) {
     const session = new WorkerSession({
       getService: async (find) => {
         const error = await this._ready.wait();
@@ -3908,7 +3675,6 @@ var WorkerRuntime = class {
       },
       appPort,
       systemPort,
-      shellPort,
       readySignal: this._ready
     });
     session.onClose.set(async () => {
@@ -4020,7 +3786,7 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    (0, import_log17.log)("opening...", {}, {
+    (0, import_log16.log)("opening...", {}, {
       file: "service-host.ts",
       line: 125,
       scope: this,
@@ -4040,7 +3806,7 @@ var ClientServicesHost = class {
         return (_a2 = this._serviceContext.dataSpaceManager) != null ? _a2 : (0, import_debug7.raise)(new Error("SpaceManager not initialized"));
       }),
       SpacesService: new SpacesServiceImpl(this._serviceContext.spaceManager),
-      DataService: new import_echo_pipeline5.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
+      DataService: new import_echo_db5.DataServiceImpl(this._serviceContext.dataServiceSubscriptions),
       NetworkService: new NetworkServiceImpl(this._serviceContext.networkManager),
       // TODO(burdon): Move to new protobuf definitions.
       ProfileService: new ProfileServiceImpl(this._serviceContext),
@@ -4056,7 +3822,7 @@ var ClientServicesHost = class {
     await this._serviceContext.open();
     this._open = true;
     const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    (0, import_log17.log)("opened", {
+    (0, import_log16.log)("opened", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -4071,7 +3837,7 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    (0, import_log17.log)("closing...", {
+    (0, import_log16.log)("closing...", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -4084,7 +3850,7 @@ var ClientServicesHost = class {
     });
     await this._serviceContext.close();
     this._open = false;
-    (0, import_log17.log)("closed", {
+    (0, import_log16.log)("closed", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -4096,14 +3862,14 @@ var ClientServicesHost = class {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-proxy.ts
-var import_async22 = require("@dxos/async");
+var import_async20 = require("@dxos/async");
 var import_errors2 = require("@dxos/errors");
-var import_rpc7 = require("@dxos/rpc");
+var import_rpc5 = require("@dxos/rpc");
 var ClientServicesProxy = class {
   // prettier-ignore
   constructor(port, _timeout = 3e4) {
     this._timeout = _timeout;
-    this._proxy = (0, import_rpc7.createProtoRpcPeer)({
+    this._proxy = (0, import_rpc5.createProtoRpcPeer)({
       requested: clientServiceBundle,
       exposed: {},
       handlers: {},
@@ -4120,7 +3886,7 @@ var ClientServicesProxy = class {
     return this._proxy.rpc;
   }
   async open() {
-    await (0, import_async22.asyncTimeout)(this._proxy.open(), this._timeout, new import_errors2.RemoteServiceConnectionTimeout());
+    await (0, import_async20.asyncTimeout)(this._proxy.open(), this._timeout, new import_errors2.RemoteServiceConnectionTimeout());
   }
   async close() {
     await this._proxy.close();
@@ -4147,13 +3913,10 @@ var ClientServicesProxy = class {
   IdentityManager,
   InvitationEncoder,
   InvitationObservableProvider,
-  MemoryShellRuntime,
   ON_CLOSE_DELAY,
   ProfileServiceImpl,
   ServiceContext,
   ServiceRegistry,
-  ShellController,
-  ShellRuntimeImpl,
   SpaceInvitationsHandler,
   SpaceInvitationsProxy,
   SpaceInvitationsServiceImpl,
@@ -4164,14 +3927,12 @@ var ClientServicesProxy = class {
   VaultResourceLock,
   WorkerRuntime,
   WorkerSession,
-  appServiceBundle,
   clientServiceBundle,
   createAuthProvider,
   createDefaultModelFactory,
   createStorageObjects,
   getNetworkPeers,
   iframeServiceBundle,
-  shellServiceBundle,
   subscribeToFeedBlocks,
   subscribeToFeeds,
   subscribeToNetworkStatus,