clanka 0.25.2 → 0.26.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Acp.d.ts +5 -37
- package/dist/Acp.d.ts.map +1 -1
- package/dist/Acp.js +33 -48
- package/dist/Acp.js.map +1 -1
- package/dist/Acp.test.js +62 -1
- package/dist/Acp.test.js.map +1 -1
- package/dist/AcpImage.test.js +3 -2
- package/dist/AcpImage.test.js.map +1 -1
- package/dist/AcpSessionStore.d.ts +114 -0
- package/dist/AcpSessionStore.d.ts.map +1 -0
- package/dist/AcpSessionStore.js +327 -0
- package/dist/AcpSessionStore.js.map +1 -0
- package/dist/AcpSessionStore.test.d.ts +2 -0
- package/dist/AcpSessionStore.test.d.ts.map +1 -0
- package/dist/AcpSessionStore.test.js +135 -0
- package/dist/AcpSessionStore.test.js.map +1 -0
- package/dist/Agent.d.ts.map +1 -1
- package/dist/Agent.js +5 -1
- package/dist/Agent.js.map +1 -1
- package/dist/Agent.test.js +20 -0
- package/dist/Agent.test.js.map +1 -1
- package/dist/ScriptFormatting.d.ts +3 -0
- package/dist/ScriptFormatting.d.ts.map +1 -0
- package/dist/ScriptFormatting.js +61 -0
- package/dist/ScriptFormatting.js.map +1 -0
- package/dist/ScriptFormatting.test.d.ts +2 -0
- package/dist/ScriptFormatting.test.d.ts.map +1 -0
- package/dist/ScriptFormatting.test.js +60 -0
- package/dist/ScriptFormatting.test.js.map +1 -0
- package/dist/bin/{AiError-CsvdOsKR.mjs → AiError-DBaKz35C.mjs} +2 -2
- package/dist/bin/{Latch-B3e9629m.mjs → Latch-DOdbsGMQ.mjs} +1 -1
- package/dist/bin/{McpClient-BCxZZgnA.mjs → McpClient-B-FFG6Pg.mjs} +1 -1
- package/dist/bin/{OutputFormatter-ByMjyBhe.mjs → OutputFormatter-DhhP2i-7.mjs} +2 -2
- package/dist/bin/{Schema-BfUmMefy.mjs → Schema-CFdSO6iH.mjs} +11 -1
- package/dist/bin/{SemanticSearch-DMzIsoZb.mjs → SemanticSearch-C3a7LAQr.mjs} +6 -6
- package/dist/bin/cli.mjs +392 -143
- package/dist/bin/{upgrade-t590zYhO.mjs → upgrade-C4aOEWJH.mjs} +2 -2
- package/dist/cli.js +10 -3
- package/dist/cli.js.map +1 -1
- package/dist/index.d.ts +4 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +4 -0
- package/dist/index.js.map +1 -1
- package/package.json +1 -1
- package/src/Acp.test.ts +120 -1
- package/src/Acp.ts +41 -55
- package/src/AcpImage.test.ts +7 -2
- package/src/AcpSessionStore.test.ts +220 -0
- package/src/AcpSessionStore.ts +455 -0
- package/src/Agent.test.ts +36 -0
- package/src/Agent.ts +5 -1
- package/src/ScriptFormatting.test.ts +66 -0
- package/src/ScriptFormatting.ts +57 -0
- package/src/cli.ts +20 -9
- package/src/index.ts +5 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { $i as gen, Ii as fail, Ml as map, Su as merge, Va as scope, Vd as identity, Ws as addFinalizer, Xa as suspend, Za as sync, Zs as provide, _i as callback, ai as acquireRelease, fi as as, fo as void_, ho as withFiber, lo as updateContext, qa as succeed, ri as value, ro as timeoutOrElse, vl as ensure } from "./Schema-CFdSO6iH.mjs";
|
|
2
2
|
import { C as make, S as isCloseEvent, _ as SocketError, b as SocketUpgradeError, g as SocketCloseError, v as SocketOpenError, x as SocketWriteError, y as SocketReadError } from "./cli.mjs";
|
|
3
|
-
import { n as makeUnsafe } from "./Latch-
|
|
3
|
+
import { n as makeUnsafe } from "./Latch-DOdbsGMQ.mjs";
|
|
4
4
|
import { Readable, finished } from "node:stream";
|
|
5
5
|
import { Buffer as Buffer$1 } from "node:buffer";
|
|
6
6
|
import * as Tls from "node:tls";
|
package/dist/cli.js
CHANGED
|
@@ -9,6 +9,7 @@ import * as NodeServices from "@effect/platform-node/NodeServices";
|
|
|
9
9
|
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
|
|
10
10
|
import * as GlobalWebSocket from "./GlobalWebSocket.js";
|
|
11
11
|
import * as Acp from "./Acp.js";
|
|
12
|
+
import * as AcpSessionStore from "./AcpSessionStore.js";
|
|
12
13
|
import * as AgentExecutor from "./AgentExecutor.js";
|
|
13
14
|
import * as Agent from "./Agent.js";
|
|
14
15
|
import * as Compaction from "./Compaction.js";
|
|
@@ -180,10 +181,16 @@ const mcpSummary = (status) => `MCP: ${Object.entries(status)
|
|
|
180
181
|
? `${name} (${server.tools.length} tools)`
|
|
181
182
|
: `${name} failed: ${server.error.split("\n")[0]}`)
|
|
182
183
|
.join(", ")}`;
|
|
183
|
-
const
|
|
184
|
+
const configDirectory = Effect.gen(function* () {
|
|
184
185
|
const path = yield* Path.Path;
|
|
185
186
|
const configHome = yield* Config.NonEmptyString("XDG_CONFIG_HOME").pipe(Config.orElse(() => Config.NonEmptyString("HOME").pipe(Config.map((home) => path.join(home, ".config")))));
|
|
186
|
-
return
|
|
187
|
+
return path.join(configHome, "clanka");
|
|
188
|
+
});
|
|
189
|
+
const Kvs = Layer.unwrap(Effect.map(configDirectory, KeyValueStore.layerFileSystem)).pipe(Layer.provide(NodeServices.layer));
|
|
190
|
+
const AcpSessions = Layer.unwrap(Effect.gen(function* () {
|
|
191
|
+
const path = yield* Path.Path;
|
|
192
|
+
const directory = yield* configDirectory;
|
|
193
|
+
return AcpSessionStore.layerFileSystem(path.join(directory, "sessions"));
|
|
187
194
|
})).pipe(Layer.provide(NodeServices.layer));
|
|
188
195
|
const Search = (directory) => Layer.unwrap(Effect.gen(function* () {
|
|
189
196
|
const apiKey = yield* Config.Redacted("OPENAI_API_KEY").pipe(Config.option);
|
|
@@ -251,7 +258,7 @@ const acp = Command.make("acp", {
|
|
|
251
258
|
auxiliary: auxiliaryModels(flags),
|
|
252
259
|
}),
|
|
253
260
|
});
|
|
254
|
-
})), Command.provide((flags) => Layer.mergeAll(Agent.ConversationMode.layer(false), Layer.succeed(Logger.LogToStderr, true), DeviceCodeHandler.layerLog, compactionConfig(flags), openAiCompatModels(flags))));
|
|
261
|
+
})), Command.provide((flags) => Layer.mergeAll(AcpSessions, Agent.ConversationMode.layer(false), Layer.succeed(Logger.LogToStderr, true), DeviceCodeHandler.layerLog, compactionConfig(flags), openAiCompatModels(flags))));
|
|
255
262
|
Command.make("clanka", {
|
|
256
263
|
provider,
|
|
257
264
|
fetch,
|
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/dist/index.d.ts
CHANGED
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;GAEG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAE3D;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;GAEG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAE3D;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA"}
|
package/dist/index.js
CHANGED
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;GAEG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAE3D;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA;AAE/B;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,aAAa,MAAM,oBAAoB,CAAA;AACnD,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC;;GAEG;AACH,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C;;GAEG;AACH,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AAEvC;;GAEG;AACH,OAAO,KAAK,iBAAiB,MAAM,wBAAwB,CAAA;AAE3D;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,cAAc,MAAM,qBAAqB,CAAA;AAErD;;GAEG;AACH,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AAEvD;;GAEG;AACH,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAE/C;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,UAAU,CAAA"}
|
package/package.json
CHANGED
package/src/Acp.test.ts
CHANGED
|
@@ -22,6 +22,7 @@ import * as LanguageModel from "effect/ai/LanguageModel"
|
|
|
22
22
|
import * as Model from "effect/ai/Model"
|
|
23
23
|
import type * as Response from "effect/ai/Response"
|
|
24
24
|
import * as Acp from "./Acp.ts"
|
|
25
|
+
import * as AcpSessionStore from "./AcpSessionStore.ts"
|
|
25
26
|
import * as Agent from "./Agent.ts"
|
|
26
27
|
import * as AgentExecutor from "./AgentExecutor.ts"
|
|
27
28
|
import * as Compaction from "./Compaction.ts"
|
|
@@ -185,7 +186,9 @@ const withStore = <A, E, R>(effect: Effect.Effect<A, E, R>) =>
|
|
|
185
186
|
effect.pipe(
|
|
186
187
|
Effect.provide(
|
|
187
188
|
Layer.merge(
|
|
188
|
-
|
|
189
|
+
AcpSessionStore.layerKeyValueStore.pipe(
|
|
190
|
+
Layer.provideMerge(KeyValueStore.layerMemory),
|
|
191
|
+
),
|
|
189
192
|
Agent.ConversationMode.layer(true),
|
|
190
193
|
),
|
|
191
194
|
),
|
|
@@ -1192,6 +1195,122 @@ await changeDirectory("sub")`),
|
|
|
1192
1195
|
),
|
|
1193
1196
|
)
|
|
1194
1197
|
|
|
1198
|
+
// A killed process runs no finalizers, so the next one only has what the
|
|
1199
|
+
// store held at that moment.
|
|
1200
|
+
const sessionStores: ReadonlyArray<
|
|
1201
|
+
readonly [
|
|
1202
|
+
string,
|
|
1203
|
+
(
|
|
1204
|
+
directory: string,
|
|
1205
|
+
) => Layer.Layer<
|
|
1206
|
+
AcpSessionStore.AcpSessionStore,
|
|
1207
|
+
unknown,
|
|
1208
|
+
KeyValueStore.KeyValueStore | FileSystem.FileSystem | Path.Path
|
|
1209
|
+
>,
|
|
1210
|
+
]
|
|
1211
|
+
> = [
|
|
1212
|
+
["a KeyValueStore", () => AcpSessionStore.layerKeyValueStore],
|
|
1213
|
+
["append-only files", AcpSessionStore.layerFileSystem],
|
|
1214
|
+
]
|
|
1215
|
+
for (const [name, sessionStore] of sessionStores) {
|
|
1216
|
+
it.live(
|
|
1217
|
+
`stores the history a prompt commits before the prompt ends, in ${name}`,
|
|
1218
|
+
() =>
|
|
1219
|
+
withStore(
|
|
1220
|
+
Effect.scoped(
|
|
1221
|
+
Effect.gen(function* () {
|
|
1222
|
+
const fs = yield* FileSystem.FileSystem
|
|
1223
|
+
const directory = yield* fs.makeTempDirectoryScoped()
|
|
1224
|
+
// Each server and check gets a store of its own, like a process.
|
|
1225
|
+
const openStore = Layer.build(sessionStore(directory)).pipe(
|
|
1226
|
+
Effect.map((context) =>
|
|
1227
|
+
Context.get(context, AcpSessionStore.AcpSessionStore),
|
|
1228
|
+
),
|
|
1229
|
+
)
|
|
1230
|
+
const stores = (sessionId: string, text: string) =>
|
|
1231
|
+
openStore.pipe(
|
|
1232
|
+
Effect.flatMap((store) => store.get(sessionId)),
|
|
1233
|
+
Effect.map((record) =>
|
|
1234
|
+
JSON.stringify(Option.getOrThrow(record).history).includes(
|
|
1235
|
+
text,
|
|
1236
|
+
),
|
|
1237
|
+
),
|
|
1238
|
+
Effect.repeat({
|
|
1239
|
+
until: (stored) => stored,
|
|
1240
|
+
schedule: Schedule.spaced("10 millis"),
|
|
1241
|
+
}),
|
|
1242
|
+
Effect.timeout("3 seconds"),
|
|
1243
|
+
)
|
|
1244
|
+
|
|
1245
|
+
const script = yield* gatedScript()
|
|
1246
|
+
const secondCall = yield* Deferred.make<void>()
|
|
1247
|
+
let calls = 0
|
|
1248
|
+
// The second model call never answers, so the prompt never ends.
|
|
1249
|
+
const killed = yield* makeServer(
|
|
1250
|
+
() =>
|
|
1251
|
+
calls++ === 0
|
|
1252
|
+
? callsExecute
|
|
1253
|
+
: Stream.unwrap(
|
|
1254
|
+
Deferred.succeed(secondCall, undefined).pipe(
|
|
1255
|
+
Effect.as(Stream.never),
|
|
1256
|
+
),
|
|
1257
|
+
),
|
|
1258
|
+
script.executor,
|
|
1259
|
+
).pipe(
|
|
1260
|
+
Effect.provideService(
|
|
1261
|
+
AcpSessionStore.AcpSessionStore,
|
|
1262
|
+
yield* openStore,
|
|
1263
|
+
),
|
|
1264
|
+
)
|
|
1265
|
+
const created = yield* killed.request(1, "session/new", {
|
|
1266
|
+
cwd: "/tmp",
|
|
1267
|
+
})
|
|
1268
|
+
const sessionId: string = created.result.sessionId
|
|
1269
|
+
yield* killed
|
|
1270
|
+
.request(2, "session/prompt", {
|
|
1271
|
+
sessionId,
|
|
1272
|
+
prompt: [{ type: "text", text: "hello" }],
|
|
1273
|
+
})
|
|
1274
|
+
.pipe(Effect.forkScoped)
|
|
1275
|
+
|
|
1276
|
+
yield* Deferred.await(script.started)
|
|
1277
|
+
yield* stores(sessionId, "hello")
|
|
1278
|
+
|
|
1279
|
+
yield* Deferred.succeed(script.release, undefined)
|
|
1280
|
+
yield* Deferred.await(secondCall)
|
|
1281
|
+
yield* stores(sessionId, "script output")
|
|
1282
|
+
|
|
1283
|
+
// A second process takes over while the first is still mid-prompt.
|
|
1284
|
+
let resumed: Prompt.Prompt | undefined
|
|
1285
|
+
const next = yield* makeServer((options) => {
|
|
1286
|
+
resumed = options.prompt
|
|
1287
|
+
return assistantSays("done")
|
|
1288
|
+
}).pipe(
|
|
1289
|
+
Effect.provideService(
|
|
1290
|
+
AcpSessionStore.AcpSessionStore,
|
|
1291
|
+
yield* openStore,
|
|
1292
|
+
),
|
|
1293
|
+
)
|
|
1294
|
+
const loaded = yield* next.request(1, "session/load", {
|
|
1295
|
+
sessionId,
|
|
1296
|
+
cwd: "/tmp",
|
|
1297
|
+
})
|
|
1298
|
+
assert.isUndefined(loaded.error)
|
|
1299
|
+
const done = yield* next.request(2, "session/prompt", {
|
|
1300
|
+
sessionId,
|
|
1301
|
+
prompt: [{ type: "text", text: "carry on" }],
|
|
1302
|
+
})
|
|
1303
|
+
assert.deepStrictEqual(done.result, { stopReason: "end_turn" })
|
|
1304
|
+
const sent = JSON.stringify(resumed)
|
|
1305
|
+
assert.include(sent, "hello")
|
|
1306
|
+
assert.include(sent, "script output")
|
|
1307
|
+
assert.include(sent, "carry on")
|
|
1308
|
+
}),
|
|
1309
|
+
),
|
|
1310
|
+
).pipe(Effect.provide(NodeServices.layer)),
|
|
1311
|
+
)
|
|
1312
|
+
}
|
|
1313
|
+
|
|
1195
1314
|
it.effect("queues a steer message into the running prompt", () =>
|
|
1196
1315
|
withStore(
|
|
1197
1316
|
Effect.scoped(
|
package/src/Acp.ts
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Agent Client Protocol (ACP) server for clanka.
|
|
4
4
|
*
|
|
5
5
|
* Speaks JSON-RPC 2.0 over stdio so ACP clients (Zed, Multica, ...) can drive
|
|
6
|
-
* an Agent. Sessions are persisted to the
|
|
6
|
+
* an Agent. Sessions are persisted to the AcpSessionStore so `session/load`
|
|
7
7
|
* works across processes.
|
|
8
8
|
*
|
|
9
9
|
* @since 1.0.0
|
|
@@ -30,9 +30,12 @@ import type * as LanguageModel from "effect/ai/LanguageModel"
|
|
|
30
30
|
import type * as Model from "effect/ai/Model"
|
|
31
31
|
import * as Prompt from "effect/ai/Prompt"
|
|
32
32
|
import * as HttpClient from "effect/http/HttpClient"
|
|
33
|
-
import
|
|
33
|
+
import {
|
|
34
|
+
AcpSessionStore,
|
|
35
|
+
SessionRecord,
|
|
36
|
+
ThoughtLevel,
|
|
37
|
+
} from "./AcpSessionStore.ts"
|
|
34
38
|
import * as Agent from "./Agent.ts"
|
|
35
|
-
import * as AgentExecutor from "./AgentExecutor.ts"
|
|
36
39
|
import type * as AgentOutput from "./AgentOutput.ts"
|
|
37
40
|
import * as Compaction from "./Compaction.ts"
|
|
38
41
|
import * as Image from "./Image.ts"
|
|
@@ -116,50 +119,11 @@ export interface Server<R = never> {
|
|
|
116
119
|
readonly handle: (line: string) => Effect.Effect<void, never, R>
|
|
117
120
|
}
|
|
118
121
|
|
|
119
|
-
/**
|
|
120
|
-
* Reasoning effort levels offered through the ACP `thought_level` config
|
|
121
|
-
* option.
|
|
122
|
-
*
|
|
123
|
-
* @since 1.0.0
|
|
124
|
-
* @category Models
|
|
125
|
-
*/
|
|
126
|
-
export const ThoughtLevel = Schema.Literals([
|
|
127
|
-
"none",
|
|
128
|
-
"minimal",
|
|
129
|
-
"low",
|
|
130
|
-
"medium",
|
|
131
|
-
"high",
|
|
132
|
-
"xhigh",
|
|
133
|
-
"max",
|
|
134
|
-
])
|
|
135
|
-
|
|
136
122
|
/**
|
|
137
123
|
* @since 1.0.0
|
|
138
124
|
* @category Models
|
|
139
125
|
*/
|
|
140
|
-
export
|
|
141
|
-
|
|
142
|
-
/**
|
|
143
|
-
* @since 1.0.0
|
|
144
|
-
* @category Models
|
|
145
|
-
*/
|
|
146
|
-
export class SessionRecord extends Schema.Class<SessionRecord>(
|
|
147
|
-
"clanka/Acp/SessionRecord",
|
|
148
|
-
)({
|
|
149
|
-
cwd: Schema.String,
|
|
150
|
-
model: Schema.String,
|
|
151
|
-
thoughtLevel: ThoughtLevel,
|
|
152
|
-
/**
|
|
153
|
-
* The session's fast mode setting. It is kept across model switches and
|
|
154
|
-
* applies while the session model supports fast mode.
|
|
155
|
-
*/
|
|
156
|
-
fastMode: Schema.optionalKey(Schema.Boolean),
|
|
157
|
-
history: Prompt.Prompt,
|
|
158
|
-
/**
|
|
159
|
-
* The agent's executor environment, such as its working directory.
|
|
160
|
-
*/
|
|
161
|
-
environment: Schema.optionalKey(AgentExecutor.ExecutionEnvironment),
|
|
162
|
-
}) {}
|
|
126
|
+
export { SessionRecord, ThoughtLevel } from "./AcpSessionStore.ts"
|
|
163
127
|
|
|
164
128
|
/**
|
|
165
129
|
* @since 1.0.0
|
|
@@ -435,6 +399,8 @@ interface Session {
|
|
|
435
399
|
readonly scope: Scope.Closeable
|
|
436
400
|
/** Failed MCP servers, reported on the first prompt turn. */
|
|
437
401
|
mcpFailures: string | undefined
|
|
402
|
+
/** The Agent state of the last successful write to the store. */
|
|
403
|
+
stored: Pick<SessionRecord, "history" | "environment"> | undefined
|
|
438
404
|
}
|
|
439
405
|
|
|
440
406
|
interface Steer {
|
|
@@ -451,9 +417,9 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
451
417
|
): Effect.fn.Return<
|
|
452
418
|
Server<RAgent | RModel>,
|
|
453
419
|
never,
|
|
454
|
-
|
|
420
|
+
AcpSessionStore | Scope.Scope
|
|
455
421
|
> {
|
|
456
|
-
const
|
|
422
|
+
const store = yield* AcpSessionStore
|
|
457
423
|
const { contextWindow } = yield* Compaction.CompactionConfig
|
|
458
424
|
const size = Number.isFinite(contextWindow)
|
|
459
425
|
? Math.max(0, Math.round(contextWindow))
|
|
@@ -464,10 +430,6 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
464
430
|
const http = yield* Effect.serviceOption(HttpClient.HttpClient)
|
|
465
431
|
const fs = yield* Effect.serviceOption(FileSystem.FileSystem)
|
|
466
432
|
const path = yield* Effect.serviceOption(Path.Path)
|
|
467
|
-
const store = KeyValueStore.toSchemaStore(
|
|
468
|
-
KeyValueStore.prefix(kvs, "session-"),
|
|
469
|
-
SessionRecord,
|
|
470
|
-
)
|
|
471
433
|
const scope = yield* Effect.scope
|
|
472
434
|
const sessions = new Map<string, Session>()
|
|
473
435
|
|
|
@@ -562,8 +524,10 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
562
524
|
}
|
|
563
525
|
})
|
|
564
526
|
|
|
565
|
-
const persist = (session: Session) =>
|
|
566
|
-
|
|
527
|
+
const persist = (session: Session) => {
|
|
528
|
+
const history = session.agent.history.current
|
|
529
|
+
const environment = session.agent.environment.current
|
|
530
|
+
return store
|
|
567
531
|
.set(
|
|
568
532
|
session.id,
|
|
569
533
|
new SessionRecord({
|
|
@@ -571,15 +535,31 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
571
535
|
model: session.model,
|
|
572
536
|
thoughtLevel: session.thoughtLevel,
|
|
573
537
|
fastMode: session.fastMode,
|
|
574
|
-
history
|
|
575
|
-
environment
|
|
538
|
+
history,
|
|
539
|
+
environment,
|
|
576
540
|
}),
|
|
577
541
|
)
|
|
578
542
|
.pipe(
|
|
543
|
+
Effect.tap(() =>
|
|
544
|
+
Effect.sync(() => {
|
|
545
|
+
session.stored = { history, environment }
|
|
546
|
+
}),
|
|
547
|
+
),
|
|
579
548
|
Effect.catch((error) =>
|
|
580
549
|
Effect.logWarning("Failed to persist session", error),
|
|
581
550
|
),
|
|
582
551
|
)
|
|
552
|
+
}
|
|
553
|
+
|
|
554
|
+
// Stores what the Agent has committed since the last write. Commits made
|
|
555
|
+
// together are announced one by one, and the first write covers them all.
|
|
556
|
+
const persistCommitted = (session: Session) =>
|
|
557
|
+
Effect.suspend(() =>
|
|
558
|
+
session.stored?.history === session.agent.history.current &&
|
|
559
|
+
session.stored.environment === session.agent.environment.current
|
|
560
|
+
? Effect.void
|
|
561
|
+
: persist(session),
|
|
562
|
+
)
|
|
583
563
|
|
|
584
564
|
const openSession = Effect.fnUntraced(function* (
|
|
585
565
|
id: string,
|
|
@@ -626,6 +606,7 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
626
606
|
announcedSubagents: new Set(),
|
|
627
607
|
scope: sessionScope,
|
|
628
608
|
mcpFailures,
|
|
609
|
+
stored: undefined,
|
|
629
610
|
}
|
|
630
611
|
sessions.set(id, session)
|
|
631
612
|
return session
|
|
@@ -963,6 +944,11 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
963
944
|
content: [{ type: "content", content: textContent(part.output) }],
|
|
964
945
|
})
|
|
965
946
|
}
|
|
947
|
+
// Stored as it is committed rather than when the prompt ends, so a
|
|
948
|
+
// process killed mid-prompt loses only the response in progress.
|
|
949
|
+
case "HistoryAppended":
|
|
950
|
+
case "HistoryReplaced":
|
|
951
|
+
return persistCommitted(session)
|
|
966
952
|
default:
|
|
967
953
|
return Effect.void
|
|
968
954
|
}
|
|
@@ -1182,7 +1168,7 @@ export const make = Effect.fnUntraced(function* <RAgent, RModel>(
|
|
|
1182
1168
|
)
|
|
1183
1169
|
const exit = yield* Effect.exit(Fiber.join(session.running))
|
|
1184
1170
|
session.running = undefined
|
|
1185
|
-
yield*
|
|
1171
|
+
yield* persistCommitted(session)
|
|
1186
1172
|
if (Exit.isSuccess(exit)) return { stopReason: "end_turn" }
|
|
1187
1173
|
if (Cause.hasInterruptsOnly(exit.cause)) return { stopReason: "cancelled" }
|
|
1188
1174
|
return yield* toRpcError(exit.cause)
|
|
@@ -1305,7 +1291,7 @@ export const runStdio = <RAgent, RModel>(
|
|
|
1305
1291
|
): Effect.Effect<
|
|
1306
1292
|
void,
|
|
1307
1293
|
PlatformError.PlatformError,
|
|
1308
|
-
Stdio.Stdio |
|
|
1294
|
+
Stdio.Stdio | AcpSessionStore | RAgent | RModel
|
|
1309
1295
|
> =>
|
|
1310
1296
|
Effect.gen(function* () {
|
|
1311
1297
|
const stdio = yield* Stdio.Stdio
|
package/src/AcpImage.test.ts
CHANGED
|
@@ -20,6 +20,7 @@ import * as HttpClient from "effect/http/HttpClient"
|
|
|
20
20
|
import * as HttpClientResponse from "effect/http/HttpClientResponse"
|
|
21
21
|
import * as KeyValueStore from "effect/persistence/KeyValueStore"
|
|
22
22
|
import * as Acp from "./Acp.ts"
|
|
23
|
+
import * as AcpSessionStore from "./AcpSessionStore.ts"
|
|
23
24
|
import * as Agent from "./Agent.ts"
|
|
24
25
|
import * as AgentExecutor from "./AgentExecutor.ts"
|
|
25
26
|
import {
|
|
@@ -157,7 +158,9 @@ const withServices = <A, E, R>(
|
|
|
157
158
|
effect.pipe(
|
|
158
159
|
Effect.provide(
|
|
159
160
|
Layer.mergeAll(
|
|
160
|
-
|
|
161
|
+
AcpSessionStore.layerKeyValueStore.pipe(
|
|
162
|
+
Layer.provideMerge(KeyValueStore.layerMemory),
|
|
163
|
+
),
|
|
161
164
|
Agent.ConversationMode.layer(true),
|
|
162
165
|
NodeServices.layer,
|
|
163
166
|
http,
|
|
@@ -671,7 +674,9 @@ describe("Acp images", () => {
|
|
|
671
674
|
}).pipe(
|
|
672
675
|
Effect.provide(
|
|
673
676
|
Layer.mergeAll(
|
|
674
|
-
|
|
677
|
+
AcpSessionStore.layerKeyValueStore.pipe(
|
|
678
|
+
Layer.provideMerge(KeyValueStore.layerMemory),
|
|
679
|
+
),
|
|
675
680
|
Agent.ConversationMode.layer(true),
|
|
676
681
|
NodePath.layer,
|
|
677
682
|
),
|