@dxos/plugin-assistant 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

package/src/testing/test-generator.ts

@@ -0,0 +1,261 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Obj } from '@dxos/echo';
+import { ContextQueueService, DatabaseService } from '@dxos/functions';
+import { faker } from '@dxos/random';
+import { renderObjectLink } from '@dxos/react-ui-components';
+import { type Actor, type ContentBlock, Message, Organization } from '@dxos/types';
+import { trim } from '@dxos/util';
+
+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 const createMessageGenerator = (): MessageGenerator[] => [
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    yield* Effect.promise(() =>
+      queue.append([
+        createMessage('user', [
+          {
+            _tag: 'text',
+            text: faker.lorem.sentence(5),
+          },
+        ]),
+      ]),
+    );
+  }),
+
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    yield* Effect.promise(() =>
+      queue.append([
+        createMessage('assistant', [
+          {
+            _tag: 'text',
+            text:
+              trim`
+              ## Markdown
+              Here is a [link](https://dxos.org)
+
+              And some **bold** text.
+
+              And some JSON
+              \`\`\`json
+              {
+                "key": "value"
+              }
+              \`\`\`
+
+              And some code
+              \`\`\`js
+              const x = 1;
+              \`\`\`
+            ` + '\n',
+          },
+          {
+            _tag: 'text',
+            disposition: 'cot',
+            text:
+              [
+                faker.lorem.paragraph(),
+                '',
+                ...Array.from({
+                  length: faker.number.int({ min: 3, max: 5 }),
+                }).map((_, idx) => `${idx + 1}. ${faker.lorem.paragraph()}`),
+              ].join('\n') + '\n',
+          },
+        ]),
+      ]),
+    );
+  }),
+
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    yield* Effect.promise(() =>
+      queue.append([
+        createMessage('assistant', [
+          {
+            _tag: 'text',
+            text: 'How can I help?',
+          },
+          {
+            _tag: 'suggestion',
+            text: 'List tools',
+          },
+          {
+            _tag: 'suggestion',
+            text: 'Show info',
+          },
+          {
+            _tag: 'suggestion',
+            text: faker.lorem.paragraph(),
+          },
+        ]),
+        createMessage('assistant', [
+          {
+            _tag: 'text',
+            text: 'Select an option:',
+          },
+          {
+            _tag: 'select',
+            options: ['Option 1', 'Option 2', 'Option 3'],
+          },
+        ]),
+      ]),
+    );
+  }),
+
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    yield* Effect.promise(() =>
+      queue.append([
+        createMessage('assistant', [
+          {
+            _tag: 'toolkit',
+          },
+        ]),
+      ]),
+    );
+  }),
+
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    yield* Effect.promise(() =>
+      queue.append([
+        createMessage('user', [
+          {
+            _tag: 'text',
+            text: faker.lorem.sentence(5),
+          },
+        ]),
+      ]),
+    );
+  }),
+
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    const { db } = yield* DatabaseService;
+    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', [
+          // Inline tag.
+          {
+            _tag: 'text',
+            text: [faker.lorem.paragraph(), renderObjectLink(obj1), faker.lorem.paragraph(), '\n'].join(' '),
+          },
+
+          // Inline cards.
+          // ...[obj1, obj2, obj3, obj4].map(
+          //   (obj) =>
+          //     ({
+          //       _tag: 'text',
+          //       text: renderObjectLink(obj, true) + '\n',
+          //     }) satisfies ContentBlock.Text,
+          // ),
+        ]),
+      ]),
+    );
+  }),
+
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    yield* Effect.promise(() =>
+      queue.append([
+        createMessage('assistant', [
+          {
+            _tag: 'text',
+            text: faker.lorem.paragraph() + '\n',
+          },
+        ]),
+        createMessage('assistant', [
+          {
+            _tag: 'toolCall',
+            toolCallId: '1234',
+            name: 'search',
+            input: JSON.stringify({}),
+            providerExecuted: false,
+          },
+        ]),
+        createMessage('user', [
+          {
+            _tag: 'toolResult',
+            toolCallId: '1234',
+            name: 'search',
+            result: 'This is a tool result.',
+            providerExecuted: false,
+          },
+        ]),
+      ]),
+    );
+  }),
+
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    yield* Effect.promise(() =>
+      queue.append([
+        createMessage('assistant', [
+          {
+            _tag: 'text',
+            text: faker.lorem.paragraph() + '\n',
+          },
+        ]),
+        createMessage('assistant', [
+          {
+            _tag: 'toolCall',
+            toolCallId: '4567',
+            name: 'create',
+            input: JSON.stringify({}),
+            providerExecuted: false,
+          },
+        ]),
+        createMessage('user', [
+          {
+            _tag: 'toolResult',
+            toolCallId: '4567',
+            name: 'create',
+            result: 'This is a tool result.',
+            providerExecuted: false,
+          },
+        ]),
+        createMessage('assistant', [
+          {
+            _tag: 'text',
+            text:
+              Array.from({ length: faker.number.int({ min: 2, max: 3 }) })
+                .map(() => faker.lorem.paragraph())
+                .join('\n\n') + '\n',
+          },
+        ]),
+      ]),
+    );
+  }),
+
+  Effect.gen(function* () {
+    const { queue } = yield* ContextQueueService;
+    yield* Effect.promise(() =>
+      queue.append([
+        createMessage('assistant', [
+          {
+            _tag: 'text',
+            text: faker.lorem.paragraph(),
+          },
+        ]),
+      ]),
+    );
+  }),
+];

package/src/testing/test-services.ts

@@ -4,16 +4,10 @@
 
 import { Obj } from '@dxos/echo';
 
-import {
-  type ApiAuthorization,
-  type BaseServiceRegistry,
-  type ServiceQuery,
-  ServiceType,
-  categoryIcons,
-} from '../types';
+import { type ApiAuthorization, type BaseServiceRegistry, ServiceType, categoryIcons } from '../types';
 
 export class MockServiceRegistry implements BaseServiceRegistry {
-  async queryServices(query?: ServiceQuery): Promise<ServiceType[]> {
+  async queryServices(): Promise<ServiceType[]> {
     return TEST_SERVICES;
   }
 }

package/src/translations.ts

@@ -2,8 +2,9 @@
 // Copyright 2023 DXOS.org
 //
 
-import { Blueprint } from '@dxos/blueprints';
+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';
@@ -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,14 @@ 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]: {
         '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',
       },
       // TODO(burdon): Reconcile with react-ui-chat.
       [meta.id]: {
@@ -60,8 +74,12 @@ export const translations = [
         'service registry label': 'Service Registry',
         'type filter placeholder': 'Type',
         'any type filter label': 'Any',
+        'no blueprint message': 'No active blueprints',
+        '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',
@@ -69,28 +87,22 @@ export const translations = [
         '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',
 
-        'calling tool label': 'Calling tool...',
-        'calling label': 'Calling',
-        'error label': 'Error',
-
         'search placeholder': 'Search...',
-        'prompt placeholder': 'Ask or search for anything...',
-        'button context objects': 'Add to context',
-        'button context settings': 'Chat settings',
-        'button microphone': 'Click to speak',
-        'button cancel processing': 'Stop processing',
+        'prompt placeholder': 'Enter question or command...',
+        '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',

package/src/types/Assistant.ts

@@ -2,11 +2,11 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { Queue } from '@dxos/client/echo';
-import { Type } from '@dxos/echo';
-import { LabelAnnotation } from '@dxos/echo-schema';
+import { Obj, Ref, Type } from '@dxos/echo';
+import { FormInputAnnotation, LabelAnnotation } from '@dxos/echo/internal';
+import { Queue } from '@dxos/echo-db';
 
 import { LLM_PROVIDERS } from './defs';
 
@@ -14,11 +14,10 @@ import { LLM_PROVIDERS } from './defs';
  * AI chat.
  */
 export const Chat = Schema.Struct({
-  id: Type.ObjectId,
-  name: Schema.optional(Schema.String),
-  queue: Type.Ref(Queue),
+  name: Schema.String.pipe(Schema.optional),
+  queue: Type.Ref(Queue).pipe(FormInputAnnotation.set(false)),
   // TODO(dmaretskyi): Eventually this and the message queue will be the same.
-  traceQueue: Schema.optional(Type.Ref(Queue)),
+  traceQueue: Type.Ref(Queue).pipe(FormInputAnnotation.set(false), Schema.optional),
 }).pipe(
   Type.Obj({
     typename: 'dxos.org/type/assistant/Chat',
@@ -29,11 +28,14 @@ export const Chat = Schema.Struct({
 
 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,
+  id: Obj.ID,
 }).pipe(
   Type.Relation({
     typename: 'dxos.org/relation/assistant/CompanionTo',

package/src/types/AssistantAction.ts

@@ -2,21 +2,22 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint, Prompt } from '@dxos/blueprints';
 import { EchoObjectSchema, SpaceSchema } from '@dxos/client/echo';
 import { Sequence } from '@dxos/conductor';
-import { DataType } from '@dxos/schema';
+import { Collection } from '@dxos/schema';
 
 import { meta } from '../meta';
 
 import { Chat } from './Assistant';
 
-export class OnSpaceCreated extends Schema.TaggedClass<OnSpaceCreated>()(`${meta.id}/on-space-created`, {
+// TODO(burdon): Name?
+export class OnCreateSpace extends Schema.TaggedClass<OnCreateSpace>()(`${meta.id}/on-space-created`, {
   input: Schema.Struct({
     space: SpaceSchema,
-    rootCollection: DataType.Collection,
+    rootCollection: Collection.Collection,
   }),
   output: Schema.Void,
 }) {}
@@ -31,6 +32,13 @@ export class CreateChat extends Schema.TaggedClass<CreateChat>()(`${meta.id}/act
   }),
 }) {}
 
+export class UpdateChatName extends Schema.TaggedClass<UpdateChatName>()(`${meta.id}/action/update-name`, {
+  input: Schema.Struct({
+    chat: Chat,
+  }),
+  output: Schema.Void,
+}) {}
+
 export const BlueprintForm = Schema.Struct({
   key: Schema.String,
   name: Schema.String,
@@ -44,6 +52,15 @@ export class CreateBlueprint extends Schema.TaggedClass<CreateBlueprint>()(`${me
   }),
 }) {}
 
+export class CreatePrompt extends Schema.TaggedClass<CreatePrompt>()(`${meta.id}/action/create-prompt`, {
+  input: Schema.Struct({
+    name: Schema.optional(Schema.String),
+  }),
+  output: Schema.Struct({
+    object: Prompt.Prompt,
+  }),
+}) {}
+
 export class CreateSequence extends Schema.TaggedClass<CreateSequence>()(`${meta.id}/action/create-sequence`, {
   input: Schema.Struct({
     name: Schema.optional(Schema.String),
@@ -56,7 +73,7 @@ export class CreateSequence extends Schema.TaggedClass<CreateSequence>()(`${meta
 export class SetCurrentChat extends Schema.TaggedClass<SetCurrentChat>()(`${meta.id}/action/set-current-chat`, {
   input: Schema.Struct({
     companionTo: EchoObjectSchema,
-    chat: Chat,
+    chat: Chat.pipe(Schema.optional),
   }),
   output: Schema.Void,
 }) {}

package/src/types/service.ts

@@ -2,12 +2,14 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import * as Schema from 'effect/Schema';
 
 import { ComputeGraph } from '@dxos/conductor';
 import { Type } from '@dxos/echo';
-import { TypedObject } from '@dxos/echo-schema';
-import { FunctionType } from '@dxos/functions';
+import { TypedObject } from '@dxos/echo/internal';
+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
 
 const ApiAuthorizationKey = Schema.Struct({
   type: Schema.Literal('api-key'),
@@ -36,7 +38,7 @@ export type ApiAuthorization = Schema.Schema.Type<typeof ApiAuthorization>;
 
 const ServiceInterfaceFunction = Schema.Struct({
   kind: Schema.Literal('function'),
-  fn: Type.Ref(FunctionType),
+  fn: Type.Ref(Function.Function),
 });
 
 const ServiceInterfaceWorkflow = Schema.Struct({
@@ -63,7 +65,13 @@ const ServiceInterfaceApi = Schema.Struct({
   authorization: Schema.optional(ApiAuthorization),
 });
 
-const ServiceInterface = Schema.Union(ServiceInterfaceFunction, ServiceInterfaceWorkflow, ServiceInterfaceApi);
+const ServiceInterface = Schema.Union(
+  // Service types.
+  ServiceInterfaceFunction,
+  ServiceInterfaceWorkflow,
+  ServiceInterfaceApi,
+);
+
 export type ServiceInterface = Schema.Schema.Type<typeof ServiceInterface>;
 
 export class ServiceType extends TypedObject({
@@ -86,15 +94,15 @@ export class ServiceType extends TypedObject({
 // Service Registry
 //
 
+export interface BaseServiceRegistry {
+  queryServices(query?: ServiceQuery): Promise<ServiceType[]>;
+}
+
 export type ServiceQuery = {
   name?: string;
   category?: string;
 };
 
-export interface BaseServiceRegistry {
-  queryServices(query?: ServiceQuery): Promise<ServiceType[]>;
-}
-
 export const categoryIcons: Record<string, string> = {
   finance: 'ph--bank--regular',
   health: 'ph--heart--regular',

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

@@ -1,29 +0,0 @@
-import {
-  TemplateEditor
-} from "./chunk-V5H5CCZA.mjs";
-import "./chunk-O4LUJEDV.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, {
-      classNames: "container-max-width"
-    }, /* @__PURE__ */ React.createElement(TemplateEditor, {
-      id: blueprint.id,
-      template: blueprint.instructions
-    }));
-  } finally {
-    _effect.f();
-  }
-};
-var BlueprintContainer_default = BlueprintContainer;
-export {
-  BlueprintContainer,
-  BlueprintContainer_default as default
-};
-//# sourceMappingURL=BlueprintContainer-OWUSKPRK.mjs.map

package/dist/lib/browser/BlueprintContainer-OWUSKPRK.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 classNames='container-max-width'>\n      <TemplateEditor id={blueprint.id} template={blueprint.instructions} />\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;MAACC,YAAW;OAC5B,sBAAA,cAACC,gBAAAA;MAAeC,IAAIL,UAAUK;MAAIC,UAAUN,UAAUO;;;;;AAG5D;AAEA,IAAA,6BAAeR;",
-  "names": ["React", "StackItem", "BlueprintContainer", "blueprint", "StackItem", "Content", "classNames", "TemplateEditor", "id", "template", "instructions"]
-}