@dxos/plugin-assistant 0.8.4-main.67995b8 → 0.8.4-main.f5c0578

package/dist/lib/browser/{chunk-63GG6U6D.mjs → chunk-BVH6VK6Q.mjs}

@@ -1,47 +1,112 @@
+import {
+  AssistantCapabilities
+} from "./chunk-QB7OVS6Z.mjs";
 import {
   ServiceType
-} from "./chunk-7W7LHTRH.mjs";
+} from "./chunk-JBFDQMUJ.mjs";
 import {
-  ASSISTANT_PLUGIN,
-  __export,
-  __reExport,
   meta
-} from "./chunk-FDCJSQYF.mjs";
+} from "./chunk-LKP65RPA.mjs";
 
-// src/hooks/useChatProcessor.ts
-import { useEffect as useEffect2, useMemo as useMemo3, useState as useState2 } from "react";
-import { Capabilities as Capabilities3, useCapabilities as useCapabilities3, useIntentDispatcher } from "@dxos/app-framework";
-import { Conversation, createSystemPrompt } from "@dxos/assistant";
-import { FunctionType } from "@dxos/functions";
-import { log as log5 } from "@dxos/log";
-import { useConfig } from "@dxos/react-client";
-import { Filter as Filter3, fullyQualifiedId, useQuery } from "@dxos/react-client/echo";
-import { isNonNullable as isNonNullable2 } from "@dxos/util";
+// src/hooks/useBlueprintRegistry.ts
+import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
+import { useSignalEffect } from "@preact/signals-react";
+import { useCallback, useMemo, useState } from "react";
+import { Capabilities, useCapabilities } from "@dxos/app-framework";
+import { Blueprint } from "@dxos/blueprints";
+import { Filter, Obj, Ref } from "@dxos/echo";
+import { isNonNullable } from "@dxos/util";
+var useBlueprintRegistry = () => {
+  const blueprints = useCapabilities(Capabilities.BlueprintDefinition);
+  return useMemo(() => new Blueprint.Registry(blueprints), [
+    blueprints
+  ]);
+};
+var useBlueprints = ({ context }) => {
+  var _effect = _useSignals();
+  try {
+    const [active, setActive] = useState(/* @__PURE__ */ new Map());
+    useSignalEffect(() => {
+      const refs = [
+        ...context?.blueprints.value ?? []
+      ];
+      const t = setTimeout(async () => {
+        const blueprints = (await Ref.Array.loadAll(refs)).filter(isNonNullable);
+        setActive(new Map(blueprints.map((blueprint) => [
+          blueprint.key,
+          blueprint
+        ])));
+      });
+      return () => clearTimeout(t);
+    });
+    return active;
+  } finally {
+    _effect.f();
+  }
+};
+var useBlueprintHandlers = ({ space, context, blueprintRegistry }) => {
+  const onUpdateBlueprint = useCallback(async (key, checked) => {
+    if (!context || !blueprintRegistry) {
+      return;
+    }
+    const { objects } = await space.db.query(Filter.type(Blueprint.Blueprint)).run();
+    let storedBlueprint = objects.find((blueprint) => blueprint.key === key);
+    if (checked) {
+      if (!storedBlueprint) {
+        const blueprint = blueprintRegistry.getByKey(key);
+        if (!blueprint) {
+          return;
+        }
+        storedBlueprint = space.db.add(Obj.clone(blueprint));
+      }
+      await context.bind({
+        blueprints: [
+          Ref.make(storedBlueprint)
+        ]
+      });
+    } else if (storedBlueprint) {
+      await context.unbind({
+        blueprints: [
+          Ref.make(storedBlueprint)
+        ]
+      });
+    }
+  }, [
+    space,
+    context,
+    blueprintRegistry
+  ]);
+  return {
+    onUpdateBlueprint
+  };
+};
 
-// src/hooks/index.ts
-var hooks_exports = {};
-__export(hooks_exports, {
-  AiServiceOverloadedError: () => AiServiceOverloadedError,
-  AiServicePresets: () => AiServicePresets,
-  ChatProcessor: () => ChatProcessor,
-  Stable: () => Stable,
-  useBlueprints: () => useBlueprints,
-  useChatProcessor: () => useChatProcessor,
-  useChatServices: () => useChatServices,
-  useReferencesProvider: () => useReferencesProvider
-});
+// src/hooks/useChatProcessor.ts
+import { RegistryContext } from "@effect-rx/rx-react";
+import { useContext, useMemo as useMemo6 } from "react";
+import { useIntentDispatcher } from "@dxos/app-framework";
+import { AiConversation } from "@dxos/assistant";
+import { log as log2 } from "@dxos/log";
+import { fullyQualifiedId } from "@dxos/react-client/echo";
 
 // src/hooks/chat-processor.ts
-import { batch, computed, signal } from "@preact/signals-core";
-import { Effect } from "effect";
+import { Registry, Result, Rx } from "@effect-rx/rx-react";
+import { Effect, Option, Stream, pipe } from "effect";
 import { AiService, DEFAULT_EDGE_MODEL } from "@dxos/ai";
-import { ArtifactDiffResolver } from "@dxos/assistant";
+import { AiSession, ArtifactDiffResolver, createSystemPrompt } from "@dxos/assistant";
 import { Context } from "@dxos/context";
-import { Obj } from "@dxos/echo";
+import { Obj as Obj2 } from "@dxos/echo";
 import { runAndForwardErrors } from "@dxos/effect";
 import { log } from "@dxos/log";
-import { Filter, getVersion } from "@dxos/react-client/echo";
+import { Filter as Filter2, getVersion } from "@dxos/react-client/echo";
 import { DataType } from "@dxos/schema";
+
+// src/hooks/errors.ts
+var AiServiceOverloadedError = class extends Error {
+  code = "AI_SERVICE_OVERLOADED";
+};
+
+// src/hooks/chat-processor.ts
 function _ts_add_disposable_resource(env, value, async) {
   if (value !== null && value !== void 0) {
     if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
@@ -109,28 +174,84 @@ function _ts_dispose_resources(env) {
 }
 var __dxlog_file = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/chat-processor.ts";
 var defaultOptions = {
-  model: DEFAULT_EDGE_MODEL,
-  systemPrompt: "you are a helpful assistant"
+  model: DEFAULT_EDGE_MODEL
 };
-var ChatProcessor = class {
+var AiChatProcessor = class {
+  _services;
+  _conversation;
+  _options;
+  /**
+  * Last error.
+  */
+  // TODO(wittjosiah): Error should come from the message stream.
+  error;
+  /** Rx registry. */
+  _observableRegistry;
+  /** Current session. */
+  _session;
+  /**
+  * Current streaming message (from the AI service).
+  */
+  _streaming;
+  /**
+  * Streaming state.
+  */
+  streaming;
+  /**
+  * Pending messages (incl. the current user request).
+  */
+  _pending;
+  /**
+  * Array of Messages (incl. the current message being streamed).
+  */
+  messages;
   constructor(_services, _conversation, _options = defaultOptions) {
     this._services = _services;
     this._conversation = _conversation;
     this._options = _options;
-    this._pending = signal([]);
-    this._streaming = signal(void 0);
-    this.streaming = computed(() => this._streaming.value !== void 0);
-    this.error = signal(void 0);
-    this.messages = computed(() => {
-      const messages = [
-        ...this._pending.value
-      ];
-      if (this._streaming.value) {
-        messages.push(Obj.make(DataType.Message, this._streaming.value));
-      }
-      return messages;
+    this.error = Rx.make(Option.none());
+    this._session = Rx.make(Option.none());
+    this._streaming = Rx.make((get) => {
+      return pipe(get(this._session), Option.map((session) => Stream.fromQueue(session.blockQueue)), Option.getOrElse(() => Stream.make()), Stream.scan(Option.none(), (acc, blockOption) => Option.flatMap(blockOption, (block) => acc.pipe(Option.match({
+        onNone: () => [
+          block
+        ],
+        onSome: (message) => [
+          ...message.blocks.filter((b) => !b.pending),
+          block
+        ]
+      }), Option.some, Option.map((blocks) => Obj2.make(DataType.Message, {
+        created: (/* @__PURE__ */ new Date()).toISOString(),
+        sender: {
+          role: "assistant"
+        },
+        blocks
+      }))))));
+    });
+    this.streaming = Rx.make((get) => {
+      return pipe(get(this._streaming), Result.map((streaming) => Option.isSome(streaming)), Result.getOrElse(() => false));
+    });
+    this._pending = Rx.make((get) => {
+      const session = get(this._session);
+      return Option.isSome(session) ? pipe(session.value.messageQueue, Stream.fromQueue, Stream.scan([], (acc, message) => [
+        ...acc,
+        message
+      ])) : Stream.make();
+    });
+    this.messages = Rx.make((get) => {
+      const streaming = get(this._streaming);
+      return Result.map(get(this._pending), (pending) => Result.match(streaming, {
+        onInitial: () => pending,
+        onSuccess: (streaming2) => Option.match(streaming2.value, {
+          onNone: () => pending,
+          onSome: (message) => [
+            ...pending,
+            message
+          ]
+        }),
+        onFailure: () => pending
+      }));
     });
-    this._session = void 0;
     this._artifactDiffResolver = {
       resolve: async (artifacts) => {
         const space = this._options.extensions?.space;
@@ -139,7 +260,7 @@ var ChatProcessor = class {
         }
         const versions = /* @__PURE__ */ new Map();
         await Promise.all(artifacts.map(async (artifact) => {
-          const { objects: [object] } = await space.db.query(Filter.ids(artifact.id)).run();
+          const { objects: [object] } = await space.db.query(Filter2.ids(artifact.id)).run();
           if (!object) {
             return;
           }
@@ -151,32 +272,25 @@ var ChatProcessor = class {
         return versions;
       }
     };
-    this._tools = [
-      ..._options.tools ?? []
-    ];
-  }
-  get conversation() {
-    return this._conversation;
+    this._observableRegistry = this._options.observableRegistry ?? Registry.make();
+    if (this._options.model && !this._options.system) {
+      const capabilities = this._options.modelRegistry?.getCapabilities(this._options.model) ?? {};
+      this._options.system = createSystemPrompt(capabilities);
+    }
   }
   get context() {
     return this._conversation.context;
   }
+  get conversation() {
+    return this._conversation;
+  }
   get blueprintRegistry() {
     return this._options.blueprintRegistry;
   }
-  get tools() {
-    return this._tools;
-  }
-  /**
-  * @deprecated Replace with blueprints
-  */
-  setTools(tools) {
-    this._tools = tools;
-  }
   /**
   * Make GPT request.
   */
-  async request(message, options = {}) {
+  async request(message, _options = {}) {
     const env = {
       stack: [],
       error: void 0,
@@ -185,100 +299,36 @@ var ChatProcessor = class {
     try {
       const ctx = _ts_add_disposable_resource(env, Context.default(void 0, {
         F: __dxlog_file,
-        L: 138
+        L: 174
       }), true);
-      this._conversation.onBegin.on(ctx, (session) => {
-        log.info("onBegin", {
+      const session = new AiSession();
+      this._observableRegistry.set(this._session, Option.some(session));
+      ctx.onDispose(() => {
+        log.info("onDispose", {
           session,
           isDisposed: ctx.disposed
         }, {
           F: __dxlog_file,
-          L: 141,
+          L: 180,
           S: this,
           C: (f, a) => f(...a)
         });
-        this._session = session;
-        ctx.onDispose(() => {
-          log.info("onDispose", {
-            session,
-            isDisposed: ctx.disposed
-          }, {
-            F: __dxlog_file,
-            L: 145,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          if (this._session === session) {
-            this._session = void 0;
-          }
-        });
-        session.userMessage.on((message2) => {
-          log.info("userMessage", {
-            message: message2
-          }, {
-            F: __dxlog_file,
-            L: 153,
-            S: this,
-            C: (f, a) => f(...a)
-          });
-          this._pending.value = [
-            ...this._pending.value,
-            message2
-          ];
-        });
-        session.message.on((message2) => {
-          batch(() => {
-            this._pending.value = [
-              ...this._pending.value,
-              message2
-            ];
-            this._streaming.value = void 0;
-          });
-        });
-        session.update.on((block) => {
-          batch(() => {
-            if (!this._streaming.value) {
-              this._streaming.value = Obj.make(DataType.Message, {
-                created: (/* @__PURE__ */ new Date()).toISOString(),
-                sender: {
-                  role: "assistant"
-                },
-                blocks: [
-                  block
-                ]
-              });
-            } else if (this._streaming.value.blocks.at(-1)?.pending === true) {
-              this._streaming.value.blocks[this._streaming.value.blocks.length - 1] = block;
-            } else {
-              this._streaming.value.blocks.push(block);
+        Option.match(this._observableRegistry.get(this._session), {
+          onSome: (s) => {
+            if (s === session) {
+              this._observableRegistry.set(this._session, Option.none());
             }
-          });
-        });
-        session.block.on((block) => {
-          if (!this._streaming.value) {
-            this._streaming.value = Obj.make(DataType.Message, {
-              created: (/* @__PURE__ */ new Date()).toISOString(),
-              sender: {
-                role: "assistant"
-              },
-              blocks: [
-                block
-              ]
-            });
-          } else if (this._streaming.value.blocks.at(-1)?.pending === true) {
-            this._streaming.value.blocks[this._streaming.value.blocks.length - 1] = block;
-          } else {
-            this._streaming.value.blocks.push(block);
+          },
+          onNone: () => {
           }
         });
       });
       try {
         const messages = await runAndForwardErrors(this._conversation.run({
+          session,
           prompt: message,
-          // TODO(burdon): Construct from blueprints?
-          systemPrompt: this._options.systemPrompt
+          system: this._options.system
         }).pipe(
-          //
           Effect.provide(AiService.model(this._options.model ?? DEFAULT_EDGE_MODEL)),
           // TODO(dmaretskyi): Move ArtifactDiffResolver upstream.
           Effect.provideService(ArtifactDiffResolver, this._artifactDiffResolver),
@@ -288,7 +338,7 @@ var ChatProcessor = class {
               cause
             }, {
               F: __dxlog_file,
-              L: 243,
+              L: 205,
               S: this,
               C: (f, a) => f(...a)
             });
@@ -299,28 +349,27 @@ var ChatProcessor = class {
           messages
         }, {
           F: __dxlog_file,
-          L: 249,
+          L: 211,
           S: this,
           C: (f, a) => f(...a)
         });
       } catch (err) {
         log.catch(err, void 0, {
           F: __dxlog_file,
-          L: 251,
+          L: 213,
           S: this,
           C: (f, a) => f(...a)
         });
         if (err instanceof Error && err.message.includes("Overloaded")) {
-          this.error.value = new AiServiceOverloadedError("AI service overloaded", {
+          this._observableRegistry.set(this.error, Option.some(new AiServiceOverloadedError("AI service overloaded", {
             cause: err
-          });
+          })));
         } else {
-          this.error.value = new Error("AI service error", {
+          this._observableRegistry.set(this.error, Option.some(new Error("AI service error", {
             cause: err
-          });
+          })));
         }
       }
-      return this._reset();
     } catch (e) {
       env.error = e;
       env.hasError = true;
@@ -331,32 +380,16 @@ var ChatProcessor = class {
   }
   /**
   * Cancel pending requests.
-  * @returns Pending requests (incl. the request message).
   */
   async cancel() {
     log.info("cancelling...", void 0, {
       F: __dxlog_file,
-      L: 267,
+      L: 229,
       S: this,
       C: (f, a) => f(...a)
     });
-    this._session?.abort();
-    return this._reset();
-  }
-  async _reset() {
-    const messages = this._pending.value;
-    batch(() => {
-      this._pending.value = [];
-      this._streaming.value = void 0;
-    });
-    return messages;
-  }
-};
-var AiServiceOverloadedError = class extends Error {
-  constructor() {
-    super(...arguments);
-    this.code = "AI_SERVICE_OVERLOADED";
   }
+  _artifactDiffResolver;
 };
 
 // src/hooks/presets.ts
@@ -374,11 +407,11 @@ var createModelLabel = (model) => {
 var AiServicePresets = [
   {
     provider: "dxos-remote",
-    model: "@anthropic/claude-3-5-haiku-20241022"
+    model: "@anthropic/claude-opus-4-0"
   },
   {
     provider: "dxos-remote",
-    model: "@anthropic/claude-opus-4-0"
+    model: "@anthropic/claude-3-5-haiku-20241022"
   },
   {
     provider: "lm-studio",
@@ -387,6 +420,10 @@ var AiServicePresets = [
   {
     provider: "lm-studio",
     model: "@mlx-community/llama-3.2-3b-instruct"
+  },
+  {
+    model: "deepseek-r1:latest",
+    provider: "dxos-local"
   }
 ].map(({ model, provider }, i) => ({
   id: `preset-${i}`,
@@ -395,126 +432,108 @@ var AiServicePresets = [
   label: createModelLabel(model)
 }));
 
-// src/hooks/useBlueprints.ts
-import { useSignals as _useSignals } from "@preact-signals/safe-react/tracking";
-import { effect } from "@preact/signals-react";
-import { useCallback, useEffect, useState } from "react";
-import { Blueprint } from "@dxos/blueprints";
-import { Obj as Obj2, Ref } from "@dxos/echo";
-import { log as log2 } from "@dxos/log";
-import { isNonNullable } from "@dxos/util";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/useBlueprints.ts";
-var useBlueprints = (space, context, blueprintRegistry) => {
-  var _effect = _useSignals();
-  try {
-    const [blueprints, setBlueprints] = useState([]);
-    useEffect(() => {
-      let t;
-      effect(() => {
-        const refs = [
-          ...context.blueprints.value ?? []
-        ];
-        t = setTimeout(async () => {
-          const blueprints2 = (await Ref.Array.loadAll(refs)).filter(isNonNullable);
-          setBlueprints(blueprints2);
-        });
-      });
-      return () => clearTimeout(t);
-    }, [
-      context
-    ]);
-    const handleUpdate = useCallback((key, active) => {
-      log2.info("update", {
-        key,
-        active
-      }, {
-        F: __dxlog_file2,
-        L: 41,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      if (active) {
-        const blueprint = blueprintRegistry?.getByKey(key);
-        if (blueprint) {
-          const { id: _id, ...data } = blueprint;
-          const obj = space.db.add(Obj2.make(Blueprint.Blueprint, data));
-          void context.bind({
-            blueprints: [
-              Ref.make(obj)
-            ]
-          });
-        }
-      }
-    }, [
-      space,
-      context
-    ]);
-    return [
-      blueprints,
-      handleUpdate
-    ];
-  } finally {
-    _effect.f();
-  }
-};
-
 // src/hooks/useChatServices.ts
-var useChatServices_exports = {};
-__export(useChatServices_exports, {
-  useChatServices: () => useChatServices
-});
+import { AiToolkit } from "@effect/ai";
 import { Layer } from "effect";
-import { useMemo } from "react";
-import { useDeepCompareMemoize } from "use-deep-compare-effect";
-import { Capabilities, useCapabilities } from "@dxos/app-framework";
+import { useMemo as useMemo2 } from "react";
+import { Capabilities as Capabilities2, useCapabilities as useCapabilities2 } from "@dxos/app-framework";
 import { makeToolExecutionServiceFromFunctions, makeToolResolverFromFunctions } from "@dxos/assistant";
 import { ComputeEventLogger, CredentialsService, DatabaseService, LocalFunctionExecutionService, QueueService, RemoteFunctionExecutionService, TracingService } from "@dxos/functions";
 
-// src/capability-definitions.ts
-import { defineCapability } from "@dxos/app-framework";
-(function(AssistantCapabilities2) {
-  AssistantCapabilities2.AiServiceLayer = defineCapability(`${ASSISTANT_PLUGIN}/capability/ai-service-factory`);
-})(AssistantCapabilities || (AssistantCapabilities = {}));
-var AssistantCapabilities;
+// src/capabilities/index.ts
+import { lazy } from "@dxos/app-framework";
+var AiService2 = lazy(() => import("./ai-service-7KJ5LXBT.mjs"));
+var AppGraphBuilder = lazy(() => import("./app-graph-builder-ERU5XY2S.mjs"));
+var BlueprintDefinition = lazy(() => import("./blueprint-definition-CMGIZAOW.mjs"));
+var EdgeModelResolver = lazy(() => import("./edge-model-resolver-2HB4PCWH.mjs"));
+var IntentResolver = lazy(() => import("./intent-resolver-DGRO2XSG.mjs"));
+var ReactSurface = lazy(() => import("./react-surface-LPSIBHEJ.mjs"));
+var Settings = lazy(() => import("./settings-ZFNQYSYP.mjs"));
+var Toolkit = lazy(() => import("./toolkit-IW4FBLLB.mjs"));
 
 // src/hooks/useChatServices.ts
-__reExport(useChatServices_exports, assistant_star);
-import * as assistant_star from "@dxos/assistant";
-var useChatServices = ({ space }) => {
-  const aiServiceLayer = useCapabilities(AssistantCapabilities.AiServiceLayer).at(0) ?? Layer.die("AiService not found");
-  const functions = useCapabilities(Capabilities.Functions).flat();
-  return useMemo(() => {
-    return Layer.mergeAll(aiServiceLayer, makeToolResolverFromFunctions(functions), makeToolExecutionServiceFromFunctions(functions), CredentialsService.configuredLayer([]), space ? DatabaseService.makeLayer(space.db) : DatabaseService.notAvailable, space ? QueueService.makeLayer(space.queues) : QueueService.notAvailable, ComputeEventLogger.layerFromTracing).pipe(Layer.provideMerge(TracingService.layerNoop), Layer.provideMerge(LocalFunctionExecutionService.layer), Layer.provideMerge(RemoteFunctionExecutionService.mockLayer));
+var useChatServices = ({ space, chat }) => {
+  const serviceLayer = useCapabilities2(AssistantCapabilities.AiServiceLayer).at(0) ?? Layer.die("AiService not found");
+  const functions = useCapabilities2(Capabilities2.Functions);
+  const toolkits = useCapabilities2(Capabilities2.Toolkit);
+  const handlers = useCapabilities2(Capabilities2.ToolkitHandler);
+  return useMemo2(() => {
+    const allFunctions = functions.flat();
+    const toolkit = AiToolkit.merge(...toolkits);
+    const handlersLayer = Layer.mergeAll(Layer.empty, ...handlers);
+    return Layer.mergeAll(serviceLayer, makeToolResolverFromFunctions(allFunctions, toolkit), makeToolExecutionServiceFromFunctions(allFunctions, toolkit, handlersLayer), CredentialsService.layerFromDatabase(), ComputeEventLogger.layerFromTracing).pipe(Layer.provideMerge(Layer.mergeAll(space ? DatabaseService.layer(space.db) : DatabaseService.notAvailable, space ? QueueService.layer(space.queues) : QueueService.notAvailable, chat?.traceQueue?.target ? TracingService.layerQueue(chat.traceQueue?.target) : TracingService.layerNoop, LocalFunctionExecutionService.layer, RemoteFunctionExecutionService.mockLayer)));
   }, [
     space,
-    useDeepCompareMemoize(functions.map((f) => f.name))
+    functions,
+    toolkits,
+    handlers,
+    chat?.traceQueue?.target
   ]);
 };
 
-// src/hooks/index.ts
-__reExport(hooks_exports, useChatServices_exports);
+// src/hooks/useOnline.ts
+import { useState as useState2 } from "react";
+var useOnline = () => {
+  const [online, setOnline] = useState2(true);
+  return [
+    online,
+    setOnline
+  ];
+};
+
+// src/hooks/usePresets.ts
+import { useCallback as useCallback2, useEffect, useMemo as useMemo3, useState as useState3 } from "react";
+var usePresets = (online) => {
+  const [preset, setPreset] = useState3();
+  const presets = useMemo3(() => AiServicePresets.filter((preset2) => online === (preset2.provider === "dxos-remote")), [
+    online
+  ]);
+  const presetOptions = useMemo3(() => presets.map(({ id, model, label }) => ({
+    id,
+    label: label ?? model
+  })), [
+    presets
+  ]);
+  useEffect(() => {
+    setPreset(presets[0]);
+  }, [
+    presets
+  ]);
+  const handleChangePreset = useCallback2((id) => {
+    const preset2 = presets.find((preset3) => preset3.id === id);
+    if (preset2) {
+      setPreset(preset2);
+    }
+  }, [
+    presets
+  ]);
+  return {
+    preset,
+    presets: presetOptions,
+    onChangePreset: handleChangePreset
+  };
+};
 
 // src/hooks/useReferencesProvider.ts
-import { useMemo as useMemo2 } from "react";
-import { Capabilities as Capabilities2, useCapabilities as useCapabilities2 } from "@dxos/app-framework";
-import { Filter as Filter2, Obj as Obj3 } from "@dxos/echo";
+import { useMemo as useMemo4 } from "react";
+import { Capabilities as Capabilities3, useCapabilities as useCapabilities3 } from "@dxos/app-framework";
+import { Filter as Filter3, Obj as Obj3 } from "@dxos/echo";
 var useReferencesProvider = (space) => {
-  const artifactDefinitions = useCapabilities2(Capabilities2.ArtifactDefinition);
-  return useMemo2(() => {
+  const blueprints = useCapabilities3(Capabilities3.BlueprintDefinition);
+  return useMemo4(() => {
     if (!space) {
       return void 0;
     }
     return {
       getReferences: async ({ query }) => {
-        const schemas = artifactDefinitions.map((artifact) => artifact.schema);
-        const { objects } = await space.db.query(Filter2.or(...schemas.map((schema) => Filter2.type(schema)))).run();
+        const { objects } = await space.db.query(Filter3.everything()).run();
         return objects.filter((object) => stringMatch(query, Obj3.getLabel(object) ?? "")).filter((object) => !!Obj3.getDXN(object)).map((object) => ({
           uri: Obj3.getDXN(object).toString(),
           label: Obj3.getLabel(object) ?? ""
         }));
       },
       resolveReference: async ({ uri }) => {
-        const object = await space.db.query(Filter2.ids(uri)).first();
+        const object = await space.db.query(Filter3.ids(uri)).first();
         return {
           uri,
           label: Obj3.getLabel(object) ?? ""
@@ -523,55 +542,123 @@ var useReferencesProvider = (space) => {
     };
   }, [
     space,
-    artifactDefinitions
+    blueprints
   ]);
 };
 var stringMatch = (query, label) => label.toLowerCase().startsWith(query.toLowerCase());
 
+// src/hooks/useResolveRef.ts
+import { useMemo as useMemo5, useSyncExternalStore } from "react";
+var useResolvedRef = (space, ref) => {
+  const { subscribe, getSnapshot } = useMemo5(() => {
+    const resolver = space.db.graph.createRefResolver({});
+    let currentCallback = void 0;
+    return {
+      subscribe: (cb) => {
+        currentCallback = cb;
+        return () => {
+          if (currentCallback === cb) {
+            currentCallback = void 0;
+          }
+        };
+      },
+      getSnapshot: () => resolver?.resolveSync(ref.dxn, true, () => {
+        currentCallback?.();
+      })
+    };
+  }, [
+    space,
+    ref.dxn.toString()
+  ]);
+  return useSyncExternalStore(subscribe, getSnapshot);
+};
+
+// src/hooks/useExecutionGraph.ts
+import { Obj as Obj5 } from "@dxos/echo";
+import { useQueue } from "@dxos/react-client/echo";
+
+// src/execution-graph/execution-graph.ts
+import { AgentStatus } from "@dxos/ai";
+import { Obj as Obj4 } from "@dxos/echo";
+import { MESSAGE_PROPERTY_TOOL_CALL_ID } from "@dxos/functions";
+import { DataType as DataType2 } from "@dxos/schema";
+
+// src/hooks/useChatProcessor.ts
+var __dxlog_file2 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/useChatProcessor.ts";
+var useChatProcessor = ({ space, chat, preset, services, blueprintRegistry, settings }) => {
+  const observableRegistry = useContext(RegistryContext);
+  const { dispatchPromise: dispatch } = useIntentDispatcher();
+  const chatId = useMemo6(() => chat ? fullyQualifiedId(chat) : void 0, [
+    chat
+  ]);
+  const extensions = useMemo6(() => ({
+    space,
+    dispatch,
+    pivotId: chatId
+  }), [
+    dispatch,
+    space,
+    chatId
+  ]);
+  const conversation = useMemo6(() => {
+    if (!chat?.queue.target) {
+      return;
+    }
+    return new AiConversation({
+      queue: chat.queue.target
+    });
+  }, [
+    chat?.queue.target
+  ]);
+  const processor = useMemo6(() => {
+    if (!services || !conversation) {
+      return void 0;
+    }
+    log2("creating processor", {
+      preset,
+      model: preset?.model,
+      settings
+    }, {
+      F: __dxlog_file2,
+      L: 60,
+      S: void 0,
+      C: (f, a) => f(...a)
+    });
+    return new AiChatProcessor(services, conversation, {
+      extensions,
+      blueprintRegistry,
+      observableRegistry,
+      model: preset?.model
+    });
+  }, [
+    services,
+    conversation,
+    blueprintRegistry,
+    extensions,
+    preset
+  ]);
+  return processor;
+};
+var Stable = Object.freeze({
+  array: [],
+  object: {}
+});
+
+// src/components/Toolbox/Toolbox.tsx
+import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
+import React, { Fragment, useEffect as useEffect2, useState as useState4 } from "react";
+import { FunctionType } from "@dxos/functions";
+import { log as log5 } from "@dxos/log";
+import { Filter as Filter4, useQuery } from "@dxos/react-client/echo";
+import { useTranslation } from "@dxos/react-ui";
+import { mx } from "@dxos/react-ui-theme";
+
 // src/tools/function.ts
-import { createTool, ToolResult } from "@dxos/ai";
+import { ToolResult, createTool } from "@dxos/ai";
 import { Type } from "@dxos/echo";
 import { getInvocationUrl, getUserFunctionUrlInMetadata } from "@dxos/functions";
 import { log as log3 } from "@dxos/log";
 import { getMeta } from "@dxos/react-client/echo";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/tools/function.ts";
-var convertFunctionToTool = (fn, edgeUrl, spaceId) => {
-  if (!fn.description || !fn.inputSchema) {
-    return void 0;
-  }
-  const existingFunctionUrl = getUserFunctionUrlInMetadata(getMeta(fn));
-  if (!existingFunctionUrl) {
-    return void 0;
-  }
-  const url = getInvocationUrl(existingFunctionUrl, edgeUrl, {
-    spaceId
-  });
-  return createTool("user-function", {
-    name: fn.name,
-    description: fn.description,
-    schema: Type.toEffectSchema(fn.inputSchema),
-    execute: async (input) => {
-      log3.info("execute function tool", {
-        name: fn.name,
-        url,
-        input
-      }, {
-        F: __dxlog_file3,
-        L: 34,
-        S: void 0,
-        C: (f, a) => f(...a)
-      });
-      const response = await fetch(url, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(input)
-      });
-      return ToolResult.Success(await response.text());
-    }
-  });
-};
 
 // src/tools/openapi.ts
 import { Schema as Schema2 } from "effect";
@@ -582,11 +669,11 @@ import { normalizeSchema } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
 import { log as log4 } from "@dxos/log";
 import { deepMapValues } from "@dxos/util";
-var __dxlog_file4 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/tools/openapi.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/tools/openapi.ts";
 var createToolsFromService = async (service) => {
   invariant(service.interfaces?.length === 1 && service.interfaces[0].kind === "api", void 0, {
-    F: __dxlog_file4,
-    L: 24,
+    F: __dxlog_file3,
+    L: 27,
     S: void 0,
     A: [
       "service.interfaces?.length === 1 && service.interfaces[0].kind === 'api'",
@@ -595,8 +682,8 @@ var createToolsFromService = async (service) => {
   });
   const iface = service.interfaces[0];
   invariant(iface.schemaUrl, void 0, {
-    F: __dxlog_file4,
-    L: 26,
+    F: __dxlog_file3,
+    L: 29,
     S: void 0,
     A: [
       "iface.schemaUrl",
@@ -604,8 +691,8 @@ var createToolsFromService = async (service) => {
     ]
   });
   invariant(iface.schemaUrl, void 0, {
-    F: __dxlog_file4,
-    L: 27,
+    F: __dxlog_file3,
+    L: 30,
     S: void 0,
     A: [
       "iface.schemaUrl",
@@ -622,8 +709,8 @@ var createToolsFromApi = async (url, options) => {
   log4("spec", {
     spec
   }, {
-    F: __dxlog_file4,
-    L: 37,
+    F: __dxlog_file3,
+    L: 40,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -640,8 +727,8 @@ var createToolsFromApi = async (url, options) => {
         method,
         methodItem
       }, {
-        F: __dxlog_file4,
-        L: 48,
+        F: __dxlog_file3,
+        L: 51,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -658,8 +745,8 @@ var createToolsFromApi = async (url, options) => {
         log4("parameter", {
           parameter
         }, {
-          F: __dxlog_file4,
-          L: 63,
+          F: __dxlog_file3,
+          L: 66,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -681,8 +768,8 @@ var createToolsFromApi = async (url, options) => {
       log4("inputSchema", {
         inputSchema
       }, {
-        F: __dxlog_file4,
-        L: 88,
+        F: __dxlog_file3,
+        L: 91,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -693,8 +780,8 @@ var createToolsFromApi = async (url, options) => {
           path,
           method
         }, {
-          F: __dxlog_file4,
-          L: 93,
+          F: __dxlog_file3,
+          L: 96,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -772,8 +859,8 @@ var callApiEndpoint = async (endpoint, input) => {
     name: endpoint.path,
     input
   }, {
-    F: __dxlog_file4,
-    L: 180,
+    F: __dxlog_file3,
+    L: 183,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -831,8 +918,8 @@ var callApiEndpoint = async (endpoint, input) => {
     url,
     request
   }, {
-    F: __dxlog_file4,
-    L: 243,
+    F: __dxlog_file3,
+    L: 246,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -842,8 +929,8 @@ var callApiEndpoint = async (endpoint, input) => {
     status: response.status,
     statusText: response.statusText
   }, {
-    F: __dxlog_file4,
-    L: 246,
+    F: __dxlog_file3,
+    L: 249,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -866,8 +953,8 @@ var callApiEndpoint = async (endpoint, input) => {
       log4.error("error", {
         error
       }, {
-        F: __dxlog_file4,
-        L: 264,
+        F: __dxlog_file3,
+        L: 267,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -877,8 +964,8 @@ var callApiEndpoint = async (endpoint, input) => {
       log4.error("error", {
         error
       }, {
-        F: __dxlog_file4,
-        L: 268,
+        F: __dxlog_file3,
+        L: 271,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -892,8 +979,8 @@ var getEndpointUrl = (endpoint) => {
     url = endpoint.document.servers[0].url;
   } else {
     invariant(!isV3_1(endpoint.document), void 0, {
-      F: __dxlog_file4,
-      L: 279,
+      F: __dxlog_file3,
+      L: 282,
       S: void 0,
       A: [
         "!isV3_1(endpoint.document)",
@@ -912,8 +999,8 @@ var resolveAuthorization = async (authorization) => {
   switch (authorization.type) {
     case "api-key": {
       invariant(authorization.placement.type === "authorization-header", void 0, {
-        F: __dxlog_file4,
-        L: 295,
+        F: __dxlog_file3,
+        L: 298,
         S: void 0,
         A: [
           "authorization.placement.type === 'authorization-header'",
@@ -950,8 +1037,8 @@ var resolveJsonSchema = (schema, base) => {
             ref: value.$ref,
             base
           }, {
-            F: __dxlog_file4,
-            L: 328,
+            F: __dxlog_file3,
+            L: 331,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -965,138 +1052,9 @@ var isV3_1 = (document) => {
   return document.openapi === "3.0.1";
 };
 
-// src/hooks/useChatProcessor.ts
-var __dxlog_file5 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/useChatProcessor.ts";
-var useChatProcessor = ({ preset, space, chat, services, blueprintRegistry, settings, instructions, artifact, noPluginArtifacts }) => {
-  const { dispatchPromise: dispatch } = useIntentDispatcher();
-  const globalTools = useCapabilities3(Capabilities3.Tools);
-  let artifacts = useCapabilities3(Capabilities3.ArtifactDefinition);
-  if (noPluginArtifacts) {
-    artifacts = Stable.array;
-  }
-  const remoteServices = useQuery(space, Filter3.type(ServiceType));
-  const [serviceTools, setServiceTools] = useState2([]);
-  useEffect2(() => {
-    log5("creating service tools...", void 0, {
-      F: __dxlog_file5,
-      L: 68,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    queueMicrotask(async () => {
-      const tools2 = await Promise.all(remoteServices.map((service) => createToolsFromService(service)));
-      setServiceTools(tools2.flat());
-    });
-  }, [
-    remoteServices
-  ]);
-  const config = useConfig();
-  const functions = useQuery(space, Filter3.type(FunctionType));
-  const chatId = useMemo3(() => chat ? fullyQualifiedId(chat) : void 0, [
-    chat
-  ]);
-  const [tools, extensions] = useMemo3(() => {
-    log5("creating tools...", void 0, {
-      F: __dxlog_file5,
-      L: 80,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    const tools2 = [
-      ...globalTools.flat(),
-      ...serviceTools,
-      ...functions.map((fn) => convertFunctionToTool(fn, config.values.runtime?.services?.edge?.url ?? "", space?.id)).filter(isNonNullable2)
-    ];
-    const extensions2 = {
-      space,
-      dispatch,
-      pivotId: chatId
-    };
-    return [
-      tools2,
-      extensions2
-    ];
-  }, [
-    dispatch,
-    globalTools,
-    space,
-    chatId,
-    serviceTools,
-    functions
-  ]);
-  const systemPrompt = useMemo3(() => createSystemPrompt({
-    artifacts: artifacts.map((definition) => `${definition.name}
-${definition.instructions}`),
-    artifact,
-    instructions
-  }), [
-    artifacts,
-    artifact,
-    instructions
-  ]);
-  const conversation = useMemo3(() => {
-    if (!chat?.queue.target) {
-      return;
-    }
-    return new Conversation({
-      queue: chat.queue.target
-    });
-  }, [
-    chat?.queue.target
-  ]);
-  const processor = useMemo3(() => {
-    if (!services || !conversation) {
-      return void 0;
-    }
-    log5.info("creating processor", {
-      preset,
-      artifacts: artifacts.length,
-      systemPrompt: systemPrompt.length,
-      model: preset?.model,
-      settings
-    }, {
-      F: __dxlog_file5,
-      L: 118,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    return new ChatProcessor(services, conversation, {
-      tools,
-      extensions,
-      blueprintRegistry,
-      artifacts,
-      systemPrompt,
-      model: preset?.model
-    });
-  }, [
-    services,
-    conversation,
-    tools,
-    blueprintRegistry,
-    artifacts,
-    extensions,
-    systemPrompt,
-    preset
-  ]);
-  return processor;
-};
-var Stable = Object.freeze({
-  array: [],
-  object: {}
-});
-
 // src/components/Toolbox/Toolbox.tsx
-import { useSignals as _useSignals2 } from "@preact-signals/safe-react/tracking";
-import React, { useState as useState3, useEffect as useEffect3, Fragment } from "react";
-import { parseToolName } from "@dxos/ai";
-import { Capabilities as Capabilities4, useCapabilities as useCapabilities4 } from "@dxos/app-framework";
-import { FunctionType as FunctionType2 } from "@dxos/functions";
-import { log as log6 } from "@dxos/log";
-import { Filter as Filter4, useQuery as useQuery2 } from "@dxos/react-client/echo";
-import { useTranslation } from "@dxos/react-ui";
-import { mx } from "@dxos/react-ui-theme";
-var __dxlog_file6 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/components/Toolbox/Toolbox.tsx";
-var Toolbox = ({ classNames, artifacts, functions, services, blueprints, activeBlueprints, striped }) => {
+var __dxlog_file4 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/components/Toolbox/Toolbox.tsx";
+var Toolbox = ({ classNames, functions, services, blueprints, activeBlueprints }) => {
   var _effect = _useSignals2();
   try {
     const { t } = useTranslation(meta.id);
@@ -1108,7 +1066,7 @@ var Toolbox = ({ classNames, artifacts, functions, services, blueprints, activeB
         name: target?.name ?? "",
         description: target?.description ?? "",
         subitems: target?.tools.map((toolId) => ({
-          name: `\u2219 ${parseToolName(toolId)}`
+          name: `\u2219 ${safeToolId(toolId)}`
         }))
       }))
     }), activeBlueprints && activeBlueprints.length > 0 && /* @__PURE__ */ React.createElement(Section, {
@@ -1117,17 +1075,7 @@ var Toolbox = ({ classNames, artifacts, functions, services, blueprints, activeB
         name: target?.name ?? "",
         description: target?.description ?? "",
         subitems: target?.tools.map((toolId) => ({
-          name: `\u2219 ${parseToolName(toolId)}`
-        }))
-      }))
-    }), artifacts && artifacts.length > 0 && /* @__PURE__ */ React.createElement(Section, {
-      title: "Artifacts",
-      items: artifacts.map(({ name, description, tools }) => ({
-        name,
-        description,
-        subitems: tools.map(({ name: name2, description: description2 }) => ({
-          name: `\u2219 ${parseToolName(name2)}`,
-          description: description2
+          name: `\u2219 ${safeToolId(toolId)}`
         }))
       }))
     }), services && services.length > 0 && /* @__PURE__ */ React.createElement(Section, {
@@ -1146,7 +1094,7 @@ var Toolbox = ({ classNames, artifacts, functions, services, blueprints, activeB
         name,
         description
       }))
-    }), !blueprints?.length && !activeBlueprints?.length && !artifacts?.length && !services?.length && !functions?.length && /* @__PURE__ */ React.createElement("div", null, t("no tools")));
+    }), !blueprints?.length && !activeBlueprints?.length && !services?.length && !functions?.length && /* @__PURE__ */ React.createElement("div", null, t("no tools")));
   } finally {
     _effect.f();
   }
@@ -1184,15 +1132,14 @@ var Section = ({ title, items, striped }) => {
 var ToolboxContainer = ({ classNames, space, processor }) => {
   var _effect = _useSignals2();
   try {
-    const artifactDefinitions = useCapabilities4(Capabilities4.ArtifactDefinition);
-    const services = useQuery2(space, Filter4.type(ServiceType));
-    const [serviceTools, setServiceTools] = useState3([]);
-    useEffect3(() => {
-      log6("creating service tools...", {
+    const services = useQuery(space, Filter4.type(ServiceType));
+    const [serviceTools, setServiceTools] = useState4([]);
+    useEffect2(() => {
+      log5("creating service tools...", {
         services: services.length
       }, {
-        F: __dxlog_file6,
-        L: 150,
+        F: __dxlog_file4,
+        L: 123,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -1206,11 +1153,10 @@ var ToolboxContainer = ({ classNames, space, processor }) => {
     }, [
       services
     ]);
-    const functions = useQuery2(space, Filter4.type(FunctionType2));
+    const functions = useQuery(space, Filter4.type(FunctionType));
     return /* @__PURE__ */ React.createElement(Toolbox, {
       classNames,
       blueprints: processor?.context.blueprints.value,
-      artifacts: artifactDefinitions,
       services: serviceTools,
       functions
     });
@@ -1218,25 +1164,28 @@ var ToolboxContainer = ({ classNames, space, processor }) => {
     _effect.f();
   }
 };
+var safeToolId = (name) => {
+  return name.split("_").pop();
+};
 
 // src/components/Chat/Chat.tsx
-import { useSignals as _useSignals11 } from "@preact-signals/safe-react/tracking";
+import { useSignals as _useSignals12 } from "@preact-signals/safe-react/tracking";
 import { Prec } from "@codemirror/state";
 import { keymap } from "@codemirror/view";
+import { Result as Result2, useRxValue } from "@effect-rx/rx-react";
 import { createContext } from "@radix-ui/react-context";
-import { dedupeWith } from "effect/Array";
-import React10, { useCallback as useCallback3, useEffect as useEffect6, useMemo as useMemo7, useRef as useRef2, useState as useState6 } from "react";
-import { CollaborationActions, createIntent, useIntentDispatcher as useIntentDispatcher2 } from "@dxos/app-framework";
+import { Array as Array2, Option as Option2 } from "effect";
+import React11, { useCallback as useCallback4, useEffect as useEffect5, useMemo as useMemo11, useRef as useRef2, useState as useState7 } from "react";
 import { Event } from "@dxos/async";
-import { DXN, Obj as Obj5, Ref as Ref3 } from "@dxos/echo";
-import { log as log8 } from "@dxos/log";
+import { DXN as DXN2, Obj as Obj9, Ref as Ref4 } from "@dxos/echo";
+import { log as log6 } from "@dxos/log";
 import { useVoiceInput } from "@dxos/plugin-transcription";
-import { getSpace, useQueue } from "@dxos/react-client/echo";
+import { getSpace, useQueue as useQueue2 } from "@dxos/react-client/echo";
 import { useIdentity } from "@dxos/react-client/halo";
-import { Input as Input2, useTranslation as useTranslation6 } from "@dxos/react-ui";
+import { Input, useTranslation as useTranslation7 } from "@dxos/react-ui";
 import { ChatEditor, references } from "@dxos/react-ui-chat";
 import { mx as mx6 } from "@dxos/react-ui-theme";
-import { DataType as DataType2 } from "@dxos/schema";
+import { DataType as DataType3 } from "@dxos/schema";
 import { isNotFalsy as isNotFalsy2 } from "@dxos/util";
 
 // src/components/ChatPrompt/ChatActions.tsx
@@ -1299,23 +1248,22 @@ var ChatActions = ({ classNames, children, microphone, recording, processing, on
   }
 };
 
-// src/components/ChatPrompt/ChatOptionsMenu.tsx
+// src/components/ChatPrompt/ChatOptions.tsx
 import { useSignals as _useSignals4 } from "@preact-signals/safe-react/tracking";
-import React3, { useMemo as useMemo4 } from "react";
-import { DropdownMenu, IconButton as IconButton2, Input, useTranslation as useTranslation3 } from "@dxos/react-ui";
-var ChatOptionsMenu = ({ blueprintRegistry, blueprints, onChange }) => {
+import React3, { useMemo as useMemo7 } from "react";
+import { DropdownMenu, Icon, IconButton as IconButton2, useTranslation as useTranslation3 } from "@dxos/react-ui";
+var ChatOptions = ({ context, blueprintRegistry, onUpdateBlueprint }) => {
   var _effect = _useSignals4();
   try {
     const { t } = useTranslation3(meta.id);
-    const blueprintOptions = useMemo4(() => blueprintRegistry?.query().map((blueprint) => ({
-      key: blueprint.key,
-      label: blueprint.name
-    })), [
+    const blueprints = useMemo7(() => blueprintRegistry?.query() ?? [], [
       blueprintRegistry
     ]);
+    const activeBlueprints = useBlueprints({
+      context
+    });
     return /* @__PURE__ */ React3.createElement(DropdownMenu.Root, null, /* @__PURE__ */ React3.createElement(DropdownMenu.Trigger, {
-      asChild: true,
-      disabled: !blueprintOptions?.length
+      asChild: true
     }, /* @__PURE__ */ React3.createElement(IconButton2, {
       icon: "ph--plus--regular",
       variant: "ghost",
@@ -1324,14 +1272,19 @@ var ChatOptionsMenu = ({ blueprintRegistry, blueprints, onChange }) => {
       label: t("button add blueprint")
     })), /* @__PURE__ */ React3.createElement(DropdownMenu.Portal, null, /* @__PURE__ */ React3.createElement(DropdownMenu.Content, {
       side: "left"
-    }, /* @__PURE__ */ React3.createElement(DropdownMenu.Viewport, null, blueprintOptions?.map((option) => /* @__PURE__ */ React3.createElement(DropdownMenu.Item, {
-      key: option.key
-    }, /* @__PURE__ */ React3.createElement(Input.Root, null, /* @__PURE__ */ React3.createElement(Input.Checkbox, {
-      checked: !!blueprints?.find((blueprint) => blueprint.key === option.key),
-      onCheckedChange: (checked) => onChange?.(option.key, !!checked)
-    }), /* @__PURE__ */ React3.createElement(Input.Label, {
-      classNames: "m-0"
-    }, option.label))))), /* @__PURE__ */ React3.createElement(DropdownMenu.Arrow, null))));
+    }, /* @__PURE__ */ React3.createElement(DropdownMenu.Viewport, null, blueprints.map((blueprint) => /* @__PURE__ */ React3.createElement(DropdownMenu.CheckboxItem, {
+      key: blueprint.key,
+      checked: activeBlueprints?.get(blueprint.key) !== void 0,
+      onCheckedChange: (checked) => onUpdateBlueprint?.(blueprint.key, !!checked),
+      classNames: "gap-2"
+    }, /* @__PURE__ */ React3.createElement("div", {
+      className: "flex-1 min-is-0"
+    }, blueprint.name), /* @__PURE__ */ React3.createElement(DropdownMenu.ItemIndicator, {
+      asChild: true
+    }, /* @__PURE__ */ React3.createElement(Icon, {
+      icon: "ph--check--regular",
+      size: 4
+    }))))), /* @__PURE__ */ React3.createElement(DropdownMenu.Arrow, null))));
   } finally {
     _effect.f();
   }
@@ -1361,38 +1314,38 @@ var ChatPresets = ({ presets, preset, onChange }) => {
 
 // src/components/ChatPrompt/ChatReferences.tsx
 import { useSignals as _useSignals6 } from "@preact-signals/safe-react/tracking";
-import React5, { useCallback as useCallback2 } from "react";
-import { Filter as Filter5, Obj as Obj4, Ref as Ref2 } from "@dxos/echo";
+import React5, { useCallback as useCallback3 } from "react";
+import { Filter as Filter5, Obj as Obj6, Ref as Ref2 } from "@dxos/echo";
 import { useAsyncState, useTranslation as useTranslation4 } from "@dxos/react-ui";
 import { TagPicker } from "@dxos/react-ui-tag-picker";
 import { mx as mx3 } from "@dxos/react-ui-theme";
-import { isNonNullable as isNonNullable3 } from "@dxos/util";
+import { isNonNullable as isNonNullable2 } from "@dxos/util";
 var ChatReferences = ({ classNames, space, context, onUpdate }) => {
   var _effect = _useSignals6();
   try {
-    const { t: _t } = useTranslation4(meta.id);
+    const { t } = useTranslation4(meta.id);
     const [items] = useAsyncState(async () => {
       const objects = await Ref2.Array.loadAll(context.objects.value ?? []);
-      return objects.filter(isNonNullable3).map((obj) => ({
-        id: obj.id,
-        label: Obj4.getLabel(obj) ?? obj.id
+      return objects.filter(isNonNullable2).map((obj) => ({
+        id: Obj6.getDXN(obj).toString(),
+        label: Obj6.getLabel(obj) ?? Obj6.getTypename(obj) ?? obj.id
       }));
     }, [
       context
     ]);
-    const handleSearch = useCallback2((text, ids) => {
+    const handleSearch = useCallback3((text, dxns) => {
       const objects = space.db.query(Filter5.everything()).runSync();
       return objects.map(({ object }) => ({
-        id: object.id,
-        label: Obj4.getLabel(object) ?? ""
-      })).filter(({ id, label }) => !ids.includes(id) && label.toLocaleLowerCase().includes(text.toLocaleLowerCase()));
+        id: Obj6.getDXN(object).toString(),
+        label: Obj6.getLabel(object) ?? ""
+      })).filter(({ id, label }) => !dxns.includes(id) && label.toLocaleLowerCase().includes(text.toLocaleLowerCase()));
     }, [
       space
     ]);
     return /* @__PURE__ */ React5.createElement(TagPicker, {
       classNames: mx3("h-[1.75rem] text-sm", classNames),
       mode: "multi-select",
-      // placeholder={t('context objects placeholder')}
+      placeholder: t("context objects placeholder"),
       items,
       onSearch: handleSearch,
       onUpdate
@@ -1404,15 +1357,15 @@ var ChatReferences = ({ classNames, space, context, onUpdate }) => {
 
 // src/components/ChatPrompt/ChatStatusIndicator.tsx
 import { useSignals as _useSignals7 } from "@preact-signals/safe-react/tracking";
-import React6, { useEffect as useEffect4, useState as useState4 } from "react";
-import { Icon, Tooltip, useTimeout } from "@dxos/react-ui";
+import React6, { useEffect as useEffect3, useState as useState5 } from "react";
+import { Icon as Icon2, Tooltip, useTimeout } from "@dxos/react-ui";
 import { Spinner } from "@dxos/react-ui-sfx";
 import { errorText } from "@dxos/react-ui-theme";
 var ChatStatusIndicator = ({ preset, error, processing }) => {
   var _effect = _useSignals7();
   try {
-    const [init, setInit] = useState4(false);
-    useEffect4(() => {
+    const [init, setInit] = useState5(false);
+    useEffect3(() => {
       setInit(false);
     }, [
       preset
@@ -1426,7 +1379,7 @@ var ChatStatusIndicator = ({ preset, error, processing }) => {
       return /* @__PURE__ */ React6.createElement(Tooltip.Trigger, {
         content: error.message,
         delayDuration: 0
-      }, /* @__PURE__ */ React6.createElement(Icon, {
+      }, /* @__PURE__ */ React6.createElement(Icon2, {
         icon: "ph--warning-circle--regular",
         classNames: errorText,
         size: 5
@@ -1441,47 +1394,71 @@ var ChatStatusIndicator = ({ preset, error, processing }) => {
 };
 
 // src/components/ChatThread/ChatThread.tsx
-import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
-import React9, { forwardRef, useMemo as useMemo6 } from "react";
+import { useSignals as _useSignals11 } from "@preact-signals/safe-react/tracking";
+import React10, { forwardRef, useMemo as useMemo10 } from "react";
 import { PublicKey } from "@dxos/keys";
 import { ScrollContainer } from "@dxos/react-ui-components";
 import { mx as mx5 } from "@dxos/react-ui-theme";
 import { keyToFallback } from "@dxos/util";
 
 // src/components/ChatThread/ChatMessage.tsx
-import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
-import React8, { Fragment as Fragment2 } from "react";
-import { Surface } from "@dxos/app-framework";
+import { useSignals as _useSignals10 } from "@preact-signals/safe-react/tracking";
+import React9, { Fragment as Fragment2, useMemo as useMemo9 } from "react";
+import { ErrorBoundary, Surface } from "@dxos/app-framework";
+import { resolveRef } from "@dxos/client";
+import { Obj as Obj8 } from "@dxos/echo";
 import { invariant as invariant2 } from "@dxos/invariant";
-import { Button, Icon as Icon2, IconButton as IconButton3, useTranslation as useTranslation5 } from "@dxos/react-ui";
+import { DXN, DXN_ECHO_REGEXP } from "@dxos/keys";
+import { useClient } from "@dxos/react-client";
+import { Button, IconButton as IconButton3, Link, useTranslation as useTranslation6 } from "@dxos/react-ui";
 import { MarkdownViewer, ToggleContainer as NativeToggleContainer } from "@dxos/react-ui-components";
 import { mx as mx4 } from "@dxos/react-ui-theme";
 import { safeParseJson } from "@dxos/util";
 
-// src/components/ChatThread/ToolBlock.tsx
+// src/components/ChatThread/Link.tsx
 import { useSignals as _useSignals8 } from "@preact-signals/safe-react/tracking";
-import React7, { useEffect as useEffect5, useMemo as useMemo5, useRef, useState as useState5 } from "react";
-import { log as log7 } from "@dxos/log";
+import React7 from "react";
+import { Obj as Obj7, Ref as Ref3 } from "@dxos/echo";
+import { DxRefTag } from "@dxos/lit-ui/react";
+var ObjectLink = ({ space, dxn }) => {
+  var _effect = _useSignals8();
+  try {
+    const object = useResolvedRef(space, Ref3.fromDXN(dxn));
+    const title = Obj7.getLabel(object) ?? object?.id ?? dxn.toString();
+    return /* @__PURE__ */ React7.createElement(DxRefTag, {
+      refid: dxn.toString()
+    }, title);
+  } finally {
+    _effect.f();
+  }
+};
+
+// src/components/ChatThread/ToolBlock.tsx
+import { useSignals as _useSignals9 } from "@preact-signals/safe-react/tracking";
+import React8, { useEffect as useEffect4, useMemo as useMemo8, useRef, useState as useState6 } from "react";
+import { useTranslation as useTranslation5 } from "@dxos/react-ui";
 import { NumericTabs, StatusRoll, ToggleContainer } from "@dxos/react-ui-components";
 import { Json as NativeJson } from "@dxos/react-ui-syntax-highlighter";
-import { isNonNullable as isNonNullable4, isNotFalsy } from "@dxos/util";
-var __dxlog_file7 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/components/ChatThread/ToolBlock.tsx";
+import { isNonNullable as isNonNullable3, isNotFalsy } from "@dxos/util";
 var isToolMessage = (message) => {
   return message.blocks.some((block) => block._tag === "toolCall" || block._tag === "toolResult");
 };
 var getToolName2 = (tool) => {
   return tool.namespace && tool.function ? `${tool.namespace}:${tool.function}` : tool.name.split("_").pop();
 };
-var getToolCaption = (tool, status) => {
-  if (!tool) {
-    return "Calling tool...";
-  }
-  return status?.message ?? tool.caption ?? `Calling ${getToolName2(tool)}...`;
-};
 var ToolBlock = ({ classNames, message, tools }) => {
-  var _effect = _useSignals8();
+  var _effect = _useSignals9();
   try {
+    const { t } = useTranslation5(meta.id);
     const { blocks = [] } = message;
+    const getToolCaption = (tool, status) => {
+      if (!tool) {
+        return t("calling tool label");
+      }
+      return status?.message ?? tool.caption ?? [
+        t("calling label") + getToolName2(tool)
+      ].join(" ");
+    };
     let request;
     const toolBlocks = blocks.filter((block) => block._tag === "toolCall" || block._tag === "toolResult");
     const items = toolBlocks.map((block) => {
@@ -1495,40 +1472,32 @@ var ToolBlock = ({ classNames, message, tools }) => {
             block
           };
           return {
-            title: getToolCaption(request.tool, void 0),
+            title: getToolCaption(request.tool, request.block.status),
             block
           };
         }
         case "toolResult": {
-          if (!request) {
-            log7.warn("unexpected message", {
-              block
-            }, {
-              F: __dxlog_file7,
-              L: 59,
-              S: void 0,
-              C: (f, a) => f(...a)
-            });
+          if (!request || block.error) {
             return {
-              title: "Error",
+              title: t("error label"),
               block
             };
           }
           return {
-            title: `${getToolCaption(request.tool, void 0)} (Success)`,
+            title: getToolCaption(request.tool, request.block.status),
             block
           };
         }
         default: {
           request = void 0;
           return {
-            title: "Error",
+            title: t("error label"),
             block
           };
         }
       }
-    }).filter(isNonNullable4);
-    return /* @__PURE__ */ React7.createElement(ToolContainer, {
+    }).filter(isNonNullable3);
+    return /* @__PURE__ */ React8.createElement(ToolContainer, {
       classNames,
       items
     });
@@ -1537,12 +1506,12 @@ var ToolBlock = ({ classNames, message, tools }) => {
   }
 };
 var ToolContainer = ({ classNames, items }) => {
-  var _effect = _useSignals8();
+  var _effect = _useSignals9();
   try {
     const tabsRef = useRef(null);
-    const [selected, setSelected] = useState5(0);
-    const [open, setOpen] = useState5(false);
-    useEffect5(() => {
+    const [selected, setSelected] = useState6(0);
+    const [open, setOpen] = useState6(false);
+    useEffect4(() => {
       if (open) {
         tabsRef.current?.focus();
       }
@@ -1556,9 +1525,9 @@ var ToolContainer = ({ classNames, items }) => {
         setSelected(index);
       }
     };
-    const title = useMemo5(() => {
+    const title = useMemo8(() => {
       const lines = items.map((item) => item.title).filter(isNotFalsy);
-      return /* @__PURE__ */ React7.createElement(StatusRoll, {
+      return /* @__PURE__ */ React8.createElement(StatusRoll, {
         key: "status-roll",
         lines,
         duration: 1e3,
@@ -1567,7 +1536,7 @@ var ToolContainer = ({ classNames, items }) => {
     }, [
       items
     ]);
-    return /* @__PURE__ */ React7.createElement(ToggleContainer, {
+    return /* @__PURE__ */ React8.createElement(ToggleContainer, {
       classNames: [
         "flex flex-col",
         classNames
@@ -1575,14 +1544,14 @@ var ToolContainer = ({ classNames, items }) => {
       title,
       open,
       onChangeOpen: setOpen
-    }, /* @__PURE__ */ React7.createElement("div", {
+    }, /* @__PURE__ */ React8.createElement("div", {
       className: "w-full grid grid-cols-[32px_1fr]"
-    }, /* @__PURE__ */ React7.createElement(NumericTabs, {
+    }, /* @__PURE__ */ React8.createElement(NumericTabs, {
       ref: tabsRef,
       length: items.length,
       selected,
       onSelect: handleSelect
-    }), /* @__PURE__ */ React7.createElement(Json, {
+    }), /* @__PURE__ */ React8.createElement(Json, {
       data: items[selected].block
     })));
   } finally {
@@ -1590,9 +1559,9 @@ var ToolContainer = ({ classNames, items }) => {
   }
 };
 var Json = ({ data }) => {
-  var _effect = _useSignals8();
+  var _effect = _useSignals9();
   try {
-    return /* @__PURE__ */ React7.createElement(NativeJson, {
+    return /* @__PURE__ */ React8.createElement(NativeJson, {
       data,
       classNames: "!p-1 text-xs bg-transparent"
     });
@@ -1602,24 +1571,27 @@ var Json = ({ data }) => {
 };
 
 // src/components/ChatThread/ChatMessage.tsx
-var __dxlog_file8 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/components/ChatThread/ChatMessage.tsx";
-var ChatMessage = ({ classNames, debug, space, message, processor, tools, onEvent }) => {
-  var _effect = _useSignals9();
+var __dxlog_file5 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/components/ChatThread/ChatMessage.tsx";
+var panelClasses = "flex flex-col is-full bg-activeSurface rounded-sm";
+var marginClasses = "pie-4 pis-4";
+var paddingClasses = "pis-2 pie-2 pbs-0.5 pbe-0.5";
+var ChatMessage = ({ classNames, debug, space, message, tools, onEvent, onDelete }) => {
+  var _effect = _useSignals10();
   try {
-    const { t } = useTranslation5(meta.id);
+    const { t } = useTranslation6(meta.id);
     const { sender: { role }, blocks } = message;
     if (isToolMessage(message)) {
-      return /* @__PURE__ */ React8.createElement(MessageContainer, {
+      return /* @__PURE__ */ React9.createElement(MessageItem, {
         classNames: mx4(classNames, "animate-[fadeIn_0.5s]")
-      }, /* @__PURE__ */ React8.createElement(ToolBlock, {
+      }, /* @__PURE__ */ React9.createElement(ToolBlock, {
         classNames: panelClasses,
         message,
         tools
       }));
     }
-    return /* @__PURE__ */ React8.createElement(React8.Fragment, null, debug && /* @__PURE__ */ React8.createElement("div", {
+    return /* @__PURE__ */ React9.createElement(React9.Fragment, null, debug && /* @__PURE__ */ React9.createElement("div", {
       className: mx4("flex justify-end text-subdued", marginClasses)
-    }, /* @__PURE__ */ React8.createElement("pre", {
+    }, /* @__PURE__ */ React9.createElement("pre", {
       className: "text-xs"
     }, JSON.stringify({
       created: message.created
@@ -1631,34 +1603,32 @@ var ChatMessage = ({ classNames, debug, space, message, processor, tools, onEven
       if (!Component) {
         return null;
       }
-      return /* @__PURE__ */ React8.createElement(Fragment2, {
+      return /* @__PURE__ */ React9.createElement(Fragment2, {
         key: idx
-      }, /* @__PURE__ */ React8.createElement(MessageContainer, {
+      }, /* @__PURE__ */ React9.createElement(MessageItem, {
         classNames,
         user: block._tag === "text" && role === "user"
-      }, /* @__PURE__ */ React8.createElement(Component, {
+      }, /* @__PURE__ */ React9.createElement(ErrorBoundary, {
+        data: block
+      }, /* @__PURE__ */ React9.createElement(Component, {
         space,
-        processor,
         block,
         onEvent
-      })), debug && /* @__PURE__ */ React8.createElement("div", {
+      }))), debug && /* @__PURE__ */ React9.createElement("div", {
         className: mx4("flex justify-end text-subdued", marginClasses)
-      }, /* @__PURE__ */ React8.createElement("pre", {
+      }, /* @__PURE__ */ React9.createElement("pre", {
         className: "text-xs"
       }, JSON.stringify({
         block: block._tag
       }))));
-    }), /* @__PURE__ */ React8.createElement("div", {
+    }), onDelete && /* @__PURE__ */ React9.createElement("div", {
       className: mx4("flex justify-end pbs-2 pbe-2 opacity-50 hover:opacity-100", marginClasses)
-    }, /* @__PURE__ */ React8.createElement(IconButton3, {
+    }, /* @__PURE__ */ React9.createElement(IconButton3, {
       classNames: "animate-[fadeIn_0.5s]",
       icon: "ph--trash--regular",
       iconOnly: true,
       label: t("button delete message"),
-      onClick: () => onEvent?.({
-        type: "delete",
-        id: message.id
-      })
+      onClick: () => onDelete()
     })));
   } finally {
     _effect.f();
@@ -1668,46 +1638,139 @@ var components = {
   //
   // Text
   //
-  ["text"]: ({ block }) => {
+  ["text"]: ({ space, block }) => {
     invariant2(block._tag === "text", void 0, {
-      F: __dxlog_file8,
-      L: 113,
+      F: __dxlog_file5,
+      L: 127,
       S: void 0,
       A: [
         "block._tag === 'text'",
         ""
       ]
     });
-    const title = block.disposition ? titles[block.disposition] : void 0;
-    if (!title) {
-      return /* @__PURE__ */ React8.createElement(MarkdownViewer, {
-        content: block.text
-      });
-    }
-    return /* @__PURE__ */ React8.createElement(ToggleContainer2, {
-      // open={open}
-      defaultOpen: systemDispositions.includes(block.disposition ?? "") && block.pending,
-      title,
-      icon: block.pending ? /* @__PURE__ */ React8.createElement(Icon2, {
-        icon: "ph--circle-notch--regular",
-        classNames: "text-subdued animate-spin",
-        size: 4
-      }) : void 0
-    }, /* @__PURE__ */ React8.createElement(MarkdownViewer, {
-      content: block.text,
-      classNames: [
-        "pbe-2",
-        systemDispositions.includes(block.disposition ?? "") && "text-sm text-subdued"
+    return /* @__PURE__ */ React9.createElement(MarkdownViewer, {
+      content: preprocessTextContent(block.text),
+      components: {
+        a: ({ node: { properties }, children, href, ...props }) => {
+          if (space && typeof properties?.href === "string" && properties?.href?.startsWith("dxn")) {
+            try {
+              const dxn = DXN.parse(properties.href);
+              return /* @__PURE__ */ React9.createElement(ObjectLink, {
+                space,
+                dxn
+              });
+            } catch {
+            }
+          }
+          return /* @__PURE__ */ React9.createElement(Link, {
+            href,
+            target: "_blank",
+            rel: "noopener noreferrer",
+            ...props
+          }, children);
+        },
+        img: ({ node: { properties }, ...props }) => {
+          const client = useClient();
+          if (space && typeof properties?.src === "string" && properties?.src?.startsWith("dxn")) {
+            try {
+              const dxn = DXN.parse(properties?.src);
+              const subject = resolveRef(client, dxn, space);
+              const data = useMemo9(() => ({
+                subject
+              }), [
+                subject
+              ]);
+              return /* @__PURE__ */ React9.createElement(Surface, {
+                role: "card--transclusion",
+                data,
+                limit: 1
+              });
+            } catch {
+            }
+          }
+          return /* @__PURE__ */ React9.createElement("img", properties);
+        }
+      }
+    });
+  },
+  //
+  // Suggest
+  //
+  ["suggest"]: ({ block, onEvent }) => {
+    const { t } = useTranslation6(meta.id);
+    invariant2(block._tag === "suggest", void 0, {
+      F: __dxlog_file5,
+      L: 170,
+      S: void 0,
+      A: [
+        "block._tag === 'suggest'",
+        ""
+      ]
+    });
+    return /* @__PURE__ */ React9.createElement(IconButton3, {
+      icon: "ph--lightning--regular",
+      label: block.text,
+      title: t("button suggest"),
+      onClick: () => onEvent?.({
+        type: "submit",
+        text: block.text
+      })
+    });
+  },
+  //
+  // Select
+  //
+  ["select"]: ({ block, onEvent }) => {
+    const { t } = useTranslation6(meta.id);
+    invariant2(block._tag === "select", void 0, {
+      F: __dxlog_file5,
+      L: 186,
+      S: void 0,
+      A: [
+        "block._tag === 'select'",
+        ""
       ]
+    });
+    return /* @__PURE__ */ React9.createElement("div", {
+      className: "flex flex-wrap gap-1"
+    }, block.options.map((option, idx) => /* @__PURE__ */ React9.createElement(Button, {
+      classNames: "animate-[fadeIn_0.5s] rounded-sm text-sm",
+      key: idx,
+      onClick: () => onEvent?.({
+        type: "submit",
+        text: option
+      }),
+      title: t("button select option")
+    }, option)));
+  },
+  //
+  // Toolkit
+  //
+  ["toolkit"]: ({ block }) => {
+    invariant2(block._tag === "toolkit", void 0, {
+      F: __dxlog_file5,
+      L: 207,
+      S: void 0,
+      A: [
+        "block._tag === 'toolkit'",
+        ""
+      ]
+    });
+    return /* @__PURE__ */ React9.createElement(ToggleContainer2, {
+      title: "Toolbox",
+      classNames: panelClasses,
+      defaultOpen: true
+    }, /* @__PURE__ */ React9.createElement(Toolbox, {
+      classNames: marginClasses
     }));
   },
   //
   // JSON
   //
-  ["json"]: ({ space, processor, block, onEvent }) => {
+  ["json"]: ({ block, onEvent }) => {
     invariant2(block._tag === "json", void 0, {
-      F: __dxlog_file8,
-      L: 151,
+      F: __dxlog_file5,
+      L: 219,
       S: void 0,
       A: [
         "block._tag === 'json'",
@@ -1715,53 +1778,19 @@ var components = {
       ]
     });
     switch (block.disposition) {
-      case "tool_list": {
-        return /* @__PURE__ */ React8.createElement(ToggleContainer2, {
-          title: titles[block.disposition],
-          defaultOpen: true
-        }, /* @__PURE__ */ React8.createElement(ToolboxContainer, {
-          space,
-          processor,
-          classNames: "pbe-2"
-        }));
-      }
-      case "suggest": {
-        const { text = "" } = safeParseJson(block.data ?? "{}") ?? {};
-        return /* @__PURE__ */ React8.createElement(IconButton3, {
-          icon: "ph--lightning--regular",
-          label: text,
-          onClick: () => onEvent?.({
-            type: "submit",
-            text
-          })
-        });
-      }
-      case "select": {
-        const { options = [] } = safeParseJson(block.data ?? "{}") ?? {};
-        return /* @__PURE__ */ React8.createElement("div", {
-          className: "flex flex-wrap gap-1"
-        }, options.map((text, idx) => /* @__PURE__ */ React8.createElement(Button, {
-          classNames: "animate-[fadeIn_0.5s] rounded-sm text-sm",
-          key: idx,
-          onClick: () => onEvent?.({
-            type: "submit",
-            text
-          })
-        }, text)));
-      }
       case "graph": {
-        return /* @__PURE__ */ React8.createElement("div", {
+        return /* @__PURE__ */ React9.createElement("div", {
           className: "flex flex-wrap gap-1"
-        }, /* @__PURE__ */ React8.createElement(Surface, {
+        }, /* @__PURE__ */ React9.createElement(Surface, {
           role: "card",
           data: {
             subject: JSON.parse(block.data ?? "{}")
           },
           limit: 1,
-          fallback: /* @__PURE__ */ React8.createElement("div", {
+          fallback: /* @__PURE__ */ React9.createElement("div", {
             className: "font-mono text-xs text-pre"
           }, block.data)
-        }), onEvent && /* @__PURE__ */ React8.createElement(IconButton3, {
+        }), onEvent && /* @__PURE__ */ React9.createElement(IconButton3, {
           icon: "ph--plus--regular",
           label: "Add to graph",
           onClick: () => onEvent?.({
@@ -1771,57 +1800,35 @@ var components = {
         }));
       }
       default: {
-        const title = block.disposition ? titles[block.disposition] : void 0;
-        return /* @__PURE__ */ React8.createElement(ToggleContainer2, {
-          title: title ?? "JSON"
-        }, /* @__PURE__ */ React8.createElement(Json, {
+        return /* @__PURE__ */ React9.createElement(ToggleContainer2, {
+          title: block.disposition ?? block._tag
+        }, /* @__PURE__ */ React9.createElement(Json, {
           data: safeParseJson(block.data ?? block)
         }));
       }
     }
   },
   //
-  // Default
+  // Fallback
   //
   default: ({ block }) => {
-    let title = titles[block._tag];
-    if (block._tag === "toolCall") {
-      title = `Tool [${block.name}]`;
-    } else {
-      title = block._tag;
-    }
-    return /* @__PURE__ */ React8.createElement(ToggleContainer2, {
-      title: title ?? "JSON"
-    }, /* @__PURE__ */ React8.createElement(Json, {
+    return /* @__PURE__ */ React9.createElement(ToggleContainer2, {
+      title: block._tag
+    }, /* @__PURE__ */ React9.createElement(Json, {
       data: block
     }));
   }
 };
-var titles = {
-  ["cot"]: "Chain of thought",
-  ["artifact"]: "Artifact",
-  ["tool_use"]: "Tool request",
-  ["tool_result"]: "Tool result",
-  ["tool_list"]: "Tools",
-  ["artifact-update"]: "Artifact(s) changed"
-};
-var systemDispositions = [
-  "cot",
-  "artifact-update"
-];
-var panelClasses = "flex flex-col is-full bg-activeSurface rounded-sm";
-var marginClasses = "pie-4 pis-4";
-var paddingClasses = "pis-2 pie-2 pbs-0.5 pbe-0.5";
-var MessageContainer = ({ classNames, children, user }) => {
-  var _effect = _useSignals9();
+var MessageItem = ({ classNames, children, user }) => {
+  var _effect = _useSignals10();
   try {
     if (!children) {
       return null;
     }
-    return /* @__PURE__ */ React8.createElement("div", {
+    return /* @__PURE__ */ React9.createElement("div", {
       role: "list-item",
       className: mx4("flex is-full", user && "justify-end", marginClasses, classNames)
-    }, /* @__PURE__ */ React8.createElement("div", {
+    }, /* @__PURE__ */ React9.createElement("div", {
       className: mx4(user ? [
         "rounded-sm",
         "bg-[--user-fill] text-accentSurfaceText",
@@ -1833,9 +1840,9 @@ var MessageContainer = ({ classNames, children, user }) => {
   }
 };
 var ToggleContainer2 = (props) => {
-  var _effect = _useSignals9();
+  var _effect = _useSignals10();
   try {
-    return /* @__PURE__ */ React8.createElement(NativeToggleContainer, {
+    return /* @__PURE__ */ React9.createElement(NativeToggleContainer, {
       ...props,
       classNames: mx4(panelClasses, props.classNames)
     });
@@ -1843,6 +1850,7 @@ var ToggleContainer2 = (props) => {
     _effect.f();
   }
 };
+var preprocessTextContent = (content) => content.replaceAll(new RegExp(DXN_ECHO_REGEXP, "g"), (_, dxn) => `<${dxn}>`);
 
 // src/components/ChatThread/reducer.ts
 var messageReducer = ({ current, messages }, message) => {
@@ -1894,14 +1902,14 @@ var messageReducer = ({ current, messages }, message) => {
 
 // src/components/ChatThread/ChatThread.tsx
 var ChatThread = /* @__PURE__ */ forwardRef(({ classNames, identity, messages, collapse = true, ...props }, forwardedRef) => {
-  var _effect = _useSignals10();
+  var _effect = _useSignals11();
   try {
-    const userHue = useMemo6(() => {
+    const userHue = useMemo10(() => {
       return identity?.profile?.data?.hue || keyToFallback(identity?.identityKey ?? PublicKey.random()).hue;
     }, [
       identity
     ]);
-    const { messages: filteredMessages = [] } = useMemo6(() => {
+    const { messages: filteredMessages = [] } = useMemo10(() => {
       if (collapse) {
         return (messages ?? []).reduce(messageReducer, {
           messages: []
@@ -1915,17 +1923,17 @@ var ChatThread = /* @__PURE__ */ forwardRef(({ classNames, identity, messages, c
       messages,
       collapse
     ]);
-    return /* @__PURE__ */ React9.createElement(ScrollContainer, {
+    return /* @__PURE__ */ React10.createElement(ScrollContainer, {
       ref: forwardedRef,
       classNames,
       fade: true
-    }, /* @__PURE__ */ React9.createElement("div", {
+    }, /* @__PURE__ */ React10.createElement("div", {
       role: "none",
-      className: mx5(filteredMessages.length > 0 && "pbs-4 pbe-4"),
+      className: mx5("flex flex-col gap-2", filteredMessages.length > 0 && "pbs-4 pbe-4"),
       style: {
         "--user-fill": `var(--dx-${userHue}Fill)`
       }
-    }, filteredMessages.map((message) => /* @__PURE__ */ React9.createElement(ChatMessage, {
+    }, filteredMessages.map((message) => /* @__PURE__ */ React10.createElement(ChatMessage, {
       key: message.id,
       message,
       ...props
@@ -1936,11 +1944,11 @@ var ChatThread = /* @__PURE__ */ forwardRef(({ classNames, identity, messages, c
 });
 
 // src/components/Chat/Chat.tsx
-var __dxlog_file9 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/components/Chat/Chat.tsx";
+var __dxlog_file6 = "/__w/dxos/dxos/packages/plugins/plugin-assistant/src/components/Chat/Chat.tsx";
 var Endcap = ({ children }) => {
-  var _effect = _useSignals11();
+  var _effect = _useSignals12();
   try {
-    return /* @__PURE__ */ React10.createElement("div", {
+    return /* @__PURE__ */ React11.createElement("div", {
       className: "grid w-[var(--rail-action)] h-[var(--rail-action)] items-center justify-center"
     }, children);
   } finally {
@@ -1948,48 +1956,49 @@ var Endcap = ({ children }) => {
   }
 };
 var [ChatContextProvider, useChatContext] = createContext("Chat");
-var ChatRoot = ({ classNames, children, chat, processor, artifact, onEvent, ...props }) => {
-  var _effect = _useSignals11();
+var ChatRoot = ({ classNames, children, chat, processor, onEvent, ...props }) => {
+  var _effect = _useSignals12();
   try {
-    const [debug, setDebug] = useState6(false);
+    const [debug, setDebug] = useState7(false);
     const space = getSpace(chat);
-    const queue = useQueue(chat?.queue.dxn);
-    const messages = useMemo7(() => dedupeWith([
-      ...queue?.objects?.filter(Obj5.instanceOf(DataType2.Message)) ?? [],
-      ...processor?.messages.value ?? []
-    ], (a, b) => a.id === b.id), [
-      queue?.objects,
-      processor?.messages.value
-    ]);
-    const { dispatchPromise: dispatch } = useIntentDispatcher2();
-    useEffect6(() => {
-      if (!processor?.streaming.value && queue?.objects && artifact) {
-        const message = queue.objects[queue.objects.length - 1];
-        if (dispatch && space && chat && message) {
-          void dispatch(createIntent(CollaborationActions.InsertContent, {
-            target: artifact,
-            object: Ref3.fromDXN(new DXN(DXN.kind.QUEUE, [
-              ...chat.queue.dxn.parts,
-              message.id
-            ])),
-            label: "View proposal"
-          }));
-        }
-      }
+    const queue = useQueue2(chat?.queue.dxn);
+    const pending = useRxValue(processor.messages);
+    const streaming = useRxValue(processor.streaming);
+    const messages = useMemo11(() => {
+      const queueMessages = queue?.objects?.filter(Obj9.instanceOf(DataType3.Message)) ?? [];
+      return Result2.match(pending, {
+        onInitial: () => queueMessages,
+        onSuccess: (pending2) => Array2.dedupeWith([
+          ...queueMessages,
+          ...pending2.value
+        ], (a, b) => a.id === b.id),
+        onFailure: () => queueMessages
+      });
     }, [
-      queue,
-      processor?.streaming.value
+      queue?.objects,
+      pending
     ]);
-    const event = useMemo7(() => new Event(), []);
-    useEffect6(() => {
+    const event = useMemo11(() => new Event(), []);
+    useEffect5(() => {
       return event.on((event2) => {
         switch (event2.type) {
           case "toggle-debug": {
-            setDebug((debug2) => !debug2);
+            setDebug((current) => {
+              const debug2 = !current;
+              log6.info("toggle-debug", {
+                debug: debug2
+              }, {
+                F: __dxlog_file6,
+                L: 123,
+                S: void 0,
+                C: (f, a) => f(...a)
+              });
+              return debug2;
+            });
             break;
           }
           case "submit": {
-            if (!processor.streaming.value) {
+            if (!streaming) {
               void processor.request(event2.text);
             }
             break;
@@ -2005,12 +2014,14 @@ var ChatRoot = ({ classNames, children, chat, processor, artifact, onEvent, ...p
       });
     }, [
       event,
-      onEvent
+      onEvent,
+      processor,
+      streaming
     ]);
     if (!space) {
       return null;
     }
-    return /* @__PURE__ */ React10.createElement(ChatContextProvider, {
+    return /* @__PURE__ */ React11.createElement(ChatContextProvider, {
       debug,
       event,
       chat,
@@ -2018,7 +2029,7 @@ var ChatRoot = ({ classNames, children, chat, processor, artifact, onEvent, ...p
       processor,
       messages,
       ...props
-    }, /* @__PURE__ */ React10.createElement("div", {
+    }, /* @__PURE__ */ React11.createElement("div", {
       role: "none",
       className: mx6("flex flex-col h-full overflow-hidden", classNames)
     }, children));
@@ -2028,12 +2039,12 @@ var ChatRoot = ({ classNames, children, chat, processor, artifact, onEvent, ...p
 };
 ChatRoot.displayName = "Chat.Root";
 var ChatThread2 = (props) => {
-  var _effect = _useSignals11();
+  var _effect = _useSignals12();
   try {
-    const { debug, event, space, processor, messages } = useChatContext(ChatThread2.displayName);
+    const { debug, event, space, messages } = useChatContext(ChatThread2.displayName);
     const identity = useIdentity();
     const scrollerRef = useRef2(null);
-    useEffect6(() => {
+    useEffect5(() => {
       return event.on((event2) => {
         switch (event2.type) {
           case "submit":
@@ -2048,14 +2059,13 @@ var ChatThread2 = (props) => {
     if (!identity) {
       return null;
     }
-    return /* @__PURE__ */ React10.createElement(ChatThread, {
+    return /* @__PURE__ */ React11.createElement(ChatThread, {
       ...props,
       ref: scrollerRef,
       debug,
       identity,
       space,
       messages,
-      tools: processor?.tools,
       onEvent: (ev) => event.emit(ev)
     });
   } finally {
@@ -2064,12 +2074,14 @@ var ChatThread2 = (props) => {
 };
 ChatThread2.displayName = "Chat.Thread";
 var ChatPrompt = ({ classNames, placeholder, expandable, online, presets, preset, onChangePreset, onChangeOnline }) => {
-  var _effect = _useSignals11();
+  var _effect = _useSignals12();
   try {
-    const { t } = useTranslation6(meta.id);
+    const { t } = useTranslation7(meta.id);
     const { space, event, processor } = useChatContext(ChatPrompt.displayName);
-    const [active, setActive] = useState6(false);
-    useEffect6(() => {
+    const streaming = useRxValue(processor.streaming);
+    const error = useRxValue(processor.error).pipe(Option2.getOrUndefined);
+    const [active, setActive] = useState7(false);
+    useEffect5(() => {
       return event.on((event2) => {
         switch (event2.type) {
           case "record-start":
@@ -2091,14 +2103,13 @@ var ChatPrompt = ({ classNames, placeholder, expandable, online, presets, preset
         editorRef.current?.focus();
       }
     });
-    const [blueprints, handleUpdateBlueprints] = useBlueprints(space, processor.context, processor.blueprintRegistry);
-    const contextProvider = useReferencesProvider(space);
-    const extensions = useMemo7(() => {
+    const referencesProvider = useReferencesProvider(space);
+    const extensions = useMemo11(() => {
       return [
-        contextProvider && references({
-          provider: contextProvider
+        referencesProvider && references({
+          provider: referencesProvider
         }),
-        expandable && Prec.highest(keymap.of([
+        Prec.highest(keymap.of([
           {
             key: "cmd-d",
             preventDefault: true,
@@ -2109,7 +2120,7 @@ var ChatPrompt = ({ classNames, placeholder, expandable, online, presets, preset
               return true;
             }
           },
-          {
+          expandable && {
             key: "cmd-ArrowUp",
             preventDefault: true,
             run: () => {
@@ -2119,7 +2130,7 @@ var ChatPrompt = ({ classNames, placeholder, expandable, online, presets, preset
               return true;
             }
           },
-          {
+          expandable && {
             key: "cmd-ArrowDown",
             preventDefault: true,
             run: () => {
@@ -2129,15 +2140,15 @@ var ChatPrompt = ({ classNames, placeholder, expandable, online, presets, preset
               return true;
             }
           }
-        ]))
+        ].filter(isNotFalsy2)))
       ].filter(isNotFalsy2);
     }, [
       event,
       expandable,
-      contextProvider
+      referencesProvider
     ]);
-    const handleSubmit = useCallback3((text) => {
-      if (!processor.streaming.value) {
+    const handleSubmit = useCallback4((text) => {
+      if (!streaming) {
         event.emit({
           type: "submit",
           text
@@ -2145,31 +2156,39 @@ var ChatPrompt = ({ classNames, placeholder, expandable, online, presets, preset
         return true;
       }
     }, [
-      processor,
+      streaming,
       event
     ]);
-    const handleEvent = useCallback3((ev) => {
+    const handleEvent = useCallback4((ev) => {
       event.emit(ev);
     }, [
       event
     ]);
-    const handleUpdateReferences = useCallback3((ids) => {
-      log8.info("update", {
-        ids
+    const handleUpdateReferences = useCallback4((dxns) => {
+      log6.info("update", {
+        dxns
       }, {
-        F: __dxlog_file9,
-        L: 318,
+        F: __dxlog_file6,
+        L: 323,
         S: void 0,
         C: (f, a) => f(...a)
       });
+      void processor.context.bind({
+        objects: dxns.map((dxn) => Ref4.fromDXN(DXN2.parse(dxn)))
+      });
     }, []);
-    return /* @__PURE__ */ React10.createElement("div", {
+    const { onUpdateBlueprint } = useBlueprintHandlers({
+      space,
+      context: processor.context,
+      blueprintRegistry: processor.blueprintRegistry
+    });
+    return /* @__PURE__ */ React11.createElement("div", {
       className: mx6("is-full grid grid-cols-[var(--rail-action)_1fr_var(--rail-action)] grid-rows-[min-content_min-content_min-content]", classNames)
-    }, /* @__PURE__ */ React10.createElement(Endcap, null, /* @__PURE__ */ React10.createElement(ChatStatusIndicator, {
+    }, /* @__PURE__ */ React11.createElement(Endcap, null, /* @__PURE__ */ React11.createElement(ChatStatusIndicator, {
       preset,
-      error: processor.error.value,
-      processing: processor.streaming.value
-    })), /* @__PURE__ */ React10.createElement(ChatEditor, {
+      error,
+      processing: streaming
+    })), /* @__PURE__ */ React11.createElement(ChatEditor, {
       ref: editorRef,
       autoFocus: true,
       lineWrapping: true,
@@ -2177,28 +2196,28 @@ var ChatPrompt = ({ classNames, placeholder, expandable, online, presets, preset
       placeholder: placeholder ?? t("prompt placeholder"),
       extensions,
       onSubmit: handleSubmit
-    }), /* @__PURE__ */ React10.createElement("div", null), /* @__PURE__ */ React10.createElement(ChatReferences, {
+    }), /* @__PURE__ */ React11.createElement("div", null), /* @__PURE__ */ React11.createElement(ChatReferences, {
       classNames: "col-span-2 flex pis-1 items-center",
       space,
       context: processor.context,
       onUpdate: handleUpdateReferences
-    }), /* @__PURE__ */ React10.createElement(ChatOptionsMenu, {
+    }), /* @__PURE__ */ React11.createElement(ChatOptions, {
       blueprintRegistry: processor.blueprintRegistry,
-      blueprints,
-      onChange: handleUpdateBlueprints
-    }), /* @__PURE__ */ React10.createElement(ChatActions, {
+      context: processor.context,
+      onUpdateBlueprint
+    }), /* @__PURE__ */ React11.createElement(ChatActions, {
       classNames: "col-span-2",
       microphone: true,
       recording,
-      processing: processor.streaming.value,
+      processing: streaming,
       onEvent: handleEvent
-    }, /* @__PURE__ */ React10.createElement(React10.Fragment, null, /* @__PURE__ */ React10.createElement("div", {
+    }, /* @__PURE__ */ React11.createElement(React11.Fragment, null, /* @__PURE__ */ React11.createElement("div", {
       className: "grow"
-    }), presets && /* @__PURE__ */ React10.createElement(ChatPresets, {
+    }), presets && /* @__PURE__ */ React11.createElement(ChatPresets, {
       preset,
       presets,
       onChange: onChangePreset
-    }), online !== void 0 && /* @__PURE__ */ React10.createElement(Input2.Root, null, /* @__PURE__ */ React10.createElement(Input2.Switch, {
+    }), online !== void 0 && /* @__PURE__ */ React11.createElement(Input.Root, null, /* @__PURE__ */ React11.createElement(Input.Switch, {
       classNames: "mis-2 mie-2",
       checked: online,
       onCheckedChange: onChangeOnline
@@ -2215,12 +2234,21 @@ var Chat = {
 };
 
 export {
+  useBlueprintRegistry,
   useChatProcessor,
-  AssistantCapabilities,
   useChatServices,
-  hooks_exports,
+  useOnline,
+  usePresets,
   Toolbox,
   ToolboxContainer,
-  Chat
+  Chat,
+  AiService2 as AiService,
+  AppGraphBuilder,
+  BlueprintDefinition,
+  EdgeModelResolver,
+  IntentResolver,
+  ReactSurface,
+  Settings,
+  Toolkit
 };
-//# sourceMappingURL=chunk-63GG6U6D.mjs.map
+//# sourceMappingURL=chunk-BVH6VK6Q.mjs.map