@dxos/plugin-assistant 0.8.4-main.67995b8 → 0.8.4-main.dedc0f3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.67995b8",
+  "version": "0.8.4-main.dedc0f3",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -10,16 +10,16 @@
   "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",
-      "source": "./src/index.ts"
+      "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",
-      "source": "./src/types/index.ts"
+      "node": "./dist/lib/node-esm/types/index.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -36,105 +36,127 @@
     "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",
+    "@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",
     "@preact/signals-react": "^3.2.0",
     "@radix-ui/react-context": "1.1.1",
-    "@xiechao/codemirror-lang-handlebars": "1.0.4",
-    "effect": "3.17.0",
+    "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",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/ai": "0.8.4-main.67995b8",
-    "@dxos/app-framework": "0.8.4-main.67995b8",
-    "@dxos/assistant": "0.8.4-main.67995b8",
-    "@dxos/blueprints": "0.8.4-main.67995b8",
-    "@dxos/client": "0.8.4-main.67995b8",
-    "@dxos/async": "0.8.4-main.67995b8",
-    "@dxos/compute": "0.8.4-main.67995b8",
-    "@dxos/conductor": "0.8.4-main.67995b8",
-    "@dxos/config": "0.8.4-main.67995b8",
-    "@dxos/context": "0.8.4-main.67995b8",
-    "@dxos/devtools": "0.8.4-main.67995b8",
-    "@dxos/debug": "0.8.4-main.67995b8",
-    "@dxos/echo": "0.8.4-main.67995b8",
-    "@dxos/echo-db": "0.8.4-main.67995b8",
-    "@dxos/echo-protocol": "0.8.4-main.67995b8",
-    "@dxos/echo-schema": "0.8.4-main.67995b8",
-    "@dxos/edge-client": "0.8.4-main.67995b8",
-    "@dxos/effect": "0.8.4-main.67995b8",
-    "@dxos/functions": "0.8.4-main.67995b8",
-    "@dxos/graph": "0.8.4-main.67995b8",
-    "@dxos/invariant": "0.8.4-main.67995b8",
-    "@dxos/keys": "0.8.4-main.67995b8",
-    "@dxos/live-object": "0.8.4-main.67995b8",
-    "@dxos/local-storage": "0.8.4-main.67995b8",
-    "@dxos/log": "0.8.4-main.67995b8",
-    "@dxos/plugin-client": "0.8.4-main.67995b8",
-    "@dxos/plugin-deck": "0.8.4-main.67995b8",
-    "@dxos/plugin-explorer": "0.8.4-main.67995b8",
-    "@dxos/plugin-graph": "0.8.4-main.67995b8",
-    "@dxos/plugin-inbox": "0.8.4-main.67995b8",
-    "@dxos/plugin-markdown": "0.8.4-main.67995b8",
-    "@dxos/plugin-preview": "0.8.4-main.67995b8",
-    "@dxos/plugin-script": "0.8.4-main.67995b8",
-    "@dxos/plugin-sketch": "0.8.4-main.67995b8",
-    "@dxos/plugin-space": "0.8.4-main.67995b8",
-    "@dxos/plugin-stack": "0.8.4-main.67995b8",
-    "@dxos/plugin-transcription": "0.8.4-main.67995b8",
-    "@dxos/plugin-wnfs": "0.8.4-main.67995b8",
-    "@dxos/protocols": "0.8.4-main.67995b8",
-    "@dxos/react-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-attention": "0.8.4-main.67995b8",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.67995b8",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.67995b8",
-    "@dxos/react-edge-client": "0.8.4-main.67995b8",
-    "@dxos/react-ui-chat": "0.8.4-main.67995b8",
-    "@dxos/react-ui-components": "0.8.4-main.67995b8",
-    "@dxos/react-ui-editor": "0.8.4-main.67995b8",
-    "@dxos/react-ui-form": "0.8.4-main.67995b8",
-    "@dxos/react-ui-list": "0.8.4-main.67995b8",
-    "@dxos/react-ui-graph": "0.8.4-main.67995b8",
-    "@dxos/react-ui-sfx": "0.8.4-main.67995b8",
-    "@dxos/react-ui-stack": "0.8.4-main.67995b8",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.67995b8",
-    "@dxos/react-ui-tag-picker": "0.8.4-main.67995b8",
-    "@dxos/util": "0.8.4-main.67995b8",
-    "@dxos/schema": "0.8.4-main.67995b8"
+    "@dxos/app-framework": "0.8.4-main.dedc0f3",
+    "@dxos/ai": "0.8.4-main.dedc0f3",
+    "@dxos/assistant": "0.8.4-main.dedc0f3",
+    "@dxos/assistant-testing": "0.8.4-main.dedc0f3",
+    "@dxos/async": "0.8.4-main.dedc0f3",
+    "@dxos/client": "0.8.4-main.dedc0f3",
+    "@dxos/blueprints": "0.8.4-main.dedc0f3",
+    "@dxos/compute": "0.8.4-main.dedc0f3",
+    "@dxos/config": "0.8.4-main.dedc0f3",
+    "@dxos/conductor": "0.8.4-main.dedc0f3",
+    "@dxos/devtools": "0.8.4-main.dedc0f3",
+    "@dxos/echo": "0.8.4-main.dedc0f3",
+    "@dxos/echo-db": "0.8.4-main.dedc0f3",
+    "@dxos/echo-schema": "0.8.4-main.dedc0f3",
+    "@dxos/edge-client": "0.8.4-main.dedc0f3",
+    "@dxos/effect": "0.8.4-main.dedc0f3",
+    "@dxos/echo-protocol": "0.8.4-main.dedc0f3",
+    "@dxos/functions": "0.8.4-main.dedc0f3",
+    "@dxos/graph": "0.8.4-main.dedc0f3",
+    "@dxos/invariant": "0.8.4-main.dedc0f3",
+    "@dxos/keys": "0.8.4-main.dedc0f3",
+    "@dxos/context": "0.8.4-main.dedc0f3",
+    "@dxos/lit-ui": "0.8.4-main.dedc0f3",
+    "@dxos/debug": "0.8.4-main.dedc0f3",
+    "@dxos/local-storage": "0.8.4-main.dedc0f3",
+    "@dxos/log": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-attention": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-board": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-client": "0.8.4-main.dedc0f3",
+    "@dxos/live-object": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-deck": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-graph": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-markdown": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-preview": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-script": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-explorer": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-sketch": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-stack": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-wnfs": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-transcription": "0.8.4-main.dedc0f3",
+    "@dxos/protocols": "0.8.4-main.dedc0f3",
+    "@dxos/react-client": "0.8.4-main.dedc0f3",
+    "@dxos/react-edge-client": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-attention": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-space": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-chat": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-components": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-graph": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-editor": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-form": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-list": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-menu": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-sfx": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-searchlist": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-stack": "0.8.4-main.dedc0f3",
+    "@dxos/util": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-tag-picker": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-tabs": "0.8.4-main.dedc0f3",
+    "@dxos/schema": "0.8.4-main.dedc0f3"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.38.0",
-    "@effect/platform": "0.89.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.17.0",
+    "effect": "3.17.7",
     "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.67995b8",
-    "@dxos/plugin-chess": "0.8.4-main.67995b8",
-    "@dxos/echo-db": "0.8.4-main.67995b8",
-    "@dxos/plugin-inbox": "0.8.4-main.67995b8",
-    "@dxos/plugin-map": "0.8.4-main.67995b8",
-    "@dxos/plugin-markdown": "0.8.4-main.67995b8",
-    "@dxos/plugin-table": "0.8.4-main.67995b8",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/random": "0.8.4-main.67995b8",
-    "@dxos/react-ui-menu": "0.8.4-main.67995b8",
-    "@dxos/storybook-utils": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "vite": "7.1.1",
+    "@dxos/devtools": "0.8.4-main.dedc0f3",
+    "@dxos/assistant-testing": "0.8.4-main.dedc0f3",
+    "@dxos/echo-db": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-automation": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-chess": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-inbox": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-markdown": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-map": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-script": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-sketch": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-stack": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-table": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-theme": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-preview": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-thread": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-token-manager": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-wnfs": "0.8.4-main.dedc0f3",
+    "@dxos/random": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-table": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-menu": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-board": "0.8.4-main.dedc0f3",
+    "@dxos/plugin-attention": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3",
+    "@dxos/storybook-utils": "0.8.4-main.dedc0f3"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -142,8 +164,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.4-main.67995b8",
-    "@dxos/react-ui-theme": "0.8.4-main.67995b8"
+    "@dxos/react-ui": "0.8.4-main.dedc0f3",
+    "@dxos/react-ui-theme": "0.8.4-main.dedc0f3"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -2,10 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Layer } from 'effect';
-
-import { AiServiceTestingPreset } from '@dxos/ai/testing';
 import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
+import { ResearchGraph } from '@dxos/assistant-testing';
 import { Blueprint } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
@@ -13,11 +11,23 @@ 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 { AssistantCapabilities } from './capability-definitions';
+import {
+  AiService,
+  AppGraphBuilder,
+  AssistantState,
+  BlueprintDefinition,
+  ComputeRuntime,
+  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, [
@@ -31,6 +41,14 @@ 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,
@@ -63,22 +81,22 @@ export const AssistantPlugin = () =>
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: Assistant.Chat,
-            getIntent: (_, options) => createIntent(Assistant.CreateChat, { space: options.space }),
+            getIntent: (_, options) => createIntent(AssistantAction.CreateChat, { space: options.space }),
           }),
         ),
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: Blueprint.Blueprint,
-            formSchema: Assistant.BlueprintForm,
-            getIntent: (props) => createIntent(Assistant.CreateBlueprint, props),
+            formSchema: AssistantAction.BlueprintForm,
+            getIntent: (props) => createIntent(AssistantAction.CreateBlueprint, props),
           }),
         ),
         contributes(
           SpaceCapabilities.ObjectForm,
           defineObjectForm({
             objectSchema: Sequence,
-            getIntent: () => createIntent(Assistant.CreateSequence),
+            getIntent: () => createIntent(AssistantAction.CreateSequence),
           }),
         ),
       ],
@@ -86,14 +104,14 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/schema`,
       activatesOn: ClientEvents.SetupSchema,
-      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, Assistant.CompanionTo]),
+      activate: () => contributes(ClientCapabilities.Schema, [ServiceType, Assistant.CompanionTo, ResearchGraph]),
     }),
     defineModule({
       id: `${meta.id}/module/on-space-created`,
       activatesOn: SpaceEvents.SpaceCreated,
       activate: () =>
-        contributes(SpaceCapabilities.OnSpaceCreated, ({ space, rootCollection }) =>
-          createIntent(Assistant.OnSpaceCreated, { space, rootCollection }),
+        contributes(SpaceCapabilities.OnSpaceCreated, ({ rootCollection, space }) =>
+          createIntent(AssistantAction.OnSpaceCreated, { rootCollection, space }),
         ),
     }),
     defineModule({
@@ -113,12 +131,38 @@ export const AssistantPlugin = () =>
       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: () => [
-        // TODO(dmaretskyi): Read config from settings.
-        contributes(AssistantCapabilities.AiServiceLayer, AiServiceTestingPreset('edge-remote').pipe(Layer.orDie)),
-      ],
+      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,
+    }),
+    defineModule({
+      id: `${meta.id}/module/compute-runtime`,
+      // TODO(wittjosiah): Use a different event.
+      activatesOn: Events.Startup,
+      activate: ComputeRuntime,
     }),
   ]);

package/src/capabilities/ai-service.ts

@@ -0,0 +1,28 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Effect, Layer } from 'effect';
+
+import { AiServiceRouter } from '@dxos/ai';
+import { type PluginContext, contributes } from '@dxos/app-framework';
+
+import { AssistantCapabilities } from './capabilities';
+
+export default (context: PluginContext) => {
+  const resolvers = context.getCapabilities(AssistantCapabilities.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(
+      AssistantCapabilities.AiServiceLayer,
+      AiServiceRouter.AiModelResolver.buildAiService.pipe(Layer.provide(combinedLayer)),
+    ),
+  ];
+};

package/src/capabilities/app-graph-builder.ts

@@ -7,24 +7,26 @@ import { Option, pipe } from 'effect';
 
 import {
   Capabilities,
-  contributes,
-  createIntent,
   LayoutAction,
-  type PromiseIntentDispatcher,
   type PluginContext,
+  type PromiseIntentDispatcher,
+  contributes,
+  createIntent,
 } from '@dxos/app-framework';
 import { Sequence } from '@dxos/conductor';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
-import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
-import { createExtension, ROOT_ID } from '@dxos/plugin-graph';
-import { getActiveSpace, rxFromQuery } from '@dxos/plugin-space';
+import { ATTENDABLE_PATH_SEPARATOR, PLANK_COMPANION_TYPE } from '@dxos/plugin-deck/types';
+import { ROOT_ID, createExtension, rxFromSignal } from '@dxos/plugin-graph';
+import { getActiveSpace } from '@dxos/plugin-space';
 import { SpaceAction } from '@dxos/plugin-space/types';
-import { type Space, Filter, Query, type QueryResult, fullyQualifiedId, getSpace } from '@dxos/react-client/echo';
+import { Query, type Space, fullyQualifiedId } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, meta } from '../meta';
-import { Assistant } from '../types';
+import { Assistant, AssistantAction } from '../types';
+
+import { AssistantCapabilities } from './capabilities';
 
 export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
@@ -79,44 +81,36 @@ export default (context: PluginContext) =>
     }),
 
     createExtension({
-      id: `${meta.id}/object-chat-companion`,
+      id: `${meta.id}/companion-chat`,
       connector: (node) => {
-        let query: QueryResult<Assistant.Chat> | undefined;
-        return Rx.make((get) => {
-          const nodeOption = get(node);
-          if (Option.isNone(nodeOption)) {
-            return [];
-          }
-
-          const object = nodeOption.value.data;
-          if (!Obj.isObject(object)) {
-            return [];
-          }
-
-          const space = getSpace(object);
-          if (!space) {
-            return [];
-          }
-
-          if (!query) {
-            query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(Assistant.CompanionTo).source());
-          }
+        return Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node.data) : Option.none())),
+            Option.map((object) => {
+              const currentChat = get(
+                rxFromSignal(
+                  () => context.getCapability(AssistantCapabilities.State).currentChat[fullyQualifiedId(object)],
+                ),
+              );
 
-          const chat = get(rxFromQuery(query))[0];
-          return [
-            {
-              id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
-              type: PLANK_COMPANION_TYPE,
-              data: chat ?? 'assistant-chat',
-              properties: {
-                label: ['assistant chat label', { ns: meta.id }],
-                icon: 'ph--sparkle--regular',
-                position: 'hoist',
-                disposition: 'hidden',
-              },
-            },
-          ];
-        });
+              return [
+                {
+                  id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+                  type: PLANK_COMPANION_TYPE,
+                  data: currentChat ?? 'assistant-chat',
+                  properties: {
+                    label: ['assistant chat label', { ns: meta.id }],
+                    icon: 'ph--sparkle--regular',
+                    position: 'hoist',
+                    disposition: 'hidden',
+                  },
+                },
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        );
       },
     }),
 
@@ -155,14 +149,13 @@ const getOrCreateChat = async (
   const { objects: relatedChats } = await space.db
     .query(Query.type(Assistant.Chat).sourceOf(Assistant.CompanionTo).source())
     .run();
+
   const chats = allChats.filter((chat) => !relatedChats.includes(chat));
-  // console.log('objects', JSON.stringify(objects, null, 2));
   if (chats.length > 0) {
-    // TODO(burdon): Is this the most recent?
-    return chats[chats.length - 1];
+    return chats.at(-1);
   }
 
-  const { data } = await dispatch(createIntent(Assistant.CreateChat, { space }));
+  const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));
   invariant(Obj.instanceOf(Assistant.Chat, data?.object));
   await dispatch(createIntent(SpaceAction.AddObject, { target: space, object: data.object }));
   return data.object;

package/src/capabilities/blueprint-definition.ts

@@ -0,0 +1,58 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
+import { templates } from '@dxos/assistant';
+import {
+  DISCORD_BLUEPRINT,
+  LINEAR_BLUEPRINT,
+  RESEARCH_BLUEPRINT,
+  fetchDiscordMessages,
+  research,
+  syncLinearIssues,
+} from '@dxos/assistant-testing';
+import { Blueprint } from '@dxos/blueprints';
+import { type FunctionDefinition } from '@dxos/functions';
+
+import { analysis, list, load } from '../functions';
+
+const functions: FunctionDefinition[] = [analysis, list, load];
+const tools = [
+  'add-to-context',
+  // TODO(wittjosiah): Factor out to an ECHO blueprint.
+  'get-schemas',
+  'add-schema',
+  'create-record',
+  // TODO(wittjosiah): Factor out to a generic app-framework blueprint.
+  'open-item',
+  // TODO(burdon): Anthropic only.
+  //  https://docs.anthropic.com/en/docs/agents-and-tools/tool-use/text-editor-tool#example-str-replace-command
+  //  AI_TOOL_NOT_FOUND: str_replace_based_edit_tool
+  // 'str_replace_based_edit_tool',
+];
+
+export const BLUEPRINT_KEY = 'dxos.org/blueprint/assistant';
+
+export const createBlueprint = (): Blueprint.Blueprint =>
+  Blueprint.make({
+    key: BLUEPRINT_KEY,
+    name: 'Assistant',
+    tools: Blueprint.toolDefinitions({ functions, tools }),
+    instructions: templates.system,
+  });
+
+const blueprint = createBlueprint();
+
+// TODO(dmaretskyi): Consider splitting into multiple modules.
+export default (): Capability<any>[] => [
+  contributes(Capabilities.Functions, functions),
+  contributes(Capabilities.Functions, [research]),
+  contributes(Capabilities.BlueprintDefinition, blueprint),
+  contributes(Capabilities.BlueprintDefinition, RESEARCH_BLUEPRINT),
+  // TODO(burdon): Move out of assistant.
+  contributes(Capabilities.Functions, [syncLinearIssues]),
+  contributes(Capabilities.Functions, [fetchDiscordMessages]),
+  contributes(Capabilities.BlueprintDefinition, LINEAR_BLUEPRINT),
+  contributes(Capabilities.BlueprintDefinition, DISCORD_BLUEPRINT),
+];