@dxos/plugin-assistant 0.8.4-main.406dc2a → 0.8.4-main.548089c

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.406dc2a",
+  "version": "0.8.4-main.548089c",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -37,10 +37,13 @@
   ],
   "dependencies": {
     "@codemirror/autocomplete": "^6.19.0",
+    "@codemirror/lang-html": "^6.4.11",
+    "@codemirror/lang-xml": "^6.1.0",
+    "@codemirror/language": "^6.11.3",
     "@codemirror/state": "^6.5.2",
     "@codemirror/view": "^6.38.4",
     "@effect/ai": "0.29.1",
-    "@effect/ai-anthropic": "^0.19.2",
+    "@effect/ai-anthropic": "0.21.1",
     "@effect/ai-openai": "^0.32.1",
     "@effect/experimental": "0.56.0",
     "@effect/platform-browser": "0.72.0",
@@ -55,93 +58,95 @@
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@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"
+    "@dxos/app-framework": "0.8.4-main.548089c",
+    "@dxos/ai": "0.8.4-main.548089c",
+    "@dxos/async": "0.8.4-main.548089c",
+    "@dxos/blueprints": "0.8.4-main.548089c",
+    "@dxos/assistant-toolkit": "0.8.4-main.548089c",
+    "@dxos/client": "0.8.4-main.548089c",
+    "@dxos/compute": "0.8.4-main.548089c",
+    "@dxos/conductor": "0.8.4-main.548089c",
+    "@dxos/config": "0.8.4-main.548089c",
+    "@dxos/debug": "0.8.4-main.548089c",
+    "@dxos/context": "0.8.4-main.548089c",
+    "@dxos/devtools": "0.8.4-main.548089c",
+    "@dxos/echo": "0.8.4-main.548089c",
+    "@dxos/echo-db": "0.8.4-main.548089c",
+    "@dxos/echo-protocol": "0.8.4-main.548089c",
+    "@dxos/echo-query": "0.8.4-main.548089c",
+    "@dxos/assistant": "0.8.4-main.548089c",
+    "@dxos/effect": "0.8.4-main.548089c",
+    "@dxos/functions-runtime": "0.8.4-main.548089c",
+    "@dxos/edge-client": "0.8.4-main.548089c",
+    "@dxos/graph": "0.8.4-main.548089c",
+    "@dxos/invariant": "0.8.4-main.548089c",
+    "@dxos/functions": "0.8.4-main.548089c",
+    "@dxos/keys": "0.8.4-main.548089c",
+    "@dxos/lit-ui": "0.8.4-main.548089c",
+    "@dxos/live-object": "0.8.4-main.548089c",
+    "@dxos/local-storage": "0.8.4-main.548089c",
+    "@dxos/plugin-attention": "0.8.4-main.548089c",
+    "@dxos/plugin-automation": "0.8.4-main.548089c",
+    "@dxos/plugin-client": "0.8.4-main.548089c",
+    "@dxos/log": "0.8.4-main.548089c",
+    "@dxos/plugin-graph": "0.8.4-main.548089c",
+    "@dxos/plugin-deck": "0.8.4-main.548089c",
+    "@dxos/plugin-transcription": "0.8.4-main.548089c",
+    "@dxos/react-client": "0.8.4-main.548089c",
+    "@dxos/protocols": "0.8.4-main.548089c",
+    "@dxos/react-ui-attention": "0.8.4-main.548089c",
+    "@dxos/react-edge-client": "0.8.4-main.548089c",
+    "@dxos/plugin-space": "0.8.4-main.548089c",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.548089c",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.548089c",
+    "@dxos/react-ui-chat": "0.8.4-main.548089c",
+    "@dxos/react-ui-editor": "0.8.4-main.548089c",
+    "@dxos/react-ui-form": "0.8.4-main.548089c",
+    "@dxos/react-ui-graph": "0.8.4-main.548089c",
+    "@dxos/react-ui-components": "0.8.4-main.548089c",
+    "@dxos/react-ui-list": "0.8.4-main.548089c",
+    "@dxos/react-ui-menu": "0.8.4-main.548089c",
+    "@dxos/react-ui-searchlist": "0.8.4-main.548089c",
+    "@dxos/react-ui-sfx": "0.8.4-main.548089c",
+    "@dxos/react-ui-stack": "0.8.4-main.548089c",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.548089c",
+    "@dxos/react-ui-tabs": "0.8.4-main.548089c",
+    "@dxos/schema": "0.8.4-main.548089c",
+    "@dxos/util": "0.8.4-main.548089c",
+    "@dxos/types": "0.8.4-main.548089c"
   },
   "devDependencies": {
-    "@effect-rx/rx-react": "0.42.4",
+    "@effect-atom/atom-react": "^0.3.4",
     "@effect/platform": "0.92.1",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~19.2.2",
-    "@types/react-dom": "~19.2.1",
+    "@types/react-dom": "~19.2.2",
     "effect": "3.18.3",
     "openapi-types": "^12.1.3",
     "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"
+    "@dxos/assistant-toolkit": "0.8.4-main.548089c",
+    "@dxos/devtools": "0.8.4-main.548089c",
+    "@dxos/echo-db": "0.8.4-main.548089c",
+    "@dxos/plugin-chess": "0.8.4-main.548089c",
+    "@dxos/plugin-map": "0.8.4-main.548089c",
+    "@dxos/react-ui": "0.8.4-main.548089c",
+    "@dxos/react-ui-menu": "0.8.4-main.548089c",
+    "@dxos/random": "0.8.4-main.548089c",
+    "@dxos/plugin-table": "0.8.4-main.548089c",
+    "@dxos/react-ui-table": "0.8.4-main.548089c",
+    "@dxos/react-ui-theme": "0.8.4-main.548089c",
+    "@dxos/storybook-utils": "0.8.4-main.548089c"
   },
   "peerDependencies": {
-    "@effect-rx/rx-react": "^0.34.1",
+    "@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.406dc2a",
-    "@dxos/react-ui-theme": "0.8.4-main.406dc2a"
+    "@dxos/react-ui": "0.8.4-main.548089c",
+    "@dxos/react-ui-theme": "0.8.4-main.548089c"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -3,13 +3,14 @@
 //
 
 import { Capabilities, Events, contributes, createIntent, defineModule, definePlugin } from '@dxos/app-framework';
-import { ResearchGraph, ResearchOn } from '@dxos/assistant-testing';
+import { ResearchGraph } from '@dxos/assistant-toolkit';
 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 { HasSubject } from '@dxos/types';
 
 import {
   AiService,
@@ -55,18 +56,28 @@ export const AssistantPlugin = definePlugin(meta, () => [
         id: Type.getTypename(Assistant.Chat),
         metadata: {
           icon: 'ph--atom--regular',
+          iconHue: 'sky',
         },
       }),
       contributes(Capabilities.Metadata, {
         id: Type.getTypename(Blueprint.Blueprint),
         metadata: {
           icon: 'ph--blueprint--regular',
+          iconHue: 'sky',
+        },
+      }),
+      contributes(Capabilities.Metadata, {
+        id: Type.getTypename(Prompt.Prompt),
+        metadata: {
+          icon: 'ph--scroll--regular',
+          iconHue: 'sky',
         },
       }),
       contributes(Capabilities.Metadata, {
         id: Type.getTypename(Sequence),
         metadata: {
           icon: 'ph--circuitry--regular',
+          iconHue: 'sky',
         },
       }),
     ],
@@ -90,6 +101,13 @@ export const AssistantPlugin = definePlugin(meta, () => [
           getIntent: (props) => createIntent(AssistantAction.CreateBlueprint, props),
         }),
       ),
+      contributes(
+        SpaceCapabilities.ObjectForm,
+        defineObjectForm({
+          objectSchema: Prompt.Prompt,
+          getIntent: () => createIntent(AssistantAction.CreatePrompt),
+        }),
+      ),
       contributes(
         SpaceCapabilities.ObjectForm,
         defineObjectForm({
@@ -107,7 +125,7 @@ export const AssistantPlugin = definePlugin(meta, () => [
         ServiceType,
         Assistant.CompanionTo,
         ResearchGraph,
-        ResearchOn,
+        HasSubject.HasSubject,
         Prompt.Prompt,
       ]),
   }),

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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
+import { Atom } from '@effect-atom/atom-react';
 import * as Function from 'effect/Function';
 import * as Option from 'effect/Option';
 
@@ -14,15 +14,16 @@ import {
   contributes,
   createIntent,
 } from '@dxos/app-framework';
+import { Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
-import { Obj } from '@dxos/echo';
+import { DXN, Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 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 { Query, type Space, fullyQualifiedId } from '@dxos/react-client/echo';
+import { Query, type Space, getSpace } from '@dxos/react-client/echo';
 
 import { ASSISTANT_DIALOG, meta } from '../meta';
 import { Assistant, AssistantAction } from '../types';
@@ -31,10 +32,41 @@ import { AssistantCapabilities } from './capabilities';
 
 export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
+    createExtension({
+      id: `${meta.id}/root`,
+      actions: (node) =>
+        Atom.make((get) =>
+          Function.pipe(
+            get(node),
+            Option.flatMap((node) => {
+              return Obj.instanceOf(Assistant.Chat, node.data) ? Option.some(node.data) : Option.none();
+            }),
+            Option.map((object) => {
+              const id = Obj.getDXN(object).toString();
+              return [
+                {
+                  id: `${AssistantAction.UpdateChatName._tag}/${id}`,
+                  data: async () => {
+                    const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+                    await dispatch(createIntent(AssistantAction.UpdateChatName, { chat: object }));
+                  },
+                  properties: {
+                    label: ['chat update name label', { ns: meta.id }],
+                    icon: 'ph--magic-wand--regular',
+                    disposition: 'list-item',
+                  },
+                },
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        ),
+    }),
+
     createExtension({
       id: `${meta.id}/assistant`,
       actions: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
@@ -84,20 +116,31 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/companion-chat`,
       connector: (node) => {
-        return Rx.make((get) =>
+        return Atom.make((get) =>
           Function.pipe(
             get(node),
             Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node.data) : Option.none())),
-            Option.map((object) => {
-              const currentChat = get(
+            Option.flatMap((object) => {
+              const currentChatState = get(
                 rxFromSignal(
-                  () => context.getCapability(AssistantCapabilities.State).currentChat[fullyQualifiedId(object)],
+                  () => context.getCapability(AssistantCapabilities.State).currentChat[Obj.getDXN(object).toString()],
                 ),
               );
+              // If no state, continue to allow chat initialization.
+              if (!currentChatState) {
+                return Option.some({ object, currentChat: undefined });
+              }
 
+              const space = getSpace(object);
+              const currentChatDxn = DXN.tryParse(currentChatState);
+              const currentChatRef = currentChatDxn ? space?.db.ref(currentChatDxn) : undefined;
+              const currentChat = get(rxFromSignal(() => currentChatRef?.target));
+              return currentChat ? Option.some({ object, currentChat }) : Option.none();
+            }),
+            Option.map(({ object, currentChat }) => {
               return [
                 {
-                  id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+                  id: [Obj.getDXN(object).toString(), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
                   type: PLANK_COMPANION_TYPE,
                   data: currentChat ?? 'assistant-chat',
                   properties: {
@@ -116,19 +159,23 @@ export default (context: PluginContext) =>
     }),
 
     createExtension({
-      id: `${meta.id}/sequence-logs`,
+      id: `${meta.id}/invocations`,
       connector: (node) =>
-        Rx.make((get) =>
+        Atom.make((get) =>
           Function.pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(Sequence, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) =>
+              Obj.instanceOf(Sequence, node.data) || Obj.instanceOf(Prompt.Prompt, node.data)
+                ? Option.some(node)
+                : Option.none(),
+            ),
             Option.map((node) => [
               {
-                id: [node.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),
+                id: [node.id, 'invocations'].join(ATTENDABLE_PATH_SEPARATOR),
                 type: PLANK_COMPANION_TYPE,
-                data: 'logs',
+                data: 'invocations',
                 properties: {
-                  label: ['sequence logs label', { ns: meta.id }],
+                  label: ['invocations label', { ns: meta.id }],
                   icon: 'ph--clock-countdown--regular',
                   disposition: 'hidden',
                 },

package/src/capabilities/blueprint-definition.ts

@@ -5,42 +5,38 @@
 import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
 import { templates } from '@dxos/assistant';
 import {
-  DISCORD_BLUEPRINT,
-  LINEAR_BLUEPRINT,
-  RESEARCH_BLUEPRINT,
-  WEB_SEARCH_BLUEPRINT,
-  agent,
-  createResearchNote,
-  entityExtraction,
-  fetchDiscordMessages,
-  research,
-  syncLinearIssues,
-} from '@dxos/assistant-testing';
+  Agent,
+  AssistantToolkit,
+  Discord,
+  DiscordBlueprint,
+  EntityExtraction,
+  Linear,
+  LinearBlueprint,
+  Research,
+  ResearchBlueprint,
+  SystemToolkit,
+  WebSearchBlueprint,
+} from '@dxos/assistant-toolkit';
 import { Blueprint } from '@dxos/blueprints';
 import { type FunctionDefinition } from '@dxos/functions';
 
 import { analysis, list, load } from '../functions';
 
+// TODO(burdon): Document plugin structure (blueprint, functions, toolkit.)
+// TODO(burdon): Test framework for developing functions. Error handling.
+// TODO(burdon): Function naming pattern (noun-verb); fully-qualified?
+
+// TODO(wittjosiah): Factor out to a generic app-framework blueprint.
+const deckTools = ['open-item'];
+
 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',
-];
+const tools = [...AssistantToolkit.tools, ...SystemToolkit.tools, ...deckTools];
 
-export const BLUEPRINT_KEY = 'dxos.org/blueprint/assistant';
+export const ASSISTANT_BLUEPRINT_KEY = 'dxos.org/blueprint/assistant';
 
 export const createBlueprint = (): Blueprint.Blueprint =>
   Blueprint.make({
-    key: BLUEPRINT_KEY,
+    key: ASSISTANT_BLUEPRINT_KEY,
     name: 'Assistant',
     tools: Blueprint.toolDefinitions({ functions, tools }),
     instructions: templates.system,
@@ -48,17 +44,23 @@ export const createBlueprint = (): Blueprint.Blueprint =>
 
 const blueprint = createBlueprint();
 
-// TODO(dmaretskyi): Consider splitting into multiple modules.
 export default (): Capability<any>[] => [
   contributes(Capabilities.Functions, functions),
-  contributes(Capabilities.Functions, [agent]),
-  contributes(Capabilities.Functions, [research, createResearchNote, entityExtraction]),
   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),
-  contributes(Capabilities.BlueprintDefinition, WEB_SEARCH_BLUEPRINT),
+
+  // TODO(burdon): Factor out.
+  contributes(Capabilities.Functions, [Research.create, Research.research]),
+  contributes(Capabilities.BlueprintDefinition, ResearchBlueprint),
+
+  // TODO(burdon): Factor out.
+  contributes(Capabilities.Functions, [Agent.prompt, EntityExtraction.extract]),
+  contributes(Capabilities.BlueprintDefinition, WebSearchBlueprint),
+
+  // TODO(burdon): Factor out.
+  contributes(Capabilities.Functions, [Discord.fetch]),
+  contributes(Capabilities.BlueprintDefinition, DiscordBlueprint),
+
+  // TODO(burdon): Factor out.
+  contributes(Capabilities.Functions, [Linear.sync]),
+  contributes(Capabilities.BlueprintDefinition, LinearBlueprint),
 ];

package/src/capabilities/capabilities.ts

@@ -6,12 +6,11 @@ import { defineCapability } from '@dxos/app-framework';
 import { type DeepReadonly } from '@dxos/util';
 
 import { meta } from '../meta';
-import { type Assistant } from '../types';
 
 export namespace AssistantCapabilities {
   export type AssistantState = {
-    /** Map of primary object fq id to current chat. */
-    currentChat: Record<string, Assistant.Chat>;
+    /** Map of primary object dxn to current chat dxn. */
+    currentChat: Record<string, string | undefined>;
   };
   export const State = defineCapability<DeepReadonly<AssistantState>>(`${meta.id}/capability/state`);
   export const MutableState = defineCapability<AssistantState>(`${meta.id}/capability/state`);

package/src/capabilities/intent-resolver.ts

@@ -5,16 +5,22 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, type PluginContext, contributes, createIntent, createResolver } from '@dxos/app-framework';
-import { AiContextBinder } from '@dxos/assistant';
-import { Blueprint, Template } from '@dxos/blueprints';
-import { fullyQualifiedId } from '@dxos/client/echo';
+import { AiContextBinder, AiConversation } from '@dxos/assistant';
+import { Agent } from '@dxos/assistant-toolkit';
+import { Blueprint, Prompt, Template } from '@dxos/blueprints';
+import { type Queue } from '@dxos/client/echo';
 import { Sequence } from '@dxos/conductor';
-import { Filter, Key, Obj, Ref } from '@dxos/echo';
+import { Filter, Key, Obj, Ref, Type } from '@dxos/echo';
+import { TracingService, serializeFunction } from '@dxos/functions';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
 import { CollectionAction } from '@dxos/plugin-space/types';
+import { getSpace } from '@dxos/react-client/echo';
+import { type Message } from '@dxos/types';
 
+import { type AiChatServices, updateName } from '../processor';
 import { Assistant, AssistantAction } from '../types';
 
-import { BLUEPRINT_KEY, createBlueprint } from './blueprint-definition';
+import { ASSISTANT_BLUEPRINT_KEY, createBlueprint } from './blueprint-definition';
 import { AssistantCapabilities } from './capabilities';
 
 export default (context: PluginContext) => [
@@ -25,12 +31,28 @@ export default (context: PluginContext) => [
         Effect.gen(function* () {
           const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
           const { object: chatCollection } = yield* dispatch(
-            createIntent(CollectionAction.CreateQueryCollection, { typename: Assistant.Chat.typename }),
+            createIntent(CollectionAction.CreateQueryCollection, {
+              typename: Assistant.Chat.typename,
+            }),
           );
           const { object: blueprintCollection } = yield* dispatch(
-            createIntent(CollectionAction.CreateQueryCollection, { typename: Blueprint.Blueprint.typename }),
+            createIntent(CollectionAction.CreateQueryCollection, {
+              typename: Blueprint.Blueprint.typename,
+            }),
           );
-          rootCollection.objects.push(Ref.make(chatCollection), Ref.make(blueprintCollection));
+          const { object: promptCollection } = yield* dispatch(
+            createIntent(CollectionAction.CreateQueryCollection, {
+              typename: Type.getTypename(Prompt.Prompt),
+            }),
+          );
+          rootCollection.objects.push(
+            Ref.make(chatCollection),
+            Ref.make(blueprintCollection),
+            Ref.make(promptCollection),
+          );
+
+          // TODO(wittjosiah): Remove once function registry is avaiable.
+          space.db.add(serializeFunction(Agent.prompt));
 
           // Create default chat.
           const { object: chat } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
@@ -42,29 +64,58 @@ export default (context: PluginContext) => [
       resolve: async ({ space, name }) => {
         const queue = space.queues.create();
         const chat = Assistant.makeChat({ name, queue });
-        const { objects: blueprints } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+
         // TODO(wittjosiah): This should be a space-level setting.
         // TODO(burdon): Clone when activated. Copy-on-write for template.
-        let defaultBlueprint = blueprints.find((blueprint) => blueprint.key === BLUEPRINT_KEY);
+        const { objects: blueprints } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+        let defaultBlueprint = blueprints.find((blueprint) => blueprint.key === ASSISTANT_BLUEPRINT_KEY);
         if (!defaultBlueprint) {
           defaultBlueprint = space.db.add(createBlueprint());
         }
 
         const binder = new AiContextBinder(queue);
-        await binder.open();
-        await binder.bind({ blueprints: [Ref.make(defaultBlueprint)] });
-        await binder.close();
+        await binder.use((binder) => binder.bind({ blueprints: [Ref.make(defaultBlueprint)] }));
 
         return {
           data: { object: chat },
         };
       },
     }),
+    createResolver({
+      intent: AssistantAction.UpdateChatName,
+      resolve: async ({ chat }) => {
+        const space = getSpace(chat);
+        const queue = chat.queue.target as Queue<Message.Message>;
+        if (!space || !queue) {
+          return;
+        }
+
+        const runtimeResolver = context.getCapability(AutomationCapabilities.ComputeRuntime);
+        const runtime = await runtimeResolver
+          .getRuntime(space.id)
+          .runPromise(Effect.runtime<AiChatServices>().pipe(Effect.provide(TracingService.layerNoop)));
+
+        await new AiConversation(queue).use(async (conversation) => updateName(runtime, conversation, chat));
+      },
+    }),
     createResolver({
       intent: AssistantAction.CreateBlueprint,
       resolve: ({ key, name, description }) => ({
         data: {
-          object: Blueprint.make({ key, name, description, instructions: Template.make({ source: '' }) }),
+          object: Blueprint.make({
+            key,
+            name,
+            description,
+            instructions: Template.make(),
+          }),
+        },
+      }),
+    }),
+    createResolver({
+      intent: AssistantAction.CreatePrompt,
+      resolve: ({ name }) => ({
+        data: {
+          object: Prompt.make({ name }),
         },
       }),
     }),
@@ -89,7 +140,7 @@ export default (context: PluginContext) => [
       resolve: ({ companionTo, chat }) =>
         Effect.gen(function* () {
           const state = context.getCapability(AssistantCapabilities.MutableState);
-          state.currentChat[fullyQualifiedId(companionTo)] = chat;
+          state.currentChat[Obj.getDXN(companionTo).toString()] = chat && Obj.getDXN(chat).toString();
         }),
     }),
   ]),

package/src/capabilities/local-model-resolver.ts

@@ -21,7 +21,7 @@ export default (): Capability<any>[] => [
     AiServiceRouter.LMStudioResolver.pipe(
       Layer.provide(
         OpenAiClient.layer({
-          apiUrl: AiServiceRouter.LMSTUDIO_ENDPOINT,
+          apiUrl: AiServiceRouter.DEFAULT_LMSTUDIO_ENDPOINT,
         }),
       ),
       Layer.provide(FetchHttpClient.layer),