@dxos/plugin-registry 0.8.4-main.bc674ce → 0.8.4-main.bcb3aa67d6

package/src/components/{PluginItem.tsx → PluginList/PluginItem.tsx}

@@ -6,11 +6,11 @@ import React, { type MouseEvent, useCallback } from 'react';
 
 import { type Plugin } from '@dxos/app-framework';
 import { type ChromaticPalette, Icon, IconButton, Input, Link, ListItem, Tag, useTranslation } from '@dxos/react-ui';
-import { descriptionText, mx } from '@dxos/ui-theme';
+import { mx } from '@dxos/ui-theme';
 import { getStyles } from '@dxos/ui-theme';
 
-import { meta } from '../meta';
-import { type RegistryTagType } from '../types';
+import { meta } from '#meta';
+import { type RegistryTagType } from '#types';
 
 export type PluginItemProps = {
   plugin: Plugin.Plugin;
@@ -58,11 +58,15 @@ export const PluginItem = ({
       labelId={labelId}
       data-testid={`pluginList.${id}`}
       aria-describedby={descriptionId}
-      classNames={mx(gridCols, 'bs-[12rem] is-full gap-3 pie-2 border border-separator rounded-md overflow-hidden')}
+      classNames={mx(gridCols, 'h-[14rem] w-full gap-3 pe-2 bg-modal-surface rounded-md overflow-hidden')}
     >
-      <div className={mx(gridRows, 'justify-center rounded-l-md', styles.bg)}>
-        <div />
-        <Icon classNames={mx('cursor-pointer', styles.icon)} icon={icon} size={14} onClick={handleClick} />
+      <div className={mx(gridRows, 'justify-center rounded-l-md', styles.surface)}>
+        <Icon
+          classNames={mx('row-start-2 cursor-pointer', styles.surfaceText)}
+          icon={icon}
+          size={14}
+          onClick={handleClick}
+        />
       </div>
 
       <div className={mx(gridRows)}>
@@ -71,10 +75,10 @@ export const PluginItem = ({
         </div>
 
         <div>
-          <p className={mx(descriptionText, 'line-clamp-4 min-is-0')}>{description}</p>
+          <p className={mx('text-description', 'line-clamp-4 min-w-0')}>{description}</p>
         </div>
 
-        <div className='flex -mis-0.5 overflow-x-auto scrollbar-none'>
+        <div className='flex -ms-0.5 overflow-x-auto scrollbar-none'>
           {tags?.map((tag) => (
             <Tag key={tag} palette={tagColors[tag as RegistryTagType]} classNames='text-xs uppercase font-thin'>
               {tag}
@@ -87,7 +91,7 @@ export const PluginItem = ({
             aria-describedby={descriptionId}
             classNames='cursor-pointer'
             icon='ph--gear--regular'
-            label={t('settings label')}
+            label={t('settings.label')}
             iconOnly
             size={4}
             onClick={handleSettings}
@@ -95,11 +99,11 @@ export const PluginItem = ({
           />
 
           <Link aria-describedby={descriptionId} classNames='text-description cursor-pointer' onClick={handleClick}>
-            {t('details label')}
+            {t('details.label')}
           </Link>
 
           <div className='grow' />
-          <div className='pie-1'>
+          <div className='pe-1'>
             <Input.Root id={inputId}>
               <Input.Switch classNames='self-center' checked={isEnabled} onClick={handleChange} />
             </Input.Root>

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

@@ -7,11 +7,12 @@ import React, { useState } from 'react';
 
 import { type Plugin, Plugin as PluginNS } from '@dxos/app-framework';
 import { faker } from '@dxos/random';
+import { ScrollArea } from '@dxos/react-ui';
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 import { getHashHue } from '@dxos/ui-theme';
 
-import { translations } from '../translations';
-import { RegistryTagType } from '../types';
+import { translations } from '../../translations';
+import { RegistryTagType } from '#types';
 
 import { PluginList } from './PluginList';
 
@@ -31,7 +32,7 @@ const DefaultStory = () => {
     faker.helpers.multiple(
       () =>
         PluginNS.define({
-          id: `dxos.org/plugin/plugin-${faker.string.uuid()}`,
+          id: `org.dxos.plugin.plugin-${faker.string.uuid()}`,
           name: `${faker.commerce.productName()}`,
           description: faker.lorem.sentences(Math.ceil(Math.random() * 3)),
           tags: faker.helpers.uniqueArray(RegistryTagType.literals as any, Math.floor(Math.random() * 3)),
@@ -49,11 +50,17 @@ const DefaultStory = () => {
     setEnabled((plugins) => (enabled ? [...plugins, id] : plugins.filter((plugin) => plugin === id)));
   };
 
-  return <PluginList plugins={plugins} enabled={enabled} onChange={handleChange} hasSettings={() => true} />;
+  return (
+    <ScrollArea.Root orientation='vertical'>
+      <ScrollArea.Viewport>
+        <PluginList plugins={plugins} enabled={enabled} onChange={handleChange} hasSettings={() => true} />
+      </ScrollArea.Viewport>
+    </ScrollArea.Root>
+  );
 };
 
 const meta = {
-  title: 'plugins/plugin-registry/PluginList',
+  title: 'plugins/plugin-registry/components/PluginList',
   component: PluginList,
   render: DefaultStory,
   parameters: {
@@ -66,11 +73,14 @@ export default meta;
 type Story = StoryObj<typeof meta>;
 
 export const Default: Story = {
-  decorators: [withTheme, withLayout({ layout: 'column', scroll: true })],
+  decorators: [withTheme(), withLayout({ layout: 'column', classNames: 'bg-deck-surface' })],
+  parameters: {
+    layout: 'fullscreen',
+  },
 };
 
 export const FullScreen: Story = {
-  decorators: [withTheme, withLayout({ scroll: true })],
+  decorators: [withTheme(), withLayout({ scroll: true })],
   parameters: {
     layout: 'fullscreen',
   },

package/src/components/PluginList/index.ts

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

package/src/components/index.ts

@@ -4,4 +4,3 @@
 
 export * from './PluginDetail';
 export * from './PluginList';
-export * from './RegistryContainer';

package/src/containers/LoadPluginDialog/LoadPluginDialog.tsx

@@ -0,0 +1,84 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import React, { useCallback, useRef, useState } from 'react';
+
+import { usePluginManager } from '@dxos/app-framework/ui';
+import { runAndForwardErrors } from '@dxos/effect';
+import { Button, Dialog, Input, useTranslation } from '@dxos/react-ui';
+
+import { meta } from '../../meta';
+
+export const LOAD_PLUGIN_DIALOG = `${meta.id}.LoadPluginDialog`;
+
+export const LoadPluginDialog = () => {
+  const manager = usePluginManager();
+  const { t } = useTranslation(meta.id);
+  const [url, setUrl] = useState('');
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
+  const closeRef = useRef<HTMLButtonElement | null>(null);
+
+  const handleLoad = useCallback(() => {
+    if (!url.trim()) {
+      return;
+    }
+
+    setLoading(true);
+    setError(null);
+
+    void Effect.gen(function* () {
+      yield* manager.add(url.trim());
+      closeRef.current?.click();
+    }).pipe(
+      Effect.catchAll((err) =>
+        Effect.sync(() => {
+          setError(String(err));
+        }),
+      ),
+      Effect.tap(() => Effect.sync(() => setLoading(false))),
+      runAndForwardErrors,
+    );
+  }, [url, manager]);
+
+  return (
+    <Dialog.Content>
+      <Dialog.Header>
+        <Dialog.Title>{t('load-by-url-dialog.title')}</Dialog.Title>
+        <Dialog.Close asChild>
+          <Dialog.CloseIconButton ref={closeRef} />
+        </Dialog.Close>
+      </Dialog.Header>
+      <Dialog.Body>
+        <div className='flex flex-col gap-4'>
+          <Input.Root validationValence={error ? 'error' : undefined}>
+            <Input.Label>{t('plugin-url.label')}</Input.Label>
+            <Input.TextInput
+              placeholder='https://example.com/plugin.mjs'
+              value={url}
+              onChange={(event) => {
+                setUrl(event.target.value);
+                setError(null);
+              }}
+              onKeyDown={(event) => {
+                if (event.key === 'Enter') {
+                  handleLoad();
+                }
+              }}
+              disabled={loading}
+              autoFocus
+            />
+            {error && <Input.DescriptionAndValidation>{error}</Input.DescriptionAndValidation>}
+          </Input.Root>
+          <div className='flex justify-end'>
+            <Button variant='primary' disabled={!url.trim() || loading} onClick={handleLoad}>
+              {loading ? t('loading.label') : t('load-plugin.label')}
+            </Button>
+          </div>
+        </div>
+      </Dialog.Body>
+    </Dialog.Content>
+  );
+};

package/src/containers/LoadPluginDialog/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { LoadPluginDialog } from './LoadPluginDialog';
+
+export default LoadPluginDialog;

package/src/containers/PluginArticle/PluginArticle.tsx

@@ -0,0 +1,28 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import React, { useCallback } from 'react';
+
+import { type Plugin } from '@dxos/app-framework';
+import { usePluginManager } from '@dxos/app-framework/ui';
+import { runAndForwardErrors } from '@dxos/effect';
+
+import { PluginDetail } from '#components';
+
+// TODO(burdon): Convert to ECHO type.
+export type PluginArticleProps = { subject: Plugin.Plugin };
+
+export const PluginArticle = ({ subject: plugin }: PluginArticleProps) => {
+  const manager = usePluginManager();
+  const enabled = manager.getEnabled().includes(plugin.meta.id);
+  const handleEnableChange = useCallback(
+    (enabled: boolean) =>
+      enabled
+        ? runAndForwardErrors(manager.enable(plugin.meta.id))
+        : runAndForwardErrors(manager.disable(plugin.meta.id)),
+    [manager, plugin.meta.id],
+  );
+
+  return <PluginDetail plugin={plugin} enabled={enabled} onEnabledChange={handleEnableChange} />;
+};

package/src/containers/PluginArticle/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { PluginArticle } from './PluginArticle';
+
+export default PluginArticle;

package/src/containers/PluginRegistry/PluginRegistry.tsx

@@ -0,0 +1,94 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { useAtomValue } from '@effect-atom/atom-react';
+import * as Effect from 'effect/Effect';
+import React, { useCallback, useMemo } from 'react';
+
+import { type Plugin } from '@dxos/app-framework';
+import { useCapabilities, useOperationInvoker, usePluginManager } from '@dxos/app-framework/ui';
+import { AppCapabilities, LayoutOperation, SettingsOperation } from '@dxos/app-toolkit';
+import { runAndForwardErrors } from '@dxos/effect';
+import { ObservabilityOperation } from '@dxos/plugin-observability/operations';
+import { ScrollArea } from '@dxos/react-ui';
+import { composable, composableProps } from '@dxos/ui-theme';
+
+import { PluginList } from '#components';
+import { getPluginPath } from '#meta';
+
+const sortByPluginMeta = ({ meta: { name: a = '' } }: Plugin.Plugin, { meta: { name: b = '' } }: Plugin.Plugin) =>
+  a.localeCompare(b);
+
+export type PluginRegistryProps = {
+  id: string;
+  plugins: Plugin.Plugin[];
+};
+
+export const PluginRegistry = composable<HTMLDivElement, PluginRegistryProps>(
+  ({ id, plugins: pluginsProp, ...props }, forwardedRef) => {
+    const manager = usePluginManager();
+    const { invoke, invokePromise } = useOperationInvoker();
+    const plugins = useMemo(() => pluginsProp.sort(sortByPluginMeta), [pluginsProp]);
+    const enabled = useAtomValue(manager.enabled);
+    const allSettings = useCapabilities(AppCapabilities.Settings);
+
+    // TODO(wittjosiah): Factor out to an intent?
+    const handleChange = useCallback(
+      (id: string, enabled: boolean) =>
+        Effect.gen(function* () {
+          if (enabled) {
+            yield* manager.enable(id);
+          } else {
+            yield* manager.disable(id);
+          }
+
+          yield* invoke(ObservabilityOperation.SendEvent, {
+            name: 'plugins.toggle',
+            properties: {
+              plugin: id,
+              enabled,
+            },
+          });
+        }).pipe(runAndForwardErrors),
+      [invoke, manager],
+    );
+
+    const handleClick = useCallback(
+      (pluginId: string) =>
+        invokePromise(LayoutOperation.Open, {
+          subject: [getPluginPath(pluginId)],
+          pivotId: id,
+          positioning: 'end',
+        }),
+      [invokePromise, id],
+    );
+
+    const hasSettings = useCallback(
+      (pluginId: string) => allSettings.some((s) => s.prefix === pluginId),
+      [allSettings],
+    );
+
+    const handleSettings = useCallback(
+      (pluginId: string) => invokePromise(SettingsOperation.Open, { plugin: pluginId }),
+      [invokePromise],
+    );
+
+    return (
+      <ScrollArea.Root {...composableProps(props)} orientation='vertical' ref={forwardedRef}>
+        <ScrollArea.Viewport>
+          <PluginList
+            plugins={plugins}
+            enabled={enabled}
+            onClick={handleClick}
+            onChange={handleChange}
+            hasSettings={hasSettings}
+            onSettings={handleSettings}
+          />
+        </ScrollArea.Viewport>
+      </ScrollArea.Root>
+    );
+  },
+);
+
+PluginRegistry.displayName = 'PluginRegistry';

package/src/containers/PluginRegistry/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { PluginRegistry } from './PluginRegistry';
+
+export default PluginRegistry;

package/src/containers/index.ts

@@ -0,0 +1,10 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type ComponentType, lazy } from 'react';
+
+export { LOAD_PLUGIN_DIALOG } from './LoadPluginDialog/LoadPluginDialog';
+export const LoadPluginDialog: ComponentType<any> = lazy(() => import('./LoadPluginDialog'));
+export const PluginArticle: ComponentType<any> = lazy(() => import('./PluginArticle'));
+export const PluginRegistry: ComponentType<any> = lazy(() => import('./PluginRegistry'));

package/src/meta.ts

@@ -3,16 +3,23 @@
 //
 
 import { type Plugin } from '@dxos/app-framework';
+import { pinnedWorkspaceId } from '@dxos/app-toolkit';
 import { trim } from '@dxos/util';
 
-// TODO(wittjosiah): Deck does not currently support `/` in ids.
-// TODO(wittjosiah): This is a hack to prevent the previous deck from being set for pinned items.
-//  Ideally this should be worked into the data model in a generic way.
-export const REGISTRY_ID = '!dxos:plugin-registry';
+export const REGISTRY_ID = pinnedWorkspaceId('dxos:plugin-registry');
 export const REGISTRY_KEY = 'plugin-registry';
 
+// TODO(wittjosiah): Should this be a special separator or use the standard path separator?
+const CATEGORY_SEPARATOR = '>';
+
+/** Build a registry category node ID. */
+export const registryCategoryId = (category: string): string => `${REGISTRY_KEY}${CATEGORY_SEPARATOR}${category}`;
+
+/** Qualified graph path to a specific plugin node. */
+export const getPluginPath = (pluginId: string): string => `root/${REGISTRY_ID}/${pluginId}`;
+
 export const meta: Plugin.Meta = {
-  id: 'dxos.org/plugin/registry',
+  id: 'org.dxos.plugin.registry',
   name: 'Plugins',
   description: trim`
     Plugin management system for discovering, installing, and configuring workspace extensions.

package/src/operations/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { OperationHandlerSet } from '@dxos/operation';
+
+export const RegistryOperationHandlerSet = OperationHandlerSet.lazy(() => import('./open-plugin-registry'));

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

@@ -0,0 +1,21 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { LayoutOperation, SettingsOperation, getSpacePath } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+
+import { REGISTRY_ID } from '#meta';
+
+const handler: Operation.WithHandler<typeof SettingsOperation.OpenPluginRegistry> =
+  SettingsOperation.OpenPluginRegistry.pipe(
+    Operation.withHandler(
+      Effect.fnUntraced(function* () {
+        yield* Operation.invoke(LayoutOperation.SwitchWorkspace, { subject: getSpacePath(REGISTRY_ID) });
+      }),
+    ),
+  );
+
+export default handler;

package/src/translations.ts

@@ -4,26 +4,30 @@
 
 import { type Resource } from '@dxos/react-ui';
 
-import { meta } from './meta';
+import { meta } from '#meta';
 
 export const translations = [
   {
     'en-US': {
       [meta.id]: {
-        'plugin name': 'Registry',
-        'details label': 'Details',
-        'home page label': 'Website',
-        'source label': 'Source',
-        'plugin registry label': 'Plugin Registry',
-        'all plugins label': 'All',
-        'installed plugins label': 'Enabled',
-        'recommended plugins label': 'Recommended',
-        'labs plugins label': 'Labs',
-        'community plugins label': 'Community',
-        'load by url label': 'Load by URL (soon)',
-        'coming soon label': 'Coming soon!',
-        'open plugin registry label': 'Open plugin registry',
-        'settings label': 'Settings',
+        'plugin.name': 'Registry',
+        'details.label': 'Details',
+        'home-page.label': 'Website',
+        'source.label': 'Source',
+        'plugin-registry.label': 'Plugin Registry',
+        'all-plugins.label': 'All',
+        'installed-plugins.label': 'Enabled',
+        'recommended-plugins.label': 'Recommended',
+        'labs-plugins.label': 'Labs',
+        'community-plugins.label': 'Community',
+        'load-by-url.label': 'Load from URL',
+        'load-by-url-dialog.title': 'Load Plugin from URL',
+        'plugin-url.label': 'Plugin URL',
+        'load-plugin.label': 'Load Plugin',
+        'loading.label': 'Loading...',
+        'coming-soon.label': 'Coming soon!',
+        'open-plugin-registry.label': 'Open plugin registry',
+        'settings.label': 'Settings',
       },
     },
   },

package/dist/lib/browser/app-graph-builder-P3ZGGFAR.mjs

@@ -1,166 +0,0 @@
-import {
-  REGISTRY_ID,
-  REGISTRY_KEY,
-  meta
-} from "./chunk-VOAOTNGS.mjs";
-
-// src/capabilities/app-graph-builder/app-graph-builder.ts
-import * as Effect from "effect/Effect";
-import { Capability, Common, SettingsOperation } from "@dxos/app-framework";
-import { Operation } from "@dxos/operation";
-import { GraphBuilder, NodeMatcher } from "@dxos/plugin-graph";
-var app_graph_builder_default = Capability.makeModule(Effect.fnUntraced(function* () {
-  const capabilities = yield* Capability.Service;
-  const extensions = yield* Effect.all([
-    GraphBuilder.createExtension({
-      id: meta.id,
-      match: NodeMatcher.whenRoot,
-      actions: () => Effect.succeed([
-        {
-          id: meta.id,
-          data: () => Operation.invoke(SettingsOperation.OpenPluginRegistry),
-          properties: {
-            label: [
-              "open plugin registry label",
-              {
-                ns: meta.id
-              }
-            ],
-            icon: "ph--squares-four--regular",
-            disposition: "menu"
-          }
-        }
-      ])
-    }),
-    GraphBuilder.createExtension({
-      id: meta.id,
-      match: NodeMatcher.whenRoot,
-      connector: () => Effect.succeed([
-        {
-          id: REGISTRY_ID,
-          type: meta.id,
-          properties: {
-            label: [
-              "plugin registry label",
-              {
-                ns: meta.id
-              }
-            ],
-            icon: "ph--squares-four--regular",
-            disposition: "pin-end",
-            testId: "treeView.pluginRegistry"
-          },
-          nodes: [
-            {
-              id: `${REGISTRY_KEY}+all`,
-              type: "category",
-              data: `${REGISTRY_KEY}+all`,
-              properties: {
-                label: [
-                  "all plugins label",
-                  {
-                    ns: meta.id
-                  }
-                ],
-                icon: "ph--squares-four--regular",
-                key: REGISTRY_KEY,
-                testId: "pluginRegistry.all"
-              }
-            },
-            {
-              id: `${REGISTRY_KEY}+installed`,
-              type: "category",
-              data: `${REGISTRY_KEY}+installed`,
-              properties: {
-                label: [
-                  "installed plugins label",
-                  {
-                    ns: meta.id
-                  }
-                ],
-                icon: "ph--check--regular",
-                key: REGISTRY_KEY,
-                testId: "pluginRegistry.installed"
-              }
-            },
-            {
-              id: `${REGISTRY_KEY}+recommended`,
-              type: "category",
-              data: `${REGISTRY_KEY}+recommended`,
-              properties: {
-                label: [
-                  "recommended plugins label",
-                  {
-                    ns: meta.id
-                  }
-                ],
-                icon: "ph--star--regular",
-                key: REGISTRY_KEY,
-                testId: "pluginRegistry.recommended"
-              }
-            },
-            {
-              id: `${REGISTRY_KEY}+labs`,
-              type: "category",
-              data: `${REGISTRY_KEY}+labs`,
-              properties: {
-                label: [
-                  "labs plugins label",
-                  {
-                    ns: meta.id
-                  }
-                ],
-                icon: "ph--flask--regular",
-                key: REGISTRY_KEY,
-                testId: "pluginRegistry.labs"
-              }
-            }
-          ]
-        }
-      ])
-    }),
-    GraphBuilder.createExtension({
-      id: `${meta.id}/actions`,
-      match: NodeMatcher.whenId(REGISTRY_ID),
-      actions: () => Effect.succeed([
-        {
-          id: `${meta.id}/load-by-url`,
-          data: Effect.fnUntraced(function* () {
-          }),
-          properties: {
-            label: [
-              "load by url label",
-              {
-                ns: meta.id
-              }
-            ],
-            icon: "ph--cloud-arrow-down--regular",
-            disabled: true
-          }
-        }
-      ])
-    }),
-    GraphBuilder.createExtension({
-      id: `${meta.id}/plugins`,
-      match: NodeMatcher.whenId(REGISTRY_ID),
-      connector: () => {
-        const manager = capabilities.get(Common.Capability.PluginManager);
-        return Effect.succeed(manager.getPlugins().map((plugin) => ({
-          id: plugin.meta.id.replaceAll("/", ":"),
-          type: "dxos.org/plugin",
-          data: plugin,
-          properties: {
-            label: plugin.meta.name ?? plugin.meta.id,
-            icon: plugin.meta.icon ?? "ph--circle--regular",
-            disposition: "hidden"
-          }
-        })));
-      }
-    })
-  ]);
-  return Capability.contributes(Common.Capability.AppGraphBuilder, extensions);
-}));
-export {
-  app_graph_builder_default as default
-};
-//# sourceMappingURL=app-graph-builder-P3ZGGFAR.mjs.map