@dxos/assistant 0.8.4-main.a4bbb77 → 0.8.4-main.ae835ea

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

@@ -7,28 +7,20 @@ import {
   GenerationObserver,
   VersionPin,
   createToolkit
-} from "./chunk-GVKA7VL3.mjs";
+} from "./chunk-AUUC7II4.mjs";
 
 // src/conversation/context.ts
 import { computed } from "@preact/signals-core";
-import { Context, Schema } from "effect";
-import { Array as Array2, 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) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    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)),
@@ -44,32 +36,96 @@ var ContextBinding = Schema.Struct({
   version: "0.1.0"
 }));
 var Bindings = class {
+  blueprints = new ComplexSet((ref) => ref.dxn.toString());
+  // TODO(burdon): Some DXNs have the Space prefix so only compare the object ID.
+  objects = new ComplexSet((ref) => ref.dxn.asEchoDXN()?.echoId);
   toJSON() {
     return {
       blueprints: Array2.fromIterable(this.blueprints).map((ref) => ref.dxn.toString()),
       objects: Array2.fromIterable(this.objects).map((ref) => ref.dxn.toString())
     };
   }
-  constructor() {
-    _define_property(this, "blueprints", new ComplexSet((ref) => ref.dxn.toString()));
-    _define_property(this, "objects", new ComplexSet((ref) => ref.dxn.asEchoDXN()?.echoId));
-  }
 };
-var AiContextBinder = class {
+var AiContextBinder = class extends Resource {
+  _queue;
+  /**
+  * Reactive query of all bindings.
+  */
+  // TODO(burdon): Cache value?
+  _bindings;
+  _blueprints;
+  _objects;
+  constructor(_queue) {
+    super(), this._queue = _queue;
+  }
+  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 +157,7 @@ var AiContextBinder = class {
     ]);
   }
   _reduce(items) {
-    return pipe(items, Array2.filter(Obj.instanceOf(ContextBinding)), Array2.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) => {
@@ -115,45 +171,44 @@ var AiContextBinder = class {
       return context;
     }));
   }
-  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
-    ]);
-  }
 };
 var AiContextService = class extends Context.Tag("@dxos/assistant/AiContextService")() {
 };
 
 // src/conversation/conversation.ts
-import { Array as Array3, 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";
 import { DataType } from "@dxos/schema";
-function _define_property2(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
+var __dxlog_file2 = "/__w/dxos/dxos/packages/core/assistant/src/conversation/conversation.ts";
+var AiConversation = class extends Resource2 {
+  /**
+  * Message and binding queue.
+  */
+  _queue;
+  /**
+  * Blueprints bound to the conversation.
+  */
+  _context;
+  /**
+  * Toolkit from the current session request.
+  */
+  _toolkit;
+  constructor(queue) {
+    super();
+    this._queue = queue;
+    this._context = new AiContextBinder(this._queue);
+  }
+  async _open() {
+    await this._context.open();
+  }
+  async _close() {
+    await this._context.close();
   }
-  return obj;
-}
-var __dxlog_file = "/__w/dxos/dxos/packages/core/assistant/src/conversation/conversation.ts";
-var AiConversation = class {
   get context() {
     return this._context;
   }
@@ -172,8 +227,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(Array3.filter(Option.isSome)), Effect.map(Array3.map((option) => option.value)));
-      const objects = yield* Effect.forEach(context.objects.values(), DatabaseService.loadOption).pipe(Effect.map(Array3.filter(Option.isSome)), Effect.map(Array3.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 +240,8 @@ var AiConversation = class {
         objects: objects.length,
         tools: this._toolkit?.tools.length ?? 0
       }, {
-        F: __dxlog_file,
-        L: 98,
+        F: __dxlog_file2,
+        L: 107,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -203,8 +258,8 @@ var AiConversation = class {
         messages: messages.length,
         duration: Date.now() - start
       }, {
-        F: __dxlog_file,
-        L: 112,
+        F: __dxlog_file2,
+        L: 121,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -212,13 +267,6 @@ var AiConversation = class {
       return messages;
     }).pipe(Effect.withSpan("AiConversation.request"));
   }
-  constructor(options) {
-    _define_property2(this, "_queue", void 0);
-    _define_property2(this, "_context", void 0);
-    _define_property2(this, "_toolkit", void 0);
-    this._queue = options.queue;
-    this._context = new AiContextBinder(this._queue);
-  }
 };
 
 // src/diff.ts
@@ -226,7 +274,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,8 +327,8 @@ 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,
-          L: 73,
+          F: __dxlog_file3,
+          L: 78,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -297,20 +345,15 @@ 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 {
+  // TODO(dmaretskyi): Evolve the internal state to support chats, functions, circuit workflows, etc.
+  _commits = [];
+  _branchNames = /* @__PURE__ */ new Set();
+  _lastBlockId;
+  // Tool call tracking.
+  _toolCallCommitIds = /* @__PURE__ */ new Map();
+  _lastCommitByBranch = /* @__PURE__ */ new Map();
+  _pendingToolResults = /* @__PURE__ */ new Map();
   /**
   * Adds events to the graph.
   */
@@ -492,14 +535,6 @@ var ExecutionGraph = class {
     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;
@@ -664,14 +699,18 @@ var stringifyObject = (obj) => {
 };
 
 // src/functions/services.ts
-import { Tool } 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 { Query } from "@dxos/echo";
-import { DatabaseService as DatabaseService2, FunctionDefinition, FunctionInvocationService, FunctionType } 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, Function as Function2, FunctionDefinition, FunctionInvocationService } 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.effect(ToolResolverService, Effect2.gen(function* () {
     const dbService = yield* DatabaseService2;
@@ -681,10 +720,10 @@ var makeToolResolverFromFunctions = (functions, toolkit) => {
         if (tool) {
           return tool;
         }
-        const { objects: [dbFunction] } = yield* DatabaseService2.runQuery(Query.type(FunctionType, {
+        const { objects: [dbFunction] } = yield* DatabaseService2.runQuery(Query2.type(Function2.Function, {
           key: id
         }));
-        const functionDef = dbFunction ? FunctionDefinition.deserialize(dbFunction) : functions.find((fn) => fn.key === id);
+        const functionDef = dbFunction ? FunctionDefinition.deserialize(dbFunction) : functions.find((fn2) => fn2.key === id);
         if (!functionDef) {
           return yield* Effect2.fail(new AiToolNotFoundError(id));
         }
@@ -696,9 +735,9 @@ var makeToolResolverFromFunctions = (functions, toolkit) => {
 var makeToolExecutionServiceFromFunctions = (toolkit, handlersLayer) => {
   return Layer.effect(ToolExecutionService, Effect2.gen(function* () {
     const toolkitHandler = yield* toolkit.pipe(Effect2.provide(handlersLayer));
-    invariant(isHandlerLike(toolkitHandler), void 0, {
-      F: __dxlog_file3,
-      L: 68,
+    invariant2(isHandlerLike(toolkitHandler), void 0, {
+      F: __dxlog_file4,
+      L: 73,
       S: this,
       A: [
         "isHandlerLike(toolkitHandler)",
@@ -728,26 +767,26 @@ var makeToolExecutionServiceFromFunctions = (toolkit, handlersLayer) => {
 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 = Tool.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, {
-    definition: fn
+    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: 135,
+  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-_]*$/)",
@@ -798,8 +837,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} />`;