@dxos/plugin-assistant 0.8.3 → 0.8.4-main.1da679c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.3",
+  "version": "0.8.4-main.1da679c",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,11 +10,13 @@
   "type": "module",
   "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"
     },
     "./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"
@@ -34,108 +36,137 @@
     "src"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.18.1",
-    "@codemirror/language": "^6.10.3",
-    "@codemirror/search": "^6.5.6",
-    "@codemirror/state": "^6.4.1",
-    "@codemirror/view": "^6.34.1",
+    "@codemirror/autocomplete": "^6.18.7",
+    "@codemirror/language": "^6.11.3",
+    "@codemirror/search": "^6.5.11",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.2",
+    "@effect/ai": "0.25.2",
+    "@effect/ai-anthropic": "^0.16.1",
+    "@effect/ai-openai": "^0.29.1",
+    "@effect/platform-browser": "0.70.0",
     "@lezer/highlight": "^1.2.1",
+    "@lezer/markdown": "^1.3.1",
     "@preact-signals/safe-react": "^0.9.0",
     "@preact/signals-core": "^1.9.0",
-    "@xiechao/codemirror-lang-handlebars": "1.0.4",
+    "@preact/signals-react": "^3.2.0",
+    "@radix-ui/react-context": "1.1.1",
+    "effect": "3.17.7",
     "exa-js": "^1.5.12",
     "json5": "^2.2.3",
     "jsonpointer": "^5.0.1",
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
-    "@dxos/ai": "0.8.3",
-    "@dxos/app-framework": "0.8.3",
-    "@dxos/artifact": "0.8.3",
-    "@dxos/assistant": "0.8.3",
-    "@dxos/client": "0.8.3",
-    "@dxos/compute": "0.8.3",
-    "@dxos/conductor": "0.8.3",
-    "@dxos/config": "0.8.3",
-    "@dxos/async": "0.8.3",
-    "@dxos/context": "0.8.3",
-    "@dxos/debug": "0.8.3",
-    "@dxos/devtools": "0.8.3",
-    "@dxos/echo-db": "0.8.3",
-    "@dxos/echo-protocol": "0.8.3",
-    "@dxos/echo-schema": "0.8.3",
-    "@dxos/edge-client": "0.8.3",
-    "@dxos/echo": "0.8.3",
-    "@dxos/effect": "0.8.3",
-    "@dxos/graph": "0.8.3",
-    "@dxos/invariant": "0.8.3",
-    "@dxos/keys": "0.8.3",
-    "@dxos/functions": "0.8.3",
-    "@dxos/live-object": "0.8.3",
-    "@dxos/log": "0.8.3",
-    "@dxos/plugin-client": "0.8.3",
-    "@dxos/local-storage": "0.8.3",
-    "@dxos/plugin-explorer": "0.8.3",
-    "@dxos/plugin-deck": "0.8.3",
-    "@dxos/plugin-inbox": "0.8.3",
-    "@dxos/plugin-graph": "0.8.3",
-    "@dxos/plugin-markdown": "0.8.3",
-    "@dxos/plugin-sketch": "0.8.3",
-    "@dxos/plugin-script": "0.8.3",
-    "@dxos/plugin-space": "0.8.3",
-    "@dxos/plugin-stack": "0.8.3",
-    "@dxos/plugin-preview": "0.8.3",
-    "@dxos/plugin-transcription": "0.8.3",
-    "@dxos/plugin-wnfs": "0.8.3",
-    "@dxos/protocols": "0.8.3",
-    "@dxos/react-edge-client": "0.8.3",
-    "@dxos/react-client": "0.8.3",
-    "@dxos/react-ui-attention": "0.8.3",
-    "@dxos/react-ui-canvas-compute": "0.8.3",
-    "@dxos/react-ui-components": "0.8.3",
-    "@dxos/react-ui-dnd": "0.8.3",
-    "@dxos/react-ui-editor": "0.8.3",
-    "@dxos/react-ui-canvas-editor": "0.8.3",
-    "@dxos/react-ui-form": "0.8.3",
-    "@dxos/react-ui-list": "0.8.3",
-    "@dxos/react-ui-graph": "0.8.3",
-    "@dxos/react-ui-sfx": "0.8.3",
-    "@dxos/util": "0.8.3",
-    "@dxos/schema": "0.8.3",
-    "@dxos/react-ui-stack": "0.8.3",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3"
+    "use-deep-compare-effect": "^1.8.1",
+    "@dxos/ai": "0.8.4-main.1da679c",
+    "@dxos/app-framework": "0.8.4-main.1da679c",
+    "@dxos/assistant-testing": "0.8.4-main.1da679c",
+    "@dxos/async": "0.8.4-main.1da679c",
+    "@dxos/client": "0.8.4-main.1da679c",
+    "@dxos/compute": "0.8.4-main.1da679c",
+    "@dxos/config": "0.8.4-main.1da679c",
+    "@dxos/blueprints": "0.8.4-main.1da679c",
+    "@dxos/context": "0.8.4-main.1da679c",
+    "@dxos/assistant": "0.8.4-main.1da679c",
+    "@dxos/debug": "0.8.4-main.1da679c",
+    "@dxos/conductor": "0.8.4-main.1da679c",
+    "@dxos/devtools": "0.8.4-main.1da679c",
+    "@dxos/echo": "0.8.4-main.1da679c",
+    "@dxos/echo-db": "0.8.4-main.1da679c",
+    "@dxos/echo-schema": "0.8.4-main.1da679c",
+    "@dxos/echo-protocol": "0.8.4-main.1da679c",
+    "@dxos/edge-client": "0.8.4-main.1da679c",
+    "@dxos/effect": "0.8.4-main.1da679c",
+    "@dxos/functions": "0.8.4-main.1da679c",
+    "@dxos/graph": "0.8.4-main.1da679c",
+    "@dxos/invariant": "0.8.4-main.1da679c",
+    "@dxos/lit-ui": "0.8.4-main.1da679c",
+    "@dxos/live-object": "0.8.4-main.1da679c",
+    "@dxos/local-storage": "0.8.4-main.1da679c",
+    "@dxos/log": "0.8.4-main.1da679c",
+    "@dxos/plugin-automation": "0.8.4-main.1da679c",
+    "@dxos/plugin-attention": "0.8.4-main.1da679c",
+    "@dxos/plugin-board": "0.8.4-main.1da679c",
+    "@dxos/keys": "0.8.4-main.1da679c",
+    "@dxos/plugin-deck": "0.8.4-main.1da679c",
+    "@dxos/plugin-client": "0.8.4-main.1da679c",
+    "@dxos/plugin-explorer": "0.8.4-main.1da679c",
+    "@dxos/plugin-graph": "0.8.4-main.1da679c",
+    "@dxos/plugin-markdown": "0.8.4-main.1da679c",
+    "@dxos/plugin-preview": "0.8.4-main.1da679c",
+    "@dxos/plugin-script": "0.8.4-main.1da679c",
+    "@dxos/plugin-space": "0.8.4-main.1da679c",
+    "@dxos/plugin-transcription": "0.8.4-main.1da679c",
+    "@dxos/plugin-wnfs": "0.8.4-main.1da679c",
+    "@dxos/plugin-sketch": "0.8.4-main.1da679c",
+    "@dxos/protocols": "0.8.4-main.1da679c",
+    "@dxos/react-client": "0.8.4-main.1da679c",
+    "@dxos/react-edge-client": "0.8.4-main.1da679c",
+    "@dxos/react-ui-attention": "0.8.4-main.1da679c",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.1da679c",
+    "@dxos/plugin-stack": "0.8.4-main.1da679c",
+    "@dxos/react-ui-chat": "0.8.4-main.1da679c",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.1da679c",
+    "@dxos/react-ui-components": "0.8.4-main.1da679c",
+    "@dxos/react-ui-editor": "0.8.4-main.1da679c",
+    "@dxos/react-ui-form": "0.8.4-main.1da679c",
+    "@dxos/react-ui-graph": "0.8.4-main.1da679c",
+    "@dxos/react-ui-list": "0.8.4-main.1da679c",
+    "@dxos/react-ui-searchlist": "0.8.4-main.1da679c",
+    "@dxos/react-ui-menu": "0.8.4-main.1da679c",
+    "@dxos/react-ui-sfx": "0.8.4-main.1da679c",
+    "@dxos/react-ui-stack": "0.8.4-main.1da679c",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.1da679c",
+    "@dxos/schema": "0.8.4-main.1da679c",
+    "@dxos/react-ui-tabs": "0.8.4-main.1da679c",
+    "@dxos/util": "0.8.4-main.1da679c",
+    "@dxos/react-ui-tag-picker": "0.8.4-main.1da679c"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
+    "@effect-rx/rx-react": "^0.38.0",
+    "@effect/platform": "0.90.2",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~18.2.0",
     "@types/react-dom": "~18.2.0",
-    "effect": "3.14.21",
+    "effect": "3.17.7",
     "openapi-types": "^12.1.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.3",
-    "@dxos/echo-db": "0.8.3",
-    "@dxos/plugin-inbox": "0.8.3",
-    "@dxos/plugin-chess": "0.8.3",
-    "@dxos/plugin-map": "0.8.3",
-    "@dxos/plugin-table": "0.8.3",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-menu": "0.8.3",
-    "@dxos/random": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3",
-    "@dxos/storybook-utils": "0.8.3",
-    "@dxos/plugin-markdown": "0.8.3"
+    "vite": "7.1.1",
+    "@dxos/assistant-testing": "0.8.4-main.1da679c",
+    "@dxos/devtools": "0.8.4-main.1da679c",
+    "@dxos/echo-db": "0.8.4-main.1da679c",
+    "@dxos/plugin-attention": "0.8.4-main.1da679c",
+    "@dxos/plugin-board": "0.8.4-main.1da679c",
+    "@dxos/plugin-chess": "0.8.4-main.1da679c",
+    "@dxos/plugin-inbox": "0.8.4-main.1da679c",
+    "@dxos/plugin-map": "0.8.4-main.1da679c",
+    "@dxos/plugin-markdown": "0.8.4-main.1da679c",
+    "@dxos/plugin-preview": "0.8.4-main.1da679c",
+    "@dxos/plugin-project": "0.8.4-main.1da679c",
+    "@dxos/plugin-script": "0.8.4-main.1da679c",
+    "@dxos/plugin-stack": "0.8.4-main.1da679c",
+    "@dxos/plugin-sketch": "0.8.4-main.1da679c",
+    "@dxos/plugin-table": "0.8.4-main.1da679c",
+    "@dxos/plugin-theme": "0.8.4-main.1da679c",
+    "@dxos/plugin-thread": "0.8.4-main.1da679c",
+    "@dxos/plugin-token-manager": "0.8.4-main.1da679c",
+    "@dxos/plugin-wnfs": "0.8.4-main.1da679c",
+    "@dxos/random": "0.8.4-main.1da679c",
+    "@dxos/react-ui-menu": "0.8.4-main.1da679c",
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/react-ui-table": "0.8.4-main.1da679c",
+    "@dxos/storybook-utils": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
-    "@effect/platform": "0.80.12",
+    "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3",
-    "@dxos/react-ui-theme": "0.8.3"
+    "@dxos/react-ui": "0.8.4-main.1da679c",
+    "@dxos/react-ui-theme": "0.8.4-main.1da679c"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -2,28 +2,31 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Effect } from 'effect';
-
-import {
-  Capabilities,
-  Events,
-  allOf,
-  contributes,
-  createIntent,
-  defineModule,
-  definePlugin,
-} from '@dxos/app-framework';
-import { Blueprint } from '@dxos/assistant';
-import { Ref, Type } from '@dxos/echo';
+import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
+import { ResearchGraph, ResearchOn } from '@dxos/assistant-testing';
+import { Blueprint, Prompt } from '@dxos/blueprints';
+import { Sequence } from '@dxos/conductor';
+import { Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
 import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
-import { CollectionAction, defineObjectForm } from '@dxos/plugin-space/types';
+import { defineObjectForm } from '@dxos/plugin-space/types';
 
-import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, Settings } from './capabilities';
+import {
+  AiService,
+  AppGraphBuilder,
+  AssistantState,
+  BlueprintDefinition,
+  EdgeModelResolver,
+  IntentResolver,
+  LocalModelResolver,
+  ReactSurface,
+  Settings,
+  Toolkit,
+} from './capabilities';
 import { AssistantEvents } from './events';
 import { meta } from './meta';
-import translations from './translations';
-import { AssistantAction, AIChatType, ServiceType, TemplateType, CompanionTo } from './types';
+import { translations } from './translations';
+import { Assistant, AssistantAction, ServiceType } from './types';
 
 export const AssistantPlugin = () =>
   definePlugin(meta, [
@@ -37,20 +40,34 @@ export const AssistantPlugin = () =>
       activatesOn: Events.SetupSettings,
       activate: Settings,
     }),
+    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: AssistantState,
+    }),
     defineModule({
       id: `${meta.id}/module/metadata`,
       activatesOn: Events.SetupMetadata,
       activate: () => [
         contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Blueprint),
+          id: Type.getTypename(Assistant.Chat),
+          metadata: {
+            icon: 'ph--atom--regular',
+          },
+        }),
+        contributes(Capabilities.Metadata, {
+          id: Type.getTypename(Blueprint.Blueprint),
           metadata: {
             icon: 'ph--blueprint--regular',
           },
         }),
         contributes(Capabilities.Metadata, {
-          id: Type.getTypename(AIChatType),
+          id: Type.getTypename(Sequence),
           metadata: {
-            icon: 'ph--atom--regular',
+            icon: 'ph--circuitry--regular',
           },
         }),
       ],
@@ -62,15 +79,23 @@ export const AssistantPlugin = () =>
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
-            objectSchema: AIChatType,
+            objectSchema: Assistant.Chat,
             getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
           }),
         ),
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
-            objectSchema: Blueprint,
-            getIntent: () => createIntent(AssistantAction.CreateBlueprint),
+            objectSchema: Blueprint.Blueprint,
+            formSchema: AssistantAction.BlueprintForm,
+            getIntent: (props) => createIntent(AssistantAction.CreateBlueprint, props),
+          }),
+        ),
+        contributes(
+          SpaceCapabilities.ObjectForm,
+          defineObjectForm({
+            objectSchema: Sequence,
+            getIntent: () => createIntent(AssistantAction.CreateSequence),
           }),
         ),
       ],
@@ -78,26 +103,22 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, TemplateType, CompanionTo]),
+      activate: () =>
+        contributes(ClientCapabilities.Schema, [
+          ServiceType,
+          Assistant.CompanionTo,
+          ResearchGraph,
+          ResearchOn,
+          Prompt.Prompt,
+        ]),
     }),
     defineModule({
       id: `${meta.id}/module/on-space-created`,
       activatesOn: SpaceEvents.SpaceCreated,
-      activate: (context) => {
-        const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
-        return contributes(SpaceCapabilities.OnSpaceCreated, async ({ space, rootCollection }) => {
-          const program = Effect.gen(function* () {
-            const { object: collection } = yield* dispatch(
-              createIntent(CollectionAction.CreateQueryCollection, { typename: Type.getTypename(AIChatType) }),
-            );
-            rootCollection.objects.push(Ref.make(collection));
-
-            const { object: chat } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
-            space.db.add(chat);
-          });
-          await Effect.runPromise(program);
-        });
-      },
+      activate: () =>
+        contributes(SpaceCapabilities.OnSpaceCreated, ({ rootCollection, space }) =>
+          createIntent(AssistantAction.OnSpaceCreated, { rootCollection, space }),
+        ),
     }),
     defineModule({
       id: `${meta.id}/module/app-graph-builder`,
@@ -117,9 +138,31 @@ export const AssistantPlugin = () =>
       activate: ReactSurface,
     }),
     defineModule({
-      id: `${meta.id}/module/ai-client`,
-      activatesOn: allOf(ClientEvents.ClientReady, Events.SettingsReady),
-      activatesAfter: [AssistantEvents.AiClientReady],
-      activate: AiClient,
+      id: `${meta.id}/module/edge-model-resolver`,
+      activatesOn: AssistantEvents.SetupAiServiceProviders,
+      activate: EdgeModelResolver,
+    }),
+    defineModule({
+      id: `${meta.id}/module/local-model-resolver`,
+      activatesOn: AssistantEvents.SetupAiServiceProviders,
+      activate: LocalModelResolver,
+    }),
+    defineModule({
+      id: `${meta.id}/module/ai-service`,
+      activatesBefore: [AssistantEvents.SetupAiServiceProviders],
+      // TODO(dmaretskyi): This should activate lazily when the AI chat is used.
+      activatesOn: Events.Startup,
+      activate: AiService,
+    }),
+    defineModule({
+      id: `${meta.id}/module/blueprint`,
+      activatesOn: Events.SetupArtifactDefinition,
+      activate: BlueprintDefinition,
+    }),
+    defineModule({
+      id: `${meta.id}/module/toolkit`,
+      // TODO(wittjosiah): Use a different event.
+      activatesOn: Events.Startup,
+      activate: Toolkit,
     }),
   ]);

package/src/capabilities/ai-service.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Effect, Layer } from 'effect';
+
+import { AiServiceRouter } from '@dxos/ai';
+import { Capabilities, type PluginContext, contributes } from '@dxos/app-framework';
+
+export default (context: PluginContext) => {
+  const resolvers = context.getCapabilities(Capabilities.AiModelResolver);
+
+  // TODO(dmaretskyi): Extract function to reduce them.
+  const combinedLayer = resolvers.reduce(
+    (acc, resolver) => resolver.pipe(Layer.provide(acc)),
+    AiServiceRouter.AiModelResolver.fromModelMap(Effect.succeed({})), // Empty resolver as fallback.
+  );
+
+  return [
+    // TODO(dmaretskyi): Read config from settings.
+    contributes(
+      Capabilities.AiServiceLayer,
+      AiServiceRouter.AiModelResolver.buildAiService.pipe(Layer.provide(combinedLayer)),
+    ),
+  ];
+};