@dxos/plugin-assistant 0.8.4-main.e098934 → 0.8.4-main.ead640a

package/src/capabilities/blueprint-definition.ts

@@ -8,6 +8,10 @@ import {
   DISCORD_BLUEPRINT,
   LINEAR_BLUEPRINT,
   RESEARCH_BLUEPRINT,
+  WEB_SEARCH_BLUEPRINT,
+  agent,
+  createResearchNote,
+  entityExtraction,
   fetchDiscordMessages,
   research,
   syncLinearIssues,
@@ -47,7 +51,8 @@ const blueprint = createBlueprint();
 // TODO(dmaretskyi): Consider splitting into multiple modules.
 export default (): Capability<any>[] => [
   contributes(Capabilities.Functions, functions),
-  contributes(Capabilities.Functions, [research]),
+  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.
@@ -55,4 +60,5 @@ export default (): Capability<any>[] => [
   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,22 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type Layer, type ManagedRuntime } from 'effect';
-
-import { type AiService, type AiServiceRouter, type ToolExecutionService, type ToolResolverService } from '@dxos/ai';
 import { defineCapability } from '@dxos/app-framework';
-import type {
-  CredentialsService,
-  DatabaseService,
-  FunctionImplementationResolver,
-  InvocationTracer,
-  LocalFunctionExecutionService,
-  QueueService,
-  RemoteFunctionExecutionService,
-  TriggerDispatcher,
-  TriggerStateStore,
-} from '@dxos/functions';
-import type { SpaceId } from '@dxos/keys';
 import { type DeepReadonly } from '@dxos/util';
 
 import { meta } from '../meta';
@@ -30,42 +15,4 @@ export namespace AssistantCapabilities {
   };
   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`,
-  );
-
-  /**
-   * Service stack for executing agents, functions, and triggers.
-   */
-  export type ComputeServices =
-    | TriggerDispatcher
-    | AiService.AiService
-    | DatabaseService
-    | QueueService
-    | CredentialsService
-    | LocalFunctionExecutionService
-    | RemoteFunctionExecutionService
-    // TODO(dmaretskyi): This service is private and shouldn't be exposed as a part of public API.
-    | FunctionImplementationResolver
-    | InvocationTracer
-    | TriggerStateStore
-    // TODO(dmaretskyi): Those should be provided at AI-chat call site.
-    | ToolResolverService
-    | ToolExecutionService;
-
-  export interface ComputeRuntimeProvider {
-    getRuntime(spaceId: SpaceId): ManagedRuntime.ManagedRuntime<ComputeServices, never>;
-  }
-
-  /**
-   * Runtime for executing agents, functions, and triggers.
-   */
-  export const ComputeRuntime = defineCapability<ComputeRuntimeProvider>(`${meta.id}/capability/compute-runtime`);
 }

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/index.ts

@@ -14,7 +14,6 @@ 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 const ComputeRuntime = lazy(() => import('./compute-runtime'));
 
 export * from './blueprint-definition';
 export * from './capabilities';

package/src/capabilities/intent-resolver.ts

@@ -2,15 +2,18 @@
 // 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 { AiConversation } 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';
+import { getSpace } from '@dxos/react-client/echo';
+import { type DataType } from '@dxos/schema';
 
 import { Assistant, AssistantAction } from '../types';
 
@@ -20,7 +23,7 @@ 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);
@@ -41,7 +44,7 @@ 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 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.
@@ -51,13 +54,33 @@ export default (context: PluginContext) => [
         }
 
         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.UpdateChatName,
+      resolve: async ({ chat }) => {
+        // TODO(burdon): Reuse system conversation/queue.
+        const space = getSpace(chat);
+        const queue = space?.queues.create<DataType.Message>();
+        if (!queue) {
+          return;
+        }
+
+        const conversation = new AiConversation(queue);
+        await conversation.open();
+        // TODO(burdon): How to get runtime?
+        // await updateName(runtime, conversation, chat);
+        await conversation.close();
+        console.log(chat);
+      },
+    }),
     createResolver({
       intent: AssistantAction.CreateBlueprint,
       resolve: ({ key, name, description }) => ({

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,7 +17,7 @@ import { AssistantCapabilities } from './capabilities';
  */
 export default (): Capability<any>[] => [
   contributes(
-    AssistantCapabilities.AiModelResolver,
+    Capabilities.AiModelResolver,
     AiServiceRouter.LMStudioResolver.pipe(
       Layer.provide(
         OpenAiClient.layer({

package/src/capabilities/react-surface.tsx

@@ -16,10 +16,10 @@ import { StackItem } from '@dxos/react-ui-stack';
 import {
   AssistantSettings,
   BlueprintContainer,
+  BlueprintSettings,
   ChatCompanion,
   ChatContainer,
   ChatDialog,
-  PromptSettings,
   SequenceContainer,
 } from '../components';
 import { ASSISTANT_DIALOG, meta } from '../meta';
@@ -77,10 +77,10 @@ export default () =>
       component: ({ data }) => <BlueprintContainer blueprint={data.subject} />,
     }),
     createSurface({
-      id: `${meta.id}/prompt-settings`,
+      id: `${meta.id}/blueprint-settings`,
       role: 'object-settings',
       filter: (data): data is { subject: Blueprint.Blueprint } => Obj.instanceOf(Blueprint.Blueprint, data.subject),
-      component: ({ data }) => <PromptSettings template={data.subject.instructions} />,
+      component: ({ data }) => <BlueprintSettings blueprint={data.subject} />,
     }),
     createSurface({
       id: ASSISTANT_DIALOG,

package/src/capabilities/toolkit.ts

@@ -2,11 +2,14 @@
 // Copyright 2025 DXOS.org
 //
 
-import { AiTool, AiToolkit } from '@effect/ai';
-import { Effect, Schema } from 'effect';
+import * as Tool from '@effect/ai/Tool';
+import * as Toolkit from '@effect/ai/Toolkit';
+import * as Effect from 'effect/Effect';
+import * as Schema from 'effect/Schema';
 
 import { Capabilities, type Capability, type PluginContext, contributes, createIntent } from '@dxos/app-framework';
 import { AiContextService, ArtifactId } from '@dxos/assistant';
+import { WebSearchToolkit } from '@dxos/assistant-testing';
 import { Filter, Obj, Ref, SchemaNotFoundError, Type } from '@dxos/echo';
 import { DatabaseService } from '@dxos/functions';
 import { invariant } from '@dxos/invariant';
@@ -17,8 +20,8 @@ import { DataType } from '@dxos/schema';
 import { trim } from '@dxos/util';
 
 // TODO(burdon): Reconcile with functions (currently reuses plugin framework intents).
-class Toolkit extends AiToolkit.make(
-  AiTool.make('add-to-context', {
+class AssistantToolkit extends Toolkit.make(
+  Tool.make('add-to-context', {
     description: trim`
       Adds the object to the chat context.
     `,
@@ -29,9 +32,10 @@ class Toolkit extends AiToolkit.make(
     },
     success: Schema.Void,
     failure: Schema.Never,
-  }).addRequirement<AiContextService | DatabaseService>(), // TODO(burdon): Define standard contract.
+    dependencies: [AiContextService, DatabaseService],
+  }),
 
-  AiTool.make('get-schemas', {
+  Tool.make('get-schemas', {
     description: trim`
       Retrieves schemas definitions.
     `,
@@ -44,7 +48,7 @@ class Toolkit extends AiToolkit.make(
     failure: Schema.Never,
   }),
 
-  AiTool.make('add-schema', {
+  Tool.make('add-schema', {
     description: trim`
       Adds a schema to the space.
       The name will be used when displayed to the user.
@@ -59,7 +63,7 @@ class Toolkit extends AiToolkit.make(
     failure: Schema.Never,
   }),
 
-  AiTool.make('create-record', {
+  Tool.make('create-record', {
     description: trim`
       Creates a new record and adds it to the current space.
       Get the schema from the get-schemas tool and ensure that the data matches the corresponding schema.
@@ -74,7 +78,7 @@ class Toolkit extends AiToolkit.make(
   }),
 ) {
   static layer = (context: PluginContext) =>
-    Toolkit.toLayer({
+    AssistantToolkit.toLayer({
       'add-to-context': Effect.fnUntraced(function* ({ id }) {
         const { binder } = yield* AiContextService;
         const { db } = yield* DatabaseService;
@@ -158,6 +162,7 @@ class Toolkit extends AiToolkit.make(
 }
 
 export default (context: PluginContext): Capability<any>[] => [
-  contributes(Capabilities.Toolkit, Toolkit),
-  contributes(Capabilities.ToolkitHandler, Toolkit.layer(context)),
+  contributes(Capabilities.Toolkit, AssistantToolkit),
+  contributes(Capabilities.ToolkitHandler, AssistantToolkit.layer(context)),
+  contributes(Capabilities.Toolkit, WebSearchToolkit),
 ];

package/src/components/BlueprintContainer.tsx

@@ -15,8 +15,8 @@ export type BlueprintContainerProps = {
 
 export const BlueprintContainer = ({ blueprint }: BlueprintContainerProps) => {
   return (
-    <StackItem.Content classNames='container-max-width'>
-      <TemplateEditor id={blueprint.id} template={blueprint.instructions} />
+    <StackItem.Content>
+      <TemplateEditor id={blueprint.id} template={blueprint.instructions} classNames='container-max-width' />
     </StackItem.Content>
   );
 };

package/src/components/BlueprintSettings.tsx

@@ -0,0 +1,15 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+import React from 'react';
+
+import { Blueprint } from '@dxos/blueprints';
+import { Form } from '@dxos/react-ui-form';
+
+const FormSchema = Blueprint.Blueprint.pipe(Schema.pick('tools'));
+
+export const BlueprintSettings = ({ blueprint }: { blueprint: Blueprint.Blueprint }) => {
+  return <Form outerSpacing={false} readonly='disabled-input' values={blueprint} schema={FormSchema} />;
+};

package/src/components/Chat/Chat.tsx

@@ -6,7 +6,8 @@ import { type Extension, Prec } from '@codemirror/state';
 import { keymap } from '@codemirror/view';
 import { useRxValue } from '@effect-rx/rx-react';
 import { createContext } from '@radix-ui/react-context';
-import { Array, Option } from 'effect';
+import * as Array from 'effect/Array';
+import * as Option from 'effect/Option';
 import React, { type PropsWithChildren, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { Event } from '@dxos/async';
@@ -18,7 +19,7 @@ import { Input, type ThemedClassName, useDynamicRef, useTranslation } from '@dxo
 import { ChatEditor, type ChatEditorController, type ChatEditorProps, references } from '@dxos/react-ui-chat';
 import { mx } from '@dxos/react-ui-theme';
 import { DataType } from '@dxos/schema';
-import { isNotFalsy } from '@dxos/util';
+import { isTruthy } from '@dxos/util';
 
 import { useReferencesProvider } from '../../hooks';
 import { meta } from '../../meta';
@@ -141,7 +142,7 @@ const ChatRoot = ({ classNames, children, chat, processor, onEvent, ...props }:
       processor={processor}
       {...props}
     >
-      <div role='none' className={mx('flex flex-col h-full overflow-hidden', classNames)}>
+      <div role='none' className={mx('flex flex-col bs-full is-full', classNames)}>
         {children}
       </div>
     </ChatContextProvider>
@@ -157,6 +158,7 @@ ChatRoot.displayName = 'Chat.Root';
 type ChatPromptProps = ThemedClassName<
   {
     outline?: boolean;
+    settings?: boolean;
   } & Pick<ChatEditorProps, 'placeholder'> &
     Omit<ChatPresetsProps, 'onChange'> & {
       expandable?: boolean;
@@ -169,6 +171,7 @@ type ChatPromptProps = ThemedClassName<
 const ChatPrompt = ({
   classNames,
   outline,
+  settings = true,
   placeholder,
   expandable,
   online,
@@ -247,10 +250,10 @@ const ChatPrompt = ({
                 return true;
               },
             },
-          ].filter(isNotFalsy),
+          ].filter(isTruthy),
         ),
       ),
-    ].filter(isNotFalsy);
+    ].filter(isTruthy);
   }, [event, expandable, referencesProvider]);
 
   const handleSubmit = useCallback<NonNullable<ChatEditorProps['onSubmit']>>(
@@ -272,15 +275,16 @@ const ChatPrompt = ({
 
   return (
     <div
+      role='group'
       className={mx(
-        'is-full flex flex-col density-fine',
+        'flex flex-col is-full density-fine',
         outline && [
           'p-2 bg-groupSurface border border-subduedSeparator transition transition-border [&:has(.cm-content:focus)]:border-separator rounded',
         ],
         classNames,
       )}
     >
-      <div className='flex gap-2'>
+      <div role='none' className='flex gap-2'>
         <ChatStatusIndicator classNames='p-1' preset={preset} error={error} processing={streaming} />
 
         <ChatEditor
@@ -294,34 +298,37 @@ const ChatPrompt = ({
         />
       </div>
 
-      <div className='flex pbs-2 items-center'>
-        <ChatOptions
-          space={space}
-          blueprintRegistry={processor.blueprintRegistry}
-          context={processor.context}
-          preset={preset}
-          presets={presets}
-          onPresetChange={onPresetChange}
-        />
-
-        <div role='none' className='pli-cardSpacingChrome grow'>
-          <ChatReferences space={space} context={processor.context} />
+      {settings && (
+        <div role='none' className='flex pbs-2 items-center'>
+          <ChatOptions
+            space={space}
+            blueprintRegistry={processor.blueprintRegistry}
+            context={processor.context}
+            preset={preset}
+            presets={presets}
+            onPresetChange={onPresetChange}
+          />
+
+          <div role='none' className='pli-cardSpacingChrome grow'>
+            <ChatReferences space={space} context={processor.context} />
+          </div>
+
+          <ChatActions
+            classNames='col-span-2'
+            microphone={true}
+            recording={recording}
+            processing={streaming}
+            onEvent={handleEvent}
+          >
+            {online !== undefined && (
+              <Input.Root>
+                <Input.Label srOnly>{t('online switch label')}</Input.Label>
+                <Input.Switch classNames='mis-2 mie-2' checked={online} onCheckedChange={onOnlineChange} />
+              </Input.Root>
+            )}
+          </ChatActions>
         </div>
-
-        <ChatActions
-          classNames='col-span-2'
-          microphone={true}
-          recording={recording}
-          processing={streaming}
-          onEvent={handleEvent}
-        >
-          {online !== undefined && (
-            <Input.Root>
-              <Input.Switch classNames='mis-2 mie-2' checked={online} onCheckedChange={onOnlineChange} />
-            </Input.Root>
-          )}
-        </ChatActions>
-      </div>
+      )}
     </div>
   );
 };

package/src/components/ChatCompanion.tsx

@@ -2,7 +2,10 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Array, Effect, Option, pipe } from 'effect';
+import * as Array from 'effect/Array';
+import * as Effect from 'effect/Effect';
+import * as Function from 'effect/Function';
+import * as Option from 'effect/Option';
 import React, { useMemo } from 'react';
 
 import { Capabilities, createIntent, useCapabilities, useIntentDispatcher } from '@dxos/app-framework';
@@ -15,7 +18,7 @@ import { useQuery } from '@dxos/react-client/echo';
 import { useAsyncEffect } from '@dxos/react-ui';
 
 import { ChatContainer } from '../components';
-import { useContextBinder } from '../hooks';
+import { useBlueprintRegistry, useContextBinder } from '../hooks';
 import { Assistant, AssistantAction } from '../types';
 
 export type ChatCompanionProps = {
@@ -27,6 +30,7 @@ export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
   const companionTo = data.companionTo;
   const space = getSpace(companionTo);
   const chat = data.subject === 'assistant-chat' ? undefined : data.subject;
+  const blueprintRegistry = useBlueprintRegistry();
   const binder = useContextBinder(chat);
   const { dispatch } = useIntentDispatcher();
 
@@ -66,7 +70,7 @@ export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
   const metadata = useCapabilities(Capabilities.Metadata);
   const blueprintKeys = useMemo(
     () =>
-      pipe(
+      Function.pipe(
         metadata,
         Array.findFirst(
           (capability): capability is { id: string; metadata: { blueprints?: string[] } } =>
@@ -77,14 +81,35 @@ export const ChatCompanion = ({ role, data }: ChatCompanionProps) => {
       ),
     [metadata, companionTo],
   );
-  const allBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
+  const existingBlueprints = useQuery(space, Filter.type(Blueprint.Blueprint));
   const pluginBlueprints = useMemo(
-    () => allBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
-    [allBlueprints, blueprintKeys],
+    () => existingBlueprints.filter((blueprint) => blueprintKeys.includes(blueprint.key)),
+    [existingBlueprints, blueprintKeys],
   );
 
-  // TODO(wittjosiah): Occasionally this fails to bind but seems to be an upstream issue.
-  //   It seems like the queue object signal emits as an empty array after previously emitting a non-empty array.
+  // Initialize related blueprints that are not already in the space.
+  useAsyncEffect(async () => {
+    if (!space) {
+      return;
+    }
+
+    // NOTE: This must be run instead of using the useQuery result to avoid duplicates.
+    const { objects: existingBlueprints } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+    for (const key of blueprintKeys) {
+      const existingBlueprint = existingBlueprints.find((blueprint) => blueprint.key === key);
+      if (existingBlueprint) {
+        continue;
+      }
+
+      const blueprint = blueprintRegistry.getByKey(key);
+      if (!blueprint) {
+        continue;
+      }
+
+      space.db.add(Obj.clone(blueprint));
+    }
+  }, [space, blueprintRegistry, blueprintKeys]);
+
   useAsyncEffect(async () => {
     if (!binder) {
       return;

package/src/components/ChatContainer.tsx

@@ -36,9 +36,9 @@ export const ChatContainer = ({ chat, companionTo }: ChatContainerProps) => {
   }
 
   return (
-    <StackItem.Content toolbar={!!companionTo} classNames='container-max-width'>
+    <StackItem.Content toolbar={!!companionTo}>
       {!!companionTo && <Toolbar chat={chat} companionTo={companionTo} />}
-      <Chat.Root chat={chat} processor={processor}>
+      <Chat.Root classNames='container-max-width' chat={chat} processor={processor}>
         <Chat.Thread />
         <div className='p-2'>
           <Chat.Prompt {...chatProps} outline preset={preset?.id} online={online} onOnlineChange={setOnline} />

package/src/components/ChatProgress/ChatProgress.tsx

@@ -5,9 +5,8 @@
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { addEventListener } from '@dxos/async';
-import { Flex, ProgressBar, type ProgressBarProps, TextCrawl } from '@dxos/react-ui-components';
+import { Flex, ProgressBar, type ProgressBarProps, TextCrawl, useExecutionGraph } from '@dxos/react-ui-components';
 
-import { useExecutionGraph } from '../../hooks';
 import { type Assistant } from '../../types';
 
 // TODO(burdon): Reset after each session.