clanka 0.2.71 → 0.2.72
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/AgentExecutor.d.ts +36 -36
- package/dist/AgentExecutor.d.ts.map +1 -1
- package/dist/AgentExecutor.js +5 -5
- package/dist/AgentExecutor.js.map +1 -1
- package/dist/AgentOutput.js +1 -1
- package/dist/AgentOutput.js.map +1 -1
- package/dist/ChunkRepo.js +1 -1
- package/dist/ChunkRepo.js.map +1 -1
- package/dist/CodeChunker.js +1 -1
- package/dist/CodeChunker.js.map +1 -1
- package/dist/CodexAuth.js +1 -1
- package/dist/CodexAuth.js.map +1 -1
- package/dist/CopilotAuth.js +1 -1
- package/dist/CopilotAuth.js.map +1 -1
- package/dist/ExaSearch.js +1 -1
- package/dist/ExaSearch.js.map +1 -1
- package/dist/McpClient.js +1 -1
- package/dist/McpClient.js.map +1 -1
- package/dist/SemanticSearch.d.ts +2 -2
- package/dist/SemanticSearch.d.ts.map +1 -1
- package/dist/SemanticSearch.js.map +1 -1
- package/dist/TypeBuilder.js +1 -1
- package/dist/TypeBuilder.js.map +1 -1
- package/dist/cli.js +11 -11
- package/dist/cli.js.map +1 -1
- package/package.json +21 -21
- package/src/AgentExecutor.ts +18 -24
- package/src/AgentOutput.ts +1 -1
- package/src/ChunkRepo.ts +1 -1
- package/src/CodeChunker.ts +1 -1
- package/src/CodexAuth.ts +1 -1
- package/src/CopilotAuth.ts +1 -1
- package/src/ExaSearch.ts +1 -1
- package/src/McpClient.ts +1 -1
- package/src/SemanticSearch.ts +2 -2
- package/src/TypeBuilder.ts +1 -1
- package/src/cli.ts +14 -14
package/dist/SemanticSearch.d.ts
CHANGED
|
@@ -14,10 +14,10 @@ import { SemanticSearch } from "./SemanticSearch/Service.ts";
|
|
|
14
14
|
* @category Services
|
|
15
15
|
*/
|
|
16
16
|
export * from "./SemanticSearch/Service.ts";
|
|
17
|
-
export declare const makeEmbeddingResolver: (resolver: EmbeddingModel.
|
|
17
|
+
export declare const makeEmbeddingResolver: (resolver: EmbeddingModel.EmbeddingModel["resolver"], options: {
|
|
18
18
|
readonly embeddingBatchSize?: number | undefined;
|
|
19
19
|
readonly embeddingRequestDelay?: Duration.Input | undefined;
|
|
20
|
-
}) => EmbeddingModel.
|
|
20
|
+
}) => EmbeddingModel.EmbeddingModel["resolver"];
|
|
21
21
|
export declare const chunkEmbeddingInput: (chunk: CodeChunker.CodeChunk) => string;
|
|
22
22
|
/**
|
|
23
23
|
* @since 1.0.0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SemanticSearch.d.ts","sourceRoot":"","sources":["../src/SemanticSearch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,cAAc,MAAM,mCAAmC,CAAA;AAGnE,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AAEnC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAG3C,OAAO,KAAK,KAAK,QAAQ,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,KAAK,cAAc,MAAM,wCAAwC,CAAA;AAC7E,OAAO,KAAK,KAAK,aAAa,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,KAAK,mBAAmB,MAAM,6CAA6C,CAAA;AACvF,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;;GAGG;AACH,cAAc,6BAA6B,CAAA;AAY3C,eAAO,MAAM,qBAAqB,aACtB,cAAc,CAAC,
|
|
1
|
+
{"version":3,"file":"SemanticSearch.d.ts","sourceRoot":"","sources":["../src/SemanticSearch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAGrC,OAAO,KAAK,cAAc,MAAM,mCAAmC,CAAA;AAGnE,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AAEnC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAG3C,OAAO,KAAK,KAAK,QAAQ,MAAM,8BAA8B,CAAA;AAC7D,OAAO,KAAK,KAAK,cAAc,MAAM,wCAAwC,CAAA;AAC7E,OAAO,KAAK,KAAK,aAAa,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,KAAK,mBAAmB,MAAM,6CAA6C,CAAA;AACvF,OAAO,KAAK,KAAK,UAAU,MAAM,mBAAmB,CAAA;AAEpD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;;GAGG;AACH,cAAc,6BAA6B,CAAA;AAY3C,eAAO,MAAM,qBAAqB,aACtB,cAAc,CAAC,cAAc,CAAC,UAAU,CAAC,WAC1C;IACP,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChD,QAAQ,CAAC,qBAAqB,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;CAC5D,KACA,cAAc,CAAC,cAAc,CAAC,UAAU,CAMxC,CAAA;AAEH,eAAO,MAAM,mBAAmB,UAAW,WAAW,CAAC,SAAS,KAAG,MAwBlE,CAAA;AAKD;;;GAGG;AACH,eAAO,MAAM,KAAK,YAAa;IAC7B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACtC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAChD,QAAQ,CAAC,qBAAqB,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAA;IAC3D,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IACzC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACjD,KAAG,KAAK,CAAC,KAAK,CACb,cAAc,EACZ,QAAQ,CAAC,QAAQ,GACjB,cAAc,CAAC,cAAc,GAC7B,aAAa,CAAC,aAAa,EAC3B,cAAc,CAAC,cAAc,GAC7B,IAAI,CAAC,IAAI,GACT,mBAAmB,CAAC,mBAAmB,GACvC,UAAU,CAAC,UAAU,GACrB,cAAc,CAAC,UAAU,CAgL1B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SemanticSearch.js","sourceRoot":"","sources":["../src/SemanticSearch.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACxC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,SAAS,MAAM,gBAAgB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,kBAAkB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,cAAc,MAAM,mCAAmC,CAAA;AACnE,OAAO,KAAK,eAAe,MAAM,wBAAwB,CAAA;AACzD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AAMzC,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;;GAGG;AACH,cAAc,6BAA6B,CAAA;AAE3C,MAAM,aAAa,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;AAEhE,MAAM,kBAAkB,GAAG,CAAC,OAE3B,EAAE,EAAE,CAAC,CAAC;IACL,SAAS,EAAE,EAAE;IACb,YAAY,EAAE,CAAC;IACf,kBAAkB,EAAE,OAAO,CAAC,kBAAkB,IAAI,MAAM;CACzD,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,
|
|
1
|
+
{"version":3,"file":"SemanticSearch.js","sourceRoot":"","sources":["../src/SemanticSearch.ts"],"names":[],"mappings":"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"}
|
package/dist/TypeBuilder.js
CHANGED
|
@@ -248,7 +248,7 @@ const stripOptionalTupleUndefined = (ast) => {
|
|
|
248
248
|
}
|
|
249
249
|
return definedTypes.length === 1 && definedType !== undefined
|
|
250
250
|
? definedType
|
|
251
|
-
: new AST.Union(definedTypes, ast.
|
|
251
|
+
: new AST.Union(definedTypes, ast.options, ast.annotations, ast.checks, ast.encoding, ast.context);
|
|
252
252
|
};
|
|
253
253
|
const tupleElementTypeNode = (ast, context, indentLevel) => {
|
|
254
254
|
const type = toTypeNode(stripOptionalTupleUndefined(ast), context, indentLevel);
|
package/dist/TypeBuilder.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeBuilder.js","sourceRoot":"","sources":["../src/TypeBuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"TypeBuilder.js","sourceRoot":"","sources":["../src/TypeBuilder.ts"],"names":[],"mappings":"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"}
|
package/dist/cli.js
CHANGED
|
@@ -21,7 +21,7 @@ import * as KeyValueStore from "effect/unstable/persistence/KeyValueStore";
|
|
|
21
21
|
import * as Option from "effect/Option";
|
|
22
22
|
import { OpenAiClient, OpenAiEmbeddingModel } from "@effect/ai-openai";
|
|
23
23
|
import { DeviceCodeHandler } from "./index.js";
|
|
24
|
-
const provider = Flag.
|
|
24
|
+
const provider = Flag.Literals("provider", ["openai", "copilot"]).pipe(Flag.withAlias("p"), Flag.withFallbackPrompt(Prompt.Select({
|
|
25
25
|
message: "Select a provider",
|
|
26
26
|
choices: [
|
|
27
27
|
{
|
|
@@ -35,9 +35,9 @@ const provider = Flag.choice("provider", ["openai", "copilot"]).pipe(Flag.withAl
|
|
|
35
35
|
},
|
|
36
36
|
],
|
|
37
37
|
})));
|
|
38
|
-
const model = Flag.
|
|
38
|
+
const model = Flag.String("model").pipe(Flag.withAlias("m"), Flag.withFallbackPrompt(Prompt.String({
|
|
39
39
|
message: "Enter a model",
|
|
40
|
-
default: "gpt-
|
|
40
|
+
default: "gpt-6-astra/medium",
|
|
41
41
|
validate(value) {
|
|
42
42
|
const parts = value.split("/");
|
|
43
43
|
if (parts.length !== 2) {
|
|
@@ -46,15 +46,15 @@ const model = Flag.string("model").pipe(Flag.withAlias("m"), Flag.withFallbackPr
|
|
|
46
46
|
return Effect.succeed(value);
|
|
47
47
|
},
|
|
48
48
|
})));
|
|
49
|
-
const semantic = Flag.
|
|
50
|
-
const prompt = Flag.
|
|
49
|
+
const semantic = Flag.Directory("search").pipe(Flag.withDescription("Directory for semantic search data (uses OPENAI_API_KEY env var)"), Flag.withAlias("s"), Flag.optional);
|
|
50
|
+
const prompt = Flag.String("prompt").pipe(Flag.withDescription("Pass a prompt in non-interactive mode"), Flag.optional);
|
|
51
51
|
const Kvs = Layer.unwrap(Effect.gen(function* () {
|
|
52
52
|
const path = yield* Path.Path;
|
|
53
|
-
const configHome = yield* Config.
|
|
53
|
+
const configHome = yield* Config.NonEmptyString("XDG_CONFIG_HOME").pipe(Config.orElse(() => Config.NonEmptyString("HOME").pipe(Config.map((home) => path.join(home, ".config")))));
|
|
54
54
|
return KeyValueStore.layerFileSystem(path.join(configHome, "clanka"));
|
|
55
55
|
})).pipe(Layer.provide(NodeServices.layer));
|
|
56
56
|
const Search = (directory) => Layer.unwrap(Effect.gen(function* () {
|
|
57
|
-
const apiKey = yield* Config.
|
|
57
|
+
const apiKey = yield* Config.Redacted("OPENAI_API_KEY").pipe(Config.option);
|
|
58
58
|
if (Option.isNone(apiKey)) {
|
|
59
59
|
yield* Effect.logWarning("OPENAI_API_KEY is not set");
|
|
60
60
|
return Layer.empty;
|
|
@@ -78,9 +78,9 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(Command.withH
|
|
|
78
78
|
reasoning: {
|
|
79
79
|
effort: reasoning,
|
|
80
80
|
},
|
|
81
|
-
}).pipe(Layer.merge(Agent.layerSubagentModel(Codex.modelWebSocket(
|
|
81
|
+
}).pipe(Layer.merge(Agent.layerSubagentModel(Codex.modelWebSocket(model, {
|
|
82
82
|
reasoning: {
|
|
83
|
-
effort:
|
|
83
|
+
effort: reasoning,
|
|
84
84
|
},
|
|
85
85
|
}))), Layer.provide(Codex.layerClient))
|
|
86
86
|
: Copilot.model(model, {
|
|
@@ -89,7 +89,7 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(Command.withH
|
|
|
89
89
|
},
|
|
90
90
|
}).pipe(Layer.merge(Agent.layerSubagentModel(Copilot.model(model, {
|
|
91
91
|
reasoning: {
|
|
92
|
-
effort:
|
|
92
|
+
effort: reasoning,
|
|
93
93
|
},
|
|
94
94
|
}))), Layer.provide(Copilot.layerClient));
|
|
95
95
|
return yield* Effect.gen(function* () {
|
|
@@ -98,7 +98,7 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(Command.withH
|
|
|
98
98
|
return yield* pipe(agent.send({ prompt: nonInteractivePrompt.value }), Stream.unwrap, OutputFormatter.pretty(), Stream.run(stdio.stdout()));
|
|
99
99
|
}
|
|
100
100
|
while (true) {
|
|
101
|
-
const prompt = yield* Prompt.
|
|
101
|
+
const prompt = yield* Prompt.String({
|
|
102
102
|
message: ">",
|
|
103
103
|
});
|
|
104
104
|
yield* pipe(agent.send({ prompt }), Stream.unwrap, OutputFormatter.pretty({ outputTruncation: 20 }), Stream.run(stdio.stdout()));
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AACA,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,4BAA4B,CAAA;AACpD,OAAO,KAAK,cAAc,MAAM,sCAAsC,CAAA;AACtE,OAAO,KAAK,OAAO,MAAM,6BAA6B,CAAA;AACtD,OAAO,KAAK,IAAI,MAAM,0BAA0B,CAAA;AAChD,OAAO,KAAK,YAAY,MAAM,oCAAoC,CAAA;AAClE,OAAO,KAAK,WAAW,MAAM,mCAAmC,CAAA;AAChE,OAAO,KAAK,UAAU,MAAM,kCAAkC,CAAA;AAC9D,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,eAAe,MAAM,sBAAsB,CAAA;AACvD,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAA;AACnC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,aAAa,MAAM,2CAA2C,CAAA;AAC1E,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,EAAE,YAAY,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAA;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAA;AAE9C,MAAM,QAAQ,GAAG,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "clanka",
|
|
3
3
|
"type": "module",
|
|
4
|
-
"version": "0.2.
|
|
4
|
+
"version": "0.2.72",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public"
|
|
7
7
|
},
|
|
@@ -25,9 +25,9 @@
|
|
|
25
25
|
"url": "https://github.com/Effectful-Tech/clanka.git"
|
|
26
26
|
},
|
|
27
27
|
"dependencies": {
|
|
28
|
-
"@modelcontextprotocol/sdk": "^1.
|
|
28
|
+
"@modelcontextprotocol/sdk": "^1.30.0",
|
|
29
29
|
"@vscode/ripgrep": "^1.18.0",
|
|
30
|
-
"chalk": "^
|
|
30
|
+
"chalk": "^6.0.0",
|
|
31
31
|
"glob": "^13.0.6",
|
|
32
32
|
"sqlite-vec": "0.1.9",
|
|
33
33
|
"tree-sitter": "^0.21.1",
|
|
@@ -36,30 +36,30 @@
|
|
|
36
36
|
"turndown": "^7.2.4"
|
|
37
37
|
},
|
|
38
38
|
"peerDependencies": {
|
|
39
|
-
"@effect/ai-openai": ">=4.0.0-
|
|
40
|
-
"@effect/ai-openai-compat": ">=4.0.0-
|
|
41
|
-
"@effect/platform-node": ">=4.0.0-
|
|
42
|
-
"@effect/sql-sqlite-node": ">=4.0.0-
|
|
43
|
-
"effect": ">=4.0.0-
|
|
39
|
+
"@effect/ai-openai": ">=4.0.0-rc.115 <4.0.1",
|
|
40
|
+
"@effect/ai-openai-compat": ">=4.0.0-rc.115 <4.0.1",
|
|
41
|
+
"@effect/platform-node": ">=4.0.0-rc.115 <4.0.1",
|
|
42
|
+
"@effect/sql-sqlite-node": ">=4.0.0-rc.115 <4.0.1",
|
|
43
|
+
"effect": ">=4.0.0-rc.115 <4.0.1"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
|
-
"@changesets/changelog-github": "^0.
|
|
47
|
-
"@changesets/cli": "^
|
|
48
|
-
"@effect/ai-openai": "4.0.0-
|
|
49
|
-
"@effect/ai-openai-compat": "4.0.0-
|
|
50
|
-
"@effect/platform-node": "4.0.0-
|
|
51
|
-
"@effect/sql-sqlite-node": "4.0.0-
|
|
52
|
-
"@effect/tsgo": "0.
|
|
53
|
-
"@effect/vitest": "4.0.0-
|
|
46
|
+
"@changesets/changelog-github": "^1.0.1",
|
|
47
|
+
"@changesets/cli": "^3.0.3",
|
|
48
|
+
"@effect/ai-openai": "4.0.0-rc.115",
|
|
49
|
+
"@effect/ai-openai-compat": "4.0.0-rc.115",
|
|
50
|
+
"@effect/platform-node": "4.0.0-rc.115",
|
|
51
|
+
"@effect/sql-sqlite-node": "4.0.0-rc.115",
|
|
52
|
+
"@effect/tsgo": "0.45.0",
|
|
53
|
+
"@effect/vitest": "4.0.0-rc.115",
|
|
54
54
|
"@types/node": "^26.1.1",
|
|
55
55
|
"@types/turndown": "^5.0.6",
|
|
56
|
-
"effect": "4.0.0-
|
|
56
|
+
"effect": "4.0.0-rc.115",
|
|
57
57
|
"husky": "^9.1.7",
|
|
58
|
-
"lint-staged": "^17.
|
|
59
|
-
"oxlint": "^1.
|
|
60
|
-
"prettier": "^3.9.
|
|
58
|
+
"lint-staged": "^17.5.1",
|
|
59
|
+
"oxlint": "^1.83.0",
|
|
60
|
+
"prettier": "^3.9.7",
|
|
61
61
|
"typescript": "^7.0.2",
|
|
62
|
-
"vitest": "^
|
|
62
|
+
"vitest": "^5.0.1"
|
|
63
63
|
},
|
|
64
64
|
"lint-staged": {
|
|
65
65
|
"*.{ts,tsx}": [
|
package/src/AgentExecutor.ts
CHANGED
|
@@ -29,7 +29,7 @@ import * as Scope from "effect/Scope"
|
|
|
29
29
|
import * as Fiber from "effect/Fiber"
|
|
30
30
|
import * as Console from "effect/Console"
|
|
31
31
|
import * as Exit from "effect/Exit"
|
|
32
|
-
import { pipe,
|
|
32
|
+
import { pipe, identity } from "effect/Function"
|
|
33
33
|
import * as RpcClient from "effect/unstable/rpc/RpcClient"
|
|
34
34
|
import * as Layer from "effect/Layer"
|
|
35
35
|
import * as RpcServer from "effect/unstable/rpc/RpcServer"
|
|
@@ -131,18 +131,15 @@ export const makeLocal = Effect.fnUntraced(function* <
|
|
|
131
131
|
const handlerScope = Scope.makeUnsafe("parallel")
|
|
132
132
|
const trackFiber = Fiber.runIn(handlerScope)
|
|
133
133
|
|
|
134
|
-
const taskServices = Context.
|
|
135
|
-
Context.
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
Context.add(
|
|
142
|
-
|
|
143
|
-
? Context.add(SemanticSearch, search.value)
|
|
144
|
-
: identity,
|
|
145
|
-
),
|
|
134
|
+
const taskServices = Context.empty().pipe(
|
|
135
|
+
Context.add(TaskCompleter, opts.onTaskComplete),
|
|
136
|
+
Context.add(CurrentDirectory, options.directory),
|
|
137
|
+
Context.add(SubagentExecutor, opts.onSubagent),
|
|
138
|
+
Context.add(Console.Console, console),
|
|
139
|
+
Context.add(References.CurrentLogAnnotations, {}),
|
|
140
|
+
Option.isSome(search)
|
|
141
|
+
? Context.add(SemanticSearch, search.value)
|
|
142
|
+
: identity,
|
|
146
143
|
)
|
|
147
144
|
|
|
148
145
|
yield* Effect.gen(function* () {
|
|
@@ -218,17 +215,14 @@ export const makeLocal = Effect.fnUntraced(function* <
|
|
|
218
215
|
return Effect.die(new Error(`Unknown tool: ${opts.tool}`))
|
|
219
216
|
}
|
|
220
217
|
|
|
221
|
-
const taskServices =
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
Context.add(
|
|
228
|
-
|
|
229
|
-
? Context.add(SemanticSearch, search.value)
|
|
230
|
-
: identity,
|
|
231
|
-
),
|
|
218
|
+
const taskServices = handler.context.pipe(
|
|
219
|
+
Context.add(TaskCompleter, () => Effect.void),
|
|
220
|
+
Context.add(CurrentDirectory, options.directory),
|
|
221
|
+
Context.add(SubagentExecutor, () => Effect.succeed("")),
|
|
222
|
+
Context.add(References.CurrentLogAnnotations, {}),
|
|
223
|
+
Option.isSome(search)
|
|
224
|
+
? Context.add(SemanticSearch, search.value)
|
|
225
|
+
: identity,
|
|
232
226
|
)
|
|
233
227
|
|
|
234
228
|
const encodeSuccess = Schema.encodeUnknownEffect(
|
package/src/AgentOutput.ts
CHANGED
|
@@ -196,7 +196,7 @@ export const Output = Schema.Union([
|
|
|
196
196
|
* @since 1.0.0
|
|
197
197
|
* @category Output
|
|
198
198
|
*/
|
|
199
|
-
export class AgentFinished extends Schema.
|
|
199
|
+
export class AgentFinished extends Schema.TaggedError<AgentFinished>()(
|
|
200
200
|
"AgentFinished",
|
|
201
201
|
{
|
|
202
202
|
summary: Schema.String,
|
package/src/ChunkRepo.ts
CHANGED
|
@@ -121,7 +121,7 @@ export class ChunkRepo extends Context.Service<
|
|
|
121
121
|
* @since 1.0.0
|
|
122
122
|
* @category Errors
|
|
123
123
|
*/
|
|
124
|
-
export class ChunkRepoError extends Schema.
|
|
124
|
+
export class ChunkRepoError extends Schema.TaggedError<ChunkRepoError>()(
|
|
125
125
|
"ChunkRepoError",
|
|
126
126
|
{
|
|
127
127
|
reason: Schema.Union([SqlError.SqlError]),
|
package/src/CodeChunker.ts
CHANGED
|
@@ -910,7 +910,7 @@ export const layer: Layer.Layer<
|
|
|
910
910
|
entries
|
|
911
911
|
.map((entry) => normalizePath(entry.trim()))
|
|
912
912
|
.filter((entry) => entry.length > 0 && isMeaningfulFile(entry))
|
|
913
|
-
.
|
|
913
|
+
.toSorted((left, right) => left.localeCompare(right)),
|
|
914
914
|
),
|
|
915
915
|
Effect.orDie,
|
|
916
916
|
)
|
package/src/CodexAuth.ts
CHANGED
|
@@ -47,7 +47,7 @@ export class TokenData extends Schema.Class<TokenData>(
|
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
49
|
|
|
50
|
-
export class CodexAuthError extends Schema.
|
|
50
|
+
export class CodexAuthError extends Schema.TaggedError<CodexAuthError>()(
|
|
51
51
|
"CodexAuthError",
|
|
52
52
|
{
|
|
53
53
|
reason: Schema.Literals([
|
package/src/CopilotAuth.ts
CHANGED
|
@@ -44,7 +44,7 @@ export class TokenData extends Schema.Class<TokenData>(
|
|
|
44
44
|
}
|
|
45
45
|
}
|
|
46
46
|
|
|
47
|
-
export class GithubCopilotAuthError extends Schema.
|
|
47
|
+
export class GithubCopilotAuthError extends Schema.TaggedError<GithubCopilotAuthError>()(
|
|
48
48
|
"GithubCopilotAuthError",
|
|
49
49
|
{
|
|
50
50
|
reason: Schema.Literal("DeviceFlowFailed"),
|
package/src/ExaSearch.ts
CHANGED
|
@@ -42,7 +42,7 @@ class ExaSearchResult extends Schema.Class<ExaSearchResult>("ExaSearchResult")({
|
|
|
42
42
|
* @since 1.0.0
|
|
43
43
|
* @category Errors
|
|
44
44
|
*/
|
|
45
|
-
export class ExaError extends Schema.
|
|
45
|
+
export class ExaError extends Schema.TaggedError<ExaError>()("ExaError", {
|
|
46
46
|
cause: Schema.Defect(),
|
|
47
47
|
}) {}
|
|
48
48
|
|
package/src/McpClient.ts
CHANGED
|
@@ -30,7 +30,7 @@ export class McpClient extends Context.Service<
|
|
|
30
30
|
* @since 1.0.0
|
|
31
31
|
* @category Errors
|
|
32
32
|
*/
|
|
33
|
-
export class McpClientError extends Schema.
|
|
33
|
+
export class McpClientError extends Schema.TaggedError<McpClientError>()(
|
|
34
34
|
"McpClientError",
|
|
35
35
|
{
|
|
36
36
|
cause: Schema.Defect(),
|
package/src/SemanticSearch.ts
CHANGED
|
@@ -41,12 +41,12 @@ const resolveChunkConfig = (options: {
|
|
|
41
41
|
})
|
|
42
42
|
|
|
43
43
|
export const makeEmbeddingResolver = (
|
|
44
|
-
resolver: EmbeddingModel.
|
|
44
|
+
resolver: EmbeddingModel.EmbeddingModel["resolver"],
|
|
45
45
|
options: {
|
|
46
46
|
readonly embeddingBatchSize?: number | undefined
|
|
47
47
|
readonly embeddingRequestDelay?: Duration.Input | undefined
|
|
48
48
|
},
|
|
49
|
-
): EmbeddingModel.
|
|
49
|
+
): EmbeddingModel.EmbeddingModel["resolver"] =>
|
|
50
50
|
resolver.pipe(
|
|
51
51
|
RequestResolver.setDelay(
|
|
52
52
|
options.embeddingRequestDelay ?? Duration.millis(50),
|
package/src/TypeBuilder.ts
CHANGED
package/src/cli.ts
CHANGED
|
@@ -22,10 +22,10 @@ import * as Option from "effect/Option"
|
|
|
22
22
|
import { OpenAiClient, OpenAiEmbeddingModel } from "@effect/ai-openai"
|
|
23
23
|
import { DeviceCodeHandler } from "./index.ts"
|
|
24
24
|
|
|
25
|
-
const provider = Flag.
|
|
25
|
+
const provider = Flag.Literals("provider", ["openai", "copilot"]).pipe(
|
|
26
26
|
Flag.withAlias("p"),
|
|
27
27
|
Flag.withFallbackPrompt(
|
|
28
|
-
Prompt.
|
|
28
|
+
Prompt.Select({
|
|
29
29
|
message: "Select a provider",
|
|
30
30
|
choices: [
|
|
31
31
|
{
|
|
@@ -42,12 +42,12 @@ const provider = Flag.choice("provider", ["openai", "copilot"]).pipe(
|
|
|
42
42
|
),
|
|
43
43
|
)
|
|
44
44
|
|
|
45
|
-
const model = Flag.
|
|
45
|
+
const model = Flag.String("model").pipe(
|
|
46
46
|
Flag.withAlias("m"),
|
|
47
47
|
Flag.withFallbackPrompt(
|
|
48
|
-
Prompt.
|
|
48
|
+
Prompt.String({
|
|
49
49
|
message: "Enter a model",
|
|
50
|
-
default: "gpt-
|
|
50
|
+
default: "gpt-6-astra/medium",
|
|
51
51
|
validate(value) {
|
|
52
52
|
const parts = value.split("/")
|
|
53
53
|
if (parts.length !== 2) {
|
|
@@ -59,7 +59,7 @@ const model = Flag.string("model").pipe(
|
|
|
59
59
|
),
|
|
60
60
|
)
|
|
61
61
|
|
|
62
|
-
const semantic = Flag.
|
|
62
|
+
const semantic = Flag.Directory("search").pipe(
|
|
63
63
|
Flag.withDescription(
|
|
64
64
|
"Directory for semantic search data (uses OPENAI_API_KEY env var)",
|
|
65
65
|
),
|
|
@@ -67,7 +67,7 @@ const semantic = Flag.directory("search").pipe(
|
|
|
67
67
|
Flag.optional,
|
|
68
68
|
)
|
|
69
69
|
|
|
70
|
-
const prompt = Flag.
|
|
70
|
+
const prompt = Flag.String("prompt").pipe(
|
|
71
71
|
Flag.withDescription("Pass a prompt in non-interactive mode"),
|
|
72
72
|
Flag.optional,
|
|
73
73
|
)
|
|
@@ -76,9 +76,9 @@ const Kvs = Layer.unwrap(
|
|
|
76
76
|
Effect.gen(function* () {
|
|
77
77
|
const path = yield* Path.Path
|
|
78
78
|
|
|
79
|
-
const configHome = yield* Config.
|
|
79
|
+
const configHome = yield* Config.NonEmptyString("XDG_CONFIG_HOME").pipe(
|
|
80
80
|
Config.orElse(() =>
|
|
81
|
-
Config.
|
|
81
|
+
Config.NonEmptyString("HOME").pipe(
|
|
82
82
|
Config.map((home) => path.join(home, ".config")),
|
|
83
83
|
),
|
|
84
84
|
),
|
|
@@ -90,7 +90,7 @@ const Kvs = Layer.unwrap(
|
|
|
90
90
|
const Search = (directory: string) =>
|
|
91
91
|
Layer.unwrap(
|
|
92
92
|
Effect.gen(function* () {
|
|
93
|
-
const apiKey = yield* Config.
|
|
93
|
+
const apiKey = yield* Config.Redacted("OPENAI_API_KEY").pipe(
|
|
94
94
|
Config.option,
|
|
95
95
|
)
|
|
96
96
|
|
|
@@ -142,9 +142,9 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(
|
|
|
142
142
|
}).pipe(
|
|
143
143
|
Layer.merge(
|
|
144
144
|
Agent.layerSubagentModel(
|
|
145
|
-
Codex.modelWebSocket(
|
|
145
|
+
Codex.modelWebSocket(model, {
|
|
146
146
|
reasoning: {
|
|
147
|
-
effort:
|
|
147
|
+
effort: reasoning as any,
|
|
148
148
|
},
|
|
149
149
|
}),
|
|
150
150
|
),
|
|
@@ -160,7 +160,7 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(
|
|
|
160
160
|
Agent.layerSubagentModel(
|
|
161
161
|
Copilot.model(model, {
|
|
162
162
|
reasoning: {
|
|
163
|
-
effort:
|
|
163
|
+
effort: reasoning,
|
|
164
164
|
},
|
|
165
165
|
}),
|
|
166
166
|
),
|
|
@@ -181,7 +181,7 @@ Command.make("clanka", { provider, model, semantic, prompt }).pipe(
|
|
|
181
181
|
}
|
|
182
182
|
|
|
183
183
|
while (true) {
|
|
184
|
-
const prompt = yield* Prompt.
|
|
184
|
+
const prompt = yield* Prompt.String({
|
|
185
185
|
message: ">",
|
|
186
186
|
})
|
|
187
187
|
|