@dxos/plugin-assistant 0.8.4-main.f9ba587 → 0.8.4-main.fd6878d

package/src/testing/test-functions.ts

@@ -2,10 +2,15 @@
 // Copyright 2024 DXOS.org
 //
 
-import { DEFAULT_EDGE_MODEL, type GenerateRequest } from '@dxos/ai';
-import { createSystemPrompt } from '@dxos/artifact';
+import { DEFAULT_EDGE_MODEL } from '@dxos/ai';
+import { createSystemPrompt } from '@dxos/assistant';
 
-export const createProcessorOptions = (artifacts: string[]): Pick<GenerateRequest, 'model' | 'systemPrompt'> => ({
+import { type AiChatProcessorOptions } from '../hooks';
+
+/**
+ * @deprecated
+ */
+export const createProcessorOptions = (): Pick<AiChatProcessorOptions, 'model' | 'system'> => ({
   model: DEFAULT_EDGE_MODEL,
-  systemPrompt: createSystemPrompt({ artifacts }),
+  system: createSystemPrompt({}),
 });

package/src/testing/test-sequence.ts

@@ -2,13 +2,11 @@
 // Copyright 2025 DXOS.org
 //
 
-import { ToolRegistry } from '@dxos/ai';
-import { EXA_API_KEY } from '@dxos/ai/testing';
-import { createExaTool, createGraphWriterTool, createLocalSearchTool } from '@dxos/assistant';
+import { ToolId, ToolRegistry } from '@dxos/ai';
+// import { createExaTool, createGraphWriterTool, createLocalSearchTool } from '@dxos/assistant';
 import { type Space } from '@dxos/client/echo';
-import { SequenceParser, type SequenceDefinition } from '@dxos/conductor';
+import { type SequenceDefinition, SequenceParser } from '@dxos/conductor';
 import { type DXN } from '@dxos/keys';
-import { DataTypes } from '@dxos/schema';
 import { isNonNullable } from '@dxos/util';
 
 // TODO(dmaretskyi): make db available through services (same as function executor).
@@ -16,18 +14,18 @@ import { isNonNullable } from '@dxos/util';
 export const createToolRegistry = (space: Space, queueDxn?: DXN): ToolRegistry => {
   return new ToolRegistry(
     [
-      createExaTool({ apiKey: EXA_API_KEY }),
-      createLocalSearchTool(space.db, queueDxn && space.queues.get(queueDxn)),
-      queueDxn &&
-        createGraphWriterTool({
-          db: space.db,
-          queue: space.queues.get(queueDxn),
-          schema: DataTypes,
-          onDone: async (objects) => {
-            const queue = space.queues.get(queueDxn);
-            await queue.append(objects);
-          },
-        }),
+      // createExaTool({ apiKey: EXA_API_KEY }),
+      // createLocalSearchTool(space.db, queueDxn && space.queues.get(queueDxn)),
+      // queueDxn &&
+      //   createGraphWriterTool({
+      //     db: space.db,
+      //     queue: space.queues.get(queueDxn),
+      //     schema: DataTypes,
+      //     onDone: async (objects) => {
+      //       const queue = space.queues.get(queueDxn);
+      //       await queue.append(objects);
+      //     },
+      //   }),
     ].filter(isNonNullable),
   );
 };
@@ -36,16 +34,16 @@ export const RESEARCH_SEQUENCE_DEFINITION: SequenceDefinition = {
   steps: [
     {
       instructions: 'Research information and entities related to the selected objects.',
-      tools: ['search/web_search'],
+      tools: [ToolId.make('search/web_search')],
     },
     {
       instructions:
         'Based on your research find matching entires that are already in the graph. Do exaustive research.',
-      tools: ['search/local_search'],
+      tools: [ToolId.make('search/local_search')],
     },
     {
       instructions: 'Add researched data to the graph. Make connections to existing objects.',
-      tools: ['search/local_search', 'graph/writer'],
+      tools: [ToolId.make('search/local_search'), ToolId.make('graph/writer')],
     },
   ],
 };

package/src/tools/function.ts

@@ -2,7 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { createTool, type ExecutableTool, ToolResult } from '@dxos/ai';
+// ISSUE(burdon): deprecated types: ToolResult
+
+import { type ExecutableTool, ToolResult, createTool } from '@dxos/ai';
 import { Type } from '@dxos/echo';
 import { getInvocationUrl, getUserFunctionUrlInMetadata } from '@dxos/functions';
 import { type FunctionType } from '@dxos/functions';
@@ -26,6 +28,7 @@ export const convertFunctionToTool = (
 
   const url = getInvocationUrl(existingFunctionUrl, edgeUrl, { spaceId });
 
+  // TODO(burdon): Should be DXN?
   return createTool('user-function', {
     name: fn.name,
     description: fn.description,

package/src/tools/openapi.test.ts

@@ -6,10 +6,11 @@ import { describe, expect, test } from 'vitest';
 
 import { log } from '@dxos/log';
 
-import { createToolsFromApi, resolveAuthorization } from './openapi';
-import { ChatProcessor } from '../hooks';
+import { AiChatProcessor } from '../hooks';
 import { type ApiAuthorization } from '../types';
 
+import { createToolsFromApi, resolveAuthorization } from './openapi';
+
 describe.skip('openapi', () => {
   describe.skip('mapping', () => {
     test('amadeus flight availabilities', async () => {
@@ -67,12 +68,13 @@ describe.skip('openapi', () => {
     });
   });
 
+  // ISSUE(burdon): tools
   describe.skip('AI uses tools', () => {
     test('amadeus flight availabilities', { timeout: 60_000 }, async () => {
       const tools = await createToolsFromApi(FLIGHT_SEARCH_API, { authorization: AMADEUS_AUTH });
-      // const aiClient = new EdgeAiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
       // TODO(dmaretskyi): FIX ME.
-      const processor = new ChatProcessor(null as any, { tools });
+      const processor = new AiChatProcessor(null as any, null as any);
       const reply = await processor.request(
         `What is the cheapest flight from New York to Paris? going on ${new Date().toISOString()} and returning after a week. 1 adult traveler`,
       );
@@ -83,9 +85,9 @@ describe.skip('openapi', () => {
     // TODO(dmaretskyi): Doesn't work.
     test('amadeus hotel name autocomplete', { timeout: 60_000 }, async () => {
       const tools = await createToolsFromApi(HOTEL_NAME_AUTOCOMPLETE_API, { authorization: AMADEUS_AUTH });
-      // const aiClient = new EdgeAiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
       // TODO(dmaretskyi): FIX ME.
-      const processor = new ChatProcessor(null as any, { tools });
+      const processor = new AiChatProcessor(null as any, null as any);
       const reply = await processor.request('Find me the William Wale in Brooklyn New York');
 
       log.info('reply', { reply });
@@ -96,9 +98,9 @@ describe.skip('openapi', () => {
         authorization: VISUAL_CROSSING_CREDENTIALS,
         instructions: WEATHER_INSTRUCTIONS,
       });
-      // const aiClient = new EdgeAiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
       // TODO(dmaretskyi): FIX ME.
-      const processor = new ChatProcessor(null as any, { tools });
+      const processor = new AiChatProcessor(null as any, null as any);
       const reply = await processor.request(
         `Today's date is ${new Date().toISOString().split('T')[0]}. Give me weather forecast for Warsaw for next 5 days.`,
       );

package/src/tools/openapi.ts

@@ -2,6 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
+// ISSUE(burdon): tools
+// @ts-ignore
+
 import { Schema } from 'effect';
 import jsonpointer from 'jsonpointer';
 import { type OpenAPIV2, type OpenAPIV3_1 } from 'openapi-types';
@@ -80,7 +83,7 @@ export const createToolsFromApi = async (
           inputSchema.properties![name] = normalizeSchema(schema);
           if (required) {
             inputSchema.required ??= [];
-            inputSchema.required!.push(name);
+            inputSchema.required.push(name);
           }
         }
       }

package/src/translations.ts

@@ -2,35 +2,44 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Blueprint } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
 import { type Resource } from '@dxos/react-ui';
 
 import { meta } from './meta';
-import { Assistant, TemplateType } from './types';
+import { Assistant } from './types';
 
 export const translations = [
   {
     'en-US': {
-      [Assistant.Chat.typename]: {
-        'typename label': 'Assistant',
-        'typename label_zero': 'Assistants',
-        'typename label_one': 'Assistant',
-        'typename label_other': 'Assistants',
-        'object name placeholder': 'New assistant',
+      // TODO(burdon): From assistant.
+      [Blueprint.Blueprint.typename]: {
+        'typename label': 'Blueprint',
+        'typename label_zero': 'Blueprints',
+        'typename label_one': 'Blueprint',
+        'typename label_other': 'Blueprints',
+        'object name placeholder': 'New blueprint',
+        'rename object label': 'Rename blueprint',
+        'delete object label': 'Delete blueprint',
       },
+      // TODO(burdon): From conductor.
       [Sequence.typename]: {
         'typename label': 'Sequence',
         'typename label_zero': 'Sequences',
         'typename label_one': 'Sequence',
         'typename label_other': 'Sequences',
         'object name placeholder': 'New sequence',
+        'rename object label': 'Rename sequence',
+        'delete object label': 'Delete sequence',
       },
-      [TemplateType.typename]: {
-        'typename label': 'Template',
-        'typename label_zero': 'Templates',
-        'typename label_one': 'Template',
-        'typename label_other': 'Templates',
-        'object name placeholder': 'New template',
+      [Assistant.Chat.typename]: {
+        'typename label': 'Assistant',
+        'typename label_zero': 'Assistants',
+        'typename label_one': 'Assistant',
+        'typename label_other': 'Assistants',
+        'object name placeholder': 'New assistant',
+        'rename object label': 'Rename assistant',
+        'delete object label': 'Delete assistant',
       },
       [meta.id]: {
         'templates label': 'Templates',
@@ -57,9 +66,16 @@ export const translations = [
 
         'no tools': 'No tools are configured.',
 
+        'button suggest': 'Assistant suggestion',
+        'button select option': 'Select option',
+
         'button save': 'Save',
         'button run': 'Run',
 
+        'calling tool label': 'Calling tool...',
+        'calling label': 'Calling',
+        'error label': 'Error',
+
         'search placeholder': 'Search...',
         'prompt placeholder': 'Ask or search for anything...',
         'context objects placeholder': 'Add to context...',

package/src/types/Assistant.ts

@@ -0,0 +1,59 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Schema } from 'effect';
+
+import { Queue } from '@dxos/client/echo';
+import { Type } from '@dxos/echo';
+import { LabelAnnotation } from '@dxos/echo-schema';
+
+import { LLM_PROVIDERS } from './defs';
+
+/**
+ * AI chat.
+ */
+export const Chat = Schema.Struct({
+  id: Type.ObjectId,
+  name: Schema.optional(Schema.String),
+  queue: Type.Ref(Queue),
+}).pipe(
+  Type.Obj({
+    typename: 'dxos.org/type/assistant/Chat',
+    version: '0.2.0',
+  }),
+  LabelAnnotation.set(['name']),
+);
+
+export interface Chat extends Schema.Schema.Type<typeof Chat> {}
+
+/**
+ * Relation between a Chat and companion objects (e.g., artifacts).
+ */
+export const CompanionTo = Schema.Struct({
+  id: Type.ObjectId,
+}).pipe(
+  Type.Relation({
+    typename: 'dxos.org/relation/assistant/CompanionTo',
+    version: '0.1.0',
+    source: Chat,
+    target: Type.Expando,
+  }),
+);
+
+export interface CompanionTo extends Schema.Schema.Type<typeof CompanionTo> {}
+
+/**
+ * Plugin settings.
+ */
+export const Settings = Schema.mutable(
+  Schema.Struct({
+    llmProvider: Schema.optional(Schema.Literal(...LLM_PROVIDERS)),
+    edgeModel: Schema.optional(Schema.String),
+    ollamaModel: Schema.optional(Schema.String),
+    lmstudioModel: Schema.optional(Schema.String),
+    customPrompts: Schema.optional(Schema.Boolean),
+  }),
+);
+
+export type Settings = Schema.Schema.Type<typeof Settings>;

package/src/types/AssistantAction.ts

@@ -0,0 +1,54 @@
+//
+// Copyright 2024 DXOS.org
+//
+
+import { Schema } from 'effect';
+
+import { Blueprint } from '@dxos/blueprints';
+import { SpaceSchema } from '@dxos/client/echo';
+import { Sequence } from '@dxos/conductor';
+import { DataType } from '@dxos/schema';
+
+import { meta } from '../meta';
+
+import { Chat } from './Assistant';
+
+export class OnSpaceCreated extends Schema.TaggedClass<OnSpaceCreated>()(`${meta.id}/on-space-created`, {
+  input: Schema.Struct({
+    space: SpaceSchema,
+    rootCollection: DataType.Collection,
+  }),
+  output: Schema.Void,
+}) {}
+
+export class CreateChat extends Schema.TaggedClass<CreateChat>()(`${meta.id}/action/create-chat`, {
+  input: Schema.Struct({
+    space: SpaceSchema,
+    name: Schema.optional(Schema.String),
+  }),
+  output: Schema.Struct({
+    object: Chat,
+  }),
+}) {}
+
+export const BlueprintForm = Schema.Struct({
+  key: Schema.String,
+  name: Schema.String,
+  description: Schema.optional(Schema.String),
+});
+
+export class CreateBlueprint extends Schema.TaggedClass<CreateBlueprint>()(`${meta.id}/action/create-blueprint`, {
+  input: BlueprintForm,
+  output: Schema.Struct({
+    object: Blueprint.Blueprint,
+  }),
+}) {}
+
+export class CreateSequence extends Schema.TaggedClass<CreateSequence>()(`${meta.id}/action/create-sequence`, {
+  input: Schema.Struct({
+    name: Schema.optional(Schema.String),
+  }),
+  output: Schema.Struct({
+    object: Sequence,
+  }),
+}) {}

package/src/types/defs.ts

@@ -0,0 +1,5 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+export const LLM_PROVIDERS = ['edge', 'ollama', 'lmstudio'] as const;

package/src/types/index.ts

@@ -2,6 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './schema';
+export * as Assistant from './Assistant';
+export * as AssistantAction from './AssistantAction';
+
+export * from './defs';
 export * from './service';
-export * from './template';

package/dist/lib/browser/ChatContainer-6XNB5NEI.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/ChatContainer.tsx"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport React from 'react';\n\nimport { Capabilities, useCapability } from '@dxos/app-framework';\nimport { type AssociatedArtifact } from '@dxos/artifact';\nimport { getSpace } from '@dxos/client/echo';\nimport { StackItem } from '@dxos/react-ui-stack';\n\nimport { Chat } from './Chat';\nimport { useChatProcessor, useServiceContainer } from '../hooks';\nimport { meta } from '../meta';\nimport { type Assistant } from '../types';\n\nexport type ChatContainerProps = {\n  role: string;\n  chat: Assistant.Chat;\n  artifact?: AssociatedArtifact;\n};\n\nexport const ChatContainer = ({ role, chat, artifact }: ChatContainerProps) => {\n  const space = getSpace(chat);\n  const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;\n  const serviceContainer = useServiceContainer({ space });\n  const processor = useChatProcessor({ part: 'deck', chat, serviceContainer, settings });\n  if (!processor) {\n    return null;\n  }\n\n  // TODO(burdon): Add attention attributes.\n  return (\n    <StackItem.Content role={role} classNames='container-max-width'>\n      <Chat.Root chat={chat} processor={processor} artifact={artifact}>\n        <Chat.Thread />\n        <div className='pbe-4 pis-2 pie-2'>\n          <Chat.Prompt classNames='border border-subduedSeparator rounded-md' />\n        </div>\n      </Chat.Root>\n    </StackItem.Content>\n  );\n};\n\nexport default ChatContainer;\n"],
-  "mappings": ";;;;;;;;;;;;;;AAIA,OAAOA,WAAW;AAElB,SAASC,cAAcC,qBAAqB;AAE5C,SAASC,gBAAgB;AACzB,SAASC,iBAAiB;AAanB,IAAMC,gBAAgB,CAAC,EAAEC,MAAMC,MAAMC,SAAQ,MAAsB;;;AACxE,UAAMC,QAAQC,SAASH,IAAAA;AACvB,UAAMI,WAAWC,cAAcC,aAAaC,aAAa,EAAEC,SAA6BC,KAAKC,EAAE,GAAGC;AAClG,UAAMC,mBAAmBC,oBAAoB;MAAEX;IAAM,CAAA;AACrD,UAAMY,YAAYC,iBAAiB;MAAEC,MAAM;MAAQhB;MAAMY;MAAkBR;IAAS,CAAA;AACpF,QAAI,CAACU,WAAW;AACd,aAAO;IACT;AAGA,WACE,sBAAA,cAACG,UAAUC,SAAO;MAACnB;MAAYoB,YAAW;OACxC,sBAAA,cAACC,KAAKC,MAAI;MAACrB;MAAYc;MAAsBb;OAC3C,sBAAA,cAACmB,KAAKE,QAAM,IAAA,GACZ,sBAAA,cAACC,OAAAA;MAAIC,WAAU;OACb,sBAAA,cAACJ,KAAKK,QAAM;MAACN,YAAW;;;;;AAKlC;AAEA,IAAA,wBAAerB;",
-  "names": ["React", "Capabilities", "useCapability", "getSpace", "StackItem", "ChatContainer", "role", "chat", "artifact", "space", "getSpace", "settings", "useCapability", "Capabilities", "SettingsStore", "getStore", "meta", "id", "value", "serviceContainer", "useServiceContainer", "processor", "useChatProcessor", "part", "StackItem", "Content", "classNames", "Chat", "Root", "Thread", "div", "className", "Prompt"]
-}

package/dist/lib/browser/ChatDialog-IMWPRXTO.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/ChatDialog.tsx"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport React, { useCallback, useState } from 'react';\n\nimport { useCapability, Capabilities } from '@dxos/app-framework';\nimport { getSpace } from '@dxos/client/echo';\nimport { useTranslation } from '@dxos/react-ui';\nimport { ChatDialog as NativeChatDialog } from '@dxos/react-ui-chat';\n\nimport { Chat, type ChatRootProps } from './Chat';\nimport { useChatProcessor, useServiceContainer } from '../hooks';\nimport { meta } from '../meta';\nimport { type Assistant } from '../types';\n\nexport type ChatDialogProps = {\n  chat?: Assistant.Chat;\n};\n\nexport const ChatDialog = ({ chat }: ChatDialogProps) => {\n  const { t } = useTranslation(meta.id);\n\n  const space = getSpace(chat);\n  const settings = useCapability(Capabilities.SettingsStore).getStore<Assistant.Settings>(meta.id)?.value;\n  const serviceContainer = useServiceContainer({ space });\n  const processor = useChatProcessor({ part: 'dialog', chat, serviceContainer, settings });\n\n  // TODO(burdon): Refocus when open.\n  const [open, setOpen] = useState(true);\n  const [expanded, setExpanded] = useState(false);\n  const handleEvent = useCallback<NonNullable<ChatRootProps['onEvent']>>((event) => {\n    switch (event.type) {\n      case 'submit':\n      case 'thread-open':\n        setOpen(true);\n        setExpanded(true);\n        break;\n\n      case 'thread-close':\n        setOpen(false);\n        break;\n    }\n  }, []);\n\n  if (!chat || !processor) {\n    return null;\n  }\n\n  return (\n    <Chat.Root chat={chat} processor={processor} onEvent={handleEvent}>\n      <NativeChatDialog.Root open={open} expanded={expanded} onOpenChange={setOpen}>\n        <NativeChatDialog.Header title={t('assistant dialog title')} />\n        <NativeChatDialog.Content>\n          <Chat.Thread />\n        </NativeChatDialog.Content>\n        <NativeChatDialog.Footer>\n          <Chat.Prompt expandable />\n        </NativeChatDialog.Footer>\n      </NativeChatDialog.Root>\n    </Chat.Root>\n  );\n};\n\nexport default ChatDialog;\n"],
-  "mappings": ";;;;;;;;;;;;;;AAIA,OAAOA,SAASC,aAAaC,gBAAgB;AAE7C,SAASC,eAAeC,oBAAoB;AAC5C,SAASC,gBAAgB;AACzB,SAASC,sBAAsB;AAC/B,SAASC,cAAcC,wBAAwB;AAWxC,IAAMC,aAAa,CAAC,EAAEC,KAAI,MAAmB;;;AAClD,UAAM,EAAEC,EAAC,IAAKC,eAAeC,KAAKC,EAAE;AAEpC,UAAMC,QAAQC,SAASN,IAAAA;AACvB,UAAMO,WAAWC,cAAcC,aAAaC,aAAa,EAAEC,SAA6BR,KAAKC,EAAE,GAAGQ;AAClG,UAAMC,mBAAmBC,oBAAoB;MAAET;IAAM,CAAA;AACrD,UAAMU,YAAYC,iBAAiB;MAAEC,MAAM;MAAUjB;MAAMa;MAAkBN;IAAS,CAAA;AAGtF,UAAM,CAACW,MAAMC,OAAAA,IAAWC,SAAS,IAAA;AACjC,UAAM,CAACC,UAAUC,WAAAA,IAAeF,SAAS,KAAA;AACzC,UAAMG,cAAcC,YAAmD,CAACC,UAAAA;AACtE,cAAQA,MAAMC,MAAI;QAChB,KAAK;QACL,KAAK;AACHP,kBAAQ,IAAA;AACRG,sBAAY,IAAA;AACZ;QAEF,KAAK;AACHH,kBAAQ,KAAA;AACR;MACJ;IACF,GAAG,CAAA,CAAE;AAEL,QAAI,CAACnB,QAAQ,CAACe,WAAW;AACvB,aAAO;IACT;AAEA,WACE,sBAAA,cAACY,KAAKC,MAAI;MAAC5B;MAAYe;MAAsBc,SAASN;OACpD,sBAAA,cAACO,iBAAiBF,MAAI;MAACV;MAAYG;MAAoBU,cAAcZ;OACnE,sBAAA,cAACW,iBAAiBE,QAAM;MAACC,OAAOhC,EAAE,wBAAA;QAClC,sBAAA,cAAC6B,iBAAiBI,SAAO,MACvB,sBAAA,cAACP,KAAKQ,QAAM,IAAA,CAAA,GAEd,sBAAA,cAACL,iBAAiBM,QAAM,MACtB,sBAAA,cAACT,KAAKU,QAAM;MAACC,YAAAA;;;;;AAKvB;AAEA,IAAA,qBAAevC;",
-  "names": ["React", "useCallback", "useState", "useCapability", "Capabilities", "getSpace", "useTranslation", "ChatDialog", "NativeChatDialog", "ChatDialog", "chat", "t", "useTranslation", "meta", "id", "space", "getSpace", "settings", "useCapability", "Capabilities", "SettingsStore", "getStore", "value", "serviceContainer", "useServiceContainer", "processor", "useChatProcessor", "part", "open", "setOpen", "useState", "expanded", "setExpanded", "handleEvent", "useCallback", "event", "type", "Chat", "Root", "onEvent", "NativeChatDialog", "onOpenChange", "Header", "title", "Content", "Thread", "Footer", "Prompt", "expandable"]
-}