@dxos/assistant 0.8.4-main.e098934 → 0.8.4-main.ead640a

package/dist/lib/node-esm/index.mjs

@@ -7,14 +7,18 @@ import {
   GenerationObserver,
   VersionPin,
   createToolkit
-} from "./chunk-W7AIB6DP.mjs";
+} from "./chunk-OV5PMQPB.mjs";
 
 // src/conversation/context.ts
 import { computed } from "@preact/signals-core";
-import { Context, Schema } from "effect";
-import { Array, pipe } from "effect";
+import * as Array2 from "effect/Array";
+import * as Context from "effect/Context";
+import * as Function from "effect/Function";
+import * as Schema from "effect/Schema";
 import { Blueprint } from "@dxos/blueprints";
-import { DXN, Obj, Type } from "@dxos/echo";
+import { Resource } from "@dxos/context";
+import { DXN, Filter, Obj, Query, Type } from "@dxos/echo";
+import { invariant } from "@dxos/invariant";
 import { ComplexSet } from "@dxos/util";
 function _define_property(obj, key, value) {
   if (key in obj) {
@@ -29,6 +33,7 @@ function _define_property(obj, key, value) {
   }
   return obj;
 }
+var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant/src/conversation/context.ts";
 var ContextBinding = Schema.Struct({
   blueprints: Schema.Struct({
     added: Schema.Array(Type.Ref(Blueprint.Blueprint)),
@@ -46,8 +51,8 @@ var ContextBinding = Schema.Struct({
 var Bindings = class {
   toJSON() {
     return {
-      blueprints: Array.fromIterable(this.blueprints).map((ref) => ref.dxn.toString()),
-      objects: Array.fromIterable(this.objects).map((ref) => ref.dxn.toString())
+      blueprints: Array2.fromIterable(this.blueprints).map((ref) => ref.dxn.toString()),
+      objects: Array2.fromIterable(this.objects).map((ref) => ref.dxn.toString())
     };
   }
   constructor() {
@@ -55,21 +60,75 @@ var Bindings = class {
     _define_property(this, "objects", new ComplexSet((ref) => ref.dxn.asEchoDXN()?.echoId));
   }
 };
-var AiContextBinder = class {
+var AiContextBinder = class extends Resource {
+  get bindings() {
+    invariant(this._bindings, "AiContextBinder not open", {
+      F: __dxlog_file,
+      L: 78,
+      S: this,
+      A: [
+        "this._bindings",
+        "'AiContextBinder not open'"
+      ]
+    });
+    return this._bindings;
+  }
+  get blueprints() {
+    invariant(this._blueprints, "AiContextBinder not open", {
+      F: __dxlog_file,
+      L: 83,
+      S: this,
+      A: [
+        "this._blueprints",
+        "'AiContextBinder not open'"
+      ]
+    });
+    return this._blueprints;
+  }
+  get objects() {
+    invariant(this._objects, "AiContextBinder not open", {
+      F: __dxlog_file,
+      L: 88,
+      S: this,
+      A: [
+        "this._objects",
+        "'AiContextBinder not open'"
+      ]
+    });
+    return this._objects;
+  }
+  // TODO(wittjosiah): Use parent context?
+  async _open() {
+    const query = this._queue.query(Query.select(Filter.everything()));
+    this._ctx.onDispose(query.subscribe(() => {
+    }));
+    this._bindings = computed(() => this._reduce(query.objects));
+    this._blueprints = computed(() => [
+      ...this.bindings.value.blueprints
+    ]);
+    this._objects = computed(() => [
+      ...this.bindings.value.objects
+    ]);
+  }
+  async _close() {
+    this._bindings = void 0;
+    this._blueprints = void 0;
+    this._objects = void 0;
+  }
   /**
   * Asynchronous query of all bindings.
   */
   async query() {
-    const queueItems = await this._queue.queryObjects();
-    return this._reduce(queueItems);
+    const { objects } = await this._queue.query(Query.select(Filter.everything())).run();
+    return this._reduce(objects);
   }
   // TODO(burdon): Pass in Blueprint obj (from registry?) and create reference.
   async bind(props) {
-    if (!props.blueprints?.length && !props.objects?.length) {
-      return;
-    }
     const blueprints = props.blueprints?.filter((ref) => !this.blueprints.peek().find((b) => b.dxn.toString() === ref.dxn.toString())) ?? [];
     const objects = props.objects?.filter((ref) => !this.objects.peek().find((o) => o.dxn.toString() === ref.dxn.toString())) ?? [];
+    if (!blueprints.length && !objects.length) {
+      return;
+    }
     await this._queue.append([
       Obj.make(ContextBinding, {
         blueprints: {
@@ -101,7 +160,7 @@ var AiContextBinder = class {
     ]);
   }
   _reduce(items) {
-    return pipe(items, Array.filter(Obj.instanceOf(ContextBinding)), Array.reduce(new Bindings(), (context, item) => {
+    return Function.pipe(items, Array2.filter(Obj.instanceOf(ContextBinding)), Array2.reduce(new Bindings(), (context, item) => {
       item.blueprints.removed.forEach((ref) => context.blueprints.delete(ref));
       item.blueprints.added.forEach((ref) => context.blueprints.add(ref));
       item.objects.removed.forEach((ref) => {
@@ -116,25 +175,21 @@ var AiContextBinder = class {
     }));
   }
   constructor(_queue) {
-    _define_property(this, "_queue", void 0);
-    _define_property(this, "bindings", void 0);
-    _define_property(this, "blueprints", void 0);
-    _define_property(this, "objects", void 0);
-    this._queue = _queue;
-    this.bindings = computed(() => this._reduce(this._queue.objects));
-    this.blueprints = computed(() => [
-      ...this.bindings.value.blueprints
-    ]);
-    this.objects = computed(() => [
-      ...this.bindings.value.objects
-    ]);
+    super(), _define_property(this, "_queue", void 0), /**
+    * Reactive query of all bindings.
+    */
+    // TODO(burdon): Cache value?
+    _define_property(this, "_bindings", void 0), _define_property(this, "_blueprints", void 0), _define_property(this, "_objects", void 0), this._queue = _queue;
   }
 };
 var AiContextService = class extends Context.Tag("@dxos/assistant/AiContextService")() {
 };
 
 // src/conversation/conversation.ts
-import { Array as Array2, Effect, Option } from "effect";
+import * as Array4 from "effect/Array";
+import * as Effect from "effect/Effect";
+import * as Option from "effect/Option";
+import { Resource as Resource2 } from "@dxos/context";
 import { Obj as Obj2 } from "@dxos/echo";
 import { DatabaseService } from "@dxos/functions";
 import { log } from "@dxos/log";
@@ -152,8 +207,14 @@ function _define_property2(obj, key, value) {
   }
   return obj;
 }
-var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant/src/conversation/conversation.ts";
-var AiConversation = class {
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/assistant/src/conversation/conversation.ts";
+var AiConversation = class extends Resource2 {
+  async _open() {
+    await this._context.open();
+  }
+  async _close() {
+    await this._context.close();
+  }
   get context() {
     return this._context;
   }
@@ -172,8 +233,8 @@ var AiConversation = class {
       const session = new AiSession();
       const history = yield* Effect.promise(() => this.getHistory());
       const context = yield* Effect.promise(() => this.context.query());
-      const blueprints = yield* Effect.forEach(context.blueprints.values(), DatabaseService.loadOption).pipe(Effect.map(Array2.filter(Option.isSome)), Effect.map(Array2.map((option) => option.value)));
-      const objects = yield* Effect.forEach(context.objects.values(), DatabaseService.loadOption).pipe(Effect.map(Array2.filter(Option.isSome)), Effect.map(Array2.map((option) => option.value)));
+      const blueprints = yield* Effect.forEach(context.blueprints.values(), DatabaseService.loadOption).pipe(Effect.map(Array4.filter(Option.isSome)), Effect.map(Array4.map((option) => option.value)));
+      const objects = yield* Effect.forEach(context.objects.values(), DatabaseService.loadOption).pipe(Effect.map(Array4.filter(Option.isSome)), Effect.map(Array4.map((option) => option.value)));
       const toolkit = yield* createToolkit({
         blueprints
       });
@@ -185,8 +246,8 @@ var AiConversation = class {
         objects: objects.length,
         tools: this._toolkit?.tools.length ?? 0
       }, {
-        F: __dxlog_file,
-        L: 102,
+        F: __dxlog_file2,
+        L: 107,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -203,8 +264,8 @@ var AiConversation = class {
         messages: messages.length,
         duration: Date.now() - start
       }, {
-        F: __dxlog_file,
-        L: 116,
+        F: __dxlog_file2,
+        L: 121,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -212,11 +273,18 @@ var AiConversation = class {
       return messages;
     }).pipe(Effect.withSpan("AiConversation.request"));
   }
-  constructor(options) {
-    _define_property2(this, "_queue", void 0);
-    _define_property2(this, "_context", void 0);
+  constructor(queue) {
+    super(), /**
+    * Message and binding queue.
+    */
+    _define_property2(this, "_queue", void 0), /**
+    * Blueprints bound to the conversation.
+    */
+    _define_property2(this, "_context", void 0), /**
+    * Toolkit from the current session request.
+    */
     _define_property2(this, "_toolkit", void 0);
-    this._queue = options.queue;
+    this._queue = queue;
     this._context = new AiContextBinder(this._queue);
   }
 };
@@ -226,7 +294,7 @@ import { next as A } from "@automerge/automerge";
 import { DocAccessor, toCursorRange } from "@dxos/echo-db";
 import { log as log2 } from "@dxos/log";
 import { isNonNullable } from "@dxos/util";
-var __dxlog_file2 = "/__w/dxos/dxos/packages/core/assistant/src/diff.ts";
+var __dxlog_file3 = "/__w/dxos/dxos/packages/core/assistant/src/diff.ts";
 var reduceDiffs = (diffs) => {
   return diffs.reduce((acc, diff) => {
     const current = acc[acc.length - 1];
@@ -279,7 +347,7 @@ var applyDiffs = (accessor, diffs) => {
         A.splice(doc, accessor.path, idx, diff.match.length, diff.replace);
       } else {
         log2.warn("diff not found", diff, {
-          F: __dxlog_file2,
+          F: __dxlog_file3,
           L: 73,
           S: void 0,
           C: (f, a) => f(...a)
@@ -290,76 +358,468 @@ var applyDiffs = (accessor, diffs) => {
   return DocAccessor.getValue(accessor);
 };
 
+// src/execution-graph.ts
+import { AgentStatus } from "@dxos/ai";
+import { Obj as Obj3 } from "@dxos/echo";
+import { MESSAGE_PROPERTY_TOOL_CALL_ID } from "@dxos/functions";
+import { LogLevel } from "@dxos/log";
+import { ContentBlock, DataType as DataType2 } from "@dxos/schema";
+import { isNonNullable as isNonNullable2 } from "@dxos/util";
+function _define_property3(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+var ExecutionGraph = class {
+  /**
+  * Adds events to the graph.
+  */
+  addEvents(events) {
+    const sortedEvents = this.sortObjectsByCreated(events);
+    for (const event of sortedEvents) {
+      if (Obj3.instanceOf(DataType2.Message, event)) {
+        this._processMessage(event);
+      } else if (Obj3.instanceOf(AgentStatus, event)) {
+        this._processAgentStatus(event);
+      }
+    }
+  }
+  /**
+  * Processes a message event and creates commits for its blocks.
+  */
+  _processMessage(message) {
+    const messageCommits = messageToCommits(message, this._lastBlockId, this._toolCallCommitIds, this._lastCommitByBranch);
+    this._commits.push(...messageCommits);
+    messageCommits.forEach((commit) => this._branchNames.add(commit.branch));
+    this._trackToolCalls(messageCommits);
+    if (messageCommits.length > 0) {
+      this._lastBlockId = messageCommits[messageCommits.length - 1].id;
+    }
+  }
+  /**
+  * Processes an AgentStatus event.
+  */
+  _processAgentStatus(event) {
+    const branch = this._getToolCallBranch(event.parentMessage, event.toolCallId);
+    this._branchNames.add(branch);
+    const agentStatusCommit = {
+      id: event.id,
+      branch,
+      message: event.message,
+      icon: "ph--flag--regular",
+      parents: this._getAgentStatusParents(event),
+      timestamp: new Date(event.created)
+    };
+    this._commits.push(agentStatusCommit);
+    this._lastBlockId = event.id;
+    if (event.toolCallId) {
+      this._lastCommitByBranch.set(branch, event.id);
+      this._updatePendingToolResults(event.toolCallId, event.id);
+    }
+  }
+  /**
+  * Stable sort: objects with 'created' field are sorted by it, others remain in place.
+  */
+  sortObjectsByCreated(objects) {
+    const sortedObjects = objects.slice();
+    const createdObjects = [];
+    sortedObjects.forEach((obj, idx) => {
+      if (obj && typeof obj.created === "string") {
+        createdObjects.push({
+          idx,
+          obj
+        });
+      }
+    });
+    createdObjects.sort((a, b) => {
+      const aDate = new Date(a.obj.created).getTime();
+      const bDate = new Date(b.obj.created).getTime();
+      return aDate - bDate;
+    });
+    let createdIdx = 0;
+    return sortedObjects.map((obj, _idx) => {
+      if (obj && typeof obj.created === "string") {
+        return createdObjects[createdIdx++].obj;
+      }
+      return obj;
+    });
+  }
+  /**
+  * Returns the current state of the graph.
+  */
+  getGraph(lastRequest = false) {
+    const idx = lastRequest ? this._commits.findLastIndex((c) => c.tags?.includes("user")) : -1;
+    const commits = idx === -1 ? this._commits : this._commits.slice(idx);
+    return {
+      branches: Array.from(this._branchNames),
+      commits
+    };
+  }
+  /**
+  * Tracks tool calls and handles pending tool result updates.
+  */
+  _trackToolCalls(commits) {
+    commits.forEach((commit) => {
+      if (this._isToolCallCommit(commit)) {
+        const toolCallId = this._extractToolCallId(commit.id);
+        if (toolCallId) {
+          this._toolCallCommitIds.set(toolCallId, commit.id);
+        }
+      }
+      if (this._isToolResultCommit(commit)) {
+        const toolCallId = this._extractToolCallId(commit.id);
+        if (toolCallId) {
+          this._pendingToolResults.set(toolCallId, commit.id);
+          this._handleLateToolResultUpdate(toolCallId, commit.id);
+        }
+      }
+      this._lastCommitByBranch.set(commit.branch, commit.id);
+    });
+  }
+  /**
+  * Updates pending tool results to point to an AgentStatus event.
+  */
+  _updatePendingToolResults(toolCallId, agentStatusId) {
+    const toolResultId = this._pendingToolResults.get(toolCallId);
+    if (!toolResultId) return;
+    const toolResultCommit = this._commits.find((c) => c.id === toolResultId);
+    if (!toolResultCommit) return;
+    const toolCallCommitId = this._toolCallCommitIds.get(toolCallId);
+    if (!toolCallCommitId) return;
+    const toolCallIndex = toolResultCommit.parents.indexOf(toolCallCommitId);
+    if (toolCallIndex !== -1) {
+      toolResultCommit.parents[toolCallIndex] = agentStatusId;
+    }
+    this._pendingToolResults.delete(toolCallId);
+  }
+  /**
+  * Handles late updates when AgentStatus is processed before tool result.
+  */
+  _handleLateToolResultUpdate(toolCallId, toolResultId) {
+    const toolCallCommitId = this._toolCallCommitIds.get(toolCallId);
+    if (!toolCallCommitId) return;
+    const messageId = toolCallCommitId.split("_toolCall_")[0];
+    const toolCallBranch = `${messageId}_${toolCallId}`;
+    const agentStatusCommitId = this._lastCommitByBranch.get(toolCallBranch);
+    if (agentStatusCommitId && agentStatusCommitId !== toolCallCommitId) {
+      const toolResultCommit = this._commits.find((c) => c.id === toolResultId);
+      if (toolResultCommit) {
+        const toolCallIndex = toolResultCommit.parents.indexOf(toolCallCommitId);
+        if (toolCallIndex !== -1) {
+          toolResultCommit.parents[toolCallIndex] = agentStatusCommitId;
+        }
+      }
+      this._pendingToolResults.delete(toolCallId);
+    }
+  }
+  /**
+  * Gets the branch name for a tool call.
+  */
+  _getToolCallBranch(parentMessage, toolCallId) {
+    if (toolCallId) {
+      return toolCallId;
+    }
+    return parentMessage || "main";
+  }
+  /**
+  * Gets the parents for an AgentStatus commit.
+  */
+  _getAgentStatusParents(event) {
+    if (event.parentMessage && event.toolCallId) {
+      return [
+        getToolCallId(event.parentMessage, event.toolCallId)
+      ];
+    }
+    return [];
+  }
+  /**
+  * Checks if a commit is a tool call commit.
+  */
+  _isToolCallCommit(commit) {
+    return commit.message.includes("Calling tool");
+  }
+  /**
+  * Checks if a commit is a tool result commit.
+  */
+  _isToolResultCommit(commit) {
+    return commit.message.includes("Tool call succeeded") || commit.message.includes("Tool error:");
+  }
+  /**
+  * Extracts tool call ID from a commit ID.
+  */
+  _extractToolCallId(commitId) {
+    const toolCallMatch = commitId.match(/_toolCall_(.+)$/);
+    const toolResultMatch = commitId.match(/_toolResult_(.+)$/);
+    return toolCallMatch?.[1] || toolResultMatch?.[1];
+  }
+  constructor() {
+    _define_property3(this, "_commits", []);
+    _define_property3(this, "_branchNames", /* @__PURE__ */ new Set());
+    _define_property3(this, "_lastBlockId", void 0);
+    _define_property3(this, "_toolCallCommitIds", /* @__PURE__ */ new Map());
+    _define_property3(this, "_lastCommitByBranch", /* @__PURE__ */ new Map());
+    _define_property3(this, "_pendingToolResults", /* @__PURE__ */ new Map());
+  }
+};
+var messageToCommits = (message, lastBlockId, toolCallIds, lastCommitByBranch) => {
+  let previousBlockId = lastBlockId;
+  return message.blocks.map((block, idx) => {
+    const branch = getMessageBranch(message);
+    const parents = getBlockParents(block, previousBlockId, message, toolCallIds, lastCommitByBranch);
+    const commit = createBlockCommit(block, message, branch, parents, idx);
+    if (commit) {
+      previousBlockId = commit.id;
+    }
+    return commit;
+  }).filter(isNonNullable2);
+};
+var getBlockParents = (block, previousBlockId, message, toolCallIds, lastCommitByBranch) => {
+  const parents = [];
+  if (block._tag === "toolResult") {
+    if (previousBlockId) {
+      parents.push(previousBlockId);
+    }
+    const toolCallCommitId = toolCallIds?.get(block.toolCallId);
+    if (toolCallCommitId) {
+      const toolCallBranch = getToolCallBranchFromCommitId(toolCallCommitId, block.toolCallId);
+      const lastBlockFromToolCallBranch = lastCommitByBranch?.get(toolCallBranch);
+      if (lastBlockFromToolCallBranch) {
+        parents.push(lastBlockFromToolCallBranch);
+      } else {
+        parents.push(toolCallCommitId);
+      }
+    }
+  } else {
+    if (previousBlockId) {
+      parents.push(previousBlockId);
+    } else {
+      const toolCallParent = getParentId(message);
+      if (toolCallParent) {
+        parents.push(toolCallParent);
+      }
+    }
+  }
+  return parents;
+};
+var createBlockCommit = (block, message, branch, parents, idx) => {
+  const timestamp = new Date(message.created);
+  switch (block._tag) {
+    case "text":
+      if (!block.text.trim().length) return null;
+      return {
+        id: getGenericBlockId(message.id, idx),
+        branch,
+        parents,
+        timestamp,
+        ...message.sender.role === "user" ? {
+          icon: "ph--user--regular",
+          tags: [
+            "user"
+          ],
+          message: "Processing request..."
+        } : {
+          icon: "ph--robot--regular",
+          message: `Response (${block.text.split(" ").length} words)`
+        }
+      };
+    case "toolCall":
+      return {
+        id: getToolCallId(message.id, block.toolCallId),
+        branch,
+        parents,
+        timestamp,
+        icon: "ph--wrench--regular",
+        level: LogLevel.INFO,
+        message: `Calling tool (${block.name})`
+      };
+    case "toolResult":
+      return {
+        id: getToolResultId(message.id, block.toolCallId),
+        branch,
+        parents,
+        timestamp,
+        icon: block.error ? "ph--x-circle--regular" : "ph--check-circle--regular",
+        level: block.error ? LogLevel.ERROR : LogLevel.INFO,
+        message: block.error ? "Tool error: " + block.error : "Tool call succeeded"
+      };
+    case "summary":
+      return {
+        id: getGenericBlockId(message.id, idx),
+        branch,
+        parents,
+        timestamp,
+        icon: "ph--rocket--regular",
+        level: LogLevel.INFO,
+        message: ContentBlock.createSummaryMessage(block)
+      };
+    case "status":
+      return {
+        id: getGenericBlockId(message.id, idx),
+        branch,
+        parents,
+        timestamp,
+        message: block.statusText,
+        level: LogLevel.INFO,
+        icon: "ph--flag--regular"
+      };
+    case "reasoning":
+      return {
+        id: getGenericBlockId(message.id, idx),
+        branch,
+        parents,
+        timestamp,
+        message: block.reasoningText ?? "Thinking...",
+        icon: "ph--brain--regular"
+      };
+    case "reference":
+      return {
+        id: getGenericBlockId(message.id, idx),
+        branch,
+        parents,
+        timestamp,
+        icon: "ph--link--regular",
+        message: stringifyRef(block.reference)
+      };
+    default:
+      return null;
+  }
+};
+var getToolCallBranchFromCommitId = (toolCallCommitId, toolCallId) => {
+  const messageId = toolCallCommitId.split("_toolCall_")[0];
+  return `${messageId}_${toolCallId}`;
+};
+var getToolCallId = (messageId, toolCallId) => `${messageId}_toolCall_${toolCallId}`;
+var getToolResultId = (messageId, toolCallId) => `${messageId}_toolResult_${toolCallId}`;
+var getGenericBlockId = (messageId, idx) => `${messageId}_block_${idx}`;
+var getBranchName = (options) => {
+  if (options.toolCallId) {
+    return options.toolCallId;
+  } else if (options.parentMessage) {
+    return options.parentMessage;
+  } else {
+    return "main";
+  }
+};
+var getMessageBranch = (message) => {
+  return getBranchName({
+    parentMessage: message.parentMessage,
+    toolCallId: message.properties?.[MESSAGE_PROPERTY_TOOL_CALL_ID]
+  });
+};
+var getParentId = (message) => {
+  if (message.parentMessage && message.properties?.[MESSAGE_PROPERTY_TOOL_CALL_ID]) {
+    return getToolCallId(message.parentMessage, message.properties[MESSAGE_PROPERTY_TOOL_CALL_ID]);
+  } else {
+    return void 0;
+  }
+};
+var stringifyRef = (ref) => {
+  if (ref.target) {
+    return stringifyObject(ref.target);
+  }
+  return ref.dxn.asEchoDXN()?.echoId ?? ref.dxn.asQueueDXN()?.objectId ?? "";
+};
+var stringifyObject = (obj) => {
+  return Obj3.getLabel(obj) ?? Obj3.getTypename(obj) ?? obj.id;
+};
+
 // src/functions/services.ts
-import { AiTool } from "@effect/ai";
-import { Context as Context2, Effect as Effect2, Layer, Record, Schema as Schema2 } from "effect";
+import * as Tool from "@effect/ai/Tool";
+import * as Context2 from "effect/Context";
+import * as Effect2 from "effect/Effect";
+import * as Layer from "effect/Layer";
+import * as Record from "effect/Record";
+import * as Schema2 from "effect/Schema";
 import { AiToolNotFoundError, ToolExecutionService, ToolResolverService } from "@dxos/ai";
 import { todo } from "@dxos/debug";
-import { LocalFunctionExecutionService } from "@dxos/functions";
-import { invariant } from "@dxos/invariant";
-var __dxlog_file3 = "/__w/dxos/dxos/packages/core/assistant/src/functions/services.ts";
+import { Query as Query2 } from "@dxos/echo";
+import { DatabaseService as DatabaseService2, FunctionDefinition, FunctionInvocationService, FunctionType } from "@dxos/functions";
+import { invariant as invariant2 } from "@dxos/invariant";
+var __dxlog_file4 = "/__w/dxos/dxos/packages/core/assistant/src/functions/services.ts";
 var makeToolResolverFromFunctions = (functions, toolkit) => {
-  return Layer.succeed(ToolResolverService, {
-    resolve: Effect2.fn("resolveTool")(function* (id) {
-      const tool = toolkit.tools[id];
-      if (tool) {
-        return tool;
-      }
-      const functionDef = functions.find((fn) => fn.name === id);
-      if (!functionDef) {
-        return yield* Effect2.fail(new AiToolNotFoundError(id));
-      }
-      return projectFunctionToTool(functionDef);
-    })
-  });
+  return Layer.effect(ToolResolverService, Effect2.gen(function* () {
+    const dbService = yield* DatabaseService2;
+    return {
+      resolve: (id) => Effect2.gen(function* () {
+        const tool = toolkit.tools[id];
+        if (tool) {
+          return tool;
+        }
+        const { objects: [dbFunction] } = yield* DatabaseService2.runQuery(Query2.type(FunctionType, {
+          key: id
+        }));
+        const functionDef = dbFunction ? FunctionDefinition.deserialize(dbFunction) : functions.find((fn2) => fn2.key === id);
+        if (!functionDef) {
+          return yield* Effect2.fail(new AiToolNotFoundError(id));
+        }
+        return projectFunctionToTool(functionDef);
+      }).pipe(Effect2.provideService(DatabaseService2, dbService))
+    };
+  }));
 };
-var makeToolExecutionServiceFromFunctions = (functions, toolkit, handlersLayer) => {
+var makeToolExecutionServiceFromFunctions = (toolkit, handlersLayer) => {
   return Layer.effect(ToolExecutionService, Effect2.gen(function* () {
     const toolkitHandler = yield* toolkit.pipe(Effect2.provide(handlersLayer));
-    const localFunctionExecutionService = yield* LocalFunctionExecutionService;
+    invariant2(isHandlerLike(toolkitHandler), void 0, {
+      F: __dxlog_file4,
+      L: 73,
+      S: this,
+      A: [
+        "isHandlerLike(toolkitHandler)",
+        ""
+      ]
+    });
+    const functionInvocationService = yield* FunctionInvocationService;
     return {
       handlersFor: (toolkit2) => {
         const makeHandler = (tool) => {
-          return Effect2.fn("toolFunctionHandler")(function* (input) {
-            if (toolkitHandler.tools.find((t) => t.name === tool.name)) {
+          return Effect2.fn(`toolFunctionHandler ${tool.name}`)(function* (input) {
+            if (toolkitHandler.tools[tool.name]) {
+              if (Tool.isProviderDefined(tool)) {
+                throw new Error("Attempted to call a provider-defined tool");
+              }
               return yield* toolkitHandler.handle(tool.name, input);
             }
-            const { functionName } = Context2.get(FunctionToolAnnotation)(tool.annotations);
-            const functionDef = functions.find((fn) => fn.name === functionName);
-            if (!functionDef) {
-              return yield* Effect2.fail(new AiToolNotFoundError(tool.name));
-            }
-            return yield* localFunctionExecutionService.invokeFunction(functionDef, input).pipe(Effect2.catchAllDefect((defect) => Effect2.fail(defect)));
+            const { definition: functionDef } = Context2.get(FunctionToolAnnotation)(tool.annotations);
+            return yield* functionInvocationService.invokeFunction(functionDef, input).pipe(Effect2.catchAllDefect((defect) => Effect2.fail(defect)));
           });
         };
-        return toolkit2.of(Record.map(toolkit2.tools, (tool, _name) => makeHandler(tool)));
+        return toolkit2.of(Record.map(toolkit2.tools, (tool, _name) => Tool.isUserDefined(tool) ? makeHandler(tool) : null));
       }
     };
   }));
 };
-var FunctionToolAnnotation = class extends Context2.Tag("@dxos/assisatnt/FunctionToolAnnotation")() {
+var FunctionToolAnnotation = class extends Context2.Tag("@dxos/assistant/FunctionToolAnnotation")() {
 };
 var toolCache = /* @__PURE__ */ new WeakMap();
-var projectFunctionToTool = (fn) => {
-  if (toolCache.has(fn)) {
-    return toolCache.get(fn);
+var projectFunctionToTool = (fn2) => {
+  if (toolCache.has(fn2)) {
+    return toolCache.get(fn2);
   }
-  const tool = AiTool.make(makeToolName(fn.name), {
-    description: fn.description,
-    parameters: createStructFieldsFromSchema(fn.inputSchema),
+  const tool = Tool.make(makeToolName(fn2.name), {
+    description: fn2.description,
+    parameters: createStructFieldsFromSchema(fn2.inputSchema),
     // TODO(dmaretskyi): Include output schema.
     failure: Schema2.Any
   }).annotate(FunctionToolAnnotation, {
-    functionName: fn.name
+    definition: fn2
   });
-  toolCache.set(fn, tool);
+  toolCache.set(fn2, tool);
   return tool;
 };
 var makeToolName = (name) => {
   const toolName = name.replace(/[^a-zA-Z0-9]/g, "_");
-  invariant(toolName.match(/^[a-zA-Z_][a-zA-Z0-9-_]*$/), void 0, {
-    F: __dxlog_file3,
-    L: 105,
+  invariant2(toolName.match(/^[a-zA-Z_][a-zA-Z0-9-_]*$/), void 0, {
+    F: __dxlog_file4,
+    L: 140,
     S: void 0,
     A: [
       "toolName.match(/^[a-zA-Z_][a-zA-Z0-9-_]*$/)",
@@ -381,16 +841,19 @@ var createStructFieldsFromSchema = (schema) => {
       return todo(`Unsupported schema AST: ${schema.ast._tag}`);
   }
 };
+var isHandlerLike = (value) => {
+  return typeof value.tools === "object" && typeof value.handle === "function";
+};
 
 // src/templates/system.ts
 import defaultsDeep from "lodash.defaultsdeep";
 import { Template } from "@dxos/blueprints";
 
-// raw-loader:./format.tpl?raw
+// raw-loader:/__w/dxos/dxos/packages/core/assistant/src/templates/format.tpl?raw
 var format_default = "{{! System Core }}\n\n## Input Formats\n\n### Blueprints\n\nYou may be provided with Blueprint definitions that include specific instructions and tools for a given set of tasks.\nBlue print instructions will be enclosed in a <blueprint> tag.\n\n### Context objects\n\nYou may be provided with references to objects that are relevant to the current prompt.\nObjects will be in the form of a <object> tag with a <dxn> element that is the unique key of the object required by many tools.\nThe <typename> element is the type of the object.\n\n<object>\n  <dxn>object-id</dxn>\n  <typename>example.com/type/TypeName</typename>\n</object>\n\n## Response Formats\n\nIt is very important to respond in the correct format.\nYou response must be valid Markdown.\nIn some cases you should respond with well-formed XML tags along with the content.\nCode snippets should use 2-space indents.\n\n{{#if cot}}\nBefore responding, explain your reasoning and include your detailed chain-of-thought enclosed in a <cot> tag.\nThe <cot> tag should be the first thing in your response.\n{{/if}}\n\n## Block references\n\nYou can reply with a block reference for objects if you have the DXN. For example:\n\n<object>\n  <dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M</dxn>\n</object>\n<object>\n  <dxn>dxn:echo:@:01K24XPK464FSCKVQJAB2H662M</dxn>\n</object>\n\n### Suggestions\n\nEach suggestion must in the form of a proposed action enclosed in a <suggestion> tag.\nExample: <suggestion>Show on a map</suggestion>\n\n### Multiple choice questions\n\nYou may ask multiple choice questions by wrapping consise options inside <option> tags inside a well formed <select> tag.\nExample: <select><option>Yes</option><option>No</option></select>\n\n## Toolkit\n\nIf the user asks for a list of tools, then just emit a single self-closing <toolkit/> tag instead of listing the tools.\n\n## Context\n\nThe current date and time is {{DATETIME}}.\n";
 
-// raw-loader:./system.tpl?raw
-var system_default = "{{! System Prompt }}\n\nYou are a helpful assistant called Kai. \nYour name is Kai and you are powered by different language models.\nYou were created by DXOS and operate in Composer and on the DXOS EDGE network.\nIn your initial greeting state your name and make some suggestions based on the current context objects.\n\nYou are an advanced AI assistant capable of creating and managing artifacts from provided data and tools.\nYour task is to process user commands and questions and decide how best to respond.\nIn general be concise and direct.\n\nFollow these instructions carefully.\n\n## Include the following steps\n\n- Analyze the structure and type of the content in the user's message.\n- Determine if you complete the task using the available blueprint definitions?\n- If you can't complete the task using the available blueprint definitions, query the list of available blueprint definitions using the appropriate tool.\n- Identify which blueprint definitions are relevant to the user's request.\n- Evaluate the potential benefits of creating an artifact vs. normal processing for each identified element.\n- Make a final decision on whether to create an artifact and explain your reasoning.\n- Are the required blueprint definitions already available?\n- If not, select which blueprint definition(s) will be the most relevant and require them using the require_artifact_definitions tool.\n- The require'd artifact tools will be available for use after require.\n- If creating an artifact, outline how you will structure it within the response.\n- Decide if the artifact needs to be shown to the user.\n- Call the show tool to show the artifact to the user.\n- Your reasoning must include: whether to use artifacts or not, to create one or query, whether to show the artifact to the user, and how to structure the response.\n\n## Blueprints\n\n- Determine if the interaction involves an artifact. Prefer artifacts for tables, lists, spreadsheets, kanbans, games, images, and other structured data.\n- Determine if the user is explicitly talking about creating a new artifact, or wants to use an existing artifact.\n- If it is ambiguous, query for existing artifacts first and then decide.\n- If you decide to create an artifact, call the associated tool to create the artifact.\n- Artifacts are stored in the database. Tools are used to create and query artifacts.\n- If you are unsure about creating an artifact ask the user for clarification.\n- Artifacts are mutable objects that can change over the course of the conversation.\n- Always re-query the artifact using the tool (like query or inspect) to get the latest state of the artifact before answering the user.\n- You must never generate the id of the artifact; only recall the ids that are already in the history.\n- Artifacts are created by requiring the specific artifact using the require_artifact tool and creating it by calling the associated tool.\n- You can add suggested actions at the end of your response.\n- Suggested actions should be very concise and start with a verb and be phrased as a command to an agent -- not a question to the user.\n- Suggested actions must be in the form of a user instruction that you can follow.\n- Suggested actions could include actions that create artifacts.\n- After creating an artifact use a tool to add it to the chat context.\n\n## Context\n\nToday is {{DATETIME}}.\n";
+// raw-loader:/__w/dxos/dxos/packages/core/assistant/src/templates/system.tpl?raw
+var system_default = "{{! System Prompt }}\n\n- You are a helpful assistant called Kai. \n- Your name is Kai and you are powered by different language models.\n- You were created by DXOS and operate inside of Composer and on the DXOS EDGE network.\n- In your initial greeting state your name and make some suggestions based on the current context objects.\n- You are an advanced AI assistant capable of creating and managing artifacts from provided data and tools.\n- Your task is to process user commands and questions and decide how best to respond.\n- In general be concise and direct.\n- Follow all instructions carefully.\n\n## Planning\n\n- Analyze the structure and type of the content in the user's message.\n- Determine if you complete the task using the available blueprint definitions?\n- If you can't complete the task using the available blueprint definitions, query the list of available blueprint definitions using the appropriate tool.\n- Identify which blueprint definitions are relevant to the user's request.\n- Evaluate the potential benefits of creating an artifact vs. normal processing for each identified element.\n- Make a final decision on whether to create an artifact and explain your reasoning.\n- Are the required blueprint definitions already available?\n- If not, select which blueprint definition(s) will be the most relevant and require them using the require_artifact_definitions tool.\n- The require'd artifact tools will be available for use after require.\n- If creating an artifact, outline how you will structure it within the response.\n- Decide if the artifact needs to be shown to the user.\n- Call the show tool to show the artifact to the user.\n- Your reasoning must include: whether to use artifacts or not, to create one or query, whether to show the artifact to the user, and how to structure the response.\n\n## Blueprints and Artifacts\n\n- Determine if the interaction involves an artifact. Prefer artifacts for tables, lists, spreadsheets, kanbans, games, images, and other structured data.\n- Determine if the user is explicitly talking about creating a new artifact, or wants to use an existing artifact.\n- If it is ambiguous, query for existing artifacts first and then decide.\n- If you decide to create an artifact, call the associated tool to create the artifact.\n- Artifacts are stored in the database. Tools are used to create and query artifacts.\n- If you are unsure about creating an artifact ask the user for clarification.\n- Artifacts are mutable objects that can change over the course of the conversation.\n- Always re-query the artifact using the tool (like query or inspect) to get the latest state of the artifact before answering the user.\n- You must never generate the id of the artifact; only recall the ids that are already in the history.\n- Artifacts are created by requiring the specific artifact using the require_artifact tool and creating it by calling the associated tool.\n- You can add suggested actions at the end of your response.\n- Suggested actions should be very concise and start with a verb and be phrased as a command to an agent -- not a question to the user.\n- Suggested actions must be in the form of a user instruction that you can follow.\n- Suggested actions could include actions that create artifacts.\n- After creating an artifact use a tool to add it to the chat context.\n\n## Context\n\nToday is {{DATETIME}}.\n";
 
 // src/templates/system.ts
 var createSystemPrompt = (options = {}) => Template.process(format_default, defaultsDeep(options, {
@@ -407,8 +870,8 @@ var templates = {
   })
 };
 
-// src/types.ts
-import { Schema as Schema3 } from "effect";
+// src/types/artifact.ts
+import * as Schema3 from "effect/Schema";
 import { DXN as DXN2, LOCAL_SPACE_TAG } from "@dxos/keys";
 import { trim } from "@dxos/util";
 var createArtifactElement = (id) => `<artifact id=${id} />`;
@@ -455,6 +918,7 @@ export {
   ArtifactId,
   Bindings,
   ContextBinding,
+  ExecutionGraph,
   GenerationObserver,
   VersionPin,
   applyDiffs,