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/bin/cli.mjs
CHANGED
|
@@ -6652,6 +6652,14 @@ const withSubcommands = dual(2, (self, subcommands) => {
|
|
|
6652
6652
|
handle
|
|
6653
6653
|
});
|
|
6654
6654
|
});
|
|
6655
|
+
const withGlobalFlags = dual(2, (self, globalFlags) => {
|
|
6656
|
+
const impl = toImpl(self);
|
|
6657
|
+
const next = Array.from(new Set([...impl.globalFlags, ...globalFlags]));
|
|
6658
|
+
return makeCommand({
|
|
6659
|
+
...impl,
|
|
6660
|
+
globalFlags: next
|
|
6661
|
+
});
|
|
6662
|
+
});
|
|
6655
6663
|
const withDescription = dual(2, (self, description) => makeCommand({
|
|
6656
6664
|
...toImpl(self),
|
|
6657
6665
|
description
|
|
@@ -11191,18 +11199,19 @@ var Skill = class extends Class$1("Skill")({
|
|
|
11191
11199
|
location: String$6,
|
|
11192
11200
|
source: SkillSource
|
|
11193
11201
|
}) {};
|
|
11202
|
+
const skillsRoots = (path, directory) => [path.resolve(directory, ".agents", "skills"), path.resolve(directory, ".kiro", "skills")];
|
|
11194
11203
|
const discover$1 = fnUntraced(function* (options) {
|
|
11195
11204
|
const path = yield* Path$3;
|
|
11196
|
-
const roots =
|
|
11197
|
-
root
|
|
11205
|
+
const roots = skillsRoots(path, options.directory).map((root) => ({
|
|
11206
|
+
root,
|
|
11198
11207
|
source: "project"
|
|
11199
|
-
}
|
|
11208
|
+
}));
|
|
11200
11209
|
if (options.hermesHome && isSome(options.hermesHome) && options.hermesHome.value !== "") roots.push({
|
|
11201
11210
|
root: path.resolve(options.hermesHome.value, "skills"),
|
|
11202
11211
|
source: "user"
|
|
11203
11212
|
});
|
|
11204
|
-
if (isSome(options.homeDirectory)) roots.push({
|
|
11205
|
-
root
|
|
11213
|
+
if (isSome(options.homeDirectory)) for (const root of skillsRoots(path, options.homeDirectory.value)) roots.push({
|
|
11214
|
+
root,
|
|
11206
11215
|
source: "user"
|
|
11207
11216
|
});
|
|
11208
11217
|
const byName = new Map();
|
|
@@ -11211,7 +11220,9 @@ const discover$1 = fnUntraced(function* (options) {
|
|
|
11211
11220
|
});
|
|
11212
11221
|
const discoverProject = fnUntraced(function* (directory) {
|
|
11213
11222
|
const path = yield* Path$3;
|
|
11214
|
-
|
|
11223
|
+
const byName = new Map();
|
|
11224
|
+
for (const root of skillsRoots(path, directory)) for (const skill of yield* scan(root, "project")) if (!byName.has(skill.name)) byName.set(skill.name, skill);
|
|
11225
|
+
return Array.from(byName.values());
|
|
11215
11226
|
});
|
|
11216
11227
|
const scan = fnUntraced(function* (skillsDir, source) {
|
|
11217
11228
|
const fs = yield* FileSystem;
|
|
@@ -32581,6 +32592,7 @@ var SessionRecord = class extends Class$1("clanka/Acp/SessionRecord")({
|
|
|
32581
32592
|
cwd: String$6,
|
|
32582
32593
|
model: String$6,
|
|
32583
32594
|
thoughtLevel: ThoughtLevel,
|
|
32595
|
+
fastMode: optionalKey(Boolean$5),
|
|
32584
32596
|
history: Prompt,
|
|
32585
32597
|
environment: optionalKey(ExecutionEnvironment)
|
|
32586
32598
|
}) {};
|
|
@@ -32663,15 +32675,24 @@ const mcpServerEntries = fnUntraced(function* (servers, cwd) {
|
|
|
32663
32675
|
return entries;
|
|
32664
32676
|
});
|
|
32665
32677
|
const SessionIdParams = Struct({ sessionId: String$6 });
|
|
32678
|
+
const SteerParams = Struct({
|
|
32679
|
+
sessionId: String$6,
|
|
32680
|
+
message: String$6
|
|
32681
|
+
});
|
|
32666
32682
|
const SetModelParams = Struct({
|
|
32667
32683
|
sessionId: String$6,
|
|
32668
32684
|
modelId: String$6
|
|
32669
32685
|
});
|
|
32670
|
-
const
|
|
32686
|
+
const FastModeValue = Literals$2(["off", "on"]);
|
|
32687
|
+
const SetConfigOptionParams = Union([Struct({
|
|
32671
32688
|
sessionId: String$6,
|
|
32672
32689
|
configId: Literal("thought_level"),
|
|
32673
32690
|
value: ThoughtLevel
|
|
32674
|
-
})
|
|
32691
|
+
}), Struct({
|
|
32692
|
+
sessionId: String$6,
|
|
32693
|
+
configId: Literal("fast_mode"),
|
|
32694
|
+
value: FastModeValue
|
|
32695
|
+
})]);
|
|
32675
32696
|
const TextBlock = Struct({
|
|
32676
32697
|
type: Literal("text"),
|
|
32677
32698
|
text: String$6
|
|
@@ -32791,7 +32812,8 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
32791
32812
|
update
|
|
32792
32813
|
});
|
|
32793
32814
|
const getSession = (sessionId) => fromOption(fromNullishOr(sessions.get(sessionId)), () => sessionNotFound(sessionId));
|
|
32794
|
-
const
|
|
32815
|
+
const supportsFastMode = (modelId) => options.supportsFastMode?.(modelId) ?? false;
|
|
32816
|
+
const requireModel = (modelId, thoughtLevel, fastMode) => fromOption(options.makeModel(modelId, thoughtLevel, fastMode && supportsFastMode(modelId)), () => new RpcError({
|
|
32795
32817
|
code: -32602,
|
|
32796
32818
|
message: `Unknown model: ${modelId}`
|
|
32797
32819
|
}));
|
|
@@ -32805,7 +32827,21 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
32805
32827
|
value,
|
|
32806
32828
|
name: value
|
|
32807
32829
|
}))
|
|
32808
|
-
}
|
|
32830
|
+
}, ...supportsFastMode(session.model) ? [{
|
|
32831
|
+
id: "fast_mode",
|
|
32832
|
+
name: "Fast mode",
|
|
32833
|
+
description: "Faster responses at a higher cost",
|
|
32834
|
+
category: "model_config",
|
|
32835
|
+
type: "select",
|
|
32836
|
+
currentValue: session.fastMode ? "on" : "off",
|
|
32837
|
+
options: [{
|
|
32838
|
+
value: "off",
|
|
32839
|
+
name: "Default"
|
|
32840
|
+
}, {
|
|
32841
|
+
value: "on",
|
|
32842
|
+
name: "On"
|
|
32843
|
+
}]
|
|
32844
|
+
}] : []];
|
|
32809
32845
|
const sessionState = fnUntraced(function* (session) {
|
|
32810
32846
|
const catalog = options.availableModels === void 0 ? [] : yield* options.availableModels;
|
|
32811
32847
|
const listed = new Set(catalog.map((model) => model.modelId));
|
|
@@ -32824,6 +32860,7 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
32824
32860
|
cwd: session.cwd,
|
|
32825
32861
|
model: session.model,
|
|
32826
32862
|
thoughtLevel: session.thoughtLevel,
|
|
32863
|
+
fastMode: session.fastMode,
|
|
32827
32864
|
history: session.agent.history.current,
|
|
32828
32865
|
environment: session.agent.environment.current
|
|
32829
32866
|
})).pipe(catch_((error) => logWarning("Failed to persist session", error)));
|
|
@@ -32846,8 +32883,10 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
32846
32883
|
cwd: record.cwd,
|
|
32847
32884
|
model: record.model,
|
|
32848
32885
|
thoughtLevel: record.thoughtLevel,
|
|
32886
|
+
fastMode: record.fastMode ?? false,
|
|
32849
32887
|
agent,
|
|
32850
32888
|
running: void 0,
|
|
32889
|
+
steers: void 0,
|
|
32851
32890
|
toolCalls: 0,
|
|
32852
32891
|
announcedSubagents: new Set(),
|
|
32853
32892
|
scope: sessionScope,
|
|
@@ -33025,6 +33064,33 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
33025
33064
|
content: textContent(finished.summary)
|
|
33026
33065
|
})));
|
|
33027
33066
|
});
|
|
33067
|
+
const withdrawSteers = fnUntraced(function* (session) {
|
|
33068
|
+
const unread = (session.steers ?? []).filter(({ fiber }) => fiber.pollUnsafe() === void 0);
|
|
33069
|
+
session.steers = [];
|
|
33070
|
+
yield* interruptAll(unread.map(({ fiber }) => fiber));
|
|
33071
|
+
return unread.filter(({ fiber }) => {
|
|
33072
|
+
const exit = fiber.pollUnsafe();
|
|
33073
|
+
return exit === void 0 || !isSuccess(exit);
|
|
33074
|
+
}).map(({ message }) => message);
|
|
33075
|
+
});
|
|
33076
|
+
const runPrompt = fnUntraced(function* (session, prompt) {
|
|
33077
|
+
yield* scoped(runTurn(session, prompt));
|
|
33078
|
+
while (true) {
|
|
33079
|
+
if (session.steers.every(({ fiber }) => fiber.pollUnsafe() !== void 0)) {
|
|
33080
|
+
session.steers = void 0;
|
|
33081
|
+
return;
|
|
33082
|
+
}
|
|
33083
|
+
const messages = yield* withdrawSteers(session);
|
|
33084
|
+
if (messages.length > 0) yield* scoped(runTurn(session, messages.map((content) => ({
|
|
33085
|
+
role: "user",
|
|
33086
|
+
content
|
|
33087
|
+
}))));
|
|
33088
|
+
}
|
|
33089
|
+
}, (effect, session) => effect.pipe(onExit(() => {
|
|
33090
|
+
const steers = session.steers ?? [];
|
|
33091
|
+
session.steers = void 0;
|
|
33092
|
+
return interruptAll(steers.map(({ fiber }) => fiber));
|
|
33093
|
+
})));
|
|
33028
33094
|
const initialize = succeed$1({
|
|
33029
33095
|
protocolVersion: 1,
|
|
33030
33096
|
agentCapabilities: {
|
|
@@ -33050,11 +33116,13 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
33050
33116
|
const { cwd, model, mcpServers } = yield* decodeParams(NewSessionParams, params);
|
|
33051
33117
|
const modelId = model ?? options.defaultModel;
|
|
33052
33118
|
const thoughtLevel = options.defaultThoughtLevel;
|
|
33053
|
-
|
|
33119
|
+
const fastMode = options.defaultFastMode ?? false;
|
|
33120
|
+
yield* requireModel(modelId, thoughtLevel, fastMode);
|
|
33054
33121
|
const session = yield* openSession(crypto.randomUUID(), new SessionRecord({
|
|
33055
33122
|
cwd,
|
|
33056
33123
|
model: modelId,
|
|
33057
33124
|
thoughtLevel,
|
|
33125
|
+
fastMode,
|
|
33058
33126
|
history: empty$1
|
|
33059
33127
|
}), mcpServers ?? []);
|
|
33060
33128
|
yield* persist(session);
|
|
@@ -33073,11 +33141,13 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
33073
33141
|
})));
|
|
33074
33142
|
if (isNone(record)) return yield* sessionNotFound(sessionId);
|
|
33075
33143
|
const modelId = model ?? record.value.model;
|
|
33076
|
-
|
|
33144
|
+
const fastMode = record.value.fastMode ?? false;
|
|
33145
|
+
yield* requireModel(modelId, record.value.thoughtLevel, fastMode);
|
|
33077
33146
|
const session = yield* openSession(sessionId, new SessionRecord({
|
|
33078
33147
|
cwd: cwd ?? record.value.cwd,
|
|
33079
33148
|
model: modelId,
|
|
33080
33149
|
thoughtLevel: record.value.thoughtLevel,
|
|
33150
|
+
fastMode,
|
|
33081
33151
|
history: record.value.history,
|
|
33082
33152
|
...record.value.environment !== void 0 && (cwd === void 0 || cwd === record.value.cwd) ? { environment: record.value.environment } : {}
|
|
33083
33153
|
}), mcpServers ?? []);
|
|
@@ -33087,16 +33157,28 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
33087
33157
|
const setModel = fnUntraced(function* (params) {
|
|
33088
33158
|
const { sessionId, modelId } = yield* decodeParams(SetModelParams, params);
|
|
33089
33159
|
const session = yield* getSession(sessionId);
|
|
33090
|
-
yield* requireModel(modelId, session.thoughtLevel);
|
|
33160
|
+
yield* requireModel(modelId, session.thoughtLevel, session.fastMode);
|
|
33091
33161
|
session.model = modelId;
|
|
33092
33162
|
yield* persist(session);
|
|
33093
|
-
|
|
33163
|
+
const options = configOptions(session);
|
|
33164
|
+
yield* update(sessionId, {
|
|
33165
|
+
sessionUpdate: "config_option_update",
|
|
33166
|
+
configOptions: options
|
|
33167
|
+
});
|
|
33168
|
+
return { configOptions: options };
|
|
33094
33169
|
});
|
|
33095
33170
|
const setConfigOption = fnUntraced(function* (params) {
|
|
33096
|
-
const
|
|
33097
|
-
const session = yield* getSession(sessionId);
|
|
33098
|
-
|
|
33099
|
-
|
|
33171
|
+
const option = yield* decodeParams(SetConfigOptionParams, params);
|
|
33172
|
+
const session = yield* getSession(option.sessionId);
|
|
33173
|
+
if (option.configId === "thought_level") {
|
|
33174
|
+
yield* requireModel(session.model, option.value, session.fastMode);
|
|
33175
|
+
session.thoughtLevel = option.value;
|
|
33176
|
+
} else {
|
|
33177
|
+
const fastMode = option.value === "on";
|
|
33178
|
+
if (fastMode && !supportsFastMode(session.model)) return yield* invalidParams(`Fast mode is not supported by model: ${session.model}`);
|
|
33179
|
+
yield* requireModel(session.model, session.thoughtLevel, fastMode);
|
|
33180
|
+
session.fastMode = fastMode;
|
|
33181
|
+
}
|
|
33100
33182
|
yield* persist(session);
|
|
33101
33183
|
return { configOptions: configOptions(session) };
|
|
33102
33184
|
});
|
|
@@ -33107,7 +33189,7 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
33107
33189
|
code: -32e3,
|
|
33108
33190
|
message: `Session ${sessionId} already has a prompt in progress`
|
|
33109
33191
|
});
|
|
33110
|
-
const model = yield* requireModel(session.model, session.thoughtLevel);
|
|
33192
|
+
const model = yield* requireModel(session.model, session.thoughtLevel, session.fastMode);
|
|
33111
33193
|
const input = yield* promptFromBlocks(session.cwd, prompt);
|
|
33112
33194
|
if (session.mcpFailures !== void 0) {
|
|
33113
33195
|
yield* update(sessionId, {
|
|
@@ -33116,7 +33198,8 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
33116
33198
|
});
|
|
33117
33199
|
session.mcpFailures = void 0;
|
|
33118
33200
|
}
|
|
33119
|
-
session.
|
|
33201
|
+
session.steers = [];
|
|
33202
|
+
session.running = yield* runPrompt(session, input).pipe(provide$1(model), forkChild);
|
|
33120
33203
|
const exit$1 = yield* exit(join$2(session.running));
|
|
33121
33204
|
session.running = void 0;
|
|
33122
33205
|
yield* persist(session);
|
|
@@ -33124,6 +33207,17 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
33124
33207
|
if (hasInterruptsOnly(exit$1.cause)) return { stopReason: "cancelled" };
|
|
33125
33208
|
return yield* toRpcError(exit$1.cause);
|
|
33126
33209
|
});
|
|
33210
|
+
const steer = fnUntraced(function* (params) {
|
|
33211
|
+
const { sessionId, message } = yield* decodeParams(SteerParams, params);
|
|
33212
|
+
const session = sessions.get(sessionId);
|
|
33213
|
+
if (session?.steers === void 0) return { queued: false };
|
|
33214
|
+
const fiber = yield* session.agent.steer(message).pipe(forkIn(session.scope, { startImmediately: true }));
|
|
33215
|
+
session.steers.push({
|
|
33216
|
+
message,
|
|
33217
|
+
fiber
|
|
33218
|
+
});
|
|
33219
|
+
return { queued: true };
|
|
33220
|
+
});
|
|
33127
33221
|
const closeSession = fnUntraced(function* (params) {
|
|
33128
33222
|
const { sessionId } = yield* decodeParams(SessionIdParams, params);
|
|
33129
33223
|
const session = yield* getSession(sessionId);
|
|
@@ -33149,6 +33243,7 @@ const make$8 = fnUntraced(function* (options) {
|
|
|
33149
33243
|
case "session/close": return closeSession(params);
|
|
33150
33244
|
case "session/set_model": return setModel(params);
|
|
33151
33245
|
case "session/prompt": return prompt(params);
|
|
33246
|
+
case "_session/steer": return steer(params);
|
|
33152
33247
|
default: return fail$1(new RpcError({
|
|
33153
33248
|
code: -32601,
|
|
33154
33249
|
message: `Method not found: ${method}`
|
|
@@ -41422,9 +41517,14 @@ const modelWebSocket = (model, options) => make$20("xai", model, mergeAll(layer$
|
|
|
41422
41517
|
//#endregion
|
|
41423
41518
|
//#region src/ModelLayer.ts
|
|
41424
41519
|
const withSubagentModel = (model) => merge$3(model, layerSubagentModel(model));
|
|
41425
|
-
const
|
|
41520
|
+
const supportsFastMode = (provider) => provider === "openai";
|
|
41521
|
+
const make = (provider, model, effort, openai, fastMode = false) => {
|
|
41426
41522
|
const options = effort === void 0 ? void 0 : { reasoning: effort === null ? null : { effort } };
|
|
41427
|
-
|
|
41523
|
+
const openaiOptions = fastMode ? {
|
|
41524
|
+
...options,
|
|
41525
|
+
service_tier: "priority"
|
|
41526
|
+
} : options;
|
|
41527
|
+
return provider === "openai" ? openai.apiKey !== void 0 ? withSubagentModel(model$2(model, openaiOptions)).pipe(provide$3(layer$4(openai))) : withSubagentModel(modelWebSocket$1(model, openaiOptions)).pipe(provide$3(layerClient$2)) : provider === "xai" ? withSubagentModel(modelWebSocket(model, options)).pipe(provide$3(layerClient)) : withSubagentModel(model$1(model, options)).pipe(provide$3(layerClient$1));
|
|
41428
41528
|
};
|
|
41429
41529
|
const isProvider$1 = is(Provider);
|
|
41430
41530
|
const parseAcpModelId = (modelId) => {
|
|
@@ -41434,6 +41534,7 @@ const parseAcpModelId = (modelId) => {
|
|
|
41434
41534
|
model
|
|
41435
41535
|
}) : none();
|
|
41436
41536
|
};
|
|
41537
|
+
const acpSupportsFastMode = (modelId) => exists(parseAcpModelId(modelId), ({ provider }) => supportsFastMode(provider));
|
|
41437
41538
|
const acpModels = (models) => models.map((model) => ({
|
|
41438
41539
|
modelId: `${model.provider}:${model.id}`,
|
|
41439
41540
|
name: `${model.name} (${model.provider})`
|
|
@@ -41445,19 +41546,27 @@ const resolveEffort = (efforts, thoughtLevel) => {
|
|
|
41445
41546
|
for (const effort of efforts) if (resolved === null || distance(effort) < distance(resolved) || distance(effort) === distance(resolved) && rank(effort) > rank(resolved)) resolved = effort;
|
|
41446
41547
|
return resolved;
|
|
41447
41548
|
};
|
|
41448
|
-
const makeAcp = (options) => (modelId, thoughtLevel) => map$8(parseAcpModelId(modelId), ({ provider, model }) => unwrap$1(map$5(options.models, (catalog) => {
|
|
41549
|
+
const makeAcp = (options) => (modelId, thoughtLevel, fastMode = false) => map$8(parseAcpModelId(modelId), ({ provider, model }) => unwrap$1(map$5(options.models, (catalog) => {
|
|
41449
41550
|
const info = catalog.find((entry) => entry.provider === provider && entry.id === model);
|
|
41450
|
-
return make(provider, model, info === void 0 ? thoughtLevel : resolveEffort(info.efforts, thoughtLevel), options.openai);
|
|
41551
|
+
return make(provider, model, info === void 0 ? thoughtLevel : resolveEffort(info.efforts, thoughtLevel), options.openai, fastMode);
|
|
41451
41552
|
})));
|
|
41452
41553
|
//#endregion
|
|
41453
41554
|
//#region node_modules/.pnpm/effect@4.0.5/node_modules/effect/dist/Logger.js
|
|
41454
41555
|
const LogToStderr = LogToStderr$1;
|
|
41455
41556
|
//#endregion
|
|
41456
41557
|
//#region package.json
|
|
41457
|
-
var version$1 = "0.
|
|
41558
|
+
var version$1 = "0.15.0";
|
|
41458
41559
|
//#endregion
|
|
41459
41560
|
//#region src/cli.ts
|
|
41460
|
-
const
|
|
41561
|
+
const ReportedVersion = Setting("reported-version")({ flag: String$1("reported-version").pipe(withDescription$1("Report this version instead of clanka's own, for --version and to ACP clients"), optional$1) });
|
|
41562
|
+
const reportedVersion = (args) => {
|
|
41563
|
+
for (const [index, arg] of args.entries()) {
|
|
41564
|
+
if (arg === "--") return void 0;
|
|
41565
|
+
if (arg === "--reported-version") return args[index + 1];
|
|
41566
|
+
if (arg.startsWith("--reported-version=")) return arg.slice(19);
|
|
41567
|
+
}
|
|
41568
|
+
};
|
|
41569
|
+
const version = reportedVersion(process.argv.slice(2)) ?? version$1;
|
|
41461
41570
|
const HttpClientLive = layerNodeHttpNoAgent.pipe(provide$3(layerAgentOptions({ keepAlive: true })));
|
|
41462
41571
|
const providers = Provider.literals;
|
|
41463
41572
|
const selectModel = fnUntraced(function* (provider) {
|
|
@@ -41520,6 +41629,7 @@ const provider = Literals("provider", providers).pipe(withAlias("p"), withFallba
|
|
|
41520
41629
|
const model = String$1("model").pipe(withAlias("m"), optional$1);
|
|
41521
41630
|
const apiKey = Redacted("api-key").pipe(withDescription$1("OpenAI API key (defaults to CLANKA_OPENAI_API_KEY)"), withFallbackConfig(Redacted$3("CLANKA_OPENAI_API_KEY")), optional$1);
|
|
41522
41631
|
const apiUrl = String$1("api-url").pipe(withDescription$1("OpenAI API base URL for API-key mode (defaults to CLANKA_OPENAI_API_URL or https://api.openai.com/v1)"), withFallbackConfig(String$4("CLANKA_OPENAI_API_URL")), optional$1);
|
|
41632
|
+
const fast = Boolean$1("fast").pipe(withDescription$1("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."), withFallbackConfig(Boolean$4("CLANKA_FAST").pipe(withDefault$2(false))));
|
|
41523
41633
|
const semantic = Directory("search").pipe(withDescription$1("Directory for semantic search data (uses OPENAI_API_KEY env var)"), withAlias("s"), optional$1);
|
|
41524
41634
|
const prompt = String$1("prompt").pipe(withDescription$1("Pass a prompt in non-interactive mode"), optional$1);
|
|
41525
41635
|
const compaction = Boolean$1("compaction").pipe(withDescription$1("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."), withFallbackConfig(Boolean$4("CLANKA_COMPACTION").pipe(withDefault$2(true))));
|
|
@@ -41544,17 +41654,22 @@ const Search = (directory) => unwrap$1(gen(function* () {
|
|
|
41544
41654
|
}).pipe(provide$3(model$3("text-embedding-3-small", { dimensions: 1536 })), provide$3(layer$4({ apiKey: apiKey.value })));
|
|
41545
41655
|
})).pipe(provide$3([layer$9, HttpClientLive]));
|
|
41546
41656
|
const acpModel = String$1("model").pipe(withAlias("m"), withDescription$1("Default model as <provider>/<model>/<effort>, e.g. openai/gpt-6-astra/medium"), withSchema(ModelId), withDefault("openai/gpt-6-astra/medium"), map$1((modelId) => getOrThrow(parseModelId(modelId))));
|
|
41657
|
+
const trustAllTools = Boolean$1("trust-all-tools").pipe(withDescription$1("Accepted for kiro-cli compatibility. Has no effect: clanka runs every tool call without asking."));
|
|
41547
41658
|
const acp = make$30("acp", {
|
|
41548
41659
|
model: acpModel,
|
|
41660
|
+
trustAllTools,
|
|
41661
|
+
fast,
|
|
41549
41662
|
compaction,
|
|
41550
41663
|
apiKey,
|
|
41551
41664
|
apiUrl
|
|
41552
|
-
}).pipe(withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), withHandler(({ model, apiKey, apiUrl }) => gen(function* () {
|
|
41665
|
+
}).pipe(withDescription("Run as an Agent Client Protocol (ACP) server over stdio"), withHandler(({ model, fast, apiKey, apiUrl }) => gen(function* () {
|
|
41553
41666
|
const repo = yield* ModelsRepo;
|
|
41554
41667
|
return yield* runStdio({
|
|
41555
41668
|
version,
|
|
41556
41669
|
defaultModel: model.model,
|
|
41557
41670
|
defaultThoughtLevel: model.thoughtLevel,
|
|
41671
|
+
defaultFastMode: fast,
|
|
41672
|
+
supportsFastMode: acpSupportsFastMode,
|
|
41558
41673
|
availableModels: map$5(repo.models, acpModels),
|
|
41559
41674
|
makeAgent: (cwd) => make$9.pipe(provide$1(layerLocal$1({ directory: cwd }))),
|
|
41560
41675
|
makeModel: makeAcp({
|
|
@@ -41569,6 +41684,7 @@ const acp = make$30("acp", {
|
|
|
41569
41684
|
make$30("clanka", {
|
|
41570
41685
|
provider,
|
|
41571
41686
|
model,
|
|
41687
|
+
fast,
|
|
41572
41688
|
semantic,
|
|
41573
41689
|
prompt,
|
|
41574
41690
|
compaction,
|
|
@@ -41576,7 +41692,7 @@ make$30("clanka", {
|
|
|
41576
41692
|
apiUrl,
|
|
41577
41693
|
mcp,
|
|
41578
41694
|
mcpConfig
|
|
41579
|
-
}).pipe(withHandler(fnUntraced(function* ({ provider, model: modelRaw, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, mcp, mcpConfig }) {
|
|
41695
|
+
}).pipe(withHandler(fnUntraced(function* ({ provider, model: modelRaw, fast, semantic, prompt: nonInteractivePrompt, apiKey, apiUrl, mcp, mcpConfig }) {
|
|
41580
41696
|
const stdio = yield* Stdio;
|
|
41581
41697
|
const mcpServers = yield* load({
|
|
41582
41698
|
cwd: process.cwd(),
|
|
@@ -41597,7 +41713,7 @@ make$30("clanka", {
|
|
|
41597
41713
|
const Model = make(provider, model, effort, {
|
|
41598
41714
|
apiKey: getOrUndefined(apiKey),
|
|
41599
41715
|
apiUrl: getOrUndefined(apiUrl)
|
|
41600
|
-
});
|
|
41716
|
+
}, fast);
|
|
41601
41717
|
return yield* gen(function* () {
|
|
41602
41718
|
const agent = yield* Agent;
|
|
41603
41719
|
if (isSome(nonInteractivePrompt)) return yield* pipe$1(agent.send({ prompt: nonInteractivePrompt.value }), unwrap$3, OutputFormatter.pretty(), run$4(stdio.stdout()));
|
|
@@ -41614,7 +41730,7 @@ make$30("clanka", {
|
|
|
41614
41730
|
onNone: () => empty$7,
|
|
41615
41731
|
onSome: Search
|
|
41616
41732
|
})), provideMerge(layer$6(mcpServers))), Model]));
|
|
41617
|
-
})), provide(({ prompt, compaction }) => mergeAll(ConversationMode.layer(isNone(prompt)), CompactionConfig.layer({ enabled: compaction }))), withSubcommands([acp]), run$1({ version }), provide$1([
|
|
41733
|
+
})), provide(({ prompt, compaction }) => mergeAll(ConversationMode.layer(isNone(prompt)), CompactionConfig.layer({ enabled: compaction }))), withSubcommands([acp]), withGlobalFlags([ReportedVersion]), run$1({ version }), provide$1([
|
|
41618
41734
|
layer$9,
|
|
41619
41735
|
ModelsRepo.layerModelsDev().pipe(provideMerge([Kvs, HttpClientLive])),
|
|
41620
41736
|
layerWebSocketConstructor,
|