@dxos/plugin-assistant 0.8.4-main.28f8d3d → 0.8.4-main.406dc2a

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

@@ -3,7 +3,8 @@
 //
 
 import { Rx } from '@effect-rx/rx-react';
-import { Option, pipe } from 'effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 
 import {
   Capabilities,
@@ -18,21 +19,23 @@ import { 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, createExtension, rxFromSignal } 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, fullyQualifiedId } 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}/assistant`,
       actions: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (node.id === ROOT_ID ? Option.some(node) : Option.none())),
             Option.map(() => [
@@ -79,44 +82,36 @@ export default (context: PluginContext) =>
     }),
 
     createExtension({
-      id: `${meta.id}/object-chat-companion`,
+      id: `${meta.id}/companion-chat`,
       connector: (node) => {
-        let query: QueryResult<Assistant.Chat> | undefined;
-        return Rx.make((get) => {
-          const nodeOption = get(node);
-          if (Option.isNone(nodeOption)) {
-            return [];
-          }
-
-          const object = nodeOption.value.data;
-          if (!Obj.isObject(object)) {
-            return [];
-          }
-
-          const space = getSpace(object);
-          if (!space) {
-            return [];
-          }
-
-          if (!query) {
-            query = space.db.query(Query.select(Filter.ids(object.id)).targetOf(Assistant.CompanionTo).source());
-          }
+        return Rx.make((get) =>
+          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)],
+                ),
+              );
 
-          const chat = get(rxFromQuery(query))[0];
-          return [
-            {
-              id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
-              type: PLANK_COMPANION_TYPE,
-              data: chat ?? 'assistant-chat',
-              properties: {
-                label: ['assistant chat label', { ns: meta.id }],
-                icon: 'ph--sparkle--regular',
-                position: 'hoist',
-                disposition: 'hidden',
-              },
-            },
-          ];
-        });
+              return [
+                {
+                  id: [fullyQualifiedId(object), 'assistant-chat'].join(ATTENDABLE_PATH_SEPARATOR),
+                  type: PLANK_COMPANION_TYPE,
+                  data: currentChat ?? 'assistant-chat',
+                  properties: {
+                    label: ['assistant chat label', { ns: meta.id }],
+                    icon: 'ph--sparkle--regular',
+                    position: 'hoist',
+                    disposition: 'hidden',
+                  },
+                },
+              ];
+            }),
+            Option.getOrElse(() => []),
+          ),
+        );
       },
     }),
 
@@ -124,7 +119,7 @@ export default (context: PluginContext) =>
       id: `${meta.id}/sequence-logs`,
       connector: (node) =>
         Rx.make((get) =>
-          pipe(
+          Function.pipe(
             get(node),
             Option.flatMap((node) => (Obj.instanceOf(Sequence, node.data) ? Option.some(node) : Option.none())),
             Option.map((node) => [
@@ -155,11 +150,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,63 @@
 // 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 {
+  DISCORD_BLUEPRINT,
+  LINEAR_BLUEPRINT,
+  RESEARCH_BLUEPRINT,
+  WEB_SEARCH_BLUEPRINT,
+  agent,
+  createResearchNote,
+  entityExtraction,
+  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 = [analysis, list, load];
-const tools: string[] = [
+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',
-  // 'open-item'
+  // 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 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 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, 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),
+];

package/src/capabilities/capabilities.ts

@@ -2,21 +2,17 @@
 // 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 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 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

@@ -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,20 +2,25 @@
 // 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 { Sequence } from '@dxos/conductor';
-import { Key, Obj, Ref } from '@dxos/echo';
+import { Filter, Key, Obj, Ref } from '@dxos/echo';
 import { CollectionAction } from '@dxos/plugin-space/types';
 
 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,
+      intent: AssistantAction.onCreateSpace,
       resolve: ({ space, rootCollection }) =>
         Effect.gen(function* () {
           const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
@@ -26,24 +31,34 @@ export default (context: PluginContext) => [
             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);
-
-          // TODO(wittjosiah): Create default blueprint.
-          // const { object: blueprint } = yield* dispatch(createIntent(AssistantAction.CreateBlueprint, { ... }));
-          // space.db.add(blueprint);
         }),
     }),
     createResolver({
       intent: AssistantAction.CreateChat,
-      resolve: ({ space, name }) => ({
-        data: {
-          object: Obj.make(Assistant.Chat, {
-            name,
-            queue: Ref.fromDXN(space.queues.create().dxn),
-          }),
-        },
-      }),
+      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);
+        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();
+
+        return {
+          data: { object: chat },
+        };
+      },
     }),
     createResolver({
       intent: AssistantAction.CreateBlueprint,
@@ -69,5 +84,13 @@ export default (context: PluginContext) => [
         },
       }),
     }),
+    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 * 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.LMSTUDIO_ENDPOINT,
+        }),
+      ),
+      Layer.provide(FetchHttpClient.layer),
+    ),
+  ),
+];

package/src/capabilities/react-surface.tsx

@@ -2,30 +2,28 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Effect } from 'effect';
-import React, { useCallback, useEffect } from 'react';
+import React from 'react';
 
-import { Capabilities, contributes, createIntent, createSurface, useIntentDispatcher } from '@dxos/app-framework';
+import { Capabilities, contributes, createSurface } from '@dxos/app-framework';
 import { Blueprint } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
 import { Sequence } from '@dxos/conductor';
 import { InvocationTraceContainer } from '@dxos/devtools';
-import { Filter, Obj, Query, Ref } from '@dxos/echo';
+import { Obj } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
-import { SpaceAction } from '@dxos/plugin-space/types';
 import { StackItem } from '@dxos/react-ui-stack';
 
 import {
   AssistantSettings,
   BlueprintContainer,
+  ChatCompanion,
   ChatContainer,
   ChatDialog,
   PromptSettings,
   SequenceContainer,
 } from '../components';
-import { type AiChatProcessor } from '../hooks';
 import { ASSISTANT_DIALOG, meta } from '../meta';
-import { Assistant, AssistantAction } from '../types';
+import { Assistant } from '../types';
 
 export default () =>
   contributes(Capabilities.ReactSurface, [
@@ -44,65 +42,12 @@ export default () =>
       component: ({ data, role }) => <ChatContainer role={role} chat={data.subject} />,
     }),
     createSurface({
-      id: `${meta.id}/object-chat`,
+      id: `${meta.id}/companion-chat`,
       role: 'article',
       filter: (data): data is { companionTo: Obj.Any; subject: Assistant.Chat | 'assistant-chat' } =>
         Obj.isObject(data.companionTo) &&
         (Obj.instanceOf(Assistant.Chat, data.subject) || data.subject === 'assistant-chat'),
-      component: ({ data, role }) => {
-        const { dispatch } = useIntentDispatcher();
-
-        // Initialize companion chat if it doesn't exist.
-        // TODO(wittjosiah): Factor out to container.
-        useEffect(() => {
-          const timeout = setTimeout(async () => {
-            const space = getSpace(data.companionTo);
-            if (space && data.subject === 'assistant-chat') {
-              const result = await space.db
-                .query(Query.select(Filter.ids(data.companionTo.id)).targetOf(Assistant.CompanionTo).source())
-                .run();
-              if (result.objects.length > 0) {
-                return;
-              }
-
-              const program = Effect.gen(function* () {
-                const { object } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
-                yield* dispatch(createIntent(SpaceAction.AddObject, { object, target: space, hidden: true }));
-                yield* dispatch(
-                  createIntent(SpaceAction.AddRelation, {
-                    space,
-                    schema: Assistant.CompanionTo,
-                    source: object,
-                    target: data.companionTo,
-                  }),
-                );
-              });
-
-              void Effect.runPromise(program);
-            }
-          });
-
-          return () => clearTimeout(timeout);
-        }, [data.subject]);
-
-        // TODO(wittjosiah): Factor out to container.
-        const handleProcessorReady = useCallback(
-          (processor: AiChatProcessor) => {
-            if (Obj.instanceOf(Blueprint.Blueprint, data.companionTo)) {
-              void processor.context.bind({ blueprints: [Ref.make(data.companionTo)] });
-            } else {
-              void processor.context.bind({ objects: [Ref.make(data.companionTo)] });
-            }
-          },
-          [data.companionTo],
-        );
-
-        if (data.subject === 'assistant-chat') {
-          return null;
-        }
-
-        return <ChatContainer role={role} chat={data.subject} onProcessorReady={handleProcessorReady} />;
-      },
+      component: ({ data, role }) => <ChatCompanion role={role} data={data} />,
     }),
     createSurface({
       id: `${meta.id}/sequence`,
@@ -111,10 +56,11 @@ export default () =>
       component: ({ data }) => <SequenceContainer sequence={data.subject} />,
     }),
     createSurface({
-      id: `${meta.id}/companion/logs`,
+      id: `${meta.id}/companion-logs`,
       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 }) => {
         const space = getSpace(data.companionTo);
         return (

package/src/capabilities/state.ts

@@ -0,0 +1,20 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { contributes } from '@dxos/app-framework';
+import { LocalStorageStore } from '@dxos/local-storage';
+
+import { meta } from '../meta';
+
+import { AssistantCapabilities } from './capabilities';
+
+export default () => {
+  // NOTE: This needs to be a chat object rather than a string id to avoid a query race.
+  // TODO(wittjosiah): Handle serialization and hydration for this so it can be cached.
+  const state = new LocalStorageStore<AssistantCapabilities.AssistantState>(meta.id, {
+    currentChat: {},
+  });
+
+  return contributes(AssistantCapabilities.State, state.values, () => state.close());
+};