@dxos/plugin-space 0.7.5-labs.5f04cf6 → 0.7.5-labs.e27f9b9

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

@@ -89,7 +89,7 @@ export declare namespace SpaceAction {
         }>;
         output: S.Struct<{
             id: typeof S.String;
-            activeParts: S.Record$<typeof S.String, S.Union<[typeof S.String, S.mutable<S.Array$<typeof S.String>>]>>;
+            subject: S.Array$<typeof S.String>;
             space: S.Schema<Space, Space, never>;
         }>;
     }>;
@@ -208,7 +208,7 @@ export declare namespace SpaceAction {
         }>;
         output: S.Struct<{
             id: typeof S.String;
-            activeParts: S.Record$<typeof S.String, S.Union<[typeof S.String, S.mutable<S.Array$<typeof S.String>>]>>;
+            subject: S.Array$<typeof S.String>;
             object: S.Schema<import("@dxos/react-client/echo").ReactiveEchoObject<any>, import("@dxos/react-client/echo").ReactiveEchoObject<any>, never>;
         }>;
     }>;

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.tsx"],"names":[],"mappings":"AAIA,OAAO,EAAgB,KAAK,uBAAuB,EAAoB,MAAM,qBAAqB,CAAC;AACnG,OAAO,EAAsD,KAAK,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAIrG,OAAO,EAML,KAAK,UAAU,EACf,KAAK,KAAK,EAEV,KAAK,IAAI,EACT,KAAK,OAAO,EACb,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAOL,KAAK,IAAI,EACT,KAAK,YAAY,EAEjB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,KAAK,EACX,MAAM,yBAAyB,CAAC;AAKjC,eAAO,MAAM,MAAM,iCAA2B,CAAC;AAC/C,eAAO,MAAM,UAAU,wBAAwB,CAAC;AAChD,eAAO,MAAM,mBAAmB,+BAA+B,CAAC;AAEhE,eAAO,MAAM,MAAM,kBAAkB,CAAC;AAItC;;;;;;GAMG;AACH,eAAO,MAAM,YAAY,GAAI,CAAC,SAAS,kBAAkB,CAAC,GAAG,CAAC,gBAC9C,KAAK,GAAG,IAAI,WACjB,YAAY,CAAC,CAAC,CAAC,YACd,YAAY,KACrB,CAAC,EAiBH,CAAC;AAGF,eAAO,MAAM,mBAAmB,UACvB,KAAK,6BACmB;IAAE,QAAQ,CAAC,EAAE,OAAO,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,KACzF,MAAM,GAAG,CAAC,MAAM,EAAE;IAAE,EAAE,EAAE,MAAM,CAAA;CAAE,CAQlC,CAAC;AAyFF,eAAO,MAAM,kBAAkB,yDAM5B;IACD,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpD;;;;;;;gBA7G0B,MAAM;;;;;;;CAmIhC,CAAC;AAEF,eAAO,MAAM,qBAAqB,8CAK/B;IACD,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,uBAAuB,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,0BAqIA,CAAC;AAEF,eAAO,MAAM,gBAAgB,2CAK1B;IACD,MAAM,EAAE,kBAAkB,CAAC,GAAG,CAAC,CAAC;IAChC,KAAK,EAAE,KAAK,CAAC;IACb,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;CACpD;;;;;;aAgCA,CAAC;AAEF,eAAO,MAAM,sBAAsB,mCAIhC;IACD,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;IACpC,QAAQ,EAAE,uBAAuB,CAAC;IAClC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,0BA2FA,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,UAAW,KAAK,WAAW,MAAM,sBAW3D,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,gBAAgB,WACnB,kBAAkB,CAAC,GAAG,CAAC,WACtB,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,KACjD,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,EAAE,CAenC,CAAC;AAEF;;GAEG;AAEH,eAAO,MAAM,WAAW,WACd,OAAO,WACN,CAAC,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YACxC,KAAK,KACd,OAAO,CAAC,OAAO,CAQjB,CAAC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util.tsx"],"names":[],"mappings":"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"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.7.2"}
+{"version":"5.7.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-space",
-  "version": "0.7.5-labs.5f04cf6",
+  "version": "0.7.5-labs.e27f9b9",
   "description": "DXOS Surface plugin for DXOS ECHO Spaces",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,36 +40,37 @@
     "lodash.get": "^4.4.2",
     "react-drag-drop-files": "^2.3.8",
     "react-is": "~18.2.0",
-    "@dxos/async": "0.7.5-labs.5f04cf6",
-    "@dxos/automerge": "0.7.5-labs.5f04cf6",
-    "@dxos/client": "0.7.5-labs.5f04cf6",
-    "@dxos/display-name": "0.7.5-labs.5f04cf6",
-    "@dxos/context": "0.7.5-labs.5f04cf6",
-    "@dxos/invariant": "0.7.5-labs.5f04cf6",
-    "@dxos/echo-schema": "0.7.5-labs.5f04cf6",
-    "@dxos/echo-signals": "0.7.5-labs.5f04cf6",
-    "@dxos/keys": "0.7.5-labs.5f04cf6",
-    "@dxos/live-object": "0.7.5-labs.5f04cf6",
-    "@dxos/local-storage": "0.7.5-labs.5f04cf6",
-    "@dxos/log": "0.7.5-labs.5f04cf6",
-    "@dxos/migrations": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-attention": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-client": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-graph": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-deck": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-observability": "0.7.5-labs.5f04cf6",
-    "@dxos/protocols": "0.7.5-labs.5f04cf6",
-    "@dxos/plugin-status-bar": "0.7.5-labs.5f04cf6",
-    "@dxos/react-client": "0.7.5-labs.5f04cf6",
-    "@dxos/app-framework": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-attention": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-editor": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-tabs": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-form": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-syntax-highlighter": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-searchlist": "0.7.5-labs.5f04cf6",
-    "@dxos/util": "0.7.5-labs.5f04cf6",
-    "@dxos/shell": "0.7.5-labs.5f04cf6"
+    "@dxos/app-framework": "0.7.5-labs.e27f9b9",
+    "@dxos/automerge": "0.7.5-labs.e27f9b9",
+    "@dxos/client": "0.7.5-labs.e27f9b9",
+    "@dxos/display-name": "0.7.5-labs.e27f9b9",
+    "@dxos/context": "0.7.5-labs.e27f9b9",
+    "@dxos/echo-schema": "0.7.5-labs.e27f9b9",
+    "@dxos/invariant": "0.7.5-labs.e27f9b9",
+    "@dxos/echo-signals": "0.7.5-labs.e27f9b9",
+    "@dxos/local-storage": "0.7.5-labs.e27f9b9",
+    "@dxos/keys": "0.7.5-labs.e27f9b9",
+    "@dxos/live-object": "0.7.5-labs.e27f9b9",
+    "@dxos/migrations": "0.7.5-labs.e27f9b9",
+    "@dxos/log": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-attention": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-graph": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-deck": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-client": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-observability": "0.7.5-labs.e27f9b9",
+    "@dxos/plugin-status-bar": "0.7.5-labs.e27f9b9",
+    "@dxos/react-client": "0.7.5-labs.e27f9b9",
+    "@dxos/protocols": "0.7.5-labs.e27f9b9",
+    "@dxos/async": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-attention": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-form": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-stack": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-searchlist": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-editor": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-syntax-highlighter": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-tabs": "0.7.5-labs.e27f9b9",
+    "@dxos/shell": "0.7.5-labs.e27f9b9",
+    "@dxos/util": "0.7.5-labs.e27f9b9"
   },
   "devDependencies": {
     "@babel/core": "^7.18.13",
@@ -80,17 +81,17 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/random": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-theme": "0.7.5-labs.5f04cf6",
-    "@dxos/storybook-utils": "0.7.5-labs.5f04cf6"
+    "@dxos/random": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-theme": "0.7.5-labs.e27f9b9",
+    "@dxos/storybook-utils": "0.7.5-labs.e27f9b9"
   },
   "peerDependencies": {
     "@phosphor-icons/react": "^2.1.5",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.7.5-labs.5f04cf6",
-    "@dxos/react-ui-theme": "0.7.5-labs.5f04cf6"
+    "@dxos/react-ui": "0.7.5-labs.e27f9b9",
+    "@dxos/react-ui-theme": "0.7.5-labs.e27f9b9"
   },
   "publishConfig": {
     "access": "public"

package/src/SpacePlugin.tsx

@@ -44,11 +44,17 @@ export type SpacePluginOptions = {
    * Query parameter for the invitation code.
    */
   invitationParam?: string;
+
+  /**
+   * Whether to send observability events.
+   */
+  observability?: boolean;
 };
 
 export const SpacePlugin = ({
   invitationUrl = window.location.origin,
   invitationParam = 'spaceInvitationCode',
+  observability = true,
 }: SpacePluginOptions = {}) => {
   const createInvitationUrl = (invitationCode: string) => {
     const baseUrl = new URL(invitationUrl);
@@ -75,7 +81,7 @@ export const SpacePlugin = ({
     }),
     defineModule({
       id: `${meta.id}/module/metadata`,
-      activatesOn: oneOf(Events.Startup, Events.SetupAppGraph),
+      activatesOn: Events.SetupMetadata,
       activate: () =>
         contributes(Capabilities.Metadata, {
           id: CollectionType.typename,
@@ -96,12 +102,12 @@ export const SpacePlugin = ({
         contributes(DeckCapabilities.ComplementaryPanel, {
           id: 'settings',
           label: ['settings panel label', { ns: SPACE_PLUGIN }],
-          icon: 'ph--gear--regular',
+          icon: 'ph--sliders--regular',
         }),
     }),
     defineModule({
       id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupClient,
+      activatesOn: ClientEvents.SetupSchema,
       activate: () => contributes(ClientCapabilities.Schema, [CollectionType]),
     }),
     defineModule({
@@ -111,13 +117,13 @@ export const SpacePlugin = ({
     }),
     defineModule({
       id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.Startup,
+      activatesOn: Events.SetupSurfaces,
       activate: () => ReactSurface({ createInvitationUrl }),
     }),
     defineModule({
       id: `${meta.id}/module/intent-resolver`,
       activatesOn: Events.SetupIntents,
-      activate: (context) => IntentResolver({ createInvitationUrl, context }),
+      activate: (context) => IntentResolver({ createInvitationUrl, context, observability }),
     }),
     defineModule({
       id: `${meta.id}/module/app-graph-builder`,
@@ -141,7 +147,6 @@ export const SpacePlugin = ({
       activatesOn: allOf(
         Events.DispatcherReady,
         Events.LayoutReady,
-        Events.LocationReady,
         Events.AppGraphReady,
         AttentionEvents.AttentionReady,
         SpaceEvents.StateReady,

package/src/capabilities/app-graph-builder.ts

@@ -46,8 +46,10 @@ export default (context: PluginsContext) => {
     cacheable: ['label', 'role'],
     properties: {
       label: ['spaces label', { ns: SPACE_PLUGIN }],
+      icon: 'ph--planet--regular',
       testId: 'spacePlugin.spaces',
       role: 'branch',
+      disposition: 'collection',
       disabled: true,
       childrenPersistenceClass: 'echo',
       onRearrangeChildren: async (nextOrder: Space[]) => {
@@ -79,7 +81,7 @@ export default (context: PluginsContext) => {
     // Primary actions.
     createExtension({
       id: `${SPACE_PLUGIN}/primary-actions`,
-      disposition: 'hoist',
+      position: 'hoist',
       filter: (node): node is Node<null> => node.id === 'root',
       actions: () => [
         {
@@ -114,7 +116,7 @@ export default (context: PluginsContext) => {
     // Create spaces group node.
     createExtension({
       id: `${SPACE_PLUGIN}/root`,
-      disposition: 'hoist',
+      position: 'hoist',
       filter: (node): node is Node<null> => node.id === 'root',
       connector: () => [spacesNode],
       resolver: ({ id }) => (id === SPACES ? spacesNode : undefined),
@@ -329,7 +331,6 @@ export default (context: PluginsContext) => {
     createExtension({
       id: `${SPACE_PLUGIN}/settings-for-subject`,
       resolver: ({ id }) => {
-        // TODO(Zan): Find util (or make one).
         if (!id.endsWith('~settings')) {
           return;
         }

package/src/capabilities/capabilities.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { defineCapability } from '@dxos/app-framework';
+import { defineCapability, type Label } from '@dxos/app-framework';
 import { type DeepReadonly } from '@dxos/util';
 
 import { SPACE_PLUGIN } from '../meta';
@@ -11,6 +11,9 @@ import { type PluginState } from '../types';
 export namespace SpaceCapabilities {
   export const State = defineCapability<DeepReadonly<PluginState>>(`${SPACE_PLUGIN}/capability/state`);
   export const MutableState = defineCapability<PluginState>(`${SPACE_PLUGIN}/capability/state`);
+
+  export type SpaceSettingsPanel = { id: string; label: Label };
+  export const SettingsPanel = defineCapability<SpaceSettingsPanel>(`${SPACE_PLUGIN}/capability/settings-panel`);
 }
 
 // TODO(wittjosiah): Factor out.