@dxos/plugin-assistant 0.8.4-main.5ea62a8 → 0.8.4-main.72ec0f3

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

@@ -2,8 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import { Atom } from '@effect-atom/atom-react';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 
 import {
   Capabilities,
@@ -13,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 { ROOT_ID, atomFromSignal, createExtension } 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';
@@ -30,11 +32,42 @@ 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) =>
-          pipe(
+        Atom.make((get) =>
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => [
@@ -83,20 +116,31 @@ export default (context: PluginContext) =>
     createExtension({
       id: `${meta.id}/companion-chat`,
       connector: (node) => {
-        return Rx.make((get) =>
-          pipe(
+        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(
-                rxFromSignal(
-                  () => context.getCapability(AssistantCapabilities.State).currentChat[fullyQualifiedId(object)],
+            Option.flatMap((object) => {
+              const currentChatState = get(
+                atomFromSignal(
+                  () => 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(atomFromSignal(() => 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: {
@@ -115,19 +159,23 @@ export default (context: PluginContext) =>
     }),
 
     createExtension({
-      id: `${meta.id}/sequence-logs`,
+      id: `${meta.id}/invocations`,
       connector: (node) =>
-        Rx.make((get) =>
-          pipe(
+        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

@@ -4,31 +4,39 @@
 
 import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
 import { templates } from '@dxos/assistant';
+import {
+  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,
@@ -39,4 +47,20 @@ const blueprint = createBlueprint();
 export default (): Capability<any>[] => [
   contributes(Capabilities.Functions, functions),
   contributes(Capabilities.BlueprintDefinition, 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

@@ -2,30 +2,16 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Layer } from 'effect';
-
-import { type AiService, type AiServiceRouter } from '@dxos/ai';
 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`);
-
-  export type AiServiceLayer = Layer.Layer<AiService.AiService>;
-  export const AiServiceLayer = defineCapability<AiServiceLayer>(`${meta.id}/capability/ai-service-factory`);
-
-  /**
-   * Plugins can contribute them to provide model resolvers.
-   */
-  export const AiModelResolver = defineCapability<Layer.Layer<AiServiceRouter.AiModelResolver>>(
-    `${meta.id}/capability/ai-model-resolver`,
-  );
 }

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

@@ -3,17 +3,15 @@
 //
 
 import * as AnthropicClient from '@effect/ai-anthropic/AnthropicClient';
-import { FetchHttpClient } from '@effect/platform';
-import { Layer } from 'effect';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as Layer from 'effect/Layer';
 
-import { AiServiceRouter } from '@dxos/ai';
-import { type Capability, contributes } from '@dxos/app-framework';
-
-import { AssistantCapabilities } from './capabilities';
+import * as AiServiceRouter from '@dxos/ai/AiServiceRouter';
+import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
 
 export default (): Capability<any>[] => [
   contributes(
-    AssistantCapabilities.AiModelResolver,
+    Capabilities.AiModelResolver,
     AiServiceRouter.AnthropicResolver.pipe(
       Layer.provide(
         AnthropicClient.layer({

package/src/capabilities/intent-resolver.ts

@@ -2,35 +2,57 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect } from 'effect';
+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) => [
   contributes(Capabilities.IntentResolver, [
     createResolver({
-      intent: AssistantAction.OnSpaceCreated,
+      intent: AssistantAction.onCreateSpace,
       resolve: ({ space, rootCollection }) =>
         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 }));
@@ -41,28 +63,59 @@ export default (context: PluginContext) => [
       intent: AssistantAction.CreateChat,
       resolve: async ({ space, name }) => {
         const queue = space.queues.create();
-        const chat = Obj.make(Assistant.Chat, { name, queue: Ref.fromDXN(queue.dxn) });
-        const { objects: blueprints } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+        const chat = Assistant.makeChat({ name, queue });
+
         // 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.bind({ blueprints: [Ref.make(defaultBlueprint)] });
+        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 }),
         },
       }),
     }),
@@ -87,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

@@ -2,14 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OpenAiClient } from '@effect/ai-openai';
-import { FetchHttpClient } from '@effect/platform';
-import { Layer } from 'effect';
+import * as OpenAiClient from '@effect/ai-openai/OpenAiClient';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as Layer from 'effect/Layer';
 
-import { AiServiceRouter } from '@dxos/ai';
-import { type Capability, contributes } from '@dxos/app-framework';
-
-import { AssistantCapabilities } from './capabilities';
+import * as AiServiceRouter from '@dxos/ai/AiServiceRouter';
+import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
 
 /**
  * To start LM Studio server:
@@ -19,11 +17,11 @@ import { AssistantCapabilities } from './capabilities';
  */
 export default (): Capability<any>[] => [
   contributes(
-    AssistantCapabilities.AiModelResolver,
+    Capabilities.AiModelResolver,
     AiServiceRouter.LMStudioResolver.pipe(
       Layer.provide(
         OpenAiClient.layer({
-          apiUrl: AiServiceRouter.LMSTUDIO_ENDPOINT,
+          apiUrl: AiServiceRouter.DEFAULT_LMSTUDIO_ENDPOINT,
         }),
       ),
       Layer.provide(FetchHttpClient.layer),

package/src/capabilities/react-surface.tsx

@@ -5,7 +5,7 @@
 import React from 'react';
 
 import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint, Prompt } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
 import { Sequence } from '@dxos/conductor';
 import { InvocationTraceContainer } from '@dxos/devtools';
@@ -15,12 +15,11 @@ import { StackItem } from '@dxos/react-ui-stack';
 
 import {
   AssistantSettings,
-  BlueprintContainer,
+  BlueprintArticle,
   ChatCompanion,
   ChatContainer,
   ChatDialog,
-  PromptSettings,
-  SequenceContainer,
+  PromptArticle,
 } from '../components';
 import { ASSISTANT_DIALOG, meta } from '../meta';
 import { Assistant } from '../types';
@@ -41,6 +40,7 @@ export default () =>
         Obj.instanceOf(Assistant.Chat, data.subject) && data.variant !== 'assistant-chat',
       component: ({ data, role }) => <ChatContainer role={role} chat={data.subject} />,
     }),
+    // TODO(wittjosiah): This is flashing when chat changes.
     createSurface({
       id: `${meta.id}/companion-chat`,
       role: 'article',
@@ -50,22 +50,18 @@ export default () =>
       component: ({ data, role }) => <ChatCompanion role={role} data={data} />,
     }),
     createSurface({
-      id: `${meta.id}/sequence`,
-      role: 'article',
-      filter: (data): data is { subject: Sequence } => Obj.instanceOf(Sequence, data.subject),
-      component: ({ data }) => <SequenceContainer sequence={data.subject} />,
-    }),
-    createSurface({
-      id: `${meta.id}/companion-logs`,
+      id: `${meta.id}/companion-invocations`,
       role: 'article',
       filter: (data): data is { companionTo: Sequence } =>
-        Obj.instanceOf(Sequence, data.companionTo) && data.subject === 'logs',
-      // eslint-disable-next-line unused-imports/no-unused-vars
-      component: ({ data, role }) => {
+        (Obj.instanceOf(Sequence, data.companionTo) || Obj.instanceOf(Prompt.Prompt, data.companionTo)) &&
+        data.subject === 'invocations',
+      component: ({ data }) => {
         const space = getSpace(data.companionTo);
+        // TODO(wittjosiah): Support invocation filtering for prompts.
+        const target = Obj.instanceOf(Prompt.Prompt, data.companionTo) ? undefined : data.companionTo;
         return (
           <StackItem.Content>
-            <InvocationTraceContainer space={space} target={data.companionTo} detailAxis='block' />
+            <InvocationTraceContainer space={space} target={target} detailAxis='block' />
           </StackItem.Content>
         );
       },
@@ -74,13 +70,13 @@ export default () =>
       id: `${meta.id}/blueprint`,
       role: 'article',
       filter: (data): data is { subject: Blueprint.Blueprint } => Obj.instanceOf(Blueprint.Blueprint, data.subject),
-      component: ({ data }) => <BlueprintContainer blueprint={data.subject} />,
+      component: ({ data }) => <BlueprintArticle subject={data.subject} />,
     }),
     createSurface({
-      id: `${meta.id}/prompt-settings`,
-      role: 'object-settings',
-      filter: (data): data is { subject: Blueprint.Blueprint } => Obj.instanceOf(Blueprint.Blueprint, data.subject),
-      component: ({ data }) => <PromptSettings template={data.subject.instructions} />,
+      id: `${meta.id}/prompt`,
+      role: 'article',
+      filter: (data): data is { subject: Prompt.Prompt } => Obj.instanceOf(Prompt.Prompt, data.subject),
+      component: ({ data }) => <PromptArticle subject={data.subject} />,
     }),
     createSurface({
       id: ASSISTANT_DIALOG,

package/src/capabilities/state.ts

@@ -16,5 +16,7 @@ export default () => {
     currentChat: {},
   });
 
+  state.prop({ key: 'currentChat', type: LocalStorageStore.json<Record<string, string | undefined>>() });
+
   return contributes(AssistantCapabilities.State, state.values, () => state.close());
 };