@dxos/plugin-assistant 0.8.4-main.72ec0f3 → 0.8.4-main.7996785055

package/src/operations/definitions.ts

@@ -0,0 +1,112 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Schema from 'effect/Schema';
+
+import { Capability } from '@dxos/app-framework';
+import { Chat } from '@dxos/assistant-toolkit';
+import { Prompt } from '@dxos/blueprints';
+import { SpaceSchema } from '@dxos/client/echo';
+import { Collection, Database, DXN, Obj, Ref } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
+
+import { meta } from '../meta';
+
+const ASSISTANT_OPERATION = `${meta.id}.operation`;
+
+export const OnCreateSpace = Operation.make({
+  meta: { key: `${ASSISTANT_OPERATION}.on-create-space`, name: 'On Create Space' },
+  services: [Capability.Service],
+  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],
+  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],
+  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],
+  input: Schema.Struct({
+    companionTo: Obj.Unknown,
+    chat: Chat.Chat.pipe(Schema.optional),
+  }),
+  output: Schema.Void,
+});
+
+export const RunPromptInNewChat = Operation.make({
+  meta: { key: `${ASSISTANT_OPERATION}.run-prompt-in-new-chat`, name: 'Run Prompt In New Chat' },
+  services: [Capability.Service],
+  input: Schema.Struct({
+    db: Database.Database,
+    /** Context objects to bind to the new chat. */
+    objects: Schema.optional(Schema.Array(Obj.Unknown)),
+    /** Blueprint keys to look up and bind to the new chat. */
+    blueprints: Schema.optional(Schema.Array(Schema.String)),
+    /** Raw instructions or an existing Prompt object reference (e.g. from the prompts surface). */
+    prompt: Schema.Union(Schema.String, Ref.Ref(Prompt.Prompt)),
+    /**
+     * When true, skips opening the chat: runs the Agent prompt operation against the new chat via the compute runtime (traced).
+     */
+    background: Schema.optional(Schema.Boolean),
+  }),
+  output: Schema.Struct({
+    object: Chat.Chat,
+  }),
+});
+
+const NavigationTargetSchema = Schema.Struct({
+  path: Schema.String.annotations({ description: 'Navigation path to use with the Open operation.' }),
+  label: Schema.String.annotations({ description: 'Human-readable label.' }),
+  type: Schema.String.annotations({ description: 'Object type.' }),
+});
+
+export const ResolveNavigationTargets = Operation.make({
+  meta: {
+    key: `${ASSISTANT_OPERATION}.resolve-navigation-targets`,
+    name: 'Resolve navigation targets',
+    description:
+      'Resolve navigation targets within the application. The returned paths can be used with the Open operation. Without a query, returns pages that can be navigated to.',
+  },
+  input: Schema.Struct({
+    query: Schema.optional(
+      Schema.Struct({
+        dxn: DXN.Schema.pipe(Schema.optional),
+      }),
+    ),
+  }),
+  output: Schema.Struct({
+    targets: Schema.Array(NavigationTargetSchema),
+  }),
+  services: [Capability.Service],
+});
+
+export const BlueprintForm = Schema.Struct({
+  key: Schema.String,
+  name: Schema.String,
+  description: Schema.optional(Schema.String),
+});

package/src/operations/index.ts

@@ -0,0 +1,16 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { OperationHandlerSet } from '@dxos/operation';
+
+export * as AssistantOperation from './definitions';
+
+export const AssistantOperationHandlerSet = OperationHandlerSet.lazy(
+  () => import('./create-chat'),
+  () => import('./on-create-space'),
+  () => import('./resolve-navigation-targets'),
+  () => import('./run-prompt-in-new-chat'),
+  () => import('./set-current-chat'),
+  () => import('./update-chat-name'),
+);

package/src/operations/on-create-space.ts

@@ -0,0 +1,24 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { AgentPrompt } from '@dxos/assistant-toolkit';
+import { Operation } from '@dxos/operation';
+
+import { CreateChat, OnCreateSpace } from './definitions';
+
+const handler: Operation.WithHandler<typeof OnCreateSpace> = OnCreateSpace.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ space }) {
+      // TODO(wittjosiah): Remove once function registry is avaiable.
+      space.db.add(Operation.serialize(AgentPrompt));
+
+      const { object: chat } = yield* Operation.invoke(CreateChat, { db: space.db });
+      space.db.add(chat);
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/resolve-navigation-targets.ts

@@ -0,0 +1,26 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capability } from '@dxos/app-framework';
+import { AppCapabilities } from '@dxos/app-toolkit';
+import { Operation } from '@dxos/operation';
+
+import { ResolveNavigationTargets } from './definitions';
+
+export default ResolveNavigationTargets.pipe(
+  Operation.withHandler(
+    Effect.fn(function* ({ query }) {
+      const capabilities = yield* Capability.Service;
+
+      // Delegate to contributed resolvers.
+      const resolvers = capabilities.getAll(AppCapabilities.NavigationTargetResolver);
+      const results = yield* Effect.forEach(resolvers, (resolver) =>
+        resolver(query as AppCapabilities.NavigationQuery).pipe(Effect.catchAll(() => Effect.succeed([]))),
+      );
+      return { targets: results.flat() };
+    }),
+  ),
+);

package/src/operations/run-prompt-in-new-chat.ts

@@ -0,0 +1,107 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { getObjectPathFromObject, LayoutOperation } from '@dxos/app-toolkit';
+import { AiContextBinder } from '@dxos/assistant';
+import { AgentPrompt } from '@dxos/assistant-toolkit';
+import { Blueprint, Prompt, Template } from '@dxos/blueprints';
+import { type Queue } from '@dxos/client/echo';
+import { Database, Filter, Obj, Ref } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { log } from '@dxos/log';
+import { Operation } from '@dxos/operation';
+import { AutomationCapabilities, invokeFunctionWithTracing } from '@dxos/plugin-automation';
+import { Text } from '@dxos/schema';
+import { type Message } from '@dxos/types';
+
+import { AssistantCapabilities } from '../types';
+import { CreateChat, RunPromptInNewChat } from './definitions';
+
+const handler: Operation.WithHandler<typeof RunPromptInNewChat> = RunPromptInNewChat.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(
+      function* ({ db, prompt, objects, blueprints, background }) {
+        const registry = yield* Capability.get(Capabilities.AtomRegistry);
+        const { object: chat } = yield* Operation.invoke(CreateChat, { db });
+
+        if ((objects && objects.length > 0) || (blueprints && blueprints.length > 0)) {
+          const queue = chat.queue.target as Queue<Message.Message>;
+          const binder = new AiContextBinder({ queue, registry });
+          yield* Effect.promise(() =>
+            binder.use(async (b: AiContextBinder) => {
+              const bindingProps: Parameters<AiContextBinder['bind']>[0] = {};
+
+              if (objects && objects.length > 0) {
+                bindingProps.objects = objects.map((obj) => Ref.make(obj));
+              }
+
+              if (blueprints && blueprints.length > 0) {
+                const allBlueprints = await db.query(Filter.type(Blueprint.Blueprint)).run();
+                const matchedBlueprints = allBlueprints.filter(
+                  (blueprint) => blueprint.key && blueprints.includes(blueprint.key),
+                );
+                if (matchedBlueprints.length > 0) {
+                  bindingProps.blueprints = matchedBlueprints.map((blueprint) => Ref.make(blueprint));
+                }
+              }
+
+              await b.bind(bindingProps);
+            }),
+          );
+        }
+
+        if (background) {
+          const promptRef =
+            typeof prompt === 'string'
+              ? Ref.make(
+                  Prompt.make({
+                    instructions: prompt,
+                    blueprints: [],
+                    context: [],
+                  }),
+                )
+              : prompt;
+          yield* Database.flush();
+          const computeRuntime = yield* Capability.get(AutomationCapabilities.ComputeRuntime);
+          const runtime = yield* computeRuntime.getRuntime(db.spaceId).runtimeEffect;
+          yield* invokeFunctionWithTracing(AgentPrompt, {
+            prompt: promptRef,
+            input: {},
+            chat: Ref.make(chat),
+          }).pipe(
+            Effect.provide(runtime),
+            Effect.catchAll((error) => {
+              log.catch(error);
+              return Effect.void;
+            }),
+          );
+          return { object: chat };
+        }
+
+        const chatPath = getObjectPathFromObject(chat);
+        const pendingPromptText =
+          typeof prompt === 'string'
+            ? prompt
+            : yield* Effect.gen(function* () {
+                const promptObj = yield* Effect.promise(() => prompt.load());
+                const source = yield* Effect.promise(() => promptObj.instructions.source.load());
+                invariant(Obj.instanceOf(Text.Text, source), 'Prompt template source must be Text.');
+                return Template.process(source.content ?? '');
+              });
+        yield* Capabilities.updateAtomValue(AssistantCapabilities.State, (current) => ({
+          ...current,
+          pendingPrompts: { ...current.pendingPrompts, [chatPath]: pendingPromptText },
+        }));
+        yield* Operation.invoke(LayoutOperation.Open, { subject: [chatPath] });
+        return { object: chat };
+      },
+      (effect, { db }) => effect.pipe(Effect.provide(Database.layer(db))),
+    ),
+  ),
+);
+
+export default handler;

package/src/operations/set-current-chat.ts

@@ -0,0 +1,27 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities } from '@dxos/app-framework';
+import { Obj } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
+
+import { AssistantCapabilities } from '../types';
+import { SetCurrentChat } from './definitions';
+
+const handler: Operation.WithHandler<typeof SetCurrentChat> = SetCurrentChat.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ companionTo, chat }) {
+      const companionToId = Obj.getDXN(companionTo).toString();
+      const chatId = chat && Obj.getDXN(chat).toString();
+      yield* Capabilities.updateAtomValue(AssistantCapabilities.State, (current) => ({
+        ...current,
+        currentChat: { ...current.currentChat, [companionToId]: chatId },
+      }));
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/update-chat-name.ts

@@ -0,0 +1,43 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AiConversation } from '@dxos/assistant';
+import { type Queue } from '@dxos/client/echo';
+import { Obj } from '@dxos/echo';
+import { TracingService } from '@dxos/functions';
+import { Operation } from '@dxos/operation';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { type Message } from '@dxos/types';
+
+import { type AiChatServices, updateName } from '../processor';
+import { UpdateChatName } from './definitions';
+
+const handler: Operation.WithHandler<typeof UpdateChatName> = UpdateChatName.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ chat }) {
+      const registry = yield* Capability.get(Capabilities.AtomRegistry);
+      const db = Obj.getDatabase(chat);
+      const queue = chat.queue.target as Queue<Message.Message>;
+      if (!db || !queue) {
+        return;
+      }
+
+      const runtimeResolver = yield* Capability.get(AutomationCapabilities.ComputeRuntime);
+      const runtime = yield* Effect.promise(() =>
+        runtimeResolver
+          .getRuntime(db.spaceId)
+          .runPromise(Effect.runtime<AiChatServices>().pipe(Effect.provide(TracingService.layerNoop))),
+      );
+
+      yield* Effect.promise(() =>
+        new AiConversation({ queue, registry }).use(async (conversation) => updateName(runtime, conversation, chat)),
+      );
+    }),
+  ),
+);
+
+export default handler;

package/src/processor/processor.test.ts

@@ -10,11 +10,14 @@ import * as Layer from 'effect/Layer';
 import * as Schema from 'effect/Schema';
 
 import { AiService } from '@dxos/ai';
+import { GenericToolkit } from '@dxos/ai';
 import { AiServiceTestingPreset } from '@dxos/ai/testing';
-import { AiConversation, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
-import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
+import { AiConversation, ToolExecutionServices } from '@dxos/assistant';
+import { acquireReleaseResource } from '@dxos/effect';
+import { TestHelpers } from '@dxos/effect/testing';
 import { CredentialsService, QueueService, TracingService } from '@dxos/functions';
 import { FunctionInvocationServiceLayerTestMocked, TestDatabaseLayer } from '@dxos/functions-runtime/testing';
+import { OperationHandlerSet } from '@dxos/operation';
 import { type Message } from '@dxos/types';
 
 import { AiChatProcessor, type AiChatServices } from './processor';
@@ -27,9 +30,6 @@ const TestToolkit = Toolkit.make(
   }),
 );
 
-// TODO(burdon): Create minimal toolkit.
-const toolkit = Toolkit.merge(TestToolkit) as Toolkit.Toolkit<any>;
-
 // TODO(burdon): Explain structure.
 const TestServicesLayer = Layer.mergeAll(
   TracingService.layerNoop,
@@ -39,15 +39,20 @@ const TestServicesLayer = Layer.mergeAll(
     // types: [],
   }),
   // CredentialsService.configuredLayer([{ service: 'exa.ai', apiKey: EXA_API_KEY }]),
-  FunctionInvocationServiceLayerTestMocked({ functions: [] }).pipe(Layer.provideMerge(TracingService.layerNoop)),
+  FunctionInvocationServiceLayerTestMocked({ functions: OperationHandlerSet.empty }).pipe(
+    Layer.provideMerge(TracingService.layerNoop),
+  ),
 );
 
 const TestLayer: Layer.Layer<AiChatServices, never, never> = Layer.mergeAll(
   AiService.model('@anthropic/claude-opus-4-0'),
-  makeToolResolverFromFunctions([], toolkit),
-  makeToolExecutionServiceFromFunctions(toolkit, toolkit.toLayer({}) as any),
+  ToolExecutionServices,
   CredentialsService.layerFromDatabase(),
-).pipe(Layer.provideMerge(TestServicesLayer), Layer.orDie);
+).pipe(
+  Layer.provideMerge(GenericToolkit.providerLayer(GenericToolkit.make(TestToolkit, TestToolkit.toLayer({} as any)))),
+  Layer.provideMerge(TestServicesLayer),
+  Layer.orDie,
+);
 
 // TODO(burdon): Create actual test with mock LLM.
 describe('Chat processor', () => {
@@ -57,7 +62,7 @@ describe('Chat processor', () => {
       function* ({ expect }) {
         const services = yield* Effect.runtime<AiChatServices>();
         const queue = yield* QueueService.createQueue<Message.Message>();
-        const conversation = yield* acquireReleaseResource(() => new AiConversation(queue));
+        const conversation = yield* acquireReleaseResource(() => new AiConversation({ queue }));
         const processor = new AiChatProcessor(conversation, async () => services);
         const result = yield* Effect.promise(() => processor.request({ message: 'Hello' }));
         void processor.cancel();