@dxos/plugin-attention 0.8.4-main.84f28bd → 0.8.4-main.8baae0fced

package/package.json

@@ -1,48 +1,86 @@
 {
   "name": "@dxos/plugin-attention",
-  "version": "0.8.4-main.84f28bd",
+  "version": "0.8.4-main.8baae0fced",
   "description": "Plugin for attention",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
-  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
+  "license": "FSL-1.1-Apache-2.0",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#capabilities": {
+      "source": "./src/capabilities/index.ts",
+      "types": "./dist/types/src/capabilities/index.d.ts",
+      "default": "./dist/lib/neutral/capabilities/index.mjs"
+    },
+    "#meta": {
+      "source": "./src/meta.ts",
+      "types": "./dist/types/src/meta.d.ts",
+      "default": "./dist/lib/neutral/meta.mjs"
+    },
+    "#operations": {
+      "source": "./src/operations/index.ts",
+      "types": "./dist/types/src/operations/index.d.ts",
+      "default": "./dist/lib/neutral/operations/index.mjs"
+    },
+    "#plugin": {
+      "source": "./src/AttentionPlugin.ts",
+      "types": "./dist/types/src/AttentionPlugin.d.ts",
+      "default": "./dist/lib/neutral/AttentionPlugin.mjs"
+    },
+    "#types": {
+      "source": "./src/types/index.ts",
+      "types": "./dist/types/src/types/index.d.ts",
+      "default": "./dist/lib/neutral/types/index.mjs"
+    }
+  },
   "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"
+      "default": "./dist/lib/neutral/index.mjs"
+    },
+    "./plugin": {
+      "source": "./src/plugin.ts",
+      "types": "./dist/types/src/plugin.d.ts",
+      "default": "./dist/lib/neutral/plugin.mjs"
+    },
+    "./testing": {
+      "source": "./src/testing.ts",
+      "types": "./dist/types/src/testing.d.ts",
+      "default": "./dist/lib/neutral/testing.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
-  "typesVersions": {
-    "*": {}
-  },
   "files": [
     "dist",
     "src"
   ],
   "dependencies": {
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "effect": "3.16.13",
-    "@dxos/app-framework": "0.8.4-main.84f28bd",
-    "@dxos/echo": "0.8.4-main.84f28bd",
-    "@dxos/echo-schema": "0.8.4-main.84f28bd",
-    "@dxos/echo-signals": "0.8.4-main.84f28bd",
-    "@dxos/keyboard": "0.8.4-main.84f28bd",
-    "@dxos/react-ui-attention": "0.8.4-main.84f28bd"
+    "effect": "3.20.0",
+    "@dxos/app-toolkit": "0.8.4-main.8baae0fced",
+    "@dxos/app-framework": "0.8.4-main.8baae0fced",
+    "@dxos/compute": "0.8.4-main.8baae0fced",
+    "@dxos/plugin-graph": "0.8.4-main.8baae0fced",
+    "@dxos/keyboard": "0.8.4-main.8baae0fced",
+    "@dxos/react-ui-attention": "0.8.4-main.8baae0fced",
+    "@dxos/echo": "0.8.4-main.8baae0fced",
+    "@dxos/util": "0.8.4-main.8baae0fced"
   },
   "devDependencies": {
-    "@types/react": "~18.2.0",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0"
+    "@types/react": "~19.2.7",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3"
   },
   "peerDependencies": {
-    "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0"
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3"
   },
   "publishConfig": {
     "access": "public"

package/src/AttentionPlugin.test.ts

@@ -0,0 +1,32 @@
+//
+// Copyright 2026 DXOS.org
+//
+
+import { describe, test } from 'vitest';
+
+import { ActivationEvents, ProcessManagerPlugin } from '@dxos/app-framework';
+import { createTestApp } from '@dxos/app-framework/testing';
+import { GraphPlugin } from '@dxos/plugin-graph/plugin';
+
+import { AttentionPlugin } from '#plugin';
+
+import { meta } from './meta';
+
+const moduleId = (name: string) => `${meta.id}.module.${name}`;
+
+describe('AttentionPlugin', () => {
+  test('modules activate on the expected events', async ({ expect }) => {
+    await using harness = await createTestApp({
+      plugins: [GraphPlugin(), ProcessManagerPlugin(), AttentionPlugin()],
+    });
+
+    // Modules expected to be active after a normal startup.
+    expect(harness.manager.getActive()).toEqual(
+      expect.arrayContaining([moduleId('attention'), moduleId('ReactContext'), moduleId('Keyboard')]),
+    );
+
+    // OperationHandler fires lazily when an operation is invoked.
+    await harness.fire(ActivationEvents.SetupProcessManager);
+    expect(harness.manager.getActive()).toContain(moduleId('OperationHandler'));
+  });
+});

package/src/AttentionPlugin.ts

@@ -2,40 +2,45 @@
 // Copyright 2025 DXOS.org
 //
 
-import { defineModule, definePlugin, Events, contributes, allOf } from '@dxos/app-framework';
+import * as Effect from 'effect/Effect';
+
+import { ActivationEvent, ActivationEvents, Capabilities, Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { AttentionManager, SelectionManager } from '@dxos/react-ui-attention';
 
-import { AttentionCapabilities, Keyboard, ReactContext } from './capabilities';
-import { AttentionEvents } from './events';
-import { meta } from './meta';
+import { Keyboard, OperationHandler, ReactContext } from '#capabilities';
+import { meta } from '#meta';
+import { AttentionEvents } from '#types';
+import { AttentionCapabilities } from '#types';
 
-export const AttentionPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/attention`,
-      activatesOn: Events.Startup,
-      activatesAfter: [AttentionEvents.AttentionReady],
-      activate: () => {
-        const attention = new AttentionManager();
-        const selection = new SelectionManager();
+export const AttentionPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  Plugin.addModule({
+    id: 'attention',
+    activatesOn: ActivationEvents.Startup,
+    firesAfterActivation: [AttentionEvents.AttentionReady],
+    activate: () =>
+      Effect.gen(function* () {
+        const registry = yield* Capability.get(Capabilities.AtomRegistry);
+        const attention = new AttentionManager(registry);
+        const selection = new SelectionManager(registry);
         setupDevtools(attention);
         return [
-          contributes(AttentionCapabilities.Attention, attention),
-          contributes(AttentionCapabilities.Selection, selection),
+          Capability.contributes(AttentionCapabilities.Attention, attention),
+          Capability.contributes(AttentionCapabilities.Selection, selection),
         ];
-      },
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-context`,
-      activatesOn: Events.Startup,
-      activate: ReactContext,
-    }),
-    defineModule({
-      id: `${meta.id}/module/keyboard`,
-      activatesOn: allOf(Events.AppGraphReady, AttentionEvents.AttentionReady),
-      activate: Keyboard,
-    }),
-  ]);
+      }),
+  }),
+  Plugin.addModule({
+    activatesOn: ActivationEvents.Startup,
+    activate: ReactContext,
+  }),
+  Plugin.addModule({
+    activatesOn: ActivationEvent.allOf(AppActivationEvents.AppGraphReady, AttentionEvents.AttentionReady),
+    activate: Keyboard,
+  }),
+  Plugin.make,
+);
 
 const setupDevtools = (attention: AttentionManager) => {
   (globalThis as any).composer ??= {};
@@ -45,15 +50,17 @@ const setupDevtools = (attention: AttentionManager) => {
       return attention;
     },
     get attended() {
-      return attention.current;
+      return attention.getCurrent();
     },
     get currentSpace() {
-      for (const id of attention.current) {
-        const [spaceId, objectId] = id.split(':');
-        if (spaceId && objectId && spaceId.length === 33) {
-          return spaceId;
+      for (const id of attention.getCurrent()) {
+        const segments = id.split('/');
+        if (segments.length > 1 && segments[1].length === 33) {
+          return segments[1];
         }
       }
     },
   };
 };
+
+export default AttentionPlugin;

package/src/capabilities/index.ts

@@ -2,9 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { lazy } from '@dxos/app-framework';
+import { Capability } from '@dxos/app-framework';
+import { OperationHandlerSet } from '@dxos/compute';
 
-export const Keyboard = lazy(() => import('./keyboard'));
-export const ReactContext = lazy(() => import('./react-context'));
-
-export * from './capabilities';
+export const Keyboard = Capability.lazy('Keyboard', () => import('./keyboard'));
+export const OperationHandler = Capability.lazy<OperationHandlerSet.OperationHandlerSet>(
+  'OperationHandler',
+  () => import('./operation-handler'),
+);
+export const ReactContext = Capability.lazy('ReactContext', () => import('./react-context'));

package/src/capabilities/keyboard.ts

@@ -2,25 +2,24 @@
 // Copyright 2025 DXOS.org
 //
 
-import { effect } from '@preact/signals-core';
-import { Option } from 'effect';
+import * as Effect from 'effect/Effect';
 
-import { Capabilities as AppCapabilities, contributes, type PluginContext } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
 import { Keyboard } from '@dxos/keyboard';
 
-import { AttentionCapabilities } from './capabilities';
+import { AttentionCapabilities } from '#types';
 
-export default (context: PluginContext) => {
-  const { graph } = context.getCapability(AppCapabilities.AppGraph);
-  const attention = context.getCapability(AttentionCapabilities.Attention);
+export default Capability.makeModule(
+  Effect.fnUntraced(function* () {
+    const attention = yield* Capability.get(AttentionCapabilities.Attention);
 
-  const unsubscribe = effect(() => {
-    const id = Array.from(attention.current)[0];
-    const path = id && graph.getPath({ target: id }).pipe(Option.getOrNull);
-    if (path) {
-      Keyboard.singleton.setCurrentContext(path.join('/'));
-    }
-  });
+    const unsubscribe = attention.subscribeCurrent((current) => {
+      const id = current[0];
+      if (id) {
+        Keyboard.singleton.setCurrentContext(id);
+      }
+    });
 
-  return contributes(AppCapabilities.Null, null, () => unsubscribe());
-};
+    return Capability.contributes(Capabilities.Null, null, () => Effect.sync(() => unsubscribe()));
+  }),
+);

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 { AttentionOperationHandlerSet } from '#operations';
+
+export default Capability.makeModule<OperationHandlerSet.OperationHandlerSet>(
+  Effect.fnUntraced(function* () {
+    return Capability.contributes(Capabilities.OperationHandler, AttentionOperationHandlerSet);
+  }),
+);

package/src/capabilities/react-context.tsx

@@ -2,33 +2,38 @@
 // Copyright 2025 DXOS.org
 //
 
+import * as Effect from 'effect/Effect';
 import React, { type PropsWithChildren } from 'react';
 
-import { Capabilities, contributes, useCapability } from '@dxos/app-framework';
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { useCapability } from '@dxos/app-framework/ui';
 import { RootAttentionProvider, SelectionProvider } from '@dxos/react-ui-attention';
 
-import { AttentionCapabilities } from './capabilities';
-import { ATTENTION_PLUGIN } from '../meta';
+import { meta } from '#meta';
+import { AttentionCapabilities } from '#types';
 
-export default () =>
-  contributes(Capabilities.ReactContext, {
-    id: ATTENTION_PLUGIN,
-    context: (props: PropsWithChildren) => {
-      const attention = useCapability(AttentionCapabilities.Attention);
-      const selection = useCapability(AttentionCapabilities.Selection);
+export default Capability.makeModule(() =>
+  Effect.succeed(
+    Capability.contributes(Capabilities.ReactContext, {
+      id: meta.id,
+      context: (props: PropsWithChildren) => {
+        const attention = useCapability(AttentionCapabilities.Attention);
+        const selection = useCapability(AttentionCapabilities.Selection);
 
-      return (
-        <RootAttentionProvider
-          attention={attention}
-          onChange={(nextAttended) => {
-            // TODO(Zan): Workout why this was in deck plugin. It didn't seem to work?
-            // if (layout.values.scrollIntoView && nextAttended.has(layout.values.scrollIntoView)) {
-            //   layout.values.scrollIntoView = undefined;
-            // }
-          }}
-        >
-          <SelectionProvider selection={selection}>{props.children}</SelectionProvider>
-        </RootAttentionProvider>
-      );
-    },
-  });
+        return (
+          <RootAttentionProvider
+            attention={attention}
+            onChange={(nextAttended) => {
+              // TODO(Zan): Workout why this was in deck plugin. It didn't seem to work?
+              // if (layout.values.scrollIntoView && nextAttended.has(layout.values.scrollIntoView)) {
+              //   layout.values.scrollIntoView = undefined;
+              // }
+            }}
+          >
+            <SelectionProvider selection={selection}>{props.children}</SelectionProvider>
+          </RootAttentionProvider>
+        );
+      },
+    }),
+  ),
+);

package/src/index.ts

@@ -2,9 +2,5 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from '@dxos/react-ui-attention';
-
-export * from './AttentionPlugin';
-export { AttentionCapabilities } from './capabilities';
-export * from './events';
 export * from './meta';
+export * from './types';

package/src/meta.ts

@@ -2,11 +2,16 @@
 // Copyright 2024 DXOS.org
 //
 
-import { type PluginMeta } from '@dxos/app-framework';
+import { type Plugin } from '@dxos/app-framework';
+import { trim } from '@dxos/util';
 
-export const ATTENTION_PLUGIN = 'dxos.org/plugin/attention';
-
-export const meta: PluginMeta = {
-  id: ATTENTION_PLUGIN,
+export const meta: Plugin.Meta = {
+  id: 'org.dxos.plugin.attention',
   name: 'Attention',
+  author: 'DXOS',
+  description: trim`
+    Track and manage focused attention on objects across your workspace.
+    Highlight items requiring action and coordinate team focus on priority work.
+  `,
+  tags: ['system'],
 };

package/src/operations/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { OperationHandlerSet } from '@dxos/compute';
+
+export const AttentionOperationHandlerSet = OperationHandlerSet.lazy(() => import('./select'));

package/src/operations/select.ts

@@ -0,0 +1,43 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Match from 'effect/Match';
+
+import { Capability } from '@dxos/app-framework';
+import { LayoutOperation } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/compute';
+
+import { AttentionCapabilities } from '../types';
+
+const handler: Operation.WithHandler<typeof LayoutOperation.Select> = LayoutOperation.Select.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* (input) {
+      const selection = yield* Capability.get(AttentionCapabilities.Selection);
+      Match.value(input.subject).pipe(
+        Match.when({ mode: 'single', id: undefined }, () => {
+          selection.clearSelection(input.contextId);
+        }),
+        Match.when({ mode: 'single' }, (s) => {
+          selection.updateSingle(input.contextId, s.id!);
+        }),
+        Match.when({ mode: 'multi' }, (s) => {
+          selection.updateMulti(input.contextId, s.ids);
+        }),
+        Match.when({ mode: 'range', from: undefined, to: undefined }, () => {
+          selection.clearSelection(input.contextId);
+        }),
+        Match.when({ mode: 'range' }, (s) => {
+          selection.updateRange(input.contextId, s.from!, s.to!);
+        }),
+        Match.when({ mode: 'multi-range' }, (s) => {
+          selection.updateMultiRange(input.contextId, s.ranges);
+        }),
+        Match.exhaustive,
+      );
+    }),
+  ),
+);
+
+export default handler;

package/src/plugin.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const AttentionPlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export { AttentionOperationHandlerSet } from './operations';

package/src/testing.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+// Eager re-export of `AttentionPlugin`. See `@dxos/plugin-testing/src/core.ts`
+// for the rationale.
+export * from './AttentionPlugin';

package/src/types/capabilities.ts

@@ -0,0 +1,13 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capability } from '@dxos/app-framework';
+import { type AttentionManager, type SelectionManager } from '@dxos/react-ui-attention';
+
+import { meta } from '#meta';
+
+export namespace AttentionCapabilities {
+  export const Attention = Capability.make<AttentionManager>(`${meta.id}.capability.attention`);
+  export const Selection = Capability.make<SelectionManager>(`${meta.id}.capability.selection`);
+}

package/src/types/events.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ActivationEvent } from '@dxos/app-framework';
+
+import { meta } from '#meta';
+
+export namespace AttentionEvents {
+  export const AttentionReady = ActivationEvent.make(`${meta.id}.event.attention-ready`);
+}

package/src/types/index.ts

@@ -0,0 +1,7 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export * from './capabilities';
+export * from './events';
+export * from './types';

package/src/types/types.ts

@@ -0,0 +1,21 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+
+import { SelectionSchema } from '@dxos/react-ui-attention';
+
+import { meta } from '#meta';
+
+export namespace AttentionAction {
+  const ATTENTION_ACTION = `${meta.id}.action`;
+
+  export class Select extends Schema.TaggedClass<Select>()(`${ATTENTION_ACTION}.select`, {
+    input: Schema.Struct({
+      contextId: Schema.String,
+      selection: SelectionSchema,
+    }),
+    output: Schema.Void,
+  }) {}
+}

package/dist/lib/browser/chunk-O6FNOKYX.mjs

@@ -1,21 +0,0 @@
-// src/meta.ts
-var ATTENTION_PLUGIN = "dxos.org/plugin/attention";
-var meta = {
-  id: ATTENTION_PLUGIN,
-  name: "Attention"
-};
-
-// src/capabilities/capabilities.ts
-import { defineCapability } from "@dxos/app-framework";
-(function(AttentionCapabilities2) {
-  AttentionCapabilities2.Attention = defineCapability(`${ATTENTION_PLUGIN}/capability/attention`);
-  AttentionCapabilities2.Selection = defineCapability(`${ATTENTION_PLUGIN}/capability/selection`);
-})(AttentionCapabilities || (AttentionCapabilities = {}));
-var AttentionCapabilities;
-
-export {
-  ATTENTION_PLUGIN,
-  meta,
-  AttentionCapabilities
-};
-//# sourceMappingURL=chunk-O6FNOKYX.mjs.map

package/dist/lib/browser/chunk-O6FNOKYX.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/meta.ts", "../../../src/capabilities/capabilities.ts"],
-  "sourcesContent": ["//\n// Copyright 2024 DXOS.org\n//\n\nimport { type PluginMeta } from '@dxos/app-framework';\n\nexport const ATTENTION_PLUGIN = 'dxos.org/plugin/attention';\n\nexport const meta: PluginMeta = {\n  id: ATTENTION_PLUGIN,\n  name: 'Attention',\n};\n", "//\n// Copyright 2025 DXOS.org\n//\n\nimport { defineCapability } from '@dxos/app-framework';\nimport { type SelectionManager, type AttentionManager } from '@dxos/react-ui-attention';\n\nimport { ATTENTION_PLUGIN } from '../meta';\n\nexport namespace AttentionCapabilities {\n  export const Attention = defineCapability<AttentionManager>(`${ATTENTION_PLUGIN}/capability/attention`);\n  export const Selection = defineCapability<SelectionManager>(`${ATTENTION_PLUGIN}/capability/selection`);\n}\n"],
-  "mappings": ";AAMO,IAAMA,mBAAmB;AAEzB,IAAMC,OAAmB;EAC9BC,IAAIF;EACJG,MAAM;AACR;;;ACPA,SAASC,wBAAwB;UAKhBC,wBAAAA;yBACFC,YAAYC,iBAAmC,GAAGC,gBAAAA,uBAAuC;yBACzFC,YAAYF,iBAAmC,GAAGC,gBAAAA,uBAAuC;AACxG,GAHiBH,0BAAAA,wBAAAA,CAAAA,EAAAA;;",
-  "names": ["ATTENTION_PLUGIN", "meta", "id", "name", "defineCapability", "AttentionCapabilities", "Attention", "defineCapability", "ATTENTION_PLUGIN", "Selection"]
-}