@dxos/plugin-assistant 0.8.4-main.422d1c7879 → 0.8.4-main.4f23b4e393

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

@@ -6,56 +6,58 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Chat } from '@dxos/assistant-toolkit';
+import { Operation } from '@dxos/compute';
 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;
-        // Cache the persisted chat so the graph connector can resolve it immediately
-        // via the cache fallback, without waiting for AtomObj.make(ref) to hydrate.
+
+import { AssistantCapabilities, AssistantOperation } from '#types';
+
+const handler: Operation.WithHandler<typeof AssistantOperation.EnsureCompanionChat> =
+  AssistantOperation.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;
+          // Cache the persisted chat so the graph connector can resolve it immediately
+          // via the cache fallback, without waiting for AtomObj.make(ref) to hydrate.
+          yield* Capabilities.updateAtomValue(AssistantCapabilities.CompanionChatCache, (current) => ({
+            ...current,
+            [companionDXN]: chat,
+          }));
+          yield* Effect.promise(() =>
+            operationInvoker.invokePromise(AssistantOperation.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(AssistantOperation.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,
+          [companionDXN]: chat,
         }));
-        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 };
-    }),
-  ),
-);
+        return { chat, persisted: false };
+      }),
+    ),
+  );
 
 export default handler;

package/src/operations/index.ts

@@ -2,9 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { OperationHandlerSet } from '@dxos/operation';
-
-export * as AssistantOperation from './definitions';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const AssistantOperationHandlerSet = OperationHandlerSet.lazy(
   () => import('./create-chat'),

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

@@ -5,17 +5,17 @@
 import * as Effect from 'effect/Effect';
 
 import { AgentPrompt } from '@dxos/assistant-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
-import { CreateChat, OnCreateSpace } from './definitions';
+import { AssistantOperation } from '#types';
 
-const handler: Operation.WithHandler<typeof OnCreateSpace> = OnCreateSpace.pipe(
+const handler: Operation.WithHandler<typeof AssistantOperation.OnCreateSpace> = AssistantOperation.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 });
+      const { object: chat } = yield* Operation.invoke(AssistantOperation.CreateChat, { db: space.db });
       space.db.add(chat);
     }),
   ),

package/src/operations/prompt.test.ts

@@ -7,29 +7,28 @@ import * as Effect from 'effect/Effect';
 import { describe, test } from 'vitest';
 
 import { AgentPrompt, Chat } from '@dxos/assistant-toolkit';
-import { Prompt } from '@dxos/blueprints';
+import { Routine, Operation } from '@dxos/compute';
 import { Database, Feed, Filter, Ref } from '@dxos/echo';
 import { runAndForwardErrors } from '@dxos/effect';
-import { TestHelpers } from '@dxos/effect/testing';
 import { ObjectId } from '@dxos/keys';
-import { Operation } from '@dxos/operation';
-import { AutomationPlugin } from '@dxos/plugin-automation/cli';
-import { AutomationCapabilities } from '@dxos/plugin-automation/types';
-import { ClientPlugin } from '@dxos/plugin-client/cli';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { AutomationPlugin } from '@dxos/plugin-automation/plugin';
+import { ClientCapabilities } from '@dxos/plugin-client';
+import { ClientPlugin } from '@dxos/plugin-client/plugin';
 import { initializeIdentity } from '@dxos/plugin-client/testing';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
 import { createComposerTestApp } from '@dxos/plugin-testing/harness';
 import { Message } from '@dxos/types';
 
-import { AssistantPlugin } from '../cli';
+import { AssistantPlugin } from '#plugin';
 
 ObjectId.dangerouslyDisableRandomness();
 
 describe('Agent prompt (composer plugin harness)', () => {
   // Hits AutomationPlugin compute runtime (plugin handlers, AiServiceLayer, blueprints).
   // Requires reachable edge AI (see repo DX_EDGE_AI_SERVICE_URL); not memoized like AssistantTestLayer tests.
-  test.runIf(TestHelpers.tagEnabled('llm'))(
+  test(
     'chat mode appends assistant messages to the chat queue',
+    { tags: ['llm'], timeout: 60_000 },
     async ({ expect }) => {
       await using harness = await createComposerTestApp({
         plugins: [ClientPlugin({}), AssistantPlugin(), AutomationPlugin()],
@@ -50,7 +49,7 @@ describe('Agent prompt (composer plugin harness)', () => {
 
           const chat = yield* Database.add(Chat.make({ feed: Ref.make(feed) }));
           const prompt = yield* Database.add(
-            Prompt.make({
+            Routine.make({
               name: 'chat-mode-test',
               instructions: 'Reply with a single word: ack.',
               blueprints: [],
@@ -74,6 +73,5 @@ describe('Agent prompt (composer plugin harness)', () => {
         }),
       );
     },
-    60_000,
   );
 });

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

@@ -6,11 +6,11 @@ import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities } from '@dxos/app-toolkit';
-import { Operation } from '@dxos/operation';
+import { Operation } from '@dxos/compute';
 
-import { ResolveNavigationTargets } from './definitions';
+import { AssistantOperation } from '#types';
 
-export default ResolveNavigationTargets.pipe(
+export default AssistantOperation.ResolveNavigationTargets.pipe(
   Operation.withHandler(
     Effect.fn(function* ({ query }) {
       const capabilities = yield* Capability.Service;

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

@@ -6,108 +6,107 @@ 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 { AiContext } from '@dxos/assistant';
 import { AgentPrompt } from '@dxos/assistant-toolkit';
-import { Blueprint, Prompt, Template } from '@dxos/blueprints';
+import { Blueprint, Routine, Template, Operation } from '@dxos/compute';
 import { Database, Feed, Filter, Obj, Ref } from '@dxos/echo';
 import { createFeedServiceLayer } from '@dxos/echo-db';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
-import { Operation } from '@dxos/operation';
-import { AutomationCapabilities } from '@dxos/plugin-automation/types';
-import { ClientCapabilities } from '@dxos/plugin-client/types';
+import { AutomationCapabilities } from '@dxos/plugin-automation';
+import { ClientCapabilities } from '@dxos/plugin-client';
 import { Text } from '@dxos/schema';
 
-import { AssistantCapabilities } from '../types';
-import { CreateChat, RunPromptInNewChat } from './definitions';
+import { AssistantCapabilities, AssistantOperation } from '#types';
 
-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 });
+const handler: Operation.WithHandler<typeof AssistantOperation.RunPromptInNewChat> =
+  AssistantOperation.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(AssistantOperation.CreateChat, { db });
 
-        if ((objects && objects.length > 0) || (blueprints && blueprints.length > 0)) {
-          const feedTarget = chat.feed.target;
-          invariant(feedTarget, 'Chat feed not found.');
-          const client = yield* Capability.get(ClientCapabilities.Client);
-          const space = client.spaces.get(db.spaceId);
-          invariant(space, 'Space not found.');
-          const feedServiceLayer = createFeedServiceLayer(space.queues);
-          const runtime = yield* Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer));
-          const binder = new AiContextBinder({ feed: feedTarget, runtime, registry });
-          yield* Effect.promise(() =>
-            binder.use(async (b: AiContextBinder) => {
-              const bindingProps: Parameters<AiContextBinder['bind']>[0] = {};
+          if ((objects && objects.length > 0) || (blueprints && blueprints.length > 0)) {
+            const feedTarget = chat.feed.target;
+            invariant(feedTarget, 'Chat feed not found.');
+            const client = yield* Capability.get(ClientCapabilities.Client);
+            const space = client.spaces.get(db.spaceId);
+            invariant(space, 'Space not found.');
+            const feedServiceLayer = createFeedServiceLayer(space.queues);
+            const runtime = yield* Effect.runtime<Feed.FeedService>().pipe(Effect.provide(feedServiceLayer));
+            const binder = new AiContext.Binder({ feed: feedTarget, runtime, registry });
+            yield* Effect.promise(() =>
+              binder.use(async (b: AiContext.Binder) => {
+                const bindingProps: Parameters<AiContext.Binder['bind']>[0] = {};
 
-              if (objects && objects.length > 0) {
-                bindingProps.objects = objects.map((obj) => Ref.make(obj));
-              }
+                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));
+                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);
-            }),
-          );
-        }
+                await b.bind(bindingProps);
+              }),
+            );
+          }
+
+          if (background) {
+            const promptRef =
+              typeof prompt === 'string'
+                ? Ref.make(
+                    Routine.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* Operation.invoke(AgentPrompt, {
+              prompt: promptRef,
+              input: {},
+              chat: Ref.make(chat),
+            }).pipe(
+              Effect.provide(runtime),
+              Effect.catchAll((error) => {
+                log.catch(error);
+                return Effect.void;
+              }),
+            );
+            return { object: chat };
+          }
 
-        if (background) {
-          const promptRef =
+          const chatPath = getObjectPathFromObject(chat);
+          const pendingPromptText =
             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* Operation.invoke(AgentPrompt, {
-            prompt: promptRef,
-            input: {},
-            chat: Ref.make(chat),
-          }).pipe(
-            Effect.provide(runtime),
-            Effect.catchAll((error) => {
-              log.catch(error);
-              return Effect.void;
-            }),
-          );
+              ? 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 };
-        }
-
-        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))),
+        },
+        (effect, { db }) => effect.pipe(Effect.provide(Database.layer(db))),
+      ),
     ),
-  ),
-);
+  );
 
 export default handler;

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

@@ -5,13 +5,12 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
+import { Operation } from '@dxos/compute';
 import { Obj } from '@dxos/echo';
-import { Operation } from '@dxos/operation';
 
-import { AssistantCapabilities } from '../types';
-import { CreateChat, SetCurrentChat } from './definitions';
+import { AssistantCapabilities, AssistantOperation } from '#types';
 
-const handler: Operation.WithHandler<typeof SetCurrentChat> = SetCurrentChat.pipe(
+const handler: Operation.WithHandler<typeof AssistantOperation.SetCurrentChat> = AssistantOperation.SetCurrentChat.pipe(
   Operation.withHandler(
     Effect.fnUntraced(function* ({ companionTo, chat }) {
       const companionToId = Obj.getDXN(companionTo).toString();
@@ -29,7 +28,7 @@ const handler: Operation.WithHandler<typeof SetCurrentChat> = SetCurrentChat.pip
         const db = Obj.getDatabase(companionTo);
         if (db) {
           const { data } = yield* Effect.promise(() =>
-            operationInvoker.invokePromise(CreateChat, { db, addToSpace: false }),
+            operationInvoker.invokePromise(AssistantOperation.CreateChat, { db, addToSpace: false }),
           );
           if (data?.object) {
             yield* Capabilities.updateAtomValue(AssistantCapabilities.CompanionChatCache, (current) => ({

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

@@ -7,15 +7,15 @@ import * as Prompt from '@effect/ai/Prompt';
 import * as Effect from 'effect/Effect';
 
 import { AiPreprocessor, AiService } from '@dxos/ai';
+import { Operation } from '@dxos/compute';
 import { Database, Feed, Filter, Obj } from '@dxos/echo';
 import { log } from '@dxos/log';
-import { Operation } from '@dxos/operation';
 import { Message } from '@dxos/types';
 import { trim } from '@dxos/util';
 
-import { UpdateChatName } from './definitions';
+import { AssistantOperation } from '#types';
 
-const handler: Operation.WithHandler<typeof UpdateChatName> = UpdateChatName.pipe(
+const handler: Operation.WithHandler<typeof AssistantOperation.UpdateChatName> = AssistantOperation.UpdateChatName.pipe(
   Operation.withHandler(
     Effect.fnUntraced(
       function* ({ chat }) {
@@ -48,7 +48,7 @@ const handler: Operation.WithHandler<typeof UpdateChatName> = UpdateChatName.pip
 
         const newName = response.text.replaceAll(/[^a-zA-Z0-9\s]/g, '').trim();
 
-        Obj.change(chat, (chat) => {
+        Obj.update(chat, (chat) => {
           chat.name = newName;
         });
         log.info('chat name updated', { chat, newName: chat.name });

package/src/plugin.ts

@@ -0,0 +1,11 @@
+//
+// Copyright 2023 DXOS.org
+//
+
+import { Plugin } from '@dxos/app-framework';
+
+import { meta } from './meta';
+
+export const AssistantPlugin = Plugin.lazy(meta, () => import('#plugin'));
+
+export { AssistantOperationHandlerSet } from './operations';

package/src/processor/processor.test.ts

@@ -8,10 +8,10 @@ import * as ManagedRuntime from 'effect/ManagedRuntime';
 
 import { AiSession } from '@dxos/assistant';
 import { Chat } from '@dxos/assistant-toolkit';
-import { AssistantTestLayer } from '@dxos/assistant/testing';
 import { Database, Feed } from '@dxos/echo';
 import { acquireReleaseResource } from '@dxos/effect';
 import { TestHelpers } from '@dxos/effect/testing';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
 
 import { AiChatProcessor } from './processor';
 
@@ -25,7 +25,7 @@ describe('Chat processor', () => {
         const feed = Feed.make();
         yield* Database.add(feed);
         const runtime = yield* Effect.runtime<Feed.FeedService>();
-        const session = yield* acquireReleaseResource(() => new AiSession({ feed, runtime }));
+        const session = yield* acquireReleaseResource(() => new AiSession.Session({ feed, runtime }));
         const managedRuntime = ManagedRuntime.make(
           Effect.runSync(Effect.map(Effect.context<never>(), () => undefined as any)) as any,
         );