clanka 0.17.3 → 0.18.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.
- package/README.md +24 -0
- package/dist/Acp.d.ts.map +1 -1
- package/dist/Acp.js +5 -0
- package/dist/Acp.js.map +1 -1
- package/dist/Agent.d.ts +11 -0
- package/dist/Agent.d.ts.map +1 -1
- package/dist/Agent.js +35 -15
- package/dist/Agent.js.map +1 -1
- package/dist/Agent.test.js +23 -0
- package/dist/Agent.test.js.map +1 -1
- package/dist/AgentExecutor.js +15 -2
- package/dist/AgentExecutor.js.map +1 -1
- package/dist/AgentExecutor.test.js +16 -0
- package/dist/AgentExecutor.test.js.map +1 -1
- package/dist/AgentOutput.d.ts +23 -4
- package/dist/AgentOutput.d.ts.map +1 -1
- package/dist/AgentOutput.js +19 -0
- package/dist/AgentOutput.js.map +1 -1
- package/dist/ClaudeAgent.d.ts.map +1 -1
- package/dist/ClaudeAgent.js +37 -4
- package/dist/ClaudeAgent.js.map +1 -1
- package/dist/ClaudeAgent.test.js +82 -0
- package/dist/ClaudeAgent.test.js.map +1 -1
- package/dist/Codex.js +9 -5
- package/dist/Codex.js.map +1 -1
- package/dist/Codex.test.js +26 -7
- package/dist/Codex.test.js.map +1 -1
- package/dist/Compaction.d.ts +41 -6
- package/dist/Compaction.d.ts.map +1 -1
- package/dist/Compaction.js +52 -11
- package/dist/Compaction.js.map +1 -1
- package/dist/Compaction.test.js +5 -4
- package/dist/Compaction.test.js.map +1 -1
- package/dist/CompactionTransport.test.js +11 -0
- package/dist/CompactionTransport.test.js.map +1 -1
- package/dist/Copilot.d.ts.map +1 -1
- package/dist/Copilot.js +3 -6
- package/dist/Copilot.js.map +1 -1
- package/dist/ModelLayer.d.ts +35 -6
- package/dist/ModelLayer.d.ts.map +1 -1
- package/dist/ModelLayer.js +30 -18
- package/dist/ModelLayer.js.map +1 -1
- package/dist/ModelLayer.test.js +11 -3
- package/dist/ModelLayer.test.js.map +1 -1
- package/dist/OutputFormatter.d.ts.map +1 -1
- package/dist/OutputFormatter.js +3 -0
- package/dist/OutputFormatter.js.map +1 -1
- package/dist/Xai.d.ts.map +1 -1
- package/dist/Xai.js +4 -12
- package/dist/Xai.js.map +1 -1
- package/dist/bin/{Effect-DNYYQ84C.mjs → Effect-5XYMLOiB.mjs} +31 -30
- package/dist/bin/Effect-5XYMLOiB.mjs.map +1 -0
- package/dist/bin/{Latch-BSlIwuxI.mjs → Latch-BnrpWMd1.mjs} +2 -2
- package/dist/bin/{Latch-BSlIwuxI.mjs.map → Latch-BnrpWMd1.mjs.map} +1 -1
- package/dist/bin/{McpClient-C7ctqJWo.mjs → McpClient-DoPNaNzW.mjs} +3 -3
- package/dist/bin/{McpClient-C7ctqJWo.mjs.map → McpClient-DoPNaNzW.mjs.map} +1 -1
- package/dist/bin/{OutputFormatter-DXej05JW.mjs → OutputFormatter-Dqxyk2qD.mjs} +4 -3
- package/dist/bin/{OutputFormatter-DXej05JW.mjs.map → OutputFormatter-Dqxyk2qD.mjs.map} +1 -1
- package/dist/bin/{Schema-CSQN_Zso.mjs → Schema-Box_9VZG.mjs} +6 -3
- package/dist/bin/{Schema-CSQN_Zso.mjs.map → Schema-Box_9VZG.mjs.map} +1 -1
- package/dist/bin/{SemanticSearch-BiwCnpKX.mjs → SemanticSearch-CH125AHH.mjs} +4 -4
- package/dist/bin/{SemanticSearch-BiwCnpKX.mjs.map → SemanticSearch-CH125AHH.mjs.map} +1 -1
- package/dist/bin/{Stream-Dwvj9X5X.mjs → Stream-C51usiew.mjs} +3 -3
- package/dist/bin/{Stream-Dwvj9X5X.mjs.map → Stream-C51usiew.mjs.map} +1 -1
- package/dist/bin/cli.mjs +321 -225
- package/dist/bin/cli.mjs.map +1 -1
- package/dist/bin/{upgrade-BSNjCnra.mjs → upgrade-HMRGSqq8.mjs} +4 -4
- package/dist/bin/{upgrade-BSNjCnra.mjs.map → upgrade-HMRGSqq8.mjs.map} +1 -1
- package/dist/cli.js +45 -5
- package/dist/cli.js.map +1 -1
- package/package.json +1 -1
- package/src/Acp.ts +7 -0
- package/src/Agent.test.ts +27 -0
- package/src/Agent.ts +49 -15
- package/src/AgentExecutor.test.ts +23 -1
- package/src/AgentExecutor.ts +16 -2
- package/src/AgentOutput.ts +23 -0
- package/src/ClaudeAgent.test.ts +113 -0
- package/src/ClaudeAgent.ts +51 -4
- package/src/Codex.test.ts +37 -9
- package/src/Codex.ts +25 -20
- package/src/Compaction.test.ts +18 -15
- package/src/Compaction.ts +89 -20
- package/src/CompactionTransport.test.ts +36 -0
- package/src/Copilot.ts +5 -6
- package/src/ModelLayer.test.ts +17 -2
- package/src/ModelLayer.ts +68 -22
- package/src/OutputFormatter.ts +3 -0
- package/src/Xai.ts +8 -12
- package/src/cli.ts +97 -5
- package/dist/bin/Effect-DNYYQ84C.mjs.map +0 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Ao as merge, Bt as scope, Ia as map, Kt as succeed, M as fail, Pc as identity, Ur as addFinalizer, Xr as provide, Xt as sync, Yt as suspend, Z as gen, c as as, cn as updateContext, dn as void_, mn as withFiber, nn as timeoutOrElse, p as callback, t as acquireRelease, xa as ensure } from "./Effect-5XYMLOiB.mjs";
|
|
2
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-
|
|
4
|
-
import {
|
|
3
|
+
import { n as makeUnsafe } from "./Latch-BnrpWMd1.mjs";
|
|
4
|
+
import { ei as value } from "./Schema-Box_9VZG.mjs";
|
|
5
5
|
import { Readable, finished } from "node:stream";
|
|
6
6
|
import { Buffer as Buffer$1 } from "node:buffer";
|
|
7
7
|
import * as Tls from "node:tls";
|
|
@@ -339,4 +339,4 @@ const drainBody = (body, maxBytes) => callback((resume) => {
|
|
|
339
339
|
});
|
|
340
340
|
export { drainBody, frameBody, toSocket };
|
|
341
341
|
|
|
342
|
-
//# sourceMappingURL=upgrade-
|
|
342
|
+
//# sourceMappingURL=upgrade-HMRGSqq8.mjs.map
|
|
@@ -1 +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":";;;;;;;;AAyBA,MAAM,SAAS,UAAU;AAUzB,MAAM,iBAAiB,MAAM,cAAc;CACzC,MAAM,QAAQ,KAAK,KAAK;CACxB,IAAI,UAAU,MAAM,OAAO,KAAA;CAC3B,MAAM,MAAM,CAAC,KAAK;CAClB,IAAI;CAEJ,OAAO,IAAI,SAAS,cAAc,QAAQ,KAAK,KAAK,OAAO,MACzD,IAAI,KAAK,KAAK;CAEhB,OAAO;AACT;AACA,MAAM,aAAY,UAASA,IAAQC,OAAW,KAAK,IAAG,UAASC,SAAO,KAAK,KAAK,CAAC;AAqEjF,MAAa,cAAc,MAAM,YAAYC,WAAiB,UAAS;CACrE,IAAI;CACJ,MAAM,QAAQC,WAAiB,KAAK;CACpC,MAAM,eAAe,MAAM;CAC3B,MAAM,WAAW,SAAS,cAAc;CACxC,MAAM,qBAAqB,SAAS,aAAa;CACjD,MAAM,YAAY,uBAAuB,YAAY,OAAO,cAAc,kBAAkB,KAAK,qBAAqB,IAAI,qBAAqB;CAC/I,MAAM,cAAc,WAAW,WAAW;CAC1C,MAAM,SAASC,IAAW,aAAa;EACrC,MAAMC,UAAQ,OAAOC;EACrB,IAAI,OAAO,OAAOC,QAAc,MAAMF,OAAK,CAAC,CAAC,KAAK,SAAS,gBAAgB,KAAA,IAAYG,cAAqB;GAC1G,UAAU,QAAQ;GAClB,cAAcC,KAAY,IAAIC,YAAmB,EAC/C,QAAQ,IAAIC,gBAAuB;IACjC,MAAM;IACN,OAAO,IAAI,MAAM,sBAAsB;GACzC,CAAC,EACH,CAAC,CAAC;EACJ,CAAC,IAAI,QAAQ;EACb,IAAI;EACJ,IAAI;EAEJ,IAAI;EACJ,IAAI,UAAU;EACd,IAAI,SAAS;EACb,IAAI,mBAAmB;EAGvB,SAAS,QAAQ;GACf,IAAI,WAAW,KAAA,KAAa,SAAS;GACrC,IAAI,QAAQ;GACZ,UAAU,KAAA;GACV,IAAI,UAAU,KAAA,KAAa,CAAC,QAAQ;IAGlC,UAAU;IACV,IAAI;KACF,QAAQ,cAAc,MAAM,SAAS;IACvC,UAAU;KACR,UAAU;IACZ;GACF;GAEA,IAAI,QAAQ,QAAQ,KAAA;GACpB,IAAI,WAAW,KAAA,GAAW;IACxB,UAAU;IACV;GACF;GACA,MAAM,SAAS,UAAU,KAAA,IAAYC,QAAe,KAAK,IAAI,UAAU,KAAA,IAAYH,KAAY,KAAK,IAAI,KAAA;GACxG,IAAI,WAAW,KAAA,GAAW;GAC1B,MAAM,SAAS;GACf,SAAS,KAAA;GACT,OAAO,MAAM;EACf;EAEA,SAAS,IAAI,KAAK;GAChB,UAAU;GACV,MAAM;EACR;EAEA,SAAS,MAAM,KAAK;GAClB,UAAU;GACV,SAAS;GACT,UAAU,KAAA;GACV,MAAM;EACR;EACA,SAAS,QAAQ;GACf,IAAI,IAAIC,YAAmB,EACzB,QAAQ,IAAIG,iBAAwB,EAClC,MAAM,IACR,CAAC,EACH,CAAC,CAAC;EACJ;EACA,SAAS,QAAQ,OAAO;GACtB,MAAM,IAAIH,YAAmB,EAC3B,QAAQ,IAAII,gBAAuB,EACjC,MACF,CAAC,EACH,CAAC,CAAC;EACJ;EACA,SAAS,QAAQ,UAAU;GACzB,MAAM,MAAM,IAAIJ,YAAmB,EACjC,QAAQ,IAAIG,iBAAwB,EAClC,MAAM,WAAW,OAAO,IAC1B,CAAC,EACH,CAAC;GACD,IAAI,UAAU,MAAM,GAAG;QAAO,IAAI,GAAG;EACvC;EACA,SAAS,oBAAoB,MAAM;GACjC,KAAK,GAAG,YAAY,KAAK;GACzB,KAAK,GAAG,OAAO,KAAK;GACpB,KAAK,GAAG,SAAS,OAAO;GACxB,KAAK,GAAG,SAAS,OAAO;EAC1B;EACA,SAAS,oBAAoB,MAAM;GACjC,KAAK,IAAI,YAAY,KAAK;GAC1B,KAAK,IAAI,OAAO,KAAK;GACrB,KAAK,IAAI,SAAS,OAAO;GACzB,KAAK,IAAI,SAAS,OAAO;EAC3B;EAGA,IAAI,CAAC,QAAQ,KAAK,MAAM;EACxB,oBAAoB,IAAI;EACxB,OAAOE,aAAmBV,SAAOW,WAAkB;GAEjD,MAAM,IAAIN,YAAmB,EAC3B,QAAQ,IAAIG,iBAAwB,EAClC,MAAM,KACR,CAAC,EACH,CAAC,CAAC;GACF,oBAAoB,IAAI;GACxB,MAAM,YAAY;GAClB,gBAAgB,KAAA;GAChB,mBAAmB;EACrB,CAAC,CAAC;EACF,gBAAgB;EAChB,MAAM,WAAW;EACjB,MAAM,OAAOI,UAAgB,WAAU;GACrC,SAAS;GACT,MAAM;GAEN,IAAI,WAAW,QAAQ;GACvB,OAAOD,WAAkB;IACvB,IAAI,WAAW,QAAQ,SAAS,KAAA;GAClC,CAAC;EACH,CAAC;EACD,MAAM,WAAW,iBAAiB,CAAC,MAAME,cAAqB;GAC5D,IAAI,CAAC,kBACH,OAAOT,KAAY,IAAIC,YAAmB,EACxC,QAAQ,IAAIS,mBAA0B,EACpC,OAAO,IAAI,MAAM,sCAAsC,EACzD,CAAC,EACH,CAAC,CAAC;GAEJ,MAAM,SAAS,eAAe,QAAQ,KAAA;GACtC,MAAM,UAAU,eAAe,SAAS,KAAA;GACxC,IAAI,aAAa,CAAC,UAAU,CAAC,YAAY,WAAW,SAClD,OAAOV,KAAY,IAAIC,YAAmB,EACxC,QAAQ,IAAIS,mBAA0B,EACpC,OAAO,IAAI,MAAM,WAAW,kDAAkD,wDAAwD,EACxI,CAAC,EACH,CAAC,CAAC;GAEJ,OAAOF,UAAgB,WAAU;IAC/B,MAAM,MAAM;IACZ,oBAAoB,GAAG;IACvB,IAAI;IACJ,IAAI;KAOF,MAAM,aAAa;MACjB,eAPoB,IAAI,oBAAoB;OAC5C,KAAK,eAAe,QAAQ,KAAA,IAAY,KAAA,IAAYlB,IAAQC,OAAW,eAAe,GAAG,IAAG,YAASC,SAAO,KAAKmB,MAAeC,OAAK,CAAC,CAAC;OACvI,MAAM,eAAe,SAAS,KAAA,IAAY,KAAA,IAAY,UAAU,eAAe,IAAI;OACnF,IAAI,eAAe,OAAO,KAAA,IAAY,KAAA,IAAY,UAAU,eAAe,EAAE;OAC7E,YAAY,eAAe,eAAe,KAAA,IAAY,KAAA,IAAYD,MAAe,eAAe,UAAU;MAC5G,CAEc;MACZ,eAAe,eAAe,kBAAkB,KAAA,IAAY,KAAA,IAAY,CAAC,GAAG,eAAe,aAAa;MACxG,aAAa,eAAe;MAC5B,oBAAoB,eAAe;KACrC;KACA,MAAM,WAAW,IAAI,IAAI,UAAU,KAAK;MACtC,GAAG;MACH,UAAU;KACZ,CAAC,IAAI,IAAI,QAAQ;MACf,GAAG;MACH,YAAY,eAAe;MAC3B,QAAQ;KACV,CAAC;IACH,SAAS,OAAO;KACd,oBAAoB,GAAG;KACvB,OAAOX,KAAY,IAAIC,YAAmB,EACxC,QAAQ,IAAIS,mBAA0B,EACpC,MACF,CAAC,EACH,CAAC,CAAC,CAAC;KACH;IACF;IACA,OAAO;IACP,gBAAgB;IAChB,IAAI,MAAM;IACV,SAAS,UAAU;KACjB,IAAI,IAAI,aAAa,OAAO;KAC5B,IAAI,IAAI,SAAS,WAAW;KAC5B,IAAI,IAAI,SAAS,cAAc;IACjC;IACA,SAAS,UAAU;KACjB,QAAQ;KACR,mBAAmB;KACnB,oBAAoB,GAAG;KACvB,OAAOG,KAAW;IACpB;IACA,SAAS,YAAY,OAAO;KAC1B,QAAQ;KACR,MAAM,eAAe,IAAIZ,YAAmB,EAC1C,QAAQ,IAAIS,mBAA0B,EACpC,MACF,CAAC,EACH,CAAC;KACD,MAAM,YAAY;KAClB,OAAOV,KAAY,YAAY,CAAC;IAClC;IACA,SAAS,iBAAiB;KACxB,YAAY,IAAI,MAAM,kCAAkC,CAAC;IAC3D;IACA,IAAI,KAAK,aAAa,OAAO;IAC7B,IAAI,KAAK,SAAS,WAAW;IAC7B,IAAI,KAAK,SAAS,cAAc;IAChC,OAAOO,WAAkB;KACvB,QAAQ;KACR,MAAM,IAAIN,YAAmB,EAC3B,QAAQ,IAAIG,iBAAwB,EAClC,MAAM,KACR,CAAC,EACH,CAAC,CAAC;KACF,IAAI,QAAQ;IACd,CAAC;GACH,CAAC;EACH,CAAC;EACD,OAAO;GACL;GACA;EACF;CACF,CAAC,CAAC,CAAC,KAAKU,eAAqB,UAASC,MAAc,cAAc,KAAK,CAAC,CAAC;CACzE,MAAM,cAAa,SAAQP,UAAgB,WAAU;EACnD,SAAS,UAAU;GACjB,KAAK,IAAI,SAAS,OAAO;GACzB,KAAK,IAAI,SAAS,OAAO;GACzB,KAAK,IAAI,SAAS,OAAO;EAC3B;EACA,SAAS,UAAU;GACjB,QAAQ;GACR,OAAOK,KAAW;EACpB;EACA,SAAS,QAAQ,OAAO;GACtB,QAAQ;GACR,OAAOb,KAAY,IAAIC,YAAmB,EACxC,QAAQ,IAAIe,iBAAwB,EAClC,MACF,CAAC,EACH,CAAC,CAAC,CAAC;EACL;EACA,SAAS,UAAU;GACjB,QAAQ;GACR,OAAOhB,KAAY,IAAIC,YAAmB,EACxC,QAAQ,IAAIe,iBAAwB,EAClC,OAAO,IAAI,MAAM,eAAe,EAClC,CAAC,EACH,CAAC,CAAC,CAAC;EACL;EACA,KAAK,GAAG,SAAS,OAAO;EACxB,KAAK,GAAG,SAAS,OAAO;EACxB,KAAK,GAAG,SAAS,OAAO;EACxB,OAAOT,KAAY,OAAO;CAC5B,CAAC;CACD,MAAM,SAAQ,UAASE,cAAqB;EAC1C,MAAM,OAAO;EACb,IAAI,SAAS,KAAA,GAAW,OAAO,MAAM,SAAS,MAAM,KAAK,CAAC;EAC1D,IAAIQ,aAAoB,KAAK,GAAG;GAC9B,KAAK,QAAQ,MAAM,OAAO,MAAO,IAAI,MAAM,oBAAoB,MAAM,MAAM,IAAI,KAAA,CAAS;GACxF,OAAOJ;EACT;EACA,IAAI;GACF,OAAO,KAAK,MAAM,KAAK,IAAIA,QAAc,WAAW,IAAI;EAC1D,SAAS,OAAO;GACd,OAAOb,KAAY,IAAIC,YAAmB,EACxC,QAAQ,IAAIe,iBAAwB,EAClC,MACF,CAAC,EACH,CAAC,CAAC;EACJ;CACF,CAAC;CACD,MAAM,YAAW,WAAUP,cAAqB;EAC9C,MAAM,OAAO;EACb,IAAI,SAAS,KAAA,GAAW,OAAO,MAAM,SAAS,SAAS,MAAM,CAAC;EAC9D,IAAI,aAAa;EACjB,IAAI;GACF,IAAI,OAAO,WAAW,GACpB,aAAa,CAAC,KAAK,MAAM,OAAO,EAAE;QAC7B;IACL,KAAK,KAAK;IACV,IAAI;KACF,KAAK,IAAI,IAAI,GAAG,IAAI,OAAO,QAAQ,KACjC,aAAa,CAAC,KAAK,MAAM,OAAO,EAAE,KAAK;IAE3C,UAAU;KACR,KAAK,OAAO;IACd;GACF;EACF,SAAS,OAAO;GACd,OAAOT,KAAY,IAAIC,YAAmB,EACxC,QAAQ,IAAIe,iBAAwB,EAClC,MACF,CAAC,EACH,CAAC,CAAC;EACJ;EACA,OAAO,aAAa,WAAW,IAAI,IAAIH;CACzC,CAAC;CACD,MAAM,SAASK,eAAsBf,QAAe;EAClD;EACA;CACF,CAAC,SAASI,WAAkB;EAC1B,IAAI,CAAC,iBAAiB,cAAc,eAAe;EACnD,cAAc,IAAI;CACpB,CAAC,CAAC;CACF,OAAOJ,QAAegB,KAAY;EAChC;EACA;CACF,CAAC,CAAC;AACJ,CAAC;;AC5ZD,MAAa,YAAY,MAAM,OAAOC,UAAgBC,WAAsBC,eAAsBC,cAAqB,KAAK,YAAYC,KAAY,UAAU,mDAAmD,CAAC,IAAIC,GAAU,MAAM,IAAI,CAAC,IAAG,SAAQC,WAAkB;CACtQ,IAAI,KAAK,WAAW;CACpB,IAAI,iBAAiB,MAEnB,KAAK,YAAY;MAEjB,KAAK,QAAQ;AAEjB,CAAC,CAAC,CAAC;AACH,MAAM,aAAY,UAAS,IAAIC,YAAmB,EAChD,QAAQ,IAAIC,gBAAuB;CACjC,MAAM;CACN,OAAO,OAAO,UAAU,WAAW,IAAI,MAAM,KAAK,IAAI;AACxD,CAAC,EACH,CAAC;AAQD,MAAa,aAAa,MAAM,MAAM,WAAW;CAC/C,IAAI,KAAK,UAAU,QACjB,OAAO;EACL,MAAM,SAAS,KAAK,WAAW,IAAI,CAAC,IAAI,CAAC,KAAK,SAAS,GAAG,MAAM,CAAC,GAAG,EAClE,YAAY,MACd,CAAC;EACD,MAAM,KAAK,SAAS,MAAM;CAC5B;CAEF,IAAI,YAAY,SAAS,KAAK;CAC9B,IAAI,UAAU;CACd,MAAM,aAAa;EACjB,KAAK,IAAI,YAAY,UAAU;EAC/B,KAAK,IAAI,OAAO,KAAK;CACvB;CACA,MAAM,mBAAmB;EACvB,OAAO,YAAY,GAAG;GACpB,IAAI,QAAQ,KAAK,KAAK;GACtB,IAAI,UAAU,MAAM;GACpB,IAAI,MAAM,SAAS,WAAW;IAC5B,KAAK,QAAQ,MAAM,SAAS,SAAS,CAAC;IACtC,QAAQ,MAAM,SAAS,GAAG,SAAS;GACrC;GACA,aAAa,MAAM;GACnB,IAAI,CAAC,KAAK,KAAK,KAAK,KAAK,YAAY,GAAG;EAC1C;EACA,KAAK;EACL,KAAK,KAAK,IAAI;CAChB;CACA,MAAM,cAAc;EAClB,KAAK;EACL,KAAK,QAAQ,IAAI,MAAM,qDAAqD,CAAC;CAC/E;CACA,MAAM,OAAO,IAAI,SAAS;EACxB,OAAO;GACL,IAAI,SAAS,OAAO,WAAW;GAC/B,UAAU;GAEV,IAAI,KAAK,SAAS,GAAG,KAAK,KAAK,IAAI;GAEnC,IAAI,KAAK,eAAe,OAAO,MAAM;GACrC,KAAK,GAAG,YAAY,UAAU;GAC9B,KAAK,GAAG,OAAO,KAAK;EACtB;EACA,QAAQ,OAAO,UAAU;GACvB,KAAK;GACL,SAAS,KAAK;EAChB;CACF,CAAC;CAED,KAAK,GAAG,eAAe,CAAC,CAAC;CACzB,OAAO;EACL;EACA,MAAM,OAAO,MAAM,CAAC;CACtB;AACF;AAOA,MAAa,aAAa,MAAM,aAAaC,UAAgB,WAAU;CACrE,IAAI,KAAK,eAAe,OAAO,OAAOT,KAAW;CACjD,IAAI,QAAQ;CACZ,MAAM,UAAU,SAAS,MAAM;EAC7B,UAAU;EACV,UAAU;CACZ,IAAG,UAAS;EACV,KAAK;EACL,OAAO,QAAQI,KAAY,UAAU,KAAK,CAAC,IAAIJ,KAAW;CAC5D,CAAC;CACD,SAAS,OAAO,OAAO;EACrB,SAAS,MAAM;EACf,IAAI,aAAa,KAAA,KAAa,QAAQ,UAAU;GAC9C,KAAK;GACL,OAAOI,KAAY,UAAU,gDAAgD,CAAC,CAAC;EACjF;CACF;CACA,SAAS,OAAO;EACd,KAAK,IAAI,QAAQ,MAAM;EACvB,QAAQ;CACV;CACA,KAAK,GAAG,QAAQ,MAAM;CAEtB,KAAK,OAAO;CACZ,OAAOE,KAAY,IAAI;AACzB,CAAC"}
|
|
1
|
+
{"version":3,"file":"upgrade-HMRGSqq8.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/dist/cli.js
CHANGED
|
@@ -102,6 +102,26 @@ const parseModelId = (modelId) => {
|
|
|
102
102
|
};
|
|
103
103
|
const ModelId = Schema.String.pipe(Schema.check(Schema.makeFilter((modelId) => Option.isSome(parseModelId(modelId)) ||
|
|
104
104
|
`Invalid model "${modelId}", expected <provider>/<model>[/<effort>] with effort one of ${Acp.ThoughtLevel.literals.join(", ")}`)));
|
|
105
|
+
// An `--subagent-model` or `--summarizer-model` value. Without an effort, the
|
|
106
|
+
// provider's default effort is used.
|
|
107
|
+
const auxiliaryModel = (options) => Flag.String(options.name).pipe(Flag.withDescription(`${options.description} As <provider>/<model>[/<effort>], e.g. openai/gpt-6-astra/low; also ${options.env}.`), Flag.withFallbackConfig(Config.String(options.env)), Flag.withSchema(ModelId), Flag.map((modelId) => {
|
|
108
|
+
const [provider, model, effort] = modelId.split("/");
|
|
109
|
+
return { provider, model, effort };
|
|
110
|
+
}), Flag.optional);
|
|
111
|
+
const subagentModel = auxiliaryModel({
|
|
112
|
+
name: "subagent-model",
|
|
113
|
+
env: "CLANKA_SUBAGENT_MODEL",
|
|
114
|
+
description: "Run sub-agents on this model instead of the agent's model.",
|
|
115
|
+
});
|
|
116
|
+
const summarizerModel = auxiliaryModel({
|
|
117
|
+
name: "summarizer-model",
|
|
118
|
+
env: "CLANKA_SUMMARIZER_MODEL",
|
|
119
|
+
description: "Summarize the history for compaction with this model instead of the agent's model.",
|
|
120
|
+
});
|
|
121
|
+
const auxiliaryModels = (flags) => ({
|
|
122
|
+
subagent: Option.getOrUndefined(flags.subagentModel),
|
|
123
|
+
summarizer: Option.getOrUndefined(flags.summarizerModel),
|
|
124
|
+
});
|
|
105
125
|
const provider = Flag.Literals("provider", providers).pipe(Flag.withAlias("p"), Flag.withFallbackPrompt(Prompt.Select({
|
|
106
126
|
message: "Select a provider",
|
|
107
127
|
choices: [
|
|
@@ -133,6 +153,19 @@ const semantic = Flag.Directory("search").pipe(Flag.withDescription("Directory f
|
|
|
133
153
|
const prompt = Flag.String("prompt").pipe(Flag.withDescription("Pass a prompt in non-interactive mode"), Flag.optional);
|
|
134
154
|
// Kill switch: `--no-compaction` or CLANKA_COMPACTION=false.
|
|
135
155
|
const compaction = Flag.Boolean("compaction").pipe(Flag.withDescription("Auto-compact the conversation history when it nears the context window. Disable with --no-compaction or CLANKA_COMPACTION=false; the execute output cap stays on."), Flag.withFallbackConfig(Config.Boolean("CLANKA_COMPACTION").pipe(Config.withDefault(true))));
|
|
156
|
+
const NonNegativeInt = Schema.Int.pipe(Schema.check(Schema.isGreaterThanOrEqualTo(0)));
|
|
157
|
+
// A compaction token setting, defaulting to `Compaction.defaultConfig`.
|
|
158
|
+
const tokens = (options) => Flag.Int(options.name).pipe(Flag.withDescription(`${options.description} Defaults to ${options.env} or ${options.defaultValue}.`), Flag.withFallbackConfig(Config.Int(options.env).pipe(Config.withDefault(options.defaultValue))), Flag.withSchema(NonNegativeInt));
|
|
159
|
+
const compactionThreshold = tokens({
|
|
160
|
+
name: "compaction-threshold",
|
|
161
|
+
env: "CLANKA_COMPACTION_THRESHOLD",
|
|
162
|
+
description: "Compact once the context exceeds this many tokens, or the context window minus its reserve when that is lower.",
|
|
163
|
+
defaultValue: Compaction.defaultConfig.thresholdTokens,
|
|
164
|
+
});
|
|
165
|
+
const compactionConfig = (flags) => Compaction.CompactionConfig.layer({
|
|
166
|
+
enabled: flags.compaction,
|
|
167
|
+
thresholdTokens: flags.compactionThreshold,
|
|
168
|
+
});
|
|
136
169
|
// Kill switch: `--no-mcp` or CLANKA_MCP=false.
|
|
137
170
|
const mcp = Flag.Boolean("mcp").pipe(Flag.withDescription("Start the MCP servers from ~/.config/clanka/mcp.json, ./.mcp.json and --mcp-config. Disable with --no-mcp or CLANKA_MCP=false."), Flag.withFallbackConfig(Config.Boolean("CLANKA_MCP").pipe(Config.withDefault(true))));
|
|
138
171
|
const mcpConfig = Flag.String("mcp-config").pipe(Flag.withDescription('An MCP config file in the { "mcpServers": { ... } } format. Repeatable; a later file wins.'), Flag.atLeast(0));
|
|
@@ -176,9 +209,12 @@ const acp = Command.make("acp", {
|
|
|
176
209
|
trustAllTools,
|
|
177
210
|
fast,
|
|
178
211
|
compaction,
|
|
212
|
+
compactionThreshold,
|
|
213
|
+
subagentModel,
|
|
214
|
+
summarizerModel,
|
|
179
215
|
apiKey,
|
|
180
216
|
apiUrl,
|
|
181
|
-
}).pipe(Command.withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), Command.withHandler(({ model, fast, apiKey, apiUrl }) => Effect.gen(function* () {
|
|
217
|
+
}).pipe(Command.withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), Command.withHandler(({ model, fast, apiKey, apiUrl, ...flags }) => Effect.gen(function* () {
|
|
182
218
|
const repo = yield* ModelsRepo.ModelsRepo;
|
|
183
219
|
const defaultThoughtLevel = yield* reasoning;
|
|
184
220
|
return yield* Acp.runStdio({
|
|
@@ -195,9 +231,10 @@ const acp = Command.make("acp", {
|
|
|
195
231
|
apiKey: Option.getOrUndefined(apiKey),
|
|
196
232
|
apiUrl: Option.getOrUndefined(apiUrl),
|
|
197
233
|
},
|
|
234
|
+
auxiliary: auxiliaryModels(flags),
|
|
198
235
|
}),
|
|
199
236
|
});
|
|
200
|
-
})), Command.provide((
|
|
237
|
+
})), Command.provide((flags) => Layer.mergeAll(Agent.ConversationMode.layer(false), Layer.succeed(Logger.LogToStderr, true), DeviceCodeHandler.layerLog, compactionConfig(flags))));
|
|
201
238
|
Command.make("clanka", {
|
|
202
239
|
provider,
|
|
203
240
|
model,
|
|
@@ -205,11 +242,14 @@ Command.make("clanka", {
|
|
|
205
242
|
semantic,
|
|
206
243
|
prompt,
|
|
207
244
|
compaction,
|
|
245
|
+
compactionThreshold,
|
|
246
|
+
subagentModel,
|
|
247
|
+
summarizerModel,
|
|
208
248
|
apiKey,
|
|
209
249
|
apiUrl,
|
|
210
250
|
mcp,
|
|
211
251
|
mcpConfig,
|
|
212
|
-
}).pipe(Command.withHandler(Effect.fnUntraced(function* ({ provider, model: modelRaw, fast, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, mcp, mcpConfig, }) {
|
|
252
|
+
}).pipe(Command.withHandler(Effect.fnUntraced(function* ({ provider, model: modelRaw, fast, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, mcp, mcpConfig, ...flags }) {
|
|
213
253
|
const stdio = yield* Stdio.Stdio;
|
|
214
254
|
const mcpServers = yield* McpConfig.load({
|
|
215
255
|
cwd: process.cwd(),
|
|
@@ -227,7 +267,7 @@ Command.make("clanka", {
|
|
|
227
267
|
const Model = ModelLayer.make(provider, model, effort, {
|
|
228
268
|
apiKey: Option.getOrUndefined(apiKey),
|
|
229
269
|
apiUrl: Option.getOrUndefined(apiUrl),
|
|
230
|
-
}, fast);
|
|
270
|
+
}, fast, auxiliaryModels(flags));
|
|
231
271
|
return yield* Effect.gen(function* () {
|
|
232
272
|
const agent = yield* Agent.Agent;
|
|
233
273
|
if (Option.isSome(nonInteractivePrompt)) {
|
|
@@ -253,7 +293,7 @@ Command.make("clanka", {
|
|
|
253
293
|
})), Layer.provideMerge(McpServers.layer(mcpServers))),
|
|
254
294
|
Model,
|
|
255
295
|
]));
|
|
256
|
-
})), Command.provide(({ prompt,
|
|
296
|
+
})), Command.provide(({ prompt, ...flags }) => Layer.mergeAll(Agent.ConversationMode.layer(Option.isNone(prompt)), compactionConfig(flags))), Command.withSubcommands([acp]), Command.withGlobalFlags([ReportedVersion]), Command.run({
|
|
257
297
|
version,
|
|
258
298
|
}), Effect.provide([
|
|
259
299
|
NodeServices.layer,
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Acp.ts
CHANGED
|
@@ -905,6 +905,13 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
905
905
|
`Retrying after error: ${part.error.message}\n`,
|
|
906
906
|
),
|
|
907
907
|
})
|
|
908
|
+
case "SessionRestarted":
|
|
909
|
+
return update(session.id, {
|
|
910
|
+
sessionUpdate: "agent_thought_chunk",
|
|
911
|
+
content: textContent(
|
|
912
|
+
`Session restarted (${part.reason}): ${part.contextTokens} context tokens resent, ${part.cacheWrite} cache write\n`,
|
|
913
|
+
),
|
|
914
|
+
})
|
|
908
915
|
// A background agent's tool call stays in progress until the agent
|
|
909
916
|
// finishes, while the parent keeps taking turns.
|
|
910
917
|
case "SubagentStart": {
|
package/src/Agent.test.ts
CHANGED
|
@@ -1579,3 +1579,30 @@ describe("Agent history events", () => {
|
|
|
1579
1579
|
}),
|
|
1580
1580
|
)
|
|
1581
1581
|
})
|
|
1582
|
+
|
|
1583
|
+
describe("Agent session restarts", () => {
|
|
1584
|
+
it.effect("reports a provider session restart with its cost", () =>
|
|
1585
|
+
Effect.gen(function* () {
|
|
1586
|
+
const { exit, outputs } = yield* runAgentCollect({
|
|
1587
|
+
respond: (_call, index) =>
|
|
1588
|
+
index === 0
|
|
1589
|
+
? Stream.fromIterable([toolCall("call-1", "ls()"), finish(1_000)])
|
|
1590
|
+
: Stream.fromIterable([
|
|
1591
|
+
...text("done"),
|
|
1592
|
+
{
|
|
1593
|
+
...finish(30_000, "stop", { write: 25_000 }),
|
|
1594
|
+
metadata: {
|
|
1595
|
+
clanka: { historyResent: { reason: "history-changed" } },
|
|
1596
|
+
},
|
|
1597
|
+
},
|
|
1598
|
+
]),
|
|
1599
|
+
})
|
|
1600
|
+
assert.deepStrictEqual(exit, Exit.succeed("done"))
|
|
1601
|
+
const restarts = outputsOfTag(outputs, "SessionRestarted")
|
|
1602
|
+
assert.lengthOf(restarts, 1)
|
|
1603
|
+
assert.strictEqual(restarts[0]!.reason, "history-changed")
|
|
1604
|
+
assert.strictEqual(restarts[0]!.contextTokens, 30_000)
|
|
1605
|
+
assert.strictEqual(restarts[0]!.cacheWrite, 25_000)
|
|
1606
|
+
}),
|
|
1607
|
+
)
|
|
1608
|
+
})
|
package/src/Agent.ts
CHANGED
|
@@ -69,6 +69,7 @@ import {
|
|
|
69
69
|
ExecuteOutputCapped,
|
|
70
70
|
CompactionStarted,
|
|
71
71
|
CompactionEnded,
|
|
72
|
+
SessionRestarted,
|
|
72
73
|
EnvironmentUpdated,
|
|
73
74
|
HistoryAppended,
|
|
74
75
|
HistoryReplaced,
|
|
@@ -282,7 +283,7 @@ export const makeWith = Effect.fnUntraced(function* <
|
|
|
282
283
|
const maxRetries = yield* MaxRetries
|
|
283
284
|
let finalSummary = Option.none<string>()
|
|
284
285
|
// `inputTokens.total` from the most recent finish part; undefined until
|
|
285
|
-
// the first response and after every
|
|
286
|
+
// the first response and after every rewrite of the history.
|
|
286
287
|
let lastContextTokens: number | undefined = undefined
|
|
287
288
|
// Images stay in the Prompt; this only decides whether they are sent.
|
|
288
289
|
// Starts false for models known not to take images, and flips to false
|
|
@@ -329,6 +330,7 @@ export const makeWith = Effect.fnUntraced(function* <
|
|
|
329
330
|
}
|
|
330
331
|
const replaceHistory = (next: Prompt.Prompt) => {
|
|
331
332
|
MutableRef.set(prompt, next)
|
|
333
|
+
lastContextTokens = undefined
|
|
332
334
|
if (!opts.historyEvents) return
|
|
333
335
|
Queue.offerUnsafe(
|
|
334
336
|
output,
|
|
@@ -776,7 +778,6 @@ ${prompt}`,
|
|
|
776
778
|
),
|
|
777
779
|
),
|
|
778
780
|
)
|
|
779
|
-
lastContextTokens = undefined
|
|
780
781
|
tokensBefore = result.value.tokensBefore
|
|
781
782
|
tokensAfter = result.value.tokensAfter
|
|
782
783
|
} else {
|
|
@@ -999,15 +1000,12 @@ ${Compaction.capOutput(turn.output ?? "").output}
|
|
|
999
1000
|
toolkit: singleTool,
|
|
1000
1001
|
}),
|
|
1001
1002
|
),
|
|
1002
|
-
Stream.takeUntil(
|
|
1003
|
-
|
|
1003
|
+
Stream.takeUntil(
|
|
1004
|
+
(part) =>
|
|
1005
|
+
modelConfig.cutStreamOnSteering !== false &&
|
|
1004
1006
|
(part.type === "text-end" || part.type === "reasoning-end") &&
|
|
1005
|
-
mailbox.messages.size > 0
|
|
1006
|
-
|
|
1007
|
-
return true
|
|
1008
|
-
}
|
|
1009
|
-
return false
|
|
1010
|
-
}),
|
|
1007
|
+
mailbox.messages.size > 0,
|
|
1008
|
+
),
|
|
1011
1009
|
Stream.runForEachArray((parts) => {
|
|
1012
1010
|
response.push(...parts)
|
|
1013
1011
|
turnTimeoutReset()
|
|
@@ -1061,6 +1059,16 @@ ${Compaction.capOutput(turn.output ?? "").output}
|
|
|
1061
1059
|
if (usage.inputTokens.cacheWrite !== undefined) {
|
|
1062
1060
|
cacheWrite += usage.inputTokens.cacheWrite
|
|
1063
1061
|
}
|
|
1062
|
+
if (isHistoryResent(part.metadata)) {
|
|
1063
|
+
maybeSend({
|
|
1064
|
+
agentId,
|
|
1065
|
+
part: new SessionRestarted({
|
|
1066
|
+
reason: part.metadata.clanka.historyResent.reason,
|
|
1067
|
+
contextTokens: usage.inputTokens.total ?? 0,
|
|
1068
|
+
cacheWrite: usage.inputTokens.cacheWrite ?? 0,
|
|
1069
|
+
}),
|
|
1070
|
+
})
|
|
1071
|
+
}
|
|
1064
1072
|
if (usage.inputTokens.total !== undefined) {
|
|
1065
1073
|
lastContextTokens = usage.inputTokens.total
|
|
1066
1074
|
inputTokens += usage.inputTokens.total
|
|
@@ -1395,6 +1403,10 @@ const generateSystemTools = (
|
|
|
1395
1403
|
) => `YOU ONLY HAVE ONE TOOL AVAILABLE: "execute", to run javascript code to do your work.
|
|
1396
1404
|
|
|
1397
1405
|
- Use \`console.log\` to print any output you need.
|
|
1406
|
+
- Print only what you need, as everything printed stays in your context.${when(
|
|
1407
|
+
tools.offers("readFile"),
|
|
1408
|
+
` Read line ranges with "startLine" / "endLine" instead of whole files.`,
|
|
1409
|
+
)} Slice or filter large results before printing them.
|
|
1398
1410
|
- Use top level await.${when(
|
|
1399
1411
|
tools.offers("search") && tools.offers("rg"),
|
|
1400
1412
|
`
|
|
@@ -1477,16 +1489,13 @@ console.log("files:", files)
|
|
|
1477
1489
|
console.log("package.json:", JSON.parse(content))
|
|
1478
1490
|
\`\`\`
|
|
1479
1491
|
|
|
1480
|
-
And then you will
|
|
1492
|
+
And then you will receive back the console output:
|
|
1481
1493
|
|
|
1482
1494
|
\`\`\`
|
|
1483
1495
|
[22:44:53.050] INFO (#47): Calling "ls" { directory: '.' }
|
|
1484
1496
|
[22:44:53.054] INFO (#47): Calling "readFile" { path: 'package.json' }
|
|
1485
1497
|
files: [ 'package.json' ]
|
|
1486
|
-
package.json: {
|
|
1487
|
-
"name": "my-project",
|
|
1488
|
-
"version": "1.0.0"
|
|
1489
|
-
}
|
|
1498
|
+
package.json: { name: 'my-project', version: '1.0.0' }
|
|
1490
1499
|
\`\`\``
|
|
1491
1500
|
|
|
1492
1501
|
const ReadSkillTools = Toolkit.make(
|
|
@@ -1770,13 +1779,38 @@ export class AgentModelConfig extends Context.Reference<{
|
|
|
1770
1779
|
* them.
|
|
1771
1780
|
*/
|
|
1772
1781
|
readonly supportsImages?: boolean | undefined
|
|
1782
|
+
/**
|
|
1783
|
+
* `false` for models whose live session does not survive a response being
|
|
1784
|
+
* cut short (Claude Code). A steering message then waits for the current
|
|
1785
|
+
* step to end instead of cutting the model stream. Defaults to `true`.
|
|
1786
|
+
*/
|
|
1787
|
+
readonly cutStreamOnSteering?: boolean | undefined
|
|
1773
1788
|
}>("clanka/Agent/SystemPromptTransform", {
|
|
1774
1789
|
defaultValue: () => ({}),
|
|
1775
1790
|
}) {
|
|
1776
1791
|
static readonly layer = (options: typeof AgentModelConfig.Service) =>
|
|
1777
1792
|
Layer.succeed(AgentModelConfig, options)
|
|
1793
|
+
/**
|
|
1794
|
+
* The keys of the service, for a provider that accepts them among its
|
|
1795
|
+
* model options to split them from its own config.
|
|
1796
|
+
*/
|
|
1797
|
+
static readonly optionKeys = [
|
|
1798
|
+
"systemPromptTransform",
|
|
1799
|
+
"supportsImages",
|
|
1800
|
+
"cutStreamOnSteering",
|
|
1801
|
+
] as const
|
|
1778
1802
|
}
|
|
1779
1803
|
|
|
1804
|
+
// A provider that had to send the whole history again says so, and why, in
|
|
1805
|
+
// `metadata.clanka.historyResent` on its `finish` part.
|
|
1806
|
+
const isHistoryResent = Schema.is(
|
|
1807
|
+
Schema.Struct({
|
|
1808
|
+
clanka: Schema.Struct({
|
|
1809
|
+
historyResent: Schema.Struct({ reason: Schema.String }),
|
|
1810
|
+
}),
|
|
1811
|
+
}),
|
|
1812
|
+
)
|
|
1813
|
+
|
|
1780
1814
|
const responseToSummary = (
|
|
1781
1815
|
response: ReadonlyArray<Response.AnyPart>,
|
|
1782
1816
|
): string => {
|
|
@@ -268,6 +268,28 @@ const withSlowGh = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
|
|
|
268
268
|
}),
|
|
269
269
|
)
|
|
270
270
|
|
|
271
|
+
// Node's default `console.log` breaks values over many lines and pads short
|
|
272
|
+
// array entries into columns. That whitespace is paid for in every prompt.
|
|
273
|
+
describe("console.log in scripts", () => {
|
|
274
|
+
it.live("prints arrays and objects on one line without padding", () =>
|
|
275
|
+
Effect.gen(function* () {
|
|
276
|
+
const output = yield* runScript(`
|
|
277
|
+
console.log([".changeset", ".envrc", ".git", ".github", ".gitignore", ".husky", ".oxlintrc.json", ".prettierignore", ".prettierrc.json", ".specs", "AGENTS.md", "CHANGELOG.md", "CLAUDE.md", "README.md", "examples", "flake.lock", "flake.nix", "package.json", "pnpm-lock.yaml", "scripts", "src", "tsconfig.json", "tsdown.config.ts", "vitest.config.ts"])
|
|
278
|
+
console.log([0, 37, 74, 111, 148, 185, 222, 259, 296, 333, 370, 407, 444, 481, 518, 555, 592, 629, 666, 703, 740, 777, 814, 851, 888, 925, 962, 999, 1036, 1073])
|
|
279
|
+
console.log({ name: "my-project", version: "1.0.0", scripts: { check: "oxlint -c .oxlintrc.json --fix && pnpm tsc -b tsconfig.json", test: "vitest run" } })`)
|
|
280
|
+
const lines = output.trimEnd().split("\n")
|
|
281
|
+
assert.strictEqual(lines.length, 3, output)
|
|
282
|
+
assert.include(lines[0], "vitest.config.ts")
|
|
283
|
+
assert.include(lines[1], "1073")
|
|
284
|
+
assert.include(lines[2], "vitest run")
|
|
285
|
+
assert.notMatch(output, / {2,}/, "no padding or indentation")
|
|
286
|
+
}).pipe(
|
|
287
|
+
Effect.timeout("3 seconds"),
|
|
288
|
+
Effect.provide(executorModes.local({})),
|
|
289
|
+
),
|
|
290
|
+
)
|
|
291
|
+
})
|
|
292
|
+
|
|
271
293
|
for (const [mode, executorLayer] of Object.entries(executorModes)) {
|
|
272
294
|
describe(`${mode} executor environment`, () => {
|
|
273
295
|
// A cancelled script keeps the directory it changed to, as an ACP
|
|
@@ -533,4 +555,4 @@ sleep(100).then(() => console.constructor.constructor("return process")().exit(7
|
|
|
533
555
|
),
|
|
534
556
|
)
|
|
535
557
|
})
|
|
536
|
-
}
|
|
558
|
+
}
|
package/src/AgentExecutor.ts
CHANGED
|
@@ -1384,7 +1384,11 @@ function runScriptWorker(load: (id: string) => unknown): void {
|
|
|
1384
1384
|
})
|
|
1385
1385
|
|
|
1386
1386
|
const sandbox: Record<string, unknown> = {
|
|
1387
|
-
|
|
1387
|
+
// Matches `inspectOptions`, which the worker source cannot reference.
|
|
1388
|
+
console: new Console({
|
|
1389
|
+
stdout,
|
|
1390
|
+
inspectOptions: { colors: false, compact: true, breakLength: Infinity },
|
|
1391
|
+
}),
|
|
1388
1392
|
fetch,
|
|
1389
1393
|
process: undefined,
|
|
1390
1394
|
}
|
|
@@ -1432,6 +1436,16 @@ ${fromFailure}
|
|
|
1432
1436
|
(${runScriptWorker})(require)
|
|
1433
1437
|
`
|
|
1434
1438
|
|
|
1439
|
+
/**
|
|
1440
|
+
* Prints values on one line, without the column padding Node uses for short
|
|
1441
|
+
* array entries. `colors` replaces `colorMode`: Node rejects both together.
|
|
1442
|
+
*/
|
|
1443
|
+
const inspectOptions = {
|
|
1444
|
+
colors: false,
|
|
1445
|
+
compact: true,
|
|
1446
|
+
breakLength: Infinity,
|
|
1447
|
+
}
|
|
1448
|
+
|
|
1435
1449
|
const homeDirectory = (): Option.Option<string> => {
|
|
1436
1450
|
const fromEnv = process.env.HOME
|
|
1437
1451
|
if (fromEnv) return Option.some(fromEnv)
|
|
@@ -1448,7 +1462,7 @@ const makeConsole = Effect.fn(function* (
|
|
|
1448
1462
|
const writable = new QueueWriteStream(queue)
|
|
1449
1463
|
const newConsole = new NodeConsole.Console({
|
|
1450
1464
|
stdout: writable,
|
|
1451
|
-
|
|
1465
|
+
inspectOptions,
|
|
1452
1466
|
})
|
|
1453
1467
|
yield* Effect.addFinalizer(() => {
|
|
1454
1468
|
writable.end()
|