@dxos/plugin-observability 0.8.4-main.21d9917 → 0.8.4-main.2244d791bb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-observability",
-  "version": "0.8.4-main.21d9917",
+  "version": "0.8.4-main.2244d791bb",
   "description": "DXOS app framework plugin for hooking up app observability",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,44 +45,46 @@
     "src"
   ],
   "dependencies": {
-    "@effect-atom/atom": "^0.4.13",
-    "@effect-atom/atom-react": "^0.4.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "effect": "3.19.16",
     "localforage": "^1.10.0",
-    "@dxos/app-framework": "0.8.4-main.21d9917",
-    "@dxos/async": "0.8.4-main.21d9917",
-    "@dxos/context": "0.8.4-main.21d9917",
-    "@dxos/echo": "0.8.4-main.21d9917",
-    "@dxos/effect": "0.8.4-main.21d9917",
-    "@dxos/invariant": "0.8.4-main.21d9917",
-    "@dxos/observability": "0.8.4-main.21d9917",
-    "@dxos/log": "0.8.4-main.21d9917",
-    "@dxos/operation": "0.8.4-main.21d9917",
-    "@dxos/plugin-graph": "0.8.4-main.21d9917",
-    "@dxos/protocols": "0.8.4-main.21d9917",
-    "@dxos/react-ui-form": "0.8.4-main.21d9917",
-    "@dxos/react-ui-stack": "0.8.4-main.21d9917",
-    "@dxos/util": "0.8.4-main.21d9917",
-    "@dxos/react-client": "0.8.4-main.21d9917"
+    "@dxos/app-framework": "0.8.4-main.2244d791bb",
+    "@dxos/app-toolkit": "0.8.4-main.2244d791bb",
+    "@dxos/async": "0.8.4-main.2244d791bb",
+    "@dxos/context": "0.8.4-main.2244d791bb",
+    "@dxos/invariant": "0.8.4-main.2244d791bb",
+    "@dxos/echo": "0.8.4-main.2244d791bb",
+    "@dxos/effect": "0.8.4-main.2244d791bb",
+    "@dxos/log": "0.8.4-main.2244d791bb",
+    "@dxos/operation": "0.8.4-main.2244d791bb",
+    "@dxos/observability": "0.8.4-main.2244d791bb",
+    "@dxos/plugin-graph": "0.8.4-main.2244d791bb",
+    "@dxos/protocols": "0.8.4-main.2244d791bb",
+    "@dxos/react-client": "0.8.4-main.2244d791bb",
+    "@dxos/react-hooks": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-form": "0.8.4-main.2244d791bb",
+    "@dxos/react-ui-stack": "0.8.4-main.2244d791bb",
+    "@dxos/util": "0.8.4-main.2244d791bb"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
     "@types/react": "~19.2.7",
     "react": "~19.2.3",
     "vite": "7.1.9",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917",
-    "@dxos/storybook-utils": "0.8.4-main.21d9917"
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/storybook-utils": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.4.6",
-    "@effect/platform": "0.93.6",
-    "effect": "3.19.11",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.19.16",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.21d9917",
-    "@dxos/ui-theme": "0.8.4-main.21d9917"
+    "@dxos/react-ui": "0.8.4-main.2244d791bb",
+    "@dxos/ui-theme": "0.8.4-main.2244d791bb"
   },
   "publishConfig": {
     "access": "public"

package/src/ObservabilityPlugin.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { ActivationEvent, Capability, Common, Plugin } from '@dxos/app-framework';
+import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { type Observability } from '@dxos/observability';
 
 import {
@@ -22,13 +23,16 @@ import { ObservabilityCapabilities } from './types';
 
 export type ObservabilityPluginOptions = {
   namespace: string;
-  observability: () => Promise<Observability>;
+  observability: () => Promise<Observability.Observability>;
 };
 
 export const ObservabilityPlugin = Plugin.define<ObservabilityPluginOptions>(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations }),
   Plugin.addModule(({ namespace, observability }) => ({
     id: 'observability',
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activate: () =>
       Effect.gen(function* () {
         const obs = yield* Effect.tryPromise(() => observability());
@@ -36,27 +40,24 @@ export const ObservabilityPlugin = Plugin.define<ObservabilityPluginOptions>(met
       }),
   })),
   Plugin.addModule({
-    activatesOn: Common.ActivationEvent.SetupSettings,
+    activatesOn: AppActivationEvents.SetupSettings,
     activate: ObservabilitySettings,
   }),
   Plugin.addModule(({ namespace }) => ({
     id: Capability.getModuleTag(ObservabilityState),
-    activatesOn: Common.ActivationEvent.Startup,
+    activatesOn: ActivationEvents.Startup,
     activatesAfter: [ObservabilityEvents.StateReady],
     activate: () => ObservabilityState({ namespace }),
   })),
-  Common.Plugin.addTranslationsModule({ translations }),
   Plugin.addModule(({ namespace }) => ({
     id: Capability.getModuleTag(OperationResolver),
-    activatesOn: Common.ActivationEvent.SetupOperationResolver,
+    activatesOn: ActivationEvents.SetupOperationResolver,
     activate: () => OperationResolver({ namespace }),
   })),
-  Common.Plugin.addSurfaceModule({ activate: ReactSurface }),
-  Common.Plugin.addAppGraphModule({ activate: AppGraphBuilder }),
   Plugin.addModule(({ namespace, observability }) => ({
     id: Capability.getModuleTag(ClientReady),
     activatesOn: ActivationEvent.allOf(
-      Common.ActivationEvent.OperationInvokerReady,
+      ActivationEvents.OperationInvokerReady,
       ObservabilityEvents.StateReady,
       ClientReadyEvent,
     ),

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

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
 
 import { meta } from '../../meta';
@@ -37,6 +38,6 @@ export default Capability.makeModule(
       }),
     ]);
 
-    return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
   }),
 );

package/src/capabilities/client-ready/client-ready.ts

@@ -4,23 +4,24 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common, SettingsOperation } from '@dxos/app-framework';
-import { type Observability, setupTelemetryListeners } from '@dxos/observability';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { LayoutOperation, SettingsOperation } from '@dxos/app-toolkit';
+import { type Observability, ObservabilityProvider } from '@dxos/observability';
 
 import { meta } from '../../meta';
 import { ClientCapability, ObservabilityCapabilities, ObservabilityOperation } from '../../types';
 
-type ClientReadyOptions = {
+export type ClientReadyOptions = {
   namespace: string;
-  observability: Observability;
+  observability: Observability.Observability;
 };
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* (props?: ClientReadyOptions) {
-    const { namespace, observability } = props!;
-    const manager = yield* Capability.get(Common.Capability.PluginManager);
-    const { invokePromise } = yield* Capability.get(Common.Capability.OperationInvoker);
-    const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+    const { observability } = props!;
+    const manager = yield* Capability.get(Capabilities.PluginManager);
+    const { invokePromise } = yield* Capability.get(Capabilities.OperationInvoker);
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
     const stateAtom = yield* Capability.get(ObservabilityCapabilities.State);
     const client = yield* Capability.get(ClientCapability);
 
@@ -30,7 +31,7 @@ export default Capability.makeModule(
         environment && environment !== 'ci' && !environment.endsWith('.local') && !environment.endsWith('.lan');
       const state = registry.get(stateAtom);
       if (!state.notified && notify) {
-        await invokePromise(Common.LayoutOperation.AddToast, {
+        await invokePromise(LayoutOperation.AddToast, {
           id: `${meta.id}/notice`,
           title: ['observability toast label', { ns: meta.id }],
           description: ['observability toast description', { ns: meta.id }],
@@ -49,7 +50,7 @@ export default Capability.makeModule(
     // Ensure errors are tagged with enabled plugins to help with reproductions.
     const enabledPlugins = manager.getEnabled();
     for (const plugin of enabledPlugins) {
-      observability?.setTag(`pluginEnabled-${plugin}`, 'true', 'errors');
+      observability.setTags({ [`pluginEnabled-${plugin}`]: 'true' }, 'errors');
     }
 
     yield* Effect.tryPromise(() =>
@@ -62,18 +63,11 @@ export default Capability.makeModule(
       }),
     );
 
-    // Start client observability (i.e. not running as shared worker)
-    // TODO(nf): how to prevent multiple instances for single shared worker?
-    const cleanup = setupTelemetryListeners(namespace, client, observability);
-
-    yield* Effect.tryPromise(() =>
-      Promise.all([
-        observability.setIdentityTags(client.services.services),
-        observability.startRuntimeMetrics(client),
-        observability.startNetworkMetrics(client.services.services),
-        observability.startSpacesMetrics(client, namespace),
-      ]),
-    );
+    // Add client data providers.
+    yield* observability.addDataProvider(ObservabilityProvider.Client.identityProvider(client.services.services));
+    yield* observability.addDataProvider(ObservabilityProvider.Client.networkMetricsProvider(client.services.services));
+    yield* observability.addDataProvider(ObservabilityProvider.Client.runtimeMetricsProvider(client.services.services));
+    yield* observability.addDataProvider(ObservabilityProvider.Client.spacesMetricsProvider(client));
 
     if (client.halo.identity.get()) {
       yield* Effect.tryPromise(() => sendPrivacyNotice());
@@ -81,17 +75,11 @@ export default Capability.makeModule(
       const subscription = client.halo.identity.subscribe(async (identity) => {
         if (identity && observability) {
           await sendPrivacyNotice();
-          await observability.setIdentityTags(client.services.services);
           subscription.unsubscribe();
         }
       });
     }
 
-    return Capability.contributes(ObservabilityCapabilities.Observability, observability, () =>
-      Effect.tryPromise(async () => {
-        cleanup();
-        await observability.close();
-      }),
-    );
+    return Capability.contributes(ObservabilityCapabilities.Observability, observability, () => observability.close());
   }),
 );

package/src/capabilities/client-ready/index.ts

@@ -4,4 +4,6 @@
 
 import { Capability } from '@dxos/app-framework';
 
-export const ClientReady = Capability.lazy('ClientReady', () => import('./client-ready'));
+import { type ClientReadyOptions } from './client-ready';
+
+export const ClientReady = Capability.lazy<ClientReadyOptions>('ClientReady', () => import('./client-ready'));

package/src/capabilities/operation-resolver/operation-resolver.ts

@@ -4,46 +4,47 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { getTelemetryIdentity, storeObservabilityDisabled } from '@dxos/observability';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Observability } from '@dxos/observability';
 import { OperationResolver } from '@dxos/operation';
 
 import { type ObservabilitySettingsProps } from '../../components';
 import { meta } from '../../meta';
-import { ClientCapability, ObservabilityCapabilities, ObservabilityOperation } from '../../types';
+import { ObservabilityCapabilities, ObservabilityOperation } from '../../types';
 
 export default Capability.makeModule(
   Effect.fnUntraced(function* (props?: { namespace: string }) {
     const { namespace } = props!;
     const capabilities = yield* Capability.Service;
 
-    return Capability.contributes(Common.Capability.OperationResolver, [
+    return Capability.contributes(Capabilities.OperationResolver, [
       //
       // Toggle
       //
       OperationResolver.make({
         operation: ObservabilityOperation.Toggle,
         handler: Effect.fnUntraced(function* (input) {
-          const client = yield* Capability.get(ClientCapability);
           const observability = yield* Capability.get(ObservabilityCapabilities.Observability);
-          const registry = capabilities.get(Common.Capability.AtomRegistry);
-          const allSettings = capabilities.getAll(Common.Capability.Settings);
-          const settingsObj = allSettings.find((s: Common.Capability.Settings) => s.prefix === meta.id);
+          const registry = capabilities.get(Capabilities.AtomRegistry);
+          const allSettings = capabilities.getAll(AppCapabilities.Settings);
+          const settingsObj = allSettings.find((s: AppCapabilities.Settings) => s.prefix === meta.id);
           if (!settingsObj) {
             return false;
           }
           const settings = registry.get(settingsObj.atom) as ObservabilitySettingsProps;
           const newEnabled = input.state ?? !settings.enabled;
           registry.set(settingsObj.atom, { ...settings, enabled: newEnabled });
-          observability.track({
-            ...getTelemetryIdentity(client),
-            action: 'observability.toggle',
-            properties: {
-              enabled: newEnabled,
-            },
+          observability.events.captureEvent('observability.toggle', {
+            enabled: newEnabled,
           });
-          observability.setMode(newEnabled ? 'basic' : 'disabled');
-          yield* Effect.promise(() => storeObservabilityDisabled(namespace, !newEnabled));
+
+          if (newEnabled) {
+            yield* observability.enable();
+          } else {
+            yield* observability.disable();
+          }
+          yield* Effect.promise(() => Observability.storeObservabilityDisabled(namespace, !newEnabled));
           return newEnabled;
         }),
       }),
@@ -56,14 +57,8 @@ export default Capability.makeModule(
         handler: Effect.fnUntraced(function* (input) {
           // NOTE: This is to ensure that events fired before observability is ready are still sent.
           const observability = yield* Capability.waitFor(ObservabilityCapabilities.Observability);
-          const client = yield* Capability.get(ClientCapability);
           const properties = input.properties ?? {};
-
-          observability.track({
-            ...getTelemetryIdentity(client),
-            action: input.name,
-            properties,
-          });
+          observability.events.captureEvent(input.name, properties);
         }),
       }),
 
@@ -74,7 +69,7 @@ export default Capability.makeModule(
         operation: ObservabilityOperation.CaptureUserFeedback,
         handler: Effect.fnUntraced(function* (input) {
           const observability = yield* Capability.get(ObservabilityCapabilities.Observability);
-          observability.captureUserFeedback(input.message);
+          observability.feedback.captureUserFeedback({ message: input.message, includeLogs: input.includeLogs });
         }),
       }),
     ]);

package/src/capabilities/react-surface/react-surface.tsx

@@ -5,26 +5,27 @@
 import * as Effect from 'effect/Effect';
 import React from 'react';
 
-import { Capability, Common } from '@dxos/app-framework';
-import { useSettingsState } from '@dxos/app-framework/react';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useSettingsState } from '@dxos/app-framework/ui';
+import { AppCapabilities } from '@dxos/app-toolkit';
 
 import { HelpContainer, ObservabilitySettings, type ObservabilitySettingsProps } from '../../components';
 import { meta } from '../../meta';
 
 export default Capability.makeModule(() =>
   Effect.succeed(
-    Capability.contributes(Common.Capability.ReactSurface, [
-      Common.createSurface({
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
         id: meta.id,
         role: 'article',
-        filter: (data): data is { subject: Common.Capability.Settings } =>
-          Common.Capability.isSettings(data.subject) && data.subject.prefix === meta.id,
+        filter: (data): data is { subject: AppCapabilities.Settings } =>
+          AppCapabilities.isSettings(data.subject) && data.subject.prefix === meta.id,
         component: ({ data: { subject } }) => {
           const { settings, updateSettings } = useSettingsState<ObservabilitySettingsProps>(subject.atom);
           return <ObservabilitySettings settings={settings} onSettingsChange={updateSettings} />;
         },
       }),
-      Common.createSurface({
+      Surface.create({
         id: `${meta.id}/help`,
         role: 'deck-companion--help',
         component: () => <HelpContainer />,

package/src/capabilities/settings/settings.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
 import { ObservabilitySettingsSchema } from '../../components';
@@ -23,7 +24,7 @@ export default Capability.makeModule(() =>
 
     return [
       Capability.contributes(ObservabilityCapabilities.Settings, settingsAtom),
-      Capability.contributes(Common.Capability.Settings, {
+      Capability.contributes(AppCapabilities.Settings, {
         prefix: meta.id,
         schema: ObservabilitySettingsSchema,
         atom: settingsAtom,

package/src/capabilities/state/state.ts

@@ -4,9 +4,9 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { createKvsStore } from '@dxos/effect';
-import { getObservabilityGroup } from '@dxos/observability';
+import { Observability } from '@dxos/observability';
 
 import { meta } from '../../meta';
 import { ObservabilityCapabilities } from '../../types';
@@ -21,8 +21,8 @@ export default Capability.makeModule(
     });
 
     // NOTE: Group is set at runtime, not persisted.
-    const group = yield* Effect.tryPromise(() => getObservabilityGroup(namespace));
-    const registry = yield* Capability.get(Common.Capability.AtomRegistry);
+    const group = yield* Effect.tryPromise(() => Observability.getObservabilityGroup(namespace));
+    const registry = yield* Capability.get(Capabilities.AtomRegistry);
     registry.set(stateAtom, { ...registry.get(stateAtom), group });
 
     return Capability.contributes(ObservabilityCapabilities.State, stateAtom);

package/src/cli/plugin.ts

@@ -4,7 +4,8 @@
 
 import * as Effect from 'effect/Effect';
 
-import { Capability, Common, Plugin } from '@dxos/app-framework';
+import { Capabilities, Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
 import { OperationResolver } from '@dxos/operation';
 
 import { meta } from '../meta';
@@ -12,10 +13,10 @@ import { ObservabilityOperation } from '../types';
 
 // TODO(wittjosiah): Hook up.
 export const ObservabilityPlugin = Plugin.define(meta).pipe(
-  Common.Plugin.addOperationResolverModule({
+  AppPlugin.addOperationResolverModule({
     activate: () =>
       Effect.succeed(
-        Capability.contributes(Common.Capability.OperationResolver, [
+        Capability.contributes(Capabilities.OperationResolver, [
           OperationResolver.make({
             operation: ObservabilityOperation.SendEvent,
             handler: () => Effect.void,

package/src/components/FeedbackForm.stories.tsx

@@ -13,7 +13,7 @@ import { FeedbackForm } from './FeedbackForm';
 const meta = {
   title: 'plugins/plugin-observability/FeedbackForm',
   component: FeedbackForm,
-  decorators: [withTheme, withLayout({ layout: 'column' })],
+  decorators: [withTheme(), withLayout({ layout: 'column' })],
   parameters: {
     layout: 'fullscreen',
     translations,

package/src/components/FeedbackForm.tsx

@@ -5,21 +5,26 @@
 import React from 'react';
 
 import { useTranslation } from '@dxos/react-ui';
-import { Form, type FormRootProps } from '@dxos/react-ui-form';
+import { Form, type FormRootProps, type FormSubmitProps } from '@dxos/react-ui-form';
 
 import { meta } from '../meta';
 import { UserFeedback } from '../types';
 
-export type FeedbackFormProps = Pick<FormRootProps<UserFeedback>, 'onSave'>;
+export type FeedbackFormProps = Pick<FormRootProps<UserFeedback>, 'onSave'> & Pick<FormSubmitProps, 'disabled'>;
 
-export const FeedbackForm = ({ onSave }: FeedbackFormProps) => {
+const defaultValues: UserFeedback = {
+  message: '',
+  includeLogs: true,
+};
+
+export const FeedbackForm = ({ onSave, disabled }: FeedbackFormProps) => {
   const { t } = useTranslation(meta.id);
 
   return (
-    <Form.Root schema={UserFeedback} onSave={onSave}>
+    <Form.Root schema={UserFeedback} defaultValues={defaultValues} onSave={onSave}>
       <Form.Content>
         <Form.FieldSet />
-        <Form.Submit icon='ph--paper-plane-tilt--regular' label={t('send feedback label')} />
+        <Form.Submit icon='ph--paper-plane-tilt--regular' label={t('send feedback label')} disabled={disabled} />
       </Form.Content>
     </Form.Root>
   );

package/src/components/HelpContainer.tsx

@@ -2,25 +2,45 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { useCallback } from 'react';
+import * as Effect from 'effect/Effect';
+import React, { useCallback, useState } from 'react';
 
-import { Common } from '@dxos/app-framework';
-import { useOperationInvoker } from '@dxos/app-framework/react';
+import { useCapability, useOperationInvoker } from '@dxos/app-framework/ui';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { runAndForwardErrors } from '@dxos/effect';
+import { useAsyncEffect } from '@dxos/react-hooks';
 import { osTranslations } from '@dxos/ui-theme';
 
 import { meta } from '../meta';
-import { ObservabilityOperation, type UserFeedback } from '../types';
+import { ObservabilityCapabilities, ObservabilityOperation, type UserFeedback } from '../types';
 
 import { FeedbackForm } from './FeedbackForm';
 
+/** Renders the feedback form, disabling it when the feedback survey is unavailable. */
 export const HelpContainer = () => {
   const { invokePromise } = useOperationInvoker();
+  const observability = useCapability(ObservabilityCapabilities.Observability);
+  const [feedbackAvailable, setFeedbackAvailable] = useState(false);
+
+  useAsyncEffect(
+    async (controller) => {
+      const available = await observability.isAvailable('feedback').pipe(
+        Effect.catchAll(() => Effect.succeed(false)),
+        Effect.catchAllDefect(() => Effect.succeed(false)),
+        runAndForwardErrors,
+      );
+      if (!controller.signal.aborted) {
+        setFeedbackAvailable(available);
+      }
+    },
+    [observability],
+  );
 
   const handleSave = useCallback(
     async (values: UserFeedback) => {
       await invokePromise(ObservabilityOperation.CaptureUserFeedback, values);
-      await invokePromise(Common.LayoutOperation.UpdateComplementary, { state: 'collapsed' });
-      await invokePromise(Common.LayoutOperation.AddToast, {
+      await invokePromise(LayoutOperation.UpdateComplementary, { state: 'collapsed' });
+      await invokePromise(LayoutOperation.AddToast, {
         id: `${meta.id}/feedback-success`,
         icon: 'ph--paper-plane-tilt--regular',
         duration: 3000,
@@ -32,5 +52,5 @@ export const HelpContainer = () => {
     [invokePromise],
   );
 
-  return <FeedbackForm onSave={handleSave} />;
+  return <FeedbackForm onSave={handleSave} disabled={!feedbackAvailable} />;
 };

package/src/components/ObservabilitySettings.tsx

@@ -5,9 +5,9 @@
 import * as Schema from 'effect/Schema';
 import React from 'react';
 
-import { useOperationInvoker } from '@dxos/app-framework/react';
+import { useOperationInvoker } from '@dxos/app-framework/ui';
 import { Input, Message, useTranslation } from '@dxos/react-ui';
-import { ControlGroup, ControlItemInput, ControlPage, ControlSection } from '@dxos/react-ui-form';
+import { Settings } from '@dxos/react-ui-form';
 
 import { meta } from '../meta';
 import { ObservabilityOperation } from '../types';
@@ -34,20 +34,20 @@ export const ObservabilitySettings = ({ settings }: ObservabilitySettingsCompone
   const { invokePromise } = useOperationInvoker();
 
   return (
-    <ControlPage>
-      <ControlSection title={t('settings title', { ns: meta.id })}>
+    <Settings.Root>
+      <Settings.Section 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')}>
+        <Settings.Group>
+          <Settings.ItemInput title={t('observability enabled label')}>
             <Input.Switch
               checked={settings.enabled}
               onCheckedChange={(checked) => invokePromise(ObservabilityOperation.Toggle, { state: !!checked })}
             />
-          </ControlItemInput>
-        </ControlGroup>
-      </ControlSection>
-    </ControlPage>
+          </Settings.ItemInput>
+        </Settings.Group>
+      </Settings.Section>
+    </Settings.Root>
   );
 };

package/src/translations.ts

@@ -26,6 +26,7 @@ export const translations = [
         'help label': 'Feedback & Support',
         'feedback textarea label': 'Feedback',
         'feedback textarea placeholder': 'Please enter your feedback, technical issue, or feature request.',
+        'include debug logs label': 'Include debug logs',
         'send feedback label': 'Send Feedback',
         'feedback toast label': 'Thank you for your feedback!',
         'feedback toast description': 'We will review your feedback and get back to you as soon as possible.',

package/src/types/capabilities.ts

@@ -26,7 +26,7 @@ export namespace ObservabilityCapabilities {
 
   export const State = Capability.make<Atom.Writable<State>>(`${meta.id}/capability/state`);
 
-  export const Observability = Capability.make<Observability>(`${meta.id}/capability/observability`);
+  export const Observability = Capability.make<Observability.Observability>(`${meta.id}/capability/observability`);
 }
 
 // NOTE: This is cloned from the client plugin to avoid circular dependencies.

package/src/types/events.ts

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