@conduit-harness/conduit-runner-aider 0.0.2-rc2 → 0.1.0-preview.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/dist/index.d.ts +2 -0
- package/dist/index.js +84 -4
- package/dist/index.js.map +1 -1
- package/package.json +6 -3
package/dist/index.d.ts
CHANGED
|
@@ -7,8 +7,10 @@ export default class AiderRunner implements AgentRunner {
|
|
|
7
7
|
private readonly extraArgs;
|
|
8
8
|
private readonly turnTimeoutMs;
|
|
9
9
|
private readonly stallTimeoutMs;
|
|
10
|
+
private ollamaPreflight;
|
|
10
11
|
constructor(config: ServiceConfig);
|
|
11
12
|
private preflight;
|
|
13
|
+
private preflightOllama;
|
|
12
14
|
run(attempt: RunAttempt, prompt: string): Promise<AgentResult>;
|
|
13
15
|
private buildCommand;
|
|
14
16
|
}
|
package/dist/index.js
CHANGED
|
@@ -4,6 +4,30 @@ import { join } from "node:path";
|
|
|
4
4
|
function str(v, fallback) { return typeof v === "string" && v.length > 0 ? v : fallback; }
|
|
5
5
|
function maybeStr(v) { return typeof v === "string" && v.length > 0 ? v : undefined; }
|
|
6
6
|
function num(v, fallback) { const n = typeof v === "string" ? Number.parseInt(v, 10) : typeof v === "number" ? v : NaN; return Number.isFinite(n) ? n : fallback; }
|
|
7
|
+
function nativeShell() { return process.platform === "win32" ? ["powershell", "-Command"] : ["bash", "-lc"]; }
|
|
8
|
+
function parseShorthandNumber(s) {
|
|
9
|
+
const match = /^([\d.]+)([kmb])?$/i.exec(s.trim());
|
|
10
|
+
if (!match)
|
|
11
|
+
return undefined;
|
|
12
|
+
const base = Number.parseFloat(match[1] ?? "");
|
|
13
|
+
if (!Number.isFinite(base))
|
|
14
|
+
return undefined;
|
|
15
|
+
const suffix = (match[2] ?? "").toLowerCase();
|
|
16
|
+
const multipliers = { k: 1000, m: 1000000, b: 1000000000 };
|
|
17
|
+
return Math.round(base * (multipliers[suffix] ?? 1));
|
|
18
|
+
}
|
|
19
|
+
function parseAiderTokenUsage(output) {
|
|
20
|
+
const tokenLine = output.split("\n").find(line => line.includes("Tokens:") && (line.includes("sent") || line.includes("received")));
|
|
21
|
+
if (!tokenLine)
|
|
22
|
+
return undefined;
|
|
23
|
+
const sentMatch = /(\d+\.?\d*[kmb]?)\s*(?:tokens?)?\s*sent/i.exec(tokenLine);
|
|
24
|
+
const receivedMatch = /(\d+\.?\d*[kmb]?)\s*(?:tokens?)?\s*received/i.exec(tokenLine);
|
|
25
|
+
const inputTokens = sentMatch ? (parseShorthandNumber(sentMatch[1] ?? "") ?? 0) : 0;
|
|
26
|
+
const outputTokens = receivedMatch ? (parseShorthandNumber(receivedMatch[1] ?? "") ?? 0) : 0;
|
|
27
|
+
if (inputTokens === 0 && outputTokens === 0)
|
|
28
|
+
return undefined;
|
|
29
|
+
return { inputTokens, outputTokens, cacheCreationInputTokens: 0, cacheReadInputTokens: 0 };
|
|
30
|
+
}
|
|
7
31
|
export default class AiderRunner {
|
|
8
32
|
command;
|
|
9
33
|
model;
|
|
@@ -12,6 +36,7 @@ export default class AiderRunner {
|
|
|
12
36
|
extraArgs;
|
|
13
37
|
turnTimeoutMs;
|
|
14
38
|
stallTimeoutMs;
|
|
39
|
+
ollamaPreflight;
|
|
15
40
|
constructor(config) {
|
|
16
41
|
const raw = config.agent.raw;
|
|
17
42
|
// Aider treats stdin lines as separate chat turns, so we hand it the prompt
|
|
@@ -29,8 +54,10 @@ export default class AiderRunner {
|
|
|
29
54
|
const bin = this.command.trim().split(/\s+/)[0];
|
|
30
55
|
if (!bin)
|
|
31
56
|
return;
|
|
32
|
-
const result = spawnSync(bin, ["--version"], { stdio: "ignore" });
|
|
33
|
-
const notFound =
|
|
57
|
+
const result = spawnSync(bin, ["--version"], { stdio: "ignore", shell: process.platform === "win32" });
|
|
58
|
+
const notFound = process.platform === "win32"
|
|
59
|
+
? (result.status ?? 1) !== 0
|
|
60
|
+
: result.error !== undefined && result.error.code === "ENOENT";
|
|
34
61
|
if (notFound) {
|
|
35
62
|
throw new Error(`aider runner: '${bin}' was not found on PATH.\n\n` +
|
|
36
63
|
`Install aider:\n` +
|
|
@@ -39,7 +66,52 @@ export default class AiderRunner {
|
|
|
39
66
|
`\nOther install methods: https://aider.chat/docs/install.html`);
|
|
40
67
|
}
|
|
41
68
|
}
|
|
69
|
+
async preflightOllama() {
|
|
70
|
+
if (this.ollamaPreflight !== undefined) {
|
|
71
|
+
if (this.ollamaPreflight instanceof Error)
|
|
72
|
+
throw this.ollamaPreflight;
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
if (!this.model.startsWith("ollama_chat/")) {
|
|
76
|
+
this.ollamaPreflight = true;
|
|
77
|
+
return;
|
|
78
|
+
}
|
|
79
|
+
try {
|
|
80
|
+
const url = `${this.ollamaEndpoint}/api/tags`;
|
|
81
|
+
const controller = new AbortController();
|
|
82
|
+
const timeout = setTimeout(() => controller.abort(), 5000);
|
|
83
|
+
const response = await fetch(url, { signal: controller.signal });
|
|
84
|
+
clearTimeout(timeout);
|
|
85
|
+
if (!response.ok) {
|
|
86
|
+
const error = new Error(`aider runner: Ollama is not reachable at ${this.ollamaEndpoint}.\n\n` +
|
|
87
|
+
`- Is the Ollama daemon running? Start it with: \`ollama serve\` (or open the Ollama app)\n` +
|
|
88
|
+
`- Is \`ollama_endpoint\` correct in your workflow?`);
|
|
89
|
+
this.ollamaPreflight = error;
|
|
90
|
+
throw error;
|
|
91
|
+
}
|
|
92
|
+
const data = await response.json();
|
|
93
|
+
const models = data.models ?? [];
|
|
94
|
+
const modelName = this.model.slice("ollama_chat/".length);
|
|
95
|
+
const found = models.some(m => m.name === modelName);
|
|
96
|
+
if (!found) {
|
|
97
|
+
const available = models.map(m => m.name).join(", ");
|
|
98
|
+
const error = new Error(`aider runner: model '${modelName}' is not pulled in Ollama.\n\n` +
|
|
99
|
+
`Pull it with: ollama pull ${modelName}\n\n` +
|
|
100
|
+
`Currently available: ${available || "(none)"}`);
|
|
101
|
+
this.ollamaPreflight = error;
|
|
102
|
+
throw error;
|
|
103
|
+
}
|
|
104
|
+
this.ollamaPreflight = true;
|
|
105
|
+
}
|
|
106
|
+
catch (err) {
|
|
107
|
+
const error = err instanceof Error ? err : new Error(String(err));
|
|
108
|
+
if (this.ollamaPreflight === undefined)
|
|
109
|
+
this.ollamaPreflight = error;
|
|
110
|
+
throw error;
|
|
111
|
+
}
|
|
112
|
+
}
|
|
42
113
|
async run(attempt, prompt) {
|
|
114
|
+
await this.preflightOllama();
|
|
43
115
|
const promptFile = join(attempt.workspacePath, ".conduit-aider-prompt.md");
|
|
44
116
|
await writeFile(promptFile, prompt, "utf8");
|
|
45
117
|
const fullCommand = this.buildCommand(promptFile);
|
|
@@ -47,7 +119,8 @@ export default class AiderRunner {
|
|
|
47
119
|
if (this.apiKey)
|
|
48
120
|
env.OPENAI_API_KEY = this.apiKey;
|
|
49
121
|
const result = await new Promise((resolve) => {
|
|
50
|
-
const
|
|
122
|
+
const [shell, flag] = nativeShell();
|
|
123
|
+
const child = spawn(shell, [flag, fullCommand], { cwd: attempt.workspacePath, env, stdio: ["ignore", "pipe", "pipe"] });
|
|
51
124
|
let output = "";
|
|
52
125
|
let settled = false;
|
|
53
126
|
let stallTimer;
|
|
@@ -67,6 +140,11 @@ export default class AiderRunner {
|
|
|
67
140
|
r.exitCode = code;
|
|
68
141
|
if (code !== 0)
|
|
69
142
|
r.error = `aider_exit_${code}`;
|
|
143
|
+
if (code === 0) {
|
|
144
|
+
const usage = parseAiderTokenUsage(output);
|
|
145
|
+
if (usage !== undefined)
|
|
146
|
+
r.usage = usage;
|
|
147
|
+
}
|
|
70
148
|
finish(r);
|
|
71
149
|
});
|
|
72
150
|
bumpStall();
|
|
@@ -86,8 +164,10 @@ export default class AiderRunner {
|
|
|
86
164
|
}
|
|
87
165
|
}
|
|
88
166
|
function shellQuote(value) {
|
|
89
|
-
if (/^[A-Za-z0-9_
|
|
167
|
+
if (/^[A-Za-z0-9_./:@\\-]+$/.test(value))
|
|
90
168
|
return value;
|
|
169
|
+
if (process.platform === "win32")
|
|
170
|
+
return `'${value.replace(/'/g, "''")}'`;
|
|
91
171
|
return `'${value.replace(/'/g, "'\\''")}'`;
|
|
92
172
|
}
|
|
93
173
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,SAAS,GAAG,CAAC,CAAU,EAAE,QAAgB,IAAY,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;AACnH,SAAS,QAAQ,CAAC,CAAU,IAAwB,OAAO,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AACnH,SAAS,GAAG,CAAC,CAAU,EAAE,QAAgB,IAAY,MAAM,CAAC,GAAG,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@conduit-harness/conduit-runner-aider",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.1.0-preview.1",
|
|
4
4
|
"description": "Conduit agent runner plugin for Aider (open-source agentic CLI, works with Ollama)",
|
|
5
|
+
"license": "MIT",
|
|
5
6
|
"type": "module",
|
|
6
7
|
"exports": {
|
|
7
8
|
".": { "import": "./dist/index.js", "types": "./dist/index.d.ts" }
|
|
@@ -9,15 +10,17 @@
|
|
|
9
10
|
"files": ["dist"],
|
|
10
11
|
"scripts": {
|
|
11
12
|
"build": "tsc -p tsconfig.json",
|
|
13
|
+
"test": "vitest run",
|
|
12
14
|
"typecheck": "tsc -p tsconfig.json --noEmit"
|
|
13
15
|
},
|
|
14
16
|
"publishConfig": { "access": "public" },
|
|
15
17
|
"repository": { "type": "git", "url": "git+https://github.com/conduit-harness/conduit.git" },
|
|
16
18
|
"engines": { "node": ">=24.0.0" },
|
|
17
|
-
"peerDependencies": { "@conduit-harness/conduit": ">=0.0.
|
|
19
|
+
"peerDependencies": { "@conduit-harness/conduit": ">=0.0.1" },
|
|
18
20
|
"devDependencies": {
|
|
19
21
|
"@conduit-harness/conduit": "workspace:*",
|
|
20
22
|
"@types/node": "latest",
|
|
21
|
-
"typescript": "latest"
|
|
23
|
+
"typescript": "latest",
|
|
24
|
+
"vitest": "latest"
|
|
22
25
|
}
|
|
23
26
|
}
|