clanka 0.25.2 → 0.26.0

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 (55) hide show
  1. package/dist/Acp.d.ts +5 -37
  2. package/dist/Acp.d.ts.map +1 -1
  3. package/dist/Acp.js +33 -48
  4. package/dist/Acp.js.map +1 -1
  5. package/dist/Acp.test.js +62 -1
  6. package/dist/Acp.test.js.map +1 -1
  7. package/dist/AcpImage.test.js +3 -2
  8. package/dist/AcpImage.test.js.map +1 -1
  9. package/dist/AcpSessionStore.d.ts +114 -0
  10. package/dist/AcpSessionStore.d.ts.map +1 -0
  11. package/dist/AcpSessionStore.js +327 -0
  12. package/dist/AcpSessionStore.js.map +1 -0
  13. package/dist/AcpSessionStore.test.d.ts +2 -0
  14. package/dist/AcpSessionStore.test.d.ts.map +1 -0
  15. package/dist/AcpSessionStore.test.js +135 -0
  16. package/dist/AcpSessionStore.test.js.map +1 -0
  17. package/dist/Agent.d.ts.map +1 -1
  18. package/dist/Agent.js +5 -1
  19. package/dist/Agent.js.map +1 -1
  20. package/dist/Agent.test.js +20 -0
  21. package/dist/Agent.test.js.map +1 -1
  22. package/dist/ScriptFormatting.d.ts +3 -0
  23. package/dist/ScriptFormatting.d.ts.map +1 -0
  24. package/dist/ScriptFormatting.js +61 -0
  25. package/dist/ScriptFormatting.js.map +1 -0
  26. package/dist/ScriptFormatting.test.d.ts +2 -0
  27. package/dist/ScriptFormatting.test.d.ts.map +1 -0
  28. package/dist/ScriptFormatting.test.js +60 -0
  29. package/dist/ScriptFormatting.test.js.map +1 -0
  30. package/dist/bin/{AiError-CsvdOsKR.mjs → AiError-DBaKz35C.mjs} +2 -2
  31. package/dist/bin/{Latch-B3e9629m.mjs → Latch-DOdbsGMQ.mjs} +1 -1
  32. package/dist/bin/{McpClient-BCxZZgnA.mjs → McpClient-B-FFG6Pg.mjs} +1 -1
  33. package/dist/bin/{OutputFormatter-ByMjyBhe.mjs → OutputFormatter-DhhP2i-7.mjs} +2 -2
  34. package/dist/bin/{Schema-BfUmMefy.mjs → Schema-CFdSO6iH.mjs} +11 -1
  35. package/dist/bin/{SemanticSearch-DMzIsoZb.mjs → SemanticSearch-C3a7LAQr.mjs} +6 -6
  36. package/dist/bin/cli.mjs +392 -143
  37. package/dist/bin/{upgrade-t590zYhO.mjs → upgrade-C4aOEWJH.mjs} +2 -2
  38. package/dist/cli.js +10 -3
  39. package/dist/cli.js.map +1 -1
  40. package/dist/index.d.ts +4 -0
  41. package/dist/index.d.ts.map +1 -1
  42. package/dist/index.js +4 -0
  43. package/dist/index.js.map +1 -1
  44. package/package.json +1 -1
  45. package/src/Acp.test.ts +120 -1
  46. package/src/Acp.ts +41 -55
  47. package/src/AcpImage.test.ts +7 -2
  48. package/src/AcpSessionStore.test.ts +220 -0
  49. package/src/AcpSessionStore.ts +455 -0
  50. package/src/Agent.test.ts +36 -0
  51. package/src/Agent.ts +5 -1
  52. package/src/ScriptFormatting.test.ts +66 -0
  53. package/src/ScriptFormatting.ts +57 -0
  54. package/src/cli.ts +20 -9
  55. package/src/index.ts +5 -0
@@ -0,0 +1,327 @@
1
+ /** @effect-diagnostics schemaNumber:off */
2
+ /**
3
+ * Storage for ACP sessions, so `session/load` works across processes.
4
+ *
5
+ * `layerFileSystem` keeps each session in an append-only file. A write adds
6
+ * one line holding what changed since the last write, and rewrites the file
7
+ * only when the history was replaced, for example by compaction.
8
+ *
9
+ * @since 1.0.0
10
+ */
11
+ import * as Context from "effect/Context";
12
+ import * as Effect from "effect/Effect";
13
+ import * as FileSystem from "effect/FileSystem";
14
+ import * as Layer from "effect/Layer";
15
+ import * as Option from "effect/Option";
16
+ import * as Path from "effect/Path";
17
+ import * as Schema from "effect/Schema";
18
+ import * as Semaphore from "effect/Semaphore";
19
+ import * as Prompt from "effect/ai/Prompt";
20
+ import * as KeyValueStore from "effect/persistence/KeyValueStore";
21
+ import * as AgentExecutor from "./AgentExecutor.js";
22
+ /**
23
+ * Reasoning effort levels offered through the ACP `thought_level` config
24
+ * option.
25
+ *
26
+ * @since 1.0.0
27
+ * @category Models
28
+ */
29
+ export const ThoughtLevel = Schema.Literals([
30
+ "none",
31
+ "minimal",
32
+ "low",
33
+ "medium",
34
+ "high",
35
+ "xhigh",
36
+ "max",
37
+ ]);
38
+ /**
39
+ * @since 1.0.0
40
+ * @category Models
41
+ */
42
+ export class SessionRecord extends Schema.Class("clanka/Acp/SessionRecord")({
43
+ cwd: Schema.String,
44
+ model: Schema.String,
45
+ thoughtLevel: ThoughtLevel,
46
+ /**
47
+ * The session's fast mode setting. It is kept across model switches and
48
+ * applies while the session model supports fast mode.
49
+ */
50
+ fastMode: Schema.optionalKey(Schema.Boolean),
51
+ history: Prompt.Prompt,
52
+ /**
53
+ * The agent's executor environment, such as its working directory.
54
+ */
55
+ environment: Schema.optionalKey(AgentExecutor.ExecutionEnvironment),
56
+ }) {
57
+ }
58
+ /**
59
+ * @since 1.0.0
60
+ * @category Errors
61
+ */
62
+ export class AcpSessionStoreError extends Schema.TaggedError()("AcpSessionStoreError", {
63
+ message: Schema.String,
64
+ cause: Schema.optional(Schema.Defect()),
65
+ }) {
66
+ }
67
+ /**
68
+ * @since 1.0.0
69
+ * @category Services
70
+ */
71
+ export class AcpSessionStore extends Context.Service()("clanka/AcpSessionStore") {
72
+ }
73
+ const keyValueStore = (kvs) => {
74
+ const store = KeyValueStore.toSchemaStore(KeyValueStore.prefix(kvs, "session-"), SessionRecord);
75
+ return AcpSessionStore.of({
76
+ get: (sessionId) => store
77
+ .get(sessionId)
78
+ .pipe(Effect.mapError((cause) => new AcpSessionStoreError({ message: cause.message, cause }))),
79
+ set: (sessionId, record) => store
80
+ .set(sessionId, record)
81
+ .pipe(Effect.mapError((cause) => new AcpSessionStoreError({ message: cause.message, cause }))),
82
+ });
83
+ };
84
+ /**
85
+ * Stores each session as one record under `session-<id>` in the
86
+ * KeyValueStore, rewritten whole on every write.
87
+ *
88
+ * @since 1.0.0
89
+ * @category Layers
90
+ */
91
+ export const layerKeyValueStore = Layer.effect(AcpSessionStore, Effect.gen(function* () {
92
+ return keyValueStore(yield* KeyValueStore.KeyValueStore);
93
+ }));
94
+ // One line of a session file. A file starts with a `Snapshot`, and each
95
+ // `Update` after it holds what changed since the line its `parent` names.
96
+ // Every line has a random `id`, encoded last so the end of a file names the
97
+ // line that ends it.
98
+ const Snapshot = Schema.TaggedStruct("Snapshot", {
99
+ record: SessionRecord,
100
+ id: Schema.String,
101
+ });
102
+ const Update = Schema.TaggedStruct("Update", {
103
+ cwd: Schema.optionalKey(Schema.String),
104
+ model: Schema.optionalKey(Schema.String),
105
+ thoughtLevel: Schema.optionalKey(ThoughtLevel),
106
+ fastMode: Schema.optionalKey(Schema.Boolean),
107
+ environment: Schema.optionalKey(AgentExecutor.ExecutionEnvironment),
108
+ /** Messages appended to the history. */
109
+ messages: Schema.optionalKey(Schema.Array(Prompt.Message)),
110
+ parent: Schema.String,
111
+ id: Schema.String,
112
+ });
113
+ const Entry = Schema.Union([Snapshot, Update]);
114
+ const EntryJson = Schema.fromJsonString(Schema.toCodecJson(Entry));
115
+ const decodeEntry = Schema.decodeExit(EntryJson);
116
+ const encodeEntry = Schema.encodeEffect(EntryJson);
117
+ const fieldKeys = [
118
+ "cwd",
119
+ "model",
120
+ "thoughtLevel",
121
+ "fastMode",
122
+ "environment",
123
+ ];
124
+ const applyUpdate = (record, update) => {
125
+ const { _tag, messages, parent: _parent, id: _id, ...fields } = update;
126
+ return new SessionRecord({
127
+ ...record,
128
+ ...fields,
129
+ history: messages === undefined
130
+ ? record.history
131
+ : Prompt.fromMessages([...record.history.content, ...messages]),
132
+ });
133
+ };
134
+ // What changed from `previous` to `next`, or `undefined` when only a
135
+ // snapshot can express it: the history was not appended to, or a field was
136
+ // removed.
137
+ const diff = (previous, next) => {
138
+ const before = previous.history.content;
139
+ const after = next.history.content;
140
+ if (after.length < before.length ||
141
+ before.some((message, index) => after[index] !== message)) {
142
+ return undefined;
143
+ }
144
+ const changes = {};
145
+ for (const key of fieldKeys) {
146
+ if (previous[key] === next[key])
147
+ continue;
148
+ if (next[key] === undefined)
149
+ return undefined;
150
+ changes[key] = next[key];
151
+ }
152
+ if (after.length > before.length) {
153
+ changes.messages = after.slice(before.length);
154
+ }
155
+ return changes;
156
+ };
157
+ const storeError = (message) => (cause) => new AcpSessionStoreError({ message, cause });
158
+ const encodeLine = (entry) => encodeEntry(entry).pipe(Effect.map((json) => encoder.encode(`${json}\n`)), Effect.mapError(storeError("Failed to encode session")));
159
+ const newline = 0x0a;
160
+ // Enough of the end of a file to hold the `id` of its last line.
161
+ const tailLength = 64;
162
+ const encoder = new TextEncoder();
163
+ const decoder = new TextDecoder();
164
+ /**
165
+ * Stores each session in an append-only file, `<directory>/<id>.jsonl`.
166
+ *
167
+ * The first line is a snapshot of the session, and each later line holds the
168
+ * fields and history messages added to the line it names as its parent. A
169
+ * write that cannot be expressed as an addition, such as a compacted history,
170
+ * writes a new file and renames it over the old one.
171
+ *
172
+ * Loading follows the chain of lines from the snapshot and skips any line
173
+ * whose parent is not the line before it in the chain, so it always returns a
174
+ * record exactly as one `set` stored it, never a mix of two:
175
+ *
176
+ * - A process killed while appending can leave an incomplete last line, which
177
+ * loading ignores. The next write replaces the file.
178
+ * - Writes through one layer are serialized. Across layers and processes
179
+ * there is no lock, and only one process may write a session at a time, as
180
+ * when a client kills one process and loads the session in the next.
181
+ * - Every write first checks that the file is what this layer last read or
182
+ * wrote, and writes a whole snapshot when it is not. A process that takes
183
+ * over a session therefore replaces whatever an earlier owner wrote after
184
+ * it last loaded the session.
185
+ * - Writes from processes that do overlap are not ordered: which one a later
186
+ * load returns is unspecified, and the others can be lost. The next write
187
+ * from each of them is a snapshot.
188
+ *
189
+ * @since 1.0.0
190
+ * @category Layers
191
+ */
192
+ export const layerFileSystem = (directory) => Layer.effect(AcpSessionStore, Effect.gen(function* () {
193
+ const fs = yield* FileSystem.FileSystem;
194
+ const path = yield* Path.Path;
195
+ yield* fs.makeDirectory(directory, { recursive: true });
196
+ const semaphore = yield* Semaphore.make(1);
197
+ // What this layer last read or wrote in each file: the record its chain
198
+ // adds up to, the id of the chain's last line, and the file's length and
199
+ // last bytes. A file that is no longer exactly this gets a snapshot.
200
+ const files = new Map();
201
+ const fileFor = (sessionId) => path.join(directory, `${encodeURIComponent(sessionId)}.jsonl`);
202
+ const read = Effect.fnUntraced(function* (sessionId) {
203
+ const file = fileFor(sessionId);
204
+ files.delete(sessionId);
205
+ const result = yield* fs.readFile(file).pipe(Effect.asSome, Effect.catchReason("PlatformError", "NotFound", () => Effect.succeedNone), Effect.mapError(storeError(`Failed to read session ${sessionId}`)));
206
+ if (Option.isNone(result))
207
+ return Option.none();
208
+ const bytes = result.value;
209
+ let record;
210
+ let id = "";
211
+ let start = 0;
212
+ while (start < bytes.length) {
213
+ const end = bytes.indexOf(newline, start);
214
+ // An incomplete last line: the append writing it was cut short.
215
+ if (end === -1)
216
+ break;
217
+ const entry = decodeEntry(decoder.decode(bytes.subarray(start, end)));
218
+ start = end + 1;
219
+ if (entry._tag === "Failure")
220
+ continue;
221
+ const line = entry.value;
222
+ if (line._tag === "Snapshot") {
223
+ if (record !== undefined)
224
+ continue;
225
+ record = line.record;
226
+ }
227
+ else {
228
+ // Written by a process that did not know the file ended here.
229
+ if (record === undefined || line.parent !== id)
230
+ continue;
231
+ record = applyUpdate(record, line);
232
+ }
233
+ id = line.id;
234
+ }
235
+ if (record === undefined) {
236
+ return yield* new AcpSessionStoreError({
237
+ message: `Session file for ${sessionId} does not start with a snapshot`,
238
+ });
239
+ }
240
+ if (start < bytes.length) {
241
+ yield* Effect.logWarning("Ignoring an incomplete end of an ACP session file").pipe(Effect.annotateLogs({ sessionId, file }));
242
+ }
243
+ else {
244
+ files.set(sessionId, {
245
+ record,
246
+ id,
247
+ size: bytes.length,
248
+ tail: bytes.slice(-tailLength),
249
+ });
250
+ }
251
+ return Option.some(record);
252
+ });
253
+ // Writes the whole record to a new file, then renames it over the old
254
+ // one, so a reader sees either file complete.
255
+ const writeSnapshot = Effect.fnUntraced(function* (sessionId, record) {
256
+ const file = fileFor(sessionId);
257
+ const temporary = `${file}.${crypto.randomUUID()}.tmp`;
258
+ const id = crypto.randomUUID();
259
+ const bytes = yield* encodeLine(Snapshot.make({ record, id }));
260
+ files.delete(sessionId);
261
+ yield* fs.writeFile(temporary, bytes).pipe(Effect.andThen(fs.rename(temporary, file)), Effect.onError(() => Effect.ignore(fs.remove(temporary, { force: true }))), Effect.mapError(storeError(`Failed to write session ${sessionId}`)));
262
+ files.set(sessionId, {
263
+ record,
264
+ id,
265
+ size: bytes.length,
266
+ tail: bytes.slice(-tailLength),
267
+ });
268
+ });
269
+ // Appends `bytes`, which may be empty, when the file is still what this layer last left
270
+ // there: the same length, ending in the same line. Another process
271
+ // only ever appends to a file, which changes its length, or replaces
272
+ // it with a snapshot, which ends in a line with a new id.
273
+ const append = Effect.fnUntraced(function* (sessionId, known, bytes) {
274
+ const handle = yield* fs.open(fileFor(sessionId), { flag: "a+" });
275
+ const info = yield* handle.stat;
276
+ if (Number(info.size) !== known.size)
277
+ return false;
278
+ const tail = new Uint8Array(known.tail.length);
279
+ const read = yield* handle.read(tail, {
280
+ position: BigInt(known.size - tail.length),
281
+ });
282
+ if (read !== tail.length ||
283
+ tail.some((byte, index) => byte !== known.tail[index])) {
284
+ return false;
285
+ }
286
+ if (bytes.length === 0)
287
+ return true;
288
+ // Forgotten until the append succeeds, so a failed append, which
289
+ // can leave part of a line, is followed by a snapshot.
290
+ files.delete(sessionId);
291
+ yield* handle.writeAll(bytes);
292
+ return true;
293
+ }, Effect.scoped, (effect, sessionId) => Effect.mapError(effect, storeError(`Failed to write session ${sessionId}`)));
294
+ const write = Effect.fnUntraced(function* (sessionId, record) {
295
+ const known = files.get(sessionId);
296
+ const changes = known && diff(known.record, record);
297
+ if (known !== undefined && changes !== undefined) {
298
+ // An unchanged record appends nothing, but is still checked
299
+ // against the file, which another process may have replaced.
300
+ if (Object.keys(changes).length === 0) {
301
+ if (yield* append(sessionId, known, new Uint8Array())) {
302
+ files.set(sessionId, { ...known, record });
303
+ return;
304
+ }
305
+ }
306
+ else {
307
+ const id = crypto.randomUUID();
308
+ const bytes = yield* encodeLine(Update.make({ ...changes, parent: known.id, id }));
309
+ if (yield* append(sessionId, known, bytes)) {
310
+ files.set(sessionId, {
311
+ record,
312
+ id,
313
+ size: known.size + bytes.length,
314
+ tail: bytes.slice(-tailLength),
315
+ });
316
+ return;
317
+ }
318
+ }
319
+ }
320
+ yield* writeSnapshot(sessionId, record);
321
+ });
322
+ return AcpSessionStore.of({
323
+ get: (sessionId) => semaphore.withPermit(read(sessionId)),
324
+ set: (sessionId, record) => semaphore.withPermit(write(sessionId, record)),
325
+ });
326
+ }));
327
+ //# sourceMappingURL=AcpSessionStore.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AcpSessionStore.js","sourceRoot":"","sources":["../src/AcpSessionStore.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=AcpSessionStore.test.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AcpSessionStore.test.d.ts","sourceRoot":"","sources":["../src/AcpSessionStore.test.ts"],"names":[],"mappings":""}
@@ -0,0 +1,135 @@
1
+ import { assert, describe, it } from "@effect/vitest";
2
+ import * as NodeServices from "@effect/platform-node/NodeServices";
3
+ import * as Context from "effect/Context";
4
+ import * as Deferred from "effect/Deferred";
5
+ import * as Effect from "effect/Effect";
6
+ import * as FileSystem from "effect/FileSystem";
7
+ import * as Layer from "effect/Layer";
8
+ import * as Option from "effect/Option";
9
+ import * as Path from "effect/Path";
10
+ import * as Prompt from "effect/ai/Prompt";
11
+ import * as AcpSessionStore from "./AcpSessionStore.js";
12
+ const message = (role, text) => Prompt.makeMessage(role, {
13
+ content: [Prompt.makePart("text", { text })],
14
+ });
15
+ const record = (messages, model = "test:model") => new AcpSessionStore.SessionRecord({
16
+ cwd: "/tmp",
17
+ model,
18
+ thoughtLevel: "medium",
19
+ fastMode: false,
20
+ history: Prompt.fromMessages(messages),
21
+ });
22
+ const texts = (stored) => Option.getOrThrow(stored).history.content.map((message) => {
23
+ const [part] = message.content;
24
+ return typeof part === "object" && part.type === "text"
25
+ ? part.text
26
+ : undefined;
27
+ });
28
+ // Each call is a new process: it knows nothing about the files yet.
29
+ const openStore = (directory) => Layer.build(AcpSessionStore.layerFileSystem(directory)).pipe(Effect.map((context) => Context.get(context, AcpSessionStore.AcpSessionStore)));
30
+ const withDirectory = (f) => Effect.gen(function* () {
31
+ const fs = yield* FileSystem.FileSystem;
32
+ const path = yield* Path.Path;
33
+ const directory = yield* fs.makeTempDirectoryScoped();
34
+ return yield* f(directory, (sessionId) => path.join(directory, `${sessionId}.jsonl`));
35
+ }).pipe(Effect.scoped, Effect.provide(NodeServices.layer));
36
+ const lines = Effect.fnUntraced(function* (file) {
37
+ const fs = yield* FileSystem.FileSystem;
38
+ const text = yield* fs.readFileString(file);
39
+ return text.split("\n").filter((line) => line !== "");
40
+ });
41
+ describe("AcpSessionStore.layerFileSystem", () => {
42
+ it.effect("appends what each write adds and rewrites a replaced history", () => withDirectory(Effect.fnUntraced(function* (directory, file) {
43
+ const hello = message("user", "hello");
44
+ const hi = message("assistant", "hi");
45
+ const store = yield* openStore(directory);
46
+ yield* store.set("s", record([hello]));
47
+ yield* store.set("s", record([hello, hi], "other:model"));
48
+ const [first, second] = yield* lines(file("s"));
49
+ assert.include(first, '"Snapshot"');
50
+ assert.include(second, '"Update"');
51
+ assert.notInclude(second, "hello");
52
+ const loaded = yield* (yield* openStore(directory)).get("s");
53
+ assert.deepStrictEqual(texts(loaded), ["hello", "hi"]);
54
+ assert.strictEqual(Option.getOrThrow(loaded).model, "other:model");
55
+ yield* store.set("s", record([message("user", "summary")]));
56
+ assert.strictEqual((yield* lines(file("s"))).length, 1);
57
+ const compacted = yield* (yield* openStore(directory)).get("s");
58
+ assert.deepStrictEqual(texts(compacted), ["summary"]);
59
+ })));
60
+ it.effect("drops an interrupted append and replaces the file on the next write", () => withDirectory(Effect.fnUntraced(function* (directory, file) {
61
+ const fs = yield* FileSystem.FileSystem;
62
+ const hello = message("user", "hello");
63
+ const store = yield* openStore(directory);
64
+ yield* store.set("s", record([hello]));
65
+ yield* store.set("s", record([hello, message("assistant", "lost")]));
66
+ // A kill in the middle of the second line.
67
+ const text = yield* fs.readFileString(file("s"));
68
+ yield* fs.writeFileString(file("s"), text.slice(0, text.indexOf("\n") + 20));
69
+ const next = yield* openStore(directory);
70
+ const loaded = yield* next.get("s");
71
+ assert.deepStrictEqual(texts(loaded), ["hello"]);
72
+ const history = Option.getOrThrow(loaded).history.content;
73
+ yield* next.set("s", record([...history, message("user", "again")]));
74
+ const reloaded = yield* (yield* openStore(directory)).get("s");
75
+ assert.deepStrictEqual(texts(reloaded), ["hello", "again"]);
76
+ })));
77
+ it.effect("starts over from a file replaced by another process, even at the same size", () => withDirectory(Effect.fnUntraced(function* (directory) {
78
+ const a = yield* openStore(directory);
79
+ yield* a.set("s", record([message("user", "old")]));
80
+ const b = yield* openStore(directory);
81
+ const stale = Option.getOrThrow(yield* b.get("s")).history.content;
82
+ yield* a.set("s", record([message("user", "new")]));
83
+ yield* b.set("s", record([...stale, message("user", "tail")]));
84
+ const loaded = yield* (yield* openStore(directory)).get("s");
85
+ assert.deepStrictEqual(texts(loaded), ["old", "tail"]);
86
+ })));
87
+ it.effect("stores a record again after another process replaced it", () => withDirectory(Effect.fnUntraced(function* (directory) {
88
+ const a = yield* openStore(directory);
89
+ const first = record([message("user", "A")]);
90
+ yield* a.set("s", first);
91
+ yield* (yield* openStore(directory)).set("s", record([message("user", "B")]));
92
+ yield* a.set("s", first);
93
+ const loaded = yield* (yield* openStore(directory)).get("s");
94
+ assert.deepStrictEqual(texts(loaded), ["A"]);
95
+ })));
96
+ it.effect("never combines the appends of two racing processes", () => withDirectory(Effect.fnUntraced(function* (directory) {
97
+ const fs = yield* FileSystem.FileSystem;
98
+ // Holds every append until both processes are about to append, so
99
+ // both have checked the file before either writes.
100
+ const bothChecked = yield* Deferred.make();
101
+ let appends = 0;
102
+ const racing = FileSystem.FileSystem.of({
103
+ ...fs,
104
+ open: (file, options) => Effect.map(fs.open(file, options), (handle) => new Proxy(handle, {
105
+ get: (target, key) => key === "writeAll"
106
+ ? (bytes) => Effect.gen(function* () {
107
+ if (++appends === 2) {
108
+ yield* Deferred.succeed(bothChecked, undefined);
109
+ }
110
+ yield* Deferred.await(bothChecked);
111
+ return yield* target.writeAll(bytes);
112
+ })
113
+ : Reflect.get(target, key, target),
114
+ })),
115
+ });
116
+ const base = [message("user", "base")];
117
+ yield* (yield* openStore(directory)).set("s", record(base));
118
+ const a = yield* openStore(directory).pipe(Effect.provideService(FileSystem.FileSystem, racing));
119
+ const b = yield* openStore(directory).pipe(Effect.provideService(FileSystem.FileSystem, racing));
120
+ const fromA = Option.getOrThrow(yield* a.get("s")).history.content;
121
+ const fromB = Option.getOrThrow(yield* b.get("s")).history.content;
122
+ yield* Effect.all([
123
+ a.set("s", record([...fromA, message("user", "A")])),
124
+ b.set("s", record([...fromB, message("user", "B")])),
125
+ ], { concurrency: 2 });
126
+ assert.strictEqual(appends, 2);
127
+ const loaded = texts(yield* (yield* openStore(directory)).get("s"));
128
+ assert.oneOf(loaded.join(), ["base,A", "base,B"]);
129
+ // Each process sees the file changed, so its next write is whole.
130
+ yield* b.set("s", record([...fromB, message("user", "B"), message("user", "C")]));
131
+ const next = yield* (yield* openStore(directory)).get("s");
132
+ assert.deepStrictEqual(texts(next), ["base", "B", "C"]);
133
+ })));
134
+ });
135
+ //# sourceMappingURL=AcpSessionStore.test.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"AcpSessionStore.test.js","sourceRoot":"","sources":["../src/AcpSessionStore.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../src/Agent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Agent.d.ts","sourceRoot":"","sources":["../src/Agent.ts"],"names":[],"mappings":"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"}
package/dist/Agent.js CHANGED
@@ -7,6 +7,7 @@ import * as AgentSkills from "./AgentSkills.js";
7
7
  import * as McpServers from "./McpServers.js";
8
8
  import { ToolkitRenderer } from "./ToolkitRenderer.js";
9
9
  import { stripWrappingCodeFence } from "./ScriptExtraction.js";
10
+ import { formatScript } from "./ScriptFormatting.js";
10
11
  import * as Image from "./Image.js";
11
12
  import * as Prompt from "effect/ai/Prompt";
12
13
  import * as Effect from "effect/Effect";
@@ -1018,7 +1019,10 @@ ${prompt}`,
1018
1019
  }
1019
1020
  }).pipe(Effect.provideService(ScriptExecutor, (script) => {
1020
1021
  maybeSend({ agentId, part: new ScriptStart() });
1021
- maybeSend({ agentId, part: new ScriptDelta({ delta: script }) });
1022
+ maybeSend({
1023
+ agentId,
1024
+ part: new ScriptDelta({ delta: formatScript(script) }),
1025
+ });
1022
1026
  return executeScript(script);
1023
1027
  }), Effect.ensuring(Scope.close(runScope, Exit.void)), Effect.ensuring(Effect.sync(() => {
1024
1028
  if (mailbox.emit === emit)