@dxos/plugin-assistant 0.8.4-main.2e9d522 → 0.8.4-main.406dc2a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.2e9d522",
+  "version": "0.8.4-main.406dc2a",
   "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,114 +36,112 @@
     "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",
-    "@effect/ai": "0.23.0",
-    "@lezer/highlight": "^1.2.1",
+    "@codemirror/autocomplete": "^6.19.0",
+    "@codemirror/state": "^6.5.2",
+    "@codemirror/view": "^6.38.4",
+    "@effect/ai": "0.29.1",
+    "@effect/ai-anthropic": "^0.19.2",
+    "@effect/ai-openai": "^0.32.1",
+    "@effect/experimental": "0.56.0",
+    "@effect/platform-browser": "0.72.0",
     "@preact-signals/safe-react": "^0.9.0",
-    "@preact/signals-core": "^1.9.0",
-    "@preact/signals-react": "^3.2.0",
+    "@preact/signals-core": "^1.12.1",
+    "@preact/signals-react": "^3.3.0",
     "@radix-ui/react-context": "1.1.1",
-    "@xiechao/codemirror-lang-handlebars": "1.0.4",
-    "effect": "3.17.0",
+    "effect": "3.18.3",
     "exa-js": "^1.5.12",
     "json5": "^2.2.3",
     "jsonpointer": "^5.0.1",
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/ai": "0.8.4-main.2e9d522",
-    "@dxos/app-framework": "0.8.4-main.2e9d522",
-    "@dxos/assistant": "0.8.4-main.2e9d522",
-    "@dxos/async": "0.8.4-main.2e9d522",
-    "@dxos/blueprints": "0.8.4-main.2e9d522",
-    "@dxos/client": "0.8.4-main.2e9d522",
-    "@dxos/compute": "0.8.4-main.2e9d522",
-    "@dxos/conductor": "0.8.4-main.2e9d522",
-    "@dxos/config": "0.8.4-main.2e9d522",
-    "@dxos/debug": "0.8.4-main.2e9d522",
-    "@dxos/context": "0.8.4-main.2e9d522",
-    "@dxos/devtools": "0.8.4-main.2e9d522",
-    "@dxos/echo": "0.8.4-main.2e9d522",
-    "@dxos/echo-protocol": "0.8.4-main.2e9d522",
-    "@dxos/echo-db": "0.8.4-main.2e9d522",
-    "@dxos/echo-schema": "0.8.4-main.2e9d522",
-    "@dxos/edge-client": "0.8.4-main.2e9d522",
-    "@dxos/effect": "0.8.4-main.2e9d522",
-    "@dxos/functions": "0.8.4-main.2e9d522",
-    "@dxos/graph": "0.8.4-main.2e9d522",
-    "@dxos/live-object": "0.8.4-main.2e9d522",
-    "@dxos/keys": "0.8.4-main.2e9d522",
-    "@dxos/local-storage": "0.8.4-main.2e9d522",
-    "@dxos/invariant": "0.8.4-main.2e9d522",
-    "@dxos/log": "0.8.4-main.2e9d522",
-    "@dxos/plugin-client": "0.8.4-main.2e9d522",
-    "@dxos/plugin-deck": "0.8.4-main.2e9d522",
-    "@dxos/plugin-explorer": "0.8.4-main.2e9d522",
-    "@dxos/plugin-graph": "0.8.4-main.2e9d522",
-    "@dxos/plugin-inbox": "0.8.4-main.2e9d522",
-    "@dxos/plugin-markdown": "0.8.4-main.2e9d522",
-    "@dxos/plugin-script": "0.8.4-main.2e9d522",
-    "@dxos/plugin-preview": "0.8.4-main.2e9d522",
-    "@dxos/plugin-sketch": "0.8.4-main.2e9d522",
-    "@dxos/plugin-space": "0.8.4-main.2e9d522",
-    "@dxos/plugin-stack": "0.8.4-main.2e9d522",
-    "@dxos/plugin-transcription": "0.8.4-main.2e9d522",
-    "@dxos/plugin-wnfs": "0.8.4-main.2e9d522",
-    "@dxos/react-client": "0.8.4-main.2e9d522",
-    "@dxos/react-edge-client": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-attention": "0.8.4-main.2e9d522",
-    "@dxos/protocols": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-chat": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-components": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-form": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-editor": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-graph": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-list": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-sfx": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-stack": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.2e9d522",
-    "@dxos/schema": "0.8.4-main.2e9d522",
-    "@dxos/util": "0.8.4-main.2e9d522"
+    "@dxos/ai": "0.8.4-main.406dc2a",
+    "@dxos/app-framework": "0.8.4-main.406dc2a",
+    "@dxos/assistant": "0.8.4-main.406dc2a",
+    "@dxos/assistant-testing": "0.8.4-main.406dc2a",
+    "@dxos/blueprints": "0.8.4-main.406dc2a",
+    "@dxos/async": "0.8.4-main.406dc2a",
+    "@dxos/compute": "0.8.4-main.406dc2a",
+    "@dxos/conductor": "0.8.4-main.406dc2a",
+    "@dxos/config": "0.8.4-main.406dc2a",
+    "@dxos/client": "0.8.4-main.406dc2a",
+    "@dxos/context": "0.8.4-main.406dc2a",
+    "@dxos/debug": "0.8.4-main.406dc2a",
+    "@dxos/devtools": "0.8.4-main.406dc2a",
+    "@dxos/echo-protocol": "0.8.4-main.406dc2a",
+    "@dxos/echo-db": "0.8.4-main.406dc2a",
+    "@dxos/echo": "0.8.4-main.406dc2a",
+    "@dxos/echo-query": "0.8.4-main.406dc2a",
+    "@dxos/edge-client": "0.8.4-main.406dc2a",
+    "@dxos/effect": "0.8.4-main.406dc2a",
+    "@dxos/graph": "0.8.4-main.406dc2a",
+    "@dxos/invariant": "0.8.4-main.406dc2a",
+    "@dxos/functions": "0.8.4-main.406dc2a",
+    "@dxos/keys": "0.8.4-main.406dc2a",
+    "@dxos/lit-ui": "0.8.4-main.406dc2a",
+    "@dxos/live-object": "0.8.4-main.406dc2a",
+    "@dxos/local-storage": "0.8.4-main.406dc2a",
+    "@dxos/log": "0.8.4-main.406dc2a",
+    "@dxos/plugin-automation": "0.8.4-main.406dc2a",
+    "@dxos/plugin-client": "0.8.4-main.406dc2a",
+    "@dxos/plugin-attention": "0.8.4-main.406dc2a",
+    "@dxos/plugin-deck": "0.8.4-main.406dc2a",
+    "@dxos/plugin-graph": "0.8.4-main.406dc2a",
+    "@dxos/plugin-space": "0.8.4-main.406dc2a",
+    "@dxos/plugin-transcription": "0.8.4-main.406dc2a",
+    "@dxos/protocols": "0.8.4-main.406dc2a",
+    "@dxos/react-client": "0.8.4-main.406dc2a",
+    "@dxos/react-edge-client": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-attention": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-chat": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-editor": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-form": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-graph": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-menu": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-searchlist": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-list": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-stack": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-sfx": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-tabs": "0.8.4-main.406dc2a",
+    "@dxos/schema": "0.8.4-main.406dc2a",
+    "@dxos/util": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-components": "0.8.4-main.406dc2a"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "^0.38.0",
-    "@effect/platform": "0.89.0",
+    "@effect-rx/rx-react": "0.42.4",
+    "@effect/platform": "0.92.1",
     "@types/lodash.defaultsdeep": "^4.6.6",
-    "@types/react": "~18.2.0",
-    "@types/react-dom": "~18.2.0",
-    "effect": "3.17.0",
+    "@types/react": "~19.2.2",
+    "@types/react-dom": "~19.2.1",
+    "effect": "3.18.3",
     "openapi-types": "^12.1.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "vite": "5.4.7",
-    "@dxos/assistant-testing": "0.8.4-main.2e9d522",
-    "@dxos/echo-db": "0.8.4-main.2e9d522",
-    "@dxos/plugin-chess": "0.8.4-main.2e9d522",
-    "@dxos/plugin-inbox": "0.8.4-main.2e9d522",
-    "@dxos/plugin-markdown": "0.8.4-main.2e9d522",
-    "@dxos/plugin-map": "0.8.4-main.2e9d522",
-    "@dxos/plugin-table": "0.8.4-main.2e9d522",
-    "@dxos/react-ui": "0.8.4-main.2e9d522",
-    "@dxos/random": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-menu": "0.8.4-main.2e9d522",
-    "@dxos/storybook-utils": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-theme": "0.8.4-main.2e9d522"
+    "react": "~19.2.0",
+    "react-dom": "~19.2.0",
+    "vite": "7.1.9",
+    "@dxos/assistant-testing": "0.8.4-main.406dc2a",
+    "@dxos/devtools": "0.8.4-main.406dc2a",
+    "@dxos/plugin-map": "0.8.4-main.406dc2a",
+    "@dxos/plugin-chess": "0.8.4-main.406dc2a",
+    "@dxos/echo-db": "0.8.4-main.406dc2a",
+    "@dxos/plugin-table": "0.8.4-main.406dc2a",
+    "@dxos/random": "0.8.4-main.406dc2a",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-table": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a",
+    "@dxos/storybook-utils": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-menu": "0.8.4-main.406dc2a"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
     "@effect/platform": "^0.80.12",
     "effect": "^3.13.3",
-    "react": "~18.2.0",
-    "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.2e9d522",
-    "@dxos/react-ui-theme": "0.8.4-main.2e9d522"
+    "react": "^19.0.0",
+    "react-dom": "^19.0.0",
+    "@dxos/react-ui": "0.8.4-main.406dc2a",
+    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -3,96 +3,165 @@
 //
 
 import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
-import { Template } from '@dxos/blueprints';
+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 { defineObjectForm } from '@dxos/plugin-space/types';
 
-import { 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 { Assistant, ServiceType } from './types';
+import { Assistant, AssistantAction, ServiceType } from './types';
 
-export const AssistantPlugin = () =>
-  definePlugin(meta, [
-    defineModule({
-      id: `${meta.id}/module/translations`,
-      activatesOn: Events.SetupTranslations,
-      activate: () => contributes(Capabilities.Translations, translations),
-    }),
-    defineModule({
-      id: `${meta.id}/module/settings`,
-      activatesOn: Events.SetupSettings,
-      activate: Settings,
-    }),
-    defineModule({
-      id: `${meta.id}/module/metadata`,
-      activatesOn: Events.SetupMetadata,
-      activate: () => [
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Sequence),
-          metadata: {
-            icon: 'ph--circuitry--regular',
-          },
+export const AssistantPlugin = definePlugin(meta, () => [
+  defineModule({
+    id: `${meta.id}/module/translations`,
+    activatesOn: Events.SetupTranslations,
+    activate: () => contributes(Capabilities.Translations, translations),
+  }),
+  defineModule({
+    id: `${meta.id}/module/settings`,
+    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(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(Sequence),
+        metadata: {
+          icon: 'ph--circuitry--regular',
+        },
+      }),
+    ],
+  }),
+  defineModule({
+    id: `${meta.id}/module/object-form`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () => [
+      contributes(
+        SpaceCapabilities.ObjectForm,
+        defineObjectForm({
+          objectSchema: Assistant.Chat,
+          getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
         }),
-        contributes(Capabilities.Metadata, {
-          id: Type.getTypename(Assistant.Chat),
-          metadata: {
-            icon: 'ph--atom--regular',
-          },
+      ),
+      contributes(
+        SpaceCapabilities.ObjectForm,
+        defineObjectForm({
+          objectSchema: Blueprint.Blueprint,
+          formSchema: AssistantAction.BlueprintForm,
+          getIntent: (props) => createIntent(AssistantAction.CreateBlueprint, props),
         }),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/object-form`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => [
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: Assistant.Chat,
-            getIntent: (_, options) => createIntent(Assistant.CreateChat, { space: options.space }),
-          }),
-        ),
-        contributes(
-          SpaceCapabilities.ObjectForm,
-          defineObjectForm({
-            objectSchema: Sequence,
-            getIntent: () => createIntent(Assistant.CreateSequence),
-          }),
-        ),
-      ],
-    }),
-    defineModule({
-      id: `${meta.id}/module/schema`,
-      activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, Template.Template, Assistant.CompanionTo]),
-    }),
-    defineModule({
-      id: `${meta.id}/module/on-space-created`,
-      activatesOn: SpaceEvents.SpaceCreated,
-      activate: () =>
-        contributes(SpaceCapabilities.OnSpaceCreated, ({ space, rootCollection }) =>
-          createIntent(Assistant.OnSpaceCreated, { space, rootCollection }),
-        ),
-    }),
-    defineModule({
-      id: `${meta.id}/module/app-graph-builder`,
-      activatesOn: Events.SetupAppGraph,
-      activate: AppGraphBuilder,
-    }),
-    defineModule({
-      id: `${meta.id}/module/intent-resolver`,
-      activatesOn: Events.SetupIntentResolver,
-      activate: IntentResolver,
-    }),
-    defineModule({
-      id: `${meta.id}/module/react-surface`,
-      activatesOn: Events.SetupReactSurface,
-      // TODO(wittjosiah): Should occur before the chat is loaded when surfaces activation is more granular.
-      activatesBefore: [Events.SetupArtifactDefinition],
-      activate: ReactSurface,
-    }),
-  ]);
+      ),
+      contributes(
+        SpaceCapabilities.ObjectForm,
+        defineObjectForm({
+          objectSchema: Sequence,
+          getIntent: () => createIntent(AssistantAction.CreateSequence),
+        }),
+      ),
+    ],
+  }),
+  defineModule({
+    id: `${meta.id}/module/schema`,
+    activatesOn: ClientEvents.SetupSchema,
+    activate: () =>
+      contributes(ClientCapabilities.Schema, [
+        ServiceType,
+        Assistant.CompanionTo,
+        ResearchGraph,
+        ResearchOn,
+        Prompt.Prompt,
+      ]),
+  }),
+  defineModule({
+    id: `${meta.id}/module/on-space-created`,
+    activatesOn: SpaceEvents.SpaceCreated,
+    activate: () =>
+      contributes(SpaceCapabilities.onCreateSpace, ({ rootCollection, space }) =>
+        createIntent(AssistantAction.onCreateSpace, { rootCollection, space }),
+      ),
+  }),
+  defineModule({
+    id: `${meta.id}/module/app-graph-builder`,
+    activatesOn: Events.SetupAppGraph,
+    activate: AppGraphBuilder,
+  }),
+  defineModule({
+    id: `${meta.id}/module/intent-resolver`,
+    activatesOn: Events.SetupIntentResolver,
+    activate: IntentResolver,
+  }),
+  defineModule({
+    id: `${meta.id}/module/react-surface`,
+    activatesOn: Events.SetupReactSurface,
+    // TODO(wittjosiah): Should occur before the chat is loaded when surfaces activation is more granular.
+    activatesBefore: [Events.SetupArtifactDefinition],
+    activate: ReactSurface,
+  }),
+  defineModule({
+    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,27 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+import * as Layer from 'effect/Layer';
+
+import * as AiServiceRouter from '@dxos/ai/AiServiceRouter';
+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)),
+    ),
+  ];
+};