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

package/dist/lib/browser/{chunk-R2FEBB66.mjs → chunk-WF53R6F7.mjs}

@@ -2184,7 +2184,7 @@ var SpaceInvitationsServiceImpl = class extends AbstractInvitationsService {
 import { Trigger as Trigger5 } from "@dxos/async";
 import { getCredentialAssertion as getCredentialAssertion3 } from "@dxos/credentials";
 import { failUndefined as failUndefined2 } from "@dxos/debug";
-import { valueEncoding, DataServiceSubscriptions, MetadataStore, SpaceManager, SnapshotStore } from "@dxos/echo-db";
+import { valueEncoding, MetadataStore, SpaceManager, DataServiceSubscriptions, SnapshotStore } from "@dxos/echo-pipeline";
 import { FeedFactory, FeedStore } from "@dxos/feed-store";
 import { Keyring } from "@dxos/keyring";
 import { log as log11 } from "@dxos/log";
@@ -2194,7 +2194,7 @@ import assert12 from "@dxos/node-std/assert";
 import { Event as Event4, synchronized, trackLeaks as trackLeaks2 } from "@dxos/async";
 import { Context as Context7 } from "@dxos/context";
 import { getCredentialAssertion as getCredentialAssertion2 } from "@dxos/credentials";
-import { spaceGenesis, SnapshotManager } from "@dxos/echo-db";
+import { spaceGenesis, SnapshotManager } from "@dxos/echo-pipeline";
 import { PublicKey as PublicKey7 } from "@dxos/keys";
 import { log as log10 } from "@dxos/log";
 import { Presence } from "@dxos/teleport-extension-presence";
@@ -2204,7 +2204,7 @@ import { ComplexMap as ComplexMap3, deferFunction as deferFunction2 } from "@dxo
 import { trackLeaks } from "@dxos/async";
 import { Context as Context6 } from "@dxos/context";
 import { timed } from "@dxos/debug";
-import { DataPipelineControllerImpl, createMappedFeedWriter } from "@dxos/echo-db";
+import { DataPipelineControllerImpl, createMappedFeedWriter } from "@dxos/echo-pipeline";
 import { PublicKey as PublicKey6 } from "@dxos/keys";
 import { AdmittedFeed as AdmittedFeed3 } from "@dxos/protocols/proto/dxos/halo/credentials";
 import { ComplexSet as ComplexSet2 } from "@dxos/util";
@@ -3013,18 +3013,133 @@ var toStorageType = (type) => {
   }
 };
 
+// packages/sdk/client-services/src/packlets/vault/services.ts
+import { schema as schema7 } from "@dxos/protocols";
+var iframeServiceBundle = {
+  IframeService: schema7.getService("dxos.iframe.IframeService"),
+  BridgeService: schema7.getService("dxos.mesh.bridge.BridgeService")
+};
+var workerServiceBundle = {
+  WorkerService: schema7.getService("dxos.iframe.WorkerService")
+};
+var appServiceBundle = {
+  AppService: schema7.getService("dxos.iframe.AppService")
+};
+var shellServiceBundle = {
+  ShellService: schema7.getService("dxos.iframe.ShellService")
+};
+
+// packages/sdk/client-services/src/packlets/vault/shell-runtime.ts
+import assert13 from "@dxos/node-std/assert";
+import { Event as Event5 } from "@dxos/async";
+import { ShellLayout } from "@dxos/protocols/proto/dxos/iframe";
+import { createProtoRpcPeer } from "@dxos/rpc";
+var ShellRuntimeImpl = class {
+  constructor(_port) {
+    this._port = _port;
+    this.layoutUpdate = new Event5();
+    this._layout = 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) {
+    assert13(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 = 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 Event5();
+    this.contextUpdate = new Event5();
+    this._layout = layout != null ? layout : 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
 import { Trigger as Trigger9 } from "@dxos/async";
-import { log as log16, logInfo as logInfo2 } from "@dxos/log";
+import { log as log17, logInfo as logInfo2 } from "@dxos/log";
 import { MemorySignalManager as MemorySignalManager2, MemorySignalManagerContext as MemorySignalManagerContext2, WebsocketSignalManager as WebsocketSignalManager2 } from "@dxos/messaging";
 import { createWebRTCTransportFactory, NetworkManager as NetworkManager2 } from "@dxos/network-manager";
-import { createProtoRpcPeer as createProtoRpcPeer4 } from "@dxos/rpc";
+import { createProtoRpcPeer as createProtoRpcPeer6 } from "@dxos/rpc";
+import { getAsyncValue } from "@dxos/util";
 
 // packages/sdk/client-services/src/packlets/services/service-host.ts
 import { raise as raise2 } from "@dxos/debug";
 import { DocumentModel } from "@dxos/document-model";
-import { DataServiceImpl } from "@dxos/echo-db";
-import { log as log15 } from "@dxos/log";
+import { DataServiceImpl } from "@dxos/echo-pipeline";
+import { log as log16 } from "@dxos/log";
 import { ModelFactory } from "@dxos/model-factory";
 import { Status } from "@dxos/protocols/proto/dxos/client";
 import { TextModel } from "@dxos/text-model";
@@ -3097,7 +3212,7 @@ var NetworkServiceImpl = class {
 import { scheduleTask as scheduleTask4 } from "@dxos/async";
 import { Stream as Stream11 } from "@dxos/codec-protobuf";
 import { raise } from "@dxos/debug";
-import { SpaceNotFoundError } from "@dxos/echo-db";
+import { SpaceNotFoundError } from "@dxos/echo-pipeline";
 var SpacesServiceImpl = class {
   constructor(_spaceManager) {
     this._spaceManager = _spaceManager;
@@ -3139,26 +3254,15 @@ var SpacesServiceImpl = class {
 
 // packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
 import { WebRTCTransportService } from "@dxos/network-manager";
-import { createProtoRpcPeer } from "@dxos/rpc";
-
-// packages/sdk/client-services/src/packlets/vault/services.ts
-import { schema as schema7 } from "@dxos/protocols";
-var iframeServiceBundle = {
-  IframeService: schema7.getService("dxos.iframe.IframeService"),
-  BridgeService: schema7.getService("dxos.mesh.bridge.BridgeService")
-};
-var workerServiceBundle = {
-  WorkerService: schema7.getService("dxos.iframe.WorkerService")
-};
-
-// packages/sdk/client-services/src/packlets/vault/iframe-proxy-runtime.ts
+import { createProtoRpcPeer as createProtoRpcPeer2 } from "@dxos/rpc";
 var IFrameProxyRuntime = class {
-  constructor({ systemPort, workerAppPort, windowAppPort }) {
+  constructor({ systemPort, workerAppPort, windowAppPort, shellPort }) {
     this._transportService = new WebRTCTransportService();
     this._systemPort = systemPort;
     this._windowAppPort = windowAppPort;
     this._workerAppPort = workerAppPort;
-    this._systemRpc = createProtoRpcPeer({
+    this._shellPort = shellPort;
+    this._systemRpc = createProtoRpcPeer2({
       requested: workerServiceBundle,
       exposed: iframeServiceBundle,
       handlers: {
@@ -3173,22 +3277,109 @@ 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
+import { Event as Event6 } from "@dxos/async";
+import { log as log12 } from "@dxos/log";
+import { ShellDisplay } from "@dxos/protocols/proto/dxos/iframe";
+import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
+var ShellController = class {
+  constructor(_port) {
+    this._port = _port;
+    this.contextUpdate = new Event6();
+    this._display = 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;
+    log12("set layout", {
+      layout,
+      ...options
+    }, {
+      file: "shell-controller.ts",
+      line: 39,
+      scope: this,
+      callSite: (f, a) => f(...a)
+    });
+    this._display = ShellDisplay.FULLSCREEN;
+    this._emitUpdate();
+    await ((_a = this._shellRpc) == null ? void 0 : _a.rpc.ShellService.setLayout({
+      layout,
+      ...options
+    }));
+  }
+  async open() {
+    this._shellRpc = createProtoRpcPeer3({
+      requested: shellServiceBundle,
+      exposed: appServiceBundle,
+      handlers: {
+        AppService: {
+          setContext: async (request) => {
+            log12("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
 import { asyncTimeout, Trigger as Trigger6 } from "@dxos/async";
-import { log as log12 } from "@dxos/log";
+import { log as log13 } from "@dxos/log";
 var Message;
 (function(Message2) {
   Message2["ACQUIRING"] = "acquiring";
@@ -3221,7 +3412,7 @@ var VaultResourceLock = class {
     }
   }
   async _requestLock(steal = false) {
-    log12("requesting lock...", {
+    log13("requesting lock...", {
       steal
     }, {
       file: "vault-resource-lock.ts",
@@ -3238,14 +3429,14 @@ var VaultResourceLock = class {
       acquired.wake();
       this._releaseTrigger = new Trigger6();
       await this._releaseTrigger.wait();
-      log12("releasing lock...", {}, {
+      log13("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));
-      log12("released lock", {}, {
+      log13("released lock", {}, {
         file: "vault-resource-lock.ts",
         line: 67,
         scope: this,
@@ -3256,7 +3447,7 @@ var VaultResourceLock = class {
       await ((_a = this._onRelease) == null ? void 0 : _a.call(this));
     });
     await acquired.wait();
-    log12("recieved lock", {
+    log13("recieved lock", {
       steal
     }, {
       file: "vault-resource-lock.ts",
@@ -3269,15 +3460,15 @@ var VaultResourceLock = class {
 
 // packages/sdk/client-services/src/packlets/vault/worker-runtime.ts
 import { Trigger as Trigger8 } from "@dxos/async";
-import { log as log14 } from "@dxos/log";
+import { log as log15 } from "@dxos/log";
 import { MemorySignalManager, MemorySignalManagerContext, WebsocketSignalManager } from "@dxos/messaging";
 import { NetworkManager, WebRTCTransportProxyFactory } from "@dxos/network-manager";
 
 // packages/sdk/client-services/src/packlets/vault/worker-session.ts
-import assert13 from "@dxos/node-std/assert";
-import { Trigger as Trigger7 } from "@dxos/async";
-import { log as log13, logInfo } from "@dxos/log";
-import { createProtoRpcPeer as createProtoRpcPeer2 } from "@dxos/rpc";
+import assert14 from "@dxos/node-std/assert";
+import { asyncTimeout as asyncTimeout2, Trigger as Trigger7 } from "@dxos/async";
+import { log as log14, logInfo } from "@dxos/log";
+import { createProtoRpcPeer as createProtoRpcPeer4 } from "@dxos/rpc";
 import { Callback } from "@dxos/util";
 var __decorate3 = function(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
@@ -3290,33 +3481,39 @@ var __decorate3 = function(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 var WorkerSession = class {
-  constructor({ getService, systemPort, appPort, options = {
+  constructor({ getService, systemPort, appPort, shellPort, options = {
     heartbeatInterval: 1e3
   } }) {
     this._startTrigger = new Trigger7();
     this.onClose = new Callback();
-    assert13(options);
-    assert13(getService);
+    assert14(options);
+    assert14(getService);
     this._options = options;
     this._getService = getService;
-    this._clientRpc = createProtoRpcPeer2({
+    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 = createProtoRpcPeer4({
       exposed: clientServiceBundle,
-      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)
-      },
+      handlers,
       port: appPort
     });
-    this._iframeRpc = createProtoRpcPeer2({
+    this._shellClientRpc = createProtoRpcPeer4({
+      exposed: clientServiceBundle,
+      handlers,
+      port: shellPort
+    });
+    this._iframeRpc = createProtoRpcPeer4({
       requested: iframeServiceBundle,
       exposed: workerServiceBundle,
       handlers: {
@@ -3330,9 +3527,9 @@ var WorkerSession = class {
               try {
                 await this.close();
               } catch (err) {
-                log13.catch(err, {}, {
+                log14.catch(err, {}, {
                   file: "worker-session.ts",
-                  line: 90,
+                  line: 92,
                   scope: this,
                   callSite: (f, a) => f(...a)
                 });
@@ -3348,15 +3545,16 @@ var WorkerSession = class {
     this.bridgeService = this._iframeRpc.rpc.BridgeService;
   }
   async open() {
-    log13.info("opening..", {}, {
+    log14.info("opening..", {}, {
       file: "worker-session.ts",
-      line: 104,
+      line: 106,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await Promise.all([
       this._clientRpc.open(),
-      this._iframeRpc.open()
+      this._iframeRpc.open(),
+      this._maybeOpenShell()
     ]);
     await this._startTrigger.wait({
       timeout: 3e3
@@ -3365,20 +3563,20 @@ var WorkerSession = class {
       try {
         await this._iframeRpc.rpc.IframeService.heartbeat();
       } catch (err1) {
-        log13.warn("Heartbeat failed", {
+        log14.warn("Heartbeat failed", {
           err: err1
         }, {
           file: "worker-session.ts",
-          line: 116,
+          line: 118,
           scope: this,
           callSite: (f, a) => f(...a)
         });
         try {
           await this.close();
         } catch (err) {
-          log13.catch(err, {}, {
+          log14.catch(err, {}, {
             file: "worker-session.ts",
-            line: 120,
+            line: 122,
             scope: this,
             callSite: (f, a) => f(...a)
           });
@@ -3387,18 +3585,18 @@ var WorkerSession = class {
     }, this._options.heartbeatInterval);
   }
   async close() {
-    log13.info("closing..", {}, {
+    log14.info("closing..", {}, {
       file: "worker-session.ts",
-      line: 127,
+      line: 129,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     try {
       await this.onClose.callIfSet();
     } catch (err) {
-      log13.catch(err, {}, {
+      log14.catch(err, {}, {
         file: "worker-session.ts",
-        line: 131,
+        line: 133,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3411,6 +3609,18 @@ var WorkerSession = class {
       this._iframeRpc.close()
     ]);
   }
+  async _maybeOpenShell() {
+    try {
+      await asyncTimeout2(this._shellClientRpc.open(), 1e3);
+    } catch (e) {
+      log14.info("No shell connected.", {}, {
+        file: "worker-session.ts",
+        line: 147,
+        scope: this,
+        callSite: (f, a) => f(...a)
+      });
+    }
+  }
 };
 __decorate3([
   logInfo
@@ -3426,9 +3636,9 @@ var WorkerRuntime = class {
     this.sessions = /* @__PURE__ */ new Set();
   }
   async start() {
-    log14("starting...", {}, {
+    log15("starting...", {}, {
       file: "worker-runtime.ts",
-      line: 41,
+      line: 42,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3447,17 +3657,17 @@ var WorkerRuntime = class {
       });
       await this._clientServices.open();
       this._ready.wake(void 0);
-      log14("started", {}, {
+      log15("started", {}, {
         file: "worker-runtime.ts",
-        line: 58,
+        line: 59,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     } catch (err) {
       this._ready.wake(err);
-      log14.catch(err, {}, {
+      log15.catch(err, {}, {
         file: "worker-runtime.ts",
-        line: 61,
+        line: 62,
         scope: this,
         callSite: (f, a) => f(...a)
       });
@@ -3469,7 +3679,7 @@ var WorkerRuntime = class {
   /**
   * Create a new session.
   */
-  async createSession({ appPort, systemPort }) {
+  async createSession({ appPort, systemPort, shellPort }) {
     const session = new WorkerSession({
       getService: async (find) => {
         const error = await this._ready.wait();
@@ -3484,6 +3694,7 @@ var WorkerRuntime = class {
       },
       appPort,
       systemPort,
+      shellPort,
       readySignal: this._ready
     });
     session.onClose.set(async () => {
@@ -3595,7 +3806,7 @@ var ClientServicesHost = class {
     if (this._open) {
       return;
     }
-    log15("opening...", {}, {
+    log16("opening...", {}, {
       file: "service-host.ts",
       line: 125,
       scope: this,
@@ -3631,7 +3842,7 @@ var ClientServicesHost = class {
     await this._serviceContext.open();
     this._open = true;
     const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    log15("opened", {
+    log16("opened", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -3646,7 +3857,7 @@ var ClientServicesHost = class {
       return;
     }
     const deviceKey = (_a = this._serviceContext.identityManager.identity) == null ? void 0 : _a.deviceKey;
-    log15("closing...", {
+    log16("closing...", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -3659,7 +3870,7 @@ var ClientServicesHost = class {
     });
     await this._serviceContext.close();
     this._open = false;
-    log15("closed", {
+    log16("closed", {
       deviceKey
     }, {
       file: "service-host.ts",
@@ -3671,14 +3882,14 @@ var ClientServicesHost = class {
 };
 
 // packages/sdk/client-services/src/packlets/services/service-proxy.ts
-import { asyncTimeout as asyncTimeout2 } from "@dxos/async";
+import { asyncTimeout as asyncTimeout3 } from "@dxos/async";
 import { RemoteServiceConnectionTimeout } from "@dxos/errors";
-import { createProtoRpcPeer as createProtoRpcPeer3 } from "@dxos/rpc";
+import { createProtoRpcPeer as createProtoRpcPeer5 } from "@dxos/rpc";
 var ClientServicesProxy = class {
   // prettier-ignore
   constructor(port, _timeout = 3e4) {
     this._timeout = _timeout;
-    this._proxy = createProtoRpcPeer3({
+    this._proxy = createProtoRpcPeer5({
       requested: clientServiceBundle,
       exposed: {},
       handlers: {},
@@ -3695,7 +3906,7 @@ var ClientServicesProxy = class {
     return this._proxy.rpc;
   }
   async open() {
-    await asyncTimeout2(this._proxy.open(), this._timeout, new RemoteServiceConnectionTimeout());
+    await asyncTimeout3(this._proxy.open(), this._timeout, new RemoteServiceConnectionTimeout());
   }
   async close() {
     await this._proxy.close();
@@ -3715,11 +3926,12 @@ var __decorate4 = function(decorators, target, key, desc) {
 };
 var LOCK_KEY = "DXOS_RESOURCE_LOCK";
 var IFrameHostRuntime = class {
-  constructor({ configProvider, appPort }) {
+  constructor({ configProvider, appPort, shellPort }) {
     this._transportFactory = createWebRTCTransportFactory();
     this._ready = new Trigger9();
     this._configProvider = configProvider;
     this._appPort = appPort;
+    this._shellPort = shellPort;
     this._getService = async (find) => {
       const error = await this._ready.wait();
       if (error) {
@@ -3731,16 +3943,26 @@ 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() {
-    log16("starting...", {}, {
+    var _a;
+    log17("starting...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 63,
+      line: 81,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     try {
-      this._config = await this._configProvider();
+      this._config = await getAsyncValue(this._configProvider);
       const signalServer = this._config.get("runtime.services.signal.server");
       this._clientServices = new ClientServicesHost({
         lockKey: LOCK_KEY,
@@ -3753,7 +3975,7 @@ var IFrameHostRuntime = class {
           transportFactory: this._transportFactory
         })
       });
-      this._clientRpc = createProtoRpcPeer4({
+      this._clientRpc = createProtoRpcPeer6({
         exposed: clientServiceBundle,
         handlers: {
           DataService: async () => await this._getService((services) => services.DataService),
@@ -3772,37 +3994,40 @@ var IFrameHostRuntime = class {
       });
       await Promise.all([
         this._clientServices.open(),
-        this._clientRpc.open()
+        this._clientRpc.open(),
+        (_a = this._shellRuntime) == null ? void 0 : _a.open()
       ]);
       this._ready.wake(void 0);
-      log16("started", {}, {
+      log17("started", {}, {
         file: "iframe-host-runtime.ts",
-        line: 99,
+        line: 117,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     } catch (err) {
       this._ready.wake(err);
-      log16.catch(err, {}, {
+      log17.catch(err, {}, {
         file: "iframe-host-runtime.ts",
-        line: 102,
+        line: 120,
         scope: this,
         callSite: (f, a) => f(...a)
       });
     }
   }
   async stop() {
-    log16("stopping...", {}, {
+    var _a;
+    log17("stopping...", {}, {
       file: "iframe-host-runtime.ts",
-      line: 107,
+      line: 125,
       scope: this,
       callSite: (f, a) => f(...a)
     });
     await this._clientRpc.close();
     await this._clientServices.close();
-    log16("stopped", {}, {
+    await ((_a = this._shellRuntime) == null ? void 0 : _a.close());
+    log17("stopped", {}, {
       file: "iframe-host-runtime.ts",
-      line: 110,
+      line: 129,
       scope: this,
       callSite: (f, a) => f(...a)
     });
@@ -3850,10 +4075,15 @@ export {
   ServiceContext,
   clientServiceBundle,
   createStorageObjects,
-  IFrameHostRuntime,
   iframeServiceBundle,
   workerServiceBundle,
+  appServiceBundle,
+  shellServiceBundle,
+  ShellRuntimeImpl,
+  MemoryShellRuntime,
+  IFrameHostRuntime,
   IFrameProxyRuntime,
+  ShellController,
   VaultResourceLock,
   WorkerSession,
   WorkerRuntime,
@@ -3862,4 +4092,4 @@ export {
   ClientServicesHost,
   ClientServicesProxy
 };
-//# sourceMappingURL=chunk-R2FEBB66.mjs.map
+//# sourceMappingURL=chunk-WF53R6F7.mjs.map