@dxos/plugin-assistant 0.8.3-main.7f5a14c → 0.8.3-staging.0fa589b

package/dist/types/src/types/types.d.ts

@@ -8,11 +8,11 @@ export declare namespace AssistantAction {
             name: Schema.optional<typeof Schema.String>;
         }>;
         output: Schema.Struct<{
-            object: import("@dxos/echo-schema").EchoTypeSchema<Schema.Struct<{
+            object: import("@dxos/echo/Type").obj<Schema.Struct<{
                 id: import("@dxos/keys").ObjectIdClass;
                 name: Schema.optional<typeof Schema.String>;
-                queue: import("@dxos/echo-schema").Ref$<import("@dxos/echo-db").Queue<import("@dxos/echo-schema").AnyEchoObject>>;
-            }>, {}>;
+                queue: import("@dxos/echo/Type").ref<Schema.Schema<import("@dxos/echo-db").Queue<import("@dxos/echo/Obj").Any | import("@dxos/echo/Relation").Any>, import("@dxos/echo-db").Queue<import("@dxos/echo/Obj").Any | import("@dxos/echo/Relation").Any>, never>>;
+            }>>;
         }>;
     }>;
     export class CreateChat extends CreateChat_base {
@@ -24,14 +24,14 @@ export declare namespace AssistantAction {
             name: Schema.optional<typeof Schema.String>;
         }>;
         output: Schema.Struct<{
-            object: import("@dxos/echo-schema").EchoTypeSchema<Schema.Struct<{
+            object: import("@dxos/echo/Type").obj<Schema.Struct<{
                 name: Schema.optional<typeof Schema.String>;
                 steps: Schema.Array$<Schema.Struct<{
                     id: import("@dxos/keys").ObjectIdClass;
                     instructions: typeof Schema.String;
                     tools: Schema.optional<Schema.Array$<typeof Schema.String>>;
                 }>>;
-            }>, {}>;
+            }>>;
         }>;
     }>;
     export class CreateBlueprint extends CreateBlueprint_base {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/plugin-assistant",
-  "version": "0.8.3-main.7f5a14c",
+  "version": "0.8.3-staging.0fa589b",
   "description": "Assistant plugin",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -48,60 +48,61 @@
     "jsonpointer": "^5.0.1",
     "lodash.defaultsdeep": "^4.6.1",
     "unified": "^11.0.0",
-    "@dxos/app-framework": "0.8.3-main.7f5a14c",
-    "@dxos/artifact": "0.8.3-main.7f5a14c",
-    "@dxos/async": "0.8.3-main.7f5a14c",
-    "@dxos/assistant": "0.8.3-main.7f5a14c",
-    "@dxos/ai": "0.8.3-main.7f5a14c",
-    "@dxos/conductor": "0.8.3-main.7f5a14c",
-    "@dxos/client": "0.8.3-main.7f5a14c",
-    "@dxos/compute": "0.8.3-main.7f5a14c",
-    "@dxos/context": "0.8.3-main.7f5a14c",
-    "@dxos/echo": "0.8.3-main.7f5a14c",
-    "@dxos/config": "0.8.3-main.7f5a14c",
-    "@dxos/echo-db": "0.8.3-main.7f5a14c",
-    "@dxos/echo-protocol": "0.8.3-main.7f5a14c",
-    "@dxos/debug": "0.8.3-main.7f5a14c",
-    "@dxos/edge-client": "0.8.3-main.7f5a14c",
-    "@dxos/echo-schema": "0.8.3-main.7f5a14c",
-    "@dxos/effect": "0.8.3-main.7f5a14c",
-    "@dxos/functions": "0.8.3-main.7f5a14c",
-    "@dxos/graph": "0.8.3-main.7f5a14c",
-    "@dxos/keys": "0.8.3-main.7f5a14c",
-    "@dxos/live-object": "0.8.3-main.7f5a14c",
-    "@dxos/local-storage": "0.8.3-main.7f5a14c",
-    "@dxos/log": "0.8.3-main.7f5a14c",
-    "@dxos/invariant": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-client": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-deck": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-explorer": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-graph": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-markdown": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-script": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-preview": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-sketch": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-inbox": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-stack": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-space": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-transcription": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-wnfs": "0.8.3-main.7f5a14c",
-    "@dxos/react-client": "0.8.3-main.7f5a14c",
-    "@dxos/react-edge-client": "0.8.3-main.7f5a14c",
-    "@dxos/protocols": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-attention": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-canvas-compute": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-canvas-editor": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-dnd": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-components": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-form": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-graph": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-list": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-editor": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-sfx": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-stack": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-syntax-highlighter": "0.8.3-main.7f5a14c",
-    "@dxos/schema": "0.8.3-main.7f5a14c",
-    "@dxos/util": "0.8.3-main.7f5a14c"
+    "@dxos/ai": "0.8.3-staging.0fa589b",
+    "@dxos/app-framework": "0.8.3-staging.0fa589b",
+    "@dxos/artifact": "0.8.3-staging.0fa589b",
+    "@dxos/assistant": "0.8.3-staging.0fa589b",
+    "@dxos/async": "0.8.3-staging.0fa589b",
+    "@dxos/client": "0.8.3-staging.0fa589b",
+    "@dxos/conductor": "0.8.3-staging.0fa589b",
+    "@dxos/compute": "0.8.3-staging.0fa589b",
+    "@dxos/debug": "0.8.3-staging.0fa589b",
+    "@dxos/config": "0.8.3-staging.0fa589b",
+    "@dxos/devtools": "0.8.3-staging.0fa589b",
+    "@dxos/context": "0.8.3-staging.0fa589b",
+    "@dxos/echo": "0.8.3-staging.0fa589b",
+    "@dxos/echo-db": "0.8.3-staging.0fa589b",
+    "@dxos/echo-protocol": "0.8.3-staging.0fa589b",
+    "@dxos/echo-schema": "0.8.3-staging.0fa589b",
+    "@dxos/edge-client": "0.8.3-staging.0fa589b",
+    "@dxos/effect": "0.8.3-staging.0fa589b",
+    "@dxos/functions": "0.8.3-staging.0fa589b",
+    "@dxos/graph": "0.8.3-staging.0fa589b",
+    "@dxos/invariant": "0.8.3-staging.0fa589b",
+    "@dxos/keys": "0.8.3-staging.0fa589b",
+    "@dxos/live-object": "0.8.3-staging.0fa589b",
+    "@dxos/local-storage": "0.8.3-staging.0fa589b",
+    "@dxos/log": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-deck": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-explorer": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-client": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-graph": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-inbox": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-preview": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-markdown": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-script": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-sketch": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-space": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-stack": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-wnfs": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-transcription": "0.8.3-staging.0fa589b",
+    "@dxos/protocols": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-attention": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-canvas-compute": "0.8.3-staging.0fa589b",
+    "@dxos/react-edge-client": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-canvas-editor": "0.8.3-staging.0fa589b",
+    "@dxos/react-client": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-components": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-dnd": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-editor": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-form": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-list": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-graph": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-sfx": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-stack": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-syntax-highlighter": "0.8.3-staging.0fa589b",
+    "@dxos/schema": "0.8.3-staging.0fa589b",
+    "@dxos/util": "0.8.3-staging.0fa589b"
   },
   "devDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -114,18 +115,18 @@
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
     "vite": "5.4.7",
-    "@dxos/artifact-testing": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-chess": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-inbox": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-map": "0.8.3-main.7f5a14c",
-    "@dxos/echo-db": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-markdown": "0.8.3-main.7f5a14c",
-    "@dxos/plugin-table": "0.8.3-main.7f5a14c",
-    "@dxos/random": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-menu": "0.8.3-main.7f5a14c",
-    "@dxos/storybook-utils": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
+    "@dxos/artifact-testing": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-chess": "0.8.3-staging.0fa589b",
+    "@dxos/echo-db": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-inbox": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-map": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-markdown": "0.8.3-staging.0fa589b",
+    "@dxos/random": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui": "0.8.3-staging.0fa589b",
+    "@dxos/plugin-table": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-menu": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b",
+    "@dxos/storybook-utils": "0.8.3-staging.0fa589b"
   },
   "peerDependencies": {
     "@effect-rx/rx-react": "^0.34.1",
@@ -133,8 +134,8 @@
     "effect": "^3.13.3",
     "react": "~18.2.0",
     "react-dom": "~18.2.0",
-    "@dxos/react-ui": "0.8.3-main.7f5a14c",
-    "@dxos/react-ui-theme": "0.8.3-main.7f5a14c"
+    "@dxos/react-ui": "0.8.3-staging.0fa589b",
+    "@dxos/react-ui-theme": "0.8.3-staging.0fa589b"
   },
   "publishConfig": {
     "access": "public"

package/src/AssistantPlugin.tsx

@@ -2,6 +2,8 @@
 // Copyright 2023 DXOS.org
 //
 
+import { Effect } from 'effect';
+
 import {
   Capabilities,
   Events,
@@ -12,12 +14,13 @@ import {
   definePlugin,
 } from '@dxos/app-framework';
 import { Blueprint } from '@dxos/assistant';
-import { Type } from '@dxos/echo';
+import { Ref, Type } from '@dxos/echo';
 import { ClientCapabilities, ClientEvents } from '@dxos/plugin-client';
-import { SpaceCapabilities } from '@dxos/plugin-space';
-import { defineObjectForm } from '@dxos/plugin-space/types';
+import { SpaceCapabilities, SpaceEvents } from '@dxos/plugin-space';
+import { CollectionAction, defineObjectForm } from '@dxos/plugin-space/types';
 
 import { AiClient, AppGraphBuilder, IntentResolver, ReactSurface, Settings } from './capabilities';
+import { AssistantEvents } from './events';
 import { meta } from './meta';
 import translations from './translations';
 import { AssistantAction, AIChatType, ServiceType, TemplateType, CompanionTo } from './types';
@@ -77,6 +80,25 @@ export const AssistantPlugin = () =>
       activatesOn: ClientEvents.SetupSchema,
       activate: () => contributes(ClientCapabilities.Schema, [ServiceType, TemplateType, CompanionTo]),
     }),
+    defineModule({
+      id: `${meta.id}/module/on-space-created`,
+      activatesOn: SpaceEvents.SpaceCreated,
+      activate: (context) => {
+        const { dispatch } = context.getCapability(Capabilities.IntentDispatcher);
+        return contributes(SpaceCapabilities.OnSpaceCreated, async ({ space, rootCollection }) => {
+          const program = Effect.gen(function* () {
+            const { object: collection } = yield* dispatch(
+              createIntent(CollectionAction.CreateQueryCollection, { typename: Type.getTypename(AIChatType) }),
+            );
+            rootCollection.objects.push(Ref.make(collection));
+
+            const { object: chat } = yield* dispatch(createIntent(AssistantAction.CreateChat, { space }));
+            space.db.add(chat);
+          });
+          await Effect.runPromise(program);
+        });
+      },
+    }),
     defineModule({
       id: `${meta.id}/module/app-graph-builder`,
       activatesOn: Events.SetupAppGraph,
@@ -97,6 +119,7 @@ export const AssistantPlugin = () =>
     defineModule({
       id: `${meta.id}/module/ai-client`,
       activatesOn: allOf(ClientEvents.ClientReady, Events.SettingsReady),
+      activatesAfter: [AssistantEvents.AiClientReady],
       activate: AiClient,
     }),
   ]);

package/src/capabilities/ai-client.ts

@@ -4,7 +4,7 @@
 
 import { effect, signal } from '@preact/signals-core';
 
-import { type AIServiceClient, AIServiceEdgeClient, OllamaClient } from '@dxos/ai';
+import { type AiServiceClient, EdgeAiServiceClient, OllamaAiServiceClient } from '@dxos/ai';
 import { Capabilities, contributes, type PluginContext } from '@dxos/app-framework';
 import { ClientCapabilities } from '@dxos/plugin-client';
 
@@ -18,7 +18,7 @@ const DEFAULT_AI_SERVICE_URL = 'http://localhost:8788';
 export default (context: PluginContext) => {
   const client = context.getCapability(ClientCapabilities.Client);
   const endpoint = client.config.values.runtime?.services?.ai?.server ?? DEFAULT_AI_SERVICE_URL;
-  const aiClient = signal<AIServiceClient>(new AIServiceEdgeClient({ endpoint }));
+  const aiClient = signal<AiServiceClient>(new EdgeAiServiceClient({ endpoint }));
 
   const unsubscribe = effect(() => {
     const settings = context
@@ -26,9 +26,9 @@ export default (context: PluginContext) => {
       .getStore<AssistantSettingsProps>(ASSISTANT_PLUGIN)?.value;
 
     if (settings?.llmProvider === 'ollama') {
-      aiClient.value = new OllamaClient();
+      aiClient.value = new OllamaAiServiceClient();
     } else {
-      aiClient.value = new AIServiceEdgeClient({
+      aiClient.value = new EdgeAiServiceClient({
         endpoint,
         defaultGenerationOptions: {
           // model: '@anthropic/claude-sonnet-4-20250514',

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

@@ -13,12 +13,13 @@ import {
   type PromiseIntentDispatcher,
   type PluginContext,
 } from '@dxos/app-framework';
+import { Blueprint } from '@dxos/assistant';
 import { Obj } from '@dxos/echo';
 import { invariant } from '@dxos/invariant';
 import { ClientCapabilities } from '@dxos/plugin-client';
 import { PLANK_COMPANION_TYPE, ATTENDABLE_PATH_SEPARATOR } from '@dxos/plugin-deck/types';
 import { createExtension, ROOT_ID } from '@dxos/plugin-graph';
-import { rxFromQuery } from '@dxos/plugin-space';
+import { getActiveSpace, rxFromQuery } from '@dxos/plugin-space';
 import { SPACE_TYPE, SpaceAction } from '@dxos/plugin-space/types';
 import {
   type Space,
@@ -48,25 +49,9 @@ export default (context: PluginContext) =>
                 data: async () => {
                   const { dispatchPromise: dispatch } = context.getCapability(Capabilities.IntentDispatcher);
                   const client = context.getCapability(ClientCapabilities.Client);
-                  const layout = context.getCapability(Capabilities.Layout);
-                  const { graph } = context.getCapability(Capabilities.AppGraph);
-
-                  // TODO(burdon): Get space from workspace.
-                  // TODO(burdon): If need to create chat, then add to dispatch stack below.
-                  let chat: AIChatType | undefined;
-                  if (layout.active.length > 0) {
-                    const node = graph.getNode(layout.active[0]).pipe(Option.getOrNull);
-                    if (node) {
-                      const space = getSpace(node.data);
-                      if (space) {
-                        chat = await getOrCreateChat(dispatch, space);
-                      }
-                    }
-                  } else {
-                    const space = client.spaces.default;
-                    chat = await getOrCreateChat(dispatch, space);
-                  }
 
+                  const space = getActiveSpace(context) ?? client.spaces.default;
+                  const chat = await getOrCreateChat(dispatch, space);
                   if (!chat) {
                     return;
                   }
@@ -144,6 +129,30 @@ export default (context: PluginContext) =>
       },
     }),
 
+    createExtension({
+      id: `${ASSISTANT_PLUGIN}/blueprint-logs`,
+      connector: (node) =>
+        Rx.make((get) =>
+          pipe(
+            get(node),
+            Option.flatMap((node) => (Obj.instanceOf(Blueprint, node.data) ? Option.some(node) : Option.none())),
+            Option.map((node) => [
+              {
+                id: [node.id, 'logs'].join(ATTENDABLE_PATH_SEPARATOR),
+                type: PLANK_COMPANION_TYPE,
+                data: 'logs',
+                properties: {
+                  label: ['blueprint logs label', { ns: ASSISTANT_PLUGIN }],
+                  icon: 'ph--clock-countdown--regular',
+                  disposition: 'hidden',
+                },
+              },
+            ]),
+            Option.getOrElse(() => []),
+          ),
+        ),
+    }),
+
     createExtension({
       id: `${ASSISTANT_PLUGIN}/root`,
       connector: (node) => {
@@ -222,11 +231,14 @@ export default (context: PluginContext) =>
 
 // TODO(burdon): Factor out.
 const getOrCreateChat = async (dispatch: PromiseIntentDispatcher, space: Space): Promise<AIChatType | undefined> => {
-  const { objects } = await space.db.query(Filter.type(AIChatType)).run();
+  // TODO(wittjosiah): This should be possible with a single query.
+  const { objects: allChats } = await space.db.query(Query.type(AIChatType)).run();
+  const { objects: relatedChats } = await space.db.query(Query.type(AIChatType).sourceOf(CompanionTo).source()).run();
+  const chats = allChats.filter((chat) => !relatedChats.includes(chat));
   // console.log('objects', JSON.stringify(objects, null, 2));
-  if (objects.length > 0) {
+  if (chats.length > 0) {
     // TODO(burdon): Is this the most recent?
-    return objects[objects.length - 1];
+    return chats[chats.length - 1];
   }
 
   const { data } = await dispatch(createIntent(AssistantAction.CreateChat, { space }));

package/src/capabilities/capabilities.ts

@@ -4,12 +4,12 @@
 
 import { type ReadonlySignal } from '@preact/signals-core';
 
-import { type AIServiceClient } from '@dxos/ai';
+import { type AiServiceClient } from '@dxos/ai';
 import { defineCapability } from '@dxos/app-framework';
 
 import { ASSISTANT_PLUGIN } from '../meta';
 
 // TODO(burdon): Move to types to import from other plugins?
 export namespace AssistantCapabilities {
-  export const AiClient = defineCapability<ReadonlySignal<AIServiceClient>>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
+  export const AiClient = defineCapability<ReadonlySignal<AiServiceClient>>(`${ASSISTANT_PLUGIN}/capability/ai-client`);
 }

package/src/capabilities/react-surface.tsx

@@ -7,10 +7,12 @@ import React, { useEffect, useMemo } from 'react';
 
 import { Capabilities, contributes, createIntent, createSurface, useIntentDispatcher } from '@dxos/app-framework';
 import { Blueprint } from '@dxos/assistant';
+import { InvocationTraceContainer } from '@dxos/devtools';
 import { Filter, type Key, Obj, Query } from '@dxos/echo';
 import { SettingsStore } from '@dxos/local-storage';
 import { SpaceAction } from '@dxos/plugin-space/types';
 import { fullyQualifiedId, getSpace, getTypename } from '@dxos/react-client/echo';
+import { StackItem } from '@dxos/react-ui-stack';
 
 import {
   AssistantDialog,
@@ -100,6 +102,20 @@ export default () =>
       filter: (data): data is { subject: Blueprint } => Obj.instanceOf(Blueprint, data.subject),
       component: ({ data, role }) => <BlueprintContainer role={role} blueprint={data.subject} />,
     }),
+    createSurface({
+      id: `${ASSISTANT_PLUGIN}/companion/logs`,
+      role: 'article',
+      filter: (data): data is { companionTo: Blueprint } =>
+        Obj.instanceOf(Blueprint, data.companionTo) && data.subject === 'logs',
+      component: ({ data, role }) => {
+        const space = getSpace(data.companionTo);
+        return (
+          <StackItem.Content role={role}>
+            <InvocationTraceContainer space={space} target={data.companionTo} detailAxis='block' />
+          </StackItem.Content>
+        );
+      },
+    }),
     createSurface({
       id: `${ASSISTANT_PLUGIN}/template`,
       role: 'article',

package/src/components/BlueprintContainer.tsx

@@ -11,8 +11,6 @@ import { useCapability } from '@dxos/app-framework';
 import {
   type Blueprint,
   type BlueprintDefinition,
-  BlueprintLoggerAdapter,
-  BlueprintParser,
   BlueprintMachine,
   createLocalSearchTool,
   createExaTool,
@@ -27,6 +25,7 @@ import { StackItem, type StackItemContentProps } from '@dxos/react-ui-stack';
 import { BlueprintEditor } from './BlueprintEditor';
 import { AssistantCapabilities } from '../capabilities';
 import { meta } from '../meta';
+import { QueueLogger } from '../queue-logger';
 
 // TODO(burdon): Move to config.
 export const EXA_API_KEY = '9c7e17ff-0c85-4cd5-827a-8b489f139e03';
@@ -76,13 +75,13 @@ export const BlueprintContainer = ({
         queue,
         schema: [], // TODO(burdon): Get schema from client/blueprint?
         onDone: async (objects) => {
-          queue.append(objects);
+          await queue.append(objects);
         },
       }),
     ]);
   }, [blueprint]);
 
-  const formatAndSave = (): BlueprintDefinition | undefined => {
+  const formatAndSave = useCallback((): BlueprintDefinition | undefined => {
     if (!blueprint) {
       return;
     }
@@ -112,28 +111,18 @@ export const BlueprintContainer = ({
       });
     }
 
-    return definition;
-  };
+    return blueprint;
+  }, [blueprint]);
 
   // TODO(burdon): Save raw blueprint separately from parsed blueprint? (like Script).
-  const handleSave = useCallback(() => {
-    const definition = formatAndSave();
-    if (!definition) {
-      return;
-    }
-
-    setDefinition(definition);
-  }, [blueprint]);
+  const handleSave = useCallback(() => formatAndSave(), [formatAndSave]);
 
   const handleRun = useCallback(async () => {
     if (!aiClient?.value || !toolRegistry) {
       return;
     }
 
-    const definition = formatAndSave();
-    if (!definition) {
-      return;
-    }
+    formatAndSave();
 
     // Get input from selection.
     const input = Array.from(getSelectionSet(selectionManager)).map((id) => DXN.fromLocalObjectId(id));
@@ -141,14 +130,13 @@ export const BlueprintContainer = ({
       return;
     }
 
-    const blueprint = BlueprintParser.create().parse(definition);
-    const machine = new BlueprintMachine(toolRegistry, blueprint).setLogger(new BlueprintLoggerAdapter());
+    const machine = new BlueprintMachine(toolRegistry, blueprint).setLogger(new QueueLogger(blueprint));
     await machine.runToCompletion({ aiClient: aiClient.value, input });
-  }, [aiClient.value, toolRegistry]);
+  }, [aiClient.value, blueprint, formatAndSave, selectionManager, toolRegistry]);
 
   return (
     <StackItem.Content role={role} toolbar>
-      <Toolbar.Root classNames='border-be border-subduedSeparator'>
+      <Toolbar.Root>
         <Toolbar.Button onClick={handleSave}>{t('button save')}</Toolbar.Button>
         <Toolbar.Button onClick={handleRun}>{t('button run')}</Toolbar.Button>
       </Toolbar.Root>

package/src/components/PromptSettings.tsx

@@ -48,7 +48,7 @@ export const PromptSettings = ({ template }: { template: TemplateType }) => {
   );
 
   return (
-    <div className='p-2 flex flex-col gap-4'>
+    <div className='flex flex-col gap-4'>
       <h2>{t('prompt rules label')}</h2>
       <Toolbar.Root>
         <Select.Root value={template.kind.include} onValueChange={handleKindChange}>

package/src/components/Thread/Thread.stories.tsx

@@ -7,10 +7,10 @@ import '@dxos-theme';
 import { type StoryObj, type Meta } from '@storybook/react';
 import React, { useCallback, useEffect, useState } from 'react';
 
-import { type Message } from '@dxos/ai';
+import { Message } from '@dxos/ai';
 import { IntentPlugin } from '@dxos/app-framework';
 import { withPluginManager } from '@dxos/app-framework/testing';
-import { Type } from '@dxos/echo';
+import { Obj } from '@dxos/echo';
 import { faker } from '@dxos/random';
 import { withClientProvider } from '@dxos/react-client/testing';
 import { withLayout, withSignals, withTheme } from '@dxos/storybook-utils';
@@ -29,12 +29,11 @@ const DefaultStory = ({ messages: _messages, ...props }: ThreadProps) => {
 
   const handleSubmit = useCallback(
     (text: string) => {
-      const request: Message = { id: Type.ObjectId.random(), role: 'user', content: [{ type: 'text', text }] };
-      const response: Message = {
-        id: Type.ObjectId.random(),
+      const request: Message = Obj.make(Message, { role: 'user', content: [{ type: 'text', text }] });
+      const response: Message = Obj.make(Message, {
         role: 'assistant',
         content: [{ type: 'text', disposition: 'cot', pending: true, text: faker.lorem.paragraphs(1) }],
-      };
+      });
       setMessages([...messages, request, response]);
       setProcessing(true);
       setTimeout(() => {
@@ -43,11 +42,10 @@ const DefaultStory = ({ messages: _messages, ...props }: ThreadProps) => {
           ...messages,
           request,
           response,
-          {
-            id: Type.ObjectId.random(),
+          Obj.make(Message, {
             role: 'assistant',
             content: [{ type: 'text', text: faker.lorem.paragraphs(1) }],
-          },
+          }),
         ]);
         setProcessing(false);
       }, 3_000);
@@ -89,8 +87,7 @@ export default meta;
 type Story = StoryObj<ThreadProps>;
 
 const TEST_MESSAGES: Message[] = [
-  {
-    id: Type.ObjectId.random(),
+  Obj.make(Message, {
     role: 'user',
     content: [
       {
@@ -98,9 +95,8 @@ const TEST_MESSAGES: Message[] = [
         text: faker.lorem.sentence(5),
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'assistant',
     content: [
       {
@@ -123,9 +119,8 @@ const TEST_MESSAGES: Message[] = [
         input: {},
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'user',
     content: [
       {
@@ -134,9 +129,8 @@ const TEST_MESSAGES: Message[] = [
         content: 'This is a tool result.',
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'assistant',
     content: [
       {
@@ -146,9 +140,8 @@ const TEST_MESSAGES: Message[] = [
         input: {},
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'user',
     content: [
       {
@@ -157,9 +150,8 @@ const TEST_MESSAGES: Message[] = [
         content: 'This is a tool result.',
       },
     ],
-  },
-  {
-    id: Type.ObjectId.random(),
+  }),
+  Obj.make(Message, {
     role: 'assistant',
     content: [
       {
@@ -167,7 +159,7 @@ const TEST_MESSAGES: Message[] = [
         text: faker.lorem.paragraphs(1),
       },
     ],
-  },
+  }),
 ];
 
 export const Default: Story = {