@dxos/assistant 0.8.2-main.12df754 → 0.8.2-main.30e4dbb

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

@@ -1,6 +1,8 @@
-import { Schema as S } from 'effect';
+import { Schema } 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.
@@ -12,6 +14,19 @@ 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[];
@@ -28,13 +43,19 @@ export type SessionRunOptions = {
      * Pre-require artifacts.
      */
     requiredArtifactIds?: string[];
+    /**
+     * @see ArtifactDiffResolver
+     */
+    artifactDiffResolver?: ArtifactDiffResolver;
 };
-type OperationModel = 'planning' | 'immediate';
+type OperationModel = 'planning' | 'importing' | 'configured';
 export type AiSessionOptions = {
     /**
-     * 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.
+     * 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.
      */
     operationModel: OperationModel;
 };
@@ -199,10 +220,15 @@ 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: S.TaggedErrorClass<AIServiecOverloadedError, "AIServiecOverloadedError", {
-    readonly _tag: S.tag<"AIServiecOverloadedError">;
+declare const AIServiecOverloadedError_base: Schema.TaggedErrorClass<AIServiecOverloadedError, "AIServiecOverloadedError", {
+    readonly _tag: Schema.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,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"}
+{"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"}

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

@@ -0,0 +1,18 @@
+import { Message, type Tool } from '@dxos/artifact';
+export declare const isToolUse: (message: Message, { onlyToolNames }?: {
+    onlyToolNames?: string[];
+}) => boolean;
+export type RunToolsOptions = {
+    message: Message;
+    tools: Tool[];
+    extensions?: ToolContextExtensions;
+};
+export type RunToolsResult = {
+    type: 'continue';
+    message: Message;
+} | {
+    type: 'break';
+    result: unknown;
+};
+export declare const runTools: ({ message, tools, extensions }: RunToolsOptions) => Promise<RunToolsResult>;
+//# sourceMappingURL=tools.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../../../../src/session/tools.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,OAAO,EAAE,KAAK,IAAI,EAAc,MAAM,gBAAgB,CAAC;AAKhE,eAAO,MAAM,SAAS,GAAI,SAAS,OAAO,EAAE,oBAAmB;IAAE,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAAO,YAI/F,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,UAAU,CAAC,EAAE,qBAAqB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,cAAc,GACtB;IACE,IAAI,EAAE,UAAU,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;CAClB,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,OAAO,CAAC;CACjB,CAAC;AAEN,eAAO,MAAM,QAAQ,GAAU,gCAAgC,eAAe,KAAG,OAAO,CAAC,cAAc,CAqFtG,CAAC"}

package/dist/types/src/session/version-pin.d.ts

@@ -0,0 +1,22 @@
+import { Schema } from 'effect';
+import type { MessageContentBlock } from '@dxos/artifact';
+import type { ObjectVersion } from '@dxos/echo-db';
+import { type BaseEchoObject } from '@dxos/echo-schema';
+declare const VersionPinSchema: Schema.Struct<{
+    objectId: import("@dxos/echo-schema").ObjectIdClass;
+    version: Schema.Schema<ObjectVersion, ObjectVersion, never>;
+}>;
+/**
+ * Used to pin a specific version of an object during the course of a conversation.
+ *
+ * This allows us to detect when the object changes during the course of the conversation.
+ */
+export interface VersionPin extends Schema.Schema.Type<typeof VersionPinSchema> {
+}
+export declare const VersionPin: typeof VersionPinSchema & {
+    DISPOSITION: 'version-pin';
+    fromObject: (object: BaseEchoObject) => VersionPin;
+    createBlock: (pin: VersionPin) => MessageContentBlock;
+};
+export {};
+//# sourceMappingURL=version-pin.d.ts.map

package/dist/types/src/session/version-pin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"version-pin.d.ts","sourceRoot":"","sources":["../../../../src/session/version-pin.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAEnD,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKlE,QAAA,MAAM,gBAAgB;;;EAKpB,CAAC;AAEH;;;;GAIG;AACH,MAAM,WAAW,UAAW,SAAQ,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,gBAAgB,CAAC;CAAG;AAElF,eAAO,MAAM,UAAU,EAAE,OAAO,gBAAgB,GAAG;IACjD,WAAW,EAAE,aAAa,CAAC;IAC3B,UAAU,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,UAAU,CAAC;IACnD,WAAW,EAAE,CAAC,GAAG,EAAE,UAAU,KAAK,mBAAmB,CAAC;CAiBvD,CAAC"}

package/dist/types/src/session/version-pin.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=version-pin.test.d.ts.map

package/dist/types/src/session/version-pin.test.d.ts.map

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

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

@@ -4,4 +4,5 @@ export * from './ollama';
 export * from './query-promts';
 export * from './test-data';
 export * from './test-schema';
+export * from './printer';
 //# sourceMappingURL=index.d.ts.map

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,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;AAC9B,cAAc,WAAW,CAAC"}

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

@@ -1,5 +1,5 @@
 import type { ImageSource } from '@dxos/artifact';
-import type { ConversationEvent } from '../conversation';
+import type { ConversationEvent } from '../experimental';
 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,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"}
+{"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"}

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,aAAc,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,GAAI,UAAU,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,iBAKjF,CAAC"}

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

@@ -0,0 +1,6 @@
+import type { Message, MessageContentBlock } from '@dxos/artifact';
+export declare class ConsolePrinter {
+    printMessage: (message: Message) => void;
+    printContentBlock: (content: MessageContentBlock) => void;
+}
+//# sourceMappingURL=printer.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"printer.d.ts","sourceRoot":"","sources":["../../../../src/testing/printer.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAEnE,qBAAa,cAAc;IACzB,YAAY,GAAI,SAAS,OAAO,UAM9B;IAEF,iBAAiB,GAAI,SAAS,mBAAmB,UAsB/C;CACH"}

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

@@ -1,5 +1,5 @@
-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;
+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;
 //# 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,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"}
+{"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"}

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

@@ -1,19 +1,19 @@
-import { type Schema as S } from 'effect';
+import { type Schema } from 'effect';
 import type { EchoDatabase } from '@dxos/echo-db';
 import { type JsonSchemaType } from '@dxos/echo-schema';
-import { type DataSource, type Node, type Relationship } from '../cypher';
+import { type DataSource, type Node, type Relationship } from '../experimental';
 export declare const seedTestData: (db: EchoDatabase) => void;
 export declare const createTestData: () => MockDataSource;
 export declare class MockDataSource implements DataSource {
     objects: Record<string, {
-        schema: S.Schema.All;
+        schema: Schema.Schema.All;
         typeDxn: string;
         id: string;
         data: unknown;
     }>;
     schema: Record<string, {
         json: JsonSchemaType;
-        instance: S.Schema.All;
+        instance: Schema.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 S.Schema.All>(schema: S, data: S.Schema.Type<S>): S.Schema.Type<S>;
+    add<S extends Schema.Schema.All>(schema: S, data: Schema.Schema.Type<S>): Schema.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,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"}
+{"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"}

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

@@ -1,23 +1,24 @@
-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>;
+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>;
 }>>;
-export interface Contact extends S.Schema.Type<typeof Contact> {
+export interface Contact extends Schema.Schema.Type<typeof Contact> {
 }
-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>;
+/** @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 interface Project extends S.Schema.Type<typeof Project> {
+export interface Project extends Schema.Schema.Type<typeof Project> {
 }
-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>;
+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>;
     project: import("@dxos/echo-schema").Ref$<{
         name: string;
         description?: string | undefined;
@@ -29,22 +30,23 @@ export declare const Task: S.mutable<S.Struct<{
         email?: string | undefined;
     }>;
 }>>;
-export interface Task extends S.Schema.Type<typeof Task> {
+export interface Task extends Schema.Schema.Type<typeof Task> {
 }
-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$<{
+/** @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$<{
         name: string;
         description?: string | undefined;
         id: string;
     }>>;
-    employees: S.Array$<import("@dxos/echo-schema").Ref$<{
+    employees: Schema.Array$<import("@dxos/echo-schema").Ref$<{
         name: string;
         id: string;
         email?: string | undefined;
     }>>;
 }>>;
-export interface Org extends S.Schema.Type<typeof Org> {
+export interface Organization extends Schema.Schema.Type<typeof Organization> {
 }
 //# 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,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"}
+{"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"}

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,YAAa,oBAAoB,aAAa,GAAG,EAAE,WAMnE,CAAC"}
+{"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"}

package/dist/types/tsconfig.tsbuildinfo

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.2-main.12df754",
+  "version": "0.8.2-main.30e4dbb",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -37,25 +37,31 @@
     "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.12df754",
-    "@dxos/async": "0.8.2-main.12df754",
-    "@dxos/debug": "0.8.2-main.12df754",
-    "@dxos/context": "0.8.2-main.12df754",
-    "@dxos/echo-db": "0.8.2-main.12df754",
-    "@dxos/echo-schema": "0.8.2-main.12df754",
-    "@dxos/invariant": "0.8.2-main.12df754",
-    "@dxos/keys": "0.8.2-main.12df754",
-    "@dxos/live-object": "0.8.2-main.12df754",
-    "@dxos/log": "0.8.2-main.12df754",
-    "@dxos/node-std": "0.8.2-main.12df754",
-    "@dxos/util": "0.8.2-main.12df754"
+    "@dxos/artifact": "0.8.2-main.30e4dbb",
+    "@dxos/async": "0.8.2-main.30e4dbb",
+    "@dxos/context": "0.8.2-main.30e4dbb",
+    "@dxos/debug": "0.8.2-main.30e4dbb",
+    "@dxos/echo-db": "0.8.2-main.30e4dbb",
+    "@dxos/echo-protocol": "0.8.2-main.30e4dbb",
+    "@dxos/echo": "0.8.2-main.30e4dbb",
+    "@dxos/echo-schema": "0.8.2-main.30e4dbb",
+    "@dxos/invariant": "0.8.2-main.30e4dbb",
+    "@dxos/effect": "0.8.2-main.30e4dbb",
+    "@dxos/live-object": "0.8.2-main.30e4dbb",
+    "@dxos/keys": "0.8.2-main.30e4dbb",
+    "@dxos/node-std": "0.8.2-main.30e4dbb",
+    "@dxos/log": "0.8.2-main.30e4dbb",
+    "@dxos/schema": "0.8.2-main.30e4dbb",
+    "@dxos/util": "0.8.2-main.30e4dbb"
   },
   "devDependencies": {
     "@types/parsimmon": "^1.10.9",
-    "effect": "3.13.3",
+    "effect": "3.14.21",
     "inquirer": "^12.0.0"
   },
   "peerDependencies": {

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

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 import { test, describe } from 'vitest';
 
 import { defineTool, Message, ToolResult, type Tool } from '@dxos/artifact';
@@ -58,8 +58,8 @@ describe.skip('AI Service Client', () => {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
       parameters: toJsonSchema(
-        S.Struct({
-          magicWord: S.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
+        Schema.Struct({
+          magicWord: Schema.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
         }),
       ),
     };
@@ -194,8 +194,8 @@ describe.skip('Ollama Client', () => {
         defineTool('test', {
           name: 'encrypt',
           description: 'Encrypt a message',
-          schema: S.Struct({
-            message: S.String.annotations({ description: 'The message to encrypt' }),
+          schema: Schema.Struct({
+            message: Schema.String.annotations({ description: 'The message to encrypt' }),
           }),
           execute: async ({ message }) => ToolResult.Success(message.split('').reverse().join('')),
         }),

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

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 
 import { type MessageContentBlock, defineTool, type Tool, ToolResult } from '@dxos/artifact';
 import { ObjectId } from '@dxos/echo-schema';
@@ -14,7 +14,7 @@ import { MessageCollector, emitMessageAsEvents } from './message-collector';
 import { type AIServiceClient, type GenerationStream } from './service';
 import { GenerationStreamImpl } from './stream';
 import { ToolTypes, type GenerateRequest, type GenerateResponse, type GenerationStreamEvent } from './types';
-import { isToolUse, runTools } from '../conversation';
+import { isToolUse, runTools } from '../session';
 
 export type OllamaClientParams = {
   endpoint?: string;
@@ -388,8 +388,8 @@ const WELL_KNOWN_TOOLS: Record<string, Tool> = {
   [ToolTypes.TextToImage]: defineTool('system', {
     name: 'text-to-image',
     description: 'Generate an image from a text prompt',
-    schema: S.Struct({
-      prompt: S.String.annotations({ description: 'The text prompt describing the image to generate' }),
+    schema: Schema.Struct({
+      prompt: Schema.String.annotations({ description: 'The text prompt describing the image to generate' }),
     }),
     execute: async ({ prompt }) => {
       const image = await fetch(SAMPLE_IMAGE_URL).then(async (res) => Buffer.from(await res.arrayBuffer()));
@@ -467,15 +467,15 @@ class OllamaDecoderStream extends TransformStream<string, OllamaResponseData> {
   }
 }
 
-class ModelDoesNotSupportToolsError extends S.TaggedError<ModelDoesNotSupportToolsError>()(
+class ModelDoesNotSupportToolsError extends Schema.TaggedError<ModelDoesNotSupportToolsError>()(
   'ModelDoesNotSupportToolsError',
   {
-    model: S.String,
+    model: Schema.String,
   },
 ) {}
 
-class ModelNotFoundError extends S.TaggedError<ModelNotFoundError>()('ModelNotFoundError', {
-  model: S.String,
+class ModelNotFoundError extends Schema.TaggedError<ModelNotFoundError>()('ModelNotFoundError', {
+  model: Schema.String,
 }) {}
 
 const parseOllamaError = (error: string): Error => {

package/src/ai-service/types.ts

@@ -2,7 +2,7 @@
 // Copyright 2025 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 
 import { Tool, Message, type MessageContentBlock } from '@dxos/artifact';
 import { type ObjectId } from '@dxos/echo-schema';
@@ -11,9 +11,9 @@ import { DEFAULT_EDGE_MODELS, DEFAULT_OLLAMA_MODELS } from './defs';
 
 export const createArtifactElement = (id: ObjectId) => `<artifact id=${id} />`;
 
-export const LLMModel = S.Literal(...DEFAULT_EDGE_MODELS, ...DEFAULT_OLLAMA_MODELS);
+export const LLMModel = Schema.Literal(...DEFAULT_EDGE_MODELS, ...DEFAULT_OLLAMA_MODELS);
 
-export type LLMModel = S.Schema.Type<typeof LLMModel>;
+export type LLMModel = Schema.Schema.Type<typeof LLMModel>;
 
 export const ToolTypes = Object.freeze({
   // TODO(dmaretskyi): Not implemented yet.
@@ -24,47 +24,47 @@ export const ToolTypes = Object.freeze({
 /**
  * Client GPT request.
  */
-export const GenerateRequest = S.Struct({
+export const GenerateRequest = Schema.Struct({
   /**
    * Preferred model or system default.
    */
-  model: S.optional(LLMModel),
+  model: Schema.optional(LLMModel),
 
   /**
    * Tools available for the LLM.
    */
-  tools: S.optional(S.Array(Tool).pipe(S.mutable)),
+  tools: Schema.optional(Schema.Array(Tool).pipe(Schema.mutable)),
 
   /**
    * System instructions to the LLM.
    */
-  systemPrompt: S.optional(S.String),
+  systemPrompt: Schema.optional(Schema.String),
 
   /**
    * History of messages to include in the context window.
    */
   // TODO(burdon): Rename messages.
-  history: S.optional(S.Array(Message)),
+  history: Schema.optional(Schema.Array(Message)),
 
   /**
    * Current request.
    */
-  prompt: S.optional(Message),
+  prompt: Schema.optional(Message),
 });
-export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;
+export type GenerateRequest = Schema.Schema.Type<typeof GenerateRequest>;
 
 /**
  * Non-streaming response.
  */
-export const GenerateResponse = S.Struct({
-  messages: S.Array(Message),
+export const GenerateResponse = Schema.Struct({
+  messages: Schema.Array(Message),
 
   /**
    * Number of tokens used in the response.
    */
-  tokenCount: S.optional(S.Number),
+  tokenCount: Schema.optional(Schema.Number),
 });
-export type GenerateResponse = S.Schema.Type<typeof GenerateResponse>;
+export type GenerateResponse = Schema.Schema.Type<typeof GenerateResponse>;
 
 /**
  * Server-Sent Events (SSE) stream from the AI service.

package/src/bin/chat.ts

@@ -11,7 +11,7 @@ import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 import { AIServiceEdgeClient, ToolTypes, DEFAULT_EDGE_MODEL } from '../ai-service';
-import { runLLM } from '../conversation';
+import { runLLM } from '../experimental';
 import {
   AI_SERVICE_ENDPOINT,
   createLogger,
@@ -19,7 +19,7 @@ import {
   createSystemPrompt,
   createTestData,
   Contact,
-  Org,
+  Organization,
   Project,
   Task,
 } from '../testing';
@@ -33,7 +33,7 @@ const dataSource = createTestData();
 
 const cypherTool = createCypherTool(dataSource);
 
-const schemaTypes = [Org, Project, Task, Contact];
+const schemaTypes = [Organization, Project, Task, Contact];
 
 const spaceId = SpaceId.random();
 const threadId = ObjectId.random();

package/src/{conversation → experimental/conversation}/conversation.test.ts

@@ -2,7 +2,7 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema as S } from 'effect';
+import { Schema } from 'effect';
 import { describe, test } from 'vitest';
 
 import { createUserMessage, defineTool, ToolResult } from '@dxos/artifact';
@@ -11,8 +11,8 @@ import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 import { runLLM, type ConversationEvent } from './conversation';
-import { AIServiceEdgeClient, DEFAULT_EDGE_MODEL } from '../ai-service';
-import { AI_SERVICE_ENDPOINT } from '../testing';
+import { AIServiceEdgeClient, DEFAULT_EDGE_MODEL } from '../../ai-service';
+import { AI_SERVICE_ENDPOINT } from '../../testing';
 
 // TODO(burdon): Local live LLM test.
 describe.skip('Conversation tests', () => {
@@ -40,8 +40,8 @@ describe.skip('Conversation tests', () => {
     const custodian = defineTool('testing', {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
-      schema: S.Struct({
-        magicWord: S.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
+      schema: Schema.Struct({
+        magicWord: Schema.String.annotations({ description: 'The magic word. Should be exactly "pretty please"' }),
       }),
       execute: async ({ magicWord }) => {
         if (magicWord === 'pretty please') {