@dxos/plugin-assistant 0.8.2-main.fbd8ed0 → 0.8.2-staging.4d6ad0f

package/dist/lib/node/{chunk-OOHFSPWR.cjs → chunk-H4A42LNR.cjs}

@@ -26,11 +26,13 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_OOHFSPWR_exports = {};
-__export(chunk_OOHFSPWR_exports, {
+var chunk_H4A42LNR_exports = {};
+__export(chunk_H4A42LNR_exports, {
   AiClient: () => AiClient,
   AppGraphBuilder: () => AppGraphBuilder,
   IntentResolver: () => IntentResolver,
+  Prompt: () => Prompt,
+  PromptBar: () => PromptBar,
   ReactSurface: () => ReactSurface,
   Settings: () => Settings,
   Thread: () => Thread,
@@ -38,98 +40,515 @@ __export(chunk_OOHFSPWR_exports, {
   Toolbox: () => Toolbox,
   ToolboxContainer: () => ToolboxContainer
 });
-module.exports = __toCommonJS(chunk_OOHFSPWR_exports);
-var import_chunk_GBUNQ257 = require("./chunk-GBUNQ257.cjs");
-var import_chunk_VG2UQY4S = require("./chunk-VG2UQY4S.cjs");
-var import_chunk_Q5XWEMHB = require("./chunk-Q5XWEMHB.cjs");
+module.exports = __toCommonJS(chunk_H4A42LNR_exports);
+var import_chunk_TS3H5OSX = require("./chunk-TS3H5OSX.cjs");
+var import_chunk_RXPA2C2A = require("./chunk-RXPA2C2A.cjs");
+var import_chunk_P74TWGMG = require("./chunk-P74TWGMG.cjs");
+var import_tracking = require("@preact-signals/safe-react/tracking");
+var import_state = require("@codemirror/state");
 var import_react = __toESM(require("react"));
+var import_react_ui = require("@dxos/react-ui");
+var import_react_ui_editor = require("@dxos/react-ui-editor");
+var import_react_ui_theme = require("@dxos/react-ui-theme");
+var import_util = require("@dxos/util");
+var import_state2 = require("@codemirror/state");
+var import_view = require("@codemirror/view");
+var import_autocomplete = require("@codemirror/autocomplete");
+var import_state3 = require("@codemirror/state");
+var import_view2 = require("@codemirror/view");
+var import_async = require("@dxos/async");
+var import_tracking2 = require("@preact-signals/safe-react/tracking");
+var import_react2 = __toESM(require("react"));
+var import_plugin_transcription = require("@dxos/plugin-transcription");
+var import_react_ui2 = require("@dxos/react-ui");
+var import_react_ui_sfx = require("@dxos/react-ui-sfx");
+var import_react_ui_theme2 = require("@dxos/react-ui-theme");
+var import_tracking3 = require("@preact-signals/safe-react/tracking");
+var import_react3 = __toESM(require("react"));
+var import_ai = require("@dxos/ai");
 var import_app_framework = require("@dxos/app-framework");
-var import_artifact = require("@dxos/artifact");
 var import_functions = require("@dxos/functions");
 var import_log = require("@dxos/log");
 var import_echo = require("@dxos/react-client/echo");
-var import_react_ui_theme = require("@dxos/react-ui-theme");
-var import_artifact2 = require("@dxos/artifact");
+var import_react_ui_theme3 = require("@dxos/react-ui-theme");
+var import_ai2 = require("@dxos/ai");
 var import_echo_schema = require("@dxos/echo-schema");
 var import_functions2 = require("@dxos/functions");
 var import_log2 = require("@dxos/log");
 var import_echo2 = require("@dxos/react-client/echo");
 var import_effect = require("effect");
 var import_jsonpointer = __toESM(require("jsonpointer"));
-var import_artifact3 = require("@dxos/artifact");
+var import_ai3 = require("@dxos/ai");
 var import_echo_schema2 = require("@dxos/echo-schema");
 var import_invariant = require("@dxos/invariant");
 var import_log3 = require("@dxos/log");
-var import_util = require("@dxos/util");
-var import_react2 = __toESM(require("react"));
+var import_util2 = require("@dxos/util");
+var import_tracking4 = require("@preact-signals/safe-react/tracking");
+var import_react4 = __toESM(require("react"));
 var import_halo = require("@dxos/react-client/halo");
 var import_react_ui_components = require("@dxos/react-ui-components");
-var import_react_ui_theme2 = require("@dxos/react-ui-theme");
-var import_util2 = require("@dxos/util");
-var import_react3 = __toESM(require("react"));
+var import_react_ui_theme4 = require("@dxos/react-ui-theme");
+var import_util3 = require("@dxos/util");
+var import_tracking5 = require("@preact-signals/safe-react/tracking");
+var import_react5 = __toESM(require("react"));
+var import_app_framework2 = require("@dxos/app-framework");
 var import_invariant2 = require("@dxos/invariant");
-var import_react_ui = require("@dxos/react-ui");
+var import_react_ui3 = require("@dxos/react-ui");
 var import_react_ui_components2 = require("@dxos/react-ui-components");
 var import_react_ui_syntax_highlighter = require("@dxos/react-ui-syntax-highlighter");
-var import_react_ui_theme3 = require("@dxos/react-ui-theme");
-var import_util3 = require("@dxos/util");
-var import_react4 = __toESM(require("react"));
+var import_react_ui_theme5 = require("@dxos/react-ui-theme");
+var import_util4 = require("@dxos/util");
+var import_tracking6 = require("@preact-signals/safe-react/tracking");
+var import_react6 = __toESM(require("react"));
 var import_log4 = require("@dxos/log");
 var import_react_ui_components3 = require("@dxos/react-ui-components");
 var import_react_ui_syntax_highlighter2 = require("@dxos/react-ui-syntax-highlighter");
-var import_util4 = require("@dxos/util");
-var import_state = require("@codemirror/state");
-var import_react5 = __toESM(require("react"));
-var import_react_ui2 = require("@dxos/react-ui");
-var import_react_ui_editor = require("@dxos/react-ui-editor");
-var import_react_ui_theme4 = require("@dxos/react-ui-theme");
-var import_state2 = require("@codemirror/state");
-var import_view = require("@codemirror/view");
-var import_autocomplete = require("@codemirror/autocomplete");
-var import_state3 = require("@codemirror/state");
-var import_view2 = require("@codemirror/view");
-var import_async = require("@dxos/async");
-var import_react6 = __toESM(require("react"));
-var import_plugin_transcription = require("@dxos/plugin-transcription");
-var import_react_ui3 = require("@dxos/react-ui");
-var import_react_ui_sfx = require("@dxos/react-ui-sfx");
-var import_react_ui_theme5 = require("@dxos/react-ui-theme");
+var import_util5 = require("@dxos/util");
+var import_tracking7 = require("@preact-signals/safe-react/tracking");
 var import_react7 = __toESM(require("react"));
-var import_app_framework2 = require("@dxos/app-framework");
+var import_app_framework3 = require("@dxos/app-framework");
 var import_invariant3 = require("@dxos/invariant");
 var import_keys = require("@dxos/keys");
 var import_live_object = require("@dxos/live-object");
 var import_log5 = require("@dxos/log");
 var import_echo3 = require("@dxos/react-client/echo");
 var import_signals_core = require("@preact/signals-core");
+var import_ai4 = require("@dxos/ai");
 var import_assistant = require("@dxos/assistant");
 var import_invariant4 = require("@dxos/invariant");
 var import_log6 = require("@dxos/log");
 var import_echo4 = require("@dxos/react-client/echo");
+var import_tracking8 = require("@preact-signals/safe-react/tracking");
 var import_react8 = require("react");
-var import_app_framework3 = require("@dxos/app-framework");
-var import_artifact4 = require("@dxos/artifact");
-var import_assistant2 = require("@dxos/assistant");
+var import_ai5 = require("@dxos/ai");
+var import_app_framework4 = require("@dxos/app-framework");
+var import_artifact = require("@dxos/artifact");
 var import_functions3 = require("@dxos/functions");
 var import_log7 = require("@dxos/log");
 var import_react_client = require("@dxos/react-client");
 var import_echo5 = require("@dxos/react-client/echo");
-var import_util5 = require("@dxos/util");
-var import_app_framework4 = require("@dxos/app-framework");
+var import_util6 = require("@dxos/util");
+var import_app_framework5 = require("@dxos/app-framework");
 var import_react9 = require("react");
 var import_echo_schema3 = require("@dxos/echo-schema");
 var import_echo6 = require("@dxos/react-client/echo");
 var import_react10 = require("react");
-var import_artifact5 = require("@dxos/artifact");
-var import_assistant3 = require("@dxos/assistant");
+var import_testing = require("@dxos/ai/testing");
+var import_assistant2 = require("@dxos/assistant");
+var import_schema = require("@dxos/schema");
+var import_util7 = require("@dxos/util");
+var import_ai6 = require("@dxos/ai");
+var import_artifact2 = require("@dxos/artifact");
 var import_echo_schema4 = require("@dxos/echo-schema");
+var import_tracking9 = require("@preact-signals/safe-react/tracking");
 var import_react11 = require("react");
 var import_react12 = require("react");
-var import_app_framework5 = require("@dxos/app-framework");
+var import_app_framework6 = require("@dxos/app-framework");
 var import_echo7 = require("@dxos/client/echo");
 var import_echo8 = require("@dxos/echo");
 var import_echo_schema5 = require("@dxos/echo-schema");
 var import_log8 = require("@dxos/log");
+var autocompleteExtension = ({ onSubmit, onSuggest, onCancel }) => {
+  const suggest = import_view.ViewPlugin.fromClass(class {
+    constructor(view) {
+      this._currentSuggestion = null;
+      this._decorations = this.computeDecorations(view);
+    }
+    update(update) {
+      if (update.docChanged || update.selectionSet) {
+        this._decorations = this.computeDecorations(update.view);
+      }
+    }
+    computeDecorations(view) {
+      const text = view.state.doc.toString();
+      const suggestions = onSuggest?.(text) ?? [];
+      if (!suggestions.length) {
+        this._currentSuggestion = null;
+        return import_view.Decoration.none;
+      }
+      this._currentSuggestion = suggestions[0];
+      const suffix = this._currentSuggestion.slice(text.length);
+      if (!suffix) {
+        return import_view.Decoration.none;
+      }
+      return import_view.Decoration.set([
+        import_view.Decoration.widget({
+          widget: new InlineSuggestionWidget(suffix),
+          side: 1
+        }).range(view.state.doc.length)
+      ]);
+    }
+    completeSuggestion(view) {
+      if (!this._currentSuggestion) {
+        return false;
+      }
+      const text = view.state.doc.toString();
+      const suffix = this._currentSuggestion.slice(text.length);
+      if (!suffix) {
+        return false;
+      }
+      view.dispatch({
+        changes: {
+          from: view.state.doc.length,
+          insert: suffix
+        },
+        selection: {
+          anchor: view.state.doc.length + suffix.length
+        }
+      });
+      return true;
+    }
+  }, {
+    decorations: (v) => v._decorations
+  });
+  return [
+    suggest,
+    import_view.EditorView.theme({
+      ".cm-inline-suggestion": {
+        opacity: 0.4
+      }
+    }),
+    import_state2.Prec.highest(import_view.keymap.of([
+      {
+        key: "Tab",
+        preventDefault: true,
+        run: (view) => {
+          const plugin = view.plugin(suggest);
+          return plugin?.completeSuggestion(view) ?? false;
+        }
+      },
+      {
+        key: "ArrowRight",
+        preventDefault: true,
+        run: (view) => {
+          if (view.state.selection.main.head !== view.state.doc.length) {
+            return false;
+          }
+          const plugin = view.plugin(suggest);
+          return plugin?.completeSuggestion(view) ?? false;
+        }
+      },
+      {
+        key: "Enter",
+        preventDefault: true,
+        run: (view) => {
+          const text = view.state.doc.toString().trim();
+          if (text.length > 0 && onSubmit) {
+            const reset = onSubmit(text);
+            if (reset) {
+              view.dispatch({
+                changes: {
+                  from: 0,
+                  to: view.state.doc.length,
+                  insert: ""
+                }
+              });
+            }
+          }
+          return true;
+        }
+      },
+      {
+        key: "Shift-Enter",
+        preventDefault: true,
+        run: (view) => {
+          view.dispatch({
+            changes: {
+              from: view.state.selection.main.head,
+              insert: "\n"
+            },
+            selection: {
+              anchor: view.state.selection.main.head + 1,
+              head: view.state.selection.main.head + 1
+            }
+          });
+          return true;
+        }
+      },
+      {
+        key: "Escape",
+        preventDefault: true,
+        run: (view) => {
+          view.dispatch({
+            changes: {
+              from: 0,
+              to: view.state.doc.length,
+              insert: ""
+            }
+          });
+          onCancel?.();
+          return true;
+        }
+      }
+    ]))
+  ];
+};
+var InlineSuggestionWidget = class extends import_view.WidgetType {
+  constructor(suffix) {
+    super(), this.suffix = suffix;
+  }
+  toDOM() {
+    const span = document.createElement("span");
+    span.textContent = this.suffix;
+    span.className = "cm-inline-suggestion";
+    return span;
+  }
+  eq(other) {
+    return other.suffix === this.suffix;
+  }
+};
+var promptReferences = ({ provider, debug = false, triggerCharacter = "@" }) => {
+  if (triggerCharacter.length !== 1) {
+    throw new Error("triggerCharacter must be a single character");
+  }
+  const decorationField = import_view2.ViewPlugin.fromClass(class ReferenceView {
+    constructor(view) {
+      this._mutex = new import_async.Mutex();
+      this.decorations = import_view2.Decoration.set([]);
+      queueMicrotask(async () => {
+        const guard = await this._mutex.acquire();
+        try {
+          this.decorations = await this._computeDecorations(view);
+        } finally {
+          guard.release();
+        }
+      });
+    }
+    update(update) {
+      if (update.docChanged) {
+        queueMicrotask(async () => {
+          const guard = await this._mutex.acquire();
+          try {
+            this.decorations = await this._computeDecorations(update.view);
+          } finally {
+            guard.release();
+          }
+        });
+      }
+    }
+    async _computeDecorations(view) {
+      const text = view.state.doc.toString();
+      const references = text.matchAll(new RegExp(`${triggerCharacter}[a-zA-Z0-9@:]+\\s`, "g"));
+      const decorations = [];
+      for (const match of references) {
+        const reference = match[0];
+        const uri = reference.slice(1, -1);
+        const data = await provider.resolveReference({
+          uri
+        });
+        if (data) {
+          decorations.push(import_view2.Decoration.replace({
+            widget: new ReferenceWidget(data)
+          }).range(match.index, match.index + reference.length));
+        }
+      }
+      return import_view2.Decoration.set(decorations);
+    }
+  }, {
+    decorations: (v) => v.decorations,
+    provide: (plugin) => [
+      import_view2.EditorView.atomicRanges.of((view) => view.plugin(decorationField)?.decorations ?? import_state3.RangeSet.empty)
+    ]
+  });
+  return [
+    decorationField,
+    import_view2.EditorView.theme({
+      ".cm-reference-pill": {
+        borderRadius: "0.25rem",
+        borderWidth: "1px",
+        marginRight: "0.25rem",
+        marginLeft: "0.25rem"
+      }
+    }),
+    (0, import_autocomplete.autocompletion)({
+      activateOnTyping: true,
+      override: [
+        async (context) => {
+          const match = context.matchBefore(new RegExp(`${triggerCharacter}[a-zA-Z0-9]+`));
+          if (!match || match?.to === match?.from) {
+            return null;
+          }
+          const query = match.text.slice(1);
+          const references = await provider.getReferences({
+            query
+          });
+          return {
+            from: match.from,
+            filter: false,
+            options: references.map((reference) => ({
+              label: reference.label,
+              apply: `${triggerCharacter}${reference.uri} `
+            }))
+          };
+        }
+      ],
+      closeOnBlur: !debug,
+      tooltipClass: () => "shadow rounded",
+      aboveCursor: true
+    }),
+    import_view2.keymap.of(import_autocomplete.completionKeymap)
+  ];
+};
+var ReferenceWidget = class extends import_view2.WidgetType {
+  constructor(data) {
+    super(), this.data = data;
+  }
+  toDOM() {
+    const span = document.createElement("span");
+    span.textContent = `@ ${this.data.label}`;
+    span.className = "cm-reference-pill";
+    return span;
+  }
+  eq(other) {
+    return other.data.uri === this.data.uri;
+  }
+  ignoreEvent() {
+    return true;
+  }
+};
+var Prompt = /* @__PURE__ */ (0, import_react.forwardRef)(({ classNames, extensions, references, autoFocus, lineWrapping = false, placeholder, onSubmit, onSuggest, onCancel, onOpenChange }, forwardRef3) => {
+  var _effect = (0, import_tracking.useSignals)();
+  try {
+    const { themeMode } = (0, import_react_ui.useThemeContext)();
+    const { parentRef, view } = (0, import_react_ui_editor.useTextEditor)({
+      debug: true,
+      autoFocus,
+      extensions: [
+        autocompleteExtension({
+          onSubmit,
+          onSuggest,
+          onCancel
+        }),
+        (0, import_react_ui_editor.createBasicExtensions)({
+          bracketMatching: false,
+          lineWrapping,
+          placeholder
+        }),
+        (0, import_react_ui_editor.createThemeExtensions)({
+          themeMode
+        }),
+        references ? promptReferences({
+          provider: references
+        }) : [],
+        import_state.Prec.highest(import_react_ui_editor.keymap.of([
+          {
+            key: "cmd-ArrowUp",
+            preventDefault: true,
+            run: () => {
+              onOpenChange?.(true);
+              return true;
+            }
+          },
+          {
+            key: "cmd-ArrowDown",
+            preventDefault: true,
+            run: () => {
+              onOpenChange?.(false);
+              return true;
+            }
+          }
+        ])),
+        extensions
+      ].filter(import_util.isNonNullable)
+    }, [
+      themeMode,
+      extensions,
+      onSubmit,
+      onSuggest
+    ]);
+    (0, import_react.useImperativeHandle)(forwardRef3, () => {
+      return {
+        focus: () => {
+          view?.focus();
+        },
+        setText: (text) => {
+          view?.dispatch({
+            changes: {
+              from: 0,
+              to: view.state.doc.length,
+              insert: text
+            },
+            selection: {
+              anchor: text.length,
+              head: text.length
+            }
+          });
+        }
+      };
+    }, [
+      view,
+      onSubmit
+    ]);
+    return /* @__PURE__ */ import_react.default.createElement("div", {
+      ref: parentRef,
+      className: (0, import_react_ui_theme.mx)("w-full", classNames)
+    });
+  } finally {
+    _effect.f();
+  }
+});
+var PromptBar = /* @__PURE__ */ (0, import_react2.forwardRef)(({ classNames, placeholder, processing, error, microphone, references, onCancel, ...props }, forwardedRef) => {
+  var _effect = (0, import_tracking2.useSignals)();
+  try {
+    const { t } = (0, import_react_ui2.useTranslation)(import_chunk_P74TWGMG.ASSISTANT_PLUGIN);
+    const promptRef = (0, import_react_ui2.useForwardedRef)(forwardedRef);
+    const [active, setActive] = (0, import_react2.useState)(false);
+    const { recording } = (0, import_plugin_transcription.useVoiceInput)({
+      active,
+      onUpdate: (text) => {
+        promptRef.current?.setText(text);
+        promptRef.current?.focus();
+      }
+    });
+    return /* @__PURE__ */ import_react2.default.createElement("div", {
+      className: (0, import_react_ui_theme2.mx)("shrink-0 w-full grid grid-cols-[var(--rail-action)_1fr_var(--rail-action)] overflow-hidden", classNames)
+    }, /* @__PURE__ */ import_react2.default.createElement("div", {
+      className: "flex w-[--rail-action] h-[--rail-action] items-center justify-center"
+    }, error && /* @__PURE__ */ import_react2.default.createElement(import_react_ui2.Tooltip.Trigger, {
+      content: error.message,
+      delayDuration: 0
+    }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui2.Icon, {
+      icon: "ph--warning-circle--regular",
+      classNames: import_react_ui_theme2.errorText,
+      size: 5
+    })) || /* @__PURE__ */ import_react2.default.createElement(import_react_ui_sfx.Spinner, {
+      active: processing
+    })), /* @__PURE__ */ import_react2.default.createElement(Prompt, {
+      ref: promptRef,
+      autoFocus: true,
+      classNames: "pbs-2",
+      lineWrapping: true,
+      placeholder: placeholder ?? t("prompt placeholder"),
+      references,
+      onCancel,
+      ...props
+    }), (onCancel || microphone) && /* @__PURE__ */ import_react2.default.createElement("div", {
+      className: "flex w-[--rail-action] h-[--rail-action] items-center justify-center"
+    }, processing && onCancel && /* @__PURE__ */ import_react2.default.createElement(import_react_ui2.IconButton, {
+      classNames: "px-1.5",
+      variant: "ghost",
+      size: 5,
+      icon: "ph--x--regular",
+      iconOnly: true,
+      label: t("cancel processing button"),
+      onClick: onCancel
+    }), !processing && microphone && /* @__PURE__ */ import_react2.default.createElement(import_react_ui2.IconButton, {
+      classNames: (0, import_react_ui_theme2.mx)("px-1.5", recording && "bg-primary-500"),
+      variant: "ghost",
+      size: 5,
+      icon: "ph--microphone--regular",
+      iconOnly: true,
+      noTooltip: true,
+      label: t("microphone button"),
+      onMouseDown: () => setActive(true),
+      onMouseUp: () => setActive(false),
+      onTouchStart: () => setActive(true),
+      onTouchEnd: () => setActive(false)
+    })));
+  } finally {
+    _effect.f();
+  }
+});
 var __dxlog_file = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/tools/function.ts";
 var convertFunctionToTool = (fn, edgeUrl, spaceId) => {
   if (!fn.description || !fn.inputSchema) {
@@ -142,7 +561,7 @@ var convertFunctionToTool = (fn, edgeUrl, spaceId) => {
   const url = (0, import_functions2.getInvocationUrl)(existingFunctionUrl, edgeUrl, {
     spaceId
   });
-  return (0, import_artifact2.defineTool)("user-function", {
+  return (0, import_ai2.createTool)("user-function", {
     name: fn.name,
     description: fn.description,
     schema: (0, import_echo_schema.toEffectSchema)(fn.inputSchema),
@@ -164,7 +583,7 @@ var convertFunctionToTool = (fn, edgeUrl, spaceId) => {
         },
         body: JSON.stringify(input)
       });
-      return import_artifact2.ToolResult.Success(await response.text());
+      return import_ai2.ToolResult.Success(await response.text());
     }
   });
 };
@@ -209,7 +628,7 @@ var createToolsFromApi = async (url, options) => {
     spec
   }, {
     F: __dxlog_file2,
-    L: 33,
+    L: 36,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -227,7 +646,7 @@ var createToolsFromApi = async (url, options) => {
         methodItem
       }, {
         F: __dxlog_file2,
-        L: 45,
+        L: 47,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -245,7 +664,7 @@ var createToolsFromApi = async (url, options) => {
           parameter
         }, {
           F: __dxlog_file2,
-          L: 60,
+          L: 63,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -268,7 +687,7 @@ var createToolsFromApi = async (url, options) => {
         inputSchema
       }, {
         F: __dxlog_file2,
-        L: 85,
+        L: 88,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -280,7 +699,7 @@ var createToolsFromApi = async (url, options) => {
           method
         }, {
           F: __dxlog_file2,
-          L: 90,
+          L: 93,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -293,17 +712,20 @@ var createToolsFromApi = async (url, options) => {
         parameters: endpointParameters,
         authorization: options?.authorization
       };
-      tools.push({
-        name: getToolName(path, method, methodItem),
-        description: options?.instructions ? `${options.instructions}
+      tools.push(
+        // TODO(burdon): Namespace?
+        (0, import_ai3.createRawTool)("openapi", {
+          name: getToolName(path, method, methodItem),
+          description: options?.instructions ? `${options.instructions}
 
 ${description}` : description,
-        parameters: inputSchema,
-        execute: async (input) => {
-          const response = await callApiEndpoint(endpoint, input);
-          return import_artifact3.ToolResult.Success(response);
-        }
-      });
+          parameters: inputSchema,
+          execute: async (input) => {
+            const response = await callApiEndpoint(endpoint, input);
+            return import_ai3.ToolResult.Success(response);
+          }
+        })
+      );
     }
   }
   return tools;
@@ -356,7 +778,7 @@ var callApiEndpoint = async (endpoint, input) => {
     input
   }, {
     F: __dxlog_file2,
-    L: 174,
+    L: 180,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -415,7 +837,7 @@ var callApiEndpoint = async (endpoint, input) => {
     request
   }, {
     F: __dxlog_file2,
-    L: 237,
+    L: 243,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -426,7 +848,7 @@ var callApiEndpoint = async (endpoint, input) => {
     statusText: response.statusText
   }, {
     F: __dxlog_file2,
-    L: 240,
+    L: 246,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -450,7 +872,7 @@ var callApiEndpoint = async (endpoint, input) => {
         error
       }, {
         F: __dxlog_file2,
-        L: 258,
+        L: 264,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -461,7 +883,7 @@ var callApiEndpoint = async (endpoint, input) => {
         error
       }, {
         F: __dxlog_file2,
-        L: 262,
+        L: 268,
         S: void 0,
         C: (f, a) => f(...a)
       });
@@ -476,7 +898,7 @@ var getEndpointUrl = (endpoint) => {
   } else {
     (0, import_invariant.invariant)(!isV3_1(endpoint.document), void 0, {
       F: __dxlog_file2,
-      L: 273,
+      L: 279,
       S: void 0,
       A: [
         "!isV3_1(endpoint.document)",
@@ -496,7 +918,7 @@ var resolveAuthorization = async (authorization) => {
     case "api-key": {
       (0, import_invariant.invariant)(authorization.placement.type === "authorization-header", void 0, {
         F: __dxlog_file2,
-        L: 289,
+        L: 295,
         S: void 0,
         A: [
           "authorization.placement.type === 'authorization-header'",
@@ -522,7 +944,7 @@ var resolveAuthorization = async (authorization) => {
   }
 };
 var resolveJsonSchema = (schema, base) => {
-  return (0, import_util.deepMapValues)(schema, (value, recurse) => {
+  return (0, import_util2.deepMapValues)(schema, (value, recurse) => {
     if (typeof value === "object" && value !== null && "$ref" in value && typeof value.$ref === "string") {
       if (value.$ref.startsWith("#")) {
         const resolved = import_jsonpointer.default.get(base, value.$ref.slice(1));
@@ -534,7 +956,7 @@ var resolveJsonSchema = (schema, base) => {
             base
           }, {
             F: __dxlog_file2,
-            L: 322,
+            L: 328,
             S: void 0,
             C: (f, a) => f(...a)
           });
@@ -549,91 +971,106 @@ var isV3_1 = (document2) => {
 };
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/components/Toolbox/Toolbox.tsx";
 var Toolbox = ({ classNames, artifacts, functions, services, striped }) => {
-  return /* @__PURE__ */ import_react.default.createElement("div", {
-    className: (0, import_react_ui_theme.mx)("flex flex-col overflow-y-auto box-content", classNames)
-  }, artifacts && artifacts.length > 0 && /* @__PURE__ */ import_react.default.createElement(Section, {
-    title: "Artifacts",
-    items: artifacts.map(({ name, description, tools }) => ({
-      name,
-      description,
-      subitems: tools.map(({ name: name2, description: description2 }) => ({
-        name: `\u2219 ${(0, import_artifact.parseToolName)(name2)}`,
-        description: description2
+  var _effect = (0, import_tracking3.useSignals)();
+  try {
+    return /* @__PURE__ */ import_react3.default.createElement("div", {
+      className: (0, import_react_ui_theme3.mx)("flex flex-col overflow-y-auto box-content", classNames)
+    }, artifacts && artifacts.length > 0 && /* @__PURE__ */ import_react3.default.createElement(Section, {
+      title: "Artifacts",
+      items: artifacts.map(({ name, description, tools }) => ({
+        name,
+        description,
+        subitems: tools.map(({ name: name2, description: description2 }) => ({
+          name: `\u2219 ${(0, import_ai.parseToolName)(name2)}`,
+          description: description2
+        }))
+      }))
+    }), services && services.length > 0 && /* @__PURE__ */ import_react3.default.createElement(Section, {
+      title: "Services",
+      items: services.map(({ service: { serviceId, name, description }, tools }) => ({
+        name: name ?? serviceId,
+        description,
+        subitems: tools.map(({ name: name2, description: description2 }) => ({
+          name: `\u2219 ${name2}`,
+          description: description2
+        }))
       }))
-    }))
-  }), services && services.length > 0 && /* @__PURE__ */ import_react.default.createElement(Section, {
-    title: "Services",
-    items: services.map(({ service: { serviceId, name, description }, tools }) => ({
-      name: name ?? serviceId,
-      description,
-      subitems: tools.map(({ name: name2, description: description2 }) => ({
-        name: `\u2219 ${name2}`,
-        description: description2
+    }), functions && functions.length > 0 && /* @__PURE__ */ import_react3.default.createElement(Section, {
+      title: "Functions",
+      items: functions.map(({ name, description }) => ({
+        name,
+        description
       }))
-    }))
-  }), functions && functions.length > 0 && /* @__PURE__ */ import_react.default.createElement(Section, {
-    title: "Functions",
-    items: functions.map(({ name, description }) => ({
-      name,
-      description
-    }))
-  }));
+    }));
+  } finally {
+    _effect.f();
+  }
 };
 var Section = ({ title, items, striped }) => {
-  const stripeClassNames = "odd:bg-neutral-50 dark:odd:bg-neutral-800";
-  const gridClassNames = "grid grid-cols-[8rem_1fr]";
-  const subGridClassNames = (0, import_react_ui_theme.mx)("col-span-full grid grid-cols-subgrid text-xs px-2", striped && stripeClassNames);
-  return /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("h1", {
-    className: "px-2 text-sm"
-  }, title), /* @__PURE__ */ import_react.default.createElement("div", {
-    className: gridClassNames
-  }, items.map(({ name, description, subitems }, i) => /* @__PURE__ */ import_react.default.createElement(import_react.Fragment, {
-    key: i
-  }, name && /* @__PURE__ */ import_react.default.createElement("div", {
-    className: subGridClassNames
-  }, /* @__PURE__ */ import_react.default.createElement("div", {
-    className: "truncate text-primary-500"
-  }, name), /* @__PURE__ */ import_react.default.createElement("div", {
-    className: "line-clamp-2"
-  }, description)), subitems?.map(({ name: name2, description: description2 }, i2) => /* @__PURE__ */ import_react.default.createElement("div", {
-    key: i2,
-    className: (0, import_react_ui_theme.mx)(subGridClassNames, striped && stripeClassNames)
-  }, /* @__PURE__ */ import_react.default.createElement("div", {
-    className: "truncate"
-  }, name2), /* @__PURE__ */ import_react.default.createElement("div", {
-    className: "line-clamp-3 text-subdued"
-  }, description2)))))));
+  var _effect = (0, import_tracking3.useSignals)();
+  try {
+    const stripeClassNames = "odd:bg-neutral-50 dark:odd:bg-neutral-800";
+    const gridClassNames = "grid grid-cols-[8rem_1fr]";
+    const subGridClassNames = (0, import_react_ui_theme3.mx)("col-span-full grid grid-cols-subgrid text-xs px-2", striped && stripeClassNames);
+    return /* @__PURE__ */ import_react3.default.createElement("div", null, /* @__PURE__ */ import_react3.default.createElement("h1", {
+      className: "px-2 text-sm"
+    }, title), /* @__PURE__ */ import_react3.default.createElement("div", {
+      className: gridClassNames
+    }, items.map(({ name, description, subitems }, i) => /* @__PURE__ */ import_react3.default.createElement(import_react3.Fragment, {
+      key: i
+    }, name && /* @__PURE__ */ import_react3.default.createElement("div", {
+      className: subGridClassNames
+    }, /* @__PURE__ */ import_react3.default.createElement("div", {
+      className: "truncate text-primary-500"
+    }, name), /* @__PURE__ */ import_react3.default.createElement("div", {
+      className: "line-clamp-2"
+    }, description)), subitems?.map(({ name: name2, description: description2 }, i2) => /* @__PURE__ */ import_react3.default.createElement("div", {
+      key: i2,
+      className: (0, import_react_ui_theme3.mx)(subGridClassNames, striped && stripeClassNames)
+    }, /* @__PURE__ */ import_react3.default.createElement("div", {
+      className: "truncate"
+    }, name2), /* @__PURE__ */ import_react3.default.createElement("div", {
+      className: "line-clamp-3 text-subdued"
+    }, description2)))))));
+  } finally {
+    _effect.f();
+  }
 };
 var ToolboxContainer = ({ classNames, space }) => {
-  const artifactDefinitions = (0, import_app_framework.useCapabilities)(import_app_framework.Capabilities.ArtifactDefinition);
-  const services = (0, import_echo.useQuery)(space, import_echo.Filter.type(import_chunk_VG2UQY4S.ServiceType));
-  const [serviceTools, setServiceTools] = (0, import_react.useState)([]);
-  (0, import_react.useEffect)(() => {
-    (0, import_log.log)("creating service tools...", {
-      services: services.length
-    }, {
-      F: __dxlog_file3,
-      L: 99,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    queueMicrotask(async () => {
-      const tools = await Promise.all(services.map(async (service) => ({
-        service,
-        tools: await createToolsFromService(service)
-      })));
-      setServiceTools(tools);
+  var _effect = (0, import_tracking3.useSignals)();
+  try {
+    const artifactDefinitions = (0, import_app_framework.useCapabilities)(import_app_framework.Capabilities.ArtifactDefinition);
+    const services = (0, import_echo.useQuery)(space, import_echo.Filter.type(import_chunk_RXPA2C2A.ServiceType));
+    const [serviceTools, setServiceTools] = (0, import_react3.useState)([]);
+    (0, import_react3.useEffect)(() => {
+      (0, import_log.log)("creating service tools...", {
+        services: services.length
+      }, {
+        F: __dxlog_file3,
+        L: 100,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      queueMicrotask(async () => {
+        const tools = await Promise.all(services.map(async (service) => ({
+          service,
+          tools: await createToolsFromService(service)
+        })));
+        setServiceTools(tools);
+      });
+    }, [
+      services
+    ]);
+    const functions = (0, import_echo.useQuery)(space, import_echo.Filter.type(import_functions.FunctionType));
+    return /* @__PURE__ */ import_react3.default.createElement(Toolbox, {
+      classNames,
+      artifacts: artifactDefinitions,
+      services: serviceTools,
+      functions
     });
-  }, [
-    services
-  ]);
-  const functions = (0, import_echo.useQuery)(space, import_echo.Filter.type(import_functions.FunctionType));
-  return /* @__PURE__ */ import_react.default.createElement(Toolbox, {
-    classNames,
-    artifacts: artifactDefinitions,
-    services: serviceTools,
-    functions
-  });
+  } finally {
+    _effect.f();
+  }
 };
 var __dxlog_file4 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/components/Thread/ToolInvocations.tsx";
 var isToolMessage = (message) => {
@@ -642,164 +1079,199 @@ var isToolMessage = (message) => {
 var getToolName2 = (tool) => {
   return tool.namespace && tool.function ? `${tool.namespace}:${tool.function}` : tool.name.split("_").pop();
 };
-var getToolCaption = (tool) => {
+var getToolCaption = (tool, status) => {
   if (!tool) {
     return "Calling tool...";
   }
-  return tool.caption ?? `Calling ${getToolName2(tool)}...`;
+  return status?.message ?? tool.caption ?? `Calling ${getToolName2(tool)}...`;
 };
 var ToolBlock = ({ classNames, message, tools }) => {
-  const { content = [] } = message;
-  let request;
-  const blocks = content.filter((block) => block.type === "tool_use" || block.type === "tool_result");
-  const items = blocks.map((block) => {
-    switch (block.type) {
-      case "tool_use": {
-        if (block.pending && request?.block.id === block.id) {
-          return null;
-        }
-        request = {
-          tool: tools?.find((tool) => tool.name === block.name),
-          block
-        };
-        return {
-          title: getToolCaption(request.tool),
-          block
-        };
-      }
-      case "tool_result": {
-        if (!request) {
-          import_log4.log.warn("unexpected message", {
-            block
+  var _effect = (0, import_tracking6.useSignals)();
+  try {
+    const { content = [] } = message;
+    let request;
+    const blocks = content.filter((block) => block.type === "tool_use" || block.type === "tool_result");
+    const items = blocks.map((block) => {
+      switch (block.type) {
+        case "tool_use": {
+          if (block.pending && request?.block.id === block.id) {
+            return null;
+          }
+          import_log4.log.info("tool_use", {
+            tool: request?.tool,
+            status: block.currentStatus
           }, {
             F: __dxlog_file4,
-            L: 52,
+            L: 46,
             S: void 0,
             C: (f, a) => f(...a)
           });
+          request = {
+            tool: tools?.find((tool) => tool.name === block.name),
+            block
+          };
+          return {
+            title: getToolCaption(request.tool, block.currentStatus),
+            block
+          };
+        }
+        case "tool_result": {
+          if (!request) {
+            import_log4.log.warn("unexpected message", {
+              block
+            }, {
+              F: __dxlog_file4,
+              L: 54,
+              S: void 0,
+              C: (f, a) => f(...a)
+            });
+            return {
+              title: "Error",
+              block
+            };
+          }
+          return {
+            title: `${getToolCaption(request.tool, void 0)} (Success)`,
+            block
+          };
+        }
+        default: {
+          request = void 0;
           return {
             title: "Error",
             block
           };
         }
-        return {
-          title: `${getToolCaption(request.tool)} (Success)`,
-          block
-        };
-      }
-      default: {
-        request = void 0;
-        return {
-          title: "Error",
-          block
-        };
       }
-    }
-  }).filter(import_util4.isNonNullable);
-  return /* @__PURE__ */ import_react4.default.createElement(ToolContainer, {
-    classNames,
-    items
-  });
+    }).filter(import_util5.isNonNullable);
+    return /* @__PURE__ */ import_react6.default.createElement(ToolContainer, {
+      classNames,
+      items
+    });
+  } finally {
+    _effect.f();
+  }
 };
 var ToolContainer = ({ classNames, items }) => {
-  const tabsRef = (0, import_react4.useRef)(null);
-  const [selected, setSelected] = (0, import_react4.useState)(0);
-  const [open, setOpen] = (0, import_react4.useState)(false);
-  (0, import_react4.useEffect)(() => {
-    if (open) {
-      tabsRef.current?.focus();
-    }
-  }, [
-    open
-  ]);
-  const handleSelect = (index) => {
-    if (index === selected) {
-      setOpen(false);
-    } else {
-      setSelected(index);
-    }
-  };
-  const title = (0, import_react4.useMemo)(() => {
-    const lines = items.map((item) => item.title).filter(import_util4.isNotFalsy);
-    return /* @__PURE__ */ import_react4.default.createElement(import_react_ui_components3.StatusRoll, {
-      key: "status-roll",
-      lines,
-      duration: 1e3,
-      autoAdvance: true
-    });
-  }, [
-    items
-  ]);
-  return /* @__PURE__ */ import_react4.default.createElement(import_react_ui_components3.ToggleContainer, {
-    classNames: [
-      "flex flex-col",
-      classNames
-    ],
-    title,
-    open,
-    onChangeOpen: setOpen
-  }, /* @__PURE__ */ import_react4.default.createElement("div", {
-    className: "grid grid-cols-[32px_1fr]"
-  }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui_components3.NumericTabs, {
-    ref: tabsRef,
-    length: items.length,
-    selected,
-    onSelect: handleSelect
-  }), /* @__PURE__ */ import_react4.default.createElement(import_react_ui_syntax_highlighter2.Json, {
-    data: items[selected].block,
-    classNames: "!p-1 text-xs"
-  })));
+  var _effect = (0, import_tracking6.useSignals)();
+  try {
+    const tabsRef = (0, import_react6.useRef)(null);
+    const [selected, setSelected] = (0, import_react6.useState)(0);
+    const [open, setOpen] = (0, import_react6.useState)(false);
+    (0, import_react6.useEffect)(() => {
+      if (open) {
+        tabsRef.current?.focus();
+      }
+    }, [
+      open
+    ]);
+    const handleSelect = (index) => {
+      if (index === selected) {
+        setOpen(false);
+      } else {
+        setSelected(index);
+      }
+    };
+    const title = (0, import_react6.useMemo)(() => {
+      const lines = items.map((item) => item.title).filter(import_util5.isNotFalsy);
+      return /* @__PURE__ */ import_react6.default.createElement(import_react_ui_components3.StatusRoll, {
+        key: "status-roll",
+        lines,
+        duration: 1e3,
+        autoAdvance: true
+      });
+    }, [
+      items
+    ]);
+    return /* @__PURE__ */ import_react6.default.createElement(import_react_ui_components3.ToggleContainer, {
+      classNames: [
+        "flex flex-col",
+        classNames
+      ],
+      title,
+      open,
+      onChangeOpen: setOpen
+    }, /* @__PURE__ */ import_react6.default.createElement("div", {
+      className: "grid grid-cols-[32px_1fr]"
+    }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui_components3.NumericTabs, {
+      ref: tabsRef,
+      length: items.length,
+      selected,
+      onSelect: handleSelect
+    }), /* @__PURE__ */ import_react6.default.createElement(import_react_ui_syntax_highlighter2.Json, {
+      data: items[selected].block,
+      classNames: "!p-1 text-xs"
+    })));
+  } finally {
+    _effect.f();
+  }
 };
 var __dxlog_file5 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/components/Thread/ThreadMessage.tsx";
-var panelClassNames = "flex flex-col w-full px-2 bg-groupSurface rounded-md";
+var panelClassNames = "flex flex-col w-full px-2 bg-activeSurface rounded-md";
 var userClassNames = "bg-[--user-fill] text-accentSurfaceText";
 var ToggleContainer2 = (props) => {
-  return /* @__PURE__ */ import_react3.default.createElement(import_react_ui_components2.ToggleContainer, {
-    ...props,
-    classNames: (0, import_react_ui_theme3.mx)(panelClassNames, props.classNames)
-  });
+  var _effect = (0, import_tracking5.useSignals)();
+  try {
+    return /* @__PURE__ */ import_react5.default.createElement(import_react_ui_components2.ToggleContainer, {
+      ...props,
+      classNames: (0, import_react_ui_theme5.mx)(panelClassNames, props.classNames)
+    });
+  } finally {
+    _effect.f();
+  }
 };
 var MessageContainer = ({ children, classNames, user }) => {
-  if (!children) {
-    return null;
+  var _effect = (0, import_tracking5.useSignals)();
+  try {
+    if (!children) {
+      return null;
+    }
+    return /* @__PURE__ */ import_react5.default.createElement("div", {
+      role: "list-item",
+      className: (0, import_react_ui_theme5.mx)("flex w-full", user && "justify-end", classNames)
+    }, /* @__PURE__ */ import_react5.default.createElement("div", {
+      className: (0, import_react_ui_theme5.mx)(user ? [
+        "px-2 py-1 rounded-md",
+        userClassNames
+      ] : "w-full")
+    }, children));
+  } finally {
+    _effect.f();
   }
-  return /* @__PURE__ */ import_react3.default.createElement("div", {
-    role: "list-item",
-    className: (0, import_react_ui_theme3.mx)("flex w-full", user && "justify-end", classNames)
-  }, /* @__PURE__ */ import_react3.default.createElement("div", {
-    className: (0, import_react_ui_theme3.mx)(user ? [
-      "px-2 py-1 rounded-md",
-      userClassNames
-    ] : "w-full")
-  }, children));
 };
-var ThreadMessage = ({ classNames, space, message, tools, onPrompt }) => {
-  const { role, content = [] } = message;
-  if (isToolMessage(message)) {
-    return /* @__PURE__ */ import_react3.default.createElement(MessageContainer, {
-      classNames: (0, import_react_ui_theme3.mx)(classNames, "animate-[fadeIn_0.5s]")
-    }, /* @__PURE__ */ import_react3.default.createElement(ToolBlock, {
-      space,
-      classNames: panelClassNames,
-      message,
-      tools
-    }));
-  }
-  return content.map((block, idx) => {
-    if (block.type === "text" && block.text.replaceAll(/\s+/g, "").length === 0) {
-      return null;
+var ThreadMessage = ({ classNames, space, message, tools, onPrompt, onAddToGraph }) => {
+  var _effect = (0, import_tracking5.useSignals)();
+  try {
+    const { role, content = [] } = message;
+    if (isToolMessage(message)) {
+      return /* @__PURE__ */ import_react5.default.createElement(MessageContainer, {
+        classNames: (0, import_react_ui_theme5.mx)(classNames, "animate-[fadeIn_0.5s]")
+      }, /* @__PURE__ */ import_react5.default.createElement(ToolBlock, {
+        space,
+        classNames: panelClassNames,
+        message,
+        tools
+      }));
     }
-    const Component = components[block.type] ?? components.default;
-    return /* @__PURE__ */ import_react3.default.createElement(MessageContainer, {
-      key: idx,
-      classNames: (0, import_react_ui_theme3.mx)(classNames, "animate-[fadeIn_0.5s]"),
-      user: block.type === "text" && role === "user"
-    }, /* @__PURE__ */ import_react3.default.createElement(Component, {
-      space,
-      block,
-      onPrompt
-    }));
-  });
+    return content.map((block, idx) => {
+      if (block.type === "text" && block.text.replaceAll(/\s+/g, "").length === 0) {
+        return null;
+      }
+      const Component = components[block.type] ?? components.default;
+      return /* @__PURE__ */ import_react5.default.createElement(MessageContainer, {
+        key: idx,
+        classNames: (0, import_react_ui_theme5.mx)(classNames, "animate-[fadeIn_0.5s]"),
+        user: block.type === "text" && role === "user"
+      }, /* @__PURE__ */ import_react5.default.createElement(Component, {
+        space,
+        block,
+        onPrompt,
+        onAddToGraph
+      }));
+    });
+  } finally {
+    _effect.f();
+  }
 };
 var components = {
   //
@@ -808,7 +1280,7 @@ var components = {
   ["text"]: ({ block }) => {
     (0, import_invariant2.invariant)(block.type === "text", void 0, {
       F: __dxlog_file5,
-      L: 90,
+      L: 105,
       S: void 0,
       A: [
         "block.type === 'text'",
@@ -817,21 +1289,21 @@ var components = {
     });
     const title = block.disposition ? titles[block.disposition] : void 0;
     if (!title) {
-      return /* @__PURE__ */ import_react3.default.createElement(import_react_ui_components2.MarkdownViewer, {
+      return /* @__PURE__ */ import_react5.default.createElement(import_react_ui_components2.MarkdownViewer, {
         classNames: "[&>p]:animate-[fadeIn_0.5s]",
         content: block.text
       });
     }
-    return /* @__PURE__ */ import_react3.default.createElement(ToggleContainer2, {
+    return /* @__PURE__ */ import_react5.default.createElement(ToggleContainer2, {
       // open={open}
       defaultOpen: systemDispositions.includes(block.disposition ?? "") && block.pending,
       title,
-      icon: block.pending ? /* @__PURE__ */ import_react3.default.createElement(import_react_ui.Icon, {
+      icon: block.pending ? /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.Icon, {
         icon: "ph--circle-notch--regular",
         classNames: "text-subdued ml-2 animate-spin",
         size: 4
       }) : void 0
-    }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui_components2.MarkdownViewer, {
+    }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui_components2.MarkdownViewer, {
       content: block.text,
       classNames: [
         "pbe-2",
@@ -842,10 +1314,10 @@ var components = {
   //
   // JSON
   //
-  ["json"]: ({ space, block, onPrompt }) => {
+  ["json"]: ({ space, block, onPrompt, onAddToGraph }) => {
     (0, import_invariant2.invariant)(block.type === "json", void 0, {
       F: __dxlog_file5,
-      L: 128,
+      L: 143,
       S: void 0,
       A: [
         "block.type === 'json'",
@@ -854,38 +1326,56 @@ var components = {
     });
     switch (block.disposition) {
       case "tool_list": {
-        return /* @__PURE__ */ import_react3.default.createElement(ToggleContainer2, {
+        return /* @__PURE__ */ import_react5.default.createElement(ToggleContainer2, {
           title: titles[block.disposition],
           defaultOpen: true
-        }, /* @__PURE__ */ import_react3.default.createElement(ToolboxContainer, {
+        }, /* @__PURE__ */ import_react5.default.createElement(ToolboxContainer, {
           space,
           classNames: "pbe-2"
         }));
       }
       case "suggest": {
-        const { text = "" } = (0, import_util3.safeParseJson)(block.json ?? "{}") ?? {};
-        return /* @__PURE__ */ import_react3.default.createElement(import_react_ui.IconButton, {
+        const { text = "" } = (0, import_util4.safeParseJson)(block.json ?? "{}") ?? {};
+        return /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.IconButton, {
           icon: "ph--lightning--regular",
           label: text,
           onClick: () => onPrompt?.(text)
         });
       }
       case "select": {
-        const { options = [] } = (0, import_util3.safeParseJson)(block.json ?? "{}") ?? {};
-        return /* @__PURE__ */ import_react3.default.createElement("div", {
+        const { options = [] } = (0, import_util4.safeParseJson)(block.json ?? "{}") ?? {};
+        return /* @__PURE__ */ import_react5.default.createElement("div", {
           className: "flex flex-wrap gap-1"
-        }, options.map((option, idx) => /* @__PURE__ */ import_react3.default.createElement(import_react_ui.Button, {
+        }, options.map((option, idx) => /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.Button, {
           classNames: "animate-[fadeIn_0.5s] rounded-2xl text-sm",
           key: option,
           onClick: () => onPrompt?.(option)
         }, option)));
       }
+      case "graph": {
+        return /* @__PURE__ */ import_react5.default.createElement("div", {
+          className: "flex flex-wrap gap-1"
+        }, /* @__PURE__ */ import_react5.default.createElement(import_app_framework2.Surface, {
+          role: "card",
+          data: {
+            subject: JSON.parse(block.json ?? "{}")
+          },
+          limit: 1,
+          fallback: /* @__PURE__ */ import_react5.default.createElement("div", {
+            className: "font-mono text-xs text-pre"
+          }, block.json)
+        }), onAddToGraph && /* @__PURE__ */ import_react5.default.createElement(import_react_ui3.IconButton, {
+          icon: "ph--plus--regular",
+          label: "Add to graph",
+          onClick: () => onAddToGraph?.(JSON.parse(block.json ?? "{}"))
+        }));
+      }
       default: {
         const title = block.disposition ? titles[block.disposition] : void 0;
-        return /* @__PURE__ */ import_react3.default.createElement(ToggleContainer2, {
+        return /* @__PURE__ */ import_react5.default.createElement(ToggleContainer2, {
           title: title ?? "JSON"
-        }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui_syntax_highlighter.Json, {
-          data: (0, import_util3.safeParseJson)(block.json ?? block),
+        }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui_syntax_highlighter.Json, {
+          data: (0, import_util4.safeParseJson)(block.json ?? block),
           classNames: "!p-1 text-xs"
         }));
       }
@@ -899,9 +1389,9 @@ var components = {
     if (block.type === "tool_use") {
       title = `Tool [${block.name}]`;
     }
-    return /* @__PURE__ */ import_react3.default.createElement(ToggleContainer2, {
+    return /* @__PURE__ */ import_react5.default.createElement(ToggleContainer2, {
       title: title ?? "JSON"
-    }, /* @__PURE__ */ import_react3.default.createElement(import_react_ui_syntax_highlighter.Json, {
+    }, /* @__PURE__ */ import_react5.default.createElement(import_react_ui_syntax_highlighter.Json, {
       data: block,
       classNames: "!p-1 text-xs"
     }));
@@ -938,494 +1428,110 @@ var messageReducer = ({ current, messages }, message) => {
               block
             ]
           };
-          messages.push(current);
-        }
-        break;
-      }
-      case "text":
-      default: {
-        current = void 0;
-        messages.push({
-          id: [
-            message.id,
-            i
-          ].join("_"),
-          role: message.role,
-          content: [
-            block
-          ]
-        });
-        break;
-      }
-    }
-    i++;
-  }
-  return {
-    current,
-    messages
-  };
-};
-var createAutocompleteExtension = ({ onSubmit, onSuggest }) => {
-  const suggestionPlugin = import_view.ViewPlugin.fromClass(class {
-    constructor(view) {
-      this._currentSuggestion = null;
-      this._decorations = this.computeDecorations(view);
-    }
-    update(update) {
-      if (update.docChanged || update.selectionSet) {
-        this._decorations = this.computeDecorations(update.view);
-      }
-    }
-    computeDecorations(view) {
-      const text = view.state.doc.toString();
-      const suggestions = onSuggest?.(text) ?? [];
-      if (!suggestions.length) {
-        this._currentSuggestion = null;
-        return import_view.Decoration.none;
-      }
-      this._currentSuggestion = suggestions[0];
-      const suffix = this._currentSuggestion.slice(text.length);
-      if (!suffix) {
-        return import_view.Decoration.none;
-      }
-      return import_view.Decoration.set([
-        import_view.Decoration.widget({
-          widget: new InlineSuggestionWidget(suffix),
-          side: 1
-        }).range(view.state.doc.length)
-      ]);
-    }
-    completeSuggestion(view) {
-      if (!this._currentSuggestion) {
-        return false;
-      }
-      const text = view.state.doc.toString();
-      const suffix = this._currentSuggestion.slice(text.length);
-      if (!suffix) {
-        return false;
-      }
-      view.dispatch({
-        changes: {
-          from: view.state.doc.length,
-          insert: suffix
-        },
-        selection: {
-          anchor: view.state.doc.length + suffix.length
-        }
-      });
-      return true;
-    }
-  }, {
-    decorations: (v) => v._decorations
-  });
-  return [
-    suggestionPlugin,
-    import_view.EditorView.theme({
-      ".cm-inline-suggestion": {
-        opacity: 0.4
-      }
-    }),
-    // Accept the current suggestion.
-    import_state2.Prec.highest(import_view.keymap.of([
-      {
-        key: "Tab",
-        preventDefault: true,
-        run: (view) => {
-          const plugin = view.plugin(suggestionPlugin);
-          return plugin?.completeSuggestion(view) ?? false;
-        }
-      },
-      {
-        key: "ArrowRight",
-        preventDefault: true,
-        run: (view) => {
-          if (view.state.selection.main.head !== view.state.doc.length) {
-            return false;
-          }
-          const plugin = view.plugin(suggestionPlugin);
-          return plugin?.completeSuggestion(view) ?? false;
-        }
-      },
-      {
-        key: "Enter",
-        preventDefault: true,
-        run: (view) => {
-          const text = view.state.doc.toString().trim();
-          if (text.length > 0 && onSubmit) {
-            const reset = onSubmit(text);
-            if (reset) {
-              view.dispatch({
-                changes: {
-                  from: 0,
-                  to: view.state.doc.length,
-                  insert: ""
-                }
-              });
-            }
-          }
-          return true;
-        }
-      },
-      {
-        key: "Shift-Enter",
-        preventDefault: true,
-        run: (view) => {
-          view.dispatch({
-            changes: {
-              from: view.state.selection.main.head,
-              insert: "\n"
-            },
-            selection: {
-              anchor: view.state.selection.main.head + 1,
-              head: view.state.selection.main.head + 1
-            }
-          });
-          return true;
-        }
-      },
-      {
-        key: "Escape",
-        preventDefault: true,
-        run: (view) => {
-          view.dispatch({
-            changes: {
-              from: 0,
-              to: view.state.doc.length,
-              insert: ""
-            }
-          });
-          return true;
-        }
-      }
-    ]))
-  ];
-};
-var InlineSuggestionWidget = class extends import_view.WidgetType {
-  constructor(suffix) {
-    super();
-    this.suffix = suffix;
-  }
-  toDOM() {
-    const span = document.createElement("span");
-    span.textContent = this.suffix;
-    span.className = "cm-inline-suggestion";
-    return span;
-  }
-  eq(other) {
-    return other.suffix === this.suffix;
-  }
-};
-var promptReferences = ({ provider, debug = false, triggerCharacter = "@" }) => {
-  if (triggerCharacter.length !== 1) {
-    throw new Error("triggerCharacter must be a single character");
-  }
-  const decorationField = import_view2.ViewPlugin.fromClass(class ReferenceView {
-    constructor(view) {
-      this._mutex = new import_async.Mutex();
-      this.decorations = import_view2.Decoration.set([]);
-      queueMicrotask(async () => {
-        const guard = await this._mutex.acquire();
-        try {
-          this.decorations = await this._computeDecorations(view);
-        } finally {
-          guard.release();
+          messages.push(current);
         }
-      });
-    }
-    update(update) {
-      if (update.docChanged) {
-        queueMicrotask(async () => {
-          const guard = await this._mutex.acquire();
-          try {
-            this.decorations = await this._computeDecorations(update.view);
-          } finally {
-            guard.release();
-          }
-        });
+        break;
       }
-    }
-    async _computeDecorations(view) {
-      const text = view.state.doc.toString();
-      const references = text.matchAll(new RegExp(`${triggerCharacter}[a-zA-Z0-9@:]+\\s`, "g"));
-      const decorations = [];
-      for (const match of references) {
-        const reference = match[0];
-        const uri = reference.slice(1, -1);
-        const data = await provider.resolveReference({
-          uri
+      case "text":
+      default: {
+        current = void 0;
+        messages.push({
+          id: [
+            message.id,
+            i
+          ].join("_"),
+          role: message.role,
+          content: [
+            block
+          ]
         });
-        if (data) {
-          decorations.push(import_view2.Decoration.replace({
-            widget: new ReferenceWidget(data)
-          }).range(match.index, match.index + reference.length));
-        }
+        break;
       }
-      return import_view2.Decoration.set(decorations);
     }
-  }, {
-    decorations: (v) => v.decorations,
-    provide: (plugin) => [
-      import_view2.EditorView.atomicRanges.of((view) => view.plugin(decorationField)?.decorations ?? import_state3.RangeSet.empty)
-    ]
-  });
-  return [
-    decorationField,
-    import_view2.EditorView.theme({
-      ".cm-reference-pill": {
-        borderRadius: "0.25rem",
-        borderWidth: "1px",
-        marginRight: "0.25rem",
-        marginLeft: "0.25rem"
-      }
-    }),
-    (0, import_autocomplete.autocompletion)({
-      activateOnTyping: true,
-      override: [
-        async (context) => {
-          const match = context.matchBefore(new RegExp(`${triggerCharacter}[a-zA-Z0-9]+`));
-          if (!match || match?.to === match?.from) {
-            return null;
-          }
-          const query = match.text.slice(1);
-          const references = await provider.getReferences({
-            query
-          });
-          return {
-            from: match.from,
-            filter: false,
-            options: references.map((reference) => ({
-              label: reference.label,
-              apply: `${triggerCharacter}${reference.uri} `
-            }))
-          };
-        }
-      ],
-      closeOnBlur: !debug,
-      tooltipClass: () => "shadow rounded",
-      aboveCursor: true
-    }),
-    import_view2.keymap.of(import_autocomplete.completionKeymap)
-  ];
-};
-var ReferenceWidget = class extends import_view2.WidgetType {
-  constructor(data) {
-    super();
-    this.data = data;
-  }
-  toDOM() {
-    const span = document.createElement("span");
-    span.textContent = `@ ${this.data.label}`;
-    span.className = "cm-reference-pill";
-    return span;
-  }
-  eq(other) {
-    return other.data.uri === this.data.uri;
-  }
-  ignoreEvent() {
-    return true;
+    i++;
   }
+  return {
+    current,
+    messages
+  };
 };
-var Prompt = /* @__PURE__ */ (0, import_react5.forwardRef)(({ classNames, autoFocus, lineWrapping = false, placeholder, onSubmit, onSuggest, onOpenChange, references }, forwardRef2) => {
-  const { themeMode } = (0, import_react_ui2.useThemeContext)();
-  const { parentRef, view } = (0, import_react_ui_editor.useTextEditor)({
-    debug: true,
-    autoFocus,
-    extensions: [
-      (0, import_react_ui_editor.createBasicExtensions)({
-        bracketMatching: false,
-        lineWrapping,
-        placeholder
-      }),
-      (0, import_react_ui_editor.createThemeExtensions)({
-        themeMode
-      }),
-      references ? promptReferences({
-        provider: references
-      }) : [],
-      createAutocompleteExtension({
-        onSubmit,
-        onSuggest
-      }),
-      import_state.Prec.highest(import_react_ui_editor.keymap.of([
-        {
-          key: "cmd-ArrowUp",
-          preventDefault: true,
-          run: (view2) => {
-            onOpenChange?.(true);
-            return true;
-          }
-        },
-        {
-          key: "cmd-ArrowDown",
-          preventDefault: true,
-          run: (view2) => {
-            onOpenChange?.(false);
-            return true;
-          }
-        }
-      ]))
-    ]
-  }, [
-    themeMode,
-    onSubmit,
-    onSuggest
-  ]);
-  (0, import_react5.useImperativeHandle)(forwardRef2, () => {
-    return {
-      focus: () => {
-        view?.focus();
-      },
-      setText: (text) => {
-        view?.dispatch({
-          changes: {
-            from: 0,
-            to: view.state.doc.length,
-            insert: text
-          },
-          selection: {
-            anchor: text.length,
-            head: text.length
-          }
+var Thread = ({ classNames, space, messages, collapse = true, transcription, processing, error, onSubmit, onCancel, onOpenChange, contextProvider, ...props }) => {
+  var _effect = (0, import_tracking4.useSignals)();
+  try {
+    const scroller = (0, import_react4.useRef)(null);
+    const identity = (0, import_halo.useIdentity)();
+    const fallbackValue = (0, import_util3.keyToFallback)(identity.identityKey);
+    const userHue = identity.profile?.data?.hue || fallbackValue.hue;
+    const handleSubmit = (0, import_react4.useCallback)((value) => {
+      onSubmit?.(value);
+      scroller.current?.scrollToBottom();
+      return true;
+    }, [
+      onSubmit
+    ]);
+    const { messages: filteredMessages = [] } = (0, import_react4.useMemo)(() => {
+      if (collapse) {
+        return (messages ?? []).reduce(messageReducer, {
+          messages: []
         });
+      } else {
+        return {
+          messages: messages ?? []
+        };
+      }
+    }, [
+      messages,
+      collapse
+    ]);
+    const references = (0, import_react4.useMemo)(() => {
+      if (!contextProvider) {
+        return void 0;
       }
-    };
-  }, [
-    view,
-    onSubmit
-  ]);
-  return /* @__PURE__ */ import_react5.default.createElement("div", {
-    ref: parentRef,
-    className: (0, import_react_ui_theme4.mx)("w-full", classNames)
-  });
-});
-var PromptBar = ({ classNames, placeholder, processing, error, microphone, onCancel, references, ...props }) => {
-  const { t } = (0, import_react_ui3.useTranslation)(import_chunk_Q5XWEMHB.ASSISTANT_PLUGIN);
-  const promptRef = (0, import_react6.useRef)(null);
-  const [active, setActive] = (0, import_react6.useState)(false);
-  const { recording } = (0, import_plugin_transcription.useVoiceInput)({
-    active,
-    onUpdate: (text) => {
-      promptRef.current?.setText(text);
-      promptRef.current?.focus();
-    }
-  });
-  return /* @__PURE__ */ import_react6.default.createElement("div", {
-    className: (0, import_react_ui_theme5.mx)("shrink-0 w-full grid grid-cols-[var(--rail-action)_1fr_var(--rail-action)] overflow-hidden", classNames)
-  }, /* @__PURE__ */ import_react6.default.createElement("div", {
-    className: "flex w-[--rail-action] h-[--rail-action] items-center justify-center"
-  }, error && /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Tooltip.Trigger, {
-    content: error.message,
-    delayDuration: 0
-  }, /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.Icon, {
-    icon: "ph--warning-circle--regular",
-    classNames: import_react_ui_theme5.errorText,
-    size: 5
-  })) || /* @__PURE__ */ import_react6.default.createElement(import_react_ui_sfx.Spinner, {
-    active: processing
-  })), /* @__PURE__ */ import_react6.default.createElement(Prompt, {
-    ref: promptRef,
-    autoFocus: true,
-    classNames: "pbs-2",
-    lineWrapping: true,
-    placeholder: placeholder ?? t("prompt placeholder"),
-    references,
-    ...props
-  }), (onCancel || microphone) && /* @__PURE__ */ import_react6.default.createElement("div", {
-    className: "flex w-[--rail-action] h-[--rail-action] items-center justify-center"
-  }, processing && onCancel && /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.IconButton, {
-    classNames: "px-1.5",
-    variant: "ghost",
-    size: 5,
-    icon: "ph--x--regular",
-    iconOnly: true,
-    label: t("cancel processing button"),
-    onClick: onCancel
-  }), !processing && microphone && /* @__PURE__ */ import_react6.default.createElement(import_react_ui3.IconButton, {
-    classNames: (0, import_react_ui_theme5.mx)("px-1.5", recording && "bg-primary-500"),
-    variant: "ghost",
-    size: 5,
-    icon: "ph--microphone--regular",
-    iconOnly: true,
-    noTooltip: true,
-    label: t("microphone button"),
-    onMouseDown: () => setActive(true),
-    onMouseUp: () => setActive(false),
-    onTouchStart: () => setActive(true),
-    onTouchEnd: () => setActive(false)
-  })));
-};
-var Thread = ({ classNames, space, messages, collapse = true, transcription, processing, error, onSubmit, onCancel, onOpenChange, contextProvider, ...props }) => {
-  const scroller = (0, import_react2.useRef)(null);
-  const identity = (0, import_halo.useIdentity)();
-  const fallbackValue = (0, import_util2.keyToFallback)(identity.identityKey);
-  const userHue = identity.profile?.data?.hue || fallbackValue.hue;
-  const handleSubmit = (0, import_react2.useCallback)((value) => {
-    onSubmit?.(value);
-    scroller.current?.scrollToBottom();
-    return true;
-  }, [
-    onSubmit
-  ]);
-  const { messages: filteredMessages = [] } = (0, import_react2.useMemo)(() => {
-    if (collapse) {
-      return (messages ?? []).reduce(messageReducer, {
-        messages: []
-      });
-    } else {
       return {
-        messages: messages ?? []
+        getReferences: async ({ query }) => contextProvider.query({
+          query
+        }),
+        resolveReference: async ({ uri }) => contextProvider.resolveMetadata({
+          uri
+        })
       };
-    }
-  }, [
-    messages,
-    collapse
-  ]);
-  const references = (0, import_react2.useMemo)(() => {
-    if (!contextProvider) {
-      return void 0;
-    }
-    return {
-      getReferences: async ({ query }) => contextProvider.query({
-        query
-      }),
-      resolveReference: async ({ uri }) => contextProvider.resolveMetadata({
-        uri
-      })
-    };
-  }, [
-    contextProvider
-  ]);
-  return /* @__PURE__ */ import_react2.default.createElement("div", {
-    role: "none",
-    className: (0, import_react_ui_theme2.mx)("flex flex-col grow overflow-hidden", classNames)
-  }, /* @__PURE__ */ import_react2.default.createElement(import_react_ui_components.ScrollContainer, {
-    ref: scroller,
-    fade: true
-  }, /* @__PURE__ */ import_react2.default.createElement("div", {
-    role: "none",
-    className: (0, import_react_ui_theme2.mx)(filteredMessages.length > 0 && "pbs-6 pbe-6"),
-    style: {
-      "--user-fill": `var(--dx-${userHue}Fill)`
-    }
-  }, filteredMessages.map((message) => /* @__PURE__ */ import_react2.default.createElement(ThreadMessage, {
-    key: message.id,
-    classNames: "px-4 pbe-4",
-    space,
-    message,
-    ...props
-  })))), onSubmit && /* @__PURE__ */ import_react2.default.createElement(PromptBar, {
-    microphone: transcription,
-    processing,
-    error,
-    onSubmit: handleSubmit,
-    onCancel,
-    onOpenChange,
-    references
-  }));
+    }, [
+      contextProvider
+    ]);
+    return /* @__PURE__ */ import_react4.default.createElement("div", {
+      role: "none",
+      className: (0, import_react_ui_theme4.mx)("flex flex-col grow overflow-hidden", classNames)
+    }, /* @__PURE__ */ import_react4.default.createElement(import_react_ui_components.ScrollContainer, {
+      ref: scroller,
+      fade: true
+    }, /* @__PURE__ */ import_react4.default.createElement("div", {
+      role: "none",
+      className: (0, import_react_ui_theme4.mx)(filteredMessages.length > 0 && "pbs-6 pbe-6"),
+      style: {
+        "--user-fill": `var(--dx-${userHue}Fill)`
+      }
+    }, filteredMessages.map((message) => /* @__PURE__ */ import_react4.default.createElement(ThreadMessage, {
+      key: message.id,
+      classNames: "px-4 pbe-4",
+      space,
+      message,
+      ...props
+    })))), onSubmit && /* @__PURE__ */ import_react4.default.createElement(PromptBar, {
+      microphone: transcription,
+      processing,
+      error,
+      onSubmit: handleSubmit,
+      onCancel,
+      onOpenChange,
+      references
+    }));
+  } finally {
+    _effect.f();
+  }
 };
 var __dxlog_file6 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/processor.ts";
 var defaultOptions = {
-  model: import_assistant.DEFAULT_EDGE_MODEL,
+  model: import_ai4.DEFAULT_EDGE_MODEL,
   systemPrompt: "you are a helpful assistant"
 };
 var ChatProcessor = class {
@@ -1447,7 +1553,7 @@ var ChatProcessor = class {
         const current = messages.pop();
         (0, import_invariant4.invariant)(current, void 0, {
           F: __dxlog_file6,
-          L: 70,
+          L: 79,
           S: this,
           A: [
             "current",
@@ -1466,6 +1572,24 @@ var ChatProcessor = class {
       }
       return messages;
     });
+    this._artifactDiffResolver = async (artifacts) => {
+      const space = this._extensions?.space;
+      if (!space) {
+        return /* @__PURE__ */ new Map();
+      }
+      const versions = /* @__PURE__ */ new Map();
+      await Promise.all(artifacts.map(async (artifact) => {
+        const { objects: [object] } = await space.db.query(import_echo4.Filter.ids(artifact.id)).run();
+        if (!object) {
+          return;
+        }
+        versions.set(artifact.id, {
+          version: (0, import_echo4.getVersion)(object),
+          diff: `Current state: ${JSON.stringify(object)}`
+        });
+      }));
+      return versions;
+    };
   }
   get tools() {
     return this._tools;
@@ -1503,6 +1627,35 @@ var ChatProcessor = class {
         message2
       ];
     });
+    this._session.toolStatusReport.on(({ message: message2, status }) => {
+      const msg = this._pending.peek().find((m) => m.id === message2.id);
+      const toolUse = msg?.content.find((block2) => block2.type === "tool_use");
+      if (!toolUse) {
+        return;
+      }
+      const block = msg?.content.find((block2) => block2.type === "tool_use" && block2.id === toolUse.id);
+      if (block) {
+        this._pending.value = this._pending.value.map((m) => {
+          if (m.id === message2.id) {
+            return {
+              ...m,
+              content: m.content.map((b) => b.type === "tool_use" && b.id === toolUse.id ? {
+                ...b,
+                currentStatus: status
+              } : b)
+            };
+          }
+          return m;
+        });
+      } else {
+        import_log6.log.warn("no block for status report", void 0, {
+          F: __dxlog_file6,
+          L: 155,
+          S: this,
+          C: (f, a) => f(...a)
+        });
+      }
+    });
     try {
       const messages = await this._session.run({
         client: this._ai,
@@ -1513,26 +1666,7 @@ var ChatProcessor = class {
         prompt: message,
         systemPrompt: this._options.systemPrompt,
         extensions: this._extensions,
-        artifactDiffResolver: async (artifacts) => {
-          const space = this._extensions?.space;
-          if (!space) {
-            return /* @__PURE__ */ new Map();
-          }
-          const versions = /* @__PURE__ */ new Map();
-          await Promise.all(artifacts.map(async (artifact) => {
-            const { objects: [object] } = await space.db.query({
-              id: artifact.id
-            }).run();
-            if (!object) {
-              return;
-            }
-            versions.set(artifact.id, {
-              version: (0, import_echo4.getVersion)(object),
-              diff: `Current state: ${JSON.stringify(object)}`
-            });
-          }));
-          return versions;
-        },
+        artifactDiffResolver: this._artifactDiffResolver,
         generationOptions: {
           model: this._options.model
         }
@@ -1541,7 +1675,7 @@ var ChatProcessor = class {
         messages
       }, {
         F: __dxlog_file6,
-        L: 160,
+        L: 175,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1549,7 +1683,7 @@ var ChatProcessor = class {
     } catch (err) {
       import_log6.log.catch(err, void 0, {
         F: __dxlog_file6,
-        L: 163,
+        L: 178,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -1574,7 +1708,7 @@ var ChatProcessor = class {
   async cancel() {
     import_log6.log.info("cancelling...", void 0, {
       F: __dxlog_file6,
-      L: 181,
+      L: 196,
       S: this,
       C: (f, a) => f(...a)
     });
@@ -1596,11 +1730,11 @@ var AIServiceOverloadedError = class extends Error {
     this.code = "AI_SERVICE_OVERLOADED";
   }
 };
-var AiClient = (0, import_app_framework4.lazy)(() => import("./ai-client-OUPSRQT7.cjs"));
-var AppGraphBuilder = (0, import_app_framework4.lazy)(() => import("./app-graph-builder-LEO63CZZ.cjs"));
-var IntentResolver = (0, import_app_framework4.lazy)(() => import("./intent-resolver-QDGZMWLY.cjs"));
-var ReactSurface = (0, import_app_framework4.lazy)(() => import("./react-surface-XNEIJJYJ.cjs"));
-var Settings = (0, import_app_framework4.lazy)(() => import("./settings-WLTC7XO5.cjs"));
+var AiClient = (0, import_app_framework5.lazy)(() => import("./ai-client-R2CGEYZW.cjs"));
+var AppGraphBuilder = (0, import_app_framework5.lazy)(() => import("./app-graph-builder-PSHIOW3Q.cjs"));
+var IntentResolver = (0, import_app_framework5.lazy)(() => import("./intent-resolver-66F7WLW6.cjs"));
+var ReactSurface = (0, import_app_framework5.lazy)(() => import("./react-surface-TASAPRPQ.cjs"));
+var Settings = (0, import_app_framework5.lazy)(() => import("./settings-ERKLO6IO.cjs"));
 var __dxlog_file7 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/useChatProcessor.tsx";
 var useChatProcessor = ({
   chat,
@@ -1610,101 +1744,106 @@ var useChatProcessor = ({
   part,
   associatedArtifact
 }) => {
-  const aiClient = (0, import_app_framework3.useCapability)(import_chunk_GBUNQ257.AssistantCapabilities.AiClient);
-  const globalTools = (0, import_app_framework3.useCapabilities)(import_app_framework3.Capabilities.Tools);
-  const artifactDefinitions = (0, import_app_framework3.useCapabilities)(import_app_framework3.Capabilities.ArtifactDefinition);
-  const { dispatchPromise: dispatch } = (0, import_app_framework3.useIntentDispatcher)();
-  const services = (0, import_echo5.useQuery)(space, import_echo5.Filter.type(import_chunk_VG2UQY4S.ServiceType));
-  const [serviceTools, setServiceTools] = (0, import_react8.useState)([]);
-  (0, import_react8.useEffect)(() => {
-    (0, import_log7.log)("creating service tools...", void 0, {
-      F: __dxlog_file7,
-      L: 49,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    queueMicrotask(async () => {
-      const tools2 = await Promise.all(services.map((service) => createToolsFromService(service)));
-      setServiceTools(tools2.flat());
-    });
-  }, [
-    services
-  ]);
-  const config = (0, import_react_client.useConfig)();
-  const functions = (0, import_echo5.useQuery)(space, import_echo5.Filter.type(import_functions3.FunctionType));
-  const chatId = (0, import_react8.useMemo)(() => chat ? (0, import_echo5.fullyQualifiedId)(chat) : void 0, [
-    chat
-  ]);
-  const [tools, extensions] = (0, import_react8.useMemo)(() => {
-    (0, import_log7.log)("creating tools...", void 0, {
-      F: __dxlog_file7,
-      L: 61,
-      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(import_util5.isNonNullable)
-    ];
-    const extensions2 = {
-      space,
+  var _effect = (0, import_tracking8.useSignals)();
+  try {
+    const aiClient = (0, import_app_framework4.useCapability)(import_chunk_TS3H5OSX.AssistantCapabilities.AiClient);
+    const globalTools = (0, import_app_framework4.useCapabilities)(import_app_framework4.Capabilities.Tools);
+    const artifactDefinitions = (0, import_app_framework4.useCapabilities)(import_app_framework4.Capabilities.ArtifactDefinition);
+    const { dispatchPromise: dispatch } = (0, import_app_framework4.useIntentDispatcher)();
+    const services = (0, import_echo5.useQuery)(space, import_echo5.Filter.type(import_chunk_RXPA2C2A.ServiceType));
+    const [serviceTools, setServiceTools] = (0, import_react8.useState)([]);
+    (0, import_react8.useEffect)(() => {
+      (0, import_log7.log)("creating service tools...", void 0, {
+        F: __dxlog_file7,
+        L: 49,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      queueMicrotask(async () => {
+        const tools2 = await Promise.all(services.map((service) => createToolsFromService(service)));
+        setServiceTools(tools2.flat());
+      });
+    }, [
+      services
+    ]);
+    const config = (0, import_react_client.useConfig)();
+    const functions = (0, import_echo5.useQuery)(space, import_echo5.Filter.type(import_functions3.FunctionType));
+    const chatId = (0, import_react8.useMemo)(() => chat ? (0, import_echo5.fullyQualifiedId)(chat) : void 0, [
+      chat
+    ]);
+    const [tools, extensions] = (0, import_react8.useMemo)(() => {
+      (0, import_log7.log)("creating tools...", void 0, {
+        F: __dxlog_file7,
+        L: 61,
+        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(import_util6.isNonNullable)
+      ];
+      const extensions2 = {
+        space,
+        dispatch,
+        pivotId: chatId,
+        part
+      };
+      return [
+        tools2,
+        extensions2
+      ];
+    }, [
       dispatch,
-      pivotId: chatId,
-      part
-    };
-    return [
-      tools2,
-      extensions2
-    ];
-  }, [
-    dispatch,
-    globalTools,
-    space,
-    chatId,
-    serviceTools,
-    functions
-  ]);
-  const systemPrompt = (0, import_react8.useMemo)(() => (0, import_artifact4.createSystemPrompt)({
-    artifacts: artifactDefinitions.map((definition) => `${definition.name}
+      globalTools,
+      space,
+      chatId,
+      serviceTools,
+      functions
+    ]);
+    const systemPrompt = (0, import_react8.useMemo)(() => (0, import_artifact.createSystemPrompt)({
+      artifacts: artifactDefinitions.map((definition) => `${definition.name}
 ${definition.instructions}`),
-    associatedArtifact
-  }), [
-    artifactDefinitions,
-    associatedArtifact
-  ]);
-  const model = settings?.llmProvider === "ollama" ? settings?.ollamaModel ?? import_assistant2.DEFAULT_OLLAMA_MODEL : settings?.edgeModel ?? import_assistant2.DEFAULT_EDGE_MODEL;
-  const processor = (0, import_react8.useMemo)(() => {
-    (0, import_log7.log)("creating processor...", {
-      settings
-    }, {
-      F: __dxlog_file7,
-      L: 92,
-      S: void 0,
-      C: (f, a) => f(...a)
-    });
-    return new ChatProcessor(aiClient.value, tools, artifactDefinitions, extensions, {
+      associatedArtifact
+    }), [
+      artifactDefinitions,
+      associatedArtifact
+    ]);
+    const model = settings?.llmProvider === "ollama" ? settings?.ollamaModel ?? import_ai5.DEFAULT_OLLAMA_MODEL : settings?.edgeModel ?? import_ai5.DEFAULT_EDGE_MODEL;
+    const processor = (0, import_react8.useMemo)(() => {
+      (0, import_log7.log)("creating processor...", {
+        settings
+      }, {
+        F: __dxlog_file7,
+        L: 92,
+        S: void 0,
+        C: (f, a) => f(...a)
+      });
+      return new ChatProcessor(aiClient.value, tools, artifactDefinitions, extensions, {
+        model,
+        systemPrompt
+      });
+    }, [
+      aiClient.value,
+      tools,
+      artifactDefinitions,
+      extensions,
       model,
       systemPrompt
-    });
-  }, [
-    aiClient.value,
-    tools,
-    artifactDefinitions,
-    extensions,
-    model,
-    systemPrompt
-  ]);
-  return processor;
+    ]);
+    return processor;
+  } finally {
+    _effect.f();
+  }
 };
 var useMessageQueue = (chat) => {
   const space = (0, import_echo6.getSpace)(chat);
   const queueDxn = (0, import_react9.useMemo)(() => {
-    const dxn = space && chat?.assistantChatQueue.dxn;
-    return dxn ? (0, import_echo_schema3.createQueueDxn)(space.id) : void 0;
+    const dxn = space && chat?.queue.dxn;
+    return dxn ? (0, import_echo_schema3.createQueueDxn)(space.id, dxn.parts.at(-1)) : void 0;
   }, [
     space,
-    chat?.assistantChatQueue.dxn
+    chat?.queue.dxn
   ]);
   return (0, import_echo6.useQueue)(queueDxn);
 };
@@ -1724,7 +1863,7 @@ var VISUAL_CROSSING_CREDENTIALS = {
   }
 };
 var TEST_SERVICES = [
-  (0, import_echo_schema4.create)(import_chunk_VG2UQY4S.ServiceType, {
+  (0, import_echo_schema4.create)(import_chunk_RXPA2C2A.ServiceType, {
     serviceId: "amadeus.com/service/FlightSearch",
     name: "Amadeus Flight Search",
     description: "Search for local and international flights.",
@@ -1737,7 +1876,7 @@ var TEST_SERVICES = [
       }
     ]
   }),
-  (0, import_echo_schema4.create)(import_chunk_VG2UQY4S.ServiceType, {
+  (0, import_echo_schema4.create)(import_chunk_RXPA2C2A.ServiceType, {
     serviceId: "amadeus.com/service/HotelSearch",
     name: "Amadeus Hotel Search",
     description: "Search for local and international hotels.",
@@ -1750,7 +1889,7 @@ var TEST_SERVICES = [
       }
     ]
   }),
-  (0, import_echo_schema4.create)(import_chunk_VG2UQY4S.ServiceType, {
+  (0, import_echo_schema4.create)(import_chunk_RXPA2C2A.ServiceType, {
     serviceId: "visualcrossing.com/service/Weather",
     name: "Visual Crossing Weather",
     description: "Search for global weather forecasts.",
@@ -1764,7 +1903,7 @@ var TEST_SERVICES = [
     ]
   }),
   // TODO(burdon): Needs auth.
-  (0, import_echo_schema4.create)(import_chunk_VG2UQY4S.ServiceType, {
+  (0, import_echo_schema4.create)(import_chunk_RXPA2C2A.ServiceType, {
     serviceId: "abstractapi.com/service/GeoLocation",
     name: "Abstract GeoLocation",
     description: "Get the location of any IP address.",
@@ -1781,11 +1920,11 @@ var TEST_SERVICES = [
   //
   ...Array.from({
     length: 20
-  }, (_, i) => (0, import_echo_schema4.create)(import_chunk_VG2UQY4S.ServiceType, {
+  }, (_, i) => (0, import_echo_schema4.create)(import_chunk_RXPA2C2A.ServiceType, {
     serviceId: `example.com/service/test-${i}`,
     name: `Test ${i}`,
     description: `Test ${i}`,
-    category: Object.keys(import_chunk_VG2UQY4S.categoryIcons)[Math.floor(Math.random() * Object.keys(import_chunk_VG2UQY4S.categoryIcons).length)],
+    category: Object.keys(import_chunk_RXPA2C2A.categoryIcons)[Math.floor(Math.random() * Object.keys(import_chunk_RXPA2C2A.categoryIcons).length)],
     interfaces: [
       {
         kind: "api",
@@ -1797,7 +1936,7 @@ var TEST_SERVICES = [
 var __dxlog_file8 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/hooks/useContextProvider.ts";
 var stringMatch = (query, label) => label.toLowerCase().startsWith(query.toLowerCase());
 var useContextProvider = (space) => {
-  const artifactDefinitions = (0, import_app_framework5.useCapabilities)(import_app_framework5.Capabilities.ArtifactDefinition);
+  const artifactDefinitions = (0, import_app_framework6.useCapabilities)(import_app_framework6.Capabilities.ArtifactDefinition);
   return (0, import_react12.useMemo)(() => {
     if (!space) {
       return void 0;
@@ -1809,7 +1948,7 @@ var useContextProvider = (space) => {
         return objects.map((object) => {
           import_log8.log.info("object", {
             object,
-            label: (0, import_echo_schema5.getLabel)(import_echo8.Type.getSchema(object), object)
+            label: (0, import_echo_schema5.getLabel)(import_echo8.Obj.getSchema(object), object)
           }, {
             F: __dxlog_file8,
             L: 38,
@@ -1817,18 +1956,16 @@ var useContextProvider = (space) => {
             C: (f, a) => f(...a)
           });
           return object;
-        }).filter((object) => stringMatch(query, (0, import_echo_schema5.getLabel)(import_echo8.Type.getSchema(object), object) ?? "")).filter((object) => !!(0, import_echo_schema5.getDXN)(object)).map((object) => ({
+        }).filter((object) => stringMatch(query, (0, import_echo_schema5.getLabel)(import_echo8.Obj.getSchema(object), object) ?? "")).filter((object) => !!(0, import_echo_schema5.getDXN)(object)).map((object) => ({
           uri: (0, import_echo_schema5.getDXN)(object).toString(),
-          label: (0, import_echo_schema5.getLabel)(import_echo8.Type.getSchema(object), object) ?? ""
+          label: (0, import_echo_schema5.getLabel)(import_echo8.Obj.getSchema(object), object) ?? ""
         }));
       },
       resolveMetadata: async ({ uri }) => {
-        const object = await space.db.query({
-          id: uri
-        }).first();
+        const object = await space.db.query(import_echo7.Filter.ids(uri)).first();
         return {
           uri,
-          label: (0, import_echo_schema5.getLabel)(import_echo8.Type.getSchema(object), object) ?? ""
+          label: (0, import_echo_schema5.getLabel)(import_echo8.Obj.getSchema(object), object) ?? ""
         };
       }
     };
@@ -1839,100 +1976,106 @@ var useContextProvider = (space) => {
 };
 var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/plugins/plugin-assistant/src/components/Thread/ThreadContainer.tsx";
 var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, onOpenChange, ...props }) => {
-  const space = (0, import_echo3.getSpace)(chat);
-  const contextProvider = useContextProvider(space);
-  const processor = useChatProcessor({
-    chat,
-    space,
-    settings,
-    part,
-    associatedArtifact
-  });
-  const messageQueue = useMessageQueue(chat);
-  const { dispatchPromise: dispatch } = (0, import_app_framework2.useIntentDispatcher)();
-  const messages = [
-    ...messageQueue?.items ?? [],
-    ...processor.messages.value
-  ];
-  (0, import_react7.useEffect)(() => {
-    if (!processor.streaming.value && messageQueue?.items) {
-      const message = messageQueue.items[messageQueue.items.length - 1];
-      if (space && chat && message && dispatch && associatedArtifact) {
-        void dispatch((0, import_app_framework2.createIntent)(import_app_framework2.CollaborationActions.InsertContent, {
-          spaceId: space.id,
-          target: (0, import_live_object.makeRef)(associatedArtifact),
-          object: (0, import_live_object.refFromDXN)(new import_keys.DXN(import_keys.DXN.kind.QUEUE, [
-            ...chat.assistantChatQueue.dxn.parts,
-            message.id
-          ])),
-          label: "View proposal"
-        }));
+  var _effect = (0, import_tracking7.useSignals)();
+  try {
+    const space = (0, import_echo3.getSpace)(chat);
+    const contextProvider = useContextProvider(space);
+    const processor = useChatProcessor({
+      chat,
+      space,
+      settings,
+      part,
+      associatedArtifact
+    });
+    const messageQueue = useMessageQueue(chat);
+    const { dispatchPromise: dispatch } = (0, import_app_framework3.useIntentDispatcher)();
+    const messages = [
+      ...messageQueue?.objects ?? [],
+      ...processor.messages.value
+    ];
+    (0, import_react7.useEffect)(() => {
+      if (!processor.streaming.value && messageQueue?.objects) {
+        const message = messageQueue.objects[messageQueue.objects.length - 1];
+        if (space && chat && message && dispatch && associatedArtifact) {
+          void dispatch((0, import_app_framework3.createIntent)(import_app_framework3.CollaborationActions.InsertContent, {
+            target: associatedArtifact,
+            object: (0, import_live_object.refFromDXN)(new import_keys.DXN(import_keys.DXN.kind.QUEUE, [
+              ...chat.queue.dxn.parts,
+              message.id
+            ])),
+            label: "View proposal"
+          }));
+        }
       }
-    }
-  }, [
-    messageQueue,
-    associatedArtifact,
-    processor.streaming.value
-  ]);
-  const handleSubmit = (0, import_react7.useCallback)((text) => {
-    if (processor.streaming.value) {
-      import_log5.log.warn("ignoring submit; still processing.", void 0, {
+    }, [
+      messageQueue,
+      associatedArtifact,
+      processor.streaming.value
+    ]);
+    const handleSubmit = (0, import_react7.useCallback)((text) => {
+      if (processor.streaming.value) {
+        import_log5.log.warn("ignoring submit; still processing.", void 0, {
+          F: __dxlog_file9,
+          L: 65,
+          S: void 0,
+          C: (f, a) => f(...a)
+        });
+        return false;
+      }
+      onOpenChange?.(true);
+      (0, import_invariant3.invariant)(messageQueue, void 0, {
         F: __dxlog_file9,
-        L: 66,
+        L: 71,
         S: void 0,
-        C: (f, a) => f(...a)
+        A: [
+          "messageQueue",
+          ""
+        ]
       });
-      return false;
-    }
-    onOpenChange?.(true);
-    (0, import_invariant3.invariant)(messageQueue, void 0, {
-      F: __dxlog_file9,
-      L: 72,
-      S: void 0,
-      A: [
-        "messageQueue",
-        ""
-      ]
-    });
-    void processor.request(text, {
-      history: messageQueue.items,
-      onComplete: (messages2) => {
-        messageQueue.append(messages2);
+      void processor.request(text, {
+        history: messageQueue.objects,
+        onComplete: (messages2) => {
+          messageQueue.append(messages2);
+        }
+      });
+      return true;
+    }, [
+      processor,
+      messageQueue,
+      onOpenChange
+    ]);
+    const handleCancel = (0, import_react7.useCallback)(() => {
+      if (processor.streaming.value) {
+        void processor.cancel();
       }
+    }, [
+      processor
+    ]);
+    return /* @__PURE__ */ import_react7.default.createElement(Thread, {
+      classNames,
+      space,
+      messages,
+      processing: processor.streaming.value,
+      error: processor.error.value,
+      tools: processor.tools,
+      contextProvider,
+      onSubmit: handleSubmit,
+      onCancel: handleCancel,
+      onPrompt: handleSubmit,
+      onOpenChange,
+      ...props
     });
-    return true;
-  }, [
-    processor,
-    messageQueue,
-    onOpenChange
-  ]);
-  const handleCancel = (0, import_react7.useCallback)(() => {
-    if (processor.streaming.value) {
-      void processor.cancel();
-    }
-  }, [
-    processor
-  ]);
-  return /* @__PURE__ */ import_react7.default.createElement(Thread, {
-    classNames,
-    space,
-    messages,
-    processing: processor.streaming.value,
-    error: processor.error.value,
-    tools: processor.tools,
-    contextProvider,
-    onSubmit: handleSubmit,
-    onCancel: handleCancel,
-    onPrompt: handleSubmit,
-    onOpenChange,
-    ...props
-  });
+  } finally {
+    _effect.f();
+  }
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AiClient,
   AppGraphBuilder,
   IntentResolver,
+  Prompt,
+  PromptBar,
   ReactSurface,
   Settings,
   Thread,
@@ -1940,4 +2083,4 @@ var ThreadContainer = ({ classNames, chat, settings, part, associatedArtifact, o
   Toolbox,
   ToolboxContainer
 });
-//# sourceMappingURL=chunk-OOHFSPWR.cjs.map
+//# sourceMappingURL=chunk-H4A42LNR.cjs.map