@dxos/plugin-assistant 0.8.3-staging.0fa589b → 0.8.4-main.1da679c

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

@@ -7,37 +7,31 @@ import { Option, pipe } from 'effect';
 
 import {
   Capabilities,
-  contributes,
-  createIntent,
   LayoutAction,
-  type PromiseIntentDispatcher,
   type PluginContext,
+  type PromiseIntentDispatcher,
+  contributes,
+  createIntent,
 } from '@dxos/app-framework';
-import { Blueprint } from '@dxos/assistant';
+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 { SPACE_TYPE, SpaceAction } from '@dxos/plugin-space/types';
-import {
-  type Space,
-  Filter,
-  Query,
-  type QueryResult,
-  fullyQualifiedId,
-  getSpace,
-  isSpace,
-} from '@dxos/react-client/echo';
+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 { ASSISTANT_DIALOG, ASSISTANT_PLUGIN } from '../meta';
-import { AIChatType, AssistantAction, CompanionTo, TemplateType } from '../types';
+import { ASSISTANT_DIALOG, meta } from '../meta';
+import { Assistant, AssistantAction } from '../types';
+
+import { AssistantCapabilities } from './capabilities';
 
 export default (context: PluginContext) =>
   contributes(Capabilities.AppGraphBuilder, [
     createExtension({
-      id: `${ASSISTANT_PLUGIN}/assistant`,
+      id: `${meta.id}/assistant`,
       actions: (node) =>
         Rx.make((get) =>
           pipe(
@@ -49,7 +43,6 @@ export default (context: PluginContext) =>
                 data: async () => {
                   const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
                   const client = context.getCapability(ClientCapabilities.Client);
-
                   const space = getActiveSpace(context) ?? client.spaces.default;
                   const chat = await getOrCreateChat(dispatch, space);
                   if (!chat) {
@@ -71,7 +64,7 @@ export default (context: PluginContext) =>
                   );
                 },
                 properties: {
-                  label: ['open assistant label', { ns: ASSISTANT_PLUGIN }],
+                  label: ['open assistant label', { ns: meta.id }],
                   icon: 'ph--sparkle--regular',
                   disposition: 'pin-end',
                   position: 'hoist',
@@ -88,61 +81,53 @@ export default (context: PluginContext) =>
     }),
 
     createExtension({
-      id: `${ASSISTANT_PLUGIN}/object-chat-companion`,
+      id: `${meta.id}/companion-chat`,
       connector: (node) => {
-        let query: QueryResult<AIChatType> | 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(CompanionTo).source());
-          }
-
-          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: ASSISTANT_PLUGIN }],
-                icon: 'ph--sparkle--regular',
-                position: 'hoist',
-                disposition: 'hidden',
-              },
-            },
-          ];
-        });
+        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)],
+                ),
+              );
+
+              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(() => []),
+          ),
+        );
       },
     }),
 
     createExtension({
-      id: `${ASSISTANT_PLUGIN}/blueprint-logs`,
+      id: `${meta.id}/sequence-logs`,
       connector: (node) =>
         Rx.make((get) =>
           pipe(
             get(node),
-            Option.flatMap((node) => (Obj.instanceOf(Blueprint, node.data) ? Option.some(node) : Option.none())),
+            Option.flatMap((node) => (Obj.instanceOf(Sequence, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
               {
                 id: [node.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),
                 type: PLANK_COMPANION_TYPE,
                 data: 'logs',
                 properties: {
-                  label: ['blueprint logs label', { ns: ASSISTANT_PLUGIN }],
+                  label: ['sequence logs label', { ns: meta.id }],
                   icon: 'ph--clock-countdown--regular',
                   disposition: 'hidden',
                 },
@@ -152,97 +137,26 @@ export default (context: PluginContext) =>
           ),
         ),
     }),
-
-    createExtension({
-      id: `${ASSISTANT_PLUGIN}/root`,
-      connector: (node) => {
-        let query: QueryResult<TemplateType> | undefined;
-        return Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) =>
-              node.type === SPACE_TYPE && isSpace(node.data) ? Option.some(node.data) : Option.none(),
-            ),
-            Option.map((space) => {
-              if (!query) {
-                query = space.db.query(Query.type(TemplateType));
-              }
-
-              const templates = get(rxFromQuery(query));
-              return templates.length > 0
-                ? [
-                    {
-                      id: `${ASSISTANT_PLUGIN}/templates`,
-                      type: `${ASSISTANT_PLUGIN}/templates`,
-                      data: null,
-                      properties: {
-                        label: ['templates label', { ns: ASSISTANT_PLUGIN }],
-                        icon: 'ph--file-code--regular',
-                        space,
-                      },
-                    },
-                  ]
-                : [];
-            }),
-            Option.getOrElse(() => []),
-          ),
-        );
-      },
-    }),
-
-    createExtension({
-      id: `${ASSISTANT_PLUGIN}/templates`,
-      connector: (node) => {
-        let query: QueryResult<TemplateType> | undefined;
-        return Rx.make((get) =>
-          pipe(
-            get(node),
-            Option.flatMap((node) =>
-              node.id === `${ASSISTANT_PLUGIN}/templates` && isSpace(node.properties.space)
-                ? Option.some(node.properties.space)
-                : Option.none(),
-            ),
-            Option.map((space) => {
-              if (!query) {
-                query = space.db.query(Query.type(TemplateType));
-              }
-              return get(rxFromQuery(query))
-                .toSorted((a, b) => {
-                  const nameA = a.name ?? '';
-                  const nameB = b.name ?? '';
-                  return nameA.localeCompare(nameB);
-                })
-                .map((template) => ({
-                  id: fullyQualifiedId(template),
-                  type: `${ASSISTANT_PLUGIN}/template`,
-                  data: template,
-                  properties: {
-                    label: template.name ?? ['object placeholder', { ns: ASSISTANT_PLUGIN }],
-                    icon: 'ph--file-code--regular',
-                  },
-                }));
-            }),
-            Option.getOrElse(() => []),
-          ),
-        );
-      },
-    }),
   ]);
 
 // TODO(burdon): Factor out.
-const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space): Promise<AIChatType | undefined> => {
+const getOrCreateChat = async (
+  dispatch: PromiseIntentDispatcher,
+  space: Space,
+): Promise<Assistant.Chat | undefined> => {
   // TODO(wittjosiah): This should be possible with a single query.
-  const { objects: allChats } = await space.db.query(Query.type(AIChatType)).run();
-  const { objects: relatedChats } = await space.db.query(Query.type(AIChatType).sourceOf(CompanionTo).source()).run();
+  const { objects: allChats } = await space.db.query(Query.type(Assistant.Chat)).run();
+  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 }));
-  invariant(Obj.instanceOf(AIChatType, data?.object));
+  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,61 @@
+//
+// 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,
+  agent,
+  createResearchNote,
+  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, [agent]),
+  contributes(Capabilities.Functions, [research, createResearchNote]),
+  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),
+];

package/src/capabilities/capabilities.ts

@@ -2,14 +2,17 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type ReadonlySignal } from '@preact/signals-core';
-
-import { type AiServiceClient } from '@dxos/ai';
 import { defineCapability } from '@dxos/app-framework';
+import { type DeepReadonly } from '@dxos/util';
 
-import { ASSISTANT_PLUGIN } from '../meta';
+import { meta } from '../meta';
+import { type Assistant } from '../types';
 
-// TODO(burdon): Move to types to import from other plugins?
 export namespace AssistantCapabilities {
-  export const AiClient = defineCapability<ReadonlySignal<AiServiceClient>>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
+  export type AssistantState = {
+    /** Map of primary object fq id to current chat. */
+    currentChat: Record<string, Assistant.Chat>;
+  };
+  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

@@ -0,0 +1,25 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as AnthropicClient from '@effect/ai-anthropic/AnthropicClient';
+import { FetchHttpClient } from '@effect/platform';
+import { Layer } from 'effect';
+
+import { AiServiceRouter } from '@dxos/ai';
+import { Capabilities, type Capability, contributes } from '@dxos/app-framework';
+
+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,10 +4,16 @@
 
 import { lazy } from '@dxos/app-framework';
 
-export const AiClient = lazy(() => import('./ai-client'));
+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,34 +2,75 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Capabilities, contributes, createResolver } from '@dxos/app-framework';
-import { Blueprint } from '@dxos/assistant';
-import { Key, Obj, Ref } from '@dxos/echo';
+import { Effect } from 'effect';
 
-import { AssistantAction, AIChatType } from '../types';
+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 { Sequence } from '@dxos/conductor';
+import { Filter, Key, Obj, Ref } from '@dxos/echo';
+import { CollectionAction } from '@dxos/plugin-space/types';
 
-export default () => [
-  contributes(
-    Capabilities.IntentResolver,
+import { Assistant, AssistantAction } from '../types';
+
+import { BLUEPRINT_KEY, createBlueprint } from './blueprint-definition';
+import { AssistantCapabilities } from './capabilities';
+
+export default (context: PluginContext) => [
+  contributes(Capabilities.IntentResolver, [
+    createResolver({
+      intent: AssistantAction.OnSpaceCreated,
+      resolve: ({ space, rootCollection }) =>
+        Effect.gen(function* () {
+          const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+          const { object: chatCollection } = yield* dispatch(
+            createIntent(CollectionAction.CreateQueryCollection, { typename: Assistant.Chat.typename }),
+          );
+          const { object: blueprintCollection } = yield* dispatch(
+            createIntent(CollectionAction.CreateQueryCollection, { typename: Blueprint.Blueprint.typename }),
+          );
+          rootCollection.objects.push(Ref.make(chatCollection), Ref.make(blueprintCollection));
+
+          // Create default chat.
+          const { object: chat } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
+          space.db.add(chat);
+        }),
+    }),
     createResolver({
       intent: AssistantAction.CreateChat,
-      resolve: ({ space, name }) => ({
+      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();
+        // 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);
+        if (!defaultBlueprint) {
+          defaultBlueprint = space.db.add(createBlueprint());
+        }
+
+        const binder = new AiContextBinder(queue);
+        await binder.bind({ blueprints: [Ref.make(defaultBlueprint)] });
+
+        return {
+          data: { object: chat },
+        };
+      },
+    }),
+    createResolver({
+      intent: AssistantAction.CreateBlueprint,
+      resolve: ({ key, name, description }) => ({
         data: {
-          object: Obj.make(AIChatType, {
-            name,
-            queue: Ref.fromDXN(space.queues.create().dxn),
-          }),
+          object: Blueprint.make({ key, name, description, instructions: Template.make({ source: '' }) }),
         },
       }),
     }),
-  ),
-  contributes(
-    Capabilities.IntentResolver,
     createResolver({
-      intent: AssistantAction.CreateBlueprint,
+      intent: AssistantAction.CreateSequence,
       resolve: ({ name }) => ({
         data: {
-          object: Obj.make(Blueprint, {
+          object: Obj.make(Sequence, {
             name,
             steps: [
               {
@@ -41,5 +82,13 @@ export default () => [
         },
       }),
     }),
-  ),
+    createResolver({
+      intent: AssistantAction.SetCurrentChat,
+      resolve: ({ companionTo, chat }) =>
+        Effect.gen(function* () {
+          const state = context.getCapability(AssistantCapabilities.MutableState);
+          state.currentChat[fullyQualifiedId(companionTo)] = chat;
+        }),
+    }),
+  ]),
 ];

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

@@ -0,0 +1,30 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { OpenAiClient } from '@effect/ai-openai';
+import { FetchHttpClient } from '@effect/platform';
+import { Layer } from 'effect';
+
+import { AiServiceRouter } from '@dxos/ai';
+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.LMSTUDIO_ENDPOINT,
+        }),
+      ),
+      Layer.provide(FetchHttpClient.layer),
+    ),
+  ),
+];