@dxos/plugin-observability 0.8.4-main.1068cf700f → 0.8.4-main.1c7ec43d41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-observability",
-  "version": "0.8.4-main.1068cf700f",
+  "version": "0.8.4-main.1c7ec43d41",
   "description": "DXOS app framework plugin for hooking up app observability",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -12,6 +12,20 @@
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#translations": "./src/translations.ts",
+    "#plugin": {
+      "browser": "./src/ObservabilityPlugin.ts",
+      "node": "./src/ObservabilityPlugin.node.ts",
+      "default": "./src/ObservabilityPlugin.ts"
+    },
+    "#types": "./src/types/index.ts"
+  },
   "exports": {
     ".": {
       "source": "./src/index.ts",
@@ -19,11 +33,23 @@
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
-    "./cli": {
-      "source": "./src/cli/index.ts",
-      "types": "./dist/types/src/cli/index.d.ts",
-      "browser": "./dist/lib/browser/cli/index.mjs",
-      "node": "./dist/lib/node-esm/cli/index.mjs"
+    "./components": {
+      "source": "./src/components/index.ts",
+      "types": "./dist/types/src/components/index.d.ts",
+      "browser": "./dist/lib/browser/components/index.mjs",
+      "node": "./dist/lib/node-esm/components/index.mjs"
+    },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.mjs"
+    },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
     },
     "./types": {
       "source": "./src/types/index.ts",
@@ -33,13 +59,6 @@
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {
-      "types": [
-        "dist/types/src/types/index.d.ts"
-      ]
-    }
-  },
   "files": [
     "dist",
     "src"
@@ -47,44 +66,46 @@
   "dependencies": {
     "@effect-atom/atom": "^0.5.1",
     "@effect-atom/atom-react": "^0.5.0",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "localforage": "^1.10.0",
-    "@dxos/async": "0.8.4-main.1068cf700f",
-    "@dxos/app-framework": "0.8.4-main.1068cf700f",
-    "@dxos/app-toolkit": "0.8.4-main.1068cf700f",
-    "@dxos/context": "0.8.4-main.1068cf700f",
-    "@dxos/effect": "0.8.4-main.1068cf700f",
-    "@dxos/invariant": "0.8.4-main.1068cf700f",
-    "@dxos/echo": "0.8.4-main.1068cf700f",
-    "@dxos/log": "0.8.4-main.1068cf700f",
-    "@dxos/observability": "0.8.4-main.1068cf700f",
-    "@dxos/operation": "0.8.4-main.1068cf700f",
-    "@dxos/plugin-graph": "0.8.4-main.1068cf700f",
-    "@dxos/protocols": "0.8.4-main.1068cf700f",
-    "@dxos/react-hooks": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-form": "0.8.4-main.1068cf700f",
-    "@dxos/util": "0.8.4-main.1068cf700f",
-    "@dxos/react-client": "0.8.4-main.1068cf700f",
-    "@dxos/react-ui-stack": "0.8.4-main.1068cf700f"
+    "@dxos/app-framework": "0.8.4-main.1c7ec43d41",
+    "@dxos/app-toolkit": "0.8.4-main.1c7ec43d41",
+    "@dxos/async": "0.8.4-main.1c7ec43d41",
+    "@dxos/context": "0.8.4-main.1c7ec43d41",
+    "@dxos/compute": "0.8.4-main.1c7ec43d41",
+    "@dxos/effect": "0.8.4-main.1c7ec43d41",
+    "@dxos/echo": "0.8.4-main.1c7ec43d41",
+    "@dxos/log": "0.8.4-main.1c7ec43d41",
+    "@dxos/observability": "0.8.4-main.1c7ec43d41",
+    "@dxos/plugin-graph": "0.8.4-main.1c7ec43d41",
+    "@dxos/invariant": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-client": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-hooks": "0.8.4-main.1c7ec43d41",
+    "@dxos/protocols": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-attention": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-form": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui-stack": "0.8.4-main.1c7ec43d41",
+    "@dxos/util": "0.8.4-main.1c7ec43d41"
   },
   "devDependencies": {
     "@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.1068cf700f",
-    "@dxos/storybook-utils": "0.8.4-main.1068cf700f",
-    "@dxos/ui-theme": "0.8.4-main.1068cf700f"
+    "vite": "^8.0.10",
+    "@dxos/plugin-testing": "0.8.4-main.1c7ec43d41",
+    "@dxos/react-ui": "0.8.4-main.1c7ec43d41",
+    "@dxos/ui-theme": "0.8.4-main.1c7ec43d41",
+    "@dxos/storybook-utils": "0.8.4-main.1c7ec43d41"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/platform": "0.94.4",
-    "effect": "3.19.16",
+    "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.1068cf700f",
-    "@dxos/ui-theme": "0.8.4-main.1068cf700f"
+    "@dxos/react-ui": "0.8.4-main.1c7ec43d41",
+    "@dxos/ui-theme": "0.8.4-main.1c7ec43d41"
   },
   "publishConfig": {
     "access": "public"

package/src/ObservabilityPlugin.node.ts

@@ -0,0 +1,33 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability, Plugin } from '@dxos/app-framework';
+import { AppPlugin } from '@dxos/app-toolkit';
+import { Operation, OperationHandlerSet } from '@dxos/compute';
+
+import { meta } from '#meta';
+import { ObservabilityOperation } from '#operations';
+
+// TODO(wittjosiah): Hook up.
+export const ObservabilityPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({
+    activate: Capability.lazy('OperationHandler', () =>
+      Promise.resolve({
+        default: Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+          Effect.fnUntraced(function* () {
+            return Capability.contributes(
+              Capabilities.OperationHandler,
+              OperationHandlerSet.make(Operation.withHandler(ObservabilityOperation.SendEvent, () => Effect.void)),
+            );
+          }),
+        ),
+      }),
+    ),
+  }),
+  Plugin.make,
+);
+
+export default ObservabilityPlugin;

package/src/ObservabilityPlugin.test.ts

@@ -0,0 +1,25 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { createComposerTestApp } from '@dxos/plugin-testing/harness';
+
+import { ObservabilityPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('ObservabilityPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createComposerTestApp({
+      // TODO(wittjosiah): Align browser and node variant option types.
+      plugins: [ObservabilityPlugin({} as any)],
+    });
+
+    // OperationHandler fires automatically (OperationPlugin fires SetupOperationHandler during Startup).
+    expect(harness.manager.getActive()).toContain(moduleId('OperationHandler'));
+  });
+});

package/src/ObservabilityPlugin.ts

@@ -13,24 +13,29 @@ import {
   ClientReady,
   ObservabilitySettings,
   ObservabilityState,
-  OperationResolver,
+  OperationHandler,
   ReactSurface,
-} from './capabilities';
-import { meta } from './meta';
-import { translations } from './translations';
-import { ClientReadyEvent, ObservabilityEvents } from './types';
-import { ObservabilityCapabilities } from './types';
+} from '#capabilities';
+import { meta } from '#meta';
+import { translations } from '#translations';
+import { ClientReadyEvent, ObservabilityEvents } from '#types';
+import { ObservabilityCapabilities } from '#types';
 
 export type ObservabilityPluginOptions = {
   namespace: string;
   observability: () => Promise<Observability.Observability>;
+  /**
+   * Optional callback invoked by the help/feedback UI to download captured logs.
+   * When omitted the "Download logs" action is hidden.
+   */
+  downloadLogs?: () => void | Promise<void>;
 };
 
 export const ObservabilityPlugin = Plugin.define<ObservabilityPluginOptions>(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
-  Plugin.addModule(({ namespace, observability }) => ({
+  Plugin.addModule(({ observability }) => ({
     id: 'observability',
     activatesOn: ActivationEvents.Startup,
     activate: () =>
@@ -46,14 +51,23 @@ export const ObservabilityPlugin = Plugin.define<ObservabilityPluginOptions>(met
   Plugin.addModule(({ namespace }) => ({
     id: Capability.getModuleTag(ObservabilityState),
     activatesOn: ActivationEvents.Startup,
-    activatesAfter: [ObservabilityEvents.StateReady],
+    firesAfterActivation: [ObservabilityEvents.StateReady],
     activate: () => ObservabilityState({ namespace }),
   })),
   Plugin.addModule(({ namespace }) => ({
-    id: Capability.getModuleTag(OperationResolver),
-    activatesOn: ActivationEvents.SetupOperationResolver,
-    activate: () => OperationResolver({ namespace }),
+    id: 'namespace',
+    activatesOn: ActivationEvents.Startup,
+    activate: () => Effect.succeed(Capability.contributes(ObservabilityCapabilities.Namespace, namespace)),
+  })),
+  Plugin.addModule(({ downloadLogs }) => ({
+    id: 'log-downloader',
+    activatesOn: ActivationEvents.Startup,
+    activate: () =>
+      Effect.succeed(
+        downloadLogs !== undefined ? Capability.contributes(ObservabilityCapabilities.LogDownloader, downloadLogs) : [],
+      ),
   })),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
   Plugin.addModule(({ namespace, observability }) => ({
     id: Capability.getModuleTag(ClientReady),
     activatesOn: ActivationEvent.allOf(
@@ -69,3 +83,5 @@ export const ObservabilityPlugin = Plugin.define<ObservabilityPluginOptions>(met
   })),
   Plugin.make,
 );
+
+export default ObservabilityPlugin;

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

@@ -0,0 +1,36 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities, AppNode } from '@dxos/app-toolkit';
+import { GraphBuilder, NodeMatcher } from '@dxos/plugin-graph';
+import { linkedSegment } from '@dxos/react-ui-attention';
+
+import { meta } from '#meta';
+
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const extensions = yield* Effect.all([
+      GraphBuilder.createExtension({
+        id: 'help',
+        match: NodeMatcher.whenRoot,
+        connector: (node) =>
+          Effect.succeed([
+            AppNode.makeDeckCompanion({
+              id: linkedSegment('help'),
+              label: ['help.label', { ns: meta.id }],
+              icon: 'ph--question--regular',
+              data: null,
+              position: 'hoist',
+              joyride: 'welcome/feedback',
+            }),
+          ]),
+      }),
+    ]);
+
+    return Capability.contributes(AppCapabilities.AppGraphBuilder, extensions);
+  }),
+);

package/src/capabilities/{client-ready/client-ready.ts → client-ready.ts}

@@ -6,10 +6,12 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { LayoutOperation, SettingsOperation } from '@dxos/app-toolkit';
+import { log } from '@dxos/log';
 import { type Observability, ObservabilityProvider } from '@dxos/observability';
 
-import { meta } from '../../meta';
-import { ClientCapability, ObservabilityCapabilities, ObservabilityOperation } from '../../types';
+import { meta } from '#meta';
+import { ObservabilityOperation } from '#operations';
+import { ClientCapability, ObservabilityCapabilities } from '#types';
 
 export type ClientReadyOptions = {
   namespace: string;
@@ -17,8 +19,7 @@ export type ClientReadyOptions = {
 };
 
 export default Capability.makeModule(
-  Effect.fnUntraced(function* (props?: ClientReadyOptions) {
-    const { observability } = props!;
+  Effect.fnUntraced(function* ({ observability }: ClientReadyOptions) {
     const manager = yield* Capability.get(Capabilities.PluginManager);
     const { invokePromise } = yield* Capability.get(Capabilities.OperationInvoker);
     const registry = yield* Capability.get(Capabilities.AtomRegistry);
@@ -32,14 +33,14 @@ export default Capability.makeModule(
       const state = registry.get(stateAtom);
       if (!state.notified && notify) {
         await invokePromise(LayoutOperation.AddToast, {
-          id: `${meta.id}/notice`,
-          title: ['observability toast label', { ns: meta.id }],
-          description: ['observability toast description', { ns: meta.id }],
+          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: meta.id }],
-          actionAlt: ['observability toast action alt', { ns: meta.id }],
-          closeLabel: ['observability toast close label', { ns: meta.id }],
+          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: () => invokePromise(SettingsOperation.Open, { plugin: meta.id }),
         });
 
@@ -49,10 +50,12 @@ export default Capability.makeModule(
 
     // Ensure errors are tagged with enabled plugins to help with reproductions.
     const enabledPlugins = manager.getEnabled();
+    log('client-ready: tagging enabled plugins', { count: enabledPlugins.length });
     for (const plugin of enabledPlugins) {
       observability.setTags({ [`pluginEnabled-${plugin}`]: 'true' }, 'errors');
     }
 
+    log('client-ready: sending page.load event');
     yield* Effect.tryPromise(() =>
       invokePromise(ObservabilityOperation.SendEvent, {
         name: 'page.load',
@@ -62,16 +65,34 @@ export default Capability.makeModule(
         },
       }),
     );
+    log('client-ready: page.load event sent');
 
-    // Add client data providers.
+    // Each provider is logged individually because some provider setups perform
+    // RPC calls (e.g. runtimeMetricsProvider awaits SystemService.getPlatform());
+    // a hung worker pipe surfaces as a missing "added" log, so the last
+    // "adding ..." line points to the stall.
+    log('client-ready: adding identity data provider');
     yield* observability.addDataProvider(ObservabilityProvider.Client.identityProvider(client.services.services));
+    log('client-ready: identity data provider added');
+
+    log('client-ready: adding network metrics data provider');
     yield* observability.addDataProvider(ObservabilityProvider.Client.networkMetricsProvider(client.services.services));
+    log('client-ready: network metrics data provider added');
+
+    log('client-ready: adding runtime metrics data provider');
     yield* observability.addDataProvider(ObservabilityProvider.Client.runtimeMetricsProvider(client.services.services));
+    log('client-ready: runtime metrics data provider added');
+
+    log('client-ready: adding space metrics data provider');
     yield* observability.addDataProvider(ObservabilityProvider.Client.spacesMetricsProvider(client));
+    log('client-ready: space metrics data provider added');
 
     if (client.halo.identity.get()) {
+      log('client-ready: identity present, sending privacy notice');
       yield* Effect.tryPromise(() => sendPrivacyNotice());
+      log('client-ready: privacy notice sent');
     } else {
+      log('client-ready: no identity, deferring privacy notice');
       const subscription = client.halo.identity.subscribe(async (identity) => {
         if (identity && observability) {
           await sendPrivacyNotice();
@@ -80,6 +101,7 @@ export default Capability.makeModule(
       });
     }
 
+    log('client-ready: contributing observability capability');
     return Capability.contributes(ObservabilityCapabilities.Observability, observability, () => observability.close());
   }),
 );

package/src/capabilities/index.ts

@@ -2,9 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-export * from './app-graph-builder';
-export * from './client-ready';
-export * from './operation-resolver';
-export * from './react-surface';
-export * from './settings';
-export * from './state';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/compute';
+
+import type { ClientReadyOptions } from './client-ready';
+
+export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));
+export const ClientReady = Capability.lazy<ClientReadyOptions>('ClientReady', () => import('./client-ready'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));
+export const ObservabilitySettings = Capability.lazy('ObservabilitySettings', () => import('./settings'));
+export const ObservabilityState = Capability.lazy('ObservabilityState', () => import('./state'));

package/src/capabilities/operation-handler.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import type { OperationHandlerSet } from '@dxos/compute';
+
+import { ObservabilityOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, ObservabilityOperationHandlerSet);
+  }),
+);

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,41 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useOperationInvoker, useSettingsState } from '@dxos/app-framework/ui';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+
+import { ObservabilitySettings } from '#components';
+import { HelpContainer } from '#containers';
+import { meta } from '#meta';
+import { ObservabilityOperation } from '#operations';
+import { type Settings } from '#types';
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'root',
+        filter: AppSurface.settings(AppSurface.Article, meta.id),
+        component: ({ data: { subject } }) => {
+          const { settings } = useSettingsState<Settings.Settings>(subject.atom);
+          const { invokePromise } = useOperationInvoker();
+          const handleSettingsChange = (cb: (current: Settings.Settings) => Settings.Settings) => {
+            const next = cb(settings);
+            void invokePromise(ObservabilityOperation.Toggle, { state: next.enabled });
+          };
+          return <ObservabilitySettings settings={settings} onSettingsChange={handleSettingsChange} />;
+        },
+      }),
+      Surface.create({
+        id: 'help',
+        role: 'deck-companion--help',
+        component: () => <HelpContainer />,
+      }),
+    ]),
+  ),
+);

package/src/capabilities/{settings/settings.ts → settings.ts}

@@ -8,15 +8,14 @@ import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
 import { createKvsStore } from '@dxos/effect';
 
-import { ObservabilitySettingsSchema } from '../../components';
-import { meta } from '../../meta';
-import { ObservabilityCapabilities } from '../../types';
+import { meta } from '#meta';
+import { ObservabilityCapabilities, Settings } from '#types';
 
 export default Capability.makeModule(() =>
   Effect.sync(() => {
     const settingsAtom = createKvsStore({
       key: meta.id,
-      schema: ObservabilitySettingsSchema,
+      schema: Settings.Settings,
       defaultValue: () => ({
         enabled: true,
       }),
@@ -26,7 +25,7 @@ export default Capability.makeModule(() =>
       Capability.contributes(ObservabilityCapabilities.Settings, settingsAtom),
       Capability.contributes(AppCapabilities.Settings, {
         prefix: meta.id,
-        schema: ObservabilitySettingsSchema,
+        schema: Settings.Settings,
         atom: settingsAtom,
       }),
     ];

package/src/capabilities/{state/state.ts → state.ts}

@@ -8,12 +8,11 @@ import { Capabilities, Capability } from '@dxos/app-framework';
 import { createKvsStore } from '@dxos/effect';
 import { Observability } from '@dxos/observability';
 
-import { meta } from '../../meta';
-import { ObservabilityCapabilities } from '../../types';
+import { meta } from '#meta';
+import { ObservabilityCapabilities } from '#types';
 
 export default Capability.makeModule(
-  Effect.fnUntraced(function* (props?: { namespace: string }) {
-    const { namespace } = props!;
+  Effect.fnUntraced(function* ({ namespace }: { namespace: string }) {
     const stateAtom = createKvsStore({
       key: meta.id,
       schema: ObservabilityCapabilities.StateSchema,

package/src/components/{FeedbackForm.stories.tsx → FeedbackForm/FeedbackForm.stories.tsx}

@@ -6,12 +6,12 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../translations';
+import { translations } from '#translations';
 
 import { FeedbackForm } from './FeedbackForm';
 
 const meta = {
-  title: 'plugins/plugin-observability/FeedbackForm',
+  title: 'plugins/plugin-observability/components/FeedbackForm',
   component: FeedbackForm,
   decorators: [withTheme(), withLayout({ layout: 'column' })],
   parameters: {
@@ -31,3 +31,14 @@ export const Default: Story = {
     },
   },
 };
+
+export const WithDownloadLogs: Story = {
+  args: {
+    onSave: (values) => {
+      console.log(values);
+    },
+    onDownloadLogs: () => {
+      console.log('download logs clicked');
+    },
+  },
+};

package/src/components/FeedbackForm/FeedbackForm.tsx

@@ -0,0 +1,49 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import React from 'react';
+
+import { IconButton, useTranslation } from '@dxos/react-ui';
+import { Form, type FormRootProps, type FormSubmitProps } from '@dxos/react-ui-form';
+
+import { meta } from '#meta';
+import { UserFeedback } from '#operations';
+
+export type FeedbackFormProps = Pick<FormRootProps<UserFeedback>, 'onSave'> &
+  Pick<FormSubmitProps, 'disabled'> & {
+    /** Optional handler — when supplied a "Download logs" button is rendered below the submit action. */
+    onDownloadLogs?: () => void | Promise<void>;
+  };
+
+const defaultValues: UserFeedback = {
+  message: '',
+  includeLogs: true,
+};
+
+export const FeedbackForm = ({ onSave, disabled, onDownloadLogs }: FeedbackFormProps) => {
+  const { t } = useTranslation(meta.id);
+
+  return (
+    <Form.Root schema={UserFeedback} defaultValues={defaultValues} onSave={onSave}>
+      <Form.Viewport>
+        <Form.Content>
+          <Form.FieldSet />
+          <Form.Submit icon='ph--paper-plane-tilt--regular' label={t('send-feedback.label')} disabled={disabled} />
+          {onDownloadLogs && (
+            <div role='none' className='flex w-full pt-form-padding'>
+              <IconButton
+                classNames='w-full'
+                type='button'
+                icon='ph--download-simple--regular'
+                label={t('download-logs.label')}
+                onClick={() => void onDownloadLogs()}
+                data-testid='download-logs-button'
+              />
+            </div>
+          )}
+        </Form.Content>
+      </Form.Viewport>
+    </Form.Root>
+  );
+};

package/src/components/FeedbackForm/index.ts

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