@dxos/plugin-assistant 0.8.4-main.ae835ea → 0.8.4-main.bcb3aa67d6

package/src/operations/definitions.ts

@@ -0,0 +1,126 @@
+//
+// 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 EnsureCompanionChat = Operation.make({
+  meta: { key: `${ASSISTANT_OPERATION}.ensure-companion-chat`, name: 'Ensure Companion Chat' },
+  services: [Capability.Service],
+  input: Schema.Struct({
+    db: Database.Database,
+    companionTo: Obj.Unknown,
+  }),
+  output: Schema.Struct({
+    chat: Chat.Chat,
+    /** Whether the returned chat was already persisted in the space. */
+    persisted: Schema.Boolean,
+  }),
+});
+
+export const BlueprintForm = Schema.Struct({
+  key: Schema.String,
+  name: Schema.String,
+  description: Schema.optional(Schema.String),
+});

package/src/operations/ensure-companion-chat.ts

@@ -0,0 +1,59 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { Chat } from '@dxos/assistant-toolkit';
+import { Filter, Obj, Query } from '@dxos/echo';
+import { Operation } from '@dxos/operation';
+
+import { AssistantCapabilities } from '../types';
+import { CreateChat, EnsureCompanionChat, SetCurrentChat } from './definitions';
+
+const handler: Operation.WithHandler<typeof EnsureCompanionChat> = EnsureCompanionChat.pipe(
+  Operation.withHandler(
+    Effect.fnUntraced(function* ({ db, companionTo }) {
+      const operationInvoker = yield* Capability.get(Capabilities.OperationInvoker);
+      const companionDxn = Obj.getDXN(companionTo).toString();
+
+      // 1. Look for an existing persisted companion chat in the space.
+      const existingChats = yield* Effect.promise(() =>
+        db.query(Query.select(Filter.id(companionTo.id)).targetOf(Chat.CompanionTo).source()).run(),
+      );
+      if (existingChats.length > 0) {
+        const chat = existingChats.at(-1) as Chat.Chat;
+        yield* Capabilities.updateAtomValue(AssistantCapabilities.CompanionChatCache, (current) => {
+          const { [companionDxn]: _, ...rest } = current;
+          return rest;
+        });
+        yield* Effect.promise(() => operationInvoker.invokePromise(SetCurrentChat, { companionTo, chat }));
+        return { chat, persisted: true };
+      }
+
+      // 2. Return cached transient chat for this companion if present.
+      const cache = yield* Capabilities.getAtomValue(AssistantCapabilities.CompanionChatCache);
+      const cached = cache[companionDxn] as Chat.Chat | undefined;
+      if (cached) {
+        return { chat: cached, persisted: false };
+      }
+
+      // 3. Create a new transient chat, cache it, and return it without persisting.
+      const { data } = yield* Effect.promise(() =>
+        operationInvoker.invokePromise(CreateChat, { db, addToSpace: false }),
+      );
+      if (!data?.object) {
+        return yield* Effect.fail(new Error('CreateChat did not return a chat object'));
+      }
+      const chat = data.object;
+      yield* Capabilities.updateAtomValue(AssistantCapabilities.CompanionChatCache, (current) => ({
+        ...current,
+        [companionDxn]: chat,
+      }));
+      return { chat, persisted: false };
+    }),
+  ),
+);
+
+export default handler;

package/src/operations/index.ts

@@ -0,0 +1,17 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import { OperationHandlerSet } from '@dxos/operation';
+
+export * as AssistantOperation from './definitions';
+
+export const AssistantOperationHandlerSet = OperationHandlerSet.lazy(
+  () => import('./create-chat'),
+  () => import('./ensure-companion-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,114 @@
+//
+// 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 { Database, Feed, Filter, Obj, Ref } from '@dxos/echo';
+import { invariant } from '@dxos/invariant';
+import { log } from '@dxos/log';
+import { Operation } from '@dxos/operation';
+import { invokeFunctionWithTracing } from '@dxos/plugin-automation/hooks';
+import { AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { Text } from '@dxos/schema';
+
+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 feedTarget = chat.feed.target;
+          invariant(feedTarget, 'Chat feed not found.');
+          const queueDxn = Feed.getQueueDxn(feedTarget);
+          invariant(queueDxn, 'Feed queue DXN not found.');
+          const client = yield* Capability.get(ClientCapabilities.Client);
+          const space = client.spaces.get(db.spaceId);
+          invariant(space, 'Space not found.');
+          const queue = space.queues.get(queueDxn);
+          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,35 @@
+//
+// 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 },
+      }));
+
+      // When clearing the selection (new thread), evict the cached transient chat so a fresh one is created.
+      if (!chat) {
+        yield* Capabilities.updateAtomValue(AssistantCapabilities.CompanionChatCache, (current) => {
+          const { [companionToId]: _, ...rest } = current;
+          return rest;
+        });
+      }
+    }),
+  ),
+);
+
+export default handler;

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

@@ -0,0 +1,55 @@
+//
+// Copyright 2025 DXOS.org
+//
+
+import * as Effect from 'effect/Effect';
+
+import { Capabilities, Capability } from '@dxos/app-framework';
+import { AiConversation } from '@dxos/assistant';
+import { Feed, Obj } from '@dxos/echo';
+import { Trace, TracingService } from '@dxos/functions';
+import { invariant } from '@dxos/invariant';
+import { Operation } from '@dxos/operation';
+import { AutomationCapabilities } from '@dxos/plugin-automation/types';
+import { ClientCapabilities } from '@dxos/plugin-client/types';
+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 feedTarget = chat.feed.target;
+      if (!db || !feedTarget) {
+        return;
+      }
+      const queueDxn = Feed.getQueueDxn(feedTarget);
+      invariant(queueDxn, 'Feed queue DXN not found.');
+      const client = yield* Capability.get(ClientCapabilities.Client);
+      const space = client.spaces.get(db.spaceId);
+      invariant(space, 'Space not found.');
+      const queue = space.queues.get<Message.Message>(queueDxn);
+
+      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),
+              Effect.provide(Trace.writerLayerNoop),
+            ),
+          ),
+      );
+
+      yield* Effect.promise(() =>
+        new AiConversation({ queue, registry }).use(async (conversation) => updateName(runtime, conversation, chat)),
+      );
+    }),
+  ),
+);
+
+export default handler;

package/src/processor/presets.ts

@@ -43,7 +43,7 @@ export const AiServicePresets: AiServicePreset[] = [
   },
   {
     provider: 'lm-studio' as const,
-    model: '@mlx-community/llama-3.2-3b-instruct' as const,
+    model: '@meta/llama-3.2-3b-instruct' as const,
   },
   {
     model: 'deepseek-r1:latest' as const,

package/src/processor/processor.test.ts

@@ -2,80 +2,38 @@
 // Copyright 2025 DXOS.org
 //
 
-import * as Tool from '@effect/ai/Tool';
-import * as Toolkit from '@effect/ai/Toolkit';
 import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
-import * as Layer from 'effect/Layer';
-import * as Schema from 'effect/Schema';
+import * as ManagedRuntime from 'effect/ManagedRuntime';
 
-import { AiService } from '@dxos/ai';
-import { AiServiceTestingPreset } from '@dxos/ai/testing';
-import { AiConversation, makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from '@dxos/assistant';
-import { TestHelpers, acquireReleaseResource } from '@dxos/effect';
-import {
-  ComputeEventLogger,
-  CredentialsService,
-  FunctionInvocationService,
-  QueueService,
-  TracingService,
-} from '@dxos/functions';
-import { TestDatabaseLayer } from '@dxos/functions/testing';
-import { type DataType } from '@dxos/schema';
+import { AiConversation } from '@dxos/assistant';
+import { AssistantTestLayer } from '@dxos/assistant/testing';
+import { Feed } from '@dxos/echo';
+import { acquireReleaseResource } from '@dxos/effect';
+import { TestHelpers } from '@dxos/effect/testing';
+import { QueueService } from '@dxos/functions';
+import { type Message } from '@dxos/types';
 
-import { AiChatProcessor, type AiChatServices } from './processor';
+import { AiChatProcessor } from './processor';
 
-const TestToolkit = Toolkit.make(
-  Tool.make('random', {
-    description: 'Random number generator',
-    parameters: {},
-    success: Schema.Number,
-  }),
-);
-
-// TODO(burdon): Create minimal toolkit.
-const toolkit = Toolkit.merge(TestToolkit) as Toolkit.Toolkit<any>;
-
-// TODO(burdon): Explain structure.
-const TestServicesLayer = Layer.mergeAll(
-  TracingService.layerNoop,
-  AiServiceTestingPreset('direct'),
-  TestDatabaseLayer({
-    // indexing: { vector: true },
-    // types: [],
-  }),
-  // CredentialsService.configuredLayer([{ service: 'exa.ai', apiKey: EXA_API_KEY }]),
-  FunctionInvocationService.layerTestMocked({ functions: [] }).pipe(
-    Layer.provideMerge(ComputeEventLogger.layerFromTracing),
-    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),
-  CredentialsService.layerFromDatabase(),
-  ComputeEventLogger.layerFromTracing,
-).pipe(Layer.provideMerge(TestServicesLayer), Layer.orDie);
-
-// TODO(burdon): Create actual test with mock LLM.
 describe('Chat processor', () => {
   it.scoped(
     'basic',
     Effect.fn(
       function* ({ expect }) {
-        const services = yield* Effect.runtime<AiChatServices>();
-        const queue = yield* QueueService.createQueue<DataType.Message>();
-        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();
-        expect(processor.active).to.be.false;
-        expect(result).to.exist;
+        const queue = yield* QueueService.createQueue<Message.Message>();
+        const conversation = yield* acquireReleaseResource(() => new AiConversation({ queue }));
+        const runtime = yield* Effect.runtime<any>();
+        const managedRuntime = ManagedRuntime.make(
+          Effect.runSync(Effect.map(Effect.context<never>(), () => undefined as any)) as any,
+        );
+        const feed = Feed.make();
+        const processor = new AiChatProcessor(conversation, managedRuntime as any, feed);
+        expect(processor).toBeDefined();
+        expect(processor.active).toBeDefined();
       },
-      Effect.provide(TestLayer),
-      TestHelpers.taggedTest('llm'),
+      Effect.provide(AssistantTestLayer({ tracing: 'noop' })),
+      TestHelpers.provideTestContext,
     ),
   );
 });