@dxos/assistant 0.8.4-main.5ea62a8 → 0.8.4-main.66e292d

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 (117) hide show
  1. package/dist/lib/browser/chunk-J5LGTIGS.mjs +10 -0
  2. package/dist/lib/browser/extraction/index.mjs +122 -165
  3. package/dist/lib/browser/extraction/index.mjs.map +4 -4
  4. package/dist/lib/browser/index.mjs +980 -160
  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 +122 -165
  9. package/dist/lib/node-esm/extraction/index.mjs.map +4 -4
  10. package/dist/lib/node-esm/index.mjs +980 -160
  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/conversation/context.d.ts +47 -46
  14. package/dist/types/src/conversation/context.d.ts.map +1 -1
  15. package/dist/types/src/conversation/conversation.d.ts +11 -12
  16. package/dist/types/src/conversation/conversation.d.ts.map +1 -1
  17. package/dist/types/src/diff.d.ts.map +1 -1
  18. package/dist/types/src/errors.d.ts +38 -42
  19. package/dist/types/src/errors.d.ts.map +1 -1
  20. package/dist/types/src/execution-graph.d.ts +85 -0
  21. package/dist/types/src/execution-graph.d.ts.map +1 -0
  22. package/dist/types/src/execution-graph.test.d.ts +2 -0
  23. package/dist/types/src/execution-graph.test.d.ts.map +1 -0
  24. package/dist/types/src/extraction/extraction-llm-function/extraction-llm-function.d.ts +1 -1
  25. package/dist/types/src/extraction/extraction-llm-function/extraction-llm-function.d.ts.map +1 -1
  26. package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.d.ts +67 -55
  27. package/dist/types/src/extraction/extraction-ner-function/extraction-ner-function.d.ts.map +1 -1
  28. package/dist/types/src/extraction/extraction-ner-function/named-entity-recognition.d.ts.map +1 -1
  29. package/dist/types/src/extraction/extraction.d.ts +111 -110
  30. package/dist/types/src/extraction/extraction.d.ts.map +1 -1
  31. package/dist/types/src/extraction/quotes.d.ts +1 -1
  32. package/dist/types/src/extraction/quotes.d.ts.map +1 -1
  33. package/dist/types/src/functions/services.d.ts +18 -5
  34. package/dist/types/src/functions/services.d.ts.map +1 -1
  35. package/dist/types/src/index.d.ts +2 -1
  36. package/dist/types/src/index.d.ts.map +1 -1
  37. package/dist/types/src/session/GenericToolkit.d.ts +84 -0
  38. package/dist/types/src/session/GenericToolkit.d.ts.map +1 -0
  39. package/dist/types/src/session/artifact-diff.d.ts +2 -2
  40. package/dist/types/src/session/artifact-diff.d.ts.map +1 -1
  41. package/dist/types/src/session/error-handling.d.ts +2 -2
  42. package/dist/types/src/session/error-handling.d.ts.map +1 -1
  43. package/dist/types/src/session/format.d.ts +4 -174
  44. package/dist/types/src/session/format.d.ts.map +1 -1
  45. package/dist/types/src/session/index.d.ts +1 -0
  46. package/dist/types/src/session/index.d.ts.map +1 -1
  47. package/dist/types/src/session/observer.d.ts +3 -3
  48. package/dist/types/src/session/observer.d.ts.map +1 -1
  49. package/dist/types/src/session/session.d.ts +15 -11
  50. package/dist/types/src/session/session.d.ts.map +1 -1
  51. package/dist/types/src/session/toolkit.d.ts +7 -6
  52. package/dist/types/src/session/toolkit.d.ts.map +1 -1
  53. package/dist/types/src/session/version-pin.d.ts +4 -4
  54. package/dist/types/src/session/version-pin.d.ts.map +1 -1
  55. package/dist/types/src/types/artifact.d.ts +19 -0
  56. package/dist/types/src/types/artifact.d.ts.map +1 -0
  57. package/dist/types/src/types/index.d.ts +2 -0
  58. package/dist/types/src/types/index.d.ts.map +1 -0
  59. package/dist/types/tsconfig.tsbuildinfo +1 -1
  60. package/package.json +29 -32
  61. package/src/conversation/context.ts +54 -23
  62. package/src/conversation/conversation.ts +30 -25
  63. package/src/diff.test.ts +3 -3
  64. package/src/diff.ts +7 -0
  65. package/src/errors.ts +4 -4
  66. package/src/execution-graph.test.ts +740 -0
  67. package/src/execution-graph.ts +509 -0
  68. package/src/extraction/extraction-llm-function/extraction-llm-function.test.ts +9 -9
  69. package/src/extraction/extraction-llm-function/extraction-llm-function.ts +47 -55
  70. package/src/extraction/extraction-ner-function/extraction-ner-function.test.ts +17 -17
  71. package/src/extraction/extraction-ner-function/extraction-ner-function.ts +42 -43
  72. package/src/extraction/extraction-ner-function/named-entity-recognition.test.ts +12 -6
  73. package/src/extraction/extraction-ner-function/named-entity-recognition.ts +2 -0
  74. package/src/extraction/extraction.ts +8 -7
  75. package/src/extraction/quotes.test.ts +2 -2
  76. package/src/extraction/quotes.ts +3 -3
  77. package/src/functions/services.ts +93 -50
  78. package/src/index.ts +2 -1
  79. package/src/session/GenericToolkit.ts +130 -0
  80. package/src/session/artifact-diff.ts +2 -2
  81. package/src/session/error-handling.ts +11 -6
  82. package/src/session/format.test.ts +5 -4
  83. package/src/session/format.ts +19 -14
  84. package/src/session/index.ts +2 -0
  85. package/src/session/observer.ts +4 -3
  86. package/src/session/session.conversations.json +1 -0
  87. package/src/session/session.test.ts +51 -210
  88. package/src/session/session.ts +41 -29
  89. package/src/session/toolkit.ts +19 -13
  90. package/src/session/version-pin.ts +7 -7
  91. package/src/templates/{format.tpl → instructions/format.tpl} +4 -2
  92. package/src/templates/{system.tpl → instructions/system.tpl} +10 -12
  93. package/src/templates/system.ts +2 -2
  94. package/src/{types.ts → types/artifact.ts} +22 -4
  95. package/src/types/index.ts +5 -0
  96. package/dist/lib/browser/chunk-6WRGDEMH.mjs +0 -89
  97. package/dist/lib/browser/chunk-6WRGDEMH.mjs.map +0 -7
  98. package/dist/lib/browser/chunk-N4O3C3T5.mjs +0 -396
  99. package/dist/lib/browser/chunk-N4O3C3T5.mjs.map +0 -7
  100. package/dist/lib/browser/named-entity-recognition-O46UTCLR.mjs +0 -13
  101. package/dist/lib/node-esm/chunk-3UU5V4FS.mjs +0 -91
  102. package/dist/lib/node-esm/chunk-3UU5V4FS.mjs.map +0 -7
  103. package/dist/lib/node-esm/chunk-QVJ7EAM2.mjs +0 -398
  104. package/dist/lib/node-esm/chunk-QVJ7EAM2.mjs.map +0 -7
  105. package/dist/lib/node-esm/named-entity-recognition-W4VMRCH6.mjs +0 -14
  106. package/dist/types/src/session/version-pin.test.d.ts +0 -2
  107. package/dist/types/src/session/version-pin.test.d.ts.map +0 -1
  108. package/dist/types/src/summarization/summarization.test.d.ts +0 -2
  109. package/dist/types/src/summarization/summarization.test.d.ts.map +0 -1
  110. package/dist/types/src/types.d.ts +0 -16
  111. package/dist/types/src/types.d.ts.map +0 -1
  112. package/src/session/__snapshots__/session.test.ts.snap +0 -32
  113. package/src/session/version-pin.test.ts +0 -7
  114. package/src/summarization/summarization.test.ts +0 -197
  115. /package/dist/lib/browser/{named-entity-recognition-O46UTCLR.mjs.map → chunk-J5LGTIGS.mjs.map} +0 -0
  116. /package/dist/lib/node-esm/{named-entity-recognition-W4VMRCH6.mjs.map → chunk-HSLMI22Q.mjs.map} +0 -0
  117. /package/src/extraction/extraction-llm-function/{instructions.tpl → transcription-instructions.tpl} +0 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@dxos/assistant",
3
- "version": "0.8.4-main.5ea62a8",
3
+ "version": "0.8.4-main.66e292d",
4
4
  "description": "Natural language interface to DXOS",
5
5
  "homepage": "https://dxos.org",
6
6
  "bugs": "https://github.com/dxos/dxos/issues",
@@ -38,41 +38,38 @@
38
38
  "src"
39
39
  ],
40
40
  "dependencies": {
41
- "@automerge/automerge": "3.1.1",
42
- "@effect/ai": "0.25.2",
43
- "@effect/ai-anthropic": "^0.16.1",
44
- "@effect/platform": "^0.90.2",
45
- "@effect/platform-node": "^0.95.0",
46
- "@preact/signals-core": "^1.9.0",
41
+ "@automerge/automerge": "3.1.2",
42
+ "@effect/ai": "0.29.1",
43
+ "@effect/experimental": "0.56.0",
44
+ "@effect/platform": "^0.92.1",
45
+ "@preact/signals-core": "^1.12.1",
47
46
  "@xenova/transformers": "^2.17.2",
48
- "chalk": "^4.1.0",
49
- "handlebars": "4.7.8",
50
47
  "lodash.defaultsdeep": "^4.6.1",
51
- "@dxos/async": "0.8.4-main.5ea62a8",
52
- "@dxos/blueprints": "0.8.4-main.5ea62a8",
53
- "@dxos/context": "0.8.4-main.5ea62a8",
54
- "@dxos/ai": "0.8.4-main.5ea62a8",
55
- "@dxos/debug": "0.8.4-main.5ea62a8",
56
- "@dxos/echo": "0.8.4-main.5ea62a8",
57
- "@dxos/echo-db": "0.8.4-main.5ea62a8",
58
- "@dxos/effect": "0.8.4-main.5ea62a8",
59
- "@dxos/echo-schema": "0.8.4-main.5ea62a8",
60
- "@dxos/echo-protocol": "0.8.4-main.5ea62a8",
61
- "@dxos/errors": "0.8.4-main.5ea62a8",
62
- "@dxos/functions": "0.8.4-main.5ea62a8",
63
- "@dxos/invariant": "0.8.4-main.5ea62a8",
64
- "@dxos/keys": "0.8.4-main.5ea62a8",
65
- "@dxos/graph": "0.8.4-main.5ea62a8",
66
- "@dxos/live-object": "0.8.4-main.5ea62a8",
67
- "@dxos/log": "0.8.4-main.5ea62a8",
68
- "@dxos/node-std": "0.8.4-main.5ea62a8",
69
- "@dxos/schema": "0.8.4-main.5ea62a8",
70
- "@dxos/util": "0.8.4-main.5ea62a8"
48
+ "@dxos/ai": "0.8.4-main.66e292d",
49
+ "@dxos/blueprints": "0.8.4-main.66e292d",
50
+ "@dxos/async": "0.8.4-main.66e292d",
51
+ "@dxos/context": "0.8.4-main.66e292d",
52
+ "@dxos/debug": "0.8.4-main.66e292d",
53
+ "@dxos/echo-db": "0.8.4-main.66e292d",
54
+ "@dxos/echo": "0.8.4-main.66e292d",
55
+ "@dxos/echo-protocol": "0.8.4-main.66e292d",
56
+ "@dxos/functions": "0.8.4-main.66e292d",
57
+ "@dxos/errors": "0.8.4-main.66e292d",
58
+ "@dxos/functions-runtime": "0.8.4-main.66e292d",
59
+ "@dxos/graph": "0.8.4-main.66e292d",
60
+ "@dxos/invariant": "0.8.4-main.66e292d",
61
+ "@dxos/effect": "0.8.4-main.66e292d",
62
+ "@dxos/keys": "0.8.4-main.66e292d",
63
+ "@dxos/live-object": "0.8.4-main.66e292d",
64
+ "@dxos/node-std": "0.8.4-main.66e292d",
65
+ "@dxos/schema": "0.8.4-main.66e292d",
66
+ "@dxos/log": "0.8.4-main.66e292d",
67
+ "@dxos/types": "0.8.4-main.66e292d",
68
+ "@dxos/util": "0.8.4-main.66e292d"
71
69
  },
72
70
  "devDependencies": {
73
71
  "@types/lodash.defaultsdeep": "^4.6.6",
74
- "effect": "3.17.7",
75
- "inquirer": "^12.0.0"
72
+ "effect": "3.18.3"
76
73
  },
77
74
  "peerDependencies": {
78
75
  "effect": "^3.13.3"
@@ -82,6 +79,6 @@
82
79
  },
83
80
  "beast": {},
84
81
  "scripts": {
85
- "run:chat": "tsx ./bin/chat.ts"
82
+ "run:chat": "vite-node ./bin/chat.ts"
86
83
  }
87
84
  }
@@ -3,12 +3,16 @@
3
3
  //
4
4
 
5
5
  import { type ReadonlySignal, computed } from '@preact/signals-core';
6
- import { Context, Schema } from 'effect';
7
- import { Array, pipe } from 'effect';
6
+ import * as Array from 'effect/Array';
7
+ import * as Context from 'effect/Context';
8
+ import * as Function from 'effect/Function';
9
+ import * as Schema from 'effect/Schema';
8
10
 
9
11
  import { Blueprint } from '@dxos/blueprints';
10
- import { DXN, Obj, type Ref, type Relation, Type } from '@dxos/echo';
12
+ import { Resource } from '@dxos/context';
13
+ import { DXN, type Entity, Filter, Obj, Query, type Ref, Type } from '@dxos/echo';
11
14
  import { type Queue } from '@dxos/echo-db';
15
+ import { invariant } from '@dxos/invariant';
12
16
  import { ComplexSet } from '@dxos/util';
13
17
 
14
18
  /**
@@ -21,10 +25,9 @@ export const ContextBinding = Schema.Struct({
21
25
  removed: Schema.Array(Type.Ref(Blueprint.Blueprint)),
22
26
  }),
23
27
 
24
- // TODO(burdon): Type.Expando => Type.Obj (or Obj.Any?)
25
28
  objects: Schema.Struct({
26
- added: Schema.Array(Type.Ref(Type.Expando)),
27
- removed: Schema.Array(Type.Ref(Type.Expando)),
29
+ added: Schema.Array(Type.Ref(Obj.Any)),
30
+ removed: Schema.Array(Type.Ref(Obj.Any)),
28
31
  }),
29
32
  }).pipe(
30
33
  Type.Obj({
@@ -37,13 +40,13 @@ export interface ContextBinding extends Schema.Schema.Type<typeof ContextBinding
37
40
 
38
41
  export type BindingProps = Partial<{
39
42
  blueprints: Ref.Ref<Blueprint.Blueprint>[];
40
- objects: Ref.Ref<Type.Expando>[];
43
+ objects: Ref.Ref<Obj.Any>[];
41
44
  }>;
42
45
 
43
46
  export class Bindings {
44
47
  readonly blueprints = new ComplexSet<Ref.Ref<Blueprint.Blueprint>>((ref) => ref.dxn.toString());
45
48
  // TODO(burdon): Some DXNs have the Space prefix so only compare the object ID.
46
- readonly objects = new ComplexSet<Ref.Ref<Type.Expando>>((ref) => ref.dxn.asEchoDXN()?.echoId);
49
+ readonly objects = new ComplexSet<Ref.Ref<Obj.Any>>((ref) => ref.dxn.asEchoDXN()?.echoId);
47
50
 
48
51
  toJSON() {
49
52
  return {
@@ -57,41 +60,69 @@ export class Bindings {
57
60
  * Manages bindings of blueprints and objects to a conversation.
58
61
  */
59
62
  // TODO(burdon): Context should manage ephemeral state of bindings until prompt is issued?
60
- export class AiContextBinder {
63
+ export class AiContextBinder extends Resource {
61
64
  /**
62
65
  * Reactive query of all bindings.
63
66
  */
64
67
  // TODO(burdon): Cache value?
65
- readonly bindings: ReadonlySignal<Bindings> = computed(() => this._reduce(this._queue.objects));
68
+ private _bindings?: ReadonlySignal<Bindings>;
69
+ private _blueprints?: ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]>;
70
+ private _objects?: ReadonlySignal<Ref.Ref<Obj.Any>[]>;
66
71
 
67
- readonly blueprints: ReadonlySignal<Ref.Ref<Blueprint.Blueprint>[]> = computed(() => [
68
- ...this.bindings.value.blueprints,
69
- ]);
72
+ constructor(private readonly _queue: Queue) {
73
+ super();
74
+ }
75
+
76
+ get bindings() {
77
+ invariant(this._bindings, 'AiContextBinder not open');
78
+ return this._bindings;
79
+ }
80
+
81
+ get blueprints() {
82
+ invariant(this._blueprints, 'AiContextBinder not open');
83
+ return this._blueprints;
84
+ }
85
+
86
+ get objects() {
87
+ invariant(this._objects, 'AiContextBinder not open');
88
+ return this._objects;
89
+ }
70
90
 
71
- readonly objects: ReadonlySignal<Ref.Ref<Type.Expando>[]> = computed(() => [...this.bindings.value.objects]);
91
+ // TODO(wittjosiah): Use parent context?
92
+ protected override async _open(): Promise<void> {
93
+ const query = this._queue.query(Query.select(Filter.everything()));
94
+ this._ctx.onDispose(query.subscribe(() => {}));
95
+ this._bindings = computed(() => this._reduce(query.objects));
96
+ this._blueprints = computed(() => [...this.bindings.value.blueprints]);
97
+ this._objects = computed(() => [...this.bindings.value.objects]);
98
+ }
72
99
 
73
- constructor(private readonly _queue: Queue) {}
100
+ protected override async _close(): Promise<void> {
101
+ this._bindings = undefined;
102
+ this._blueprints = undefined;
103
+ this._objects = undefined;
104
+ }
74
105
 
75
106
  /**
76
107
  * Asynchronous query of all bindings.
77
108
  */
78
109
  async query(): Promise<Bindings> {
79
- const queueItems = await this._queue.queryObjects();
80
- return this._reduce(queueItems);
110
+ const { objects } = await this._queue.query(Query.select(Filter.everything())).run();
111
+ return this._reduce(objects);
81
112
  }
82
113
 
83
114
  // TODO(burdon): Pass in Blueprint obj (from registry?) and create reference.
84
115
  async bind(props: BindingProps): Promise<void> {
85
- if (!props.blueprints?.length && !props.objects?.length) {
86
- return;
87
- }
88
-
89
116
  const blueprints =
90
117
  props.blueprints?.filter((ref) => !this.blueprints.peek().find((b) => b.dxn.toString() === ref.dxn.toString())) ??
91
118
  [];
92
119
  const objects =
93
120
  props.objects?.filter((ref) => !this.objects.peek().find((o) => o.dxn.toString() === ref.dxn.toString())) ?? [];
94
121
 
122
+ if (!blueprints.length && !objects.length) {
123
+ return;
124
+ }
125
+
95
126
  await this._queue.append([
96
127
  Obj.make(ContextBinding, {
97
128
  blueprints: {
@@ -125,8 +156,8 @@ export class AiContextBinder {
125
156
  ]);
126
157
  }
127
158
 
128
- private _reduce(items: (Obj.Any | Relation.Any)[]): Bindings {
129
- return pipe(
159
+ private _reduce(items: Entity.Unknown[]): Bindings {
160
+ return Function.pipe(
130
161
  items,
131
162
  Array.filter(Obj.instanceOf(ContextBinding)),
132
163
  Array.reduce(new Bindings(), (context, item) => {
@@ -2,14 +2,17 @@
2
2
  // Copyright 2025 DXOS.org
3
3
  //
4
4
 
5
- import { type AiTool, type AiToolkit } from '@effect/ai';
6
- import { Array, Effect, Option } from 'effect';
5
+ import type * as Toolkit from '@effect/ai/Toolkit';
6
+ import * as Array from 'effect/Array';
7
+ import * as Effect from 'effect/Effect';
8
+ import * as Option from 'effect/Option';
7
9
 
10
+ import { Resource } from '@dxos/context';
8
11
  import { Obj } from '@dxos/echo';
9
12
  import { type Queue } from '@dxos/echo-db';
10
- import { DatabaseService } from '@dxos/functions';
13
+ import { DatabaseService } from '@dxos/echo-db';
11
14
  import { log } from '@dxos/log';
12
- import { DataType } from '@dxos/schema';
15
+ import { Message } from '@dxos/types';
13
16
 
14
17
  import {
15
18
  AiSession,
@@ -21,29 +24,21 @@ import {
21
24
 
22
25
  import { AiContextBinder, AiContextService, type ContextBinding } from './context';
23
26
 
24
- export type AiConversationRunRequirements<Tools extends AiTool.Any> =
25
- | AiSessionRunRequirements
26
- | AiTool.ToHandler<Tools>;
27
-
28
27
  export interface AiConversationRunParams {
29
28
  prompt: string;
30
29
  system?: string;
31
30
  observer?: GenerationObserver;
32
31
  }
33
32
 
34
- export type AiConversationOptions = {
35
- queue: Queue<DataType.Message | ContextBinding>;
36
- };
37
-
38
33
  /**
39
34
  * Durable conversation state (initiated by users and agents) backed by a Queue.
40
35
  * Executes tools based on AI responses and supports cancellation of in-progress requests.
41
36
  */
42
- export class AiConversation {
37
+ export class AiConversation extends Resource {
43
38
  /**
44
39
  * Message and binding queue.
45
40
  */
46
- private readonly _queue: Queue<DataType.Message | ContextBinding>;
41
+ private readonly _queue: Queue<Message.Message | ContextBinding>;
47
42
 
48
43
  /**
49
44
  * Blueprints bound to the conversation.
@@ -53,13 +48,23 @@ export class AiConversation {
53
48
  /**
54
49
  * Toolkit from the current session request.
55
50
  */
56
- private _toolkit: AiToolkit.ToHandler<AiTool.Any> | undefined;
51
+ private _toolkit: Toolkit.WithHandler<any> | undefined;
57
52
 
58
- public constructor(options: AiConversationOptions) {
59
- this._queue = options.queue;
53
+ public constructor(queue: Queue<Message.Message | ContextBinding>) {
54
+ super();
55
+ this._queue = queue;
60
56
  this._context = new AiContextBinder(this._queue);
61
57
  }
62
58
 
59
+ protected override async _open(): Promise<void> {
60
+ // TODO(wittjosiah): Pass in parent context?
61
+ await this._context.open();
62
+ }
63
+
64
+ protected override async _close(): Promise<void> {
65
+ await this._context.close();
66
+ }
67
+
63
68
  public get context() {
64
69
  return this._context;
65
70
  }
@@ -68,17 +73,17 @@ export class AiConversation {
68
73
  return this._toolkit;
69
74
  }
70
75
 
71
- public async getHistory(): Promise<DataType.Message[]> {
76
+ public async getHistory(): Promise<Message.Message[]> {
72
77
  const queueItems = await this._queue.queryObjects();
73
- return queueItems.filter(Obj.instanceOf(DataType.Message));
78
+ return queueItems.filter(Obj.instanceOf(Message.Message));
74
79
  }
75
80
 
76
81
  /**
77
82
  * Creates a new cancelable request effect.
78
83
  */
79
- createRequest<Tools extends AiTool.Any>(
84
+ createRequest(
80
85
  params: AiConversationRunParams,
81
- ): Effect.Effect<DataType.Message[], AiSessionRunError, AiConversationRunRequirements<Tools>> {
86
+ ): Effect.Effect<Message.Message[], AiSessionRunError, AiSessionRunRequirements> {
82
87
  return Effect.gen(this, function* () {
83
88
  const session = new AiSession();
84
89
  const history = yield* Effect.promise(() => this.getHistory());
@@ -95,11 +100,11 @@ export class AiConversation {
95
100
  );
96
101
 
97
102
  // Create toolkit.
98
- const toolkit = yield* createToolkit<Tools>({ blueprints });
103
+ const toolkit = yield* createToolkit({ blueprints });
99
104
  this._toolkit = toolkit;
100
105
 
101
106
  const start = Date.now();
102
- log.info('run', {
107
+ log('run', {
103
108
  history: history.length,
104
109
  blueprints: blueprints.length,
105
110
  objects: objects.length,
@@ -107,13 +112,13 @@ export class AiConversation {
107
112
  });
108
113
 
109
114
  // Process request.
110
- const messages = yield* session.run<Tools>({ history, blueprints, objects, toolkit, ...params }).pipe(
115
+ const messages = yield* session.run({ history, blueprints, objects, toolkit, ...params }).pipe(
111
116
  Effect.provideService(AiContextService, {
112
117
  binder: this.context,
113
118
  }),
114
119
  );
115
120
 
116
- log.info('result', { messages: messages.length, duration: Date.now() - start });
121
+ log('result', { messages: messages.length, duration: Date.now() - start });
117
122
 
118
123
  // Append to queue.
119
124
  yield* Effect.promise(() => this._queue.append(messages));
package/src/diff.test.ts CHANGED
@@ -6,7 +6,7 @@ import { describe, expect, it } from 'vitest';
6
6
 
7
7
  import { createDocAccessor } from '@dxos/echo-db';
8
8
  import { EchoTestBuilder } from '@dxos/echo-db/testing';
9
- import { DataType } from '@dxos/schema';
9
+ import { Text } from '@dxos/schema';
10
10
  import { trim } from '@dxos/util';
11
11
 
12
12
  import { applyDiffs } from './diff';
@@ -15,7 +15,7 @@ describe('diff', () => {
15
15
  it('should apply diffs', async () => {
16
16
  const builder = new EchoTestBuilder();
17
17
  const { db, graph } = await builder.createDatabase();
18
- graph.schemaRegistry.addSchema([DataType.Text]);
18
+ graph.schemaRegistry.addSchema([Text.Text]);
19
19
 
20
20
  const document = trim`
21
21
  # Hello World
@@ -24,7 +24,7 @@ describe('diff', () => {
24
24
  But not this one.
25
25
  `;
26
26
 
27
- const text = db.add(DataType.makeText(document));
27
+ const text = db.add(Text.make(document));
28
28
  const accessor = createDocAccessor(text, ['content']);
29
29
  const result = applyDiffs(accessor, [
30
30
  `- There'z a typo in this sentence.`,
package/src/diff.ts CHANGED
@@ -11,6 +11,13 @@ import { isNonNullable } from '@dxos/util';
11
11
  // Relevant info:
12
12
  // https://github.com/Minahil-official/GPT-4.1-Promting-Guide?tab=readme-ov-file#-apply-patch-tool-format-v4a-diff
13
13
 
14
+ // TODO(burdon): Anthropic only.
15
+ // https://docs.anthropic.com/en/docs/agents-and-tools/tool-use/text-editor-tool#example-str-replace-command
16
+ // AI_TOOL_NOT_FOUND: str_replace_based_edit_tool
17
+ // 'str_replace_based_edit_tool',
18
+
19
+ // TOOD(burdon): Support append to end (no "-").
20
+
14
21
  export type Diff = {
15
22
  match: string;
16
23
  replace: string;
package/src/errors.ts CHANGED
@@ -5,11 +5,11 @@
5
5
  import { BaseError } from '@dxos/errors';
6
6
 
7
7
  /**
8
- * Generic error for AI agent execution.
8
+ * Generic error from AI model.
9
9
  */
10
- export class AiAssistantError extends BaseError.extend('AI_ASSISTANT_ERROR') {}
10
+ export class AiModelError extends BaseError.extend('AI_MODEL_ERROR', 'AI model error') {}
11
11
 
12
12
  /**
13
- * Parsed error from the anthropic API.
13
+ * Generic error for AI agent execution.
14
14
  */
15
- export class AnthropicError extends BaseError.extend('ANTHROPIC_ERROR') {}
15
+ export class AiAssistantError extends BaseError.extend('AI_ASSISTANT_ERROR', 'AI assistant error') {}