@dxos/plugin-assistant 0.8.4-main.422d1c7879 → 0.8.4-main.51f1e5ca51

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.4-main.422d1c7879",
+  "version": "0.8.4-main.51f1e5ca51",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -21,6 +21,7 @@
     "#meta": "./src/meta.ts",
     "#operations": "./src/operations/index.ts",
     "#testing": "./src/testing/index.ts",
+    "#translations": "./src/translations.ts",
     "#types": "./src/types/index.ts"
   },
   "exports": {
@@ -30,11 +31,6 @@
       "browser": "./dist/lib/browser/index.mjs",
       "node": "./dist/lib/node-esm/index.mjs"
     },
-    "./cli": {
-      "source": "./src/cli/index.ts",
-      "types": "./dist/types/src/cli/index.d.ts",
-      "node": "./dist/lib/node-esm/cli/index.mjs"
-    },
     "./blueprints": {
       "source": "./src/blueprints/index.ts",
       "types": "./dist/types/src/blueprints/index.d.ts",
@@ -42,12 +38,23 @@
       "node": "./dist/lib/node-esm/blueprints/index.mjs",
       "default": "./src/blueprints/index.ts"
     },
+    "./cli": {
+      "source": "./src/cli/index.ts",
+      "types": "./dist/types/src/cli/index.d.ts",
+      "node": "./dist/lib/node-esm/cli/index.mjs"
+    },
     "./operations": {
       "source": "./src/operations/index.ts",
       "types": "./dist/types/src/operations/index.d.ts",
       "browser": "./dist/lib/browser/operations/index.mjs",
       "node": "./dist/lib/node-esm/operations/index.mjs"
     },
+    "./translations": {
+      "source": "./src/translations.ts",
+      "types": "./dist/types/src/translations.d.ts",
+      "browser": "./dist/lib/browser/translations.mjs",
+      "node": "./dist/lib/node-esm/translations.mjs"
+    },
     "./types": {
       "source": "./src/types/index.ts",
       "types": "./dist/types/src/types/index.d.ts",
@@ -86,73 +93,70 @@
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
     "use-deep-compare-effect": "^1.8.1",
-    "@dxos/ai": "0.8.4-main.422d1c7879",
-    "@dxos/app-graph": "0.8.4-main.422d1c7879",
-    "@dxos/app-framework": "0.8.4-main.422d1c7879",
-    "@dxos/app-toolkit": "0.8.4-main.422d1c7879",
-    "@dxos/assistant": "0.8.4-main.422d1c7879",
-    "@dxos/assistant-toolkit": "0.8.4-main.422d1c7879",
-    "@dxos/async": "0.8.4-main.422d1c7879",
-    "@dxos/client": "0.8.4-main.422d1c7879",
-    "@dxos/conductor": "0.8.4-main.422d1c7879",
-    "@dxos/blueprints": "0.8.4-main.422d1c7879",
-    "@dxos/config": "0.8.4-main.422d1c7879",
-    "@dxos/compute": "0.8.4-main.422d1c7879",
-    "@dxos/context": "0.8.4-main.422d1c7879",
-    "@dxos/debug": "0.8.4-main.422d1c7879",
-    "@dxos/echo": "0.8.4-main.422d1c7879",
-    "@dxos/echo-protocol": "0.8.4-main.422d1c7879",
-    "@dxos/echo-db": "0.8.4-main.422d1c7879",
-    "@dxos/echo-atom": "0.8.4-main.422d1c7879",
-    "@dxos/edge-client": "0.8.4-main.422d1c7879",
-    "@dxos/echo-query": "0.8.4-main.422d1c7879",
-    "@dxos/effect": "0.8.4-main.422d1c7879",
-    "@dxos/functions-runtime": "0.8.4-main.422d1c7879",
-    "@dxos/devtools": "0.8.4-main.422d1c7879",
-    "@dxos/functions": "0.8.4-main.422d1c7879",
-    "@dxos/graph": "0.8.4-main.422d1c7879",
-    "@dxos/keys": "0.8.4-main.422d1c7879",
-    "@dxos/lit-ui": "0.8.4-main.422d1c7879",
-    "@dxos/invariant": "0.8.4-main.422d1c7879",
-    "@dxos/operation": "0.8.4-main.422d1c7879",
-    "@dxos/log": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-automation": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-attention": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-client": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-graph": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-map": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-deck": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-markdown": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-space": "0.8.4-main.422d1c7879",
-    "@dxos/protocols": "0.8.4-main.422d1c7879",
-    "@dxos/react-client": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-table": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-attention": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-canvas-compute": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-canvas-editor": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-chat": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-components": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-form": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-editor": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-graph": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-list": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-transcription": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-markdown": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-masonry": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-menu": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-search": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-sfx": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-stack": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-mosaic": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-tabs": "0.8.4-main.422d1c7879",
-    "@dxos/schema": "0.8.4-main.422d1c7879",
-    "@dxos/types": "0.8.4-main.422d1c7879",
-    "@dxos/ui": "0.8.4-main.422d1c7879",
-    "@dxos/ui-editor": "0.8.4-main.422d1c7879",
-    "@dxos/util": "0.8.4-main.422d1c7879",
-    "@dxos/react-edge-client": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-status-bar": "0.8.4-main.422d1c7879"
+    "@dxos/ai": "0.8.4-main.51f1e5ca51",
+    "@dxos/app-framework": "0.8.4-main.51f1e5ca51",
+    "@dxos/app-graph": "0.8.4-main.51f1e5ca51",
+    "@dxos/assistant-toolkit": "0.8.4-main.51f1e5ca51",
+    "@dxos/assistant": "0.8.4-main.51f1e5ca51",
+    "@dxos/async": "0.8.4-main.51f1e5ca51",
+    "@dxos/compute": "0.8.4-main.51f1e5ca51",
+    "@dxos/app-toolkit": "0.8.4-main.51f1e5ca51",
+    "@dxos/client": "0.8.4-main.51f1e5ca51",
+    "@dxos/conductor": "0.8.4-main.51f1e5ca51",
+    "@dxos/debug": "0.8.4-main.51f1e5ca51",
+    "@dxos/context": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-atom": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-db": "0.8.4-main.51f1e5ca51",
+    "@dxos/devtools": "0.8.4-main.51f1e5ca51",
+    "@dxos/config": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-query": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-protocol": "0.8.4-main.51f1e5ca51",
+    "@dxos/effect": "0.8.4-main.51f1e5ca51",
+    "@dxos/functions-runtime": "0.8.4-main.51f1e5ca51",
+    "@dxos/edge-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/graph": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo": "0.8.4-main.51f1e5ca51",
+    "@dxos/invariant": "0.8.4-main.51f1e5ca51",
+    "@dxos/keys": "0.8.4-main.51f1e5ca51",
+    "@dxos/lit-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/log": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-automation": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-attention": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-graph": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-map": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-deck": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-markdown": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-space": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-table": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-status-bar": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-transcription": "0.8.4-main.51f1e5ca51",
+    "@dxos/protocols": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-edge-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-attention": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-canvas-compute": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-canvas-editor": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-chat": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-components": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-editor": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-graph": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-form": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-list": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-masonry": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-menu": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-sfx": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-search": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-markdown": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-mosaic": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-stack": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-syntax-highlighter": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-tabs": "0.8.4-main.51f1e5ca51",
+    "@dxos/schema": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/types": "0.8.4-main.51f1e5ca51",
+    "@dxos/util": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-editor": "0.8.4-main.51f1e5ca51"
   },
   "devDependencies": {
     "@effect/platform": "0.94.4",
@@ -163,22 +167,22 @@
     "openapi-types": "^12.1.3",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "vite": "^7.1.11",
-    "@dxos/assistant-toolkit": "0.8.4-main.422d1c7879",
-    "@dxos/echo-db": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-chess": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-client": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-map": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-preview": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-table": "0.8.4-main.422d1c7879",
-    "@dxos/random": "0.8.4-main.422d1c7879",
-    "@dxos/plugin-testing": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-menu": "0.8.4-main.422d1c7879",
-    "@dxos/react-ui-table": "0.8.4-main.422d1c7879",
-    "@dxos/storybook-utils": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879",
-    "@dxos/devtools": "0.8.4-main.422d1c7879"
+    "vite": "^8.0.10",
+    "@dxos/assistant-toolkit": "0.8.4-main.51f1e5ca51",
+    "@dxos/echo-db": "0.8.4-main.51f1e5ca51",
+    "@dxos/devtools": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-chess": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-client": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-map": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-preview": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-testing": "0.8.4-main.51f1e5ca51",
+    "@dxos/plugin-table": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/random": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-menu": "0.8.4-main.51f1e5ca51",
+    "@dxos/react-ui-table": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51",
+    "@dxos/storybook-utils": "0.8.4-main.51f1e5ca51"
   },
   "peerDependencies": {
     "@effect-atom/atom-react": "^0.5.0",
@@ -186,8 +190,8 @@
     "effect": "3.20.0",
     "react": "~19.2.3",
     "react-dom": "~19.2.3",
-    "@dxos/react-ui": "0.8.4-main.422d1c7879",
-    "@dxos/ui-theme": "0.8.4-main.422d1c7879"
+    "@dxos/react-ui": "0.8.4-main.51f1e5ca51",
+    "@dxos/ui-theme": "0.8.4-main.51f1e5ca51"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -8,16 +8,16 @@ import * as Option from 'effect/Option';
 import { ActivationEvent, ActivationEvents, Capability, Plugin } from '@dxos/app-framework';
 import { AppActivationEvents, AppPlugin } from '@dxos/app-toolkit';
 import { ContextBinding } from '@dxos/assistant';
-import { Agent, AgentBlueprint, Chat, McpServer, Memory, Plan, ResearchGraph } from '@dxos/assistant-toolkit';
-import { Blueprint, Prompt } from '@dxos/blueprints';
+import { Agent, AgentBlueprint, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Blueprint, Routine } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { Annotation, Feed, Obj, Type } from '@dxos/echo';
 import { type SpaceId } from '@dxos/keys';
-import { Operation } from '@dxos/operation';
 import { AutomationCapabilities } from '@dxos/plugin-automation/types';
 import { ClientEvents } from '@dxos/plugin-client/types';
 import { DeckEvents } from '@dxos/plugin-deck/types';
-import { MarkdownEvents } from '@dxos/plugin-markdown';
+import { MarkdownEvents } from '@dxos/plugin-markdown/types';
 import { SpaceOperation } from '@dxos/plugin-space/operations';
 import { type CreateObject, SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space/types';
 import { Text } from '@dxos/schema';
@@ -40,10 +40,9 @@ import {
 } from '#capabilities';
 import { meta } from '#meta';
 import { AssistantOperation } from '#operations';
+import { translations } from '#translations';
 import { AssistantEvents } from '#types';
 
-import { translations } from './translations';
-
 export const AssistantPlugin = Plugin.define(meta).pipe(
   AppPlugin.addAppGraphModule({ activate: AppGraphBuilder }),
   AppPlugin.addBlueprintDefinitionModule({ activate: BlueprintDefinition }),
@@ -88,13 +87,13 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
         },
       },
       {
-        id: Type.getTypename(Prompt.Prompt),
+        id: Type.getTypename(Routine.Routine),
         metadata: {
-          icon: Annotation.IconAnnotation.get(Prompt.Prompt).pipe(Option.getOrThrow).icon,
-          iconHue: Annotation.IconAnnotation.get(Prompt.Prompt).pipe(Option.getOrThrow).hue ?? 'white',
+          icon: Annotation.IconAnnotation.get(Routine.Routine).pipe(Option.getOrThrow).icon,
+          iconHue: Annotation.IconAnnotation.get(Routine.Routine).pipe(Option.getOrThrow).hue ?? 'white',
           createObject: ((props, options) =>
             Effect.gen(function* () {
-              const object = Prompt.make(props);
+              const object = Routine.make(props);
               return yield* Operation.invoke(SpaceOperation.AddObject, {
                 object,
                 target: options.target,
@@ -152,8 +151,7 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
       Feed.Feed,
       HasSubject.HasSubject,
       Message.Message,
-      Prompt.Prompt,
-      ResearchGraph.ResearchGraph,
+      Routine.Routine,
       Agent.Agent,
       McpServer.McpServer,
       Plan.Plan,

package/src/blueprints/assistant/blueprint.test.ts

@@ -5,12 +5,12 @@
 import { describe, it } from '@effect/vitest';
 import * as Effect from 'effect/Effect';
 
-import { AgentService } from '@dxos/assistant';
 import { DatabaseBlueprint, DatabaseHandlers } from '@dxos/assistant-toolkit';
-import { AssistantTestLayer } from '@dxos/assistant/testing';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/compute';
 import { Feed } from '@dxos/echo';
 import { TestHelpers } from '@dxos/effect/testing';
+import { AgentService } from '@dxos/functions-runtime';
+import { AssistantTestLayer } from '@dxos/functions-runtime/testing';
 import { ObjectId } from '@dxos/keys';
 import { Organization } from '@dxos/types';
 

package/src/blueprints/assistant/blueprint.ts

@@ -2,9 +2,9 @@
 // Copyright 2025 DXOS.org
 //
 
-import { LayoutOperation, type AppCapabilities } from '@dxos/app-toolkit';
+import { LayoutOperation } from '@dxos/app-toolkit';
 import { templates } from '@dxos/assistant';
-import { Blueprint } from '@dxos/blueprints';
+import { Blueprint } from '@dxos/compute';
 
 import { AssistantOperation } from '#operations';
 
@@ -23,7 +23,7 @@ const make = () =>
     instructions: templates.system,
   });
 
-const blueprint: AppCapabilities.BlueprintDefinition = {
+const blueprint: Blueprint.Definition = {
   key: BLUEPRINT_KEY,
   make,
 };

package/src/capabilities/app-graph-builder.ts

@@ -9,12 +9,12 @@ import * as Option from 'effect/Option';
 import { Capability } from '@dxos/app-framework';
 import { AppCapabilities, AppNode, getActiveSpace, getPersonalSpace } from '@dxos/app-toolkit';
 import { Chat } from '@dxos/assistant-toolkit';
-import { Blueprint, Prompt } from '@dxos/blueprints';
+import { Blueprint, Routine } from '@dxos/compute';
+import { Operation } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { DXN, Database, Filter, Obj, type Ref } from '@dxos/echo';
 import { AtomObj } from '@dxos/echo-atom';
 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 { GraphBuilder, Node, NodeMatcher } from '@dxos/plugin-graph';
@@ -128,7 +128,7 @@ export default Capability.makeModule(
         id: 'invocations',
         match: NodeMatcher.whenAny(
           NodeMatcher.whenEchoTypeMatches(Sequence),
-          NodeMatcher.whenEchoTypeMatches(Prompt.Prompt),
+          NodeMatcher.whenEchoTypeMatches(Routine.Routine),
         ),
         connector: () =>
           Effect.succeed([

package/src/capabilities/blueprint-definition.ts

@@ -18,10 +18,8 @@ import {
   DatabaseBlueprint,
   DatabaseHandlers,
   DiscordBlueprint,
-  EntityExtractionHandlers,
   LinearBlueprint,
   PlanningBlueprint,
-  ResearchBlueprint,
   WebSearchBlueprint,
   MemoryBlueprint,
   AutomationBlueprint,
@@ -35,7 +33,6 @@ const blueprintDefinition: () => Effect.Effect<Capability.Capability<unknown>[]>
     Capability.contributes(AppCapabilities.BlueprintDefinition, AssistantBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, BrowserBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, DatabaseBlueprint),
-    Capability.contributes(AppCapabilities.BlueprintDefinition, ResearchBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, WebSearchBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, DiscordBlueprint),
     Capability.contributes(AppCapabilities.BlueprintDefinition, LinearBlueprint),
@@ -50,7 +47,6 @@ const blueprintDefinition: () => Effect.Effect<Capability.Capability<unknown>[]>
     Capability.contributes(Capabilities.OperationHandler, AgentBlueprintHandlers),
     Capability.contributes(Capabilities.OperationHandler, BlueprintManagerHandlers),
     Capability.contributes(Capabilities.OperationHandler, DatabaseHandlers),
-    Capability.contributes(Capabilities.OperationHandler, EntityExtractionHandlers),
     Capability.contributes(Capabilities.OperationHandler, AgentWizardHandlers),
   ]),
 );

package/src/capabilities/index.ts

@@ -3,7 +3,7 @@
 //
 
 import { Capability } from '@dxos/app-framework';
-import { OperationHandlerSet } from '@dxos/operation';
+import { OperationHandlerSet } from '@dxos/compute';
 
 export const AiService = Capability.lazy('AiService', () => import('./ai-service'));
 export const AppGraphBuilder = Capability.lazy('AppGraphBuilder', () => import('./app-graph-builder'));

package/src/capabilities/markdown.ts

@@ -6,7 +6,7 @@ import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Obj } from '@dxos/echo';
-import { MarkdownCapabilities } from '@dxos/plugin-markdown';
+import { MarkdownCapabilities } from '@dxos/plugin-markdown/types';
 
 import { AssistantOperation } from '#operations';
 

package/src/capabilities/migrations.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capability } from '@dxos/app-framework';
-import { Chat, ResearchGraph } from '@dxos/assistant-toolkit';
+import { Chat } from '@dxos/assistant-toolkit';
 import { defineObjectMigration } from '@dxos/client/echo';
 import { ClientCapabilities } from '@dxos/plugin-client/types';
 
@@ -19,13 +19,6 @@ const migrations = [
     transform: identityTransform,
     onMigration: noopCallback,
   }),
-  defineObjectMigration({
-    from: ResearchGraph.LegacyResearchGraph,
-    to: ResearchGraph.ResearchGraphV1,
-    transform: identityTransform,
-    onMigration: noopCallback,
-  }),
-  ...ResearchGraph.migrations,
 ];
 
 export default Capability.makeModule(

package/src/capabilities/operation-handler.ts

@@ -5,7 +5,7 @@
 import * as Effect from 'effect/Effect';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
-import type { OperationHandlerSet } from '@dxos/operation';
+import type { OperationHandlerSet } from '@dxos/compute';
 
 import { AssistantOperationHandlerSet } from '#operations';
 

package/src/capabilities/react-surface.tsx

@@ -3,17 +3,18 @@
 //
 
 import * as Effect from 'effect/Effect';
-import React, { type ComponentProps } from 'react';
+import React, { type ComponentProps, useEffect } from 'react';
 
 import { Capabilities, Capability } from '@dxos/app-framework';
 import { Surface, useSettingsState } from '@dxos/app-framework/ui';
 import { AppSurface, useActiveSpace } from '@dxos/app-toolkit/ui';
 import { Chat, Agent } from '@dxos/assistant-toolkit';
-import { Blueprint, Prompt } from '@dxos/blueprints';
 import { getSpace } from '@dxos/client/echo';
+import { Blueprint, Routine } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { InvocationTraceContainer } from '@dxos/devtools';
 import { Feed, Obj } from '@dxos/echo';
+import { log } from '@dxos/log';
 import { Panel } from '@dxos/react-ui';
 
 import { AssistantSettings } from '#components';
@@ -24,8 +25,8 @@ import {
   ChatDialog,
   AgentArticle,
   AgentProperties,
-  PromptArticle,
-  PromptList,
+  RoutineArticle,
+  RoutineList,
   TracePanel,
   TriggerStatus,
 } from '#containers';
@@ -87,14 +88,14 @@ export default Capability.makeModule(() =>
         id: 'companion-invocations',
         role: 'article',
         filter: (data): data is { companionTo: Sequence } =>
-          (Obj.instanceOf(Sequence, data.companionTo) || Obj.instanceOf(Prompt.Prompt, data.companionTo)) &&
+          (Obj.instanceOf(Sequence, data.companionTo) || Obj.instanceOf(Routine.Routine, data.companionTo)) &&
           data.subject === 'invocations',
         component: ({ data, role }) => {
           const space = getSpace(data.companionTo);
           const feed = space?.properties.invocationTraceFeed?.target;
           const queueDxn = feed ? Feed.getQueueDxn(feed) : undefined;
           // TODO(wittjosiah): Support invocation filtering for prompts.
-          const target = Obj.instanceOf(Prompt.Prompt, data.companionTo) ? undefined : data.companionTo;
+          const target = Obj.instanceOf(Routine.Routine, data.companionTo) ? undefined : data.companionTo;
 
           return (
             <Panel.Root role={role} className='dx-document'>
@@ -114,9 +115,9 @@ export default Capability.makeModule(() =>
       }),
       Surface.create({
         id: 'prompt',
-        filter: AppSurface.object(AppSurface.Article, Prompt.Prompt),
+        filter: AppSurface.object(AppSurface.Article, Routine.Routine),
         component: ({ data, role }) => (
-          <PromptArticle role={role} subject={data.subject} attendableId={data.attendableId} />
+          <RoutineArticle role={role} subject={data.subject} attendableId={data.attendableId} />
         ),
       }),
       Surface.create({
@@ -129,8 +130,13 @@ export default Capability.makeModule(() =>
         filter: AppSurface.literal(Surface.makeType<{ subject: string }>('deck-companion--trace'), 'trace'),
         component: () => {
           const space = useActiveSpace();
+          useEffect(() => {
+            log('trace panel surface', { hasSpace: Boolean(space), spaceId: space?.id });
+          }, [space?.id]);
+
           if (!space) {
-            return null;
+            // TODO(dmaretskyi): Not really part of UX, but so we know what the error is.
+            return <span>No active space</span>;
           }
 
           return <TracePanel space={space} />;
@@ -154,7 +160,7 @@ export default Capability.makeModule(() =>
           Surface.makeType<{ subject: Obj.Any; attendableId: string }>('prompts'),
           Obj.isObject,
         ),
-        component: ({ data }) => <PromptList subject={data.subject} />,
+        component: ({ data }) => <RoutineList subject={data.subject} />,
       }),
     ]),
   ),

package/src/cli/plugin.ts

@@ -5,8 +5,8 @@
 import { ActivationEvents, Plugin } from '@dxos/app-framework';
 import { AppPlugin } from '@dxos/app-toolkit';
 import { ContextBinding } from '@dxos/assistant';
-import { Agent, Chat, McpServer, Memory, Plan, ResearchGraph } from '@dxos/assistant-toolkit';
-import { Blueprint, Prompt } from '@dxos/blueprints';
+import { Agent, Chat, McpServer, Memory, Plan } from '@dxos/assistant-toolkit';
+import { Blueprint, Routine } from '@dxos/compute';
 import { Sequence } from '@dxos/conductor';
 import { Feed } from '@dxos/echo';
 import { ClientEvents } from '@dxos/plugin-client/types';
@@ -49,8 +49,7 @@ export const AssistantPlugin = Plugin.define(meta).pipe(
       Feed.Feed,
       HasSubject.HasSubject,
       Message.Message,
-      Prompt.Prompt,
-      ResearchGraph.ResearchGraph,
+      Routine.Routine,
       Agent.Agent,
       McpServer.McpServer,
       Plan.Plan,

package/src/components/AssistantSettings/AssistantSettings.stories.tsx

@@ -6,7 +6,8 @@ import { type Meta, type StoryObj } from '@storybook/react-vite';
 
 import { withLayout, withTheme } from '@dxos/react-ui/testing';
 
-import { translations } from '../../translations';
+import { translations } from '#translations';
+
 import { AssistantSettings } from './AssistantSettings';
 
 const meta = {
@@ -28,7 +29,7 @@ export const Default: Story = {
   args: {
     settings: {
       customPrompts: false,
-      llmProvider: 'edge',
+      modelProvider: 'edge',
     },
   },
 };