@dxos/assistant 0.7.4 → 0.7.5-labs.071a3e2

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

@@ -1,24 +1,55 @@
 import { Schema as S } from '@effect/schema';
-import { JsonSchemaType } from '@dxos/echo-schema';
+import { type Message, type MessageContentBlock } from '@dxos/artifact';
+import { JsonSchemaType, ObjectId } from '@dxos/echo-schema';
 import type { SpaceId } from '@dxos/keys';
-import { ObjectId, type Message } from '../ai-service';
 export declare const createUserMessage: (spaceId: SpaceId, threadId: ObjectId, text: string) => Message;
-export declare const LLMToolDefinition: S.Struct<{
+/**
+ * @deprecated Use {@link LLMTool} instead.
+ */
+export declare const ToolDefinition: S.Struct<{
     name: typeof S.String;
     description: typeof S.String;
     parameters: S.Schema<JsonSchemaType, JsonSchemaType, never>;
     execute: typeof S.Any;
 }>;
-export type LLMToolDefinition = {
+/**
+ * @deprecated Use {@link LLMTool} instead.
+ */
+export type ToolDefinition = {
     name: string;
     description: string;
     parameters: JsonSchemaType;
-    execute: (params: unknown, context: ToolExecutionContext) => Promise<LLMToolResult>;
+    execute: (params: unknown, context: ToolExecutionContext) => Promise<ToolResult>;
 };
-export type ToolExecutionContext = {};
-export type LLMToolResult = {
+declare global {
+    /**
+     * Extensions to the tool execution context.
+     *
+     * Different modules can extend this definition to add their own properties.
+     *
+     * @example
+     * ```ts
+     * declare global {
+     *   interface ToolContextExtensions {
+     *     chess: {
+     *       board: string;
+     *     };
+     *   }
+     * }
+     * ```
+     *
+     * @see https://www.typescriptlang.org/docs/handbook/declaration-merging.html#global-augmentation
+     */
+    interface ToolContextExtensions {
+    }
+}
+export type ToolExecutionContext = {
+    extensions: ToolContextExtensions;
+};
+export type ToolResult = {
     kind: 'success';
     result: unknown;
+    extractContentBlocks?: MessageContentBlock[];
 } | {
     kind: 'error';
     message: string;
@@ -26,23 +57,23 @@ export type LLMToolResult = {
     kind: 'break';
     result: unknown;
 };
-export declare const LLMToolResult: Readonly<{
+export declare const ToolResult: Readonly<{
     /**
      * The tool execution was successful.
      * Gives the result back to the LLM.
      */
-    Success: (result: unknown) => LLMToolResult;
-    Error: (message: string) => LLMToolResult;
+    Success: (result: unknown, extractContentBlocks?: MessageContentBlock[]) => ToolResult;
+    Error: (message: string) => ToolResult;
     /**
      * Stop the conversation and return the result.
      */
-    Break: (result: unknown) => LLMToolResult;
+    Break: (result: unknown) => ToolResult;
 }>;
 export type DefineToolParams<Params extends S.Schema.AnyNoContext> = {
     name: string;
     description: string;
     schema: Params;
-    execute: (params: S.Schema.Type<Params>, context: ToolExecutionContext) => Promise<LLMToolResult>;
+    execute: (params: S.Schema.Type<Params>, context: ToolExecutionContext) => Promise<ToolResult>;
 };
-export declare const defineTool: <Params extends S.Schema.AnyNoContext>({ name, description, schema, execute, }: DefineToolParams<Params>) => LLMToolDefinition;
+export declare const defineTool: <Params extends S.Schema.AnyNoContext>({ name, description, schema, execute, }: DefineToolParams<Params>) => ToolDefinition;
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/conversation/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,gBAAgB,CAAC;AAG7C,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,eAAe,CAAC;AAEvD,eAAO,MAAM,iBAAiB,YAAa,OAAO,YAAY,QAAQ,QAAQ,MAAM,KAAG,OAMrF,CAAC;AAEH,eAAO,MAAM,iBAAiB;;;;;EAK5B,CAAC;AAEH,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;CACrF,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,EAAE,CAAC;AAEtC,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAEvC,eAAO,MAAM,aAAa;IACxB;;;OAGG;sBACe,OAAO,KAAG,aAAa;qBAExB,MAAM,KAAG,aAAa;IACvC;;OAEG;oBACa,OAAO,KAAG,aAAa;EACvC,CAAC;AAEH,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,YAAY,IAAI;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;CACnG,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,YAAY,2CAK5D,gBAAgB,CAAC,MAAM,CAAC,KAAG,iBAU7B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/conversation/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,gBAAgB,CAAC;AAE7C,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAgB,cAAc,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC3E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,eAAO,MAAM,iBAAiB,YAAa,OAAO,YAAY,QAAQ,QAAQ,MAAM,KAAG,OAMrF,CAAC;AAEH;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;EAKzB,CAAC;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,cAAc,CAAC;IAC3B,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CAClF,CAAC;AAEF,OAAO,CAAC,MAAM,CAAC;IACb;;;;;;;;;;;;;;;;;OAiBG;IACH,UAAU,qBAAqB;KAAG;CACnC;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,UAAU,EAAE,qBAAqB,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,SAAS,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC;IAAC,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAA;CAAE,GAClF;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,GAClC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,OAAO,CAAA;CAAE,CAAC;AAEvC,eAAO,MAAM,UAAU;IACrB;;;OAGG;sBACe,OAAO,yBAAyB,mBAAmB,EAAE,KAAG,UAAU;qBAMnE,MAAM,KAAG,UAAU;IACpC;;OAEG;oBACa,OAAO,KAAG,UAAU;EACpC,CAAC;AAEH,MAAM,MAAM,gBAAgB,CAAC,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,YAAY,IAAI;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,oBAAoB,KAAK,OAAO,CAAC,UAAU,CAAC,CAAC;CAChG,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,MAAM,SAAS,CAAC,CAAC,MAAM,CAAC,YAAY,2CAK5D,gBAAgB,CAAC,MAAM,CAAC,KAAG,cAU7B,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"combinators.d.ts","sourceRoot":"","sources":["../../../../src/cypher/combinators.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,WAAW,EAEX,YAAY,EAEZ,UAAU,EACV,WAAW,EAEX,WAAW,EACX,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,YAAY,EAEZ,WAAW,EACZ,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,OAAO,EAA2B,MAAM,SAAS,CAAC;AAgB3D,eAAO,MAAM,UAAU,qBAEtB,CAAC;AAUF,eAAO,MAAM,KAAK,qBAAwD,CAAC;AAC3E,eAAO,MAAM,QAAQ,mBAGpB,CAAC;AACF,eAAO,MAAM,UAAU,qBAItB,CAAC;AACF,eAAO,MAAM,WAAW,sBAQvB,CAAC;AAEF,eAAO,MAAM,mBAAmB,8BAa/B,CAAC;AAOF,eAAO,MAAM,YAAY,uBAIxB,CAAC;AAEF,eAAO,MAAM,WAAW,sBAIvB,CAAC;AAYF,eAAO,MAAM,WAAW,sBAOvB,CAAC;AAEF,eAAO,MAAM,YAAY,uBAaxB,CAAC;AAEF,eAAO,MAAM,WAAW,sBAUvB,CAAC"}
+{"version":3,"file":"combinators.d.ts","sourceRoot":"","sources":["../../../../src/cypher/combinators.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACV,WAAW,EAEX,YAAY,EAEZ,UAAU,EACV,WAAW,EAEX,WAAW,EACX,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,YAAY,EAEZ,WAAW,EACZ,MAAM,OAAO,CAAC;AACf,OAAO,EAAE,OAAO,EAA2B,MAAM,SAAS,CAAC;AAgB3D,eAAO,MAAM,UAAU,qBAEtB,CAAC;AAUF,eAAO,MAAM,KAAK,qBAAwD,CAAC;AAC3E,eAAO,MAAM,QAAQ,mBAGpB,CAAC;AACF,eAAO,MAAM,UAAU,qBAItB,CAAC;AACF,eAAO,MAAM,WAAW,sBAQvB,CAAC;AAEF,eAAO,MAAM,mBAAmB,8BAa/B,CAAC;AAOF,eAAO,MAAM,YAAY,uBAIxB,CAAC;AAEF,eAAO,MAAM,WAAW,sBAIvB,CAAC;AAYF,eAAO,MAAM,WAAW,sBAOvB,CAAC;AAEF,eAAO,MAAM,YAAY,uBAaxB,CAAC;AAEF,eAAO,MAAM,WAAW,sBAUvB,CAAC"}

package/dist/types/src/cypher/parjs.d.ts

@@ -1,4 +1,4 @@
-import { parjsCombinators, parjs } from '#parjs';
 import type { Parjser } from 'parjs';
+import { parjsCombinators, parjs } from '#parjs';
 export { type Parjser, parjsCombinators, parjs };
 //# sourceMappingURL=parjs.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"parjs.d.ts","sourceRoot":"","sources":["../../../../src/cypher/parjs.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAAE,KAAK,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC"}
+{"version":3,"file":"parjs.d.ts","sourceRoot":"","sources":["../../../../src/cypher/parjs.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AAEjD,OAAO,EAAE,KAAK,OAAO,EAAE,gBAAgB,EAAE,KAAK,EAAE,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"schema.d.ts","sourceRoot":"","sources":["../../../../src/cypher/schema.ts"],"names":[],"mappings":"AAKA,OAAO,EAA2B,KAAK,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAKjF;;;;;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,YACoE,CAAC"}
+{"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/testing/artifacts.test.d.ts

@@ -0,0 +1 @@
+//# sourceMappingURL=artifacts.test.d.ts.map

package/dist/types/src/testing/artifacts.test.d.ts.map

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

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

@@ -0,0 +1,2 @@
+export declare const DATA_MESSAGES: string[];
+//# sourceMappingURL=data.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"data.d.ts","sourceRoot":"","sources":["../../../../src/testing/data.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,aAAa,UAQzB,CAAC"}

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

@@ -0,0 +1,5 @@
+export declare const AI_SERVICE_ENDPOINT: {
+    LOCAL: string;
+    REMOTE: string;
+};
+//# sourceMappingURL=defs.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"defs.d.ts","sourceRoot":"","sources":["../../../../src/testing/defs.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mBAAmB;;;CAG/B,CAAC"}

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

@@ -1,3 +1,4 @@
+export * from './defs';
 export * from './logger';
 export * from './query-promts';
 export * from './test-data';

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,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,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC"}

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

@@ -1,4 +1,4 @@
-import type { ImageSource } from '../ai-service';
+import type { ImageSource } from '@dxos/artifact';
 import type { ConversationEvent } from '../conversation';
 export declare const createLogger: ({ stream, filter, onImage, }?: {
     stream?: 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,eAAe,CAAC;AACtE,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,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/query-promts.d.ts

@@ -1,5 +1,5 @@
 import { Schema as S } from '@effect/schema';
 import { type DataSource } from '../cypher';
-export declare const createCypherTool: (dataSource: DataSource, schemaTypes?: S.Schema.Any[]) => import("../conversation").LLMToolDefinition;
+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,IAAI,CAAC,EAAE,MAAM,gBAAgB,CAAC;AAM7C,OAAO,EAAwC,KAAK,UAAU,EAAE,MAAM,WAAW,CAAC;AAGlF,eAAO,MAAM,gBAAgB,eAAgB,UAAU,gBAAe,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,gDA0ChF,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,IAAI,CAAC,EAAE,MAAM,gBAAgB,CAAC;AAM7C,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,7 +1,7 @@
 import { type Schema as S } from '@effect/schema';
+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 { EchoDatabase } from '@dxos/echo-db';
 export declare const seedTestData: (db: EchoDatabase) => void;
 export declare const createTestData: () => MockDataSource;
 export declare class MockDataSource implements DataSource {

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,gBAAgB,CAAC;AAGlD,OAAO,EAAmD,KAAK,cAAc,EAAY,MAAM,mBAAmB,CAAC;AAInH,OAAO,EACL,KAAK,UAAU,EACf,KAAK,IAAI,EACT,KAAK,YAAY,EAGlB,MAAM,WAAW,CAAC;AAEnB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAElD,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;CAoEb"}
+{"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,gBAAgB,CAAC;AAGlD,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

@@ -19,13 +19,13 @@ export declare const Task: S.mutable<S.Struct<{
     name: S.SchemaClass<string, string, never>;
     description: S.optional<typeof S.String>;
     project: import("@dxos/echo-schema").Ref$<{
-        id: string;
         name: string;
         description?: string | undefined;
+        id: string;
     }>;
     assignee: import("@dxos/echo-schema").Ref$<{
-        id: string;
         name: string;
+        id: string;
         email?: string | undefined;
     }>;
 }>>;
@@ -35,13 +35,13 @@ 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$<{
-        id: string;
         name: string;
         description?: string | undefined;
+        id: string;
     }>>;
     employees: S.Array$<import("@dxos/echo-schema").Ref$<{
-        id: string;
         name: string;
+        id: string;
         email?: string | undefined;
     }>>;
 }>>;

package/dist/types/tsconfig.tsbuildinfo

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.7.4",
+  "version": "0.7.5-labs.071a3e2",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -33,32 +33,36 @@
   "types": "dist/types/src/index.d.ts",
   "files": [
     "dist",
+    "vendor",
     "src"
   ],
-  "scripts": {
-    "run:chat": "tsx src/bin/chat.ts"
-  },
   "dependencies": {
-    "@dxos/async": "workspace:*",
-    "@dxos/context": "workspace:*",
-    "@dxos/debug": "workspace:*",
-    "@dxos/echo-db": "workspace:*",
-    "@dxos/echo-schema": "workspace:*",
-    "@dxos/invariant": "workspace:*",
-    "@dxos/keys": "workspace:*",
-    "@dxos/live-object": "workspace:*",
-    "@dxos/log": "workspace:*",
-    "@dxos/node-std": "workspace:*",
-    "@dxos/util": "workspace:*",
     "@effect/schema": "^0.75.5",
     "parjs": "^1.3.9",
-    "ulidx": "^2.3.0"
+    "parsimmon": "^1.18.1",
+    "ulidx": "^2.3.0",
+    "@dxos/async": "0.7.5-labs.071a3e2",
+    "@dxos/context": "0.7.5-labs.071a3e2",
+    "@dxos/artifact": "0.7.5-labs.071a3e2",
+    "@dxos/echo-db": "0.7.5-labs.071a3e2",
+    "@dxos/debug": "0.7.5-labs.071a3e2",
+    "@dxos/echo-schema": "0.7.5-labs.071a3e2",
+    "@dxos/live-object": "0.7.5-labs.071a3e2",
+    "@dxos/keys": "0.7.5-labs.071a3e2",
+    "@dxos/log": "0.7.5-labs.071a3e2",
+    "@dxos/invariant": "0.7.5-labs.071a3e2",
+    "@dxos/node-std": "0.7.5-labs.071a3e2",
+    "@dxos/util": "0.7.5-labs.071a3e2"
   },
   "devDependencies": {
+    "@types/parsimmon": "^1.10.9",
     "inquirer": "^12.0.0"
   },
   "publishConfig": {
     "access": "restricted"
   },
-  "beast": {}
-}
+  "beast": {},
+  "scripts": {
+    "run:chat": "tsx src/bin/chat.ts"
+  }
+}

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

@@ -5,26 +5,28 @@
 import { Schema as S } from '@effect/schema';
 import { test, describe } from 'vitest';
 
-import { toJsonSchema } from '@dxos/echo-schema';
+import { type Message, type Tool } from '@dxos/artifact';
+import { toJsonSchema, ObjectId } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { SpaceId } from '@dxos/keys';
 import { log } from '@dxos/log';
 
 import { AIServiceClientImpl } from './client';
-import { ObjectId, ToolTypes, type LLMTool } from './schema';
+import { ToolTypes } from './types';
+import { AI_SERVICE_ENDPOINT } from '../testing';
 
-const ENDPOINT = 'http://localhost:8787';
+// log.config({ filter: 'debug' });
 
-describe('AI Service Client', () => {
+describe.skip('AI Service Client', () => {
   test('client generation', async () => {
     const client = new AIServiceClientImpl({
-      endpoint: ENDPOINT,
+      endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
     const spaceId = SpaceId.random();
     const threadId = ObjectId.random();
 
-    await client.insertMessages([
+    await client.appendMessages([
       {
         id: ObjectId.random(),
         spaceId,
@@ -42,20 +44,20 @@ describe('AI Service Client', () => {
       tools: [],
     });
     for await (const event of stream) {
-      log.info('event', event);
+      log('event', event);
     }
 
-    log.info('full message', {
+    log('full message', {
       message: await stream.complete(),
     });
   });
 
   test('tool calls', async () => {
     const client = new AIServiceClientImpl({
-      endpoint: ENDPOINT,
+      endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    const custodian: LLMTool = {
+    const custodian: Tool = {
       name: 'custodian',
       description: 'Custodian can tell you the password if you say the magic word',
       parameters: toJsonSchema(
@@ -68,7 +70,7 @@ describe('AI Service Client', () => {
     const spaceId = SpaceId.random();
     const threadId = ObjectId.random();
 
-    await client.insertMessages([
+    await client.appendMessages([
       {
         id: ObjectId.random(),
         spaceId,
@@ -78,59 +80,70 @@ describe('AI Service Client', () => {
       },
     ]);
 
-    const stream = await client.generate({
-      model: '@anthropic/claude-3-5-haiku-20241022',
-      spaceId,
-      threadId,
-      systemPrompt: 'You are a helpful assistant.',
-      tools: [custodian],
-    });
-    for await (const event of stream) {
-      log.info('event', event);
+    {
+      const stream1 = await client.generate({
+        model: '@anthropic/claude-3-5-haiku-20241022',
+        spaceId,
+        threadId,
+        systemPrompt: 'You are a helpful assistant.',
+        tools: [custodian],
+      });
+
+      for await (const event of stream1) {
+        log('event', event);
+      }
+
+      // TODO(burdon): !!!
+      await stream1.complete();
+      const messages: Message[] = [];
+
+      const [message1] = messages;
+      log('full message', { message: 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"' }],
+        },
+      ]);
     }
-    const [message] = await stream.complete();
-    log.info('full message', {
-      message,
-    });
-    await client.insertMessages([message]);
 
-    const toolUse = message.content.find(({ type }) => type === 'tool_use')!;
-    invariant(toolUse.type === 'tool_use');
-    await client.insertMessages([
-      {
-        id: ObjectId.random(),
+    {
+      const stream2 = await client.generate({
+        model: '@anthropic/claude-3-5-haiku-20241022',
         spaceId,
         threadId,
-        role: 'user',
-        content: [{ type: 'tool_result', toolUseId: toolUse.id, content: 'password="The sky is gray"' }],
-      },
-    ]);
+        systemPrompt: 'You are a helpful assistant.',
+        tools: [custodian],
+      });
 
-    const stream2 = await client.generate({
-      model: '@anthropic/claude-3-5-haiku-20241022',
-      spaceId,
-      threadId,
-      systemPrompt: 'You are a helpful assistant.',
-      tools: [custodian],
-    });
-    for await (const event of stream2) {
-      log.info('event', event);
+      for await (const event of stream2) {
+        log('event', event);
+      }
+
+      await stream2.complete();
+      const messages: Message[] = [];
+
+      const [message2] = messages;
+      log('full message', { message: message2 });
     }
-    const [message2] = await stream2.complete();
-    log.info('full message', {
-      message: message2,
-    });
   });
 
-  test.only('image generation', async () => {
+  test.skip('image generation', async () => {
     const client = new AIServiceClientImpl({
-      endpoint: ENDPOINT,
+      endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
     const spaceId = SpaceId.random();
     const threadId = ObjectId.random();
 
-    await client.insertMessages([
+    await client.appendMessages([
       {
         id: ObjectId.random(),
         spaceId,
@@ -148,15 +161,17 @@ describe('AI Service Client', () => {
         {
           name: 'text-to-image',
           type: ToolTypes.TextToImage,
+          // options: {
+          //   model: '@cf/stabilityai/stable-diffusion-xl-base-1.0',
+          // },
         },
       ],
     });
+
     for await (const event of stream) {
-      log.info('event', event);
+      log('event', event);
     }
 
-    log.info('full message', {
-      message: await stream.complete(),
-    });
+    log('full message', { message: await stream.complete() });
   });
 });