@dxos/plugin-assistant 0.8.4-main.28f8d3d → 0.8.4-main.2c6827d

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,26 +14,60 @@ 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 } from '@dxos/plugin-graph';
-import { getActiveSpace, rxFromQuery } from '@dxos/plugin-space';
+import { ROOT_ID, atomFromSignal, createExtension } from '@dxos/plugin-graph';
+import { getActiveSpace } from '@dxos/plugin-space';
 import { SpaceAction } from '@dxos/plugin-space/types';
-import { Filter, Query, type QueryResult, type Space, fullyQualifiedId, getSpace } 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';
 
+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(() => [
@@ -79,61 +114,68 @@ 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 Atom.make((get) =>
+          Function.pipe(
+            get(node),
+            Option.flatMap((node) => (Obj.isObject(node.data) ? Option.some(node.data) : Option.none())),
+            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 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',
-              },
-            },
-          ];
-        });
+              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: [Obj.getDXN(object).toString(), '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(() => []),
+          ),
+        );
       },
     }),
 
     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',
                 },
@@ -155,11 +197,10 @@ 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(AssistantAction.CreateChat, { space }));

package/src/capabilities/blueprint-definition.ts

@@ -2,31 +2,65 @@
 // Copyright 2025 DXOS.org
 //
 
-import { ToolId } from '@dxos/ai';
-import { Capabilities, contributes } from '@dxos/app-framework';
+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';
 
-const functions = [analysis, list, load];
-const tools: string[] = [
-  'get-schemas',
-  'create-record',
-  // 'open-item'
-];
+// 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 = [...AssistantToolkit.tools, ...SystemToolkit.tools, ...deckTools];
+
+export const ASSISTANT_BLUEPRINT_KEY = 'dxos.org/blueprint/assistant';
+
+export const createBlueprint = (): Blueprint.Blueprint =>
+  Blueprint.make({
+    key: ASSISTANT_BLUEPRINT_KEY,
+    name: 'Assistant',
+    tools: Blueprint.toolDefinitions({ functions, tools }),
+    instructions: templates.system,
+  });
+
+const blueprint = createBlueprint();
 
-export default () => {
-  return [
-    contributes(
-      Capabilities.BlueprintDefinition,
-      Blueprint.make({
-        key: 'dxos.org/blueprint/assistant',
-        name: 'Assistant',
-        instructions: templates.system,
-        tools: [...functions.map((tool) => ToolId.make(tool.name)), ...tools.map((tool) => ToolId.make(tool))],
-      }),
-    ),
-    contributes(Capabilities.Functions, functions),
-  ];
-};
+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,21 +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';
 
 export namespace AssistantCapabilities {
-  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`,
-  );
+  export type AssistantState = {
+    /** 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/edge-model-resolver.ts

@@ -2,28 +2,24 @@
 // Copyright 2025 DXOS.org
 //
 
-import { AnthropicClient } from '@effect/ai-anthropic';
-import { FetchHttpClient } from '@effect/platform';
-import { Layer } from 'effect';
+import * as AnthropicClient from '@effect/ai-anthropic/AnthropicClient';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as Layer from 'effect/Layer';
 
-import { AiServiceRouter } from '@dxos/ai';
-import { contributes } from '@dxos/app-framework';
+import * as AiServiceRouter from '@dxos/ai/AiServiceRouter';
+import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
 
-import { AssistantCapabilities } from './capabilities';
-
-export default () => {
-  return [
-    contributes(
-      AssistantCapabilities.AiModelResolver,
-      AiServiceRouter.AnthropicResolver.pipe(
-        Layer.provide(
-          AnthropicClient.layer({
-            // TODO(dmaretskyi): Read endpoint from config/settings.
-            apiUrl: 'https://ai-service.dxos.workers.dev/provider/anthropic',
-          }),
-        ),
-        Layer.provide(FetchHttpClient.layer),
+export default (): Capability<any>[] => [
+  contributes(
+    Capabilities.AiModelResolver,
+    AiServiceRouter.AnthropicResolver.pipe(
+      Layer.provide(
+        AnthropicClient.layer({
+          // TODO(dmaretskyi): Read endpoint from config/settings.
+          apiUrl: 'https://ai-service.dxos.workers.dev/provider/anthropic',
+        }),
       ),
+      Layer.provide(FetchHttpClient.layer),
     ),
-  ];
-};
+  ),
+];

package/src/capabilities/index.ts

@@ -4,13 +4,16 @@
 
 import { lazy } from '@dxos/app-framework';
 
-export * from './capabilities';
-
 export const AiService = lazy(() => import('./ai-service'));
 export const AppGraphBuilder = lazy(() => import('./app-graph-builder'));
+export const AssistantState = lazy(() => import('./state'));
 export const BlueprintDefinition = lazy(() => import('./blueprint-definition'));
 export const EdgeModelResolver = lazy(() => import('./edge-model-resolver'));
 export const IntentResolver = lazy(() => import('./intent-resolver'));
+export const LocalModelResolver = lazy(() => import('./local-model-resolver'));
 export const ReactSurface = lazy(() => import('./react-surface'));
 export const Settings = lazy(() => import('./settings'));
 export const Toolkit = lazy(() => import('./toolkit'));
+
+export * from './blueprint-definition';
+export * from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -2,54 +2,120 @@
 // 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 { Blueprint, Template } from '@dxos/blueprints';
+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 { 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 { 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,
+            }),
+          );
+          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),
           );
-          rootCollection.objects.push(Ref.make(chatCollection), Ref.make(blueprintCollection));
+
+          // 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 }));
           space.db.add(chat);
-
-          // TODO(wittjosiah): Create default blueprint.
-          // const { object: blueprint } = yield* dispatch(createIntent(AssistantAction.CreateBlueprint, { ... }));
-          // space.db.add(blueprint);
         }),
     }),
     createResolver({
       intent: AssistantAction.CreateChat,
-      resolve: ({ space, name }) => ({
+      resolve: async ({ space, name }) => {
+        const queue = space.queues.create();
+        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.
+        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.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: Obj.make(Assistant.Chat, {
+          object: Blueprint.make({
+            key,
             name,
-            queue: Ref.fromDXN(space.queues.create().dxn),
+            description,
+            instructions: Template.make(),
           }),
         },
       }),
     }),
     createResolver({
-      intent: AssistantAction.CreateBlueprint,
-      resolve: ({ key, name, description }) => ({
+      intent: AssistantAction.CreatePrompt,
+      resolve: ({ name }) => ({
         data: {
-          object: Blueprint.make({ key, name, description, instructions: Template.make({ source: '' }) }),
+          object: Prompt.make({ name }),
         },
       }),
     }),
@@ -69,5 +135,13 @@ export default (context: PluginContext) => [
         },
       }),
     }),
+    createResolver({
+      intent: AssistantAction.SetCurrentChat,
+      resolve: ({ companionTo, chat }) =>
+        Effect.gen(function* () {
+          const state = context.getCapability(AssistantCapabilities.MutableState);
+          state.currentChat[Obj.getDXN(companionTo).toString()] = chat && Obj.getDXN(chat).toString();
+        }),
+    }),
   ]),
 ];

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

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as OpenAiClient from '@effect/ai-openai/OpenAiClient';
+import * as FetchHttpClient from '@effect/platform/FetchHttpClient';
+import * as Layer from 'effect/Layer';
+
+import * as AiServiceRouter from '@dxos/ai/AiServiceRouter';
+import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
+
+/**
+ * To start LM Studio server:
+ * ```bash
+ * ~/.lmstudio/bin/lms server start --cors
+ * ```
+ */
+export default (): Capability<any>[] => [
+  contributes(
+    Capabilities.AiModelResolver,
+    AiServiceRouter.LMStudioResolver.pipe(
+      Layer.provide(
+        OpenAiClient.layer({
+          apiUrl: AiServiceRouter.DEFAULT_LMSTUDIO_ENDPOINT,
+        }),
+      ),
+      Layer.provide(FetchHttpClient.layer),
+    ),
+  ),
+];