clanka 0.17.0 → 0.17.2

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 (62) hide show
  1. package/dist/Agent.d.ts +4 -0
  2. package/dist/Agent.d.ts.map +1 -1
  3. package/dist/Agent.js +5 -1
  4. package/dist/Agent.js.map +1 -1
  5. package/dist/Agent.test.js +35 -0
  6. package/dist/Agent.test.js.map +1 -1
  7. package/dist/AgentCallerConfig.test.js +5 -3
  8. package/dist/AgentCallerConfig.test.js.map +1 -1
  9. package/dist/ChunkRepo.d.ts +1 -1
  10. package/dist/ClaudeAgent.d.ts.map +1 -1
  11. package/dist/ClaudeAgent.js +46 -17
  12. package/dist/ClaudeAgent.js.map +1 -1
  13. package/dist/ClaudeAgent.test.js +87 -16
  14. package/dist/ClaudeAgent.test.js.map +1 -1
  15. package/dist/Compaction.test.js +2 -1
  16. package/dist/Compaction.test.js.map +1 -1
  17. package/dist/CompactionTokens.test.js +15 -8
  18. package/dist/CompactionTokens.test.js.map +1 -1
  19. package/dist/bin/{Effect-On-1ks2z.mjs → Effect-DNYYQ84C.mjs} +421 -367
  20. package/dist/bin/Effect-DNYYQ84C.mjs.map +1 -0
  21. package/dist/bin/Latch-BSlIwuxI.mjs +7 -0
  22. package/dist/bin/Latch-BSlIwuxI.mjs.map +1 -0
  23. package/dist/bin/{McpClient-iwrW83Si.mjs → McpClient-C7ctqJWo.mjs} +4 -5
  24. package/dist/bin/{McpClient-iwrW83Si.mjs.map → McpClient-C7ctqJWo.mjs.map} +1 -1
  25. package/dist/bin/{OutputFormatter-DeNaqhQM.mjs → OutputFormatter-DXej05JW.mjs} +8 -13
  26. package/dist/bin/{OutputFormatter-DeNaqhQM.mjs.map → OutputFormatter-DXej05JW.mjs.map} +1 -1
  27. package/dist/bin/{Schema-B3pFcw4E.mjs → Schema-CSQN_Zso.mjs} +754 -800
  28. package/dist/bin/Schema-CSQN_Zso.mjs.map +1 -0
  29. package/dist/bin/{SemanticSearch-BZIXkWYz.mjs → SemanticSearch-BiwCnpKX.mjs} +241 -148
  30. package/dist/bin/SemanticSearch-BiwCnpKX.mjs.map +1 -0
  31. package/dist/bin/{Stream-DCB3_nIX.mjs → Stream-Dwvj9X5X.mjs} +161 -116
  32. package/dist/bin/Stream-Dwvj9X5X.mjs.map +1 -0
  33. package/dist/bin/cli.mjs +4022 -3231
  34. package/dist/bin/cli.mjs.map +1 -1
  35. package/dist/bin/{helpers-BPLUsjsL.mjs → helpers-CljL9OKa.mjs} +143 -177
  36. package/dist/bin/helpers-CljL9OKa.mjs.map +1 -0
  37. package/dist/bin/index.min-ClUfQ5ji.mjs +3782 -0
  38. package/dist/bin/index.min-ClUfQ5ji.mjs.map +1 -0
  39. package/dist/bin/{rolldown-runtime-Cjv6nE1W.mjs → rolldown-runtime-5zChB7MF.mjs} +1 -2
  40. package/dist/bin/{server-CBmuybpI.mjs → server-HlLriZxF.mjs} +5 -7
  41. package/dist/bin/{server-CBmuybpI.mjs.map → server-HlLriZxF.mjs.map} +1 -1
  42. package/dist/bin/{turndown.cjs-cie0BXQQ.mjs → turndown.cjs-C2WBxeA-.mjs} +56 -110
  43. package/dist/bin/{turndown.cjs-cie0BXQQ.mjs.map → turndown.cjs-C2WBxeA-.mjs.map} +1 -1
  44. package/dist/bin/{types-RT_9fFNm.mjs → types-LcwjLVkt.mjs} +20 -38
  45. package/dist/bin/{types-RT_9fFNm.mjs.map → types-LcwjLVkt.mjs.map} +1 -1
  46. package/dist/bin/upgrade-BSNjCnra.mjs +342 -0
  47. package/dist/bin/upgrade-BSNjCnra.mjs.map +1 -0
  48. package/package.json +14 -20
  49. package/src/Agent.test.ts +69 -0
  50. package/src/Agent.ts +5 -1
  51. package/src/AgentCallerConfig.test.ts +5 -3
  52. package/src/ClaudeAgent.test.ts +120 -21
  53. package/src/ClaudeAgent.ts +59 -19
  54. package/src/Compaction.test.ts +2 -1
  55. package/src/CompactionTokens.test.ts +15 -11
  56. package/dist/bin/Effect-On-1ks2z.mjs.map +0 -1
  57. package/dist/bin/Schema-B3pFcw4E.mjs.map +0 -1
  58. package/dist/bin/SemanticSearch-BZIXkWYz.mjs.map +0 -1
  59. package/dist/bin/Stream-DCB3_nIX.mjs.map +0 -1
  60. package/dist/bin/helpers-BPLUsjsL.mjs.map +0 -1
  61. package/dist/bin/index.min-Bkz7vIWv.mjs +0 -3300
  62. package/dist/bin/index.min-Bkz7vIWv.mjs.map +0 -1
@@ -0,0 +1,342 @@
1
+ import { Bt as scope, Fa as map, Hr as addFinalizer, Kt as succeed, M as fail, Nc as identity, Xt as sync, Yr as provide, Yt as suspend, Z as gen, ba as ensure, c as as, cn as updateContext, dn as void_, ko as merge, mn as withFiber, nn as timeoutOrElse, p as callback, t as acquireRelease } from "./Effect-DNYYQ84C.mjs";
2
+ import { _ as SocketReadError, b as isCloseEvent, g as SocketOpenError, h as SocketError, m as SocketCloseError, v as SocketUpgradeError, x as make, y as SocketWriteError } from "./cli.mjs";
3
+ import { n as makeUnsafe } from "./Latch-BSlIwuxI.mjs";
4
+ import { $r as value } from "./Schema-CSQN_Zso.mjs";
5
+ import { Readable, finished } from "node:stream";
6
+ import { Buffer as Buffer$1 } from "node:buffer";
7
+ import * as Tls from "node:tls";
8
+ // node_modules/.pnpm/@effect+platform-node-shared@4.1.1_effect@4.1.1/node_modules/@effect/platform-node-shared/dist/NodeSocket.js
9
+ const isDeno = "Deno" in globalThis;
10
+ const readAvailable = (conn, chunkSize) => {
11
+ const first = conn.read();
12
+ if (first === null) return void 0;
13
+ const out = [first];
14
+ let chunk;
15
+ while (out.length < chunkSize && (chunk = conn.read()) !== null) out.push(chunk);
16
+ return out;
17
+ };
18
+ const toBuffers = (input) => map(ensure(input), (value) => Buffer$1.from(value));
19
+ const fromDuplex = (open, options) => withFiber((fiber) => {
20
+ let currentSocket;
21
+ const latch = makeUnsafe(false);
22
+ const openServices = fiber.context;
23
+ const isServer = options?.tlsServer === true;
24
+ const requestedChunkSize = options?.chunkSize ?? 4096;
25
+ const chunkSize = requestedChunkSize === Infinity || Number.isSafeInteger(requestedChunkSize) && requestedChunkSize > 0 ? requestedChunkSize : 4096;
26
+ const secureEvent = isServer ? "secure" : "secureConnect";
27
+ const reader = gen(function* () {
28
+ const scope$1 = yield* scope;
29
+ let conn = yield* provide(open, scope$1).pipe(options?.openTimeout !== void 0 ? timeoutOrElse({
30
+ duration: options.openTimeout,
31
+ orElse: () => fail(new SocketError({ reason: new SocketOpenError({
32
+ kind: "Timeout",
33
+ cause: new Error("Connection timed out")
34
+ }) }))
35
+ }) : identity);
36
+ let error;
37
+ let waiter;
38
+ let pending;
39
+ let reading = false;
40
+ let closed = false;
41
+ let upgradeAvailable = true;
42
+ function drain() {
43
+ if (waiter === void 0 || reading) return;
44
+ let chunk = pending;
45
+ pending = void 0;
46
+ if (chunk === void 0 && !closed) {
47
+ reading = true;
48
+ try {
49
+ chunk = readAvailable(conn, chunkSize);
50
+ } finally {
51
+ reading = false;
52
+ }
53
+ }
54
+ if (closed) chunk = void 0;
55
+ if (waiter === void 0) {
56
+ pending = chunk;
57
+ return;
58
+ }
59
+ const result = chunk !== void 0 ? succeed(chunk) : error !== void 0 ? fail(error) : void 0;
60
+ if (result === void 0) return;
61
+ const resume = waiter;
62
+ waiter = void 0;
63
+ resume(result);
64
+ }
65
+ function end(err) {
66
+ error ??= err;
67
+ drain();
68
+ }
69
+ function close(err) {
70
+ error ??= err;
71
+ closed = true;
72
+ pending = void 0;
73
+ drain();
74
+ }
75
+ function onEnd() {
76
+ end(new SocketError({ reason: new SocketCloseError({ code: 1e3 }) }));
77
+ }
78
+ function onError(cause) {
79
+ close(new SocketError({ reason: new SocketReadError({ cause }) }));
80
+ }
81
+ function onClose(hadError) {
82
+ const err = new SocketError({ reason: new SocketCloseError({ code: hadError ? 1006 : 1e3 }) });
83
+ if (hadError) close(err);
84
+ else end(err);
85
+ }
86
+ function attachReadListeners(conn) {
87
+ conn.on("readable", drain);
88
+ conn.on("end", onEnd);
89
+ conn.on("error", onError);
90
+ conn.on("close", onClose);
91
+ }
92
+ function detachReadListeners(conn) {
93
+ conn.off("readable", drain);
94
+ conn.off("end", onEnd);
95
+ conn.off("error", onError);
96
+ conn.off("close", onClose);
97
+ }
98
+ if (!isDeno) conn.pause();
99
+ attachReadListeners(conn);
100
+ yield* addFinalizer(scope$1, sync(() => {
101
+ close(new SocketError({ reason: new SocketCloseError({ code: 1006 }) }));
102
+ detachReadListeners(conn);
103
+ latch.closeUnsafe();
104
+ currentSocket = void 0;
105
+ upgradeAvailable = false;
106
+ }));
107
+ currentSocket = conn;
108
+ latch.openUnsafe();
109
+ const pull = callback((resume) => {
110
+ waiter = resume;
111
+ drain();
112
+ if (waiter !== resume) return;
113
+ return sync(() => {
114
+ if (waiter === resume) waiter = void 0;
115
+ });
116
+ });
117
+ const upgrade = (upgradeOptions = {}) => suspend(() => {
118
+ if (!upgradeAvailable) return fail(new SocketError({ reason: new SocketUpgradeError({ cause: new Error("socket is already upgraded or closed") }) }));
119
+ const hasKey = upgradeOptions.key !== void 0;
120
+ const hasCert = upgradeOptions.cert !== void 0;
121
+ if (isServer && (!hasKey || !hasCert) || hasKey !== hasCert) return fail(new SocketError({ reason: new SocketUpgradeError({ cause: new Error(isServer ? "server TLS upgrade requires both key and cert" : "TLS upgrade credentials must include both key and cert") }) }));
122
+ return callback((resume) => {
123
+ const raw = conn;
124
+ detachReadListeners(raw);
125
+ let tls;
126
+ try {
127
+ const tlsOptions = {
128
+ secureContext: Tls.createSecureContext({
129
+ key: upgradeOptions.key === void 0 ? void 0 : map(ensure(upgradeOptions.key), (value$1) => Buffer$1.from(value(value$1))),
130
+ cert: upgradeOptions.cert === void 0 ? void 0 : toBuffers(upgradeOptions.cert),
131
+ ca: upgradeOptions.ca === void 0 ? void 0 : toBuffers(upgradeOptions.ca),
132
+ passphrase: upgradeOptions.passphrase === void 0 ? void 0 : value(upgradeOptions.passphrase)
133
+ }),
134
+ ALPNProtocols: upgradeOptions.alpnProtocols === void 0 ? void 0 : [...upgradeOptions.alpnProtocols],
135
+ requestCert: upgradeOptions.requestCert,
136
+ rejectUnauthorized: upgradeOptions.rejectUnauthorized
137
+ };
138
+ tls = isServer ? new Tls.TLSSocket(raw, {
139
+ ...tlsOptions,
140
+ isServer: true
141
+ }) : Tls.connect({
142
+ ...tlsOptions,
143
+ servername: upgradeOptions.servername,
144
+ socket: raw
145
+ });
146
+ } catch (cause) {
147
+ attachReadListeners(raw);
148
+ resume(fail(new SocketError({ reason: new SocketUpgradeError({ cause }) })));
149
+ return;
150
+ }
151
+ conn = tls;
152
+ currentSocket = tls;
153
+ tls.pause();
154
+ function cleanup() {
155
+ tls.off(secureEvent, succeed);
156
+ tls.off("error", failUpgrade);
157
+ tls.off("close", onUpgradeClose);
158
+ }
159
+ function succeed() {
160
+ cleanup();
161
+ upgradeAvailable = false;
162
+ attachReadListeners(tls);
163
+ resume(void_);
164
+ }
165
+ function failUpgrade(cause) {
166
+ cleanup();
167
+ const upgradeError = new SocketError({ reason: new SocketUpgradeError({ cause }) });
168
+ close(upgradeError);
169
+ resume(fail(upgradeError));
170
+ }
171
+ function onUpgradeClose() {
172
+ failUpgrade(new Error("socket closed during TLS upgrade"));
173
+ }
174
+ tls.once(secureEvent, succeed);
175
+ tls.once("error", failUpgrade);
176
+ tls.once("close", onUpgradeClose);
177
+ return sync(() => {
178
+ cleanup();
179
+ close(new SocketError({ reason: new SocketCloseError({ code: 1006 }) }));
180
+ tls.destroy();
181
+ });
182
+ });
183
+ });
184
+ return {
185
+ pull,
186
+ upgrade
187
+ };
188
+ }).pipe(updateContext((input) => merge(openServices, input)));
189
+ const awaitDrain = (conn) => callback((resume) => {
190
+ function cleanup() {
191
+ conn.off("drain", onDrain);
192
+ conn.off("error", onError);
193
+ conn.off("close", onClose);
194
+ }
195
+ function onDrain() {
196
+ cleanup();
197
+ resume(void_);
198
+ }
199
+ function onError(cause) {
200
+ cleanup();
201
+ resume(fail(new SocketError({ reason: new SocketWriteError({ cause }) })));
202
+ }
203
+ function onClose() {
204
+ cleanup();
205
+ resume(fail(new SocketError({ reason: new SocketWriteError({ cause: new Error("socket closed") }) })));
206
+ }
207
+ conn.on("drain", onDrain);
208
+ conn.on("error", onError);
209
+ conn.on("close", onClose);
210
+ return sync(cleanup);
211
+ });
212
+ const write = (chunk) => suspend(() => {
213
+ const conn = currentSocket;
214
+ if (conn === void 0) return latch.whenOpen(write(chunk));
215
+ if (isCloseEvent(chunk)) {
216
+ conn.destroy(chunk.code > 1e3 ? new Error(`closed with code ${chunk.code}`) : void 0);
217
+ return void_;
218
+ }
219
+ try {
220
+ return conn.write(chunk) ? void_ : awaitDrain(conn);
221
+ } catch (cause) {
222
+ return fail(new SocketError({ reason: new SocketWriteError({ cause }) }));
223
+ }
224
+ });
225
+ const writeAll = (chunks) => suspend(() => {
226
+ const conn = currentSocket;
227
+ if (conn === void 0) return latch.whenOpen(writeAll(chunks));
228
+ let needsDrain = false;
229
+ try {
230
+ if (chunks.length === 1) needsDrain = !conn.write(chunks[0]);
231
+ else {
232
+ conn.cork();
233
+ try {
234
+ for (let i = 0; i < chunks.length; i++) needsDrain = !conn.write(chunks[i]) || needsDrain;
235
+ } finally {
236
+ conn.uncork();
237
+ }
238
+ }
239
+ } catch (cause) {
240
+ return fail(new SocketError({ reason: new SocketWriteError({ cause }) }));
241
+ }
242
+ return needsDrain ? awaitDrain(conn) : void_;
243
+ });
244
+ const writer = acquireRelease(succeed({
245
+ write,
246
+ writeAll
247
+ }), () => sync(() => {
248
+ if (!currentSocket || currentSocket.writableEnded) return;
249
+ currentSocket.end();
250
+ }));
251
+ return succeed(make({
252
+ reader,
253
+ writer
254
+ }));
255
+ });
256
+ // node_modules/.pnpm/@effect+platform-node@4.1.1_effect@4.1.1_redis@6.2.1_@opentelemetry+api@1.10.0_/node_modules/@effect/platform-node/dist/internal/upgrade.js
257
+ const toSocket = (conn, open = void_) => fromDuplex(acquireRelease(suspend(() => conn.destroyed ? fail(openError("The upgraded connection closed before it was read")) : as(open, conn)), (conn) => sync(() => {
258
+ if (conn.destroyed) return;
259
+ if ("destroySoon" in conn) conn.destroySoon();
260
+ else conn.destroy();
261
+ })));
262
+ const openError = (cause) => new SocketError({ reason: new SocketOpenError({
263
+ kind: "Unknown",
264
+ cause: typeof cause === "string" ? new Error(cause) : cause
265
+ }) });
266
+ const frameBody = (conn, head, length) => {
267
+ if (head.length >= length) return {
268
+ body: Readable.from(length === 0 ? [] : [head.subarray(0, length)], { objectMode: false }),
269
+ rest: head.subarray(length)
270
+ };
271
+ let remaining = length - head.length;
272
+ let reading = false;
273
+ const stop = () => {
274
+ conn.off("readable", onReadable);
275
+ conn.off("end", onEnd);
276
+ };
277
+ const onReadable = () => {
278
+ while (remaining > 0) {
279
+ let chunk = conn.read();
280
+ if (chunk === null) return;
281
+ if (chunk.length > remaining) {
282
+ conn.unshift(chunk.subarray(remaining));
283
+ chunk = chunk.subarray(0, remaining);
284
+ }
285
+ remaining -= chunk.length;
286
+ if (!body.push(chunk) && remaining > 0) return;
287
+ }
288
+ stop();
289
+ body.push(null);
290
+ };
291
+ const onEnd = () => {
292
+ stop();
293
+ body.destroy(new Error("The connection closed before the request body ended"));
294
+ };
295
+ const body = new Readable({
296
+ read() {
297
+ if (reading) return onReadable();
298
+ reading = true;
299
+ if (head.length > 0) this.push(head);
300
+ if (conn.readableEnded) return onEnd();
301
+ conn.on("readable", onReadable);
302
+ conn.on("end", onEnd);
303
+ },
304
+ destroy(error, callback) {
305
+ stop();
306
+ callback(error);
307
+ }
308
+ });
309
+ body.on("error", () => {});
310
+ return {
311
+ body,
312
+ rest: Buffer.alloc(0)
313
+ };
314
+ };
315
+ const drainBody = (body, maxBytes) => callback((resume) => {
316
+ if (body.readableEnded) return resume(void_);
317
+ let bytes = 0;
318
+ const cleanup = finished(body, {
319
+ readable: true,
320
+ writable: false
321
+ }, (error) => {
322
+ done();
323
+ resume(error ? fail(openError(error)) : void_);
324
+ });
325
+ function onData(chunk) {
326
+ bytes += chunk.length;
327
+ if (maxBytes !== void 0 && bytes > maxBytes) {
328
+ done();
329
+ resume(fail(openError("The request body exceeds the maximum body size")));
330
+ }
331
+ }
332
+ function done() {
333
+ body.off("data", onData);
334
+ cleanup();
335
+ }
336
+ body.on("data", onData);
337
+ body.resume();
338
+ return sync(done);
339
+ });
340
+ export { drainBody, frameBody, toSocket };
341
+
342
+ //# sourceMappingURL=upgrade-BSNjCnra.mjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"upgrade-BSNjCnra.mjs","names":["Arr.map","Arr.ensure","Buffer","Effect.withFiber","Latch.makeUnsafe","Effect.gen","scope","Effect.scope","Scope.provide","Effect.timeoutOrElse","Effect.fail","Socket.SocketError","Socket.SocketOpenError","Effect.succeed","Socket.SocketCloseError","Socket.SocketReadError","Scope.addFinalizer","Effect.sync","Effect.callback","Effect.suspend","Socket.SocketUpgradeError","Redacted.value","value","Effect.void","Effect.updateContext","Context.merge","Socket.SocketWriteError","Socket.isCloseEvent","Effect.acquireRelease","Socket.make","Effect.void","NodeSocket.fromDuplex","Effect.acquireRelease","Effect.suspend","Effect.fail","Effect.as","Effect.sync","Socket.SocketError","Socket.SocketOpenError","Effect.callback"],"sources":["../../node_modules/.pnpm/@effect+platform-node-shared@4.1.1_effect@4.1.1/node_modules/@effect/platform-node-shared/dist/NodeSocket.js","../../node_modules/.pnpm/@effect+platform-node@4.1.1_effect@4.1.1_redis@6.2.1_@opentelemetry+api@1.10.0_/node_modules/@effect/platform-node/dist/internal/upgrade.js"],"sourcesContent":["/**\n * Node socket adapters for Effect sockets.\n *\n * This module opens `node:net` or `node:tls` connections, or wraps existing\n * Node `Duplex` streams, and presents them as `Socket.Socket` values, socket\n * channels, or layers. It also exposes the `NetSocket` service tag for the\n * underlying Node socket.\n *\n * @stability unstable\n * @since 4.0.0\n */\nimport * as Arr from \"effect/Array\";\nimport * as Channel from \"effect/Channel\";\nimport * as Context from \"effect/Context\";\nimport * as Effect from \"effect/Effect\";\nimport * as Function from \"effect/Function\";\nimport { identity } from \"effect/Function\";\nimport * as Latch from \"effect/Latch\";\nimport * as Layer from \"effect/Layer\";\nimport * as Redacted from \"effect/Redacted\";\nimport * as Scope from \"effect/Scope\";\nimport * as Socket from \"effect/socket/Socket\";\nimport { Buffer } from \"node:buffer\";\nimport * as Net from \"node:net\";\nimport * as Tls from \"node:tls\";\nconst isDeno = \"Deno\" in globalThis;\n/**\n * Service tag for the underlying Node `net.Socket` associated with the current\n * socket connection.\n *\n * @stability unstable\n * @category services\n * @since 4.0.0\n */\nexport class NetSocket extends /*#__PURE__*/Context.Service()(\"@effect/platform-node/NodeSocket/NetSocket\") {}\nconst readAvailable = (conn, chunkSize) => {\n const first = conn.read();\n if (first === null) return undefined;\n const out = [first];\n let chunk;\n // read() may synchronously refill the buffer; leave further reads to the next pull.\n while (out.length < chunkSize && (chunk = conn.read()) !== null) {\n out.push(chunk);\n }\n return out;\n};\nconst toBuffers = input => Arr.map(Arr.ensure(input), value => Buffer.from(value));\nconst closeSocket = (conn, isOpen) => {\n if (conn.closed !== false) return;\n if (!isOpen || !(\"destroySoon\" in conn)) {\n conn.destroy();\n } else {\n conn.destroySoon();\n }\n};\n/**\n * Opens a Node TCP connection as an Effect socket.\n *\n * **When to use**\n *\n * Use to create a `Socket.Socket` whose reader acquisition dials\n * `net.createConnection`.\n *\n * **Details**\n *\n * Supports `openTimeout` and closes or destroys the underlying socket when the\n * reader scope is finalized.\n *\n * @stability unstable\n * @category constructors\n * @since 4.0.0\n */\nexport const makeNet = options => fromDuplex(Effect.contextWith(context => {\n let conn;\n let isOpen = false;\n return Effect.flatMap(Scope.addFinalizer(Context.get(context, Scope.Scope), Effect.sync(() => {\n if (!conn) return;\n closeSocket(conn, isOpen);\n })), () => Effect.callback(resume => {\n conn = Net.createConnection(options);\n conn.once(\"connect\", () => {\n isOpen = true;\n resume(Effect.succeed(conn));\n });\n conn.on(\"error\", cause => {\n resume(Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketOpenError({\n kind: \"Unknown\",\n cause\n })\n })));\n });\n }));\n}), options);\n/**\n * Adapts a Node `Duplex` into a `Socket.Socket`.\n *\n * **Details**\n *\n * Reader acquisition opens the duplex and keeps it paused: each pull reads at\n * most `chunkSize` chunks (default 4096) with `stream.read()`. On Node 26+ that\n * yields each buffered chunk as a separate batch element with no copy. Earlier Node\n * concatenates the buffer into one chunk. The stream is never resumed, so once\n * Node's buffer reaches its `highWaterMark` the kernel receive window closes\n * and the peer blocks: backpressure is end-to-end with no buffering above\n * Node's own.\n *\n * Writes use `write()` return-value backpressure, awaiting one `drain` when\n * the internal buffer is full. `writeAll` corks the stream around the batch.\n * Releasing the writer scope half-closes the stream (`end()`).\n *\n * @stability unstable\n * @category constructors\n * @since 4.0.0\n */\nexport const fromDuplex = (open, options) => Effect.withFiber(fiber => {\n let currentSocket;\n const latch = Latch.makeUnsafe(false);\n const openServices = fiber.context;\n const isServer = options?.tlsServer === true;\n const requestedChunkSize = options?.chunkSize ?? 4096;\n const chunkSize = requestedChunkSize === Infinity || Number.isSafeInteger(requestedChunkSize) && requestedChunkSize > 0 ? requestedChunkSize : 4096;\n const secureEvent = isServer ? \"secure\" : \"secureConnect\";\n const reader = Effect.gen(function* () {\n const scope = yield* Effect.scope;\n let conn = yield* Scope.provide(open, scope).pipe(options?.openTimeout !== undefined ? Effect.timeoutOrElse({\n duration: options.openTimeout,\n orElse: () => Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketOpenError({\n kind: \"Timeout\",\n cause: new Error(\"Connection timed out\")\n })\n }))\n }) : identity);\n let error;\n let waiter;\n // Bytes consumed by read() while the parked pull was interrupted.\n let pending;\n let reading = false;\n let closed = false;\n let upgradeAvailable = true;\n // The only place a waiter is resumed, so delivery order has one owner:\n // retained bytes first, then freshly read bytes, then the error.\n function drain() {\n if (waiter === undefined || reading) return;\n let chunk = pending;\n pending = undefined;\n if (chunk === undefined && !closed) {\n // A data listener can interrupt and replace the pull synchronously.\n // The replacement must wait for this read to preserve byte order.\n reading = true;\n try {\n chunk = readAvailable(conn, chunkSize);\n } finally {\n reading = false;\n }\n }\n // A close during read() discards the bytes it consumed.\n if (closed) chunk = undefined;\n if (waiter === undefined) {\n pending = chunk;\n return;\n }\n const result = chunk !== undefined ? Effect.succeed(chunk) : error !== undefined ? Effect.fail(error) : undefined;\n if (result === undefined) return;\n const resume = waiter;\n waiter = undefined;\n resume(result);\n }\n // Normal EOF: already consumed bytes are still delivered before the error.\n function end(err) {\n error ??= err;\n drain();\n }\n // Teardown or failure: consumed bytes are discarded.\n function close(err) {\n error ??= err;\n closed = true;\n pending = undefined;\n drain();\n }\n function onEnd() {\n end(new Socket.SocketError({\n reason: new Socket.SocketCloseError({\n code: 1000\n })\n }));\n }\n function onError(cause) {\n close(new Socket.SocketError({\n reason: new Socket.SocketReadError({\n cause\n })\n }));\n }\n function onClose(hadError) {\n const err = new Socket.SocketError({\n reason: new Socket.SocketCloseError({\n code: hadError ? 1006 : 1000\n })\n });\n if (hadError) close(err);else end(err);\n }\n function attachReadListeners(conn) {\n conn.on(\"readable\", drain);\n conn.on(\"end\", onEnd);\n conn.on(\"error\", onError);\n conn.on(\"close\", onClose);\n }\n function detachReadListeners(conn) {\n conn.off(\"readable\", drain);\n conn.off(\"end\", onEnd);\n conn.off(\"error\", onError);\n conn.off(\"close\", onClose);\n }\n // Deno's node:net compatibility layer stops emitting `readable` after\n // an explicit pause. The stream is already non-flowing without one.\n if (!isDeno) conn.pause();\n attachReadListeners(conn);\n yield* Scope.addFinalizer(scope, Effect.sync(() => {\n // resume a pull blocked in another fiber before detaching\n close(new Socket.SocketError({\n reason: new Socket.SocketCloseError({\n code: 1006\n })\n }));\n detachReadListeners(conn);\n latch.closeUnsafe();\n currentSocket = undefined;\n upgradeAvailable = false;\n }));\n currentSocket = conn;\n latch.openUnsafe();\n const pull = Effect.callback(resume => {\n waiter = resume;\n drain();\n // Resumed synchronously: nothing to cancel.\n if (waiter !== resume) return;\n return Effect.sync(() => {\n if (waiter === resume) waiter = undefined;\n });\n });\n const upgrade = (upgradeOptions = {}) => Effect.suspend(() => {\n if (!upgradeAvailable) {\n return Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketUpgradeError({\n cause: new Error(\"socket is already upgraded or closed\")\n })\n }));\n }\n const hasKey = upgradeOptions.key !== undefined;\n const hasCert = upgradeOptions.cert !== undefined;\n if (isServer && (!hasKey || !hasCert) || hasKey !== hasCert) {\n return Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketUpgradeError({\n cause: new Error(isServer ? \"server TLS upgrade requires both key and cert\" : \"TLS upgrade credentials must include both key and cert\")\n })\n }));\n }\n return Effect.callback(resume => {\n const raw = conn;\n detachReadListeners(raw);\n let tls;\n try {\n const secureContext = Tls.createSecureContext({\n key: upgradeOptions.key === undefined ? undefined : Arr.map(Arr.ensure(upgradeOptions.key), value => Buffer.from(Redacted.value(value))),\n cert: upgradeOptions.cert === undefined ? undefined : toBuffers(upgradeOptions.cert),\n ca: upgradeOptions.ca === undefined ? undefined : toBuffers(upgradeOptions.ca),\n passphrase: upgradeOptions.passphrase === undefined ? undefined : Redacted.value(upgradeOptions.passphrase)\n });\n const tlsOptions = {\n secureContext,\n ALPNProtocols: upgradeOptions.alpnProtocols === undefined ? undefined : [...upgradeOptions.alpnProtocols],\n requestCert: upgradeOptions.requestCert,\n rejectUnauthorized: upgradeOptions.rejectUnauthorized\n };\n tls = isServer ? new Tls.TLSSocket(raw, {\n ...tlsOptions,\n isServer: true\n }) : Tls.connect({\n ...tlsOptions,\n servername: upgradeOptions.servername,\n socket: raw\n });\n } catch (cause) {\n attachReadListeners(raw);\n resume(Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketUpgradeError({\n cause\n })\n })));\n return;\n }\n conn = tls;\n currentSocket = tls;\n tls.pause();\n function cleanup() {\n tls.off(secureEvent, succeed);\n tls.off(\"error\", failUpgrade);\n tls.off(\"close\", onUpgradeClose);\n }\n function succeed() {\n cleanup();\n upgradeAvailable = false;\n attachReadListeners(tls);\n resume(Effect.void);\n }\n function failUpgrade(cause) {\n cleanup();\n const upgradeError = new Socket.SocketError({\n reason: new Socket.SocketUpgradeError({\n cause\n })\n });\n close(upgradeError);\n resume(Effect.fail(upgradeError));\n }\n function onUpgradeClose() {\n failUpgrade(new Error(\"socket closed during TLS upgrade\"));\n }\n tls.once(secureEvent, succeed);\n tls.once(\"error\", failUpgrade);\n tls.once(\"close\", onUpgradeClose);\n return Effect.sync(() => {\n cleanup();\n close(new Socket.SocketError({\n reason: new Socket.SocketCloseError({\n code: 1006\n })\n }));\n tls.destroy();\n });\n });\n });\n return {\n pull,\n upgrade\n };\n }).pipe(Effect.updateContext(input => Context.merge(openServices, input)));\n const awaitDrain = conn => Effect.callback(resume => {\n function cleanup() {\n conn.off(\"drain\", onDrain);\n conn.off(\"error\", onError);\n conn.off(\"close\", onClose);\n }\n function onDrain() {\n cleanup();\n resume(Effect.void);\n }\n function onError(cause) {\n cleanup();\n resume(Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketWriteError({\n cause\n })\n })));\n }\n function onClose() {\n cleanup();\n resume(Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketWriteError({\n cause: new Error(\"socket closed\")\n })\n })));\n }\n conn.on(\"drain\", onDrain);\n conn.on(\"error\", onError);\n conn.on(\"close\", onClose);\n return Effect.sync(cleanup);\n });\n const write = chunk => Effect.suspend(() => {\n const conn = currentSocket;\n if (conn === undefined) return latch.whenOpen(write(chunk));\n if (Socket.isCloseEvent(chunk)) {\n conn.destroy(chunk.code > 1000 ? new Error(`closed with code ${chunk.code}`) : undefined);\n return Effect.void;\n }\n try {\n return conn.write(chunk) ? Effect.void : awaitDrain(conn);\n } catch (cause) {\n return Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketWriteError({\n cause\n })\n }));\n }\n });\n const writeAll = chunks => Effect.suspend(() => {\n const conn = currentSocket;\n if (conn === undefined) return latch.whenOpen(writeAll(chunks));\n let needsDrain = false;\n try {\n if (chunks.length === 1) {\n needsDrain = !conn.write(chunks[0]);\n } else {\n conn.cork();\n try {\n for (let i = 0; i < chunks.length; i++) {\n needsDrain = !conn.write(chunks[i]) || needsDrain;\n }\n } finally {\n conn.uncork();\n }\n }\n } catch (cause) {\n return Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketWriteError({\n cause\n })\n }));\n }\n return needsDrain ? awaitDrain(conn) : Effect.void;\n });\n const writer = Effect.acquireRelease(Effect.succeed({\n write,\n writeAll\n }), () => Effect.sync(() => {\n if (!currentSocket || currentSocket.writableEnded) return;\n currentSocket.end();\n }));\n return Effect.succeed(Socket.make({\n reader,\n writer\n }));\n});\n/**\n * Creates a `Channel` over a TCP socket, reading arrays of `Uint8Array`\n * chunks and writing arrays of bytes, strings, or socket close events.\n *\n * @stability unstable\n * @category constructors\n * @since 4.0.0\n */\nexport const makeNetChannel = options => Channel.unwrap(Effect.map(makeNet(options), Socket.toChannelWith()));\n/**\n * Provides a `Socket.Socket` by opening a TCP connection with the supplied\n * Node `net` connection options.\n *\n * @stability unstable\n * @category layers\n * @since 4.0.0\n */\nexport const layerNet = /*#__PURE__*/Function.flow(makeNet, /*#__PURE__*/Layer.effect(Socket.Socket));\n/**\n * Opens a Node TLS connection as an Effect socket.\n *\n * **When to use**\n *\n * Use to create a `Socket.Socket` whose reader acquisition dials\n * `tls.connect` and completes once the TLS handshake has finished.\n *\n * **Details**\n *\n * Accepts the same options as `tls.connect`, so trust anchors (`ca`), client\n * certificates (`cert` / `key`), ALPN protocols, and `servername` are set\n * there. A failed handshake, including an untrusted or expired peer\n * certificate, fails with a `SocketOpenError`. Supports `openTimeout` and\n * destroys the underlying socket when the reader scope is finalized.\n *\n * @stability unstable\n * @category constructors\n * @since 4.0.0\n */\nexport const makeTls = options => fromDuplex(Effect.contextWith(context => {\n let conn;\n let isOpen = false;\n return Effect.flatMap(Scope.addFinalizer(Context.get(context, Scope.Scope), Effect.sync(() => {\n if (!conn) return;\n closeSocket(conn, isOpen);\n })), () => Effect.callback(resume => {\n conn = Tls.connect(options);\n conn.once(\"secureConnect\", () => {\n isOpen = true;\n resume(Effect.succeed(conn));\n });\n conn.on(\"error\", cause => {\n resume(Effect.fail(new Socket.SocketError({\n reason: new Socket.SocketOpenError({\n kind: \"Unknown\",\n cause\n })\n })));\n });\n }));\n}), options);\n/**\n * Creates a `Channel` over a TLS socket, reading arrays of `Uint8Array`\n * chunks and writing arrays of bytes, strings, or socket close events.\n *\n * @stability unstable\n * @category constructors\n * @since 4.0.0\n */\nexport const makeTlsChannel = options => Channel.unwrap(Effect.map(makeTls(options), Socket.toChannelWith()));\n/**\n * Provides a `Socket.Socket` by opening a TLS connection with the supplied\n * Node `tls` connection options.\n *\n * @stability unstable\n * @category layers\n * @since 4.0.0\n */\nexport const layerTls = /*#__PURE__*/Function.flow(makeTls, /*#__PURE__*/Layer.effect(Socket.Socket));\n//# sourceMappingURL=NodeSocket.js.map","import * as Effect from \"effect/Effect\";\nimport * as Socket from \"effect/socket/Socket\";\nimport { finished, Readable } from \"node:stream\";\nimport * as NodeSocket from \"../NodeSocket.js\";\n/**\n * Wraps an upgraded connection. Acquiring the reader runs `open`; releasing\n * its scope closes the connection.\n *\n * No `data` listener is attached before acquisition, so early bytes stay buffered.\n *\n * @internal\n */\nexport const toSocket = (conn, open = Effect.void) => NodeSocket.fromDuplex(Effect.acquireRelease(Effect.suspend(() => conn.destroyed ? Effect.fail(openError(\"The upgraded connection closed before it was read\")) : Effect.as(open, conn)), conn => Effect.sync(() => {\n if (conn.destroyed) return;\n if (\"destroySoon\" in conn) {\n ;\n conn.destroySoon();\n } else {\n conn.destroy();\n }\n})));\nconst openError = cause => new Socket.SocketError({\n reason: new Socket.SocketOpenError({\n kind: \"Unknown\",\n cause: typeof cause === \"string\" ? new Error(cause) : cause\n })\n});\n/**\n * Node 25 and older stop parsing at the head of an upgrade request, leaving\n * the body in `head` and on the connection. Reads a `Content-Length` body\n * from them on demand and returns the bytes after it.\n *\n * @internal\n */\nexport const frameBody = (conn, head, length) => {\n if (head.length >= length) {\n return {\n body: Readable.from(length === 0 ? [] : [head.subarray(0, length)], {\n objectMode: false\n }),\n rest: head.subarray(length)\n };\n }\n let remaining = length - head.length;\n let reading = false;\n const stop = () => {\n conn.off(\"readable\", onReadable);\n conn.off(\"end\", onEnd);\n };\n const onReadable = () => {\n while (remaining > 0) {\n let chunk = conn.read();\n if (chunk === null) return;\n if (chunk.length > remaining) {\n conn.unshift(chunk.subarray(remaining));\n chunk = chunk.subarray(0, remaining);\n }\n remaining -= chunk.length;\n if (!body.push(chunk) && remaining > 0) return;\n }\n stop();\n body.push(null);\n };\n const onEnd = () => {\n stop();\n body.destroy(new Error(\"The connection closed before the request body ended\"));\n };\n const body = new Readable({\n read() {\n if (reading) return onReadable();\n reading = true;\n // Pushed on first read, so the connection is not read before the body is.\n if (head.length > 0) this.push(head);\n // A half-closed connection may have ended before the body is read.\n if (conn.readableEnded) return onEnd();\n conn.on(\"readable\", onReadable);\n conn.on(\"end\", onEnd);\n },\n destroy(error, callback) {\n stop();\n callback(error);\n }\n });\n // Readers get the error through their own listeners; with none, it must not crash the process.\n body.on(\"error\", () => {});\n return {\n body,\n rest: Buffer.alloc(0)\n };\n};\n/**\n * Waits for the request body to end before the `101` is written, discarding\n * any of it the handler did not read, up to `maxBytes`.\n *\n * @internal\n */\nexport const drainBody = (body, maxBytes) => Effect.callback(resume => {\n if (body.readableEnded) return resume(Effect.void);\n let bytes = 0;\n const cleanup = finished(body, {\n readable: true,\n writable: false\n }, error => {\n done();\n resume(error ? Effect.fail(openError(error)) : Effect.void);\n });\n function onData(chunk) {\n bytes += chunk.length;\n if (maxBytes !== undefined && bytes > maxBytes) {\n done();\n resume(Effect.fail(openError(\"The request body exceeds the maximum body size\")));\n }\n }\n function done() {\n body.off(\"data\", onData);\n cleanup();\n }\n body.on(\"data\", onData);\n // A body paused by an earlier partial read must flow again.\n body.resume();\n return Effect.sync(done);\n});\n//# sourceMappingURL=upgrade.js.map"],"ignoreList":[0,1],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "clanka",
3
3
  "type": "module",
4
- "version": "0.17.0",
4
+ "version": "0.17.2",
5
5
  "publishConfig": {
6
6
  "access": "public"
7
7
  },
@@ -25,11 +25,12 @@
25
25
  "url": "https://github.com/Effectful-Tech/clanka.git"
26
26
  },
27
27
  "dependencies": {
28
- "@modelcontextprotocol/sdk": "^1.32.1",
28
+ "@anthropic-ai/claude-agent-sdk": "^0.3.314",
29
+ "@modelcontextprotocol/sdk": "^1.32.2",
29
30
  "@silvia-odwyer/photon-node": "^0.3.4",
30
31
  "@vscode/ripgrep": "^1.18.0",
31
32
  "chalk": "^6.0.1",
32
- "glob": "^13.0.6",
33
+ "glob": "^14.0.3",
33
34
  "sqlite-vec": "0.1.9",
34
35
  "tree-sitter": "^0.21.1",
35
36
  "tree-sitter-javascript": "^0.23.1",
@@ -37,37 +38,30 @@
37
38
  "turndown": "^7.2.4"
38
39
  },
39
40
  "peerDependencies": {
40
- "@anthropic-ai/claude-agent-sdk": "^0.3.314",
41
41
  "@effect/ai-openai": "^4.0.0",
42
42
  "@effect/ai-openai-compat": "^4.0.0",
43
43
  "@effect/platform-node": "^4.0.0",
44
44
  "@effect/sql-sqlite-node": "^4.0.0",
45
45
  "effect": "^4.0.0"
46
46
  },
47
- "peerDependenciesMeta": {
48
- "@anthropic-ai/claude-agent-sdk": {
49
- "optional": true
50
- }
51
- },
52
47
  "devDependencies": {
53
- "@anthropic-ai/claude-agent-sdk": "^0.3.314",
54
48
  "@anthropic-ai/sdk": "^1.3.0",
55
49
  "@changesets/changelog-github": "^1.0.1",
56
50
  "@changesets/cli": "^3.0.3",
57
- "@effect/ai-openai": "4.0.5",
58
- "@effect/ai-openai-compat": "4.0.5",
59
- "@effect/platform-node": "4.0.5",
60
- "@effect/sql-sqlite-node": "4.0.5",
61
- "@effect/tsgo": "0.53.1",
62
- "@effect/vitest": "4.0.5",
63
- "@types/node": "^26.6.5",
51
+ "@effect/ai-openai": "4.1.1",
52
+ "@effect/ai-openai-compat": "4.1.1",
53
+ "@effect/platform-node": "4.1.1",
54
+ "@effect/sql-sqlite-node": "4.1.1",
55
+ "@effect/tsgo": "0.63.0",
56
+ "@effect/vitest": "4.1.1",
57
+ "@types/node": "^26.6.6",
64
58
  "@types/turndown": "^5.0.6",
65
- "effect": "4.0.5",
59
+ "effect": "4.1.1",
66
60
  "husky": "^9.1.7",
67
61
  "lint-staged": "^17.6.0",
68
- "oxlint": "^1.88.0",
62
+ "oxlint": "^1.90.0",
69
63
  "prettier": "^3.9.10",
70
- "tsdown": "^0.23.1",
64
+ "tsdown": "^0.23.4",
71
65
  "typescript": "^7.0.2",
72
66
  "vitest": "^5.0.5"
73
67
  },
package/src/Agent.test.ts CHANGED
@@ -144,6 +144,75 @@ describe("Agent", () => {
144
144
  }),
145
145
  ),
146
146
  )
147
+
148
+ it.effect("gives a sub-agent its own model instance", () =>
149
+ Effect.gen(function* () {
150
+ // Which model instance served each call, by the agent that made it.
151
+ const calls: Array<{
152
+ readonly child: boolean
153
+ readonly instance: number
154
+ }> = []
155
+ let instances = 0
156
+ const modelLayer = Layer.mergeAll(
157
+ Layer.effect(
158
+ LanguageModel.LanguageModel,
159
+ Effect.suspend(() => {
160
+ const instance = ++instances
161
+ return LanguageModel.make({
162
+ generateText: () => Effect.succeed([]),
163
+ streamText: ({ prompt }) => {
164
+ const child = JSON.stringify(prompt).includes("TASK-CHILD")
165
+ const index = calls.push({ child, instance }) - 1
166
+ return Stream.make(
167
+ toolCall(`call-${index}`, child || index > 0 ? "done" : ""),
168
+ )
169
+ },
170
+ })
171
+ }),
172
+ ),
173
+ Layer.succeed(Model.ProviderName, "test-provider"),
174
+ Layer.succeed(Model.ModelName, "test-model"),
175
+ )
176
+ // The root delegates once in the foreground, then every agent finishes.
177
+ const executor = makeExecutor(
178
+ ({ script, environment, subagents, onTaskComplete }) =>
179
+ Stream.fromEffect(
180
+ (script === "done"
181
+ ? onTaskComplete("done")
182
+ : subagents.delegate({
183
+ prompt: "TASK-CHILD",
184
+ background: false,
185
+ environment: new AgentExecutor.EnvironmentUpdate({
186
+ environment,
187
+ update: Option.none(),
188
+ }),
189
+ })
190
+ ).pipe(Effect.as(""), Effect.orDie),
191
+ ),
192
+ )
193
+ const agent = yield* Agent.make.pipe(
194
+ Effect.provideService(AgentExecutor.AgentExecutor, executor),
195
+ )
196
+ const exit = yield* agent.send({ prompt: "hello" }).pipe(
197
+ Effect.flatMap(Stream.runDrain),
198
+ Effect.catchTag("AgentFinished", () => Effect.void),
199
+ Effect.provide(
200
+ Layer.mergeAll(
201
+ modelLayer,
202
+ Agent.ConversationMode.layer(false),
203
+ Agent.layerSubagentModel(modelLayer),
204
+ ),
205
+ ),
206
+ Effect.exit,
207
+ )
208
+ assert.deepStrictEqual(exit, Exit.void)
209
+ const root = calls.filter((call) => !call.child)
210
+ const child = calls.filter((call) => call.child)
211
+ assert.lengthOf(root, 2)
212
+ assert.lengthOf(child, 1)
213
+ assert.notStrictEqual(child[0]!.instance, root[0]!.instance)
214
+ }).pipe(Effect.scoped),
215
+ )
147
216
  })
148
217
 
149
218
  // =============================================================================
package/src/Agent.ts CHANGED
@@ -1680,6 +1680,10 @@ export class SubagentModel extends Context.Service<
1680
1680
  >()("clanka/Agent/SubagentModel") {}
1681
1681
 
1682
1682
  /**
1683
+ * The model every sub-agent runs on. Each sub-agent builds its own instance,
1684
+ * even when `layer` is also this agent's model layer, so a stateful model
1685
+ * such as Claude Agent never shares its session with another agent.
1686
+ *
1683
1687
  * @since 1.0.0
1684
1688
  * @category Subagent model
1685
1689
  */
@@ -1694,7 +1698,7 @@ export const layerSubagentModel = <E, R>(
1694
1698
  SubagentModel,
1695
1699
  Effect.gen(function* () {
1696
1700
  const services = yield* Effect.context<R>()
1697
- return Layer.orDie(layer).pipe(
1701
+ return Layer.fresh(Layer.orDie(layer)).pipe(
1698
1702
  Layer.provide(Layer.succeedContext(services)),
1699
1703
  )
1700
1704
  }),
@@ -25,6 +25,7 @@ import * as RpcSerialization from "effect/rpc/RpcSerialization"
25
25
  import * as RpcServer from "effect/rpc/RpcServer"
26
26
  import * as Agent from "./Agent.ts"
27
27
  import * as AgentExecutor from "./AgentExecutor.ts"
28
+ import * as AgentSkills from "./AgentSkills.ts"
28
29
  import { type ExcludableTool, subagentsUnavailable } from "./AgentTools.ts"
29
30
 
30
31
  // =============================================================================
@@ -427,11 +428,11 @@ describe("agent", () => {
427
428
  agent: {
428
429
  instructions: Option.some("CALLER-INSTRUCTIONS"),
429
430
  skills: [
430
- {
431
+ new AgentSkills.ProvidedSkill({
431
432
  name: "caller-skill",
432
433
  description: "Caller skill",
433
434
  content: "CALLER-SKILL-CONTENT",
434
- },
435
+ }),
435
436
  ],
436
437
  },
437
438
  script: 'await taskComplete(await readSkill("caller-skill"))',
@@ -515,7 +516,8 @@ describe("executor capabilities", () => {
515
516
  }),
516
517
  )
517
518
  const { tools: _, ...older } = encoded as Record<string, Schema.Json>
518
- const exit = yield* Effect.exit(Schema.decodeUnknownEffect(codec)(older))
519
+ // @effect-diagnostics-next-line preferTypedSchemaDecoder:off
520
+ const exit = Schema.decodeUnknownExit(codec)(older)
519
521
  assert.isTrue(Exit.isFailure(exit))
520
522
  }),
521
523
  )