@dxos/plugin-settings 0.8.4-main.d05539e30a → 0.8.4-main.d9fc60f731

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-settings",
-  "version": "0.8.4-main.d05539e30a",
+  "version": "0.8.4-main.d9fc60f731",
   "description": "DXOS Settings plugin for managing application settings.",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -48,20 +48,25 @@
     "src"
   ],
   "dependencies": {
-    "@dxos/app-framework": "0.8.4-main.d05539e30a",
-    "@dxos/app-graph": "0.8.4-main.d05539e30a",
-    "@dxos/compute": "0.8.4-main.d05539e30a",
-    "@dxos/app-toolkit": "0.8.4-main.d05539e30a",
-    "@dxos/util": "0.8.4-main.d05539e30a"
+    "@dxos/app-framework": "0.8.4-main.d9fc60f731",
+    "@dxos/app-graph": "0.8.4-main.d9fc60f731",
+    "@dxos/app-toolkit": "0.8.4-main.d9fc60f731",
+    "@dxos/react-ui-form": "0.8.4-main.d9fc60f731",
+    "@dxos/compute": "0.8.4-main.d9fc60f731",
+    "@dxos/util": "0.8.4-main.d9fc60f731",
+    "@dxos/keys": "0.8.4-main.d9fc60f731"
   },
   "devDependencies": {
     "@types/react": "~19.2.7",
-    "effect": "3.20.0",
+    "effect": "3.21.2",
     "react": "~19.2.3",
-    "@dxos/plugin-graph": "0.8.4-main.d05539e30a"
+    "@dxos/plugin-graph": "0.8.4-main.d9fc60f731"
   },
   "peerDependencies": {
-    "effect": "3.20.0",
+    "effect": "3.21.2",
     "react": "~19.2.3"
+  },
+  "publishConfig": {
+    "access": "public"
   }
 }

package/src/SettingsPlugin.ts

@@ -5,13 +5,14 @@
 import { Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 
-import { OperationHandler, SettingsAppGraphBuilder } from '#capabilities';
+import { OperationHandler, ReactSurface, SettingsAppGraphBuilder } from '#capabilities';
 import { meta } from '#meta';
 import { translations } from '#translations';
 
 export const SettingsPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: SettingsAppGraphBuilder }),
   AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
   AppPlugin.addTranslationsModule({ translations }),
   Plugin.make,
 );

package/src/actions.ts

@@ -17,7 +17,7 @@ export namespace SettingsAction {
     output: Schema.Void,
   }) {}
 
-  export class OpenPluginRegistry extends Schema.TaggedClass<OpenPluginRegistry>()(`${meta.id}.open-plugin-registry`, {
+  export class OpenPluginRegistry extends Schema.TaggedClass<OpenPluginRegistry>()(`${meta.id}.openPluginRegistry`, {
     input: Schema.Void,
     output: Schema.Void,
   }) {}

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

@@ -87,6 +87,7 @@ export default Capability.makeModule(
                   properties: {
                     label: meta.name ?? meta.id,
                     icon: meta.icon ?? 'ph--circle--regular',
+                    iconHue: meta.iconHue,
                   },
                 }),
               ),

package/src/capabilities/index.ts

@@ -10,3 +10,4 @@ export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHan
   'OperationHandler',
   () => import('./operation-handler'),
 );
+export const ReactSurface = Capability.lazy('ReactSurface', () => import('./react-surface'));

package/src/capabilities/react-surface.tsx

@@ -0,0 +1,50 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React from 'react';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Surface, useSettingsState } from '@dxos/app-framework/ui';
+import { type AppCapabilities } from '@dxos/app-toolkit';
+import { AppSurface } from '@dxos/app-toolkit/ui';
+import { Settings as SettingsForm } from '@dxos/react-ui-form';
+
+/**
+ * Generic settings surface rendered for any plugin that contributes an
+ * `AppCapabilities.Settings` entry. It drives a schema-based form from the
+ * contributed `schema`/`atom`, so plugins whose settings are plain editable
+ * fields need not register a bespoke settings surface.
+ *
+ * No section title is rendered: the settings plank heading already names the
+ * plugin. Registered with `position: 'last'` so a plugin-specific surface
+ * (matching by prefix) always wins under the settings article's `limit={1}`
+ * dispatch.
+ */
+const DefaultSettings = ({ subject }: { subject: AppCapabilities.Settings }) => {
+  const { settings, updateSettings } = useSettingsState<Record<string, any>>(subject.atom);
+
+  return (
+    <SettingsForm.Viewport>
+      <SettingsForm.FieldSet
+        schema={subject.schema}
+        values={settings}
+        onValuesChanged={(values) => updateSettings(() => values)}
+      />
+    </SettingsForm.Viewport>
+  );
+};
+
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactSurface, [
+      Surface.create({
+        id: 'defaultPluginSettings',
+        position: 'last',
+        filter: AppSurface.settings(AppSurface.Article),
+        component: ({ data: { subject } }) => <DefaultSettings subject={subject} />,
+      }),
+    ]),
+  ),
+);

package/src/meta.ts

@@ -2,11 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Plugin } from '@dxos/app-framework';
+import { Plugin } from '@dxos/app-framework';
+import { DXN } from '@dxos/keys';
 
-export const meta: Plugin.Meta = {
-  id: 'org.dxos.plugin.settings',
+export const meta = Plugin.makeMeta({
+  key: DXN.make('org.dxos.plugin.settings'),
   name: 'Settings',
   author: 'DXOS',
   tags: ['system'],
-};
+});

package/src/operations/open-plugin-registry.ts

@@ -16,11 +16,11 @@ const handler: Operation.WithHandler<typeof SettingsOperation.OpenPluginRegistry
       Effect.gen(function* () {
         const { invoke } = yield* Capability.get(Capabilities.OperationInvoker);
         yield* invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(SETTINGS_ID) });
-        yield* Effect.fork(
-          invoke(LayoutOperation.Open, {
-            subject: [`${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:plugins`],
-          }),
-        );
+        // Await (don't fork): SwitchWorkspace selects the workspace's first child, so a forked Open
+        // races/drops before its deck update applies. Awaiting guarantees the registry is selected.
+        yield* invoke(LayoutOperation.Open, {
+          subject: [`${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:plugins`],
+        });
       }),
     ),
   );

package/src/operations/open.ts

@@ -16,11 +16,12 @@ const handler: Operation.WithHandler<typeof SettingsOperation.Open> = SettingsOp
       const { invoke } = yield* Capability.get(Capabilities.OperationInvoker);
       yield* invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(SETTINGS_ID) });
       if (input.plugin) {
-        yield* Effect.fork(
-          invoke(LayoutOperation.Open, {
-            subject: [`${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:${input.plugin.replaceAll('/', ':')}`],
-          }),
-        );
+        // Await (don't fork): SwitchWorkspace already selects the workspace's first child, so a
+        // forked Open for the requested plugin races/drops before its deck update applies, leaving
+        // the wrong plugin selected. Awaiting guarantees the requested plugin becomes the selection.
+        yield* invoke(LayoutOperation.Open, {
+          subject: [`${getSpacePath(SETTINGS_ID)}/${SETTINGS_KEY}:${input.plugin.replaceAll('/', ':')}`],
+        });
       }
     }),
   ),

package/dist/lib/neutral/chunk-WJUZZMD7.mjs

@@ -1,14 +0,0 @@
-// src/meta.ts
-var meta = {
-  id: "org.dxos.plugin.settings",
-  name: "Settings",
-  author: "DXOS",
-  tags: [
-    "system"
-  ]
-};
-
-export {
-  meta
-};
-//# sourceMappingURL=chunk-WJUZZMD7.mjs.map

package/dist/lib/neutral/chunk-WJUZZMD7.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { type Plugin } from '@dxos/app-framework';\n\nexport const meta: Plugin.Meta = {\n  id: 'org.dxos.plugin.settings',\n  name: 'Settings',\n  author: 'DXOS',\n  tags: ['system'],\n};\n"],
-  "mappings": ";AAMO,IAAMA,OAAoB;EAC/BC,IAAI;EACJC,MAAM;EACNC,QAAQ;EACRC,MAAM;IAAC;;AACT;",
-  "names": ["meta", "id", "name", "author", "tags"]
-}

package/dist/lib/neutral/chunk-YMWZWP5N.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/SettingsPlugin.ts"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport { Plugin } from '@dxos/app-framework';\nimport { AppPlugin } from '@dxos/app-toolkit';\n\nimport { OperationHandler, SettingsAppGraphBuilder } from '#capabilities';\nimport { meta } from '#meta';\nimport { translations } from '#translations';\n\nexport const SettingsPlugin = Plugin.define(meta).pipe(\n  AppPlugin.addAppGraphModule({ activate: SettingsAppGraphBuilder }),\n  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),\n  AppPlugin.addTranslationsModule({ translations }),\n  Plugin.make,\n);\n\nexport default SettingsPlugin;\n"],
-  "mappings": ";AAIA,SAASA,cAAc;AACvB,SAASC,iBAAiB;AAE1B,SAASC,kBAAkBC,+BAA+B;AAC1D,SAASC,YAAY;AACrB,SAASC,oBAAoB;AAEtB,IAAMC,iBAAiBN,OAAOO,OAAOH,IAAAA,EAAMI,KAChDP,UAAUQ,kBAAkB;EAAEC,UAAUP;AAAwB,CAAA,GAChEF,UAAUU,0BAA0B;EAAED,UAAUR;AAAiB,CAAA,GACjED,UAAUW,sBAAsB;EAAEP;AAAa,CAAA,GAC/CL,OAAOa,IAAI;AAGb,IAAA,yBAAeP;",
-  "names": ["Plugin", "AppPlugin", "OperationHandler", "SettingsAppGraphBuilder", "meta", "translations", "SettingsPlugin", "define", "pipe", "addAppGraphModule", "activate", "addOperationHandlerModule", "addTranslationsModule", "make"]
-}