@dxos/assistant 0.8.1 → 0.8.2-main.12df754

package/dist/types/src/ai-service/testing/mock.d.ts

@@ -1,7 +1,11 @@
-import { type GenerationStream, type AIServiceClient, type GenerateRequest } from '@dxos/assistant';
+import { type GenerationStream, type AIServiceClient, type GenerateRequest, type GenerateResponse } from '@dxos/assistant';
 export declare class MockAIService implements AIServiceClient {
     private readonly _responses;
     constructor(_responses: string[]);
-    exec(request: GenerateRequest): Promise<GenerationStream>;
+    /**
+     * Generate non-streaming response.
+     */
+    exec(request: GenerateRequest): Promise<GenerateResponse>;
+    execStream(request: GenerateRequest): Promise<GenerationStream>;
 }
 //# sourceMappingURL=mock.d.ts.map

package/dist/types/src/ai-service/testing/mock.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mock.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/testing/mock.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,eAAe,EAErB,MAAM,iBAAiB,CAAC;AAIzB,qBAAa,aAAc,YAAW,eAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,MAAM,EAAE;IAI3C,IAAI,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAGhE"}
+{"version":3,"file":"mock.d.ts","sourceRoot":"","sources":["../../../../../src/ai-service/testing/mock.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,eAAe,EACpB,KAAK,eAAe,EAEpB,KAAK,gBAAgB,EACtB,MAAM,iBAAiB,CAAC;AAIzB,qBAAa,aAAc,YAAW,eAAe;IACvC,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,MAAM,EAAE;IAEjD;;OAEG;IACG,IAAI,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAMzD,UAAU,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAGtE"}

package/dist/types/src/ai-service/types.d.ts

@@ -1,6 +1,6 @@
 import { Schema as S } from 'effect';
 import { Message, type MessageContentBlock } from '@dxos/artifact';
-import { ObjectId } from '@dxos/echo-schema';
+import { type ObjectId } from '@dxos/echo-schema';
 export declare const createArtifactElement: (id: ObjectId) => string;
 export declare const LLMModel: S.Literal<["@anthropic/claude-3-5-haiku-20241022", "@anthropic/claude-3-5-sonnet-20241022", "@anthropic/claude-3-7-sonnet-20250219", "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b", "@hf/nousresearch/hermes-2-pro-mistral-7b", "@ollama/llama-3-1-nemotron-70b-instruct", "@ollama/llama-3-1-nemotron-mini-4b-instruct", "@ollama/llama-3-2-3b", "llama3.2:1b", "llama3:70b", "deepseek-r1:latest"]>;
 export type LLMModel = S.Schema.Type<typeof LLMModel>;
@@ -11,8 +11,6 @@ export declare const ToolTypes: Readonly<{
  * Client GPT request.
  */
 export declare const GenerateRequest: S.Struct<{
-    spaceId: S.optional<S.Schema<import("@dxos/keys").SpaceId, string, never>>;
-    threadId: S.optional<import("@dxos/echo-schema").ObjectIdClass>;
     /**
      * Preferred model or system default.
      */
@@ -39,9 +37,6 @@ export declare const GenerateRequest: S.Struct<{
      */
     history: S.optional<S.Array$<import("@dxos/echo-schema").EchoObjectSchema<S.Struct<{
         id: import("@dxos/echo-schema").ObjectIdClass;
-        spaceId: S.optional<S.Schema<import("@dxos/keys").SpaceId, string, never>>;
-        threadId: S.optional<import("@dxos/echo-schema").ObjectIdClass>;
-        foreignId: S.optional<typeof S.String>;
         role: S.refine<"user" | "assistant", S.Schema<string, string, never>>;
         content: S.mutable<S.Array$<S.Union<[S.mutable<S.extend<S.Struct<{
             pending: S.optional<typeof S.Boolean>;
@@ -86,9 +81,6 @@ export declare const GenerateRequest: S.Struct<{
      */
     prompt: S.optional<import("@dxos/echo-schema").EchoObjectSchema<S.Struct<{
         id: import("@dxos/echo-schema").ObjectIdClass;
-        spaceId: S.optional<S.Schema<import("@dxos/keys").SpaceId, string, never>>;
-        threadId: S.optional<import("@dxos/echo-schema").ObjectIdClass>;
-        foreignId: S.optional<typeof S.String>;
         role: S.refine<"user" | "assistant", S.Schema<string, string, never>>;
         content: S.mutable<S.Array$<S.Union<[S.mutable<S.extend<S.Struct<{
             pending: S.optional<typeof S.Boolean>;
@@ -130,6 +122,57 @@ export declare const GenerateRequest: S.Struct<{
     }>>>;
 }>;
 export type GenerateRequest = S.Schema.Type<typeof GenerateRequest>;
+/**
+ * Non-streaming response.
+ */
+export declare const GenerateResponse: S.Struct<{
+    messages: S.Array$<import("@dxos/echo-schema").EchoObjectSchema<S.Struct<{
+        id: import("@dxos/echo-schema").ObjectIdClass;
+        role: S.refine<"user" | "assistant", S.Schema<string, string, never>>;
+        content: S.mutable<S.Array$<S.Union<[S.mutable<S.extend<S.Struct<{
+            pending: S.optional<typeof S.Boolean>;
+        }>, S.Struct<{
+            type: S.Literal<["text"]>;
+            disposition: S.optional<typeof S.String>;
+            text: typeof S.String;
+        }>>>, S.mutable<S.extend<S.Struct<{
+            pending: S.optional<typeof S.Boolean>;
+        }>, S.Struct<{
+            type: S.Literal<["json"]>;
+            disposition: S.optional<typeof S.String>;
+            json: typeof S.String;
+        }>>>, S.mutable<S.extend<S.Struct<{
+            pending: S.optional<typeof S.Boolean>;
+        }>, S.Struct<{
+            type: S.Literal<["image"]>;
+            id: S.optional<typeof S.String>;
+            source: S.optional<S.mutable<S.Struct<{
+                type: S.Literal<["base64"]>;
+                mediaType: typeof S.String;
+                data: typeof S.String;
+            }>>>;
+        }>>>, S.mutable<S.extend<S.Struct<{
+            pending: S.optional<typeof S.Boolean>;
+        }>, S.Struct<{
+            type: S.Literal<["tool_use"]>;
+            id: typeof S.String;
+            name: typeof S.String;
+            input: typeof S.Unknown;
+        }>>>, S.mutable<S.extend<S.Struct<{
+            pending: S.optional<typeof S.Boolean>;
+        }>, S.Struct<{
+            type: S.Literal<["tool_result"]>;
+            toolUseId: typeof S.String;
+            content: typeof S.String;
+            isError: S.optional<typeof S.Boolean>;
+        }>>>]>>>;
+    }>>>;
+    /**
+     * Number of tokens used in the response.
+     */
+    tokenCount: S.optional<typeof S.Number>;
+}>;
+export type GenerateResponse = S.Schema.Type<typeof GenerateResponse>;
 /**
  * Server-Sent Events (SSE) stream from the AI service.
  * https://docs.anthropic.com/en/api/streaming

package/dist/types/src/ai-service/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/ai-service/types.ts"],"names":[],"mappings":"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"}

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

@@ -23,9 +23,6 @@ export declare const runLLM: (params: CreateLLMConversationParams) => Promise<{
     result: any;
     history: {
         readonly id: string;
-        spaceId?: SpaceId | undefined;
-        threadId?: string | undefined;
-        foreignId?: string | undefined;
         role: "user" | "assistant";
         content: ({
             pending?: boolean | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../../src/conversation/conversation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,IAAI,EAAc,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAgB,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEhG,MAAM,MAAM,2BAA2B,GAAG;IACxC,KAAK,EAAE,QAAQ,CAAC;IAEhB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IAExB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,GACD,qBAAqB,CAAC;AAG1B,eAAO,MAAM,MAAM,WAAkB,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6G/D,CAAC;AAEF,eAAO,MAAM,SAAS,YAAa,OAAO,sBAAqB;IAAE,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,YAI1F,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,mCAA0C,eAAe,KAAG,OAAO,CAAC,cAAc,CAqFtG,CAAC"}
+{"version":3,"file":"conversation.d.ts","sourceRoot":"","sources":["../../../../src/conversation/conversation.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,IAAI,EAAc,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAChE,OAAO,EAAU,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAErD,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,YAAY,CAAC;AAG1C,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,qBAAqB,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEhG,MAAM,MAAM,2BAA2B,GAAG;IACxC,KAAK,EAAE,QAAQ,CAAC;IAEhB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,OAAO,CAAC,EAAE,OAAO,EAAE,CAAC;IACpB,MAAM,EAAE,eAAe,CAAC;IAExB,MAAM,CAAC,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI,CAAC;CAC7C,CAAC;AAEF,MAAM,MAAM,iBAAiB,GACzB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;CAClB,GACD,qBAAqB,CAAC;AAG1B,eAAO,MAAM,MAAM,WAAkB,2BAA2B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuG/D,CAAC;AAEF,eAAO,MAAM,SAAS,YAAa,OAAO,sBAAqB;IAAE,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,YAI1F,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,mCAA0C,eAAe,KAAG,OAAO,CAAC,cAAc,CAqFtG,CAAC"}

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

@@ -1,8 +1,7 @@
 import { Schema as S } from 'effect';
 import { type Message, type MessageContentBlock } from '@dxos/artifact';
-import { JsonSchemaType, ObjectId } from '@dxos/echo-schema';
-import type { SpaceId } from '@dxos/keys';
-export declare const createUserMessage: (spaceId: SpaceId, threadId: ObjectId, text: string) => Message;
+import { JsonSchemaType } from '@dxos/echo-schema';
+export declare const createUserMessage: (text: string) => Message;
 /**
  * @deprecated Use {@link LLMTool} instead.
  */

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,QAAQ,CAAC;AAErC,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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/conversation/types.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,QAAQ,CAAC;AAErC,OAAO,EAAE,KAAK,OAAO,EAAE,KAAK,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAgB,cAAc,EAAY,MAAM,mBAAmB,CAAC;AAG3E,eAAO,MAAM,iBAAiB,SAAU,MAAM,KAAG,OAI/C,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/echo-data-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"echo-data-source.d.ts","sourceRoot":"","sources":["../../../../src/cypher/echo-data-source.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,YAAY,EAAmC,MAAM,eAAe,CAAC;AAKnF,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGvE,qBAAa,cAAe,YAAW,UAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,YAAY;IAGxC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAiBxD,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YA+BhE,aAAa;IAQ3B,OAAO,CAAC,aAAa;YAUP,uBAAuB;CAqBtC"}
+{"version":3,"file":"echo-data-source.d.ts","sourceRoot":"","sources":["../../../../src/cypher/echo-data-source.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,YAAY,EAAmC,MAAM,eAAe,CAAC;AAInF,OAAO,KAAK,EAAE,UAAU,EAAE,IAAI,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAGvE,qBAAa,cAAe,YAAW,UAAU;IACnC,OAAO,CAAC,QAAQ,CAAC,GAAG;gBAAH,GAAG,EAAE,YAAY;IAGxC,QAAQ,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAiBxD,gBAAgB,CAAC,EAAE,KAAK,EAAE,EAAE;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC;YA+BhE,aAAa;IAQ3B,OAAO,CAAC,aAAa;YAUP,uBAAuB;CAqBtC"}

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

@@ -53,9 +53,6 @@ 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;
@@ -166,9 +163,6 @@ 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;

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,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dxos/assistant",
-  "version": "0.8.1",
+  "version": "0.8.2-main.12df754",
   "description": "Natural language interface to DXOS",
   "homepage": "https://dxos.org",
   "bugs": "https://github.com/dxos/dxos/issues",
@@ -40,18 +40,18 @@
     "parjs": "^1.3.9",
     "parsimmon": "^1.18.1",
     "ulidx": "^2.3.0",
-    "@dxos/artifact": "0.8.1",
-    "@dxos/async": "0.8.1",
-    "@dxos/context": "0.8.1",
-    "@dxos/echo-db": "0.8.1",
-    "@dxos/echo-schema": "0.8.1",
-    "@dxos/debug": "0.8.1",
-    "@dxos/invariant": "0.8.1",
-    "@dxos/keys": "0.8.1",
-    "@dxos/live-object": "0.8.1",
-    "@dxos/node-std": "0.8.1",
-    "@dxos/util": "0.8.1",
-    "@dxos/log": "0.8.1"
+    "@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"
   },
   "devDependencies": {
     "@types/parsimmon": "^1.10.9",

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

@@ -6,9 +6,8 @@ import { Schema as S } from 'effect';
 import { test, describe } from 'vitest';
 
 import { defineTool, Message, ToolResult, type Tool } from '@dxos/artifact';
-import { toJsonSchema, ObjectId, createStatic } from '@dxos/echo-schema';
+import { toJsonSchema, create } 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';
@@ -26,23 +25,18 @@ describe.skip('AI Service Client', () => {
       endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    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({
+    // await client.appendMessages([
+    //   {
+    //     id: ObjectId.random(),
+    //     spaceId,
+    //     threadId,
+    //     role: 'user',
+    //     content: [{ type: 'text', text: 'Hello' }],
+    //   },
+    //     ]);
+
+    const stream = await client.execStream({
       model: DEFAULT_EDGE_MODEL,
-      spaceId,
-      threadId,
       systemPrompt: 'You are a poet',
       tools: [],
     });
@@ -70,24 +64,19 @@ describe.skip('AI Service Client', () => {
       ),
     };
 
-    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' }],
-      },
-    ]);
+    // 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.exec({
+      const stream1 = await client.execStream({
         model: DEFAULT_EDGE_MODEL,
-        spaceId,
-        threadId,
         systemPrompt: 'You are a helpful assistant.',
         tools: [custodian],
       });
@@ -102,26 +91,24 @@ 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.exec({
+      const stream2 = await client.execStream({
         model: DEFAULT_EDGE_MODEL,
-        spaceId,
-        threadId,
         systemPrompt: 'You are a helpful assistant.',
         tools: [custodian],
       });
@@ -143,23 +130,18 @@ describe.skip('AI Service Client', () => {
       endpoint: AI_SERVICE_ENDPOINT.LOCAL,
     });
 
-    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({
+    // 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({
       model: DEFAULT_EDGE_MODEL,
-      spaceId,
-      threadId,
       tools: [
         {
           name: 'text-to-image',
@@ -190,8 +172,8 @@ describe.skip('Ollama Client', () => {
     const parser = new MixedStreamParser();
 
     const messages = await parser.parse(
-      await client.exec({
-        prompt: createStatic(Message, {
+      await client.execStream({
+        prompt: create(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'Hello, world!' }],
         }),
@@ -225,8 +207,8 @@ describe.skip('Ollama Client', () => {
     });
 
     const messages = await parser.parse(
-      await client.exec({
-        prompt: createStatic(Message, {
+      await client.execStream({
+        prompt: create(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'What is the encrypted message for "Hello, world!"' }],
         }),
@@ -246,8 +228,8 @@ describe.skip('Ollama Client', () => {
     const parser = new MixedStreamParser();
 
     const messages = await parser.parse(
-      await client.exec({
-        prompt: createStatic(Message, {
+      await client.execStream({
+        prompt: create(Message, {
           role: 'user',
           content: [{ type: 'text', text: 'Generate an image of a cat' }],
         }),

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

@@ -2,15 +2,12 @@
 // Copyright 2024 DXOS.org
 //
 
-import { Schema as S } from 'effect';
-
-import { Message } from '@dxos/artifact';
 import { assertArgument, invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 
 import type { AIServiceClient, GenerationStream } from './service';
 import { createGenerationStream } from './stream';
-import { type GenerateRequest } from './types';
+import { type GenerateRequest, type GenerateResponse } from './types';
 
 export type AIServiceEdgeClientOptions = {
   endpoint: string;
@@ -25,28 +22,16 @@ export class AIServiceEdgeClient implements AIServiceClient {
   }
 
   /**
-   * @deprecated
+   * Generate non-streaming response.
    */
-  // TODO(burdon): Remove.
-  async appendMessages(messages: Message[]): Promise<void> {
-    const url = `${this._endpoint}/message`;
-    const res = await fetch(url, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify({
-        messages: await S.encodePromise(S.Array(Message))(messages),
-      }),
-    });
-
-    if (!res.ok) {
-      throw new Error(`${await res.text()} [${url}]`);
-    }
+  async exec(request: GenerateRequest): Promise<GenerateResponse> {
+    throw new Error('Not implemented');
   }
 
   /**
    * Process request and open message stream.
    */
-  async exec(request: GenerateRequest): Promise<GenerationStream> {
+  async execStream(request: GenerateRequest): Promise<GenerationStream> {
     assertArgument(typeof request.model === 'string', 'model is required');
     log('requesting', { endpoint: this._endpoint });
     const controller = new AbortController();
@@ -61,7 +46,15 @@ export class AIServiceEdgeClient implements AIServiceClient {
       }),
     });
 
+    if (!response.ok) {
+      throw await parseErrorResponse(response);
+    }
+
     invariant(response.body instanceof ReadableStream);
     return createGenerationStream(response, controller);
   }
 }
+
+const parseErrorResponse = async (response: Response): Promise<Error> => {
+  throw new Error(`AI Service error: ${response.status} ${response.statusText} ${await response.text()}`);
+};

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

@@ -13,7 +13,7 @@ import { DEFAULT_OLLAMA_ENDPOINT } from './defs';
 import { MessageCollector, emitMessageAsEvents } from './message-collector';
 import { type AIServiceClient, type GenerationStream } from './service';
 import { GenerationStreamImpl } from './stream';
-import { ToolTypes, type GenerateRequest, type GenerationStreamEvent } from './types';
+import { ToolTypes, type GenerateRequest, type GenerateResponse, type GenerationStreamEvent } from './types';
 import { isToolUse, runTools } from '../conversation';
 
 export type OllamaClientParams = {
@@ -300,7 +300,14 @@ export class OllamaClient implements AIServiceClient {
     }
   }
 
-  async exec(request: GenerateRequest): Promise<GenerationStream> {
+  /**
+   * Generate non-streaming response.
+   */
+  async exec(request: GenerateRequest): Promise<GenerateResponse> {
+    throw new Error('Not implemented');
+  }
+
+  async execStream(request: GenerateRequest): Promise<GenerationStream> {
     const controller = new AbortController();
 
     try {

package/src/ai-service/parser.ts

@@ -4,7 +4,7 @@
 
 import { Message, type MessageContentBlock } from '@dxos/artifact';
 import { Event } from '@dxos/async';
-import { createStatic } from '@dxos/echo-schema';
+import { create } from '@dxos/echo-schema';
 import { invariant } from '@dxos/invariant';
 import { log } from '@dxos/log';
 import { isNotFalsy, safeParseJson } from '@dxos/util';
@@ -94,7 +94,7 @@ export class MixedStreamParser {
             log.warn('unexpected message_start');
           }
 
-          this._message = createStatic(Message, { role: event.message.role, content: [...event.message.content] });
+          this._message = create(Message, { role: event.message.role, content: [...event.message.content] });
           this.message.emit(this._message);
           break;
         }
@@ -316,6 +316,17 @@ export const mergeMessageBlock = (
           break;
         }
 
+        case 'proposal': {
+          if (streamBlock.content.length === 1 && streamBlock.content[0].type === 'text') {
+            return {
+              type: 'json',
+              disposition: 'proposal',
+              json: JSON.stringify({ text: streamBlock.content[0].content }),
+            };
+          }
+          break;
+        }
+
         case 'select': {
           return {
             type: 'json',

package/src/ai-service/service.ts

@@ -2,13 +2,29 @@
 // Copyright 2025 DXOS.org
 //
 
-import { type GenerateRequest, type GenerationStreamEvent } from './types';
+import { type GenerateRequest, type GenerationStreamEvent, type GenerateResponse } from './types';
 
-// TODO(burdon): Create wrapper for edge/ollama. Create session?
+/**
+ * Interface for AI service.
+ * Generates chat completions, supports, history and tools.
+ */
 export interface AIServiceClient {
-  exec(request: GenerateRequest): Promise<GenerationStream>;
+  /**
+   * Generate chat completions, supports, history and tools.
+   * Generate non-streaming response.
+   */
+  exec(request: GenerateRequest): Promise<GenerateResponse>;
+
+  /**
+   * Generate chat completions, supports, history and tools.
+   * Process request and open message stream.
+   */
+  execStream(request: GenerateRequest): Promise<GenerationStream>;
 }
 
+/**
+ * Streaming chat completion stream.
+ */
 export interface GenerationStream extends AsyncIterable<GenerationStreamEvent> {
   abort(): void;
   complete(): Promise<void>;

package/src/ai-service/testing/mock.ts

@@ -7,6 +7,7 @@ import {
   type AIServiceClient,
   type GenerateRequest,
   createGenerationStream,
+  type GenerateResponse,
 } from '@dxos/assistant';
 
 import { createTestSSEStream } from './test-stream';
@@ -14,9 +15,16 @@ import { createTestSSEStream } from './test-stream';
 export class MockAIService implements AIServiceClient {
   constructor(private readonly _responses: string[]) {}
 
+  /**
+   * Generate non-streaming response.
+   */
+  async exec(request: GenerateRequest): Promise<GenerateResponse> {
+    throw new Error('Not implemented');
+  }
+
   // TODO(burdon): Match response to request.
   // TODO(burdon): See MockGpt (from conductor).
-  async exec(request: GenerateRequest): Promise<GenerationStream> {
+  async execStream(request: GenerateRequest): Promise<GenerationStream> {
     return createGenerationStream(new Response(createTestSSEStream(this._responses)));
   }
 }