@dxos/assistant 0.8.4-main.67995b8 → 0.8.4-main.72ec0f3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (176) hide show
  1. package/dist/lib/browser/chunk-J5LGTIGS.mjs +10 -0
  2. package/dist/lib/browser/extraction/index.mjs +121 -165
  3. package/dist/lib/browser/extraction/index.mjs.map +4 -4
  4. package/dist/lib/browser/index.mjs +1110 -1034
  5. package/dist/lib/browser/index.mjs.map +4 -4
  6. package/dist/lib/browser/meta.json +1 -1
  7. package/dist/lib/node-esm/chunk-HSLMI22Q.mjs +11 -0
  8. package/dist/lib/node-esm/extraction/index.mjs +121 -165
  9. package/dist/lib/node-esm/extraction/index.mjs.map +4 -4
  10. package/dist/lib/node-esm/index.mjs +1110 -1034
  11. package/dist/lib/node-esm/index.mjs.map +4 -4
  12. package/dist/lib/node-esm/meta.json +1 -1
  13. package/dist/types/src/{context/binding.d.ts → conversation/context.d.ts} +54 -5
  14. package/dist/types/src/conversation/context.d.ts.map +1 -0
  15. package/dist/types/src/conversation/conversation.d.ts +29 -26
  16. package/dist/types/src/conversation/conversation.d.ts.map +1 -1
  17. package/dist/types/src/conversation/index.d.ts +1 -0
  18. package/dist/types/src/conversation/index.d.ts.map +1 -1
  19. package/dist/types/src/diff.d.ts +15 -0
  20. package/dist/types/src/diff.d.ts.map +1 -0
  21. package/dist/types/src/diff.test.d.ts +2 -0
  22. package/dist/types/src/diff.test.d.ts.map +1 -0
  23. package/dist/types/src/errors.d.ts +46 -13
  24. package/dist/types/src/errors.d.ts.map +1 -1
  25. package/dist/types/src/execution-graph.d.ts +85 -0
  26. package/dist/types/src/execution-graph.d.ts.map +1 -0
  27. package/dist/types/src/execution-graph.test.d.ts +2 -0
  28. package/dist/types/src/execution-graph.test.d.ts.map +1 -0
  29. package/dist/types/src/extraction/extraction-llm-function/extraction-llm-function.d.ts +1 -1
  30. package/dist/types/src/extraction/extraction-llm-function/extraction-llm-function.d.ts.map +1 -1
  31. package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.d.ts +100 -57
  32. package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.d.ts.map +1 -1
  33. package/dist/types/src/extraction/extraction-ner-function/named-entity-recognition.d.ts.map +1 -1
  34. package/dist/types/src/extraction/extraction.d.ts +262 -221
  35. package/dist/types/src/extraction/extraction.d.ts.map +1 -1
  36. package/dist/types/src/extraction/quotes.d.ts +1 -1
  37. package/dist/types/src/extraction/quotes.d.ts.map +1 -1
  38. package/dist/types/src/functions/services.d.ts +18 -4
  39. package/dist/types/src/functions/services.d.ts.map +1 -1
  40. package/dist/types/src/index.d.ts +3 -2
  41. package/dist/types/src/index.d.ts.map +1 -1
  42. package/dist/types/src/session/GenericToolkit.d.ts +84 -0
  43. package/dist/types/src/session/GenericToolkit.d.ts.map +1 -0
  44. package/dist/types/src/session/artifact-diff.d.ts +27 -0
  45. package/dist/types/src/session/artifact-diff.d.ts.map +1 -0
  46. package/dist/types/src/session/error-handling.d.ts +4 -0
  47. package/dist/types/src/session/error-handling.d.ts.map +1 -0
  48. package/dist/types/src/session/format.d.ts +12 -0
  49. package/dist/types/src/session/format.d.ts.map +1 -0
  50. package/dist/types/src/session/format.test.d.ts +2 -0
  51. package/dist/types/src/session/format.test.d.ts.map +1 -0
  52. package/dist/types/src/session/index.d.ts +4 -0
  53. package/dist/types/src/session/index.d.ts.map +1 -1
  54. package/dist/types/src/session/observer.d.ts +22 -0
  55. package/dist/types/src/session/observer.d.ts.map +1 -0
  56. package/dist/types/src/session/session.d.ts +28 -237
  57. package/dist/types/src/session/session.d.ts.map +1 -1
  58. package/dist/types/src/session/toolkit.d.ts +15 -0
  59. package/dist/types/src/session/toolkit.d.ts.map +1 -0
  60. package/dist/types/src/session/version-pin.d.ts +4 -4
  61. package/dist/types/src/session/version-pin.d.ts.map +1 -1
  62. package/dist/types/src/templates/index.d.ts +1 -1
  63. package/dist/types/src/templates/system.d.ts +18 -0
  64. package/dist/types/src/templates/system.d.ts.map +1 -0
  65. package/dist/types/src/types/artifact.d.ts +20 -0
  66. package/dist/types/src/types/artifact.d.ts.map +1 -0
  67. package/dist/types/src/types/index.d.ts +2 -0
  68. package/dist/types/src/types/index.d.ts.map +1 -0
  69. package/dist/types/tsconfig.tsbuildinfo +1 -1
  70. package/package.json +33 -36
  71. package/src/conversation/context.ts +186 -0
  72. package/src/conversation/conversation.ts +93 -61
  73. package/src/conversation/index.ts +1 -0
  74. package/src/diff.test.ts +43 -0
  75. package/src/diff.ts +84 -0
  76. package/src/errors.ts +6 -1
  77. package/src/execution-graph.test.ts +740 -0
  78. package/src/execution-graph.ts +509 -0
  79. package/src/extraction/extraction-llm-function/extraction-llm-function.test.ts +10 -9
  80. package/src/extraction/extraction-llm-function/extraction-llm-function.ts +48 -56
  81. package/src/extraction/extraction-ner-function/extraction-ner-function.test.ts +18 -17
  82. package/src/extraction/extraction-ner-function/extraction-ner-function.ts +42 -43
  83. package/src/extraction/extraction-ner-function/named-entity-recognition.test.ts +12 -6
  84. package/src/extraction/extraction-ner-function/named-entity-recognition.ts +2 -0
  85. package/src/extraction/extraction.ts +7 -6
  86. package/src/extraction/quotes.test.ts +3 -3
  87. package/src/extraction/quotes.ts +4 -4
  88. package/src/functions/services.ts +108 -45
  89. package/src/index.ts +3 -2
  90. package/src/session/GenericToolkit.ts +130 -0
  91. package/src/session/artifact-diff.ts +41 -0
  92. package/src/session/error-handling.ts +41 -0
  93. package/src/session/format.test.ts +61 -0
  94. package/src/session/format.ts +144 -0
  95. package/src/session/index.ts +5 -0
  96. package/src/session/observer.ts +59 -0
  97. package/src/session/session.conversations.json +1 -0
  98. package/src/session/session.test.ts +38 -199
  99. package/src/session/session.ts +128 -251
  100. package/src/session/toolkit.ts +48 -0
  101. package/src/session/version-pin.ts +7 -8
  102. package/src/templates/index.ts +1 -1
  103. package/src/templates/instructions/format.tpl +61 -0
  104. package/src/templates/instructions/system.tpl +48 -0
  105. package/src/templates/system.ts +41 -0
  106. package/src/{types.ts → types/artifact.ts} +31 -7
  107. package/src/types/index.ts +5 -0
  108. package/src/typings.d.ts +5 -0
  109. package/dist/lib/browser/chunk-6WRGDEMH.mjs +0 -89
  110. package/dist/lib/browser/chunk-6WRGDEMH.mjs.map +0 -7
  111. package/dist/lib/browser/chunk-SIXTNSGV.mjs +0 -250
  112. package/dist/lib/browser/chunk-SIXTNSGV.mjs.map +0 -7
  113. package/dist/lib/browser/named-entity-recognition-O46UTCLR.mjs +0 -13
  114. package/dist/lib/node-esm/chunk-3UU5V4FS.mjs +0 -91
  115. package/dist/lib/node-esm/chunk-3UU5V4FS.mjs.map +0 -7
  116. package/dist/lib/node-esm/chunk-FD5NXKDP.mjs +0 -252
  117. package/dist/lib/node-esm/chunk-FD5NXKDP.mjs.map +0 -7
  118. package/dist/lib/node-esm/named-entity-recognition-W4VMRCH6.mjs +0 -14
  119. package/dist/types/bin/chat.d.ts +0 -2
  120. package/dist/types/bin/chat.d.ts.map +0 -1
  121. package/dist/types/src/context/binder.d.ts +0 -34
  122. package/dist/types/src/context/binder.d.ts.map +0 -1
  123. package/dist/types/src/context/binding.d.ts.map +0 -1
  124. package/dist/types/src/context/index.d.ts +0 -3
  125. package/dist/types/src/context/index.d.ts.map +0 -1
  126. package/dist/types/src/research/exa.d.ts +0 -12
  127. package/dist/types/src/research/exa.d.ts.map +0 -1
  128. package/dist/types/src/research/graph.d.ts +0 -51
  129. package/dist/types/src/research/graph.d.ts.map +0 -1
  130. package/dist/types/src/research/graph.test.d.ts +0 -2
  131. package/dist/types/src/research/graph.test.d.ts.map +0 -1
  132. package/dist/types/src/research/index.d.ts +0 -4
  133. package/dist/types/src/research/index.d.ts.map +0 -1
  134. package/dist/types/src/research/research.d.ts +0 -10
  135. package/dist/types/src/research/research.d.ts.map +0 -1
  136. package/dist/types/src/research/research.test.d.ts +0 -2
  137. package/dist/types/src/research/research.test.d.ts.map +0 -1
  138. package/dist/types/src/session/version-pin.test.d.ts +0 -2
  139. package/dist/types/src/session/version-pin.test.d.ts.map +0 -1
  140. package/dist/types/src/summarization/summarization.test.d.ts +0 -2
  141. package/dist/types/src/summarization/summarization.test.d.ts.map +0 -1
  142. package/dist/types/src/templates/prompt.d.ts +0 -30
  143. package/dist/types/src/templates/prompt.d.ts.map +0 -1
  144. package/dist/types/src/testing/exa-search-1748337321991.d.ts +0 -38
  145. package/dist/types/src/testing/exa-search-1748337321991.d.ts.map +0 -1
  146. package/dist/types/src/testing/exa-search-1748337331526.d.ts +0 -37
  147. package/dist/types/src/testing/exa-search-1748337331526.d.ts.map +0 -1
  148. package/dist/types/src/testing/exa-search-1748337344119.d.ts +0 -58
  149. package/dist/types/src/testing/exa-search-1748337344119.d.ts.map +0 -1
  150. package/dist/types/src/testing/index.d.ts +0 -3
  151. package/dist/types/src/testing/index.d.ts.map +0 -1
  152. package/dist/types/src/types.d.ts +0 -13
  153. package/dist/types/src/types.d.ts.map +0 -1
  154. package/src/context/binder.ts +0 -103
  155. package/src/context/binding.ts +0 -32
  156. package/src/context/index.ts +0 -6
  157. package/src/research/exa.ts +0 -97
  158. package/src/research/graph.test.ts +0 -64
  159. package/src/research/graph.ts +0 -369
  160. package/src/research/index.ts +0 -7
  161. package/src/research/instructions-research.tpl +0 -98
  162. package/src/research/research.test.ts +0 -190
  163. package/src/research/research.ts +0 -87
  164. package/src/session/__snapshots__/session.test.ts.snap +0 -32
  165. package/src/session/version-pin.test.ts +0 -7
  166. package/src/summarization/summarization.test.ts +0 -199
  167. package/src/templates/assistant.tpl +0 -111
  168. package/src/templates/prompt.ts +0 -45
  169. package/src/testing/exa-search-1748337321991.ts +0 -131
  170. package/src/testing/exa-search-1748337331526.ts +0 -144
  171. package/src/testing/exa-search-1748337344119.ts +0 -133
  172. package/src/testing/index.ts +0 -11
  173. package/src/typedefs.d.ts +0 -8
  174. /package/dist/lib/browser/{named-entity-recognition-O46UTCLR.mjs.map → chunk-J5LGTIGS.mjs.map} +0 -0
  175. /package/dist/lib/node-esm/{named-entity-recognition-W4VMRCH6.mjs.map → chunk-HSLMI22Q.mjs.map} +0 -0
  176. /package/src/extraction/extraction-llm-function/{instructions.tpl → transcription-instructions.tpl} +0 -0
@@ -2,44 +2,58 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { AiLanguageModel, AiToolkit, type AiError, type AiResponse, type AiTool } from '@effect/ai';
6
- import { Chunk, Context, Effect, Option, pipe, Stream, type Schema } from 'effect';
7
- import { Array, String } from 'effect';
5
+ import type * as AiError from '@effect/ai/AiError';
6
+ import * as LanguageModel from '@effect/ai/LanguageModel';
7
+ import type * as Tool from '@effect/ai/Tool';
8
+ import type * as Toolkit from '@effect/ai/Toolkit';
9
+ import * as Chunk from 'effect/Chunk';
10
+ import * as Effect from 'effect/Effect';
11
+ import type * as Schema from 'effect/Schema';
12
+ import * as Stream from 'effect/Stream';
8
13
 
9
14
  import {
10
15
  AiParser,
11
16
  AiPreprocessor,
12
- getToolCalls,
13
- runTool,
14
- ToolExecutionService,
15
- ToolResolverService,
16
- type AgentStatus,
17
- type AiInputPreprocessingError,
18
17
  type AiToolNotFoundError,
19
- type GenerationStream,
18
+ type PromptPreprocessingError,
19
+ type ToolExecutionService,
20
+ type ToolResolverService,
21
+ callTool,
22
+ getToolCalls,
20
23
  } from '@dxos/ai';
21
- import { Event } from '@dxos/async';
22
24
  import { type Blueprint } from '@dxos/blueprints';
23
25
  import { todo } from '@dxos/debug';
24
26
  import { Obj } from '@dxos/echo';
25
- import { ObjectVersion } from '@dxos/echo-db';
26
- import { type ObjectId } from '@dxos/echo-schema';
27
- import { DatabaseService } from '@dxos/functions';
27
+ import { TracingService } from '@dxos/functions';
28
28
  import { log } from '@dxos/log';
29
- import { DataType, type ContentBlock } from '@dxos/schema';
29
+ import { Message } from '@dxos/types';
30
30
 
31
- import { AiAssistantError } from '../errors';
31
+ import { type AiAssistantError } from '../errors';
32
32
 
33
- export type AiSessionOptions = {};
33
+ import { formatSystemPrompt, formatUserPrompt } from './format';
34
+ import { GenerationObserver } from './observer';
35
+
36
+ export type AiSessionRunError = AiError.AiError | PromptPreprocessingError | AiToolNotFoundError | AiAssistantError;
37
+
38
+ export type AiSessionRunRequirements =
39
+ | LanguageModel.LanguageModel
40
+ | ToolExecutionService
41
+ | ToolResolverService
42
+ | TracingService;
34
43
 
35
- export type SessionRunOptions<Tools extends AiTool.Any> = {
44
+ export type AiSessionRunParams<Tools extends Record<string, Tool.Any>> = {
36
45
  prompt: string;
37
- history: DataType.Message[];
38
- systemPrompt?: string;
39
- toolkit?: AiToolkit.AiToolkit<Tools>;
46
+ // TODO(wittjosiah): Rename to systemPrompt.
47
+ system?: string;
48
+ history?: Message.Message[];
49
+ objects?: Obj.Any[];
40
50
  blueprints?: Blueprint.Blueprint[];
51
+ toolkit?: Toolkit.WithHandler<Tools>;
52
+ observer?: GenerationObserver;
41
53
  };
42
54
 
55
+ export type AiSessionOptions = {};
56
+
43
57
  /**
44
58
  * Contains message history, tools, current context.
45
59
  * Current context means the state of the app, time of day, and other contextual information.
@@ -51,165 +65,130 @@ export type SessionRunOptions<Tools extends AiTool.Any> = {
51
65
  * Could be personal or shared.
52
66
  */
53
67
  export class AiSession {
54
- // TODO(burdon): Move to conversation.
68
+ /** Prevents concurrent execution of session. */
55
69
  private readonly _semaphore = Effect.runSync(Effect.makeSemaphore(1));
56
70
 
57
- /** Pending messages (incl. the current user request). */
58
- private _pending: DataType.Message[] = [];
59
-
60
- /** Current streaming response. */
61
- private _stream: GenerationStream | undefined;
71
+ /** Message history from queue. */
72
+ // TODO(burdon): Evolve into supporting a git-like graph of messages.
73
+ private _history: Message.Message[] = [];
62
74
 
63
- /** Prior history from queue. */
64
- private _history: DataType.Message[] = [];
65
-
66
- /**
67
- * New message.
68
- */
69
- public readonly message = new Event<DataType.Message>();
70
-
71
- /**
72
- * Complete block added to Message.
73
- */
74
- public readonly block = new Event<ContentBlock.Any>();
75
-
76
- /**
77
- * Update partial block (while streaming).
78
- */
79
- public readonly update = new Event<ContentBlock.Any>();
80
-
81
- /**
82
- * Unparsed events from the underlying generation stream.
83
- */
84
- public readonly streamEvent = new Event<AiResponse.Part>();
85
-
86
- /**
87
- * User prompt or tool result.
88
- */
89
- public readonly userMessage = new Event<DataType.Message>();
90
-
91
- /**
92
- * Agent self-reporting its status.
93
- * Triggered by the model.
94
- */
95
- public readonly statusReport = new Event<AgentStatus>();
96
-
97
- /**
98
- * Emits when the session is done.
99
- */
100
- public readonly done = new Event<void>();
75
+ /** Pending messages for this session (incl. the current prompt). */
76
+ private _pending: Message.Message[] = [];
101
77
 
102
78
  constructor(private readonly _options: AiSessionOptions = {}) {}
103
79
 
104
- /**
105
- * Runs the AI model loop interacting with tools and artifacts.
106
- * @param options - The session options.
107
- * @returns The messages generated by the session, including the user's prompt.
108
- */
109
- // TODO(dmaretskyi): Toolkit context doesn't get added to the effect type.
110
- run = <Tools extends AiTool.Any>(
111
- options: SessionRunOptions<Tools>,
112
- ): Effect.Effect<
113
- DataType.Message[],
114
- AiAssistantError | AiInputPreprocessingError | AiToolNotFoundError | AiError.AiError,
115
- AiLanguageModel.AiLanguageModel | ToolResolverService | ToolExecutionService | AiTool.ToHandler<Tools>
116
- > =>
80
+ run = <Tools extends Record<string, Tool.Any>>({
81
+ prompt,
82
+ system: systemTemplate,
83
+ history = [],
84
+ objects = [],
85
+ blueprints = [],
86
+ toolkit,
87
+ observer = GenerationObserver.noop(),
88
+ }: AiSessionRunParams<Tools>): Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements> =>
117
89
  Effect.gen(this, function* () {
118
- this._history = [...options.history];
90
+ this._history = [...history];
91
+ this._pending = [];
92
+ const pending = this._pending;
93
+
94
+ const submitMessage = Effect.fnUntraced(function* (message: Message.Message) {
95
+ pending.push(message);
96
+ yield* observer.onMessage(message);
97
+ yield* TracingService.emitConverationMessage(message);
98
+ return message;
99
+ });
100
+
101
+ // Submit the prompt.
102
+ // TODO(burdon): Remove if cancelled?
103
+ const promptMessage = yield* submitMessage(yield* formatUserPrompt({ prompt, history }));
119
104
 
120
- const promptMessages = yield* this._formatUserPrompt(options.prompt, options.history);
121
- this._pending = [promptMessages];
122
- this.userMessage.emit(promptMessages);
105
+ // Generate system and prompt messages.
106
+ const system = yield* formatSystemPrompt({ system: systemTemplate, blueprints, objects });
123
107
 
124
- // Potential tool use loop.
108
+ // Tool call loop.
125
109
  do {
126
110
  log('request', {
111
+ prompt: promptMessage,
112
+ system: { snippet: createSnippet(system), length: system.length },
127
113
  pending: this._pending.length,
128
114
  history: this._history.length,
129
- tools: (Object.values(options.toolkit?.tools ?? {}) as AiTool.Any[]).map((tool: AiTool.Any) => tool.name),
115
+ objects: objects?.length ?? 0,
130
116
  });
131
117
 
132
- const prompt = yield* AiPreprocessor.preprocessAiInput([...this._history, ...this._pending]);
133
-
134
- const blueprints = options.blueprints ?? [];
135
-
136
- // Build system prompt from blueprint templates.
137
- // TODO(dmaretskyi): Loading BP from the Database should be done at the higher level. We need a type for the resolved blueprint.
138
- const systemPrompt = yield* pipe(
139
- blueprints,
140
- Effect.forEach((blueprint) => Effect.succeed(blueprint.instructions)),
141
- Effect.flatMap(Effect.forEach((template) => DatabaseService.loadRef(template.source))),
142
- Effect.map(Array.map((template) => `\n\n<blueprint>${template.content}</blueprint>`)),
143
- Effect.map(Array.reduce(options.systemPrompt ?? '', String.concat)),
144
- );
145
-
146
- // Build a combined toolkit from the blueprint tools and the provided toolkit.
147
- const blueprintToolkit = yield* ToolResolverService.resolveToolkit(blueprints.flatMap((bp) => bp.tools));
148
- const blueprintToolkitHandler: Context.Context<AiTool.ToHandler<AiTool.Any>> =
149
- yield* blueprintToolkit.toContext(yield* ToolExecutionService.handlersFor(blueprintToolkit));
150
- const toolkit = options.toolkit != null ? AiToolkit.merge(options.toolkit, blueprintToolkit) : blueprintToolkit;
151
- const toolkitWithBlueprintHandlers = yield* toolkit.pipe(
152
- Effect.provide(blueprintToolkitHandler) as any,
153
- ) as Effect.Effect<AiToolkit.ToHandler<any>, never, AiTool.ToHandler<Tools>>;
118
+ const prompt = yield* AiPreprocessor.preprocessPrompt([...this._history, ...this._pending], { system });
154
119
 
155
- log.info('run', {
156
- systemPrompt: [systemPrompt.slice(0, 32), '...', systemPrompt.slice(-32), systemPrompt.length].join(' '),
157
- tools: Object.keys(blueprintToolkit.tools),
158
- });
159
-
160
- const blocks = yield* AiLanguageModel.streamText({
120
+ // Execute the stream request.
121
+ // logDump('prompt', Prompt.Prompt.pipe(Schema.encodeSync)(prompt));
122
+ const blocks = yield* LanguageModel.streamText({
161
123
  prompt,
162
- system: systemPrompt,
163
- toolkit: toolkitWithBlueprintHandlers,
124
+ toolkit,
164
125
  disableToolCallResolution: true,
165
126
  }).pipe(
166
- AiParser.parseGptStream({
167
- onBlock: (block) =>
168
- Effect.gen(this, function* () {
169
- if (block.pending) {
170
- this.update.emit(block);
171
- } else {
172
- this.block.emit(block);
173
- }
174
- }),
175
- onPart: (part) =>
176
- Effect.gen(this, function* () {
177
- this.streamEvent.emit(part);
178
- }),
127
+ // TOOD(dmaretskyi): Error mapping.
128
+ AiParser.parseResponse({
129
+ onBegin: () => observer.onBegin(),
130
+ onBlock: (block) => observer.onBlock(block),
131
+ onPart: (part) => observer.onPart(part),
132
+ onEnd: (summary) => observer.onEnd(summary),
179
133
  }),
180
134
  Stream.runCollect,
181
135
  Effect.map(Chunk.toArray),
182
136
  );
183
137
 
184
- const response = Obj.make(DataType.Message, {
185
- created: new Date().toISOString(),
186
- sender: { role: 'assistant' },
187
- blocks,
188
- });
189
- this._pending.push(response);
190
- this.message.emit(response);
138
+ // Create the response message.
139
+ const response = yield* submitMessage(
140
+ Obj.make(Message.Message, {
141
+ created: new Date().toISOString(),
142
+ sender: { role: 'assistant' },
143
+ blocks,
144
+ }),
145
+ );
191
146
 
147
+ // Parse the response for tool calls.
192
148
  const toolCalls = getToolCalls(response);
193
149
  if (toolCalls.length === 0) {
194
150
  break;
151
+ } else if (!toolkit) {
152
+ throw new Error('No toolkit provided'); // TODO(burdon): Throw user error?
195
153
  }
196
154
 
197
- const toolResults = yield* runTools(toolCalls, toolkitWithBlueprintHandlers as any);
198
- this._pending.push(
199
- Obj.make(DataType.Message, {
155
+ // Execute the tool calls.
156
+ // TODO(burdon): Retry errors? Write result when each completes individually?
157
+ const toolResults = yield* Effect.forEach(toolCalls, (toolCall) => {
158
+ return callTool(toolkit, toolCall).pipe(
159
+ Effect.provide(
160
+ TracingService.layerSubframe((context) => ({
161
+ ...context,
162
+ parentMessage: response.id,
163
+ toolCallId: toolCall.toolCallId,
164
+ })),
165
+ ),
166
+ );
167
+ });
168
+
169
+ // Add to queue and continue loop.
170
+ // TODO(wittjosiah): Sometimes tool error results are added to the queue before the tool agent statuses.
171
+ // This results in a broken execution graph.
172
+ yield* submitMessage(
173
+ Obj.make(Message.Message, {
200
174
  created: new Date().toISOString(),
201
- sender: { role: 'user' },
175
+ sender: { role: 'tool' },
202
176
  blocks: toolResults,
203
177
  }),
204
178
  );
205
179
  } while (true);
206
180
 
181
+ log('done', { pending: this._pending.length });
207
182
  return this._pending;
208
183
  }).pipe(this._semaphore.withPermits(1), Effect.withSpan('AiSession.run'));
209
184
 
185
+ /**
186
+ * @deprecated
187
+ */
188
+ // TODO(burdon): Implement or remove.
210
189
  async runStructured<S extends Schema.Schema.AnyNoContext>(
211
- schema: S,
212
- options: SessionRunOptions<AiTool.Any>,
190
+ _schema: S,
191
+ _options: AiSessionRunParams<any>,
213
192
  ): Promise<Schema.Schema.Type<S>> {
214
193
  return todo();
215
194
  // const parser = structuredOutputParser(schema);
@@ -219,118 +198,16 @@ export class AiSession {
219
198
  // });
220
199
  // return parser.getResult(result);
221
200
  }
222
-
223
- private _formatUserPrompt = (prompt: string, history: DataType.Message[]) =>
224
- Effect.gen(function* () {
225
- const prelude: ContentBlock.Any[] = [];
226
-
227
- // TODO(dmaretskyi): Evaluate other approaches as `serviceOption` isn't represented in the type system.
228
- const artifactDiffResolver = yield* Effect.serviceOption(ArtifactDiffResolver);
229
- if (Option.isSome(artifactDiffResolver)) {
230
- const versions = gatherObjectVersions(history);
231
-
232
- const artifactDiff = yield* Effect.tryPromise({
233
- try: () =>
234
- artifactDiffResolver.value.resolve(
235
- [...versions.entries()].map(([id, version]) => ({ id, lastVersion: version })),
236
- ),
237
- catch: AiAssistantError.wrap('Artifact diff resolution error'),
238
- });
239
-
240
- log.info('vision', {
241
- artifactDiff,
242
- versions,
243
- });
244
-
245
- for (const [id, { version }] of [...artifactDiff.entries()]) {
246
- if (ObjectVersion.equals(version, versions.get(id)!)) {
247
- artifactDiff.delete(id);
248
- continue;
249
- }
250
-
251
- prelude.push({ _tag: 'anchor', objectId: id, version });
252
- }
253
- if (artifactDiff.size > 0) {
254
- prelude.push(createArtifactUpdateBlock(artifactDiff));
255
- }
256
- }
257
-
258
- return Obj.make(DataType.Message, {
259
- created: new Date().toISOString(),
260
- sender: { role: 'user' },
261
- blocks: [...prelude, { _tag: 'text', text: prompt }],
262
- });
263
- });
264
-
265
- abort(): void {
266
- this._stream?.abort();
267
- }
268
201
  }
269
202
 
270
- const gatherObjectVersions = (messages: DataType.Message[]): Map<ObjectId, ObjectVersion> => {
271
- const artifactIds = new Map<ObjectId, ObjectVersion>();
272
- for (const message of messages) {
273
- for (const block of message.blocks) {
274
- if (block._tag === 'anchor') {
275
- artifactIds.set(block.objectId, block.version as ObjectVersion);
276
- }
277
- }
278
- }
279
-
280
- return artifactIds;
281
- };
203
+ const createSnippet = (text: string, len = 32) =>
204
+ text.length <= len * 2 ? text : [text.slice(0, len), '...', text.slice(-len)].join('');
282
205
 
283
- const createArtifactUpdateBlock = (
284
- artifactDiff: Map<ObjectId, { version: ObjectVersion; diff?: string }>,
285
- ): ContentBlock.Any => {
286
- return {
287
- _tag: 'text',
288
- // TODO(dmaretskyi): Does this need to be a special content-block?
289
- disposition: 'artifact-update',
290
- text: `
291
- The following artifacts have been updated since the last message:
292
- ${[...artifactDiff.entries()]
293
- .map(([id, { diff }]) => `<changed-artifact id="${id}">${diff ? `\n${diff}` : ''}</changed-artifact>`)
294
- .join('\n')}
295
- `,
296
- };
206
+ // TODO(dmaretskyi): Extract as a general util.
207
+ const logDump = (message: string, data: unknown) => {
208
+ // eslint-disable-next-line @typescript-eslint/no-require-imports
209
+ const { writeFileSync } = require('node:fs');
210
+ const path = `/tmp/log-data-${Date.now()}.json`;
211
+ writeFileSync(path, JSON.stringify(data, null, 2));
212
+ log.info(message, { path });
297
213
  };
298
-
299
- /**
300
- * Resolves artifact ids to their versions.
301
- * Used to give the model a sense of the changes to the artifacts made by users during the conversation.
302
- * The artifacts versions are pinned in the history, and whenever the artifact changes in-between assistant's steps,
303
- * a diff is inserted into the conversation.
304
- *
305
- * Can be optionally provided to the session run call.
306
- */
307
- // TODO(dmaretskyi): Convert to Context.Reference
308
- export class ArtifactDiffResolver extends Context.Tag('@dxos/assistant/ArtifactDiffResolver')<
309
- ArtifactDiffResolver,
310
- ArtifactDiffResolver.Service
311
- >() {}
312
-
313
- export namespace ArtifactDiffResolver {
314
- export type Service = {
315
- resolve: (artifacts: { id: ObjectId; lastVersion: ObjectVersion }[]) => Promise<
316
- Map<
317
- ObjectId,
318
- {
319
- version: ObjectVersion;
320
- diff?: string;
321
- }
322
- >
323
- >;
324
- };
325
- }
326
-
327
- const runTools: <Tools extends AiTool.Any>(
328
- toolCalls: ContentBlock.ToolCall[],
329
- toolkit: AiToolkit.AiToolkit<Tools>,
330
- ) => Effect.Effect<ContentBlock.ToolResult[], AiError.AiError, AiTool.ToHandler<Tools>> = Effect.fn('runTools')(
331
- function* (toolCalls, toolkit) {
332
- const toolkitWithHandlers = Effect.isEffect(toolkit) ? yield* toolkit : toolkit;
333
-
334
- return yield* Effect.forEach(toolCalls, (toolCall) => runTool(toolkitWithHandlers, toolCall));
335
- },
336
- );
@@ -0,0 +1,48 @@
1
+ //
2
+ // Copyright 2025 DXOS.org
3
+ //
4
+
5
+ import type * as Tool from '@effect/ai/Tool';
6
+ import * as Toolkit from '@effect/ai/Toolkit';
7
+ import type * as Context from 'effect/Context';
8
+ import * as Effect from 'effect/Effect';
9
+
10
+ import { type AiToolNotFoundError, ToolExecutionService, type ToolId, ToolResolverService } from '@dxos/ai';
11
+ import { type Blueprint } from '@dxos/blueprints';
12
+ import { isTruthy } from '@dxos/util';
13
+
14
+ export type ToolkitParams<Tools extends Record<string, Tool.Any>> = {
15
+ toolkit?: Toolkit.Toolkit<Tools>;
16
+ toolIds?: ToolId[];
17
+ blueprints?: Blueprint.Blueprint[];
18
+ };
19
+
20
+ /**
21
+ * Build a combined toolkit from the blueprint tools and the provided toolkit.
22
+ */
23
+ export const createToolkit = <Tools extends Record<string, Tool.Any> = {}>({
24
+ toolkit: toolkitParam,
25
+ toolIds = [],
26
+ blueprints = [],
27
+ }: ToolkitParams<Tools>): Effect.Effect<
28
+ Toolkit.WithHandler<any>,
29
+ AiToolNotFoundError,
30
+ ToolResolverService | ToolExecutionService | Tool.HandlersFor<Tools>
31
+ > =>
32
+ Effect.gen(function* () {
33
+ const blueprintToolkit = yield* ToolResolverService.resolveToolkit([
34
+ ...blueprints.flatMap(({ tools }) => tools),
35
+ ...toolIds,
36
+ ]);
37
+
38
+ const blueprintToolkitHandler: Context.Context<Tool.HandlersFor<any>> = yield* blueprintToolkit.toContext(
39
+ ToolExecutionService.handlersFor(blueprintToolkit),
40
+ );
41
+
42
+ const toolkit = Toolkit.merge(...[toolkitParam, blueprintToolkit].filter(isTruthy));
43
+ return yield* toolkit.pipe(Effect.provide(blueprintToolkitHandler)) as any as Effect.Effect<
44
+ Toolkit.WithHandler<any>,
45
+ never,
46
+ Tool.HandlersFor<Tools>
47
+ >;
48
+ });
@@ -2,12 +2,11 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { Schema } from 'effect';
5
+ import * as Schema from 'effect/Schema';
6
6
 
7
- import { type ObjectVersion } from '@dxos/echo-db';
8
- import { getVersion } from '@dxos/echo-db';
9
- import { ObjectId, type BaseEchoObject } from '@dxos/echo-schema';
10
- import { type ContentBlock } from '@dxos/schema';
7
+ import { type AnyEchoObject, ObjectId } from '@dxos/echo/internal';
8
+ import { type ObjectVersion, getVersion } from '@dxos/echo-db';
9
+ import { type ContentBlock } from '@dxos/types';
11
10
 
12
11
  // TODO(dmaretskyi): Extract.
13
12
  const ObjectVersionSchema = Schema.Unknown as Schema.Schema<ObjectVersion>;
@@ -15,7 +14,7 @@ const ObjectVersionSchema = Schema.Unknown as Schema.Schema<ObjectVersion>;
15
14
  const VersionPinSchema = Schema.Struct({
16
15
  // TODO(dmaretskyi): Use Ref when those support encoding.
17
16
  objectId: ObjectId,
18
- // TODO(dmaretskyi): Could be opaque
17
+ // TODO(dmaretskyi): Could be opaque.
19
18
  version: ObjectVersionSchema,
20
19
  });
21
20
 
@@ -27,11 +26,11 @@ export interface VersionPin extends Schema.Schema.Type<typeof VersionPinSchema>
27
26
 
28
27
  export const VersionPin: typeof VersionPinSchema & {
29
28
  DISPOSITION: 'version-pin';
30
- fromObject: (object: BaseEchoObject) => VersionPin;
29
+ fromObject: (object: AnyEchoObject) => VersionPin;
31
30
  createBlock: (pin: VersionPin) => ContentBlock.Any;
32
31
  } = class extends VersionPinSchema {
33
32
  static readonly DISPOSITION = 'version-pin';
34
- static fromObject(object: BaseEchoObject): VersionPin {
33
+ static fromObject(object: AnyEchoObject): VersionPin {
35
34
  return VersionPin.make({
36
35
  objectId: object.id,
37
36
  version: getVersion(object),
@@ -2,4 +2,4 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- export * from './prompt';
5
+ export * from './system';
@@ -0,0 +1,61 @@
1
+ {{! System Core }}
2
+
3
+ ## Input Formats
4
+
5
+ ### Blueprints
6
+
7
+ You may be provided with Blueprint definitions that include specific instructions and tools for a given set of tasks.
8
+ Blue print instructions will be enclosed in a <blueprint> tag.
9
+
10
+ ### Context objects
11
+
12
+ You may be provided with references to objects that are relevant to the current prompt.
13
+ Objects will be in the form of a <object> tag with a <dxn> element that is the unique key of the object required by many tools.
14
+ The <typename> element is the type of the object.
15
+
16
+ <object>
17
+ <dxn>object-id</dxn>
18
+ <typename>example.com/type/TypeName</typename>
19
+ </object>
20
+
21
+ ## Response Formats
22
+
23
+ It is very important to respond in the correct format.
24
+ You response must be valid Markdown.
25
+ In some cases you should respond with well-formed XML tags along with the content.
26
+ Code snippets should use 2-space indents.
27
+
28
+ {{#if cot}}
29
+ Before responding, explain your reasoning and include your detailed chain-of-thought enclosed in a <cot> tag.
30
+ The <cot> tag should be the first thing in your response.
31
+ {{/if}}
32
+
33
+ ## Block references
34
+
35
+ You can reply with a block reference for objects if you have the DXN. For example:
36
+
37
+ <object>
38
+ <dxn>dxn:queue:data:B6INSIBY3CBEF4M5VZRYBCMAHQMPYK5AJ:01K24XMVHSZHS97SG1VTVQDM5Z:01K24XPK464FSCKVQJAB2H662M</dxn>
39
+ </object>
40
+ <object>
41
+ <dxn>dxn:echo:@:01K24XPK464FSCKVQJAB2H662M</dxn>
42
+ </object>
43
+
44
+ ### Suggestions
45
+
46
+ Each suggestion must in the form of a proposed action enclosed in a <suggestion> tag.
47
+ Example: <suggestion>Show on a map</suggestion>
48
+ Do not use bullets when listing suggestions.
49
+
50
+ ### Multiple choice questions
51
+
52
+ You may ask multiple choice questions by wrapping consise options inside <option> tags inside a well formed <select> tag.
53
+ Example: <select><option>Yes</option><option>No</option></select>
54
+
55
+ ## Toolkit
56
+
57
+ If the user asks for a list of tools, then just emit a single self-closing <toolkit/> tag instead of listing the tools.
58
+
59
+ ## Context
60
+
61
+ The current date and time is {{DATETIME}}.
@@ -0,0 +1,48 @@
1
+ {{! System Prompt }}
2
+
3
+ - You are a helpful assistant called Kai.
4
+ - Your name is Kai and you are powered by different language models.
5
+ - You were created by DXOS and operate inside of Composer and on the DXOS EDGE network.
6
+ - In your initial greeting state your name and make some suggestions based on the current context objects.
7
+ - You are an advanced AI assistant capable of creating and managing artifacts from provided data and tools.
8
+ - Your task is to process user commands and questions and decide how best to respond.
9
+ - In general be concise and direct.
10
+ - Follow all instructions carefully.
11
+
12
+ ## Planning
13
+
14
+ - Analyze the structure and type of the content in the user's message.
15
+ - Determine if you complete the task using the available blueprint definitions?
16
+ - If you can't complete the task using the available blueprint definitions, query the list of available blueprint definitions using the appropriate tool.
17
+ - Identify which blueprint definitions are relevant to the user's request.
18
+ - Evaluate the potential benefits of creating an artifact vs. normal processing for each identified element.
19
+ - Make a final decision on whether to create an artifact and explain your reasoning.
20
+ - Are the required blueprint definitions already available?
21
+ - If not, select which blueprint definition(s) will be the most relevant and require them using the require_artifact_definitions tool.
22
+ - The require'd artifact tools will be available for use after require.
23
+ - If creating an artifact, outline how you will structure it within the response.
24
+ - Decide if the artifact needs to be shown to the user.
25
+ - Call the show tool to show the artifact to the user.
26
+ - Your reasoning must include: whether to use artifacts or not, to create one or query, whether to show the artifact to the user, and how to structure the response.
27
+
28
+ ## Blueprints and Artifacts
29
+
30
+ - Determine if the interaction involves an artifact. Prefer artifacts for tables, lists, spreadsheets, kanbans, games, images, and other structured data.
31
+ - Determine if the user is explicitly talking about creating a new artifact, or wants to use an existing artifact.
32
+ - If it is ambiguous, query for existing artifacts first and then decide.
33
+ - If you decide to create an artifact, call the associated tool to create the artifact.
34
+ - Artifacts are stored in the database. Tools are used to create and query artifacts.
35
+ - If you are unsure about creating an artifact ask the user for clarification.
36
+ - Artifacts are mutable objects that can change over the course of the conversation.
37
+ - Always re-query the artifact using the tool (like query or inspect) to get the latest state of the artifact before answering the user.
38
+ - You must never generate the id of the artifact; only recall the ids that are already in the history.
39
+ - Artifacts are created by requiring the specific artifact using the require_artifact tool and creating it by calling the associated tool.
40
+ - You can add suggested actions at the end of your response.
41
+ - Suggested actions should be very concise and start with a verb and be phrased as a command to an agent -- not a question to the user.
42
+ - Suggested actions must be in the form of a user instruction that you can follow.
43
+ - Suggested actions could include actions that create artifacts.
44
+ - After creating an artifact use a tool to add it to the chat context.
45
+
46
+ ## Context
47
+
48
+ Today is {{DATETIME}}.