@dxos/assistant 0.8.2-main.fbd8ed0 → 0.8.2-staging.7ac8446

package/dist/types/src/cypher/query-executor.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-executor.test.d.ts","sourceRoot":"","sources":["../../../../src/cypher/query-executor.test.ts"],"names":[],"mappings":""}

package/dist/types/src/cypher/schema.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/cypher/schema.ts"],"names":[],"mappings":"AAKA,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAIjF;;;;;GAKG;AACH,eAAO,MAAM,sBAAsB,gBAAiB,cAAc,EAAE,KAAG,MAAM,EAK5E,CAAC;AAkDF,eAAO,MAAM,eAAe,aAAc,MAAM,WAE/C,CAAC;AAEF,eAAO,MAAM,+BAA+B,aAAc,MAAM,YAAY,MAAM,WAGjF,CAAC;AAEF,eAAO,MAAM,WAAW,WAAY,cAAc,YAMD,CAAC"}

package/dist/types/src/cypher/schema.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"schema.test.d.ts","sourceRoot":"","sources":["../../../../src/cypher/schema.test.ts"],"names":[],"mappings":""}

package/dist/types/src/index.d.ts

@@ -1,4 +1,5 @@
 export * from './ai-service';
+export * from './cypher';
+export * from './conversation';
 export * from './session';
-export * from './experimental';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAG1B,cAAc,gBAAgB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAIA,cAAc,cAAc,CAAC;AAC7B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC"}

package/dist/types/src/session/index.d.ts

@@ -1,4 +1,2 @@
 export * from './session';
-export * from './version-pin';
-export * from './tools';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/src/session/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/session/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC;AAC1B,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/session/index.ts"],"names":[],"mappings":"AAIA,cAAc,WAAW,CAAC"}

package/dist/types/src/session/session.d.ts

@@ -1,8 +1,6 @@
-import { Schema } from 'effect';
+import { Schema as S } from 'effect';
 import { Message, type ArtifactDefinition, type Tool } from '@dxos/artifact';
 import { Event } from '@dxos/async';
-import { ObjectVersion } from '@dxos/echo-db';
-import { type ObjectId } from '@dxos/echo-schema';
 import { type AIServiceClient, type GenerateRequest } from '../ai-service';
 /**
  * Contains message history, tools, current context.
@@ -14,19 +12,6 @@ import { type AIServiceClient, type GenerateRequest } from '../ai-service';
  * Could be run locally in the app or remotely.
  * Could be personal or shared.
  */
-/**
- * Resolves artifact ids to their versions.
- * Used to give the model a sense of the changes to the artifacts made by users during the conversation.
- * The artifacts versions are pinned in the history, and whenever the artifact changes in-between assistant's steps,
- * a diff is inserted into the conversation.
- */
-export type ArtifactDiffResolver = (artifacts: {
-    id: ObjectId;
-    lastVersion: ObjectVersion;
-}[]) => Promise<Map<ObjectId, {
-    version: ObjectVersion;
-    diff?: string;
-}>>;
 export type SessionRunOptions = {
     client: AIServiceClient;
     artifacts: ArtifactDefinition[];
@@ -43,19 +28,13 @@ export type SessionRunOptions = {
      * Pre-require artifacts.
      */
     requiredArtifactIds?: string[];
-    /**
-     * @see ArtifactDiffResolver
-     */
-    artifactDiffResolver?: ArtifactDiffResolver;
 };
-type OperationModel = 'planning' | 'importing' | 'configured';
+type OperationModel = 'planning' | 'immediate';
 export type AiSessionOptions = {
     /**
-     * Determines the agent's handling of the artifacts definitions:
-     *
-     * - `planning`: The model will create a plan with required artifacts for each step.
-     * - `importing`: The model can query registry and only pull in the artifacts that are required to complete the task.
-     * - `configured`: The available artifacts are pre-selected and the model cannot select additional artifacts.
+     * In planning mode, the model will create a plan before executing the user's request.
+     * The plan will determine the artifacts that will be used to perform the actions.
+     * In require mode, the model will select the artifacts that will be used to perform the actions.
      */
     operationModel: OperationModel;
 };
@@ -74,6 +53,9 @@ export declare class AISession {
      */
     readonly message: Event<{
         readonly id: string;
+        spaceId?: import("@dxos/keys").SpaceId | undefined;
+        threadId?: string | undefined;
+        foreignId?: string | undefined;
         role: "user" | "assistant";
         content: ({
             pending?: boolean | undefined;
@@ -184,6 +166,9 @@ export declare class AISession {
      */
     readonly userMessage: Event<{
         readonly id: string;
+        spaceId?: import("@dxos/keys").SpaceId | undefined;
+        threadId?: string | undefined;
+        foreignId?: string | undefined;
         role: "user" | "assistant";
         content: ({
             pending?: boolean | undefined;
@@ -220,15 +205,10 @@ export declare class AISession {
     }>;
     constructor(_options: AiSessionOptions);
     run(options: SessionRunOptions): Promise<Message[]>;
-    runStructured<S extends Schema.Schema.AnyNoContext>(schema: S, options: SessionRunOptions): Promise<Schema.Schema.Type<S>>;
-    private _formatUserPrompt;
-    private _createQueryArtifactsTool;
-    private _createRequireTool;
-    private _createPlanningTool;
     abort(): void;
 }
-declare const AIServiecOverloadedError_base: Schema.TaggedErrorClass<AIServiecOverloadedError, "AIServiecOverloadedError", {
-    readonly _tag: Schema.tag<"AIServiecOverloadedError">;
+declare const AIServiecOverloadedError_base: S.TaggedErrorClass<AIServiecOverloadedError, "AIServiecOverloadedError", {
+    readonly _tag: S.tag<"AIServiecOverloadedError">;
 }>;
 export declare class AIServiecOverloadedError extends AIServiecOverloadedError_base {
 }

package/dist/types/src/session/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/session/session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAEL,OAAO,EAGP,KAAK,kBAAkB,EAEvB,KAAK,IAAI,EACV,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAU,KAAK,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAM1D,OAAO,EAAqB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAyB,MAAM,eAAe,CAAC;AAErH;;;;;;;;;GASG;AAEH;;;;;GAKG;AACH,MAAM,MAAM,oBAAoB,GAAG,CAAC,SAAS,EAAE;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,WAAW,EAAE,aAAa,CAAA;CAAE,EAAE,KAAK,OAAO,CACvG,GAAG,CACD,QAAQ,EACR;IACE,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CACF,CACF,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,eAAe,CAAC;IAExB,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAEhC;;OAEG;IACH,KAAK,EAAE,IAAI,EAAE,CAAC;IAEd,OAAO,EAAE,OAAO,EAAE,CAAC;IAEnB,MAAM,EAAE,MAAM,CAAC;IAEf,iBAAiB,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEnD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IAEnC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAE/B;;OAEG;IACH,oBAAoB,CAAC,EAAE,oBAAoB,CAAC;CAC7C,CAAC;AAEF,KAAK,cAAc,GAAG,UAAU,GAAG,WAAW,GAAG,YAAY,CAAC;AAE9D,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;;;OAMG;IACH,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF,qBAAa,SAAS;IAmCR,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAlCrC,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAiB;IAEjC,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAiB;IAEjC;;OAEG;IACH,SAAgB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAwB;IAE/C;;OAEG;IACH,SAAgB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAsB;IAE3C;;OAEG;IACH,SAAgB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAuB;IAE7C,SAAgB,WAAW,4CAA4B;IAEvD;;OAEG;IACH,SAAgB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAwB;gBAEtB,QAAQ,EAAE,gBAAgB;IAQjD,GAAG,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IA6GnD,aAAa,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,EAAE,iBAAiB;YASjF,iBAAiB;IAsC/B,OAAO,CAAC,yBAAyB;IAiBjC,OAAO,CAAC,kBAAkB;IA+B1B,OAAO,CAAC,mBAAmB;IAoF3B,KAAK;CAGN;;;;AAuDD,qBAAa,wBAAyB,SAAQ,6BAG7C;CAAG"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../../src/session/session.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAc,OAAO,EAAc,KAAK,kBAAkB,EAAE,KAAK,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACrG,OAAO,EAAE,KAAK,EAAgB,MAAM,aAAa,CAAC;AAKlD,OAAO,EAAqB,KAAK,eAAe,EAAE,KAAK,eAAe,EAAyB,MAAM,eAAe,CAAC;AAErH;;;;;;;;;GASG;AAEH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,MAAM,EAAE,eAAe,CAAC;IAExB,SAAS,EAAE,kBAAkB,EAAE,CAAC;IAEhC;;OAEG;IACH,KAAK,EAAE,IAAI,EAAE,CAAC;IAEd,OAAO,EAAE,OAAO,EAAE,CAAC;IAEnB,MAAM,EAAE,MAAM,CAAC;IAEf,iBAAiB,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IAEnD,UAAU,CAAC,EAAE,qBAAqB,CAAC;IAEnC,YAAY,CAAC,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC,CAAC;AAEF,KAAK,cAAc,GAAG,UAAU,GAAG,WAAW,CAAC;AAE/C,MAAM,MAAM,gBAAgB,GAAG;IAC7B;;;;OAIG;IACH,cAAc,EAAE,cAAc,CAAC;CAChC,CAAC;AAEF,qBAAa,SAAS;IAmCR,OAAO,CAAC,QAAQ,CAAC,QAAQ;IAlCrC,yBAAyB;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA2B;IAEnD,yDAAyD;IACzD,OAAO,CAAC,QAAQ,CAAiB;IAEjC,kCAAkC;IAClC,OAAO,CAAC,OAAO,CAA+B;IAE9C,gCAAgC;IAChC,OAAO,CAAC,QAAQ,CAAiB;IAEjC;;OAEG;IACH,SAAgB,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAwB;IAE/C;;OAEG;IACH,SAAgB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAsB;IAE3C;;OAEG;IACH,SAAgB,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAuB;IAE7C,SAAgB,WAAW,4CAA4B;IAEvD;;OAEG;IACH,SAAgB,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAAwB;gBAEtB,QAAQ,EAAE,gBAAgB;IAQjD,GAAG,CAAC,OAAO,EAAE,iBAAiB,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAkOzD,KAAK;CAGN;;;;AAqCD,qBAAa,wBAAyB,SAAQ,6BAG7C;CAAG"}

package/dist/types/src/testing/index.d.ts

@@ -1,7 +1,6 @@
 export * from './defs';
 export * from './logger';
 export * from './ollama';
-export * from './printer';
 export * from './query-promts';
 export * from './test-data';
 export * from './test-schema';

package/dist/types/src/testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/testing/index.ts"],"names":[],"mappings":"AAIA,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC"}

package/dist/types/src/testing/logger.d.ts

@@ -1,5 +1,5 @@
 import type { ImageSource } from '@dxos/artifact';
-import type { ConversationEvent } from '../experimental';
+import type { ConversationEvent } from '../conversation';
 export declare const createLogger: ({ stream, filter, onImage, }?: {
     stream?: boolean;
     filter?: (event: ConversationEvent) => boolean;

package/dist/types/src/testing/logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../src/testing/logger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,gBAAgB,CAAC;AAEvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,eAAO,MAAM,YAAY,GAAI,+BAI1B;IACD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC;IAC/C,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAE,KAAK,IAAI,CAAC;CAC/E,MAII,OAAO,iBAAiB,SA4GjC,CAAC"}
+{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../../../../src/testing/logger.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,WAAW,EAAuB,MAAM,gBAAgB,CAAC;AAEvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEzD,eAAO,MAAM,YAAY,kCAItB;IACD,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,OAAO,CAAC;IAC/C,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE;QAAE,EAAE,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,WAAW,CAAA;KAAE,KAAK,IAAI,CAAC;CACpF,aAIgB,iBAAiB,SA4GjC,CAAC"}

package/dist/types/src/testing/ollama.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../../src/testing/ollama.ts"],"names":[],"mappings":"AAIA,OAAO,EAAwB,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE5F;;GAEG;AACH,eAAO,MAAM,sBAAsB,GAAI,UAAU,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,iBAKjF,CAAC"}
+{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../../src/testing/ollama.ts"],"names":[],"mappings":"AAIA,OAAO,EAAwB,YAAY,EAAE,KAAK,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAE5F;;GAEG;AACH,eAAO,MAAM,sBAAsB,aAAc,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,iBAKjF,CAAC"}

package/dist/types/src/testing/query-promts.d.ts

@@ -1,5 +1,5 @@
-import { Schema } from 'effect';
-import { type DataSource } from '../experimental';
-export declare const createCypherTool: (dataSource: DataSource, schemaTypes?: Schema.Schema.Any[]) => import("@dxos/artifact").Tool;
-export declare const createSystemPrompt: (schemaTypes: Schema.Schema.Any[]) => string;
+import { Schema as S } from 'effect';
+import { type DataSource } from '../cypher';
+export declare const createCypherTool: (dataSource: DataSource, schemaTypes?: S.Schema.Any[]) => import("@dxos/artifact").Tool;
+export declare const createSystemPrompt: (schemaTypes: S.Schema.Any[]) => string;
 //# sourceMappingURL=query-promts.d.ts.map

package/dist/types/src/testing/query-promts.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-promts.d.ts","sourceRoot":"","sources":["../../../../src/testing/query-promts.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,OAAO,EAAwC,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAGxF,eAAO,MAAM,gBAAgB,GAAI,YAAY,UAAU,EAAE,cAAa,MAAM,CAAC,MAAM,CAAC,GAAG,EAAO,kCA0C1F,CAAC;AAEL,eAAO,MAAM,kBAAkB,GAAI,aAAa,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,WAiBlE,CAAC"}
+{"version":3,"file":"query-promts.d.ts","sourceRoot":"","sources":["../../../../src/testing/query-promts.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAMrC,OAAO,EAAwC,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAGlF,eAAO,MAAM,gBAAgB,eAAgB,UAAU,gBAAe,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,kCA0ChF,CAAC;AAEL,eAAO,MAAM,kBAAkB,gBAAiB,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,WAiB7D,CAAC"}

package/dist/types/src/testing/test-data.d.ts

@@ -1,19 +1,19 @@
-import { type Schema } from 'effect';
+import { type Schema as S } from 'effect';
 import type { EchoDatabase } from '@dxos/echo-db';
 import { type JsonSchemaType } from '@dxos/echo-schema';
-import { type DataSource, type Node, type Relationship } from '../experimental';
+import { type DataSource, type Node, type Relationship } from '../cypher';
 export declare const seedTestData: (db: EchoDatabase) => void;
 export declare const createTestData: () => MockDataSource;
 export declare class MockDataSource implements DataSource {
     objects: Record<string, {
-        schema: Schema.Schema.All;
+        schema: S.Schema.All;
         typeDxn: string;
         id: string;
         data: unknown;
     }>;
     schema: Record<string, {
         json: JsonSchemaType;
-        instance: Schema.Schema.All;
+        instance: S.Schema.All;
     }>;
     nodes: Node[];
     relationships: Relationship[];
@@ -23,7 +23,7 @@ export declare class MockDataSource implements DataSource {
     getRelationships({ label }: {
         label?: string;
     }): Promise<Relationship[]>;
-    add<S extends Schema.Schema.All>(schema: S, data: Schema.Schema.Type<S>): Schema.Schema.Type<S>;
+    add<S extends S.Schema.All>(schema: S, data: S.Schema.Type<S>): S.Schema.Type<S>;
     computeGraph(): void;
 }
 //# sourceMappingURL=test-data.d.ts.map

package/dist/types/src/testing/test-data.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-data.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-data.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAIL,KAAK,cAAc,EAGpB,MAAM,mBAAmB,CAAC;AAI3B,OAAO,EACL,KAAK,UAAU,EACf,KAAK,IAAI,EACT,KAAK,YAAY,EAGlB,MAAM,iBAAiB,CAAC;AAGzB,eAAO,MAAM,YAAY,GAAI,IAAI,YAAY,SAoH5C,CAAC;AAGF,eAAO,MAAM,cAAc,QAAO,cAuGjC,CAAC;AAEF,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,EAAE,MAAM,CACb,MAAM,EACN;QACE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;QAC1B,OAAO,EAAE,MAAM,CAAC;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,OAAO,CAAC;KACf,CACF,CAAM;IAEP,MAAM,EAAE,MAAM,CACZ,MAAM,EACN;QACE,IAAI,EAAE,cAAc,CAAC;QACrB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC;KAC7B,CACF,CAAM;IAEP,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,aAAa,EAAE,YAAY,EAAE,CAAM;IAE7B,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAItC,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAIpD,GAAG,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAsBvE,YAAY;CA0Eb"}
+{"version":3,"file":"test-data.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-data.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG1C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAmD,KAAK,cAAc,EAAY,MAAM,mBAAmB,CAAC;AAInH,OAAO,EACL,KAAK,UAAU,EACf,KAAK,IAAI,EACT,KAAK,YAAY,EAGlB,MAAM,WAAW,CAAC;AAGnB,eAAO,MAAM,YAAY,OAAQ,YAAY,SAoH5C,CAAC;AAGF,eAAO,MAAM,cAAc,QAAO,cAuGjC,CAAC;AAEF,qBAAa,cAAe,YAAW,UAAU;IAC/C,OAAO,EAAE,MAAM,CACb,MAAM,EACN;QACE,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;QACrB,OAAO,EAAE,MAAM,CAAC;QAChB,EAAE,EAAE,MAAM,CAAC;QACX,IAAI,EAAE,OAAO,CAAC;KACf,CACF,CAAM;IAEP,MAAM,EAAE,MAAM,CACZ,MAAM,EACN;QACE,IAAI,EAAE,cAAc,CAAC;QACrB,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC;KACxB,CACF,CAAM;IAEP,KAAK,EAAE,IAAI,EAAE,CAAM;IACnB,aAAa,EAAE,YAAY,EAAE,CAAM;IAE7B,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAItC,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE;IAIpD,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IAsB7D,YAAY;CA0Eb"}

package/dist/types/src/testing/test-schema.d.ts

@@ -1,24 +1,23 @@
-import { Schema } from 'effect';
-/** @deprecated */
-export declare const Contact: Schema.mutable<Schema.Struct<{
-    id: import("@dxos/echo-schema").ObjectIdClass;
-    name: Schema.SchemaClass<string, string, never>;
-    email: Schema.optional<typeof Schema.String>;
+import { Schema as S } from 'effect';
+export declare const ObjectId: S.SchemaClass<string, string, never>;
+export declare const Contact: S.mutable<S.Struct<{
+    id: S.SchemaClass<string, string, never>;
+    name: S.SchemaClass<string, string, never>;
+    email: S.optional<typeof S.String>;
 }>>;
-export interface Contact extends Schema.Schema.Type<typeof Contact> {
+export interface Contact extends S.Schema.Type<typeof Contact> {
 }
-/** @deprecated */
-export declare const Project: Schema.mutable<Schema.Struct<{
-    id: import("@dxos/echo-schema").ObjectIdClass;
-    name: Schema.SchemaClass<string, string, never>;
-    description: Schema.optional<typeof Schema.String>;
+export declare const Project: S.mutable<S.Struct<{
+    id: S.SchemaClass<string, string, never>;
+    name: S.SchemaClass<string, string, never>;
+    description: S.optional<typeof S.String>;
 }>>;
-export interface Project extends Schema.Schema.Type<typeof Project> {
+export interface Project extends S.Schema.Type<typeof Project> {
 }
-export declare const Task: Schema.mutable<Schema.Struct<{
-    id: import("@dxos/echo-schema").ObjectIdClass;
-    name: Schema.SchemaClass<string, string, never>;
-    description: Schema.optional<typeof Schema.String>;
+export declare const Task: S.mutable<S.Struct<{
+    id: S.SchemaClass<string, string, never>;
+    name: S.SchemaClass<string, string, never>;
+    description: S.optional<typeof S.String>;
     project: import("@dxos/echo-schema").Ref$<{
         name: string;
         description?: string | undefined;
@@ -30,23 +29,22 @@ export declare const Task: Schema.mutable<Schema.Struct<{
         email?: string | undefined;
     }>;
 }>>;
-export interface Task extends Schema.Schema.Type<typeof Task> {
+export interface Task extends S.Schema.Type<typeof Task> {
 }
-/** @deprecated */
-export declare const Organization: Schema.mutable<Schema.Struct<{
-    id: import("@dxos/echo-schema").ObjectIdClass;
-    name: Schema.SchemaClass<string, string, never>;
-    projects: Schema.Array$<import("@dxos/echo-schema").Ref$<{
+export declare const Org: S.mutable<S.Struct<{
+    id: S.SchemaClass<string, string, never>;
+    name: S.SchemaClass<string, string, never>;
+    projects: S.Array$<import("@dxos/echo-schema").Ref$<{
         name: string;
         description?: string | undefined;
         id: string;
     }>>;
-    employees: Schema.Array$<import("@dxos/echo-schema").Ref$<{
+    employees: S.Array$<import("@dxos/echo-schema").Ref$<{
         name: string;
         id: string;
         email?: string | undefined;
     }>>;
 }>>;
-export interface Organization extends Schema.Schema.Type<typeof Organization> {
+export interface Org extends S.Schema.Type<typeof Org> {
 }
 //# sourceMappingURL=test-schema.d.ts.map

package/dist/types/src/testing/test-schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,kBAAkB;AAClB,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEtE,kBAAkB;AAClB,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEtE,eAAO,MAAM,IAAI;;;;;;;;;;;;;;GAeb,CAAC;AACL,MAAM,WAAW,IAAK,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;CAAG;AAEhE,kBAAkB;AAClB,eAAO,MAAM,YAAY;;;;;;;;;;;;;GAcrB,CAAC;AACL,MAAM,WAAW,YAAa,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,YAAY,CAAC;CAAG"}
+{"version":3,"file":"test-schema.d.ts","sourceRoot":"","sources":["../../../../src/testing/test-schema.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAQrC,eAAO,MAAM,QAAQ,sCAAyE,CAAC;AAE/F,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEjE,eAAO,MAAM,OAAO;;;;GAahB,CAAC;AACL,MAAM,WAAW,OAAQ,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,OAAO,CAAC;CAAG;AAEjE,eAAO,MAAM,IAAI;;;;;;;;;;;;;;GAeb,CAAC;AACL,MAAM,WAAW,IAAK,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,CAAC;CAAG;AAE3D,eAAO,MAAM,GAAG;;;;;;;;;;;;;GAcZ,CAAC;AACL,MAAM,WAAW,GAAI,SAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,GAAG,CAAC;CAAG"}

package/dist/types/src/util/trim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"trim.d.ts","sourceRoot":"","sources":["../../../../src/util/trim.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,eAAO,MAAM,IAAI,GAAI,SAAS,oBAAoB,EAAE,GAAG,QAAQ,GAAG,EAAE,WAMnE,CAAC"}
+{"version":3,"file":"trim.d.ts","sourceRoot":"","sources":["../../../../src/util/trim.ts"],"names":[],"mappings":"AAIA;;GAEG;AAEH,eAAO,MAAM,IAAI,YAAa,oBAAoB,aAAa,GAAG,EAAE,WAMnE,CAAC"}

package/dist/types/tsconfig.tsbuildinfo

@@ -1 +1 @@
-{"version":"5.8.3"}
+{"version":"5.7.3"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.2-main.fbd8ed0",
+  "version": "0.8.2-staging.7ac8446",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -37,31 +37,25 @@
     "src"
   ],
   "dependencies": {
-    "@xenova/transformers": "^2.17.2",
-    "exa-js": "^1.5.12",
     "parjs": "^1.3.9",
     "parsimmon": "^1.18.1",
     "ulidx": "^2.3.0",
-    "@dxos/artifact": "0.8.2-main.fbd8ed0",
-    "@dxos/async": "0.8.2-main.fbd8ed0",
-    "@dxos/debug": "0.8.2-main.fbd8ed0",
-    "@dxos/context": "0.8.2-main.fbd8ed0",
-    "@dxos/echo": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-db": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-protocol": "0.8.2-main.fbd8ed0",
-    "@dxos/invariant": "0.8.2-main.fbd8ed0",
-    "@dxos/echo-schema": "0.8.2-main.fbd8ed0",
-    "@dxos/effect": "0.8.2-main.fbd8ed0",
-    "@dxos/keys": "0.8.2-main.fbd8ed0",
-    "@dxos/live-object": "0.8.2-main.fbd8ed0",
-    "@dxos/log": "0.8.2-main.fbd8ed0",
-    "@dxos/node-std": "0.8.2-main.fbd8ed0",
-    "@dxos/schema": "0.8.2-main.fbd8ed0",
-    "@dxos/util": "0.8.2-main.fbd8ed0"
+    "@dxos/artifact": "0.8.2-staging.7ac8446",
+    "@dxos/async": "0.8.2-staging.7ac8446",
+    "@dxos/context": "0.8.2-staging.7ac8446",
+    "@dxos/debug": "0.8.2-staging.7ac8446",
+    "@dxos/echo-db": "0.8.2-staging.7ac8446",
+    "@dxos/echo-schema": "0.8.2-staging.7ac8446",
+    "@dxos/keys": "0.8.2-staging.7ac8446",
+    "@dxos/invariant": "0.8.2-staging.7ac8446",
+    "@dxos/live-object": "0.8.2-staging.7ac8446",
+    "@dxos/log": "0.8.2-staging.7ac8446",
+    "@dxos/node-std": "0.8.2-staging.7ac8446",
+    "@dxos/util": "0.8.2-staging.7ac8446"
   },
   "devDependencies": {
     "@types/parsimmon": "^1.10.9",
-    "effect": "3.14.21",
+    "effect": "3.13.3",
     "inquirer": "^12.0.0"
   },
   "peerDependencies": {

package/src/ai-service/client.test.ts

@@ -2,12 +2,13 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema } from 'effect';
+import { Schema as S } from 'effect';
 import { test, describe } from 'vitest';
 
 import { defineTool, Message, ToolResult, type Tool } from '@dxos/artifact';
-import { toJsonSchema, create } from '@dxos/echo-schema';
+import { toJsonSchema, ObjectId, createStatic } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
+import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 import { DEFAULT_EDGE_MODEL } from './defs';
@@ -25,18 +26,23 @@ describe.skip('AI Service Client', () => {
       endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    // await client.appendMessages([
-    //   {
-    //     id: ObjectId.random(),
-    //     spaceId,
-    //     threadId,
-    //     role: 'user',
-    //     content: [{ type: 'text', text: 'Hello' }],
-    //   },
-    //     ]);
-
-    const stream = await client.execStream({
+    const spaceId = SpaceId.random();
+    const threadId = ObjectId.random();
+
+    await client.appendMessages([
+      {
+        id: ObjectId.random(),
+        spaceId,
+        threadId,
+        role: 'user',
+        content: [{ type: 'text', text: 'Hello' }],
+      },
+    ]);
+
+    const stream = await client.exec({
       model: DEFAULT_EDGE_MODEL,
+      spaceId,
+      threadId,
       systemPrompt: 'You are a poet',
       tools: [],
     });
@@ -58,25 +64,30 @@ describe.skip('AI Service Client', () => {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
       parameters: toJsonSchema(
-        Schema.Struct({
-          magicWord: Schema.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
+        S.Struct({
+          magicWord: S.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
         }),
       ),
     };
 
-    // await client.appendMessages([
-    //   {
-    //     id: ObjectId.random(),
-    //     spaceId,
-    //     threadId,
-    //     role: 'user',
-    //     content: [{ type: 'text', text: 'What is the password? Ask the custodian' }],
-    //   },
-    // ]);
+    const spaceId = SpaceId.random();
+    const threadId = ObjectId.random();
+
+    await client.appendMessages([
+      {
+        id: ObjectId.random(),
+        spaceId,
+        threadId,
+        role: 'user',
+        content: [{ type: 'text', text: 'What is the password? Ask the custodian' }],
+      },
+    ]);
 
     {
-      const stream1 = await client.execStream({
+      const stream1 = await client.exec({
         model: DEFAULT_EDGE_MODEL,
+        spaceId,
+        threadId,
         systemPrompt: 'You are a helpful assistant.',
         tools: [custodian],
       });
@@ -91,24 +102,26 @@ describe.skip('AI Service Client', () => {
 
       const [message1] = messages;
       log('full message', { message: message1 });
-      // await client.appendMessages([message1]);
+      await client.appendMessages([message1]);
 
       const toolUse = message1.content.find(({ type }) => type === 'tool_use')!;
       invariant(toolUse.type === 'tool_use');
-      // await client.appendMessages([
-      //   {
-      //     id: ObjectId.random(),
-      //     spaceId,
-      //     threadId,
-      //     role: 'user',
-      //     content: [{ type: 'tool_result', toolUseId: toolUse.id, content: 'password="The sky is blue"' }],
-      //   },
-      // ]);
+      await client.appendMessages([
+        {
+          id: ObjectId.random(),
+          spaceId,
+          threadId,
+          role: 'user',
+          content: [{ type: 'tool_result', toolUseId: toolUse.id, content: 'password="The sky is blue"' }],
+        },
+      ]);
     }
 
     {
-      const stream2 = await client.execStream({
+      const stream2 = await client.exec({
         model: DEFAULT_EDGE_MODEL,
+        spaceId,
+        threadId,
         systemPrompt: 'You are a helpful assistant.',
         tools: [custodian],
       });
@@ -130,18 +143,23 @@ describe.skip('AI Service Client', () => {
       endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    // await client.appendMessages([
-    //   {
-    //     id: ObjectId.random(),
-    //     spaceId,
-    //     threadId,
-    //     role: 'user',
-    //     content: [{ type: 'text', text: 'Generate an image of a cat' }],
-    //   },
-    // ]);
-
-    const stream = await client.execStream({
+    const spaceId = SpaceId.random();
+    const threadId = ObjectId.random();
+
+    await client.appendMessages([
+      {
+        id: ObjectId.random(),
+        spaceId,
+        threadId,
+        role: 'user',
+        content: [{ type: 'text', text: 'Generate an image of a cat' }],
+      },
+    ]);
+
+    const stream = await client.exec({
       model: DEFAULT_EDGE_MODEL,
+      spaceId,
+      threadId,
       tools: [
         {
           name: 'text-to-image',
@@ -172,8 +190,8 @@ describe.skip('Ollama Client', () => {
     const parser = new MixedStreamParser();
 
     const messages = await parser.parse(
-      await client.execStream({
-        prompt: create(Message, {
+      await client.exec({
+        prompt: createStatic(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'Hello, world!' }],
         }),
@@ -194,8 +212,8 @@ describe.skip('Ollama Client', () => {
         defineTool('test', {
           name: 'encrypt',
           description: 'Encrypt a message',
-          schema: Schema.Struct({
-            message: Schema.String.annotations({ description: 'The message to encrypt' }),
+          schema: S.Struct({
+            message: S.String.annotations({ description: 'The message to encrypt' }),
           }),
           execute: async ({ message }) => ToolResult.Success(message.split('').reverse().join('')),
         }),
@@ -207,8 +225,8 @@ describe.skip('Ollama Client', () => {
     });
 
     const messages = await parser.parse(
-      await client.execStream({
-        prompt: create(Message, {
+      await client.exec({
+        prompt: createStatic(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'What is the encrypted message for "Hello, world!"' }],
         }),
@@ -228,8 +246,8 @@ describe.skip('Ollama Client', () => {
     const parser = new MixedStreamParser();
 
     const messages = await parser.parse(
-      await client.execStream({
-        prompt: create(Message, {
+      await client.exec({
+        prompt: createStatic(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'Generate an image of a cat' }],
         }),