@dxos/plugin-assistant 0.8.0 → 0.8.1-main.81238a8

package/src/components/Thread/Thread.tsx

@@ -15,6 +15,13 @@ import { keyToFallback } from '@dxos/util';
 import { ThreadMessage, type ThreadMessageProps } from './ThreadMessage';
 import { messageReducer } from './reducer';
 import { PromptBar, type PromptBarProps } from '../Prompt';
+import type { ReferenceData, ReferencesProvider } from '../Prompt/references';
+
+export interface ContextProvider {
+  query({ query }: { query: string }): Promise<ReferenceData[]>;
+
+  resolveMetadata({ uri }: { uri: string }): Promise<ReferenceData | null>;
+}
 
 export type ThreadProps = ThemedClassName<{
   space?: Space;
@@ -22,6 +29,7 @@ export type ThreadProps = ThemedClassName<{
   collapse?: boolean;
   transcription?: boolean;
   onOpenChange?: (open: boolean) => void;
+  contextProvider?: ContextProvider;
 }> &
   Pick<PromptBarProps, 'processing' | 'error' | 'onSubmit' | 'onSuggest' | 'onCancel'> &
   Pick<ThreadMessageProps, 'debug' | 'tools' | 'onPrompt' | 'onDelete'>;
@@ -40,6 +48,7 @@ export const Thread = ({
   onSubmit,
   onCancel,
   onOpenChange,
+  contextProvider,
   ...props
 }: ThreadProps) => {
   const scroller = useRef<ScrollController>(null);
@@ -68,6 +77,17 @@ export const Thread = ({
     }
   }, [messages, collapse]);
 
+  const references = useMemo<ReferencesProvider | undefined>(() => {
+    if (!contextProvider) {
+      return undefined;
+    }
+
+    return {
+      getReferences: async ({ query }: { query: string }) => contextProvider.query({ query }),
+      resolveReference: async ({ uri }: { uri: string }) => contextProvider.resolveMetadata({ uri }),
+    };
+  }, [contextProvider]);
+
   return (
     <div role='none' className={mx('flex flex-col grow overflow-hidden', classNames)}>
       <ScrollContainer ref={scroller} fade>
@@ -90,6 +110,7 @@ export const Thread = ({
           onSubmit={handleSubmit}
           onCancel={onCancel}
           onOpenChange={onOpenChange}
+          references={references}
         />
       )}
     </div>

package/src/components/Thread/ThreadContainer.stories.tsx

@@ -19,9 +19,8 @@ import {
 import { withPluginManager } from '@dxos/app-framework/testing';
 import { Message, type Tool } from '@dxos/artifact';
 import { genericTools, localServiceEndpoints, type IsObject } from '@dxos/artifact-testing';
-import { AIServiceClientImpl } from '@dxos/assistant';
+import { AIServiceEdgeClient } from '@dxos/assistant';
 import { createStatic, ObjectId } from '@dxos/echo-schema';
-import { EdgeHttpClient } from '@dxos/edge-client';
 import { invariant } from '@dxos/invariant';
 import { DXN, QueueSubspaceTags, SpaceId } from '@dxos/keys';
 import { ChessPlugin } from '@dxos/plugin-chess';
@@ -31,9 +30,8 @@ import { InboxPlugin } from '@dxos/plugin-inbox';
 import { MapPlugin } from '@dxos/plugin-map';
 import { SpacePlugin } from '@dxos/plugin-space';
 import { TablePlugin } from '@dxos/plugin-table';
-import { useSpace } from '@dxos/react-client/echo';
+import { useQueue, useSpace } from '@dxos/react-client/echo';
 import { withClientProvider } from '@dxos/react-client/testing';
-import { useQueue } from '@dxos/react-edge-client';
 import { IconButton, Input, Toolbar } from '@dxos/react-ui';
 import { mx } from '@dxos/react-ui-theme';
 import { withLayout, withSignals, withTheme } from '@dxos/storybook-utils';
@@ -59,8 +57,7 @@ const Render = ({ items: _items, prompts = [], ...props }: RenderProps) => {
     [genericTools, artifactDefinitions],
   );
 
-  const [aiClient] = useState(() => new AIServiceClientImpl({ endpoint: endpoints.ai }));
-  const [edgeClient] = useState(() => new EdgeHttpClient(endpoints.edge));
+  const [aiClient] = useState(() => new AIServiceEdgeClient({ endpoint: endpoints.ai }));
   const { dispatchPromise: dispatch } = useIntentDispatcher();
 
   // TODO(burdon): Replace with useChatProcessor.
@@ -82,8 +79,8 @@ const Render = ({ items: _items, prompts = [], ...props }: RenderProps) => {
   }, [aiClient, tools, space, dispatch, artifactDefinitions]);
 
   // Queue.
-  const [queueDxn, setQueueDxn] = useState(() => randomQueueDxn());
-  const queue = useQueue<Message>(edgeClient, DXN.tryParse(queueDxn));
+  const [queueDxn, setQueueDxn] = useState<string>(() => randomQueueDxn());
+  const queue = useQueue<Message>(DXN.tryParse(queueDxn));
 
   useEffect(() => {
     if (queue?.items.length === 0 && !queue.isLoading && prompts.length > 0) {

package/src/components/Thread/ThreadContainer.tsx

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import React, { type FC, useCallback } from 'react';
+import React, { useCallback, type FC } from 'react';
 
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
@@ -10,12 +10,13 @@ import { getSpace } from '@dxos/react-client/echo';
 import { type ThemedClassName } from '@dxos/react-ui';
 
 import { Thread, type ThreadProps } from './Thread';
-import { useChatProcessor, useMessageQueue } from '../../hooks';
+import { useChatProcessor, useContextProvider, useMessageQueue } from '../../hooks';
 import { type AIChatType, type AssistantSettingsProps } from '../../types';
 
 export type ThreadContainerProps = {
   chat?: AIChatType;
   settings?: AssistantSettingsProps;
+  part?: 'deck' | 'dialog';
 } & Pick<ThreadProps, 'debug' | 'transcription' | 'onOpenChange'>;
 
 // TODO(burdon): Since this only wraps Thread, just separate out hook?
@@ -23,12 +24,13 @@ export const ThreadContainer: FC<ThemedClassName<ThreadContainerProps>> = ({
   classNames,
   chat,
   settings,
+  part,
   onOpenChange,
   ...props
 }) => {
-  // Push up capabilities hooks out of components.
   const space = getSpace(chat);
-  const processor = useChatProcessor(space, settings);
+  const contextProvider = useContextProvider(space);
+  const processor = useChatProcessor({ chat, space, settings, part });
   const messageQueue = useMessageQueue(chat);
   const messages = [...(messageQueue?.items ?? []), ...processor.messages.value];
 
@@ -73,6 +75,7 @@ export const ThreadContainer: FC<ThemedClassName<ThreadContainerProps>> = ({
       onCancel={handleCancel}
       onPrompt={handleSubmit}
       onOpenChange={onOpenChange}
+      contextProvider={contextProvider}
       {...props}
     />
   );

package/src/components/Thread/ThreadMessage.tsx

@@ -7,7 +7,7 @@ import React, { type PropsWithChildren, type FC } from 'react';
 import { type MessageContentBlock, type Message, type ToolType } from '@dxos/artifact';
 import { invariant } from '@dxos/invariant';
 import { type Space } from '@dxos/react-client/echo';
-import { Button, ButtonGroup, Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
+import { Button, Icon, IconButton, type ThemedClassName } from '@dxos/react-ui';
 import {
   MarkdownViewer,
   ToggleContainer as NativeToggleContainer,
@@ -21,7 +21,7 @@ import { ToolBlock, isToolMessage } from './ToolInvocations';
 import { ToolboxContainer } from '../Toolbox';
 
 const panelClassNames = 'flex flex-col w-full px-2 bg-groupSurface rounded-md';
-const userClassNames = 'bg-[--user-fill]';
+const userClassNames = 'bg-[--user-fill] text-inverse';
 
 const ToggleContainer = (props: ToggleContainerProps) => {
   return <NativeToggleContainer {...props} classNames={mx(panelClassNames, props.classNames)} />;
@@ -54,7 +54,7 @@ export const ThreadMessage: FC<ThreadMessageProps> = ({ classNames, space, messa
   // TODO(burdon): Restructure types to make check unnecessary.
   if (isToolMessage(message)) {
     return (
-      <MessageContainer classNames={classNames}>
+      <MessageContainer classNames={mx(classNames, 'animate-[fadeIn_0.5s]')}>
         <ToolBlock space={space} classNames={panelClassNames} message={message} tools={tools} />
       </MessageContainer>
     );
@@ -69,7 +69,11 @@ export const ThreadMessage: FC<ThreadMessageProps> = ({ classNames, space, messa
     const Component = components[block.type] ?? components.default;
 
     return (
-      <MessageContainer key={idx} classNames={classNames} user={block.type === 'text' && role === 'user'}>
+      <MessageContainer
+        key={idx}
+        classNames={mx(classNames, 'animate-[fadeIn_0.5s]')}
+        user={block.type === 'text' && role === 'user'}
+      >
         <Component space={space} block={block} onPrompt={onPrompt} />
       </MessageContainer>
     );
@@ -87,7 +91,7 @@ const components: Record<string, BlockComponent> = {
     // const [open, setOpen] = useState(block.disposition === 'cot' && block.pending);
     const title = block.disposition ? titles[block.disposition] : undefined;
     if (!title) {
-      return <MarkdownViewer content={block.text} />;
+      return <MarkdownViewer classNames='[&>p]:animate-[fadeIn_0.5s]' content={block.text} />;
     }
 
     // TOOD(burdon): Store last time user opened/closed COT.
@@ -140,13 +144,17 @@ const components: Record<string, BlockComponent> = {
       case 'select': {
         const { options = [] }: { options: string[] } = safeParseJson(block.json ?? '{}') ?? ({} as any);
         return (
-          <ButtonGroup>
-            {options.map((option) => (
-              <Button key={option} onClick={() => onPrompt?.(option)}>
+          <div className='flex flex-wrap gap-1'>
+            {options.map((option, idx) => (
+              <Button
+                classNames={'animate-[fadeIn_0.5s] rounded-2xl text-sm'}
+                key={option}
+                onClick={() => onPrompt?.(option)}
+              >
                 {option}
               </Button>
             ))}
-          </ButtonGroup>
+          </div>
         );
       }
 

package/src/components/Toolbox/Toolbox.tsx

@@ -6,7 +6,7 @@ import React, { useState, useEffect, Fragment, type FC } from 'react';
 
 import { Capabilities, useCapabilities } from '@dxos/app-framework';
 import { parseToolName, type ArtifactDefinition, type Tool } from '@dxos/artifact';
-import { FunctionType } from '@dxos/functions';
+import { FunctionType } from '@dxos/functions/types';
 import { log } from '@dxos/log';
 import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
 import { type ThemedClassName } from '@dxos/react-ui';

package/src/components/index.ts

@@ -10,6 +10,9 @@ export * from './TemplateEditor';
 export * from './Thread';
 export * from './Toolbox';
 
+// TODO(burdon): Lazy loading causes issues with Tabster.
+//  Repro: open assistant dialog then close.
+//  https://github.com/microsoft/fluentui/issues/34020
 export const AssistantDialog = lazy(() => import('./AssistantDialog'));
 export const ChatContainer = lazy(() => import('./ChatContainer'));
 export const TemplateContainer = lazy(() => import('./TemplateContainer'));

package/src/hooks/index.ts

@@ -9,3 +9,4 @@ export * from './useLocalTriggerManager';
 export * from './useMessageQueue';
 export * from './useServices';
 export * from './useTextInputEvents';
+export * from './useContextProvider';

package/src/hooks/invocation-handler.ts

@@ -5,8 +5,8 @@
 import { sleep } from '@dxos/async';
 import { getObjectCore, ResultFormat } from '@dxos/echo-db';
 import { type AnyObjectData } from '@dxos/echo-schema';
-import { FunctionType } from '@dxos/functions';
-import { type FunctionTrigger } from '@dxos/functions';
+import { FunctionType, getUserFunctionUrlInMetadata } from '@dxos/functions/types';
+import { type FunctionTrigger } from '@dxos/functions/types';
 import { invariant } from '@dxos/invariant';
 import { DXN, LOCAL_SPACE_TAG } from '@dxos/keys';
 import { log } from '@dxos/log';
@@ -53,7 +53,7 @@ export const invokeFunction = async (client: Client, space: Space, trigger: Func
       .query({ __typename: FunctionType.typename }, { format: ResultFormat.Plain })
       .run();
     const func = functions.find((fn) => referenceEquals(fn.source, trigger.function!)) as AnyObjectData | undefined;
-    const funcSlug = func?.__meta.keys.find((key) => key.source === USERFUNCTIONS_META_KEY)?.id;
+    const funcSlug = func && getUserFunctionUrlInMetadata(func.__meta);
     if (!funcSlug) {
       log.warn('function not deployed', { scriptId: script.id, name: script.name });
       return 404;
@@ -72,8 +72,6 @@ export const invokeFunction = async (client: Client, space: Space, trigger: Func
   }
 };
 
-const USERFUNCTIONS_META_KEY = 'dxos.org/service/function';
-
 const getFunctionUrl = (config: Config, slug: string, spaceId?: string) => {
   const baseUrl = new URL('functions/', config.values.runtime?.services?.edge?.url);
 

package/src/hooks/processor.ts

@@ -12,8 +12,8 @@ import {
   type GenerateRequest,
   type GenerationStream,
   MixedStreamParser,
-  DEFAULT_LLM_MODEL,
-  type AIService,
+  DEFAULT_EDGE_MODEL,
+  type AIServiceClient,
 } from '@dxos/assistant';
 import { createStatic } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
@@ -36,7 +36,7 @@ type RequestOptions = {
 export type ChatProcessorOptions = Pick<GenerateRequest, 'model' | 'systemPrompt'>;
 
 const defaultOptions: ChatProcessorOptions = {
-  model: DEFAULT_LLM_MODEL,
+  model: DEFAULT_EDGE_MODEL,
   systemPrompt: 'you are a helpful assistant',
 };
 
@@ -50,15 +50,15 @@ export class ChatProcessor {
   /** SSE stream parser. */
   private readonly _parser = new MixedStreamParser();
 
-  /** Current streaming response. */
-  private _stream: GenerationStream | undefined;
-
   /** Pending messages (incl. the current user request). */
   private readonly _pending: Signal<Message[]> = signal([]);
 
   /** Current streaming block (from the AI service). */
   private readonly _block: Signal<MessageContentBlock | undefined> = signal(undefined);
 
+  /** Current streaming response. */
+  private _stream: GenerationStream | undefined;
+
   /** Prior history from queue. */
   private _history: Message[] = [];
 
@@ -92,7 +92,7 @@ export class ChatProcessor {
   });
 
   constructor(
-    private readonly _service: AIService,
+    private readonly _ai: AIServiceClient,
     private _tools?: Tool[],
     private readonly _extensions?: ToolContextExtensions,
     private readonly _options: ChatProcessorOptions = defaultOptions,
@@ -180,7 +180,7 @@ export class ChatProcessor {
         });
 
         // Open request stream.
-        this._stream = await this._service.exec({
+        this._stream = await this._ai.exec({
           ...this._options,
           // TODO(burdon): Rename messages or separate history/message.
           history: [...this._history, ...this._pending.value],
@@ -220,9 +220,18 @@ export class ChatProcessor {
       this.error.value = undefined;
     } catch (err) {
       log.catch(err);
-      this.error.value = new Error('AI service error', { cause: err });
+      if (err instanceof Error && err.message.includes('Overloaded')) {
+        this.error.value = new AIServiecOverloadedError('AI service overloaded', { cause: err });
+      } else {
+        this.error.value = new Error('AI service error', { cause: err });
+      }
     } finally {
       this._stream = undefined;
     }
   }
 }
+
+// TODO(wittjosiah): Refactor.
+export class AIServiecOverloadedError extends Error {
+  code = 'AI_SERVICE_OVERLOADED';
+}

package/src/hooks/useChatProcessor.tsx

@@ -6,22 +6,29 @@ import { useEffect, useMemo, useState } from 'react';
 
 import { Capabilities, useCapabilities, useCapability, useIntentDispatcher } from '@dxos/app-framework';
 import { createSystemPrompt, type Tool } from '@dxos/artifact';
-import { DEFAULT_LLM_MODEL } from '@dxos/assistant';
-import { FunctionType } from '@dxos/functions';
+import { DEFAULT_EDGE_MODEL, DEFAULT_OLLAMA_MODEL } from '@dxos/assistant';
+import { FunctionType } from '@dxos/functions/types';
 import { log } from '@dxos/log';
 import { useConfig } from '@dxos/react-client';
-import { Filter, type Space, useQuery } from '@dxos/react-client/echo';
+import { Filter, fullyQualifiedId, type Space, useQuery } from '@dxos/react-client/echo';
 import { isNonNullable } from '@dxos/util';
 
 import { AssistantCapabilities } from '../capabilities';
 import { ChatProcessor } from '../hooks';
 import { covertFunctionToTool, createToolsFromService } from '../tools';
-import { type AssistantSettingsProps, ServiceType } from '../types';
+import { type AIChatType, type AssistantSettingsProps, ServiceType } from '../types';
+
+type UseChatProcessorProps = {
+  chat?: AIChatType;
+  space?: Space;
+  settings?: AssistantSettingsProps;
+  part?: 'deck' | 'dialog';
+};
 
 /**
  * Configure and create ChatProcessor.
  */
-export const useChatProcessor = (space?: Space, settings?: AssistantSettingsProps): ChatProcessor => {
+export const useChatProcessor = ({ chat, space, settings, part = 'deck' }: UseChatProcessorProps): ChatProcessor => {
   const aiClient = useCapability(AssistantCapabilities.AiClient);
   const globalTools = useCapabilities(Capabilities.Tools);
   const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
@@ -41,6 +48,7 @@ export const useChatProcessor = (space?: Space, settings?: AssistantSettingsProp
   // Tools and context.
   const config = useConfig();
   const functions = useQuery(space, Filter.schema(FunctionType));
+  const chatId = useMemo(() => (chat ? fullyQualifiedId(chat) : undefined), [chat]);
   const [tools, extensions] = useMemo(() => {
     log('creating tools...');
     const tools = [
@@ -51,9 +59,9 @@ export const useChatProcessor = (space?: Space, settings?: AssistantSettingsProp
         .map((fn) => covertFunctionToTool(fn, config.values.runtime?.services?.edge?.url ?? '', space?.id))
         .filter(isNonNullable),
     ];
-    const extensions = { space, dispatch };
+    const extensions = { space, dispatch, pivotId: chatId, part };
     return [tools, extensions];
-  }, [dispatch, globalTools, artifactDefinitions, space, serviceTools, functions]);
+  }, [dispatch, globalTools, artifactDefinitions, space, chatId, serviceTools, functions]);
 
   // Prompt.
   const systemPrompt = useMemo(
@@ -64,17 +72,18 @@ export const useChatProcessor = (space?: Space, settings?: AssistantSettingsProp
     [artifactDefinitions],
   );
 
+  // TODO(burdon): Remove default (let backend decide if not specified).
+  const model =
+    settings?.llmProvider === 'ollama'
+      ? settings?.ollamaModel ?? DEFAULT_OLLAMA_MODEL
+      : settings?.edgeModel ?? DEFAULT_EDGE_MODEL;
+
   // Create processor.
-  // TODO(burdon): Updated on each query update above. Should just update current processor.
+  // TODO(burdon): Updated on each query update above; should just update current processor.
   const processor = useMemo(() => {
     log('creating processor...', { settings });
-    return new ChatProcessor(aiClient, tools, extensions, {
-      // TODO(burdon): Remove defualt (let backend decide if not specified).
-      model: settings?.llmModel ?? DEFAULT_LLM_MODEL,
-      // TOOD(burdon): Query.
-      systemPrompt,
-    });
-  }, [aiClient, tools, extensions, systemPrompt, settings?.llmModel]);
+    return new ChatProcessor(aiClient.value, tools, extensions, { model, systemPrompt });
+  }, [aiClient.value, tools, extensions, model, systemPrompt]);
 
   return processor;
 };

package/src/hooks/useContextProvider.ts

@@ -0,0 +1,55 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { useMemo } from 'react';
+
+import { Capabilities, useCapabilities } from '@dxos/app-framework';
+import type { Space } from '@dxos/client/echo';
+import { getDXN, getLabel, getSchema } from '@dxos/echo-schema';
+import { log } from '@dxos/log';
+import { Filter } from '@dxos/react-client/echo';
+
+export type ContextProvider = {
+  query: (params: { query: string }) => Promise<Array<{ uri: string; label: string }>>;
+  resolveMetadata: (params: { uri: string }) => Promise<{ uri: string; label: string }>;
+};
+
+const stringMatch = (query: string, label: string) => label.toLowerCase().startsWith(query.toLowerCase());
+
+export const useContextProvider = (space?: Space): ContextProvider | undefined => {
+  const artifactDefinitions = useCapabilities(Capabilities.ArtifactDefinition);
+
+  return useMemo<ContextProvider | undefined>((): ContextProvider | undefined => {
+    if (!space) {
+      return undefined;
+    }
+
+    return {
+      query: async ({ query }) => {
+        const artifactSchemas = artifactDefinitions.map((artifact) => artifact.schema);
+        const { objects } = await space.db
+          .query(Filter.or(...artifactSchemas.map((schema) => Filter.schema(schema))))
+          .run();
+        return objects
+          .map((object) => {
+            log.info('object', { object, label: getLabel(getSchema(object)!, object) });
+            return object;
+          })
+          .filter((object) => stringMatch(query, getLabel(getSchema(object)!, object) ?? ''))
+          .filter((object) => !!getDXN(object))
+          .map((object) => ({
+            uri: getDXN(object)!.toString(),
+            label: getLabel(getSchema(object)!, object) ?? '',
+          }));
+      },
+      resolveMetadata: async ({ uri }) => {
+        const object = await space.db.query({ id: uri }).first();
+        return {
+          uri,
+          label: getLabel(getSchema(object)!, object) ?? '',
+        };
+      },
+    };
+  }, [space, artifactDefinitions]);
+};

package/src/hooks/useLocalTriggerManager.ts

@@ -7,7 +7,7 @@ import { useEffect, useState } from 'react';
 import { Mutex } from '@dxos/async';
 import { Context } from '@dxos/context';
 import { createSubscriptionTrigger, type TriggerFactory } from '@dxos/functions';
-import { FunctionTrigger } from '@dxos/functions';
+import { FunctionTrigger } from '@dxos/functions/types';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { useClient } from '@dxos/react-client';

package/src/hooks/useMessageQueue.ts

@@ -6,8 +6,7 @@ import { useMemo } from 'react';
 
 import { type Message } from '@dxos/artifact';
 import { DXN, QueueSubspaceTags } from '@dxos/keys';
-import { getSpace } from '@dxos/react-client/echo';
-import { useEdgeClient, useQueue } from '@dxos/react-edge-client';
+import { getSpace, useQueue } from '@dxos/react-client/echo';
 
 import { type AIChatType } from '../types';
 
@@ -18,6 +17,5 @@ export const useMessageQueue = (chat?: AIChatType) => {
     return dxn ? new DXN(DXN.kind.QUEUE, [QueueSubspaceTags.DATA, space.id, dxn.parts.at(-1)!]) : undefined;
   }, [space, chat?.queue.dxn]);
 
-  const edgeClient = useEdgeClient();
-  return useQueue<Message>(edgeClient, queueDxn);
+  return useQueue<Message>(queueDxn);
 };

package/src/meta.ts

@@ -8,11 +8,11 @@ export const ASSISTANT_PLUGIN = 'dxos.org/plugin/assistant';
 
 export const ASSISTANT_DIALOG = `${ASSISTANT_PLUGIN}/assistant/dialog`;
 
-export const meta = {
+export const meta: PluginMeta = {
   id: ASSISTANT_PLUGIN,
   name: 'Assistant',
   description: 'The Assistant tab allows you to chat with your spaces inside of Composer.',
   icon: 'ph--atom--regular',
   source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/experimental/plugin-assistant',
   tags: ['experimental'],
-} satisfies PluginMeta;
+};

package/src/testing/test-functions.ts

@@ -3,9 +3,9 @@
 //
 
 import { createSystemPrompt } from '@dxos/artifact';
-import { DEFAULT_LLM_MODEL, type GenerateRequest } from '@dxos/assistant';
+import { DEFAULT_EDGE_MODEL, type GenerateRequest } from '@dxos/assistant';
 
 export const createProcessorOptions = (artifacts: string[]): Pick<GenerateRequest, 'model' | 'systemPrompt'> => ({
-  model: DEFAULT_LLM_MODEL,
+  model: DEFAULT_EDGE_MODEL,
   systemPrompt: createSystemPrompt({ artifacts }),
 });

package/src/tools/function.ts

@@ -5,8 +5,8 @@
 import { defineTool, ToolResult } from '@dxos/artifact';
 import type { Tool } from '@dxos/artifact';
 import { toEffectSchema } from '@dxos/echo-schema';
-import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
-import type { FunctionType } from '@dxos/functions';
+import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions/types';
+import type { FunctionType } from '@dxos/functions/types';
 import { log } from '@dxos/log';
 import type { SpaceId } from '@dxos/react-client/echo';
 import { getMeta } from '@dxos/react-client/echo';

package/src/tools/openapi.test.ts

@@ -4,7 +4,7 @@
 
 import { describe, expect, test } from 'vitest';
 
-import { AIServiceClientImpl } from '@dxos/assistant';
+import { AIServiceEdgeClient } from '@dxos/assistant';
 import { AI_SERVICE_ENDPOINT } from '@dxos/assistant/testing';
 import { log } from '@dxos/log';
 
@@ -72,7 +72,7 @@ describe.skip('openapi', () => {
         authorization: AMADEUS_AUTH,
       });
 
-      const client = new AIServiceClientImpl({
+      const client = new AIServiceEdgeClient({
         endpoint: AI_SERVICE_ENDPOINT.LOCAL,
       });
       const processor = new ChatProcessor(client, tools);
@@ -87,7 +87,7 @@ describe.skip('openapi', () => {
     test('amadeus hotel name autocomplete', { timeout: 60_000 }, async () => {
       const tools = await createToolsFromApi(HOTEL_NAME_AUTOCOMPLETE_API, { authorization: AMADEUS_AUTH });
 
-      const client = new AIServiceClientImpl({
+      const client = new AIServiceEdgeClient({
         endpoint: AI_SERVICE_ENDPOINT.LOCAL,
       });
       const processor = new ChatProcessor(client, tools);
@@ -102,7 +102,7 @@ describe.skip('openapi', () => {
         instructions: WEATHER_INSTRUCTIONS,
       });
 
-      const client = new AIServiceClientImpl({
+      const client = new AIServiceEdgeClient({
         endpoint: AI_SERVICE_ENDPOINT.LOCAL,
       });
       const processor = new ChatProcessor(client, tools);

package/src/translations.ts

@@ -16,6 +16,7 @@ export default [
       },
       [ASSISTANT_PLUGIN]: {
         'chat title placeholder': 'AI Chat',
+        'templates label': 'Templates',
         'template title placeholder': 'Template',
 
         'open ambient chat label': 'Open AI chat',
@@ -27,6 +28,8 @@ export default [
         'command placeholder': 'Enter slash command...',
         'template placeholder': 'Enter template...',
         'value placeholder': 'Enter value...',
+        'typename placeholder': 'Enter typename of objects which this template is for',
+        'description placeholder': 'Enter description of when this template should be used',
         'select preset template placeholder': 'Select preset',
         'service registry label': 'Service Registry',
 
@@ -40,9 +43,11 @@ export default [
         'microphone button': 'Click to speak',
         'cancel processing button': 'Stop processing',
 
-        'settings custom prompts label': 'Custom prompts',
-        'settings llm model label': 'LLM model',
-        'settings default llm model label': 'Default Model',
+        'settings default label': 'Default',
+        'settings custom prompts label': 'Use custom prompts',
+        'settings llm provider label': 'Enable Ollama integration',
+        'settings edge llm model label': 'Remote language model',
+        'settings ollama llm model label': 'Ollama language model',
       },
     },
   },

package/src/types/service.ts

@@ -4,7 +4,7 @@
 
 import { ComputeGraph } from '@dxos/conductor';
 import { Ref, S, TypedObject, type Ref$ } from '@dxos/echo-schema';
-import { FunctionType } from '@dxos/functions';
+import { FunctionType } from '@dxos/functions/types';
 
 const ApiAuthorizationKey = S.Struct({
   type: S.Literal('api-key'),