@dxos/assistant 0.8.4-main.72ec0f3 → 0.8.4-main.7ace549

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.4-main.72ec0f3",
+  "version": "0.8.4-main.7ace549",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -45,27 +45,27 @@
     "@preact/signals-core": "^1.12.1",
     "@xenova/transformers": "^2.17.2",
     "lodash.defaultsdeep": "^4.6.1",
-    "@dxos/ai": "0.8.4-main.72ec0f3",
-    "@dxos/async": "0.8.4-main.72ec0f3",
-    "@dxos/blueprints": "0.8.4-main.72ec0f3",
-    "@dxos/debug": "0.8.4-main.72ec0f3",
-    "@dxos/echo-db": "0.8.4-main.72ec0f3",
-    "@dxos/echo": "0.8.4-main.72ec0f3",
-    "@dxos/context": "0.8.4-main.72ec0f3",
-    "@dxos/echo-protocol": "0.8.4-main.72ec0f3",
-    "@dxos/effect": "0.8.4-main.72ec0f3",
-    "@dxos/errors": "0.8.4-main.72ec0f3",
-    "@dxos/functions-runtime": "0.8.4-main.72ec0f3",
-    "@dxos/keys": "0.8.4-main.72ec0f3",
-    "@dxos/graph": "0.8.4-main.72ec0f3",
-    "@dxos/live-object": "0.8.4-main.72ec0f3",
-    "@dxos/log": "0.8.4-main.72ec0f3",
-    "@dxos/node-std": "0.8.4-main.72ec0f3",
-    "@dxos/functions": "0.8.4-main.72ec0f3",
-    "@dxos/schema": "0.8.4-main.72ec0f3",
-    "@dxos/invariant": "0.8.4-main.72ec0f3",
-    "@dxos/types": "0.8.4-main.72ec0f3",
-    "@dxos/util": "0.8.4-main.72ec0f3"
+    "@dxos/ai": "0.8.4-main.7ace549",
+    "@dxos/async": "0.8.4-main.7ace549",
+    "@dxos/blueprints": "0.8.4-main.7ace549",
+    "@dxos/context": "0.8.4-main.7ace549",
+    "@dxos/echo": "0.8.4-main.7ace549",
+    "@dxos/debug": "0.8.4-main.7ace549",
+    "@dxos/echo-db": "0.8.4-main.7ace549",
+    "@dxos/echo-protocol": "0.8.4-main.7ace549",
+    "@dxos/effect": "0.8.4-main.7ace549",
+    "@dxos/functions-runtime": "0.8.4-main.7ace549",
+    "@dxos/graph": "0.8.4-main.7ace549",
+    "@dxos/functions": "0.8.4-main.7ace549",
+    "@dxos/invariant": "0.8.4-main.7ace549",
+    "@dxos/keys": "0.8.4-main.7ace549",
+    "@dxos/live-object": "0.8.4-main.7ace549",
+    "@dxos/node-std": "0.8.4-main.7ace549",
+    "@dxos/log": "0.8.4-main.7ace549",
+    "@dxos/schema": "0.8.4-main.7ace549",
+    "@dxos/util": "0.8.4-main.7ace549",
+    "@dxos/types": "0.8.4-main.7ace549",
+    "@dxos/errors": "0.8.4-main.7ace549"
   },
   "devDependencies": {
     "@types/lodash.defaultsdeep": "^4.6.6",

package/src/conversation/context.ts

@@ -10,7 +10,7 @@ import * as Schema from 'effect/Schema';
 
 import { Blueprint } from '@dxos/blueprints';
 import { Resource } from '@dxos/context';
-import { DXN, Filter, Obj, Query, type Ref, type Relation, Type } from '@dxos/echo';
+import { DXN, type Entity, Filter, Obj, Query, type Ref, Type } from '@dxos/echo';
 import { type Queue } from '@dxos/echo-db';
 import { invariant } from '@dxos/invariant';
 import { ComplexSet } from '@dxos/util';
@@ -25,10 +25,9 @@ export const ContextBinding = Schema.Struct({
     removed: Schema.Array(Type.Ref(Blueprint.Blueprint)),
   }),
 
-  // TODO(burdon): Type.Expando => Type.Obj (or Obj.Any?)
   objects: Schema.Struct({
-    added: Schema.Array(Type.Ref(Type.Expando)),
-    removed: Schema.Array(Type.Ref(Type.Expando)),
+    added: Schema.Array(Type.Ref(Obj.Any)),
+    removed: Schema.Array(Type.Ref(Obj.Any)),
   }),
 }).pipe(
   Type.Obj({
@@ -41,13 +40,13 @@ export interface ContextBinding extends Schema.Schema.Type<typeof ContextBinding
 
 export type BindingProps = Partial<{
   blueprints: Ref.Ref<Blueprint.Blueprint>[];
-  objects: Ref.Ref<Type.Expando>[];
+  objects: Ref.Ref<Obj.Any>[];
 }>;
 
 export class Bindings {
   readonly blueprints = new ComplexSet<Ref.Ref<Blueprint.Blueprint>>((ref) => ref.dxn.toString());
   // TODO(burdon): Some DXNs have the Space prefix so only compare the object ID.
-  readonly objects = new ComplexSet<Ref.Ref<Type.Expando>>((ref) => ref.dxn.asEchoDXN()?.echoId);
+  readonly objects = new ComplexSet<Ref.Ref<Obj.Any>>((ref) => ref.dxn.asEchoDXN()?.echoId);
 
   toJSON() {
     return {
@@ -68,7 +67,7 @@ export class AiContextBinder extends Resource {
   // TODO(burdon): Cache value?
   private _bindings?: ReadonlySignal<Bindings>;
   private _blueprints?: ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]>;
-  private _objects?: ReadonlySignal<Ref.Ref<Type.Expando>[]>;
+  private _objects?: ReadonlySignal<Ref.Ref<Obj.Any>[]>;
 
   constructor(private readonly _queue: Queue) {
     super();
@@ -157,7 +156,7 @@ export class AiContextBinder extends Resource {
     ]);
   }
 
-  private _reduce(items: (Obj.Any | Relation.Any)[]): Bindings {
+  private _reduce(items: Entity.Unknown[]): Bindings {
     return Function.pipe(
       items,
       Array.filter(Obj.instanceOf(ContextBinding)),

package/src/execution-graph.test.ts

@@ -6,7 +6,7 @@ import { describe, expect, it } from '@effect/vitest';
 
 import { AgentStatus } from '@dxos/ai';
 import { Obj } from '@dxos/echo';
-import { ObjectId } from '@dxos/echo/internal';
+import { ObjectId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type ContentBlock, Message } from '@dxos/types';
 

package/src/execution-graph.ts

@@ -3,7 +3,7 @@
 //
 
 import { AgentStatus } from '@dxos/ai';
-import { Obj, type Ref } from '@dxos/echo';
+import { type Entity, Obj, type Ref } from '@dxos/echo';
 import { MESSAGE_PROPERTY_TOOL_CALL_ID } from '@dxos/functions';
 import { type ObjectId } from '@dxos/keys';
 import { LogLevel } from '@dxos/log';
@@ -65,7 +65,7 @@ export class ExecutionGraph {
   /**
    * Adds events to the graph.
    */
-  addEvents(events: Obj.Any[]) {
+  addEvents(events: Entity.Unknown[]) {
     const sortedEvents = this.sortObjectsByCreated(events);
     for (const event of sortedEvents) {
       if (Obj.instanceOf(Message.Message, event)) {

package/src/extraction/extraction-ner-function/extraction-ner-function.test.ts

@@ -8,7 +8,7 @@ import { type EchoDatabase } from '@dxos/echo-db';
 import { EchoTestBuilder } from '@dxos/echo-db/testing';
 import { FunctionExecutor, ServiceContainer } from '@dxos/functions-runtime';
 import { log } from '@dxos/log';
-import { Testing } from '@dxos/schema/testing';
+import { TestSchema } from '@dxos/schema/testing';
 import { type Message, Organization, Person } from '@dxos/types';
 import { createTestData } from '@dxos/types/testing';
 import { range } from '@dxos/util';
@@ -25,12 +25,12 @@ describe.skip('NER EntityExtraction', () => {
     transcriptJosiah: Message.Message[];
     transcriptWoflram: Message.Message[];
     transcriptMessages: Message.Message[];
-    documents: Testing.DocumentType[];
+    documents: TestSchema.DocumentType[];
     contacts: Record<string, Person.Person>;
     organizations: Record<string, Organization.Organization>;
   };
 
-  const TYPES = [Organization.Organization, Person.Person, Testing.Person, Testing.DocumentType];
+  const TYPES = [Organization.Organization, Person.Person, TestSchema.Person, TestSchema.DocumentType];
 
   beforeAll(async () => {
     // TODO(dmaretskyi): Helper to scaffold this from a config.

package/src/extraction/extraction.ts

@@ -5,7 +5,7 @@
 import * as Schema from 'effect/Schema';
 
 import { asyncTimeout } from '@dxos/async';
-import { Expando } from '@dxos/echo/internal';
+import { Type } from '@dxos/echo';
 import { type FunctionDefinition } from '@dxos/functions';
 import { type FunctionExecutor } from '@dxos/functions-runtime';
 import { log } from '@dxos/log';
@@ -13,7 +13,7 @@ import { Message } from '@dxos/types';
 
 export const ExtractionInput = Schema.Struct({
   message: Message.Message,
-  objects: Schema.optional(Schema.Array(Expando)),
+  objects: Schema.optional(Schema.Array(Type.Expando)),
   options: Schema.optional(
     Schema.Struct({
       timeout: Schema.optional(Schema.Number),

package/src/extraction/quotes.ts

@@ -5,8 +5,8 @@
 import * as Schema from 'effect/Schema';
 
 import { Filter, Query } from '@dxos/echo';
-import { ObjectId } from '@dxos/echo/internal';
 import { type EchoDatabase } from '@dxos/echo-db';
+import { ObjectId } from '@dxos/keys';
 import { DXN } from '@dxos/keys';
 import { log } from '@dxos/log';
 

package/src/session/artifact-diff.ts

@@ -4,8 +4,8 @@
 
 import * as Context from 'effect/Context';
 
-import { type ObjectId } from '@dxos/echo/internal';
 import { type ObjectVersion } from '@dxos/echo-db';
+import { type ObjectId } from '@dxos/keys';
 
 /**
  * Resolves artifact ids to their versions.

package/src/session/format.ts

@@ -9,8 +9,8 @@ import * as Option from 'effect/Option';
 
 import { Template } from '@dxos/blueprints';
 import { Obj } from '@dxos/echo';
-import { type ObjectId } from '@dxos/echo/internal';
 import { DatabaseService, ObjectVersion } from '@dxos/echo-db';
+import { type ObjectId } from '@dxos/keys';
 import { log } from '@dxos/log';
 import { type ContentBlock, Message } from '@dxos/types';
 import { trim } from '@dxos/util';

package/src/session/version-pin.ts

@@ -4,8 +4,9 @@
 
 import * as Schema from 'effect/Schema';
 
-import { type AnyEchoObject, ObjectId } from '@dxos/echo/internal';
+import { type Obj } from '@dxos/echo';
 import { type ObjectVersion, getVersion } from '@dxos/echo-db';
+import { ObjectId } from '@dxos/keys';
 import { type ContentBlock } from '@dxos/types';
 
 // TODO(dmaretskyi): Extract.
@@ -26,11 +27,11 @@ export interface VersionPin extends Schema.Schema.Type<typeof VersionPinSchema>
 
 export const VersionPin: typeof VersionPinSchema & {
   DISPOSITION: 'version-pin';
-  fromObject: (object: AnyEchoObject) => VersionPin;
+  fromObject: (object: Obj.Any) => VersionPin;
   createBlock: (pin: VersionPin) => ContentBlock.Any;
 } = class extends VersionPinSchema {
   static readonly DISPOSITION = 'version-pin';
-  static fromObject(object: AnyEchoObject): VersionPin {
+  static fromObject(object: Obj.Any): VersionPin {
     return VersionPin.make({
       objectId: object.id,
       version: getVersion(object),

package/src/types/artifact.ts

@@ -6,9 +6,8 @@ import type * as Effect from 'effect/Effect';
 import * as Schema from 'effect/Schema';
 
 import { type ObjectNotFoundError, type Type } from '@dxos/echo';
-import { type ObjectId } from '@dxos/echo/internal';
 import { DatabaseService } from '@dxos/echo-db';
-import { DXN, LOCAL_SPACE_TAG, type SpaceId } from '@dxos/keys';
+import { DXN, LOCAL_SPACE_TAG, type ObjectId, type SpaceId } from '@dxos/keys';
 import { trim } from '@dxos/util';
 
 /**
@@ -23,7 +22,7 @@ export const createArtifactElement = (id: ObjectId) => `<artifact id=${id} />`;
 // TODO(burdon): Rename RefFromLLM?
 export const ArtifactId: Schema.Schema<string> & {
   toDXN: (reference: ArtifactId, owningSpaceId?: SpaceId) => DXN;
-  resolve: <S extends Type.Obj.Any | Type.Relation.Any>(
+  resolve: <S extends Type.Entity.Any>(
     schema: S,
     ref: ArtifactId,
   ) => Effect.Effect<Schema.Schema.Type<S>, ObjectNotFoundError, DatabaseService>;
@@ -59,7 +58,7 @@ export const ArtifactId: Schema.Schema<string> & {
   /**
    * Resolves an artifact ID to an object.
    */
-  static resolve<S extends Type.Obj.Any | Type.Relation.Any>(
+  static resolve<S extends Type.Entity.Any>(
     schema: S,
     ref: ArtifactId,
   ): Effect.Effect<Schema.Schema.Type<S>, ObjectNotFoundError, DatabaseService> {