clanka 0.17.3 → 0.18.1
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.d.ts.map +1 -1
- package/dist/AgentExecutor.js +40 -8
- package/dist/AgentExecutor.js.map +1 -1
- package/dist/AgentExecutor.test.js +51 -2
- 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/AgentTools.d.ts +4 -4
- package/dist/AgentTools.d.ts.map +1 -1
- package/dist/AgentTools.js +7 -2
- package/dist/AgentTools.js.map +1 -1
- package/dist/AgentTools.test.js +22 -0
- package/dist/AgentTools.test.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 +337 -229
- 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 +80 -2
- package/src/AgentExecutor.ts +70 -10
- package/src/AgentOutput.ts +23 -0
- package/src/AgentTools.test.ts +28 -0
- package/src/AgentTools.ts +7 -2
- 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
package/dist/ModelLayer.d.ts
CHANGED
|
@@ -5,13 +5,12 @@
|
|
|
5
5
|
* @since 1.0.0
|
|
6
6
|
*/
|
|
7
7
|
import { OpenAiClient } from "@effect/ai-openai";
|
|
8
|
-
import type * as LanguageModel from "effect/ai/LanguageModel";
|
|
9
|
-
import type * as Model from "effect/ai/Model";
|
|
10
8
|
import * as Effect from "effect/Effect";
|
|
11
9
|
import * as Layer from "effect/Layer";
|
|
12
10
|
import * as Option from "effect/Option";
|
|
13
11
|
import { ThoughtLevel } from "./Acp.ts";
|
|
14
12
|
import * as Agent from "./Agent.ts";
|
|
13
|
+
import * as Compaction from "./Compaction.ts";
|
|
15
14
|
import * as ModelsRepo from "./ModelsRepo.ts";
|
|
16
15
|
/**
|
|
17
16
|
* Whether a provider supports fast mode. Only OpenAI does, through the
|
|
@@ -21,16 +20,45 @@ import * as ModelsRepo from "./ModelsRepo.ts";
|
|
|
21
20
|
* @category Fast mode
|
|
22
21
|
*/
|
|
23
22
|
export declare const supportsFastMode: (provider: ModelsRepo.Provider) => provider is "openai";
|
|
23
|
+
/**
|
|
24
|
+
* A provider, model id and reasoning effort. `effort` is `null` for models
|
|
25
|
+
* that take no reasoning effort, and `undefined` to keep the provider's
|
|
26
|
+
* default effort.
|
|
27
|
+
*
|
|
28
|
+
* @since 1.0.0
|
|
29
|
+
* @category Models
|
|
30
|
+
*/
|
|
31
|
+
export interface ModelSpec {
|
|
32
|
+
readonly provider: ModelsRepo.Provider;
|
|
33
|
+
readonly model: string;
|
|
34
|
+
readonly effort?: string | null | undefined;
|
|
35
|
+
}
|
|
36
|
+
/**
|
|
37
|
+
* The models sub-agents and the compaction summarizer run on, when they
|
|
38
|
+
* should not run on the agent's own model.
|
|
39
|
+
*
|
|
40
|
+
* @since 1.0.0
|
|
41
|
+
* @category Models
|
|
42
|
+
*/
|
|
43
|
+
export interface AuxiliaryModels {
|
|
44
|
+
readonly subagent?: ModelSpec | undefined;
|
|
45
|
+
readonly summarizer?: ModelSpec | undefined;
|
|
46
|
+
}
|
|
24
47
|
/**
|
|
25
48
|
* The model layer for a provider and model id. `effort` is `null` for models
|
|
26
49
|
* that take no reasoning effort, and `undefined` to keep the provider's
|
|
27
50
|
* default effort. `fastMode` requests the `priority` service tier and is
|
|
28
|
-
* ignored for providers without fast mode
|
|
51
|
+
* ignored for providers without fast mode; it also applies to the
|
|
52
|
+
* `auxiliary` models.
|
|
53
|
+
*
|
|
54
|
+
* Sub-agents run on `auxiliary.subagent`, or on this model when it is not
|
|
55
|
+
* set. The compaction summarizer runs on `auxiliary.summarizer`, or on the
|
|
56
|
+
* model of the agent that compacts when it is not set.
|
|
29
57
|
*
|
|
30
58
|
* @since 1.0.0
|
|
31
59
|
* @category Layers
|
|
32
60
|
*/
|
|
33
|
-
export declare const make: (provider: ModelsRepo.Provider, model: string, effort: string | null | undefined, openai: OpenAiClient.Options, fastMode?: boolean) => Layer.Layer<LanguageModel.LanguageModel | Model.ModelName | Model.ProviderName | Agent.SubagentModel, never, import("./DeviceCodeHandler.ts").DeviceCodeHandler | import("effect/http/HttpClient").HttpClient | import("effect/persistence/KeyValueStore").KeyValueStore | import("effect/socket/Socket").WebSocketConstructor>;
|
|
61
|
+
export declare const make: (provider: ModelsRepo.Provider, model: string, effort: string | null | undefined, openai: OpenAiClient.Options, fastMode?: boolean, auxiliary?: AuxiliaryModels) => Layer.Layer<import("effect/ai/LanguageModel").LanguageModel | import("effect/ai/Model").ModelName | OpenAiClient.OpenAiSocket | import("effect/ai/Model").ProviderName | import("effect/ai/ResponseIdTracker").ResponseIdTracker | Agent.SubagentModel | Compaction.SummarizerModel, never, import("./DeviceCodeHandler.ts").DeviceCodeHandler | import("effect/http/HttpClient").HttpClient | import("effect/persistence/KeyValueStore").KeyValueStore | import("effect/socket/Socket").WebSocketConstructor>;
|
|
34
62
|
/**
|
|
35
63
|
* Parses a `<provider>:<model>` id as advertised over ACP.
|
|
36
64
|
*
|
|
@@ -69,7 +97,7 @@ export declare const acpModels: (models: ReadonlyArray<ModelsRepo.ModelInfo>) =>
|
|
|
69
97
|
* A listed model that does not support the session thought level runs at the
|
|
70
98
|
* supported effort nearest to it in `ThoughtLevel` order, the higher one on a
|
|
71
99
|
* tie. Unlisted models run at the session thought level. Fast mode applies
|
|
72
|
-
* to OpenAI models only.
|
|
100
|
+
* to OpenAI models only. Every session uses the same `auxiliary` models.
|
|
73
101
|
*
|
|
74
102
|
* @since 1.0.0
|
|
75
103
|
* @category ACP
|
|
@@ -77,5 +105,6 @@ export declare const acpModels: (models: ReadonlyArray<ModelsRepo.ModelInfo>) =>
|
|
|
77
105
|
export declare const makeAcp: (options: {
|
|
78
106
|
readonly models: Effect.Effect<ReadonlyArray<ModelsRepo.ModelInfo>>;
|
|
79
107
|
readonly openai: OpenAiClient.Options;
|
|
80
|
-
|
|
108
|
+
readonly auxiliary?: AuxiliaryModels | undefined;
|
|
109
|
+
}) => (modelId: string, thoughtLevel: ThoughtLevel, fastMode?: boolean) => Option.Option<Layer.Layer<import("effect/ai/LanguageModel").LanguageModel | import("effect/ai/Model").ModelName | OpenAiClient.OpenAiSocket | import("effect/ai/Model").ProviderName | import("effect/ai/ResponseIdTracker").ResponseIdTracker | Agent.SubagentModel | Compaction.SummarizerModel, never, import("./DeviceCodeHandler.ts").DeviceCodeHandler | import("effect/http/HttpClient").HttpClient | import("effect/persistence/KeyValueStore").KeyValueStore | import("effect/socket/Socket").WebSocketConstructor>>;
|
|
81
110
|
//# sourceMappingURL=ModelLayer.d.ts.map
|
package/dist/ModelLayer.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelLayer.d.ts","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"ModelLayer.d.ts","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAGnC,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAG7C;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,aAAc,UAAU,CAAC,QAAQ,yBACvC,CAAA;AAEvB;;;;;;;GAOG;AACH,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,QAAQ,EAAE,UAAU,CAAC,QAAQ,CAAA;IACtC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAC5C;AAED;;;;;;GAMG;AACH,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;IACzC,QAAQ,CAAC,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,CAAA;CAC5C;AAsCD;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,IAAI,aACL,UAAU,CAAC,QAAQ,SACtB,MAAM,UACL,MAAM,GAAG,IAAI,GAAG,SAAS,UACzB,YAAY,CAAC,OAAO,kCAEhB,eAAe,mfAc5B,CAAA;AAID;;;;;GAKG;AACH,eAAO,MAAM,eAAe,YAAa,MAAM;;;;;;EAK9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,YAAa,MAAM,YAGhD,CAAA;AAEH;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,WAAY,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC;;;GAIhE,CAAA;AA0BL;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,OAAO,YACR;IACR,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAA;IACnE,QAAQ,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,CAAA;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,GAAG,SAAS,CAAA;CACjD,eACS,MAAM,gBAAgB,YAAY,shBAmBzC,CAAA"}
|
package/dist/ModelLayer.js
CHANGED
|
@@ -13,10 +13,10 @@ import { ThoughtLevel } from "./Acp.js";
|
|
|
13
13
|
import * as Agent from "./Agent.js";
|
|
14
14
|
import * as ClaudeAgent from "./ClaudeAgent.js";
|
|
15
15
|
import * as Codex from "./Codex.js";
|
|
16
|
+
import * as Compaction from "./Compaction.js";
|
|
16
17
|
import * as Copilot from "./Copilot.js";
|
|
17
18
|
import * as ModelsRepo from "./ModelsRepo.js";
|
|
18
19
|
import * as Xai from "./Xai.js";
|
|
19
|
-
const withSubagentModel = (model) => Layer.merge(model, Agent.layerSubagentModel(model));
|
|
20
20
|
/**
|
|
21
21
|
* Whether a provider supports fast mode. Only OpenAI does, through the
|
|
22
22
|
* `priority` service tier.
|
|
@@ -25,16 +25,7 @@ const withSubagentModel = (model) => Layer.merge(model, Agent.layerSubagentModel
|
|
|
25
25
|
* @category Fast mode
|
|
26
26
|
*/
|
|
27
27
|
export const supportsFastMode = (provider) => provider === "openai";
|
|
28
|
-
|
|
29
|
-
* The model layer for a provider and model id. `effort` is `null` for models
|
|
30
|
-
* that take no reasoning effort, and `undefined` to keep the provider's
|
|
31
|
-
* default effort. `fastMode` requests the `priority` service tier and is
|
|
32
|
-
* ignored for providers without fast mode.
|
|
33
|
-
*
|
|
34
|
-
* @since 1.0.0
|
|
35
|
-
* @category Layers
|
|
36
|
-
*/
|
|
37
|
-
export const make = (provider, model, effort, openai, fastMode = false) => {
|
|
28
|
+
const languageModel = (provider, model, effort, openai, fastMode) => {
|
|
38
29
|
const options = effort === undefined
|
|
39
30
|
? undefined
|
|
40
31
|
: { reasoning: effort === null ? null : { effort: effort } };
|
|
@@ -44,16 +35,37 @@ export const make = (provider, model, effort, openai, fastMode = false) => {
|
|
|
44
35
|
switch (provider) {
|
|
45
36
|
case "openai":
|
|
46
37
|
return openai.apiKey !== undefined
|
|
47
|
-
?
|
|
48
|
-
:
|
|
38
|
+
? Codex.model(model, openaiOptions).pipe(Layer.provide(OpenAiClient.layer(openai)))
|
|
39
|
+
: Codex.modelWebSocket(model, openaiOptions).pipe(Layer.provide(Codex.layerClient));
|
|
49
40
|
case "xai":
|
|
50
|
-
return
|
|
41
|
+
return Xai.modelWebSocket(model, options).pipe(Layer.provide(Xai.layerClient));
|
|
51
42
|
case "claude":
|
|
52
|
-
return
|
|
43
|
+
return ClaudeAgent.model(model, { effort });
|
|
53
44
|
case "copilot":
|
|
54
|
-
return
|
|
45
|
+
return Copilot.model(model, options).pipe(Layer.provide(Copilot.layerClient));
|
|
55
46
|
}
|
|
56
47
|
};
|
|
48
|
+
/**
|
|
49
|
+
* The model layer for a provider and model id. `effort` is `null` for models
|
|
50
|
+
* that take no reasoning effort, and `undefined` to keep the provider's
|
|
51
|
+
* default effort. `fastMode` requests the `priority` service tier and is
|
|
52
|
+
* ignored for providers without fast mode; it also applies to the
|
|
53
|
+
* `auxiliary` models.
|
|
54
|
+
*
|
|
55
|
+
* Sub-agents run on `auxiliary.subagent`, or on this model when it is not
|
|
56
|
+
* set. The compaction summarizer runs on `auxiliary.summarizer`, or on the
|
|
57
|
+
* model of the agent that compacts when it is not set.
|
|
58
|
+
*
|
|
59
|
+
* @since 1.0.0
|
|
60
|
+
* @category Layers
|
|
61
|
+
*/
|
|
62
|
+
export const make = (provider, model, effort, openai, fastMode = false, auxiliary) => {
|
|
63
|
+
const fromSpec = (spec) => languageModel(spec.provider, spec.model, spec.effort, openai, fastMode);
|
|
64
|
+
const main = languageModel(provider, model, effort, openai, fastMode);
|
|
65
|
+
return Layer.mergeAll(main, Agent.layerSubagentModel(auxiliary?.subagent === undefined ? main : fromSpec(auxiliary.subagent)), auxiliary?.summarizer === undefined
|
|
66
|
+
? Layer.empty
|
|
67
|
+
: Compaction.layerSummarizerModel(fromSpec(auxiliary.summarizer)));
|
|
68
|
+
};
|
|
57
69
|
const isProvider = Schema.is(ModelsRepo.Provider);
|
|
58
70
|
/**
|
|
59
71
|
* Parses a `<provider>:<model>` id as advertised over ACP.
|
|
@@ -108,7 +120,7 @@ const resolveEffort = (efforts, thoughtLevel) => {
|
|
|
108
120
|
* A listed model that does not support the session thought level runs at the
|
|
109
121
|
* supported effort nearest to it in `ThoughtLevel` order, the higher one on a
|
|
110
122
|
* tie. Unlisted models run at the session thought level. Fast mode applies
|
|
111
|
-
* to OpenAI models only.
|
|
123
|
+
* to OpenAI models only. Every session uses the same `auxiliary` models.
|
|
112
124
|
*
|
|
113
125
|
* @since 1.0.0
|
|
114
126
|
* @category ACP
|
|
@@ -117,6 +129,6 @@ export const makeAcp = (options) => (modelId, thoughtLevel, fastMode = false) =>
|
|
|
117
129
|
const info = catalog.find((entry) => entry.provider === provider && entry.id === model);
|
|
118
130
|
return make(provider, model, info === undefined
|
|
119
131
|
? thoughtLevel
|
|
120
|
-
: resolveEffort(info.efforts, thoughtLevel), options.openai, fastMode);
|
|
132
|
+
: resolveEffort(info.efforts, thoughtLevel), options.openai, fastMode, options.auxiliary);
|
|
121
133
|
})));
|
|
122
134
|
//# sourceMappingURL=ModelLayer.js.map
|
package/dist/ModelLayer.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelLayer.js","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"ModelLayer.js","sourceRoot":"","sources":["../src/ModelLayer.ts"],"names":[],"mappings":"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"}
|
package/dist/ModelLayer.test.js
CHANGED
|
@@ -9,6 +9,7 @@ import * as HttpClient from "effect/http/HttpClient";
|
|
|
9
9
|
import * as HttpClientResponse from "effect/http/HttpClientResponse";
|
|
10
10
|
import * as KeyValueStore from "effect/persistence/KeyValueStore";
|
|
11
11
|
import * as Socket from "effect/socket/Socket";
|
|
12
|
+
import * as Agent from "./Agent.js";
|
|
12
13
|
import { DeviceCodeHandler } from "./DeviceCodeHandler.js";
|
|
13
14
|
import * as ModelLayer from "./ModelLayer.js";
|
|
14
15
|
import * as ModelsRepo from "./ModelsRepo.js";
|
|
@@ -37,6 +38,7 @@ const makeModel = ModelLayer.makeAcp({
|
|
|
37
38
|
apiKey: Redacted.make("test-key"),
|
|
38
39
|
apiUrl: "https://codex.test",
|
|
39
40
|
},
|
|
41
|
+
auxiliary: { subagent: { provider: "openai", model: "gpt-4.1" } },
|
|
40
42
|
});
|
|
41
43
|
// The other providers' login and socket services, which the API-key openai
|
|
42
44
|
// path must not use.
|
|
@@ -46,17 +48,20 @@ const unused = Layer.mergeAll(KeyValueStore.layerMemory, Layer.succeed(DeviceCod
|
|
|
46
48
|
throw new Error("Unexpected live WebSocket");
|
|
47
49
|
}));
|
|
48
50
|
// The request body the model for `modelId` sends at session thought level
|
|
49
|
-
// `thoughtLevel`.
|
|
50
|
-
const requestBody = Effect.fnUntraced(function* (modelId, thoughtLevel = "high", fastMode = false) {
|
|
51
|
+
// `thoughtLevel`, or its sub-agent model with `subagent`.
|
|
52
|
+
const requestBody = Effect.fnUntraced(function* (modelId, thoughtLevel = "high", fastMode = false, subagent = false) {
|
|
51
53
|
const requests = [];
|
|
52
54
|
const client = HttpClient.make((request) => Effect.sync(() => {
|
|
53
55
|
requests.push(request);
|
|
54
56
|
return HttpClientResponse.fromWeb(request, new Response(null, { status: 400 }));
|
|
55
57
|
}));
|
|
56
58
|
const model = Option.getOrThrow(makeModel(modelId, thoughtLevel, fastMode));
|
|
57
|
-
|
|
59
|
+
const send = Effect.gen(function* () {
|
|
58
60
|
const ai = yield* LanguageModel.LanguageModel;
|
|
59
61
|
yield* ai.streamText({ prompt: "hello" }).pipe(Stream.runDrain, Effect.exit);
|
|
62
|
+
});
|
|
63
|
+
yield* Effect.gen(function* () {
|
|
64
|
+
yield* subagent ? Effect.provide(send, yield* Agent.SubagentModel) : send;
|
|
60
65
|
}).pipe(Effect.provide(model.pipe(Layer.provide([Layer.succeed(HttpClient.HttpClient, client), unused]))));
|
|
61
66
|
assert.lengthOf(requests, 1);
|
|
62
67
|
const body = requests[0].body;
|
|
@@ -80,6 +85,9 @@ describe("ModelLayer.makeAcp", () => {
|
|
|
80
85
|
assert.strictEqual((yield* requestBody("openai:gpt-6-astra", "high", true)).service_tier, "priority");
|
|
81
86
|
assert.isFalse("service_tier" in (yield* requestBody("openai:gpt-6-astra")));
|
|
82
87
|
}));
|
|
88
|
+
it.effect("runs sub-agents on the auxiliary sub-agent model", () => Effect.gen(function* () {
|
|
89
|
+
assert.strictEqual((yield* requestBody("openai:gpt-6-astra", "high", false, true)).model, "gpt-4.1");
|
|
90
|
+
}));
|
|
83
91
|
it("rejects ids that are not <provider>:<model>", () => {
|
|
84
92
|
assert.isTrue(Option.isNone(makeModel("nope", "high")));
|
|
85
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelLayer.test.js","sourceRoot":"","sources":["../src/ModelLayer.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,gBAAgB,CAAA;AACrD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,aAAa,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAA;AAEpD,OAAO,KAAK,kBAAkB,MAAM,gCAAgC,CAAA;AACpE,OAAO,KAAK,aAAa,MAAM,kCAAkC,CAAA;AACjE,OAAO,KAAK,MAAM,MAAM,sBAAsB,CAAA;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAC1D,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAE7C,MAAM,SAAS,GAAG,UAAU,CAAC,OAAO,CAAC;IACnC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC;QACrB,IAAI,UAAU,CAAC,SAAS,CAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,EAAE,EAAE,SAAS;YACb,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,EAAE;SACZ,CAAC;QACF,IAAI,UAAU,CAAC,SAAS,CAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,EAAE,EAAE,aAAa;YACjB,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;SACzB,CAAC;QACF,IAAI,UAAU,CAAC,SAAS,CAAC;YACvB,QAAQ,EAAE,QAAQ;YAClB,EAAE,EAAE,WAAW;YACf,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,CAAC,MAAM,CAAC;SAClB,CAAC;KACH,CAAC;IACF,MAAM,EAAE;QACN,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC;QACjC,MAAM,EAAE,oBAAoB;KAC7B;
|
|
1
|
+
{"version":3,"file":"ModelLayer.test.js","sourceRoot":"","sources":["../src/ModelLayer.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputFormatter.d.ts","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAO7D;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,KAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC,CAAA;AAExD;;;GAGG;AACH,eAAO,MAAM,MAAM,aAAc;IAC/B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;CACzD,KAAG,
|
|
1
|
+
{"version":3,"file":"OutputFormatter.d.ts","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAA;AAO7D;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,CAAC,EAAE,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,KAChD,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC,CAAA;AAExD;;;GAGG;AACH,eAAO,MAAM,MAAM,aAAc;IAC/B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;CACzD,KAAG,eA8GH,CAAA;;QAoCO,CAAC,EAAE,CAAC,SACC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,GAAG,CAAC,EAAE,CAAC,CAAC,GACjD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;qBACf,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;;AAV1C;;;GAGG;AACH,qBAAa,KAAM,SAAQ,UAQQ;CAAG;AAEtC;;;GAGG;AACH,eAAO,MAAM,UAAU,cAAe,eAAe,qCAsDlD,CAAA"}
|
package/dist/OutputFormatter.js
CHANGED
|
@@ -96,6 +96,9 @@ ${chalk.dim(output.summary)}\n\n`;
|
|
|
96
96
|
case "CompactionEnded": {
|
|
97
97
|
return `${prefix}${chalkInfoHeading(`${infoIcon} Context compacted (${output.reason}):`)} ~${numberFormat.format(output.tokensBefore)} tokens to ~${numberFormat.format(output.tokensAfter)}\n\n`;
|
|
98
98
|
}
|
|
99
|
+
case "SessionRestarted": {
|
|
100
|
+
return `${prefix}${chalkInfoHeading(`${infoIcon} Session restarted (${output.reason}):`)} ${numberFormat.format(output.contextTokens)} context tokens resent, ${numberFormat.format(output.cacheWrite)} cache write\n\n`;
|
|
101
|
+
}
|
|
99
102
|
case "EnvironmentUpdated": {
|
|
100
103
|
return `${prefix}${chalkInfoHeading(`${infoIcon} Environment update:`)}\n\n${chalk.dim(truncate(output.update))}\n\n`;
|
|
101
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"OutputFormatter.js","sourceRoot":"","sources":["../src/OutputFormatter.ts"],"names":[],"mappings":"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"}
|
package/dist/Xai.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Xai.d.ts","sourceRoot":"","sources":["../src/Xai.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,KAAK,KAAK,aAAa,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,KAAK,iBAAiB,MAAM,6BAA6B,CAAA;AAErE;;;GAGG;AACH,eAAO,MAAM,WAAW,4MAEmB,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,EACrC,WAAW,CACZ,GAAG;IACF,QAAQ,CAAC,SAAS,CAAC,EACjB,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,CAAA;CACxE,GAAG,OAAO,gBAAgB,CAAC,OAAO,CAAA;AAEnC;;;GAGG;AACH,eAAO,MAAM,KAAK,UACT,MAAM,YACH,YAAY,GAAG,SAAS,KACjC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,YAAY,
|
|
1
|
+
{"version":3,"file":"Xai.d.ts","sourceRoot":"","sources":["../src/Xai.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAE7C,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AACxC,OAAO,KAAK,KAAK,aAAa,MAAM,yBAAyB,CAAA;AAC7D,OAAO,KAAK,KAAK,MAAM,MAAM,sBAAsB,CAAA;AACnD,OAAO,KAAK,KAAK,iBAAiB,MAAM,6BAA6B,CAAA;AAErE;;;GAGG;AACH,eAAO,MAAM,WAAW,4MAEmB,CAAA;AAE3C;;;;;;GAMG;AACH,MAAM,MAAM,YAAY,GAAG,IAAI,CAC7B,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,EACrC,WAAW,CACZ,GAAG;IACF,QAAQ,CAAC,SAAS,CAAC,EACjB,mBAAmB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,GAAG,IAAI,GAAG,SAAS,CAAA;CACxE,GAAG,OAAO,gBAAgB,CAAC,OAAO,CAAA;AAEnC;;;GAGG;AACH,eAAO,MAAM,KAAK,UACT,MAAM,YACH,YAAY,GAAG,SAAS,KACjC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,aAAa,CAAC,aAAa,EAAE,YAAY,CAAC,YAAY,CA6BzE,CAAA;AAEH;;;GAGG;AACH,eAAO,MAAM,cAAc,UAClB,MAAM,YACH,YAAY,GAAG,SAAS,KACjC,KAAK,CAAC,KAAK,CACZ,KAAK,EACH,aAAa,CAAC,aAAa,GAC3B,YAAY,CAAC,YAAY,GACzB,iBAAiB,CAAC,iBAAiB,EACrC,YAAY,CAAC,YAAY,GAAG,MAAM,CAAC,oBAAoB,CAiCtD,CAAA"}
|
package/dist/Xai.js
CHANGED
|
@@ -24,18 +24,14 @@ export const model = (model, options) => Model.make("xai", model, Layer.mergeAll
|
|
|
24
24
|
config: {
|
|
25
25
|
...Struct.omit(options ?? {}, [
|
|
26
26
|
"reasoning",
|
|
27
|
-
|
|
28
|
-
"supportsImages",
|
|
27
|
+
...AgentModelConfig.optionKeys,
|
|
29
28
|
]),
|
|
30
29
|
store: options?.store ?? false,
|
|
31
30
|
reasoning: options?.reasoning === null
|
|
32
31
|
? undefined
|
|
33
32
|
: { effort: "high", ...options?.reasoning },
|
|
34
33
|
},
|
|
35
|
-
}), AgentModelConfig.layer({
|
|
36
|
-
systemPromptTransform: options?.systemPromptTransform,
|
|
37
|
-
supportsImages: options?.supportsImages,
|
|
38
|
-
}),
|
|
34
|
+
}), AgentModelConfig.layer(Struct.pick(options ?? {}, AgentModelConfig.optionKeys)),
|
|
39
35
|
// Cap compaction summaries; xAI honours max_output_tokens.
|
|
40
36
|
Layer.succeed(Compaction.SummarizerTransform, (effect) => OpenAiLanguageModel.withConfigOverride(effect, {
|
|
41
37
|
max_output_tokens: Compaction.summarizerMaxOutputTokens,
|
|
@@ -49,8 +45,7 @@ export const modelWebSocket = (model, options) => Model.make("xai", model, Layer
|
|
|
49
45
|
config: {
|
|
50
46
|
...Struct.omit(options ?? {}, [
|
|
51
47
|
"reasoning",
|
|
52
|
-
|
|
53
|
-
"supportsImages",
|
|
48
|
+
...AgentModelConfig.optionKeys,
|
|
54
49
|
]),
|
|
55
50
|
// xAI needs stored responses to resolve previous_response_id.
|
|
56
51
|
store: true,
|
|
@@ -59,10 +54,7 @@ export const modelWebSocket = (model, options) => Model.make("xai", model, Layer
|
|
|
59
54
|
? undefined
|
|
60
55
|
: { effort: "high", ...options?.reasoning },
|
|
61
56
|
},
|
|
62
|
-
}), AgentModelConfig.layer({
|
|
63
|
-
systemPromptTransform: options?.systemPromptTransform,
|
|
64
|
-
supportsImages: options?.supportsImages,
|
|
65
|
-
}),
|
|
57
|
+
}), AgentModelConfig.layer(Struct.pick(options ?? {}, AgentModelConfig.optionKeys)),
|
|
66
58
|
// Cap compaction summaries; xAI honours max_output_tokens.
|
|
67
59
|
Layer.succeed(Compaction.SummarizerTransform, (effect) => OpenAiLanguageModel.withConfigOverride(effect, {
|
|
68
60
|
max_output_tokens: Compaction.summarizerMaxOutputTokens,
|
package/dist/Xai.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Xai.js","sourceRoot":"","sources":["../src/Xai.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAA;AACrE,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AACtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAA;AAC7C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,iBAAiB,CAAA;AAKxC;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,YAAY,CAAC,KAAK,CAAC;IAC5C,MAAM,EAAE,qBAAqB;CAC9B,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,CAAA;AAiB3C;;;GAGG;AACH,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,KAAa,EACb,OAAkC,EAC0C,EAAE,CAC9E,KAAK,CAAC,IAAI,CACR,KAAK,EACL,KAAK,EACL,KAAK,CAAC,QAAQ,CACZ,mBAAmB,CAAC,KAAK,CAAC;IACxB,KAAK;IACL,MAAM,EAAE;QACN,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,IAAI,EAAE,EAAE;YAC5B,WAAW;YACX,
|
|
1
|
+
{"version":3,"file":"Xai.js","sourceRoot":"","sources":["../src/Xai.ts"],"names":[],"mappings":"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"}
|