@dxos/plugin-assistant 0.8.3-staging.0fa589b → 0.8.4-main.28f8d3d

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

@@ -0,0 +1,51 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ToolId, ToolRegistry } from '@dxos/ai';
+// import { createExaTool, createGraphWriterTool, createLocalSearchTool } from '@dxos/assistant';
+import { type Space } from '@dxos/client/echo';
+import { type SequenceDefinition, SequenceParser } from '@dxos/conductor';
+import { type DXN } from '@dxos/keys';
+import { isNonNullable } from '@dxos/util';
+
+// TODO(dmaretskyi): make db available through services (same as function executor).
+// TODO(burdon): Can tools implement "aspects" so that variants can be used rather than an explicit reference?
+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);
+      //     },
+      //   }),
+    ].filter(isNonNullable),
+  );
+};
+
+export const RESEARCH_SEQUENCE_DEFINITION: SequenceDefinition = {
+  steps: [
+    {
+      instructions: 'Research information and entities related to the selected objects.',
+      tools: [ToolId.make('search/web_search')],
+    },
+    {
+      instructions:
+        'Based on your research find matching entires that are already in the graph. Do exaustive research.',
+      tools: [ToolId.make('search/local_search')],
+    },
+    {
+      instructions: 'Add researched data to the graph. Make connections to existing objects.',
+      tools: [ToolId.make('search/local_search'), ToolId.make('graph/writer')],
+    },
+  ],
+};
+
+export const RESEARCH_SEQUENCE = SequenceParser.create().parse(RESEARCH_SEQUENCE_DEFINITION);

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

@@ -4,19 +4,17 @@
 
 import { describe, expect, test } from 'vitest';
 
-import { EdgeAiServiceClient } from '@dxos/ai';
-import { AI_SERVICE_ENDPOINT } from '@dxos/ai/testing';
 import { log } from '@dxos/log';
 
+import { AiChatProcessor } from '../hooks';
+import { type ApiAuthorization } from '../types';
+
 import { createToolsFromApi, resolveAuthorization } from './openapi';
-import { ChatProcessor } from '../hooks';
-import type { ApiAuthorization } from '../types';
 
 describe.skip('openapi', () => {
   describe.skip('mapping', () => {
     test('amadeus flight availabilities', async () => {
       const tools = await createToolsFromApi(FLIGHT_SEARCH_API);
-
       log.info('tools', { tools });
       // for (const tool of tools) {
       //   const schema = tool.parameters;
@@ -57,7 +55,7 @@ describe.skip('openapi', () => {
 
     test('weather API', async () => {
       const tools = await createToolsFromApi(WEATHER_API, { authorization: VISUAL_CROSSING_CREDENTIALS });
-      const forecastTool = tools.find((t) => t.name.includes('forecast'));
+      const forecastTool = tools.find((tool) => tool.name.includes('forecast'));
       const result = await forecastTool?.execute(
         {
           locations: 'Brooklyn, NY',
@@ -70,11 +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 processor = new ChatProcessor(aiClient, tools);
+      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      // TODO(dmaretskyi): FIX ME.
+      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`,
       );
@@ -85,8 +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 processor = new ChatProcessor(aiClient, tools);
+      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      // TODO(dmaretskyi): FIX ME.
+      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 });
@@ -97,8 +98,9 @@ describe.skip('openapi', () => {
         authorization: VISUAL_CROSSING_CREDENTIALS,
         instructions: WEATHER_INSTRUCTIONS,
       });
-      const aiClient = new EdgeAiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
-      const processor = new ChatProcessor(aiClient, tools);
+      // const aiClient = new Edge AiServiceClient({ endpoint: AI_SERVICE_ENDPOINT.LOCAL });
+      // TODO(dmaretskyi): FIX ME.
+      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,37 +2,46 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Blueprint } from '@dxos/assistant';
-import { Type } from '@dxos/echo';
+import { Blueprint } from '@dxos/blueprints';
+import { Sequence } from '@dxos/conductor';
+import { type Resource } from '@dxos/react-ui';
 
-import { ASSISTANT_PLUGIN } from './meta';
-import { AIChatType, TemplateType } from './types';
+import { meta } from './meta';
+import { Assistant } from './types';
 
-export default [
+export const translations = [
   {
     'en-US': {
-      [Type.getTypename(AIChatType)]: {
-        'typename label': 'Assistant',
-        'typename label_zero': 'Assistants',
-        'typename label_one': 'Assistant',
-        'typename label_other': 'Assistants',
-        'object name placeholder': 'New assistant',
-      },
-      [Type.getTypename(Blueprint)]: {
+      // 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',
       },
-      [Type.getTypename(TemplateType)]: {
-        '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',
       },
-      [ASSISTANT_PLUGIN]: {
+      [meta.id]: {
         'templates label': 'Templates',
         'open ambient chat label': 'Open Assistant',
         'assistant chat label': 'Assistant',
@@ -50,21 +59,30 @@ export default [
         'select preset template placeholder': 'Select preset',
         'service registry label': 'Service Registry',
 
-        'blueprint logs label': 'Logs',
+        'sequence logs label': 'Logs',
 
         'assistant dialog title': 'Assistant',
         'open assistant label': 'Open assistant',
 
-        'search input placeholder': 'Search...',
-        'chat input placeholder': 'Ask a question...',
-        'chat stop': 'Cancel request.',
+        'no tools': 'No tools are configured.',
+
+        'button suggest': 'Assistant suggestion',
+        'button select option': 'Select option',
 
         'button save': 'Save',
         'button run': 'Run',
 
-        'prompt placeholder': 'Ask a question...',
-        'microphone button': 'Click to speak',
-        'cancel processing button': 'Stop processing',
+        '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...',
+        'button add blueprint': 'Configure blueprints',
+        'button microphone': 'Click to speak',
+        'button cancel processing': 'Stop processing',
+        'button scroll down': 'Scroll down',
 
         'settings default label': 'Default',
         'settings custom prompts label': 'Use custom prompts',
@@ -74,4 +92,4 @@ export default [
       },
     },
   },
-];
+] as const satisfies Resource[];

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,7 +2,8 @@
 // Copyright 2024 DXOS.org
 //
 
-export * from './chat';
+export * as Assistant from './Assistant';
+export * as AssistantAction from './AssistantAction';
+
+export * from './defs';
 export * from './service';
-export * from './template';
-export * from './types';

package/dist/lib/browser/AssistantDialog-MQOOR364.mjs

@@ -1,47 +0,0 @@
-import {
-  AmbientDialog
-} from "./chunk-Q6UZ4F3H.mjs";
-import {
-  ThreadContainer
-} from "./chunk-JO4W3MF7.mjs";
-import "./chunk-AAOKC2JN.mjs";
-import "./chunk-MEGMOFJB.mjs";
-import "./chunk-UE3IZ4PN.mjs";
-import {
-  ASSISTANT_PLUGIN
-} from "./chunk-XOZ7YMO3.mjs";
-
-// packages/plugins/plugin-assistant/src/components/AssistantDialog.tsx
-import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
-import React, { useState } from "react";
-import { useCapability, Capabilities, useCapabilities } from "@dxos/app-framework";
-import { TranscriptionCapabilities } from "@dxos/plugin-transcription";
-import { useTranslation } from "@dxos/react-ui";
-var AssistantDialog = ({ chat }) => {
-  var _effect = _useSignals();
-  try {
-    const { t } = useTranslation(ASSISTANT_PLUGIN);
-    const transcription = useCapabilities(TranscriptionCapabilities.Transcriber).length > 0;
-    const settings = useCapability(Capabilities.SettingsStore).getStore(ASSISTANT_PLUGIN)?.value;
-    const [open, setOpen] = useState(false);
-    return /* @__PURE__ */ React.createElement(AmbientDialog, {
-      open,
-      onOpenChange: setOpen,
-      title: t("assistant dialog title")
-    }, /* @__PURE__ */ React.createElement(ThreadContainer, {
-      part: "dialog",
-      chat,
-      onOpenChange: setOpen,
-      settings,
-      transcription
-    }));
-  } finally {
-    _effect.f();
-  }
-};
-var AssistantDialog_default = AssistantDialog;
-export {
-  AssistantDialog,
-  AssistantDialog_default as default
-};
-//# sourceMappingURL=AssistantDialog-MQOOR364.mjs.map

package/dist/lib/browser/AssistantDialog-MQOOR364.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/AssistantDialog.tsx"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport React, { type FC, useState } from 'react';\n\nimport { useCapability, Capabilities, useCapabilities } from '@dxos/app-framework';\nimport { TranscriptionCapabilities } from '@dxos/plugin-transcription';\nimport { useTranslation } from '@dxos/react-ui';\n\nimport { AmbientDialog } from './AmbientDialog';\nimport { ThreadContainer } from './Thread';\nimport { ASSISTANT_PLUGIN } from '../meta';\nimport { type AssistantSettingsProps, type AIChatType } from '../types';\n\nexport const AssistantDialog: FC<{ chat?: AIChatType }> = ({ chat }) => {\n  const { t } = useTranslation(ASSISTANT_PLUGIN);\n  const transcription = useCapabilities(TranscriptionCapabilities.Transcriber).length > 0;\n  const settings = useCapability(Capabilities.SettingsStore).getStore<AssistantSettingsProps>(ASSISTANT_PLUGIN)?.value;\n\n  // TODO(burdon): Refocus when open.\n  const [open, setOpen] = useState(false);\n\n  return (\n    <AmbientDialog open={open} onOpenChange={setOpen} title={t('assistant dialog title')}>\n      <ThreadContainer\n        part={'dialog'}\n        chat={chat}\n        onOpenChange={setOpen}\n        settings={settings}\n        transcription={transcription}\n      />\n    </AmbientDialog>\n  );\n};\n\nexport default AssistantDialog;\n"],
-  "mappings": ";;;;;;;;;;;;;;;AAIA,OAAOA,SAAkBC,gBAAgB;AAEzC,SAASC,eAAeC,cAAcC,uBAAuB;AAC7D,SAASC,iCAAiC;AAC1C,SAASC,sBAAsB;AAOxB,IAAMC,kBAA6C,CAAC,EAAEC,KAAI,MAAE;;;AACjE,UAAM,EAAEC,EAAC,IAAKC,eAAeC,gBAAAA;AAC7B,UAAMC,gBAAgBC,gBAAgBC,0BAA0BC,WAAW,EAAEC,SAAS;AACtF,UAAMC,WAAWC,cAAcC,aAAaC,aAAa,EAAEC,SAAiCV,gBAAAA,GAAmBW;AAG/G,UAAM,CAACC,MAAMC,OAAAA,IAAWC,SAAS,KAAA;AAEjC,WACE,sBAAA,cAACC,eAAAA;MAAcH;MAAYI,cAAcH;MAASI,OAAOnB,EAAE,wBAAA;OACzD,sBAAA,cAACoB,iBAAAA;MACCC,MAAM;MACNtB;MACAmB,cAAcH;MACdP;MACAL;;;;;AAIR;AAEA,IAAA,0BAAeL;",
-  "names": ["React", "useState", "useCapability", "Capabilities", "useCapabilities", "TranscriptionCapabilities", "useTranslation", "AssistantDialog", "chat", "t", "useTranslation", "ASSISTANT_PLUGIN", "transcription", "useCapabilities", "TranscriptionCapabilities", "Transcriber", "length", "settings", "useCapability", "Capabilities", "SettingsStore", "getStore", "value", "open", "setOpen", "useState", "AmbientDialog", "onOpenChange", "title", "ThreadContainer", "part"]
-}