@dxos/plugin-assistant 0.9.1-staging.ee54ba693a → 0.11.0

package/dx.config.ts

@@ -34,5 +34,6 @@ export default Config2.make({
     icon: { key: 'ph--sparkle--regular', hue: 'sky' },
     source: 'https://github.com/dxos/dxos/tree/main/packages/plugins/plugin-assistant',
     spec: 'PLUGIN.mdl',
+    tags: ['alpha'],
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.9.1-staging.ee54ba693a",
+  "version": "0.11.0",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -16,42 +16,42 @@
     "#skills": {
       "source": "./src/skills/index.ts",
       "types": "./dist/types/src/skills/index.d.ts",
-      "default": "./dist/lib/neutral/skills/index.mjs"
+      "default": "./dist/lib/skills.mjs"
     },
     "#capabilities": {
       "source": "./src/capabilities/index.ts",
       "types": "./dist/types/src/capabilities/index.d.ts",
-      "default": "./dist/lib/neutral/capabilities/index.mjs"
+      "default": "./dist/lib/capabilities.mjs"
     },
     "#components": {
       "source": "./src/components/index.ts",
       "types": "./dist/types/src/components/index.d.ts",
-      "default": "./dist/lib/neutral/components/index.mjs"
+      "default": "./dist/lib/components.mjs"
     },
     "#containers": {
       "source": "./src/containers/index.ts",
       "types": "./dist/types/src/containers/index.d.ts",
-      "default": "./dist/lib/neutral/containers/index.mjs"
+      "default": "./dist/lib/containers.mjs"
     },
     "#execution-graph": {
       "source": "./src/execution-graph/index.ts",
       "types": "./dist/types/src/execution-graph/index.d.ts",
-      "default": "./dist/lib/neutral/execution-graph/index.mjs"
+      "default": "./dist/lib/execution-graph.mjs"
     },
     "#hooks": {
       "source": "./src/hooks/index.ts",
       "types": "./dist/types/src/hooks/index.d.ts",
-      "default": "./dist/lib/neutral/hooks/index.mjs"
+      "default": "./dist/lib/hooks.mjs"
     },
     "#meta": {
       "source": "./src/meta.ts",
       "types": "./dist/types/src/meta.d.ts",
-      "default": "./dist/lib/neutral/meta.mjs"
+      "default": "./dist/lib/meta.mjs"
     },
     "#operations": {
       "source": "./src/operations/index.ts",
       "types": "./dist/types/src/operations/index.d.ts",
-      "default": "./dist/lib/neutral/operations/index.mjs"
+      "default": "./dist/lib/operations.mjs"
     },
     "#plugin": {
       "source": {
@@ -60,72 +60,68 @@
         "default": "./src/AssistantPlugin.ts"
       },
       "types": "./dist/types/src/AssistantPlugin.d.ts",
-      "workerd": "./dist/lib/neutral/AssistantPlugin.workerd.mjs",
-      "node": "./dist/lib/neutral/AssistantPlugin.node.mjs",
-      "default": "./dist/lib/neutral/AssistantPlugin.mjs"
+      "workerd": "./dist/lib/AssistantPlugin.workerd.mjs",
+      "node": "./dist/lib/AssistantPlugin.node.mjs",
+      "default": "./dist/lib/AssistantPlugin.mjs"
     },
     "#testing": "./src/testing/index.ts",
     "#translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "default": "./dist/lib/neutral/translations.mjs"
+      "default": "./dist/lib/translations.mjs"
     },
     "#types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/neutral/types/index.mjs"
+      "default": "./dist/lib/types.mjs"
     }
   },
   "exports": {
     ".": {
       "source": "./src/index.ts",
       "types": "./dist/types/src/index.d.ts",
-      "default": "./dist/lib/neutral/index.mjs"
+      "import": "./dist/lib/index.mjs"
     },
     "./assets/PLUGIN.mdl": "./PLUGIN.mdl",
     "./skills": {
       "source": "./src/skills/index.ts",
       "types": "./dist/types/src/skills/index.d.ts",
-      "default": "./dist/lib/neutral/skills/index.mjs"
+      "import": "./dist/lib/skills.mjs"
     },
     "./components": {
       "source": "./src/components/index.ts",
       "types": "./dist/types/src/components/index.d.ts",
-      "default": "./dist/lib/neutral/components/index.mjs"
+      "import": "./dist/lib/components.mjs"
     },
     "./extensions": {
       "source": "./src/extensions/index.ts",
       "types": "./dist/types/src/extensions/index.d.ts",
-      "default": "./dist/lib/neutral/extensions/index.mjs"
+      "import": "./dist/lib/extensions.mjs"
     },
     "./hooks": {
       "source": "./src/hooks/index.ts",
       "types": "./dist/types/src/hooks/index.d.ts",
-      "default": "./dist/lib/neutral/hooks/index.mjs"
+      "import": "./dist/lib/hooks.mjs"
     },
     "./plugin": {
-      "source": {
-        "workerd": "./src/plugin.workerd.ts",
-        "default": "./src/plugin.ts"
-      },
+      "source": "./src/plugin.ts",
       "types": "./dist/types/src/plugin.d.ts",
-      "workerd": "./dist/lib/neutral/plugin.workerd.mjs",
-      "default": "./dist/lib/neutral/plugin.mjs"
+      "import": "./dist/lib/plugin.mjs"
     },
     "./testing": {
       "source": "./src/testing.ts",
       "types": "./dist/types/src/testing.d.ts",
-      "default": "./dist/lib/neutral/testing.mjs"
+      "import": "./dist/lib/testing.mjs"
     },
     "./translations": {
       "source": "./src/translations.ts",
       "types": "./dist/types/src/translations.d.ts",
-      "default": "./dist/lib/neutral/translations.mjs"
+      "import": "./dist/lib/translations.mjs"
     },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
-      "default": "./dist/lib/neutral/types/index.mjs"
+      "import": "./dist/lib/types.mjs"
     }
   },
   "types": "dist/types/src/index.d.ts",
@@ -137,10 +133,10 @@
     "PLUGIN.mdl"
   ],
   "dependencies": {
-    "@codemirror/autocomplete": "^6.20.2",
-    "@codemirror/language": "^6.12.3",
-    "@codemirror/state": "^6.6.0",
-    "@codemirror/view": "^6.43.0",
+    "@codemirror/autocomplete": "^6.20.3",
+    "@codemirror/language": "^6.12.4",
+    "@codemirror/state": "^6.7.1",
+    "@codemirror/view": "^6.43.6",
     "@effect-atom/atom": "^0.5.3",
     "@effect-atom/atom-react": "^0.5.0",
     "@effect/ai": "0.36.0",
@@ -150,64 +146,69 @@
     "@radix-ui/react-compose-refs": "1.1.1",
     "@radix-ui/react-context": "1.1.1",
     "effect": "3.21.4",
-    "@dxos/ai": "0.9.1-staging.ee54ba693a",
-    "@dxos/app-framework": "0.9.1-staging.ee54ba693a",
-    "@dxos/assistant": "0.9.1-staging.ee54ba693a",
-    "@dxos/assistant-toolkit": "0.9.1-staging.ee54ba693a",
-    "@dxos/async": "0.9.1-staging.ee54ba693a",
-    "@dxos/compute": "0.9.1-staging.ee54ba693a",
-    "@dxos/client": "0.9.1-staging.ee54ba693a",
-    "@dxos/compute-runtime": "0.9.1-staging.ee54ba693a",
-    "@dxos/devtools": "0.9.1-staging.ee54ba693a",
-    "@dxos/conductor": "0.9.1-staging.ee54ba693a",
-    "@dxos/echo-client": "0.9.1-staging.ee54ba693a",
-    "@dxos/edge-client": "0.9.1-staging.ee54ba693a",
-    "@dxos/echo": "0.9.1-staging.ee54ba693a",
-    "@dxos/app-graph": "0.9.1-staging.ee54ba693a",
-    "@dxos/app-toolkit": "0.9.1-staging.ee54ba693a",
-    "@dxos/effect": "0.9.1-staging.ee54ba693a",
-    "@dxos/functions-runtime": "0.9.1-staging.ee54ba693a",
-    "@dxos/invariant": "0.9.1-staging.ee54ba693a",
-    "@dxos/keys": "0.9.1-staging.ee54ba693a",
-    "@dxos/lit-ui": "0.9.1-staging.ee54ba693a",
-    "@dxos/log": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-attention": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-connector": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-client": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-deck": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-graph": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-map": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-markdown": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-status-bar": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-space": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-table": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-client": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-transcription": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-attention": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-list": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-editor": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-components": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-chat": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-form": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-graph": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-list": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-markdown": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-routine": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-masonry": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-search": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-menu": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-mosaic": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-syntax-highlighter": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-tabs": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-transcription": "0.9.1-staging.ee54ba693a",
-    "@dxos/schema": "0.9.1-staging.ee54ba693a",
-    "@dxos/util": "0.9.1-staging.ee54ba693a",
-    "@dxos/ui": "0.9.1-staging.ee54ba693a",
-    "@dxos/types": "0.9.1-staging.ee54ba693a",
-    "@dxos/ui-editor": "0.9.1-staging.ee54ba693a"
+    "@dxos/agent-runtime": "0.11.0",
+    "@dxos/ai": "0.11.0",
+    "@dxos/app-framework": "0.11.0",
+    "@dxos/app-graph": "0.11.0",
+    "@dxos/app-toolkit": "0.11.0",
+    "@dxos/assistant": "0.11.0",
+    "@dxos/assistant-toolkit": "0.11.0",
+    "@dxos/async": "0.11.0",
+    "@dxos/client": "0.11.0",
+    "@dxos/compute": "0.11.0",
+    "@dxos/conductor": "0.11.0",
+    "@dxos/devtools": "0.11.0",
+    "@dxos/echo": "0.11.0",
+    "@dxos/echo-client": "0.11.0",
+    "@dxos/echo-react": "0.11.0",
+    "@dxos/edge-client": "0.11.0",
+    "@dxos/effect": "0.11.0",
+    "@dxos/halo": "0.11.0",
+    "@dxos/halo-react": "0.11.0",
+    "@dxos/invariant": "0.11.0",
+    "@dxos/keys": "0.11.0",
+    "@dxos/link": "0.11.0",
+    "@dxos/lit-ui": "0.11.0",
+    "@dxos/log": "0.11.0",
+    "@dxos/plugin-attention": "0.11.0",
+    "@dxos/plugin-client": "0.11.0",
+    "@dxos/plugin-connector": "0.11.0",
+    "@dxos/plugin-deck": "0.11.0",
+    "@dxos/plugin-graph": "0.11.0",
+    "@dxos/plugin-map": "0.11.0",
+    "@dxos/plugin-markdown": "0.11.0",
+    "@dxos/plugin-routine": "0.11.0",
+    "@dxos/plugin-space": "0.11.0",
+    "@dxos/plugin-status-bar": "0.11.0",
+    "@dxos/plugin-table": "0.11.0",
+    "@dxos/plugin-transcription": "0.11.0",
+    "@dxos/react-client": "0.11.0",
+    "@dxos/react-list": "0.11.0",
+    "@dxos/react-ui-attention": "0.11.0",
+    "@dxos/react-ui-chat": "0.11.0",
+    "@dxos/react-ui-components": "0.11.0",
+    "@dxos/react-ui-editor": "0.11.0",
+    "@dxos/react-ui-form": "0.11.0",
+    "@dxos/react-ui-graph": "0.11.0",
+    "@dxos/react-ui-list": "0.11.0",
+    "@dxos/compute-runtime": "0.11.0",
+    "@dxos/react-ui-masonry": "0.11.0",
+    "@dxos/react-ui-search": "0.11.0",
+    "@dxos/react-ui-syntax-highlighter": "0.11.0",
+    "@dxos/react-ui-tabs": "0.11.0",
+    "@dxos/react-ui-transcription": "0.11.0",
+    "@dxos/schema": "0.11.0",
+    "@dxos/types": "0.11.0",
+    "@dxos/ui": "0.11.0",
+    "@dxos/ui-editor": "0.11.0",
+    "@dxos/util": "0.11.0",
+    "@dxos/react-ui-mosaic": "0.11.0",
+    "@dxos/react-ui-menu": "0.11.0",
+    "@dxos/react-ui-markdown": "0.11.0"
   },
   "devDependencies": {
     "@effect/platform": "0.96.2",
+    "@testing-library/react": "^16.3.2",
     "@types/lodash.defaultsdeep": "^4.6.6",
     "@types/react": "~19.2.17",
     "@types/react-dom": "~19.2.3",
@@ -215,22 +216,22 @@
     "openapi-types": "^12.1.3",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "vite": "^8.0.16",
-    "@dxos/assistant-toolkit": "0.9.1-staging.ee54ba693a",
-    "@dxos/devtools": "0.9.1-staging.ee54ba693a",
-    "@dxos/echo-client": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-client": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-chess": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-map": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-table": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-testing": "0.9.1-staging.ee54ba693a",
-    "@dxos/random": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-menu": "0.9.1-staging.ee54ba693a",
-    "@dxos/storybook-utils": "0.9.1-staging.ee54ba693a",
-    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a",
-    "@dxos/react-ui-table": "0.9.1-staging.ee54ba693a",
-    "@dxos/plugin-preview": "0.9.1-staging.ee54ba693a"
+    "vite": "^8.1.4",
+    "@dxos/assistant-toolkit": "0.11.0",
+    "@dxos/devtools": "0.11.0",
+    "@dxos/echo-client": "0.11.0",
+    "@dxos/plugin-chess": "0.11.0",
+    "@dxos/plugin-client": "0.11.0",
+    "@dxos/plugin-map": "0.11.0",
+    "@dxos/plugin-preview": "0.11.0",
+    "@dxos/plugin-table": "0.11.0",
+    "@dxos/random": "0.11.0",
+    "@dxos/react-ui": "0.11.0",
+    "@dxos/react-ui-menu": "0.11.0",
+    "@dxos/react-ui-table": "0.11.0",
+    "@dxos/storybook-utils": "0.11.0",
+    "@dxos/ui-theme": "0.11.0",
+    "@dxos/plugin-testing": "0.11.0"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -238,8 +239,8 @@
     "effect": "3.21.4",
     "react": "~19.2.7",
     "react-dom": "~19.2.7",
-    "@dxos/react-ui": "0.9.1-staging.ee54ba693a",
-    "@dxos/ui-theme": "0.9.1-staging.ee54ba693a"
+    "@dxos/react-ui": "^0.11.0",
+    "@dxos/ui-theme": "^0.11.0"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.node.ts

@@ -5,7 +5,7 @@
 import { ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { AiContext } from '@dxos/assistant';
-import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Agent, Chat, McpServer, Memory } from '@dxos/assistant-toolkit';
 import { Instructions, Skill } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { Feed } from '@dxos/echo';
@@ -46,7 +46,6 @@ export const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta
         Instructions.Instructions,
         Agent.Agent,
         McpServer.McpServer,
-        Plan.Plan,
         Sequence.Sequence,
         Memory.Memory,
         Text.Text,

package/src/AssistantPlugin.test.ts

@@ -3,20 +3,18 @@
 //
 
 import * as LanguageModel from '@effect/ai/LanguageModel';
-import { type TestContext } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 import * as Layer from 'effect/Layer';
 import { describe, test } from 'vitest';
 
+import { AgentService as AgentServiceRuntime } from '@dxos/agent-runtime';
 import { AiService } from '@dxos/ai';
-import { TestAiService } from '@dxos/ai/testing';
+import { ScriptedLanguageModel } from '@dxos/ai/testing';
 import { AppActivationEvents } from '@dxos/app-toolkit';
 import { AgentWizardSkill, DatabaseSkill, RunInstructions, SkillManagerSkill } from '@dxos/assistant-toolkit';
 import { AgentService, Instructions, Operation, ServiceResolver, Skill } from '@dxos/compute';
 import { Database, Ref, Registry } from '@dxos/echo';
 import { EffectEx } from '@dxos/effect';
-import { TestContextService } from '@dxos/effect/testing';
-import { AgentService as AgentServiceRuntime } from '@dxos/functions-runtime';
 import { DXN, EntityId } from '@dxos/keys';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { ClientPlugin } from '@dxos/plugin-client/plugin';
@@ -33,6 +31,9 @@ EntityId.dangerouslyDisableRandomness();
 
 const moduleId = (name: string) => `${meta.profile.key}.module.${name}`;
 
+// Memoized-replay cases (frozen A/B); gated off the default `:test` path. The module-activation
+// boot test below carries the real composition signal and always runs.
+
 describe('AssistantPlugin', () => {
   test('modules activate on the expected events', async ({ expect }) => {
     await using harness = await createComposerTestApp({
@@ -68,13 +69,14 @@ describe('AssistantPlugin', () => {
     );
   });
 
-  test('can memoize ai-service requests', async (ctx) => {
-    const { expect } = ctx;
+  test('resolves a language model through the plugin AI service', async ({ expect }) => {
     await using harness = await createComposerTestApp({
       plugins: [
         ClientPlugin({}),
         AssistantPlugin({
-          aiServiceMiddleware: await makeMemoizedAiServiceMiddleware(ctx),
+          aiServiceMiddleware: ScriptedLanguageModel.scriptedAiServiceMiddleware([
+            { parts: [ScriptedLanguageModel.text('Paris is the capital of France.')] },
+          ]),
         }),
       ],
     });
@@ -98,13 +100,15 @@ describe('AssistantPlugin', () => {
     );
   });
 
-  test('can run memoized instructions', { timeout: 120_000 }, async (ctx) => {
-    const { expect } = ctx;
+  test('runs instructions end to end through the plugin', async ({ expect }) => {
     await using harness = await createComposerTestApp({
       plugins: [
         ClientPlugin({}),
         AssistantPlugin({
-          aiServiceMiddleware: await makeMemoizedAiServiceMiddleware(ctx),
+          aiServiceMiddleware: ScriptedLanguageModel.scriptedAiServiceMiddleware([
+            { parts: [ScriptedLanguageModel.toolCall('completeJob', { success: { capital: 'paris' } })] },
+            { parts: [ScriptedLanguageModel.text('Done.')] },
+          ]),
         }),
         RoutinePlugin(),
       ],
@@ -142,58 +146,52 @@ describe('AssistantPlugin', () => {
     );
   });
 
-  test('smoke test for agent service with standard skills', { timeout: 120_000 }, async (ctx) => {
-    const { expect } = ctx;
-    await using harness = await createComposerTestApp({
-      plugins: [
-        ClientPlugin({}),
-        AssistantPlugin({
-          aiServiceMiddleware: await makeMemoizedAiServiceMiddleware(ctx),
-        }),
-        RoutinePlugin(),
-      ],
-    });
-
-    await harness.fire(AppActivationEvents.SetupArtifactDefinition);
-
-    const { personalSpace } = await initializeIdentity(harness.get(ClientCapabilities.Client)).pipe(
-      EffectEx.runAndForwardErrors,
-    );
-
-    await harness.runPromise(
-      Effect.gen(function* () {
-        const skills = yield* Effect.forEach(
-          [DatabaseSkill, AssistantSkill, SkillManagerSkill, AgentWizardSkill],
-          (_) => Skill.resolve(_.key),
-        );
-
-        const agent = yield* AgentServiceRuntime.createSession({
-          skills,
-        });
-        yield* agent.submitPrompt('Hello');
-        yield* agent.waitForCompletion();
-      }).pipe(
-        Effect.provide(
-          ServiceResolver.provide(
-            { space: personalSpace.id },
-            Database.Service,
-            AgentService.AgentService,
-            Registry.Service,
+  test(
+    'boots the agent service with the standard skills and completes a turn',
+    { timeout: 120_000 },
+    async ({ expect }) => {
+      await using harness = await createComposerTestApp({
+        plugins: [
+          ClientPlugin({}),
+          AssistantPlugin({
+            aiServiceMiddleware: ScriptedLanguageModel.scriptedAiServiceMiddleware([
+              { parts: [ScriptedLanguageModel.text('Hello back.')] },
+            ]),
+          }),
+          RoutinePlugin(),
+        ],
+      });
+
+      await harness.fire(AppActivationEvents.SetupArtifactDefinition);
+
+      const { personalSpace } = await initializeIdentity(harness.get(ClientCapabilities.Client)).pipe(
+        EffectEx.runAndForwardErrors,
+      );
+
+      await harness.runPromise(
+        Effect.gen(function* () {
+          const skills = yield* Effect.forEach(
+            [DatabaseSkill, AssistantSkill, SkillManagerSkill, AgentWizardSkill],
+            (_) => Skill.resolve(_.key),
+          );
+          expect(skills).toHaveLength(4);
+
+          const agent = yield* AgentServiceRuntime.createSession({
+            skills,
+          });
+          yield* agent.submitPrompt('Hello');
+          yield* agent.waitForCompletion();
+        }).pipe(
+          Effect.provide(
+            ServiceResolver.provide(
+              { space: personalSpace.id },
+              Database.Service,
+              AgentService.AgentService,
+              Registry.Service,
+            ),
           ),
         ),
-      ),
-    );
-  });
-});
-
-const makeMemoizedAiServiceMiddleware = (
-  ctx: TestContext,
-): Promise<(_upstream: AiService.Service) => AiService.Service> =>
-  AiService.AiService.pipe(
-    Effect.provide(
-      TestAiService({ preset: 'direct' }).pipe(Layer.provideMerge(Layer.succeed(TestContextService, ctx))),
-    ),
-    // Ignoring actual AI service the plugin contructs and using our own.
-    Effect.map((service) => (_upstream: AiService.Service) => service),
-    Effect.runPromise,
+      );
+    },
   );
+});

package/src/AssistantPlugin.ts

@@ -5,11 +5,10 @@
 import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { AiContext } from '@dxos/assistant';
-import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Agent, Chat, McpServer, Memory } from '@dxos/assistant-toolkit';
 import { Instructions, Skill } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { Feed } from '@dxos/echo';
-import { ClientEvents } from '@dxos/plugin-client';
 import { DeckEvents } from '@dxos/plugin-deck';
 import { MarkdownEvents } from '@dxos/plugin-markdown';
 import { Text } from '@dxos/schema';
@@ -29,8 +28,6 @@ import {
   EdgeModelResolver,
   LocalModelResolver,
   MarkdownExtension,
-  Migrations,
-  NavigationResolver,
   OperationHandler,
   ReactSurface,
   Settings,
@@ -49,7 +46,6 @@ const StateReady = AppActivationEvents.createStateEvent(meta.profile.key);
 export const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta)
   .pipe(
     AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
-    AppPlugin.addNavigationResolverModule({ activatesOn: ClientEvents.ClientReady, activate: NavigationResolver }),
     AppPlugin.addSkillDefinitionModule({ activate: SkillDefinition }),
     AppPlugin.addCreateObjectModule({ activate: CreateObject }),
     AppPlugin.addOperationHandlerModule({ activate: OperationHandler }),
@@ -65,7 +61,6 @@ export const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta
         Instructions.Instructions,
         Agent.Agent,
         McpServer.McpServer,
-        Plan.Plan,
         Sequence.Sequence,
         Memory.Memory,
         Text.Text,
@@ -143,10 +138,6 @@ export const AssistantPlugin = Plugin.define<AssistantPluginOptions | void>(meta
       ),
       activate: CompanionChatProvisioner,
     }),
-    Plugin.addModule({
-      activatesOn: ClientEvents.SetupMigration,
-      activate: Migrations,
-    }),
     Plugin.addModule({
       activatesOn: AppActivationEvents.SetupConnectors,
       activate: Connector,

package/src/AssistantPlugin.workerd.ts

@@ -5,7 +5,7 @@
 import { ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { AiContext } from '@dxos/assistant';
-import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Agent, Chat, McpServer, Memory } from '@dxos/assistant-toolkit';
 import { Instructions, Skill } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { Feed } from '@dxos/echo';
@@ -38,7 +38,6 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
       Instructions.Instructions,
       Agent.Agent,
       McpServer.McpServer,
-      Plan.Plan,
       Sequence.Sequence,
       Memory.Memory,
       Text.Text,