@dxos/plugin-assistant 0.8.4-main.406dc2a → 0.8.4-main.4a85c3132b

package/src/testing/test-generator.ts

@@ -5,21 +5,22 @@
 import * as Effect from 'effect/Effect';
 
 import { Obj } from '@dxos/echo';
-import { ContextQueueService, DatabaseService } from '@dxos/functions';
+import { Database } from '@dxos/echo';
+import { ContextQueueService } from '@dxos/functions';
 import { faker } from '@dxos/random';
 import { renderObjectLink } from '@dxos/react-ui-components';
-import { type ContentBlock, DataType } from '@dxos/schema';
+import { type Actor, type ContentBlock, Message, Organization } from '@dxos/types';
 import { trim } from '@dxos/util';
 
-export const createMessage = (role: DataType.ActorRole, blocks: ContentBlock.Any[]): DataType.Message => {
-  return Obj.make(DataType.Message, {
+export const createMessage = (role: Actor.Role, blocks: ContentBlock.Any[]): Message.Message => {
+  return Obj.make(Message.Message, {
     created: new Date().toISOString(),
     sender: { role },
     blocks,
   });
 };
 
-export type MessageGenerator = Effect.Effect<void, never, DatabaseService | ContextQueueService>;
+export type MessageGenerator = Effect.Effect<void, never, Database.Service | ContextQueueService>;
 
 export const createMessageGenerator = (): MessageGenerator[] => [
   Effect.gen(function* () {
@@ -70,9 +71,9 @@ export const createMessageGenerator = (): MessageGenerator[] => [
               [
                 faker.lorem.paragraph(),
                 '',
-                ...Array.from({ length: faker.number.int({ min: 3, max: 5 }) }).map(
-                  (_, idx) => `${idx + 1}. ${faker.lorem.paragraph()}`,
-                ),
+                ...Array.from({
+                  length: faker.number.int({ min: 3, max: 5 }),
+                }).map((_, idx) => `${idx + 1}. ${faker.lorem.paragraph()}`),
               ].join('\n') + '\n',
           },
         ]),
@@ -145,11 +146,11 @@ export const createMessageGenerator = (): MessageGenerator[] => [
 
   Effect.gen(function* () {
     const { queue } = yield* ContextQueueService;
-    const { db } = yield* DatabaseService;
-    const obj1 = db.add(Obj.make(DataType.Organization, { name: 'DXOS' }));
-    // const obj2 = db.add(Obj.make(DataType.Person, { fullName: 'Alice' }));
-    // const obj3 = db.add(Obj.make(DataType.Person, { fullName: 'Bob' }));
-    // const obj4 = db.add(Obj.make(DataType.Person, { fullName: 'Charlie' }));
+    const { db } = yield* Database.Service;
+    const obj1 = db.add(Obj.make(Organization.Organization, { name: 'DXOS' }));
+    // const obj2 = db.add(Obj.make(Person.Person, { fullName: 'Alice' }));
+    // const obj3 = db.add(Obj.make(Person.Person, { fullName: 'Bob' }));
+    // const obj4 = db.add(Obj.make(Person.Person, { fullName: 'Charlie' }));
     yield* Effect.promise(() =>
       queue.append([
         createMessage('assistant', [

package/src/testing/test-sequence.ts

@@ -9,16 +9,16 @@ export const RESEARCH_SEQUENCE_DEFINITION: SequenceDefinition = {
   steps: [
     {
       instructions: 'Research information and entities related to the selected objects.',
-      tools: [ToolId.make('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: [ToolId.make('search/local_search')],
+      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')],
+      tools: [ToolId.make('search/local-search'), ToolId.make('graph/writer')],
     },
   ],
 };

package/src/testing/test-services.ts

@@ -2,10 +2,12 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Obj } from '@dxos/echo';
+import { Obj, type Type } from '@dxos/echo';
 
 import { type ApiAuthorization, type BaseServiceRegistry, ServiceType, categoryIcons } from '../types';
 
+const ServiceTypeSchema = ServiceType as unknown as Type.AnyObj;
+
 export class MockServiceRegistry implements BaseServiceRegistry {
   async queryServices(): Promise<ServiceType[]> {
     return TEST_SERVICES;
@@ -48,7 +50,7 @@ const VISUAL_CROSSING_CREDENTIALS: ApiAuthorization = {
 //  - e.g., https://github.com/konfig-sdks/openapi-examples/blob/main/xkcd/openapi.yaml
 
 const TEST_SERVICES: ServiceType[] = [
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'amadeus.com/service/FlightSearch',
     name: 'Amadeus Flight Search',
     description: 'Search for local and international flights.',
@@ -62,7 +64,7 @@ const TEST_SERVICES: ServiceType[] = [
     ],
   }),
 
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'amadeus.com/service/HotelSearch',
     name: 'Amadeus Hotel Search',
     description: 'Search for local and international hotels.',
@@ -76,7 +78,7 @@ const TEST_SERVICES: ServiceType[] = [
     ],
   }),
 
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'visualcrossing.com/service/Weather',
     name: 'Visual Crossing Weather',
     description: 'Search for global weather forecasts.',
@@ -91,7 +93,7 @@ const TEST_SERVICES: ServiceType[] = [
   }),
 
   // TODO(burdon): Needs auth.
-  Obj.make(ServiceType, {
+  Obj.make(ServiceTypeSchema, {
     serviceId: 'abstractapi.com/service/GeoLocation',
     name: 'Abstract GeoLocation',
     description: 'Get the location of any IP address.',
@@ -109,7 +111,7 @@ const TEST_SERVICES: ServiceType[] = [
   //
 
   ...Array.from({ length: 20 }, (_, i) =>
-    Obj.make(ServiceType, {
+    Obj.make(ServiceTypeSchema, {
       serviceId: `example.com/service/test-${i}`,
       name: `Test ${i}`,
       description: `Test ${i}`,

package/src/translations.ts

@@ -2,12 +2,13 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Blueprint } from '@dxos/blueprints';
+import { Chat, Project } from '@dxos/assistant-toolkit';
+import { Blueprint, Prompt } from '@dxos/blueprints';
 import { Sequence } from '@dxos/conductor';
+import { Type } from '@dxos/echo';
 import { type Resource } from '@dxos/react-ui';
 
 import { meta } from './meta';
-import { Assistant } from './types';
 
 // TODO(burdon): Standardize translation names.
 export const translations = [
@@ -22,6 +23,17 @@ export const translations = [
         'object name placeholder': 'New blueprint',
         'rename object label': 'Rename blueprint',
         'delete object label': 'Delete blueprint',
+        'object deleted label': 'Blueprint deleted',
+      },
+      [Type.getTypename(Prompt.Prompt)]: {
+        'typename label': 'Prompt',
+        'typename label_zero': 'Prompts',
+        'typename label_one': 'Prompt',
+        'typename label_other': 'Prompts',
+        'object name placeholder': 'New prompt',
+        'rename object label': 'Rename prompt',
+        'delete object label': 'Delete prompt',
+        'object deleted label': 'Prompt deleted',
       },
       // TODO(burdon): From conductor.
       [Sequence.typename]: {
@@ -32,12 +44,24 @@ export const translations = [
         'object name placeholder': 'New sequence',
         'rename object label': 'Rename sequence',
         'delete object label': 'Delete sequence',
+        'object deleted label': 'Sequence deleted',
       },
-      [Assistant.Chat.typename]: {
+      [Chat.Chat.typename]: {
         'typename label': 'AI Chat',
         'object name placeholder': 'New AI Chat',
         'rename object label': 'Rename AI Chat',
         'delete object label': 'Delete AI Chat',
+        'object deleted label': 'AI Chat deleted',
+      },
+      [Project.Project.typename]: {
+        'typename label': 'Project',
+        'typename label_zero': 'Projects',
+        'typename label_one': 'Project',
+        'typename label_other': 'Projects',
+        'object name placeholder': 'New project',
+        'rename object label': 'Rename project',
+        'delete object label': 'Delete project',
+        'object deleted label': 'Project deleted',
       },
       // TODO(burdon): Reconcile with react-ui-chat.
       [meta.id]: {
@@ -61,36 +85,35 @@ export const translations = [
         'type filter placeholder': 'Type',
         'any type filter label': 'Any',
         'no blueprint message': 'No active blueprints',
-        'calling tool label': 'Calling tool...',
-        'calling label': 'Calling',
-        'error label': 'Error',
+        'tool call label': 'Calling tool...',
+        'tool result label': 'Success',
+        'tool error label': 'Tool call failed',
 
-        'sequence logs label': 'Logs',
+        'invocations label': 'Invocations',
 
         'assistant dialog title': 'Assistant',
         'open assistant label': 'Open assistant',
+        'reset blueprints label': 'Reset blueprints',
 
         'no tools': 'No tools are configured',
         'no results': 'No results',
 
-        'button retry': 'Retry',
-        'button suggestion': 'Assistant suggestion',
-        'button select option': 'Select option',
-        'button cancel': 'Cancel',
-        'button save': 'Save',
-        'button run': 'Run',
-        'button new thread': 'New Chat',
+        'cancel button': 'Cancel',
+        'save button': 'Save',
+        'new thread button': 'New Chat',
+        'rename thread button': 'Rename Chat',
         'chat history label': 'Chat History',
+        'chat update name label': 'Update AI Chat name',
 
         'toolkit label': 'Toolkit',
-        'summary label': 'Summary',
+        'stats label': 'Stats',
 
         'search placeholder': 'Search...',
         'prompt placeholder': 'Enter question or command...',
-        'button context objects': 'Add to context',
-        'button context settings': 'Chat settings',
-        'button microphone': 'Click to speak',
-        'button cancel processing': 'Stop processing',
+        'context objects button': 'Add to context',
+        'context settings button': 'Chat settings',
+        'microphone button': 'Click to speak',
+        'cancel processing button': 'Stop processing',
         'blueprints in context title': 'Blueprints',
         'objects in context title': 'Content',
         'remove object in context label': 'Remove document',
@@ -101,6 +124,16 @@ export const translations = [
         'settings llm provider label': 'LLM provider',
         'settings edge llm model label': 'Remote language model',
         'settings ollama llm model label': 'Ollama language model',
+
+        // Trigger status
+        'trigger status disabled label': 'Triggers disabled',
+        'trigger status idle label': 'Triggers idle',
+        'trigger status running label': 'Trigger running',
+        'trigger status error label': 'Trigger error',
+        'trigger runtime label': 'Trigger Runtime',
+        'trigger runtime description': 'Enable automatic trigger execution',
+        'trigger last invocation label': 'Last run',
+        'trigger duration label': 'Duration',
       },
     },
   },

package/src/types/Assistant.ts

@@ -4,49 +4,13 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Obj, Ref, Type } from '@dxos/echo';
-import { LabelAnnotation } from '@dxos/echo/internal';
-import { Queue } from '@dxos/echo-db';
+import { Chat as ChatModule } from '@dxos/assistant-toolkit';
 
 import { LLM_PROVIDERS } from './defs';
 
-/**
- * AI chat.
- */
-export const Chat = Schema.Struct({
-  id: Type.ObjectId,
-  name: Schema.optional(Schema.String),
-  queue: Type.Ref(Queue),
-  // TODO(dmaretskyi): Eventually this and the message queue will be the same.
-  traceQueue: Schema.optional(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> {}
-
-export const makeChat = ({ name, queue }: { name?: string; queue: Queue }) =>
-  Obj.make(Chat, { name, queue: Ref.fromDXN(queue.dxn) });
-
-/**
- * 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> {}
+// Re-export Chat schema for backward compatibility.
+export const Chat = ChatModule.Chat;
+export type Chat = ChatModule.Chat;
 
 /**
  * Plugin settings.

package/src/types/AssistantAction.ts

@@ -4,59 +4,73 @@
 
 import * as Schema from 'effect/Schema';
 
-import { Blueprint } from '@dxos/blueprints';
-import { EchoObjectSchema, SpaceSchema } from '@dxos/client/echo';
-import { Sequence } from '@dxos/conductor';
-import { DataType } from '@dxos/schema';
+import { Capability } from '@dxos/app-framework';
+import { Chat } from '@dxos/assistant-toolkit';
+import { SpaceSchema } from '@dxos/client/echo';
+import { Database, Obj } from '@dxos/echo';
+import { Collection } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
 
 import { meta } from '../meta';
 
-import { Chat } from './Assistant';
-
-export class onCreateSpace extends Schema.TaggedClass<onCreateSpace>()(`${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,
-  }),
-}) {}
-
-export class SetCurrentChat extends Schema.TaggedClass<SetCurrentChat>()(`${meta.id}/action/set-current-chat`, {
-  input: Schema.Struct({
-    companionTo: EchoObjectSchema,
-    chat: Chat,
-  }),
-  output: Schema.Void,
-}) {}
+// Operations
+const ASSISTANT_OPERATION = `${meta.id}/operation`;
+
+export namespace AssistantOperation {
+  export const OnCreateSpace = Operation.make({
+    meta: { key: `${ASSISTANT_OPERATION}/on-create-space`, name: 'On Create Space' },
+    services: [Capability.Service],
+    schema: {
+      input: Schema.Struct({
+        space: SpaceSchema,
+        rootCollection: Collection.Collection,
+      }),
+      output: Schema.Void,
+    },
+  });
+
+  export const CreateChat = Operation.make({
+    meta: { key: `${ASSISTANT_OPERATION}/create-chat`, name: 'Create Chat' },
+    services: [Capability.Service],
+    schema: {
+      input: Schema.Struct({
+        db: Database.Database,
+        name: Schema.optional(Schema.String),
+        /** If false, chat is created in-memory only and not added to space. Defaults to true. */
+        addToSpace: Schema.optional(Schema.Boolean),
+      }),
+      output: Schema.Struct({
+        object: Chat.Chat,
+      }),
+    },
+  });
+
+  export const UpdateChatName = Operation.make({
+    meta: { key: `${ASSISTANT_OPERATION}/update-chat-name`, name: 'Update Chat Name' },
+    services: [Capability.Service],
+    schema: {
+      input: Schema.Struct({
+        chat: Chat.Chat,
+      }),
+      output: Schema.Void,
+    },
+  });
+
+  export const SetCurrentChat = Operation.make({
+    meta: { key: `${ASSISTANT_OPERATION}/set-current-chat`, name: 'Set Current Chat' },
+    services: [Capability.Service],
+    schema: {
+      input: Schema.Struct({
+        companionTo: Obj.Unknown,
+        chat: Chat.Chat.pipe(Schema.optional),
+      }),
+      output: Schema.Void,
+    },
+  });
+
+  export const BlueprintForm = Schema.Struct({
+    key: Schema.String,
+    name: Schema.String,
+    description: Schema.optional(Schema.String),
+  });
+}

package/src/types/capabilities.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { type Atom } from '@effect-atom/atom-react';
+import * as Schema from 'effect/Schema';
+
+import { Capability } from '@dxos/app-framework';
+
+import { meta } from '../meta';
+
+import { type Assistant } from './';
+
+export namespace AssistantCapabilities {
+  export const Settings = Capability.make<Atom.Writable<Assistant.Settings>>(`${meta.id}/capability/settings`);
+
+  export const StateSchema = Schema.mutable(
+    Schema.Struct({
+      /** Map of primary object dxn to current chat dxn. */
+      currentChat: Schema.Record({ key: Schema.String, value: Schema.UndefinedOr(Schema.String) }),
+    }),
+  );
+
+  export type AssistantState = Schema.Schema.Type<typeof StateSchema>;
+
+  export const State = Capability.make<Atom.Writable<AssistantState>>(`${meta.id}/capability/state`);
+}

package/src/types/events.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { ActivationEvent } from '@dxos/app-framework';
+
+import { meta } from '../meta';
+
+export namespace AssistantEvents {
+  export const SetupAiServiceProviders = ActivationEvent.make(`${meta.id}/event/setup-ai-service-providers`);
+}

package/src/types/index.ts

@@ -2,8 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
+// Re-export Chat type from assistant-toolkit for public API type declarations.
+export type { Chat as ChatType } from '@dxos/assistant-toolkit';
+
 export * as Assistant from './Assistant';
-export * as AssistantAction from './AssistantAction';
+export { AssistantOperation } from './AssistantAction';
 
+export * from './capabilities';
 export * from './defs';
+export * from './events';
 export * from './service';

package/src/types/service.ts

@@ -5,9 +5,8 @@
 import * as Schema from 'effect/Schema';
 
 import { ComputeGraph } from '@dxos/conductor';
-import { Type } from '@dxos/echo';
-import { TypedObject } from '@dxos/echo/internal';
-import { FunctionType } from '@dxos/functions';
+import { Ref, Type } from '@dxos/echo';
+import { Function } from '@dxos/functions';
 
 // TODO(burdon): Factor out and reconcile with https://github.com/dxos/dxos/blob/main/packages/plugins/plugin-token-manager/src/defs/presets.ts#L7
 
@@ -38,12 +37,12 @@ export type ApiAuthorization = Schema.Schema.Type<typeof ApiAuthorization>;
 
 const ServiceInterfaceFunction = Schema.Struct({
   kind: Schema.Literal('function'),
-  fn: Type.Ref(FunctionType),
+  fn: Ref.Ref(Function.Function),
 });
 
 const ServiceInterfaceWorkflow = Schema.Struct({
   kind: Schema.Literal('workflow'),
-  workflow: Type.Ref(ComputeGraph),
+  workflow: Ref.Ref(ComputeGraph),
 });
 
 const ServiceInterfaceApi = Schema.Struct({
@@ -70,14 +69,11 @@ const ServiceInterface = Schema.Union(
   ServiceInterfaceFunction,
   ServiceInterfaceWorkflow,
   ServiceInterfaceApi,
-);
+) as any;
 
 export type ServiceInterface = Schema.Schema.Type<typeof ServiceInterface>;
 
-export class ServiceType extends TypedObject({
-  typename: 'dxos.org/type/ServiceType',
-  version: '0.1.0',
-})({
+export const ServiceType = Schema.Struct({
   serviceId: Schema.String,
   name: Schema.optional(Schema.String),
   description: Schema.optional(Schema.String),
@@ -88,7 +84,14 @@ export class ServiceType extends TypedObject({
    * Entries exposed: functions, workflows, and APIs.
    */
   interfaces: Schema.optional(Schema.Array(ServiceInterface)),
-}) {}
+}).pipe(
+  Type.object({
+    typename: 'dxos.org/type/ServiceType',
+    version: '0.1.0',
+  }),
+);
+
+export interface ServiceType extends Schema.Schema.Type<typeof ServiceType> {}
 
 //
 // Service Registry

package/dist/lib/browser/BlueprintContainer-WX2SSDVI.mjs

@@ -1,28 +0,0 @@
-import {
-  TemplateEditor
-} from "./chunk-43I2LR6O.mjs";
-import "./chunk-5RICKAMN.mjs";
-import "./chunk-J5LGTIGS.mjs";
-
-// src/components/BlueprintContainer.tsx
-import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
-import React from "react";
-import { StackItem } from "@dxos/react-ui-stack";
-var BlueprintContainer = ({ blueprint }) => {
-  var _effect = _useSignals();
-  try {
-    return /* @__PURE__ */ React.createElement(StackItem.Content, null, /* @__PURE__ */ React.createElement(TemplateEditor, {
-      id: blueprint.id,
-      template: blueprint.instructions,
-      classNames: "container-max-width"
-    }));
-  } finally {
-    _effect.f();
-  }
-};
-var BlueprintContainer_default = BlueprintContainer;
-export {
-  BlueprintContainer,
-  BlueprintContainer_default as default
-};
-//# sourceMappingURL=BlueprintContainer-WX2SSDVI.mjs.map

package/dist/lib/browser/BlueprintContainer-WX2SSDVI.mjs.map

@@ -1,7 +0,0 @@
-{
-  "version": 3,
-  "sources": ["../../../src/components/BlueprintContainer.tsx"],
-  "sourcesContent": ["//\n// Copyright 2025 DXOS.org\n//\n\nimport React from 'react';\n\nimport { type Blueprint } from '@dxos/blueprints';\nimport { StackItem } from '@dxos/react-ui-stack';\n\nimport { TemplateEditor } from './TemplateEditor';\n\nexport type BlueprintContainerProps = {\n  blueprint: Blueprint.Blueprint;\n};\n\nexport const BlueprintContainer = ({ blueprint }: BlueprintContainerProps) => {\n  return (\n    <StackItem.Content>\n      <TemplateEditor id={blueprint.id} template={blueprint.instructions} classNames='container-max-width' />\n    </StackItem.Content>\n  );\n};\n\nexport default BlueprintContainer;\n"],
-  "mappings": ";;;;;;;;AAIA,OAAOA,WAAW;AAGlB,SAASC,iBAAiB;AAQnB,IAAMC,qBAAqB,CAAC,EAAEC,UAAS,MAA2B;;;AACvE,WACE,sBAAA,cAACC,UAAUC,SAAO,MAChB,sBAAA,cAACC,gBAAAA;MAAeC,IAAIJ,UAAUI;MAAIC,UAAUL,UAAUM;MAAcC,YAAW;;;;;AAGrF;AAEA,IAAA,6BAAeR;",
-  "names": ["React", "StackItem", "BlueprintContainer", "blueprint", "StackItem", "Content", "TemplateEditor", "id", "template", "instructions", "classNames"]
-}