@dxos/plugin-observability 0.8.4-main.84f28bd → 0.8.4-main.a4bbb77

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-observability",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.a4bbb77",
   "description": "DXOS app framework plugin for hooking up app observability",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,21 +10,23 @@
   "type": "module",
   "exports": {
     ".": {
+      "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
     "./types": {
-      "types": "./dist/types/src/types.d.ts",
-      "browser": "./dist/lib/browser/types.mjs",
-      "node": "./dist/lib/node-esm/types.mjs"
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "browser": "./dist/lib/browser/types/index.mjs",
+      "node": "./dist/lib/node-esm/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
       "types": [
-        "dist/types/src/types.d.ts"
+        "dist/types/src/types/index.d.ts"
       ]
     }
   },
@@ -34,44 +36,44 @@
   ],
   "dependencies": {
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "effect": "3.16.13",
+    "@preact/signals-core": "^1.12.1",
+    "effect": "3.18.3",
     "localforage": "^1.10.0",
-    "@dxos/app-framework": "0.8.4-main.84f28bd",
-    "@dxos/async": "0.8.4-main.84f28bd",
-    "@dxos/echo": "0.8.4-main.84f28bd",
-    "@dxos/live-object": "0.8.4-main.84f28bd",
-    "@dxos/invariant": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/context": "0.8.4-main.84f28bd",
-    "@dxos/local-storage": "0.8.4-main.84f28bd",
-    "@dxos/log": "0.8.4-main.84f28bd",
-    "@dxos/observability": "0.8.4-main.84f28bd",
-    "@dxos/plugin-graph": "0.8.4-main.84f28bd",
-    "@dxos/protocols": "0.8.4-main.84f28bd",
-    "@dxos/react-client": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-form": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-stack": "0.8.4-main.84f28bd",
-    "@dxos/util": "0.8.4-main.84f28bd"
+    "@dxos/app-framework": "0.8.4-main.a4bbb77",
+    "@dxos/async": "0.8.4-main.a4bbb77",
+    "@dxos/context": "0.8.4-main.a4bbb77",
+    "@dxos/echo-schema": "0.8.4-main.a4bbb77",
+    "@dxos/invariant": "0.8.4-main.a4bbb77",
+    "@dxos/live-object": "0.8.4-main.a4bbb77",
+    "@dxos/log": "0.8.4-main.a4bbb77",
+    "@dxos/observability": "0.8.4-main.a4bbb77",
+    "@dxos/local-storage": "0.8.4-main.a4bbb77",
+    "@dxos/plugin-graph": "0.8.4-main.a4bbb77",
+    "@dxos/protocols": "0.8.4-main.a4bbb77",
+    "@dxos/echo": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-form": "0.8.4-main.a4bbb77",
+    "@dxos/react-client": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-stack": "0.8.4-main.a4bbb77",
+    "@dxos/util": "0.8.4-main.a4bbb77"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.38.0",
-    "@effect/platform": "0.88.0",
-    "@types/react": "~18.2.0",
-    "react": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/storybook-utils": "0.8.4-main.84f28bd"
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
+    "@types/react": "~19.2.0",
+    "react": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77",
+    "@dxos/storybook-utils": "0.8.4-main.a4bbb77"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-theme": "0.8.4-main.84f28bd"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.a4bbb77",
+    "@dxos/react-ui-theme": "0.8.4-main.a4bbb77"
   },
   "publishConfig": {
     "access": "public"

package/src/ObservabilityPlugin.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { allOf, Capabilities, contributes, defineModule, definePlugin, Events } from '@dxos/app-framework';
+import { Capabilities, Events, allOf, contributes, defineModule, definePlugin } from '@dxos/app-framework';
 import { type Observability } from '@dxos/observability';
 
 import {
@@ -14,54 +14,57 @@ import {
   ObservabilityState,
   ReactSurface,
 } from './capabilities';
-import { ObservabilityEvents, ClientReadyEvent } from './events';
+import { ClientReadyEvent, ObservabilityEvents } from './events';
 import { meta } from './meta';
 import { translations } from './translations';
 
-export const ObservabilityPlugin = (options: { namespace: string; observability: () => Promise<Observability> }) =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/observability`,
-      activatesOn: Events.Startup,
-      activate: async () => contributes(ObservabilityCapabilities.Observability, await options.observability()),
-    }),
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: ObservabilitySettings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/state`,
-      activatesOn: Events.Startup,
-      activatesAfter: [ObservabilityEvents.StateReady],
-      activate: () => ObservabilityState({ namespace: options.namespace }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: (context) => IntentResolver({ context, namespace: options.namespace }),
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      activate: ReactSurface,
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/client-ready`,
-      activatesOn: allOf(Events.DispatcherReady, ObservabilityEvents.StateReady, ClientReadyEvent),
-      activate: async (context) => {
-        const observability = await options.observability();
-        return ClientReady({ context, observability, namespace: options.namespace });
-      },
-    }),
-  ]);
+export type ObservabilityPluginOptions = {
+  namespace: string;
+  observability: () => Promise<Observability>;
+};
+
+export const ObservabilityPlugin = definePlugin<ObservabilityPluginOptions>(meta, ({ namespace, observability }) => [
+  defineModule({
+    id: `${meta.id}/module/observability`,
+    activatesOn: Events.Startup,
+    activate: async () => contributes(ObservabilityCapabilities.Observability, await observability()),
+  }),
+  defineModule({
+    id: `${meta.id}/module/settings`,
+    activatesOn: Events.SetupSettings,
+    activate: ObservabilitySettings,
+  }),
+  defineModule({
+    id: `${meta.id}/module/state`,
+    activatesOn: Events.Startup,
+    activatesAfter: [ObservabilityEvents.StateReady],
+    activate: () => ObservabilityState({ namespace }),
+  }),
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, translations),
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: (context) => IntentResolver({ context, namespace }),
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    activate: ReactSurface,
+  }),
+  defineModule({
+    id: `${meta.id}/module/app-graph-builder`,
+    activatesOn: Events.SetupAppGraph,
+    activate: AppGraphBuilder,
+  }),
+  defineModule({
+    id: `${meta.id}/module/client-ready`,
+    activatesOn: allOf(Events.DispatcherReady, ObservabilityEvents.StateReady, ClientReadyEvent),
+    activate: async (context) => {
+      return ClientReady({ context, observability: await observability(), namespace });
+    },
+  }),
+]);

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

@@ -5,19 +5,20 @@
 import { Rx } from '@effect-rx/rx-react';
 import { Option, pipe } from 'effect';
 
-import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
-import { createExtension, ROOT_ID } from '@dxos/plugin-graph';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
+import { ROOT_ID, createExtension } from '@dxos/plugin-graph';
 
-import { OBSERVABILITY_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 // NOTE: Copied from @dxos/plugin-deck to break circular dependency.
 const ATTENDABLE_PATH_SEPARATOR = '~';
+
 const DECK_COMPANION_TYPE = 'dxos.org/plugin/deck/deck-companion';
 
-export default (context: PluginContext) =>
+export default (_context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
     createExtension({
-      id: `${OBSERVABILITY_PLUGIN}/help`,
+      id: `${meta.id}/help`,
       connector: (node) =>
         Rx.make((get) =>
           pipe(
@@ -30,7 +31,7 @@ export default (context: PluginContext) =>
                   type: DECK_COMPANION_TYPE,
                   data: null,
                   properties: {
-                    label: ['help label', { ns: OBSERVABILITY_PLUGIN }],
+                    label: ['help label', { ns: meta.id }],
                     icon: 'ph--question--regular',
                     disposition: 'hidden',
                     position: 'hoist',

package/src/capabilities/capabilities.ts

@@ -6,17 +6,18 @@ import { defineCapability } from '@dxos/app-framework';
 import { type Client } from '@dxos/client';
 import { type Observability } from '@dxos/observability';
 
-import { OBSERVABILITY_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 export namespace ObservabilityCapabilities {
   export type State = {
     group?: string;
     notified?: boolean;
   };
-  export const State = defineCapability<State>(`${OBSERVABILITY_PLUGIN}/capability/state`);
+  export const State = defineCapability<State>(`${meta.id}/capability/state`);
 
-  export const Observability = defineCapability<Observability>(`${OBSERVABILITY_PLUGIN}/capability/observability`);
+  export const Observability = defineCapability<Observability>(`${meta.id}/capability/observability`);
 }
 
 // NOTE: This is cloned from the client plugin to avoid circular dependencies.
+// TODO(burdon): Figure out how to share defs.
 export const ClientCapability = defineCapability<Client>('dxos.org/plugin/client/capability/client');

package/src/capabilities/client-ready.ts

@@ -4,18 +4,19 @@
 
 import {
   Capabilities,
-  contributes,
-  createIntent,
   LayoutAction,
-  SettingsAction,
   type PluginContext,
+  SettingsAction,
+  contributes,
+  createIntent,
 } from '@dxos/app-framework';
-import { setupTelemetryListeners, type Observability } from '@dxos/observability';
+import { type Observability, setupTelemetryListeners } from '@dxos/observability';
 
-import { ClientCapability, ObservabilityCapabilities } from './capabilities';
-import { OBSERVABILITY_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { ObservabilityAction } from '../types';
 
+import { ClientCapability, ObservabilityCapabilities } from './capabilities';
+
 type ClientReadyOptions = {
   context: PluginContext;
   namespace: string;
@@ -37,15 +38,15 @@ export default async ({ context, namespace, observability }: ClientReadyOptions)
         createIntent(LayoutAction.AddToast, {
           part: 'toast',
           subject: {
-            id: `${OBSERVABILITY_PLUGIN}/notice`,
-            title: ['observability toast label', { ns: OBSERVABILITY_PLUGIN }],
-            description: ['observability toast description', { ns: OBSERVABILITY_PLUGIN }],
+            id: `${meta.id}/notice`,
+            title: ['observability toast label', { ns: meta.id }],
+            description: ['observability toast description', { ns: meta.id }],
             duration: Infinity,
             icon: 'ph--info--regular',
-            actionLabel: ['observability toast action label', { ns: OBSERVABILITY_PLUGIN }],
-            actionAlt: ['observability toast action alt', { ns: OBSERVABILITY_PLUGIN }],
-            closeLabel: ['observability toast close label', { ns: OBSERVABILITY_PLUGIN }],
-            onAction: () => dispatch(createIntent(SettingsAction.Open, { plugin: OBSERVABILITY_PLUGIN })),
+            actionLabel: ['observability toast action label', { ns: meta.id }],
+            actionAlt: ['observability toast action alt', { ns: meta.id }],
+            closeLabel: ['observability toast close label', { ns: meta.id }],
+            onAction: () => dispatch(createIntent(SettingsAction.Open, { plugin: meta.id })),
           },
         }),
       );

package/src/capabilities/intent-resolver.ts

@@ -2,15 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createResolver, IntentAction, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, IntentAction, type PluginContext, contributes, createResolver } from '@dxos/app-framework';
 import { log } from '@dxos/log';
 import { getTelemetryIdentity, storeObservabilityDisabled } from '@dxos/observability';
 
-import { ClientCapability, ObservabilityCapabilities } from './capabilities';
 import { type ObservabilitySettingsProps } from '../components';
-import { OBSERVABILITY_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { ObservabilityAction } from '../types';
 
+import { ClientCapability, ObservabilityCapabilities } from './capabilities';
+
 export default ({ context, namespace }: { context: PluginContext; namespace: string }) =>
   contributes(Capabilities.IntentResolver, [
     createResolver({
@@ -26,7 +27,7 @@ export default ({ context, namespace }: { context: PluginContext; namespace: str
         const observability = context.getCapability(ObservabilityCapabilities.Observability);
         const settings = context
           .getCapability(Capabilities.SettingsStore)
-          .getStore<ObservabilitySettingsProps>(OBSERVABILITY_PLUGIN)!.value;
+          .getStore<ObservabilitySettingsProps>(meta.id)!.value;
         settings.enabled = state ?? !settings.enabled;
         observability.track({
           ...getTelemetryIdentity(client),

package/src/capabilities/react-surface.tsx

@@ -4,23 +4,23 @@
 
 import React from 'react';
 
-import { contributes, Capabilities, createSurface } from '@dxos/app-framework';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { SettingsStore } from '@dxos/local-storage';
 
 import { HelpContainer, ObservabilitySettings, type ObservabilitySettingsProps } from '../components';
-import { OBSERVABILITY_PLUGIN } from '../meta';
+import { meta } from '../meta';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
     createSurface({
-      id: OBSERVABILITY_PLUGIN,
+      id: meta.id,
       role: 'article',
       filter: (data): data is { subject: SettingsStore<ObservabilitySettingsProps> } =>
-        data.subject instanceof SettingsStore && data.subject.prefix === OBSERVABILITY_PLUGIN,
+        data.subject instanceof SettingsStore && data.subject.prefix === meta.id,
       component: ({ data: { subject } }) => <ObservabilitySettings settings={subject.value} />,
     }),
     createSurface({
-      id: `${OBSERVABILITY_PLUGIN}/help`,
+      id: `${meta.id}/help`,
       role: 'deck-companion--help',
       component: () => <HelpContainer />,
     }),

package/src/capabilities/state.ts

@@ -6,11 +6,12 @@ import { contributes } from '@dxos/app-framework';
 import { LocalStorageStore } from '@dxos/local-storage';
 import { getObservabilityGroup } from '@dxos/observability';
 
+import { meta } from '../meta';
+
 import { ObservabilityCapabilities } from './capabilities';
-import { OBSERVABILITY_PLUGIN } from '../meta';
 
 export default async ({ namespace }: { namespace: string }) => {
-  const state = new LocalStorageStore<ObservabilityCapabilities.State>(OBSERVABILITY_PLUGIN);
+  const state = new LocalStorageStore<ObservabilityCapabilities.State>(meta.id);
 
   state.prop({ key: 'notified', type: LocalStorageStore.bool({ allowUndefined: true }) });
 

package/src/components/FeedbackForm.tsx

@@ -8,13 +8,13 @@ import { getSnapshot } from '@dxos/echo-schema';
 import { IconButton, Input, useTranslation } from '@dxos/react-ui';
 import { FormProvider, useFormContext, useInputProps } from '@dxos/react-ui-form';
 
-import { OBSERVABILITY_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { UserFeedback } from '../types';
 
 const defaultValues: UserFeedback = { message: '' };
 
 const FormContent = () => {
-  const { t } = useTranslation(OBSERVABILITY_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const { handleSave, canSave } = useFormContext<UserFeedback>();
 
   const messageProps = useInputProps(['message']);

package/src/components/HelpContainer.tsx

@@ -5,12 +5,13 @@
 import { pipe } from 'effect';
 import React, { useCallback } from 'react';
 
-import { chain, createIntent, LayoutAction, useIntentDispatcher } from '@dxos/app-framework';
+import { LayoutAction, chain, createIntent, useIntentDispatcher } from '@dxos/app-framework';
 
-import { FeedbackForm } from './FeedbackForm';
-import { OBSERVABILITY_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { ObservabilityAction, type UserFeedback } from '../types';
 
+import { FeedbackForm } from './FeedbackForm';
+
 export const HelpContainer = () => {
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
@@ -23,11 +24,11 @@ export const HelpContainer = () => {
           chain(LayoutAction.AddToast, {
             part: 'toast',
             subject: {
-              id: `${OBSERVABILITY_PLUGIN}/feedback-success`,
+              id: `${meta.id}/feedback-success`,
               icon: 'ph--paper-plane-tilt--regular',
               duration: 3000,
-              title: ['feedback toast label', { ns: OBSERVABILITY_PLUGIN }],
-              description: ['feedback toast description', { ns: OBSERVABILITY_PLUGIN }],
+              title: ['feedback toast label', { ns: meta.id }],
+              description: ['feedback toast description', { ns: meta.id }],
               closeLabel: ['close label', { ns: 'os' }],
             },
           }),

package/src/components/ObservabilitySettings.tsx

@@ -7,9 +7,9 @@ import React from 'react';
 
 import { createIntent, useIntentDispatcher } from '@dxos/app-framework';
 import { Input, Message, useTranslation } from '@dxos/react-ui';
-import { DeprecatedFormContainer, DeprecatedFormInput } from '@dxos/react-ui-form';
+import { ControlGroup, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
 
-import { OBSERVABILITY_PLUGIN } from '../meta';
+import { meta } from '../meta';
 import { ObservabilityAction } from '../types';
 
 export const ObservabilitySettingsSchema = Schema.mutable(
@@ -25,24 +25,24 @@ export const ObservabilitySettingsSchema = Schema.mutable(
 export type ObservabilitySettingsProps = Schema.Schema.Type<typeof ObservabilitySettingsSchema>;
 
 export const ObservabilitySettings = ({ settings }: { settings: ObservabilitySettingsProps }) => {
-  const { t } = useTranslation(OBSERVABILITY_PLUGIN);
+  const { t } = useTranslation(meta.id);
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   return (
-    <DeprecatedFormContainer>
-      <DeprecatedFormInput
-        label={t('observability enabled label')}
-        secondary={
-          <Message.Root valence='info'>
-            <Message.Content>{t('observability description')}</Message.Content>
-          </Message.Root>
-        }
-      >
-        <Input.Switch
-          checked={settings.enabled}
-          onCheckedChange={(checked) => dispatch(createIntent(ObservabilityAction.Toggle, { state: !!checked }))}
-        />
-      </DeprecatedFormInput>
-    </DeprecatedFormContainer>
+    <ControlPage>
+      <ControlSection title={t('settings title', { ns: meta.id })}>
+        <Message.Root valence='info' classNames='container-max-width mbe-cardSpacingBlock'>
+          <Message.Content>{t('observability description')}</Message.Content>
+        </Message.Root>
+        <ControlGroup>
+          <ControlItemInput title={t('observability enabled label')}>
+            <Input.Switch
+              checked={settings.enabled}
+              onCheckedChange={(checked) => dispatch(createIntent(ObservabilityAction.Toggle, { state: !!checked }))}
+            />
+          </ControlItemInput>
+        </ControlGroup>
+      </ControlSection>
+    </ControlPage>
   );
 };

package/src/events.ts

@@ -2,12 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { defineEvent, Events } from '@dxos/app-framework';
+import { Events, defineEvent } from '@dxos/app-framework';
 
-import { OBSERVABILITY_PLUGIN } from './meta';
+import { meta } from './meta';
 
 export namespace ObservabilityEvents {
-  export const StateReady = Events.createStateEvent(OBSERVABILITY_PLUGIN);
+  export const StateReady = Events.createStateEvent(meta.id);
 }
 
 // NOTE: This is cloned from the client plugin to avoid circular dependencies.

package/src/meta.ts

@@ -4,10 +4,8 @@
 
 import { type PluginMeta } from '@dxos/app-framework';
 
-export const OBSERVABILITY_PLUGIN = 'dxos.org/plugin/observability';
-
 export const meta: PluginMeta = {
-  id: OBSERVABILITY_PLUGIN,
+  id: 'dxos.org/plugin/observability',
   name: 'Telemetry',
   icon: 'ph--eye--regular',
 };

package/src/translations.ts

@@ -11,6 +11,7 @@ export const translations = [
     'en-US': {
       [meta.id]: {
         'plugin name': 'Telemetry',
+        'settings title': 'Telemetry settings',
         'observability toast label': 'Privacy Notice',
         'observability toast description':
           'Composer collects usage and performance metrics to improve the product. No user data is collected.',

package/src/types/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './schema';

package/src/{types.ts → types/schema.ts}

@@ -6,7 +6,7 @@ import { Schema } from 'effect';
 
 import { Type } from '@dxos/echo';
 
-import { OBSERVABILITY_PLUGIN } from './meta';
+import { meta } from '../meta';
 
 const nonEmpty = <S extends Schema.Schema.Any>(field: string) =>
   Schema.nonEmptyString<S>({ message: () => `Missing field: ${field}` });
@@ -20,10 +20,8 @@ export const UserFeedback = Schema.Struct({
 
 export type UserFeedback = Schema.Schema.Type<typeof UserFeedback>;
 
-const OBSERVABILITY_ACTION = `${OBSERVABILITY_PLUGIN}/action`;
-
 export namespace ObservabilityAction {
-  export class Toggle extends Schema.TaggedClass<Toggle>()(`${OBSERVABILITY_ACTION}/toggle`, {
+  export class Toggle extends Schema.TaggedClass<Toggle>()(`${meta.id}/action/toggle`, {
     input: Schema.Struct({
       state: Schema.optional(Schema.Boolean),
     }),
@@ -31,7 +29,7 @@ export namespace ObservabilityAction {
   }) {}
 
   export class CaptureUserFeedback extends Schema.TaggedClass<CaptureUserFeedback>()(
-    `${OBSERVABILITY_ACTION}/capture-feedback`,
+    `${meta.id}/action/capture-feedback`,
     {
       input: UserFeedback,
       output: Schema.Void,
@@ -39,7 +37,7 @@ export namespace ObservabilityAction {
   ) {}
 
   /** Base intent for sending events. */
-  export class BaseSendEvent extends Schema.TaggedClass<BaseSendEvent>()(`${OBSERVABILITY_ACTION}/send-event`, {
+  export class BaseSendEvent extends Schema.TaggedClass<BaseSendEvent>()(`${meta.id}/action/send-event`, {
     input: Schema.Struct({
       name: Schema.String,
       properties: Schema.optional(Schema.Object),
@@ -48,7 +46,7 @@ export namespace ObservabilityAction {
   }) {}
 
   /** Intent with strict types for first-party events. */
-  export class SendEvent extends Schema.TaggedClass<SendEvent>()(`${OBSERVABILITY_ACTION}/send-event`, {
+  export class SendEvent extends Schema.TaggedClass<SendEvent>()(`${meta.id}/action/send-event`, {
     // NOTE: Sort alphabetically by name.
     input: Schema.Union(
       Schema.Struct({
@@ -115,6 +113,21 @@ export namespace ObservabilityAction {
           version: Schema.optional(Schema.String),
         }),
       }),
+      Schema.Struct({
+        name: Schema.Literal('space.schema.use'),
+        properties: Schema.Struct({
+          spaceId: Type.SpaceId,
+          typename: Schema.String,
+        }),
+      }),
+      Schema.Struct({
+        name: Schema.Literal('space.schema.add'),
+        properties: Schema.Struct({
+          spaceId: Type.SpaceId,
+          objectId: Schema.String,
+          typename: Schema.String,
+        }),
+      }),
       Schema.Struct({
         name: Schema.Literal('space.object.add'),
         properties: Schema.Struct({