@dxos/plugin-thread 0.8.4-main.70d3990 → 0.8.4-main.74a063c4e0

package/package.json

@@ -1,30 +1,63 @@
 {
   "name": "@dxos/plugin-thread",
-  "version": "0.8.4-main.70d3990",
+  "version": "0.8.4-main.74a063c4e0",
   "description": "DXOS Threads Surface plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/dxos/dxos"
+  },
   "license": "MIT",
   "author": "DXOS.org",
   "sideEffects": true,
   "type": "module",
+  "imports": {
+    "#blueprints": "./src/blueprints/index.ts",
+    "#capabilities": "./src/capabilities/index.ts",
+    "#components": "./src/components/index.ts",
+    "#containers": "./src/containers/index.ts",
+    "#hooks": "./src/hooks/index.ts",
+    "#meta": "./src/meta.ts",
+    "#operations": "./src/operations/index.ts",
+    "#testing": "./src/testing/index.ts",
+    "#types": "./src/types/index.ts"
+  },
   "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"
+      "node": "./dist/lib/node-esm/index.mjs",
+      "types": "./dist/types/src/index.d.ts"
+    },
+    "./blueprints": {
+      "source": "./src/blueprints/index.ts",
+      "browser": "./dist/lib/browser/blueprints/index.mjs",
+      "node": "./dist/lib/node-esm/blueprints/index.mjs",
+      "types": "./dist/types/src/blueprints/index.d.ts"
+    },
+    "./operations": {
+      "source": "./src/operations/index.ts",
+      "browser": "./dist/lib/browser/operations/index.mjs",
+      "node": "./dist/lib/node-esm/operations/index.mjs",
+      "types": "./dist/types/src/operations/index.d.ts"
     },
     "./types": {
       "source": "./src/types/index.ts",
-      "types": "./dist/types/src/types/index.d.ts",
       "browser": "./dist/lib/browser/types/index.mjs",
-      "node": "./dist/lib/node-esm/types/index.mjs"
+      "node": "./dist/lib/node-esm/types/index.mjs",
+      "types": "./dist/types/src/types/index.d.ts"
     }
   },
   "types": "dist/types/src/index.d.ts",
   "typesVersions": {
     "*": {
+      "blueprints": [
+        "dist/types/src/blueprints/index.d.ts"
+      ],
+      "operations": [
+        "dist/types/src/operations/index.d.ts"
+      ],
       "types": [
         "dist/types/src/types/index.d.ts"
       ]
@@ -38,80 +71,86 @@
     "@codemirror/language": "^6.11.3",
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.4",
-    "@effect/ai": "0.29.1",
-    "@effect/experimental": "0.56.0",
+    "@effect-atom/atom": "^0.5.1",
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/ai": "0.33.2",
+    "@effect/experimental": "0.58.0",
     "@peermetrics/webrtc-stats": "5.7.1",
-    "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.12.1",
-    "date-fns": "^3.3.1",
+    "date-fns": "^3.6.0",
     "extendable-media-recorder": "^9.2.19",
     "extendable-media-recorder-wav-encoder": "^7.0.123",
     "md5-hex": "5.0.0",
     "react-resize-detector": "^11.0.1",
     "wavefile": "^11.0.0",
-    "@dxos/app-framework": "0.8.4-main.70d3990",
-    "@dxos/assistant": "0.8.4-main.70d3990",
-    "@dxos/codec-protobuf": "0.8.4-main.70d3990",
-    "@dxos/blueprints": "0.8.4-main.70d3990",
-    "@dxos/context": "0.8.4-main.70d3990",
-    "@dxos/devtools": "0.8.4-main.70d3990",
-    "@dxos/display-name": "0.8.4-main.70d3990",
-    "@dxos/debug": "0.8.4-main.70d3990",
-    "@dxos/echo": "0.8.4-main.70d3990",
-    "@dxos/echo-db": "0.8.4-main.70d3990",
-    "@dxos/invariant": "0.8.4-main.70d3990",
-    "@dxos/keys": "0.8.4-main.70d3990",
-    "@dxos/live-object": "0.8.4-main.70d3990",
-    "@dxos/functions": "0.8.4-main.70d3990",
-    "@dxos/async": "0.8.4-main.70d3990",
-    "@dxos/local-storage": "0.8.4-main.70d3990",
-    "@dxos/plugin-attention": "0.8.4-main.70d3990",
-    "@dxos/plugin-deck": "0.8.4-main.70d3990",
-    "@dxos/plugin-client": "0.8.4-main.70d3990",
-    "@dxos/log": "0.8.4-main.70d3990",
-    "@dxos/plugin-graph": "0.8.4-main.70d3990",
-    "@dxos/plugin-observability": "0.8.4-main.70d3990",
-    "@dxos/plugin-markdown": "0.8.4-main.70d3990",
-    "@dxos/protocols": "0.8.4-main.70d3990",
-    "@dxos/react-client": "0.8.4-main.70d3990",
-    "@dxos/react-ui-attention": "0.8.4-main.70d3990",
-    "@dxos/plugin-space": "0.8.4-main.70d3990",
-    "@dxos/react-ui-dnd": "0.8.4-main.70d3990",
-    "@dxos/react-ui-editor": "0.8.4-main.70d3990",
-    "@dxos/react-ui-form": "0.8.4-main.70d3990",
-    "@dxos/react-ui-menu": "0.8.4-main.70d3990",
-    "@dxos/react-ui-sfx": "0.8.4-main.70d3990",
-    "@dxos/react-ui-stack": "0.8.4-main.70d3990",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.70d3990",
-    "@dxos/react-ui-tabs": "0.8.4-main.70d3990",
-    "@dxos/react-ui-thread": "0.8.4-main.70d3990",
-    "@dxos/util": "0.8.4-main.70d3990",
-    "@dxos/types": "0.8.4-main.70d3990",
-    "@dxos/schema": "0.8.4-main.70d3990"
+    "@dxos/app-framework": "0.8.4-main.74a063c4e0",
+    "@dxos/assistant": "0.8.4-main.74a063c4e0",
+    "@dxos/app-toolkit": "0.8.4-main.74a063c4e0",
+    "@dxos/async": "0.8.4-main.74a063c4e0",
+    "@dxos/debug": "0.8.4-main.74a063c4e0",
+    "@dxos/context": "0.8.4-main.74a063c4e0",
+    "@dxos/codec-protobuf": "0.8.4-main.74a063c4e0",
+    "@dxos/echo": "0.8.4-main.74a063c4e0",
+    "@dxos/devtools": "0.8.4-main.74a063c4e0",
+    "@dxos/display-name": "0.8.4-main.74a063c4e0",
+    "@dxos/echo-db": "0.8.4-main.74a063c4e0",
+    "@dxos/echo-react": "0.8.4-main.74a063c4e0",
+    "@dxos/functions": "0.8.4-main.74a063c4e0",
+    "@dxos/effect": "0.8.4-main.74a063c4e0",
+    "@dxos/keys": "0.8.4-main.74a063c4e0",
+    "@dxos/operation": "0.8.4-main.74a063c4e0",
+    "@dxos/invariant": "0.8.4-main.74a063c4e0",
+    "@dxos/log": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-attention": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-client": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-deck": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-markdown": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-graph": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-observability": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-settings": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-space": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-attention": "0.8.4-main.74a063c4e0",
+    "@dxos/protocols": "0.8.4-main.74a063c4e0",
+    "@dxos/react-client": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-editor": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-menu": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-form": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-dnd": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-mosaic": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-sfx": "0.8.4-main.74a063c4e0",
+    "@dxos/blueprints": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-tabs": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-thread": "0.8.4-main.74a063c4e0",
+    "@dxos/schema": "0.8.4-main.74a063c4e0",
+    "@dxos/types": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui-stack": "0.8.4-main.74a063c4e0",
+    "@dxos/ui-editor": "0.8.4-main.74a063c4e0",
+    "@dxos/util": "0.8.4-main.74a063c4e0"
   },
   "devDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "0.92.1",
-    "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.2",
-    "effect": "3.18.3",
-    "react": "~19.2.0",
-    "react-dom": "~19.2.0",
-    "vite": "7.1.9",
-    "@dxos/plugin-theme": "0.8.4-main.70d3990",
-    "@dxos/react-ui": "0.8.4-main.70d3990",
-    "@dxos/random": "0.8.4-main.70d3990",
-    "@dxos/storybook-utils": "0.8.4-main.70d3990",
-    "@dxos/react-ui-theme": "0.8.4-main.70d3990"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "@types/react": "~19.2.7",
+    "@types/react-dom": "~19.2.3",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "vite": "^7.1.11",
+    "@dxos/plugin-theme": "0.8.4-main.74a063c4e0",
+    "@dxos/random": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui": "0.8.4-main.74a063c4e0",
+    "@dxos/storybook-utils": "0.8.4-main.74a063c4e0",
+    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
+    "@dxos/plugin-testing": "0.8.4-main.74a063c4e0"
   },
   "peerDependencies": {
-    "@effect-atom/atom-react": "^0.3.4",
-    "@effect/platform": "^0.80.12",
-    "effect": "^3.13.3",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "@dxos/react-ui": "0.8.4-main.70d3990",
-    "@dxos/react-ui-theme": "0.8.4-main.70d3990"
+    "@effect-atom/atom-react": "^0.5.0",
+    "@effect/platform": "0.94.4",
+    "effect": "3.20.0",
+    "react": "~19.2.3",
+    "react-dom": "~19.2.3",
+    "@dxos/ui-theme": "0.8.4-main.74a063c4e0",
+    "@dxos/react-ui": "0.8.4-main.74a063c4e0"
   },
   "publishConfig": {
     "access": "public"

package/src/ThreadPlugin.tsx

@@ -2,12 +2,17 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
-import { Ref, Type } from '@dxos/echo';
-import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
+import * as Effect from 'effect/Effect';
+import * as Option from 'effect/Option';
+
+import { Capability, Plugin } from '@dxos/app-framework';
+import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
+import { Annotation, Ref, Type } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
+import { ClientEvents } from '@dxos/plugin-client/types';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
-import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { type CreateObjectIntent } from '@dxos/plugin-space/types';
+import { SpaceOperation } from '@dxos/plugin-space/operations';
+import { SpaceCapabilities, SpaceEvents, type CreateObject } from '@dxos/plugin-space/types';
 import { translations as threadTranslations } from '@dxos/react-ui-thread';
 import { AnchoredTo, Message, Thread } from '@dxos/types';
 
@@ -15,77 +20,55 @@ import {
   AppGraphBuilder,
   BlueprintDefinition,
   CallManager,
-  IntentResolver,
   Markdown,
+  OperationHandler,
+  UndoMappings,
   ReactRoot,
   ReactSurface,
-  Repair,
   ThreadState,
-} from './capabilities';
-import { THREAD_ITEM, meta } from './meta';
+} from '#capabilities';
+import { THREAD_ITEM, meta } from '#meta';
+import { ThreadOperation } from '#operations';
+import { Channel } from '#types';
+
 import { translations } from './translations';
-import { Channel, ThreadAction } from './types';
 
 // TODO(Zan): Every instance of `cursor` should be replaced with `anchor`.
 //  NOTE(burdon): Review/discuss CursorConverter semantics.
 
 // TODO(wittjosiah): Rename to ChatPlugin.
 // TODO(wittjosiah): Enabling comments should likely be factored out of this plugin but depend on it's capabilities.
-export const ThreadPlugin = definePlugin(meta, () => [
-  defineModule({
-    id: `${meta.id}/module/call-manager`,
-    activatesOn: ClientEvents.ClientReady,
-    activate: CallManager,
-  }),
-  // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
-  // defineModule({
-  //   id: `${meta.id}/module/settings`,
-  //   activatesOn: Events.SetupSettings,
-  //   activate: ThreadSettings,
-  // }),
-  defineModule({
-    id: `${meta.id}/module/state`,
-    // TODO(wittjosiah): Does not integrate with settings store.
-    //   Should this be a different event?
-    //   Should settings store be renamed to be more generic?
-    activatesOn: Events.SetupSettings,
-    activate: ThreadState,
-  }),
-  defineModule({
-    id: `${meta.id}/module/translations`,
-    activatesOn: Events.SetupTranslations,
-    activate: () => contributes(Capabilities.Translations, [...translations, ...threadTranslations]),
-  }),
-  defineModule({
-    id: `${meta.id}/module/metadata`,
-    activatesOn: Events.SetupMetadata,
-    activate: () => [
-      contributes(Capabilities.Metadata, {
+
+export const ThreadPlugin = Plugin.define(meta).pipe(
+  AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
+  AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
+  AppPlugin.addMetadataModule({
+    metadata: [
+      {
         id: Type.getTypename(Channel.Channel),
         metadata: {
-          icon: 'ph--hash--regular',
-          iconHue: 'rose',
-          createObjectIntent: ((_, options) =>
-            createIntent(ThreadAction.CreateChannel, {
-              spaceId: options.space.id,
-            })) satisfies CreateObjectIntent,
+          icon: Annotation.IconAnnotation.get(Channel.Channel).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Channel.Channel).pipe(Option.getOrThrow).hue ?? 'white',
+          createObject: ((props, options) =>
+            Effect.gen(function* () {
+              const object = Channel.make(props);
+              return yield* Operation.invoke(SpaceOperation.AddObject, {
+                object,
+                target: options.target,
+                hidden: true,
+                targetNodeId: options.targetNodeId,
+              });
+            })) satisfies CreateObject,
         },
-      }),
-      contributes(Capabilities.Metadata, {
+      },
+      {
         id: Type.getTypename(Thread.Thread),
         metadata: {
           // TODO(wittjosiah): Move out of metadata.
           loadReferences: async (thread: Thread.Thread) => await Ref.Array.loadAll(thread.messages ?? []),
         },
-      }),
-      contributes(Capabilities.Metadata, {
-        id: Message.Message.typename,
-        metadata: {
-          // TODO(wittjosiah): Move out of metadata.
-          loadReferences: () => [], // loadObjectReferences(message, (message) => [...message.parts, message.context]),
-        },
-      }),
-      contributes(Capabilities.Metadata, {
+      },
+      {
         id: THREAD_ITEM,
         metadata: {
           parse: (item: Thread.Thread, type: string) => {
@@ -99,65 +82,50 @@ export const ThreadPlugin = definePlugin(meta, () => [
             }
           },
         },
-      }),
+      },
     ],
   }),
-  defineModule({
-    id: `${meta.id}/module/schema`,
-    activatesOn: ClientEvents.SetupSchema,
-    activate: () =>
-      contributes(ClientCapabilities.Schema, [
-        AnchoredTo.AnchoredTo,
-        Channel.Channel,
-        Message.Message,
-        Message.MessageV1,
-        Thread.Thread,
-      ]),
+  AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
+  AppPlugin.addOperationHandlerModule({ id: 'undo-mappings', activate: UndoMappings }),
+  AppPlugin.addReactRootModule({ activate: ReactRoot }),
+  AppPlugin.addSchemaModule({
+    schema: [AnchoredTo.AnchoredTo, Channel.Channel, Message.Message, Thread.Thread],
   }),
-  defineModule({
-    id: `${meta.id}/module/migration`,
-    activatesOn: ClientEvents.SetupMigration,
-    activate: () => contributes(ClientCapabilities.Migration, [Message.MessageV1ToV2]),
+  AppPlugin.addSurfaceModule({ activate: ReactSurface }),
+  AppPlugin.addTranslationsModule({ translations: [...translations, ...threadTranslations] }),
+  Plugin.addModule({
+    id: 'call-manager',
+    activatesOn: ClientEvents.ClientReady,
+    activate: CallManager,
+  }),
+  // TODO(wittjosiah): Currently not used but leaving because there will likely be settings for threads again.
+  // Plugin.addModule({
+  //   id: 'settings',
+  //   activatesOn: Events.SetupSettings,
+  //   activate: ThreadSettings,
+  // }),
+  Plugin.addModule({
+    id: 'state',
+    // TODO(wittjosiah): Does not integrate with settings store.
+    //   Should this be a different event?
+    //   Should settings store be renamed to be more generic?
+    activatesOn: AppActivationEvents.SetupSettings,
+    activate: ThreadState,
   }),
-  defineModule({
-    id: `${meta.id}/module/on-space-created`,
+  Plugin.addModule({
+    id: 'on-space-created',
     activatesOn: SpaceEvents.SpaceCreated,
     activate: () =>
-      contributes(SpaceCapabilities.OnCreateSpace, (params) => createIntent(ThreadAction.OnCreateSpace, params)),
+      Effect.succeed(
+        Capability.contributes(SpaceCapabilities.OnCreateSpace, (params) =>
+          Operation.invoke(ThreadOperation.OnCreateSpace, params),
+        ),
+      ),
   }),
-  defineModule({
-    id: `${meta.id}/module/repair`,
-    activatesOn: ClientEvents.SpacesReady,
-    activate: Repair,
-  }),
-  defineModule({
-    id: `${meta.id}/module/markdown`,
+  Plugin.addModule({
+    id: 'markdown',
     activatesOn: MarkdownEvents.SetupExtensions,
     activate: Markdown,
   }),
-  defineModule({
-    id: `${meta.id}/module/react-root`,
-    activatesOn: Events.Startup,
-    activate: ReactRoot,
-  }),
-  defineModule({
-    id: `${meta.id}/module/react-surface`,
-    activatesOn: Events.SetupReactSurface,
-    activate: ReactSurface,
-  }),
-  defineModule({
-    id: `${meta.id}/module/intent-resolver`,
-    activatesOn: Events.SetupIntentResolver,
-    activate: IntentResolver,
-  }),
-  defineModule({
-    id: `${meta.id}/module/app-graph-builder`,
-    activatesOn: Events.SetupAppGraph,
-    activate: AppGraphBuilder,
-  }),
-  defineModule({
-    id: `${meta.id}/module/blueprint`,
-    activatesOn: Events.SetupArtifactDefinition,
-    activate: BlueprintDefinition,
-  }),
-]);
+  Plugin.make,
+);

package/src/blueprints/index.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export { default as ThreadBlueprint } from './thread-blueprint';

package/src/blueprints/thread-blueprint.ts

@@ -0,0 +1,37 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type AppCapabilities } from '@dxos/app-toolkit';
+import { Blueprint, Template } from '@dxos/blueprints';
+import { trim } from '@dxos/util';
+
+import { ThreadOperation } from '#operations';
+
+const BLUEPRINT_KEY = 'org.dxos.blueprint.thread';
+
+const make = () =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Thread',
+    tools: Blueprint.toolDefinitions({ operations: [ThreadOperation.CreateProposals] }),
+    instructions: Template.make({
+      // TODO(wittjosiah): Move example to function input schema annotation.
+      source: trim`
+        You can update markdown documents via proposals.
+        For each diff, respond with the smallest possible matching span.
+        For example:
+          - "There is a tyop in this sentence."
+          + "There is a typo in this sentence."
+          - "This id goof."
+          + "This is good."
+      `,
+    }),
+  });
+
+const blueprint: AppCapabilities.BlueprintDefinition = {
+  key: BLUEPRINT_KEY,
+  make,
+};
+
+export default blueprint;