@dxos/assistant 0.8.3-main.7f5a14c → 0.8.3

package/dist/lib/browser/index.mjs

@@ -46,6 +46,7 @@ var processTranscriptMessage = async (params) => {
 
 // packages/core/assistant/src/extraction/extraction-llm-function/extraction-llm-function.ts
 import { Message as Message2 } from "@dxos/ai";
+import { Obj as Obj2 } from "@dxos/echo";
 import { create as create2 } from "@dxos/echo-schema";
 import { AiService, defineFunction } from "@dxos/functions";
 import { DataType as DataType2 } from "@dxos/schema";
@@ -57,6 +58,7 @@ var instructions_default = 'You are an AI assistant specialized in processing an
 import { Option, Schema as Schema3 } from "effect";
 import { AgentStatusReport, isToolUse, runTools, structuredOutputParser, Message, MixedStreamParser, ToolResult, createTool } from "@dxos/ai";
 import { Event, synchronized } from "@dxos/async";
+import { Obj } from "@dxos/echo";
 import { ObjectVersion } from "@dxos/echo-db";
 import { create } from "@dxos/echo-schema";
 import { invariant } from "@dxos/invariant";
@@ -166,7 +168,7 @@ var AISession = class _AISession {
           tools: tools.map((tool) => tool.name)
         }, {
           F: __dxlog_file2,
-          L: 200,
+          L: 201,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -189,7 +191,7 @@ var AISession = class _AISession {
           pending: this._pending
         }, {
           F: __dxlog_file2,
-          L: 225,
+          L: 226,
           S: this,
           C: (f, a) => f(...a)
         });
@@ -197,7 +199,7 @@ var AISession = class _AISession {
         const message = this._pending.at(-1);
         invariant(message, void 0, {
           F: __dxlog_file2,
-          L: 230,
+          L: 231,
           S: this,
           A: [
             "message",
@@ -207,7 +209,7 @@ var AISession = class _AISession {
         if (isToolUse(message)) {
           log2("tool request...", void 0, {
             F: __dxlog_file2,
-            L: 232,
+            L: 233,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -221,7 +223,7 @@ var AISession = class _AISession {
             response
           }, {
             F: __dxlog_file2,
-            L: 240,
+            L: 241,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -241,7 +243,7 @@ var AISession = class _AISession {
     } catch (err) {
       log2.catch(err, void 0, {
         F: __dxlog_file2,
-        L: 252,
+        L: 253,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -286,7 +288,7 @@ var AISession = class _AISession {
         versions
       }, {
         F: __dxlog_file2,
-        L: 295,
+        L: 296,
         S: this,
         C: (f, a) => f(...a)
       });
@@ -306,7 +308,7 @@ var AISession = class _AISession {
         prelude.push(createArtifactUpdateBlock(artifactDiff));
       }
     }
-    return create(Message, {
+    return Obj.make(Message, {
       role: "user",
       content: [
         ...prelude,
@@ -398,7 +400,7 @@ var AISession = class _AISession {
             action: step.action
           }, {
             F: __dxlog_file2,
-            L: 402,
+            L: 403,
             S: this,
             C: (f, a) => f(...a)
           });
@@ -524,7 +526,8 @@ ${diff}` : ""}</changed-artifact>`).join("\n")}
 
 // packages/core/assistant/src/extraction/quotes.ts
 import { Schema as Schema4 } from "effect";
-import { Filter, ObjectId as ObjectId2, Query } from "@dxos/echo-schema";
+import { Query, Filter } from "@dxos/echo";
+import { ObjectId as ObjectId2 } from "@dxos/echo-schema";
 import { DXN } from "@dxos/keys";
 import { log as log3 } from "@dxos/log";
 var __dxlog_file3 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/extraction/quotes.ts";
@@ -550,7 +553,7 @@ var findQuotes = async (quotes, db) => {
       quote
     }, {
       F: __dxlog_file3,
-      L: 34,
+      L: 35,
       S: void 0,
       C: (f, a) => f(...a)
     });
@@ -594,7 +597,7 @@ var extractionAnthropicFn = defineFunction({
       client: ai.client,
       systemPrompt: instructions_default,
       history: [
-        create2(Message2, {
+        Obj2.make(Message2, {
           role: "user",
           content: [
             {
@@ -1393,8 +1396,9 @@ import { DataTypes } from "@dxos/schema";
 // packages/core/assistant/src/research/graph.ts
 import { Schema as Schema6, identity, Option as Option2, SchemaAST } from "effect";
 import { createTool as createTool3, ToolResult as ToolResult3 } from "@dxos/ai";
+import { Query as Query2, Filter as Filter2 } from "@dxos/echo";
 import { isEncodedReference } from "@dxos/echo-protocol";
-import { EntityKind, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation, create as create4, Filter as Filter2, getEntityKind, getSchemaDXN, ObjectId as ObjectId3, Query as Query2, ReferenceAnnotationId, RelationSourceDXNId, RelationTargetDXNId, RelationSourceId, RelationTargetId } from "@dxos/echo-schema";
+import { EntityKind, getSchemaTypename, getTypeAnnotation, getTypeIdentifierAnnotation, create as create4, getEntityKind, getSchemaDXN, ObjectId as ObjectId3, ReferenceAnnotationId, RelationSourceDXNId, RelationTargetDXNId, RelationSourceId, RelationTargetId } from "@dxos/echo-schema";
 import { mapAst } from "@dxos/effect";
 import { DXN as DXN2 } from "@dxos/keys";
 import { log as log7 } from "@dxos/log";
@@ -1519,7 +1523,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
           source: data2.source
         }, {
           F: __dxlog_file7,
-          L: 216,
+          L: 214,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1530,7 +1534,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
           target: data2.target
         }, {
           F: __dxlog_file7,
-          L: 220,
+          L: 218,
           S: void 0,
           C: (f, a) => f(...a)
         });
@@ -1559,7 +1563,7 @@ var sanitizeObjects = async (types, data, db, queue) => {
     existingIds
   }, {
     F: __dxlog_file7,
-    L: 241,
+    L: 239,
     S: void 0,
     C: (f, a) => f(...a)
   });
@@ -1732,7 +1736,7 @@ var createArtifactElement = (id) => `<artifact id=${id} />`;
 
 // packages/core/assistant/src/blueprint/blueprint.ts
 import { Schema as Schema8 } from "effect";
-import { Key, Obj, Type } from "@dxos/echo";
+import { Key, Obj as Obj3, Type } from "@dxos/echo";
 var BlueprintStep = Schema8.Struct({
   id: Key.ObjectId,
   instructions: Schema8.String,
@@ -1763,7 +1767,7 @@ var Blueprint = Schema8.Struct({
       return this;
     }
     build() {
-      return Obj.make(Blueprint, {
+      return Obj3.make(Blueprint, {
         steps: this._steps
       });
     }
@@ -1790,7 +1794,7 @@ var BlueprintParser;
 import { Match, Schema as Schema9 } from "effect";
 import { createTool as createTool4, Message as Message3, ToolResult as ToolResult4 } from "@dxos/ai";
 import { Event as Event2 } from "@dxos/async";
-import { create as create6 } from "@dxos/echo-schema";
+import { Key as Key2, Obj as Obj4 } from "@dxos/echo";
 import { log as log9 } from "@dxos/log";
 import { isNonNullable as isNonNullable2 } from "@dxos/util";
 var __dxlog_file9 = "/home/runner/work/dxos/dxos/packages/core/assistant/src/blueprint/machine.ts";
@@ -1829,21 +1833,26 @@ var BlueprintMachine = class {
     return this;
   }
   async runToCompletion(options) {
-    log9.info("runToCompletion", options, {
+    const invocationId = Key2.ObjectId.random();
+    log9.info("runToCompletion", {
+      invocationId,
+      options
+    }, {
       F: __dxlog_file9,
-      L: 106,
+      L: 107,
       S: this,
       C: (f, a) => f(...a)
     });
     this.begin.emit();
     this.logger?.log({
-      type: "begin"
+      type: "begin",
+      invocationId
     });
     let firstStep = true;
     while (this._state.state !== "done") {
       const input = firstStep ? options.input : void 0;
       firstStep = false;
-      this._state = await this._execStep(this._state, {
+      this._state = await this._execStep(invocationId, this._state, {
         input,
         aiClient: options.aiClient
       });
@@ -1851,6 +1860,7 @@ var BlueprintMachine = class {
       this.stepComplete.emit(step);
       this.logger?.log({
         type: "step-complete",
+        invocationId,
         step
       });
       if (this._state.state === "bail") {
@@ -1859,10 +1869,11 @@ var BlueprintMachine = class {
     }
     this.end.emit();
     this.logger?.log({
-      type: "end"
+      type: "end",
+      invocationId
     });
   }
-  async _execStep(state, options) {
+  async _execStep(invocationId, state, options) {
     const prevStep = this.blueprint.steps.findIndex((step) => step.id === this._state.trace.at(-1)?.stepId);
     if (prevStep === this.blueprint.steps.length - 1) {
       throw new Error("Done execution blueprint");
@@ -1872,6 +1883,7 @@ var BlueprintMachine = class {
     this.stepStart.emit(nextStep);
     this.logger?.log({
       type: "step-start",
+      invocationId,
       step: nextStep
     });
     const ReportSchema = Schema9.Struct({
@@ -1895,7 +1907,7 @@ var BlueprintMachine = class {
     session.message.pipeInto(this.message);
     session.block.pipeInto(this.block);
     const inputMessages = options.input ? [
-      create6(Message3, {
+      Obj4.make(Message3, {
         role: "user",
         content: [
           taggedDataBlock("input", options.input)
@@ -1906,6 +1918,7 @@ var BlueprintMachine = class {
       this.message.emit(message);
       this.logger?.log({
         type: "message",
+        invocationId,
         message
       });
     });
@@ -2011,28 +2024,36 @@ var BlueprintLoggerAdapter = class {
   log(event) {
     switch (event.type) {
       case "begin":
-        this.logger.log("begin");
+        this.logger.log("begin", {
+          invocationId: event.invocationId
+        });
         break;
       case "end":
-        this.logger.log("end");
+        this.logger.log("end", {
+          invocationId: event.invocationId
+        });
         break;
       case "step-start":
         this.logger.log("step-start", {
+          invocationId: event.invocationId,
           step: event.step
         });
         break;
       case "step-complete":
         this.logger.log("step-complete", {
+          invocationId: event.invocationId,
           step: event.step
         });
         break;
       case "message":
         this.logger.log("message", {
+          invocationId: event.invocationId,
           message: event.message
         });
         break;
       case "block":
         this.logger.log("block", {
+          invocationId: event.invocationId,
           block: event.block
         });
         break;