clanka 0.13.2 → 0.15.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 +44 -0
- package/dist/Acp.d.ts +17 -2
- package/dist/Acp.d.ts.map +1 -1
- package/dist/Acp.js +132 -16
- package/dist/Acp.js.map +1 -1
- package/dist/Acp.test.js +128 -1
- package/dist/Acp.test.js.map +1 -1
- package/dist/AgentSkills.d.ts +6 -4
- package/dist/AgentSkills.d.ts.map +1 -1
- package/dist/AgentSkills.js +27 -15
- package/dist/AgentSkills.js.map +1 -1
- package/dist/AgentSkills.test.js +17 -2
- package/dist/AgentSkills.test.js.map +1 -1
- package/dist/ModelLayer.d.ts +21 -4
- package/dist/ModelLayer.d.ts.map +1 -1
- package/dist/ModelLayer.js +27 -7
- package/dist/ModelLayer.js.map +1 -1
- package/dist/ModelLayer.test.js +6 -2
- package/dist/ModelLayer.test.js.map +1 -1
- package/dist/bin/cli.mjs +146 -30
- package/dist/bin/cli.mjs.map +1 -1
- package/dist/cli.js +35 -5
- package/dist/cli.js.map +1 -1
- package/dist/cli.test.d.ts +2 -0
- package/dist/cli.test.d.ts.map +1 -0
- package/dist/cli.test.js +63 -0
- package/dist/cli.test.js.map +1 -0
- package/package.json +1 -1
- package/src/Acp.test.ts +184 -0
- package/src/Acp.ts +189 -22
- package/src/AgentSkills.test.ts +35 -1
- package/src/AgentSkills.ts +27 -15
- package/src/ModelLayer.test.ts +14 -1
- package/src/ModelLayer.ts +33 -5
- package/src/cli.test.ts +99 -0
- package/src/cli.ts +62 -6
package/dist/cli.js
CHANGED
|
@@ -4,6 +4,7 @@ import * as Prompt from "effect/cli/Prompt";
|
|
|
4
4
|
import * as NodeHttpClient from "@effect/platform-node/NodeHttpClient";
|
|
5
5
|
import * as Command from "effect/cli/Command";
|
|
6
6
|
import * as Flag from "effect/cli/Flag";
|
|
7
|
+
import * as GlobalFlag from "effect/cli/GlobalFlag";
|
|
7
8
|
import * as NodeServices from "@effect/platform-node/NodeServices";
|
|
8
9
|
import * as NodeRuntime from "@effect/platform-node/NodeRuntime";
|
|
9
10
|
import * as GlobalWebSocket from "./GlobalWebSocket.js";
|
|
@@ -28,7 +29,26 @@ import * as Option from "effect/Option";
|
|
|
28
29
|
import { OpenAiClient, OpenAiEmbeddingModel } from "@effect/ai-openai";
|
|
29
30
|
import * as DeviceCodeHandler from "./DeviceCodeHandler.js";
|
|
30
31
|
import packageJson from "../package.json" with { type: "json" };
|
|
31
|
-
|
|
32
|
+
// `--reported-version` replaces the version clanka reports, for `--version`
|
|
33
|
+
// and to ACP clients, so it can pass the version gates of kiro launchers such
|
|
34
|
+
// as Multica. The built-in `--version` prints the version given to
|
|
35
|
+
// `Command.run`, so the value is read from argv before the CLI parses it.
|
|
36
|
+
const ReportedVersion = GlobalFlag.Setting("reported-version")({
|
|
37
|
+
flag: Flag.String("reported-version").pipe(Flag.withDescription("Report this version instead of clanka's own, for --version and to ACP clients"), Flag.optional),
|
|
38
|
+
});
|
|
39
|
+
const reportedVersion = (args) => {
|
|
40
|
+
for (const [index, arg] of args.entries()) {
|
|
41
|
+
if (arg === "--")
|
|
42
|
+
return undefined;
|
|
43
|
+
if (arg === "--reported-version")
|
|
44
|
+
return args[index + 1];
|
|
45
|
+
if (arg.startsWith("--reported-version=")) {
|
|
46
|
+
return arg.slice("--reported-version=".length);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
return undefined;
|
|
50
|
+
};
|
|
51
|
+
const version = reportedVersion(process.argv.slice(2)) ?? packageJson.version;
|
|
32
52
|
// node:http instead of undici: the undici package adds ~15 MB of RSS on top of
|
|
33
53
|
// the HTTP stack Node loads anyway, and unlike fetch it imposes no request
|
|
34
54
|
// timeouts on long model calls.
|
|
@@ -99,6 +119,8 @@ const provider = Flag.Literals("provider", providers).pipe(Flag.withAlias("p"),
|
|
|
99
119
|
const model = Flag.String("model").pipe(Flag.withAlias("m"), Flag.optional);
|
|
100
120
|
const apiKey = Flag.Redacted("api-key").pipe(Flag.withDescription("OpenAI API key (defaults to CLANKA_OPENAI_API_KEY)"), Flag.withFallbackConfig(Config.Redacted("CLANKA_OPENAI_API_KEY")), Flag.optional);
|
|
101
121
|
const apiUrl = Flag.String("api-url").pipe(Flag.withDescription("OpenAI API base URL for API-key mode (defaults to CLANKA_OPENAI_API_URL or https://api.openai.com/v1)"), Flag.withFallbackConfig(Config.String("CLANKA_OPENAI_API_URL")), Flag.optional);
|
|
122
|
+
// OpenAI's `priority` service tier.
|
|
123
|
+
const fast = Flag.Boolean("fast").pipe(Flag.withDescription("Use OpenAI fast mode (the priority service tier) for faster responses at a higher cost. Applies to the openai provider only; also CLANKA_FAST=true."), Flag.withFallbackConfig(Config.Boolean("CLANKA_FAST").pipe(Config.withDefault(false))));
|
|
102
124
|
const semantic = Flag.Directory("search").pipe(Flag.withDescription("Directory for semantic search data (uses OPENAI_API_KEY env var)"), Flag.withAlias("s"), Flag.optional);
|
|
103
125
|
const prompt = Flag.String("prompt").pipe(Flag.withDescription("Pass a prompt in non-interactive mode"), Flag.optional);
|
|
104
126
|
// Kill switch: `--no-compaction` or CLANKA_COMPACTION=false.
|
|
@@ -135,17 +157,24 @@ const Search = (directory) => Layer.unwrap(Effect.gen(function* () {
|
|
|
135
157
|
})));
|
|
136
158
|
})).pipe(Layer.provide([NodeServices.layer, HttpClientLive]));
|
|
137
159
|
const acpModel = Flag.String("model").pipe(Flag.withAlias("m"), Flag.withDescription("Default model as <provider>/<model>/<effort>, e.g. openai/gpt-6-astra/medium"), Flag.withSchema(ModelId), Flag.withDefault("openai/gpt-6-astra/medium"), Flag.map((modelId) => Option.getOrThrow(parseModelId(modelId))));
|
|
160
|
+
// kiro launchers pass it to every `acp` run; clanka has no tool permissions to
|
|
161
|
+
// skip.
|
|
162
|
+
const trustAllTools = Flag.Boolean("trust-all-tools").pipe(Flag.withDescription("Accepted for kiro-cli compatibility. Has no effect: clanka runs every tool call without asking."));
|
|
138
163
|
const acp = Command.make("acp", {
|
|
139
164
|
model: acpModel,
|
|
165
|
+
trustAllTools,
|
|
166
|
+
fast,
|
|
140
167
|
compaction,
|
|
141
168
|
apiKey,
|
|
142
169
|
apiUrl,
|
|
143
|
-
}).pipe(Command.withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), Command.withHandler(({ model, apiKey, apiUrl }) => Effect.gen(function* () {
|
|
170
|
+
}).pipe(Command.withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), Command.withHandler(({ model, fast, apiKey, apiUrl }) => Effect.gen(function* () {
|
|
144
171
|
const repo = yield* ModelsRepo.ModelsRepo;
|
|
145
172
|
return yield* Acp.runStdio({
|
|
146
173
|
version,
|
|
147
174
|
defaultModel: model.model,
|
|
148
175
|
defaultThoughtLevel: model.thoughtLevel,
|
|
176
|
+
defaultFastMode: fast,
|
|
177
|
+
supportsFastMode: ModelLayer.acpSupportsFastMode,
|
|
149
178
|
availableModels: Effect.map(repo.models, ModelLayer.acpModels),
|
|
150
179
|
makeAgent: (cwd) => Agent.make.pipe(Effect.provide(AgentExecutor.layerLocal({ directory: cwd }))),
|
|
151
180
|
makeModel: ModelLayer.makeAcp({
|
|
@@ -160,6 +189,7 @@ const acp = Command.make("acp", {
|
|
|
160
189
|
Command.make("clanka", {
|
|
161
190
|
provider,
|
|
162
191
|
model,
|
|
192
|
+
fast,
|
|
163
193
|
semantic,
|
|
164
194
|
prompt,
|
|
165
195
|
compaction,
|
|
@@ -167,7 +197,7 @@ Command.make("clanka", {
|
|
|
167
197
|
apiUrl,
|
|
168
198
|
mcp,
|
|
169
199
|
mcpConfig,
|
|
170
|
-
}).pipe(Command.withHandler(Effect.fnUntraced(function* ({ provider, model: modelRaw, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, mcp, mcpConfig, }) {
|
|
200
|
+
}).pipe(Command.withHandler(Effect.fnUntraced(function* ({ provider, model: modelRaw, fast, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, mcp, mcpConfig, }) {
|
|
171
201
|
const stdio = yield* Stdio.Stdio;
|
|
172
202
|
const mcpServers = yield* McpConfig.load({
|
|
173
203
|
cwd: process.cwd(),
|
|
@@ -185,7 +215,7 @@ Command.make("clanka", {
|
|
|
185
215
|
const Model = ModelLayer.make(provider, model, effort, {
|
|
186
216
|
apiKey: Option.getOrUndefined(apiKey),
|
|
187
217
|
apiUrl: Option.getOrUndefined(apiUrl),
|
|
188
|
-
});
|
|
218
|
+
}, fast);
|
|
189
219
|
return yield* Effect.gen(function* () {
|
|
190
220
|
const agent = yield* Agent.Agent;
|
|
191
221
|
if (Option.isSome(nonInteractivePrompt)) {
|
|
@@ -211,7 +241,7 @@ Command.make("clanka", {
|
|
|
211
241
|
})), Layer.provideMerge(McpServers.layer(mcpServers))),
|
|
212
242
|
Model,
|
|
213
243
|
]));
|
|
214
|
-
})), Command.provide(({ prompt, compaction }) => Layer.mergeAll(Agent.ConversationMode.layer(Option.isNone(prompt)), Compaction.CompactionConfig.layer({ enabled: compaction }))), Command.withSubcommands([acp]), Command.run({
|
|
244
|
+
})), Command.provide(({ prompt, compaction }) => Layer.mergeAll(Agent.ConversationMode.layer(Option.isNone(prompt)), Compaction.CompactionConfig.layer({ enabled: compaction }))), Command.withSubcommands([acp]), Command.withGlobalFlags([ReportedVersion]), Command.run({
|
|
215
245
|
version,
|
|
216
246
|
}), Effect.provide([
|
|
217
247
|
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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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli.test.d.ts","sourceRoot":"","sources":["../src/cli.test.ts"],"names":[],"mappings":""}
|
package/dist/cli.test.js
ADDED
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { assert, describe, it } from "@effect/vitest";
|
|
2
|
+
import * as NodeServices from "@effect/platform-node/NodeServices";
|
|
3
|
+
import * as Effect from "effect/Effect";
|
|
4
|
+
import * as FileSystem from "effect/FileSystem";
|
|
5
|
+
import { execFile, spawn } from "node:child_process";
|
|
6
|
+
import * as Path from "node:path";
|
|
7
|
+
import * as Readline from "node:readline";
|
|
8
|
+
const cli = Path.join(import.meta.dirname, "cli.ts");
|
|
9
|
+
// Runs the CLI with its config and cache files kept out of the user's home.
|
|
10
|
+
const cliEnv = Effect.gen(function* () {
|
|
11
|
+
const fs = yield* FileSystem.FileSystem;
|
|
12
|
+
const configHome = yield* fs.makeTempDirectoryScoped();
|
|
13
|
+
return { ...process.env, XDG_CONFIG_HOME: configHome };
|
|
14
|
+
});
|
|
15
|
+
const run = (args) => Effect.gen(function* () {
|
|
16
|
+
const env = yield* cliEnv;
|
|
17
|
+
return yield* Effect.promise(() => new Promise((resolve, reject) => execFile(process.execPath, [cli, ...args], { env }, (error, stdout) => (error ? reject(error) : resolve(stdout)))));
|
|
18
|
+
});
|
|
19
|
+
// Starts `clanka <args>` as an ACP server and returns its reply to
|
|
20
|
+
// `initialize`.
|
|
21
|
+
const initialize = (args) => Effect.gen(function* () {
|
|
22
|
+
const env = yield* cliEnv;
|
|
23
|
+
const child = yield* Effect.acquireRelease(Effect.sync(() => spawn(process.execPath, [cli, ...args], { env })), (child) => Effect.sync(() => child.kill()));
|
|
24
|
+
child.stdin.write(`${JSON.stringify({
|
|
25
|
+
jsonrpc: "2.0",
|
|
26
|
+
id: 1,
|
|
27
|
+
method: "initialize",
|
|
28
|
+
params: { protocolVersion: 1 },
|
|
29
|
+
})}\n`);
|
|
30
|
+
return yield* Effect.promise(() => new Promise((resolve, reject) => {
|
|
31
|
+
let output = "";
|
|
32
|
+
child.stderr.on("data", (chunk) => {
|
|
33
|
+
output += chunk;
|
|
34
|
+
});
|
|
35
|
+
const lines = Readline.createInterface({ input: child.stdout });
|
|
36
|
+
lines.on("line", (line) => {
|
|
37
|
+
if (!line.startsWith("{")) {
|
|
38
|
+
output += `${line}\n`;
|
|
39
|
+
return;
|
|
40
|
+
}
|
|
41
|
+
const message = JSON.parse(line);
|
|
42
|
+
if (message.id === 1)
|
|
43
|
+
resolve(message);
|
|
44
|
+
});
|
|
45
|
+
child.on("exit", (code) => reject(new Error(`clanka exited with code ${code}:\n${output}`)));
|
|
46
|
+
}));
|
|
47
|
+
});
|
|
48
|
+
describe("cli", () => {
|
|
49
|
+
it.effect("prints the --reported-version override for --version", () => Effect.gen(function* () {
|
|
50
|
+
const stdout = yield* run(["--reported-version", "2.33.0", "--version"]);
|
|
51
|
+
assert.include(stdout, "2.33.0");
|
|
52
|
+
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)), 60_000);
|
|
53
|
+
it.effect("runs acp with --trust-all-tools and the --reported-version override", () => Effect.gen(function* () {
|
|
54
|
+
const response = yield* initialize([
|
|
55
|
+
"--reported-version",
|
|
56
|
+
"2.33.0",
|
|
57
|
+
"acp",
|
|
58
|
+
"--trust-all-tools",
|
|
59
|
+
]);
|
|
60
|
+
assert.strictEqual(response.result.agentInfo.version, "2.33.0");
|
|
61
|
+
}).pipe(Effect.scoped, Effect.provide(NodeServices.layer)), 60_000);
|
|
62
|
+
});
|
|
63
|
+
//# sourceMappingURL=cli.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cli.test.js","sourceRoot":"","sources":["../src/cli.test.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/Acp.test.ts
CHANGED
|
@@ -69,6 +69,7 @@ const makeServer = (
|
|
|
69
69
|
agentExecutor = executor,
|
|
70
70
|
onMakeModel?: (modelId: string, thoughtLevel: string) => void,
|
|
71
71
|
availableModels?: Acp.Options<never, never>["availableModels"],
|
|
72
|
+
supportsFastMode?: Acp.Options<never, never>["supportsFastMode"],
|
|
72
73
|
) =>
|
|
73
74
|
Effect.gen(function* () {
|
|
74
75
|
const sent: Array<Message> = []
|
|
@@ -102,6 +103,7 @@ const makeServer = (
|
|
|
102
103
|
: Option.none()
|
|
103
104
|
},
|
|
104
105
|
availableModels,
|
|
106
|
+
supportsFastMode,
|
|
105
107
|
})
|
|
106
108
|
const request = (id: number, method: string, params?: unknown) =>
|
|
107
109
|
server
|
|
@@ -144,6 +146,36 @@ const runsScript = (script: string) => {
|
|
|
144
146
|
: assistantSays("done")
|
|
145
147
|
}
|
|
146
148
|
|
|
149
|
+
const callsExecute = parts({
|
|
150
|
+
type: "tool-call",
|
|
151
|
+
id: "call-1",
|
|
152
|
+
name: "execute",
|
|
153
|
+
params: { script: "work" },
|
|
154
|
+
})
|
|
155
|
+
|
|
156
|
+
// An executor whose script signals `started`, then runs until `release`.
|
|
157
|
+
// With `completesTask` it calls taskComplete first.
|
|
158
|
+
const gatedScript = (options?: { readonly completesTask?: boolean }) =>
|
|
159
|
+
Effect.gen(function* () {
|
|
160
|
+
const started = yield* Deferred.make<void>()
|
|
161
|
+
const release = yield* Deferred.make<void>()
|
|
162
|
+
const gated = AgentExecutor.AgentExecutor.of({
|
|
163
|
+
...executor,
|
|
164
|
+
execute: ({ onTaskComplete }) =>
|
|
165
|
+
Stream.fromEffect(
|
|
166
|
+
Effect.gen(function* () {
|
|
167
|
+
if (options?.completesTask) {
|
|
168
|
+
yield* Effect.ignore(onTaskComplete("finished"))
|
|
169
|
+
}
|
|
170
|
+
yield* Deferred.succeed(started, undefined)
|
|
171
|
+
yield* Deferred.await(release)
|
|
172
|
+
return "script output"
|
|
173
|
+
}),
|
|
174
|
+
),
|
|
175
|
+
})
|
|
176
|
+
return { started, release, executor: gated }
|
|
177
|
+
})
|
|
178
|
+
|
|
147
179
|
const message = (role: "user" | "assistant", text: string) =>
|
|
148
180
|
Prompt.makeMessage(role, {
|
|
149
181
|
content: [Prompt.makePart("text", { text })],
|
|
@@ -363,6 +395,41 @@ describe("Acp", () => {
|
|
|
363
395
|
),
|
|
364
396
|
)
|
|
365
397
|
|
|
398
|
+
it.effect("notifies the config options a model switch changes", () =>
|
|
399
|
+
withStore(
|
|
400
|
+
Effect.scoped(
|
|
401
|
+
Effect.gen(function* () {
|
|
402
|
+
const server = yield* makeServer(
|
|
403
|
+
() => assistantSays("done"),
|
|
404
|
+
executor,
|
|
405
|
+
undefined,
|
|
406
|
+
undefined,
|
|
407
|
+
(modelId) => modelId === "other:model",
|
|
408
|
+
)
|
|
409
|
+
const created = yield* server.request(1, "session/new", {
|
|
410
|
+
cwd: "/tmp",
|
|
411
|
+
})
|
|
412
|
+
const sessionId: string = created.result.sessionId
|
|
413
|
+
assert.deepStrictEqual(
|
|
414
|
+
created.result.configOptions.map((option: any) => option.id),
|
|
415
|
+
["thought_level"],
|
|
416
|
+
)
|
|
417
|
+
|
|
418
|
+
yield* server.request(2, "session/set_model", {
|
|
419
|
+
sessionId,
|
|
420
|
+
modelId: "other:model",
|
|
421
|
+
})
|
|
422
|
+
const [notified] = server.updates(sessionId)
|
|
423
|
+
assert.strictEqual(notified.sessionUpdate, "config_option_update")
|
|
424
|
+
assert.deepInclude(notified.configOptions[1], {
|
|
425
|
+
id: "fast_mode",
|
|
426
|
+
currentValue: "off",
|
|
427
|
+
})
|
|
428
|
+
}),
|
|
429
|
+
),
|
|
430
|
+
),
|
|
431
|
+
)
|
|
432
|
+
|
|
366
433
|
for (const script of [
|
|
367
434
|
"console.log(1)",
|
|
368
435
|
'console.log("' + "x".repeat(200) + '")',
|
|
@@ -990,6 +1057,123 @@ await changeDirectory("sub")`),
|
|
|
990
1057
|
),
|
|
991
1058
|
)
|
|
992
1059
|
|
|
1060
|
+
it.effect("queues a steer message into the running prompt", () =>
|
|
1061
|
+
withStore(
|
|
1062
|
+
Effect.scoped(
|
|
1063
|
+
Effect.gen(function* () {
|
|
1064
|
+
const script = yield* gatedScript()
|
|
1065
|
+
const prompts: Array<Prompt.Prompt> = []
|
|
1066
|
+
const server = yield* makeServer((options) => {
|
|
1067
|
+
prompts.push(options.prompt)
|
|
1068
|
+
return prompts.length === 1 ? callsExecute : assistantSays("done")
|
|
1069
|
+
}, script.executor)
|
|
1070
|
+
const created = yield* server.request(1, "session/new", {
|
|
1071
|
+
cwd: "/tmp",
|
|
1072
|
+
})
|
|
1073
|
+
const sessionId: string = created.result.sessionId
|
|
1074
|
+
const prompt = yield* server
|
|
1075
|
+
.request(2, "session/prompt", {
|
|
1076
|
+
sessionId,
|
|
1077
|
+
prompt: [{ type: "text", text: "hello" }],
|
|
1078
|
+
})
|
|
1079
|
+
.pipe(Effect.forkScoped)
|
|
1080
|
+
yield* Deferred.await(script.started)
|
|
1081
|
+
|
|
1082
|
+
// Answered while the script still runs, before the agent reads it.
|
|
1083
|
+
const steered = yield* server.request(3, "_session/steer", {
|
|
1084
|
+
sessionId,
|
|
1085
|
+
message: "also update the docs",
|
|
1086
|
+
})
|
|
1087
|
+
assert.deepStrictEqual(steered.result, { queued: true })
|
|
1088
|
+
|
|
1089
|
+
yield* Deferred.succeed(script.release, undefined)
|
|
1090
|
+
const done = yield* Fiber.join(prompt)
|
|
1091
|
+
assert.deepStrictEqual(done.result, { stopReason: "end_turn" })
|
|
1092
|
+
// Read within the turn: one model call before it and one after,
|
|
1093
|
+
// with no extra turn to replay it.
|
|
1094
|
+
assert.strictEqual(prompts.length, 2)
|
|
1095
|
+
assert.include(JSON.stringify(prompts.at(-1)), "also update the docs")
|
|
1096
|
+
}),
|
|
1097
|
+
),
|
|
1098
|
+
),
|
|
1099
|
+
)
|
|
1100
|
+
|
|
1101
|
+
it.effect("does not queue a steer message without a running prompt", () =>
|
|
1102
|
+
withStore(
|
|
1103
|
+
Effect.scoped(
|
|
1104
|
+
Effect.gen(function* () {
|
|
1105
|
+
const server = yield* makeServer(() => assistantSays("done"))
|
|
1106
|
+
const created = yield* server.request(1, "session/new", {
|
|
1107
|
+
cwd: "/tmp",
|
|
1108
|
+
})
|
|
1109
|
+
const sessionId: string = created.result.sessionId
|
|
1110
|
+
const steer = (id: number) =>
|
|
1111
|
+
server.request(id, "_session/steer", {
|
|
1112
|
+
sessionId,
|
|
1113
|
+
message: "also update the docs",
|
|
1114
|
+
})
|
|
1115
|
+
|
|
1116
|
+
const idle = yield* steer(2)
|
|
1117
|
+
yield* server.request(3, "session/prompt", {
|
|
1118
|
+
sessionId,
|
|
1119
|
+
prompt: [{ type: "text", text: "hello" }],
|
|
1120
|
+
})
|
|
1121
|
+
const afterTurn = yield* steer(4)
|
|
1122
|
+
|
|
1123
|
+
for (const response of [idle, afterTurn]) {
|
|
1124
|
+
assert.notStrictEqual(response.error?.code, -32601)
|
|
1125
|
+
assert.notDeepEqual(response.result, { queued: true })
|
|
1126
|
+
}
|
|
1127
|
+
}),
|
|
1128
|
+
),
|
|
1129
|
+
),
|
|
1130
|
+
)
|
|
1131
|
+
|
|
1132
|
+
it.effect(
|
|
1133
|
+
"does not lose a steer message queued while the turn completes",
|
|
1134
|
+
() =>
|
|
1135
|
+
withStore(
|
|
1136
|
+
Effect.scoped(
|
|
1137
|
+
Effect.gen(function* () {
|
|
1138
|
+
const script = yield* gatedScript({ completesTask: true })
|
|
1139
|
+
const prompts: Array<Prompt.Prompt> = []
|
|
1140
|
+
const server = yield* makeServer((options) => {
|
|
1141
|
+
prompts.push(options.prompt)
|
|
1142
|
+
return prompts.length === 1 ? callsExecute : assistantSays("done")
|
|
1143
|
+
}, script.executor)
|
|
1144
|
+
const created = yield* server.request(1, "session/new", {
|
|
1145
|
+
cwd: "/tmp",
|
|
1146
|
+
})
|
|
1147
|
+
const sessionId: string = created.result.sessionId
|
|
1148
|
+
const prompt = yield* server
|
|
1149
|
+
.request(2, "session/prompt", {
|
|
1150
|
+
sessionId,
|
|
1151
|
+
prompt: [{ type: "text", text: "hello" }],
|
|
1152
|
+
})
|
|
1153
|
+
.pipe(Effect.forkScoped)
|
|
1154
|
+
// The script has called taskComplete and is still running.
|
|
1155
|
+
yield* Deferred.await(script.started)
|
|
1156
|
+
|
|
1157
|
+
const steered = yield* server.request(3, "_session/steer", {
|
|
1158
|
+
sessionId,
|
|
1159
|
+
message: "also update the docs",
|
|
1160
|
+
})
|
|
1161
|
+
yield* Deferred.succeed(script.release, undefined)
|
|
1162
|
+
yield* Fiber.join(prompt)
|
|
1163
|
+
|
|
1164
|
+
// Either refused, or queued and seen by the model.
|
|
1165
|
+
assert.isBoolean(steered.result?.queued)
|
|
1166
|
+
if (steered.result.queued) {
|
|
1167
|
+
assert.include(
|
|
1168
|
+
JSON.stringify(prompts.at(-1)),
|
|
1169
|
+
"also update the docs",
|
|
1170
|
+
)
|
|
1171
|
+
}
|
|
1172
|
+
}),
|
|
1173
|
+
),
|
|
1174
|
+
),
|
|
1175
|
+
)
|
|
1176
|
+
|
|
993
1177
|
it.effect("reports prompts still running when stdin ends", () =>
|
|
994
1178
|
withStore(
|
|
995
1179
|
Effect.gen(function* () {
|