overmind-mcp 1.4.7 → 1.5.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 +10 -9
- package/dist/lib/InstallHelper.d.ts +14 -0
- package/dist/lib/InstallHelper.d.ts.map +1 -0
- package/dist/lib/InstallHelper.js +112 -0
- package/dist/lib/InstallHelper.js.map +1 -0
- package/dist/lib/config.d.ts +12 -0
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +9 -26
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/loadEnv.d.ts +2 -0
- package/dist/lib/loadEnv.d.ts.map +1 -0
- package/dist/lib/loadEnv.js +26 -0
- package/dist/lib/loadEnv.js.map +1 -0
- package/dist/lib/sessions.d.ts +3 -2
- package/dist/lib/sessions.d.ts.map +1 -1
- package/dist/lib/sessions.js +20 -6
- package/dist/lib/sessions.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +3 -10
- package/dist/server.js.map +1 -1
- package/dist/services/AgentManager.js +3 -3
- package/dist/services/AgentManager.js.map +1 -1
- package/dist/services/ClaudeRunner.d.ts +1 -0
- package/dist/services/ClaudeRunner.d.ts.map +1 -1
- package/dist/services/ClaudeRunner.js +55 -28
- package/dist/services/ClaudeRunner.js.map +1 -1
- package/dist/services/ClineRunner.d.ts +1 -0
- package/dist/services/ClineRunner.d.ts.map +1 -1
- package/dist/services/ClineRunner.js +2 -2
- package/dist/services/ClineRunner.js.map +1 -1
- package/dist/services/GeminiRunner.d.ts +1 -0
- package/dist/services/GeminiRunner.d.ts.map +1 -1
- package/dist/services/GeminiRunner.js +39 -12
- package/dist/services/GeminiRunner.js.map +1 -1
- package/dist/services/KiloRunner.d.ts +1 -0
- package/dist/services/KiloRunner.d.ts.map +1 -1
- package/dist/services/KiloRunner.js +22 -38
- package/dist/services/KiloRunner.js.map +1 -1
- package/dist/services/NousHermesRunner.d.ts +22 -0
- package/dist/services/NousHermesRunner.d.ts.map +1 -0
- package/dist/services/NousHermesRunner.js +129 -0
- package/dist/services/NousHermesRunner.js.map +1 -0
- package/dist/services/OpenClawRunner.d.ts +1 -0
- package/dist/services/OpenClawRunner.d.ts.map +1 -1
- package/dist/services/OpenClawRunner.js +3 -3
- package/dist/services/OpenClawRunner.js.map +1 -1
- package/dist/services/OpenCodeRunner.d.ts +1 -0
- package/dist/services/OpenCodeRunner.d.ts.map +1 -1
- package/dist/services/OpenCodeRunner.js +3 -3
- package/dist/services/OpenCodeRunner.js.map +1 -1
- package/dist/services/QwenCliRunner.d.ts +22 -0
- package/dist/services/QwenCliRunner.d.ts.map +1 -0
- package/dist/services/QwenCliRunner.js +87 -0
- package/dist/services/QwenCliRunner.js.map +1 -0
- package/dist/tools/config_example.d.ts +3 -3
- package/dist/tools/config_example.d.ts.map +1 -1
- package/dist/tools/config_example.js +144 -144
- package/dist/tools/config_example.js.map +1 -1
- package/dist/tools/create_agent.d.ts +12 -6
- package/dist/tools/create_agent.d.ts.map +1 -1
- package/dist/tools/create_agent.js +8 -9
- package/dist/tools/create_agent.js.map +1 -1
- package/dist/tools/get_agent_configs.d.ts +10 -4
- package/dist/tools/get_agent_configs.d.ts.map +1 -1
- package/dist/tools/get_agent_configs.js.map +1 -1
- package/dist/tools/manage_agents.d.ts +32 -14
- package/dist/tools/manage_agents.d.ts.map +1 -1
- package/dist/tools/manage_agents.js +2 -2
- package/dist/tools/manage_agents.js.map +1 -1
- package/dist/tools/manage_prompts.d.ts +13 -8
- package/dist/tools/manage_prompts.d.ts.map +1 -1
- package/dist/tools/manage_prompts.js.map +1 -1
- package/dist/tools/memory_runs.d.ts +3 -4
- package/dist/tools/memory_runs.d.ts.map +1 -1
- package/dist/tools/memory_runs.js.map +1 -1
- package/dist/tools/memory_search.d.ts +3 -4
- package/dist/tools/memory_search.d.ts.map +1 -1
- package/dist/tools/memory_search.js.map +1 -1
- package/dist/tools/memory_store.d.ts +10 -4
- package/dist/tools/memory_store.d.ts.map +1 -1
- package/dist/tools/memory_store.js.map +1 -1
- package/dist/tools/run_agent.d.ts +10 -3
- package/dist/tools/run_agent.d.ts.map +1 -1
- package/dist/tools/run_agent.js +50 -198
- package/dist/tools/run_agent.js.map +1 -1
- package/dist/tools/run_agent_cli.d.ts +1 -1
- package/dist/tools/run_agent_cli.d.ts.map +1 -1
- package/dist/tools/run_agent_cli.js +23 -3
- package/dist/tools/run_agent_cli.js.map +1 -1
- package/dist/tools/run_claude.d.ts +6 -2
- package/dist/tools/run_claude.d.ts.map +1 -1
- package/dist/tools/run_claude.js +47 -34
- package/dist/tools/run_claude.js.map +1 -1
- package/dist/tools/run_cline.d.ts +15 -4
- package/dist/tools/run_cline.d.ts.map +1 -1
- package/dist/tools/run_cline.js +23 -53
- package/dist/tools/run_cline.js.map +1 -1
- package/dist/tools/run_gemini.d.ts +15 -6
- package/dist/tools/run_gemini.d.ts.map +1 -1
- package/dist/tools/run_gemini.js +23 -45
- package/dist/tools/run_gemini.js.map +1 -1
- package/dist/tools/run_hermes.d.ts +27 -0
- package/dist/tools/run_hermes.d.ts.map +1 -0
- package/dist/tools/run_hermes.js +35 -0
- package/dist/tools/run_hermes.js.map +1 -0
- package/dist/tools/run_kilo.d.ts +13 -4
- package/dist/tools/run_kilo.d.ts.map +1 -1
- package/dist/tools/run_kilo.js +22 -75
- package/dist/tools/run_kilo.js.map +1 -1
- package/dist/tools/run_nexus_agent.d.ts +11 -1
- package/dist/tools/run_nexus_agent.d.ts.map +1 -1
- package/dist/tools/run_nexus_agent.js +46 -12
- package/dist/tools/run_nexus_agent.js.map +1 -1
- package/dist/tools/run_nexus_sentinel.d.ts +12 -0
- package/dist/tools/run_nexus_sentinel.d.ts.map +1 -0
- package/dist/tools/run_nexus_sentinel.js +98 -0
- package/dist/tools/run_nexus_sentinel.js.map +1 -0
- package/dist/tools/run_openclaw.d.ts +15 -4
- package/dist/tools/run_openclaw.d.ts.map +1 -1
- package/dist/tools/run_openclaw.js +22 -54
- package/dist/tools/run_openclaw.js.map +1 -1
- package/dist/tools/run_opencode.d.ts +15 -4
- package/dist/tools/run_opencode.d.ts.map +1 -1
- package/dist/tools/run_opencode.js +22 -49
- package/dist/tools/run_opencode.js.map +1 -1
- package/dist/tools/run_qwencli.d.ts +26 -0
- package/dist/tools/run_qwencli.d.ts.map +1 -0
- package/dist/tools/run_qwencli.js +27 -0
- package/dist/tools/run_qwencli.js.map +1 -0
- package/package.json +2 -2
- package/dist/bin/logs/postgresql-mcp-2026-04-19.log +0 -4
- package/dist/orchestration/WorkflowEngine.d.ts +0 -2
- package/dist/orchestration/WorkflowEngine.d.ts.map +0 -1
- package/dist/orchestration/WorkflowEngine.js +0 -2
- package/dist/orchestration/WorkflowEngine.js.map +0 -1
- package/dist/orchestration/demo.d.ts +0 -2
- package/dist/orchestration/demo.d.ts.map +0 -1
- package/dist/orchestration/demo.js +0 -2
- package/dist/orchestration/demo.js.map +0 -1
- package/dist/orchestration/types.d.ts +0 -2
- package/dist/orchestration/types.d.ts.map +0 -1
- package/dist/orchestration/types.js +0 -2
- package/dist/orchestration/types.js.map +0 -1
- package/dist/tools/orchestrate_workflow.d.ts +0 -2
- package/dist/tools/orchestrate_workflow.d.ts.map +0 -1
- package/dist/tools/orchestrate_workflow.js +0 -2
- package/dist/tools/orchestrate_workflow.js.map +0 -1
|
@@ -9,7 +9,7 @@ export class ClaudeRunner {
|
|
|
9
9
|
timeoutMs;
|
|
10
10
|
constructor() {
|
|
11
11
|
this.config = CONFIG.CLAUDE;
|
|
12
|
-
this.timeoutMs = CONFIG.TIMEOUT_MS ||
|
|
12
|
+
this.timeoutMs = CONFIG.TIMEOUT_MS || 900000;
|
|
13
13
|
}
|
|
14
14
|
async runAgent(options) {
|
|
15
15
|
const { prompt, agentName, autoResume } = options;
|
|
@@ -18,7 +18,7 @@ export class ClaudeRunner {
|
|
|
18
18
|
const agentCustomEnv = {};
|
|
19
19
|
// --- Auto Resume ---
|
|
20
20
|
if (autoResume && agentName && !sessionId) {
|
|
21
|
-
const lastId = await getLastSessionId(agentName);
|
|
21
|
+
const lastId = await getLastSessionId(agentName, options.configPath);
|
|
22
22
|
if (lastId) {
|
|
23
23
|
sessionId = lastId;
|
|
24
24
|
}
|
|
@@ -77,7 +77,7 @@ export class ClaudeRunner {
|
|
|
77
77
|
if (!agentCustomEnv.ANTHROPIC_MODEL && (settings.env.ANTHROPIC_MODEL || settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL)) {
|
|
78
78
|
agentCustomEnv.ANTHROPIC_MODEL = (settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL && settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL.includes('claude'))
|
|
79
79
|
? settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL
|
|
80
|
-
: 'claude-
|
|
80
|
+
: 'claude-sonnet-4-6';
|
|
81
81
|
}
|
|
82
82
|
// --- SMART NICKNAME FALLBACK ---
|
|
83
83
|
const currentModel = settings.env.ANTHROPIC_MODEL;
|
|
@@ -93,7 +93,7 @@ export class ClaudeRunner {
|
|
|
93
93
|
// On utilise le modèle Sonnet par défaut ou la valeur configurée si elle semble valide
|
|
94
94
|
agentCustomEnv.ANTHROPIC_MODEL = (settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL && settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL.includes('claude'))
|
|
95
95
|
? settings.env.ANTHROPIC_DEFAULT_SONNET_MODEL
|
|
96
|
-
: 'claude-
|
|
96
|
+
: 'claude-sonnet-4-6';
|
|
97
97
|
}
|
|
98
98
|
if (settings.env.AGENT_TIMEOUT_MS || settings.env.API_TIMEOUT_MS) {
|
|
99
99
|
const timeoutValue = settings.env.AGENT_TIMEOUT_MS || settings.env.API_TIMEOUT_MS;
|
|
@@ -176,11 +176,12 @@ export class ClaudeRunner {
|
|
|
176
176
|
// DÉCISION IMPORTANTE: On n'ajoute pas de guillemets manuels ici, spawn s'en occupe
|
|
177
177
|
argsSpawn.push('--settings', finalSettingsPath);
|
|
178
178
|
argsSpawn.push('--mcp-config', mcpPath);
|
|
179
|
-
|
|
180
|
-
|
|
179
|
+
argsSpawn.push('--output-format', 'json');
|
|
180
|
+
if (sessionId && sessionId.trim() !== "") {
|
|
181
|
+
argsSpawn.push("--resume", sessionId);
|
|
181
182
|
}
|
|
182
183
|
// --- MODEL & NICKNAME FLAGS ---
|
|
183
|
-
const modelToUse = agentCustomEnv.ANTHROPIC_MODEL || 'claude-
|
|
184
|
+
const modelToUse = agentCustomEnv.ANTHROPIC_MODEL || 'claude-sonnet-4-6';
|
|
184
185
|
console.error(`[ClaudeRunner] 🛠️ Model override: ${modelToUse}`);
|
|
185
186
|
argsSpawn.push('--model', modelToUse);
|
|
186
187
|
if (agentCustomEnv.AGENT_NICKNAME) {
|
|
@@ -242,7 +243,7 @@ export class ClaudeRunner {
|
|
|
242
243
|
else {
|
|
243
244
|
spawnArgs = [...argsSpawn, '-p'];
|
|
244
245
|
}
|
|
245
|
-
if (agentName) {
|
|
246
|
+
if (agentName && !options.silent) {
|
|
246
247
|
agentCustomEnv.OVERMIND_AGENT_NAME = agentName;
|
|
247
248
|
const id = agentCustomEnv.AGENT_NICKNAME || agentName;
|
|
248
249
|
console.error(`[ClaudeRunner] 🚀 Démarrage de l'agent ${id}...`);
|
|
@@ -263,7 +264,9 @@ export class ClaudeRunner {
|
|
|
263
264
|
// Écrire le prompt via stdin (important: le faire avant d'écouter les événements)
|
|
264
265
|
if (child.stdin) {
|
|
265
266
|
try {
|
|
266
|
-
|
|
267
|
+
// S'assurer que le prompt ne contient pas de surrogates isolés (casse l'encodage UTF-8)
|
|
268
|
+
const sanitizedPrompt = finalPrompt.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, '');
|
|
269
|
+
child.stdin.write(sanitizedPrompt);
|
|
267
270
|
child.stdin.end();
|
|
268
271
|
}
|
|
269
272
|
catch (stdinError) {
|
|
@@ -295,7 +298,7 @@ export class ClaudeRunner {
|
|
|
295
298
|
child.stdout.on('data', (d) => {
|
|
296
299
|
const chunk = d.toString();
|
|
297
300
|
stdout += chunk;
|
|
298
|
-
if (agentName) {
|
|
301
|
+
if (agentName && !options.silent) {
|
|
299
302
|
const id = agentCustomEnv.AGENT_NICKNAME || agentName;
|
|
300
303
|
process.stderr.write(`[ClaudeRunner:${id}] ${chunk}`);
|
|
301
304
|
}
|
|
@@ -305,7 +308,7 @@ export class ClaudeRunner {
|
|
|
305
308
|
child.stderr.on('data', (d) => {
|
|
306
309
|
const chunk = d.toString();
|
|
307
310
|
stderr += chunk;
|
|
308
|
-
if (agentName) {
|
|
311
|
+
if (agentName && !options.silent) {
|
|
309
312
|
const id = agentCustomEnv.AGENT_NICKNAME || agentName;
|
|
310
313
|
process.stderr.write(`[ClaudeRunner:${id}:ERR] ${chunk}`);
|
|
311
314
|
}
|
|
@@ -361,33 +364,57 @@ export class ClaudeRunner {
|
|
|
361
364
|
}
|
|
362
365
|
}
|
|
363
366
|
const fullRaw = stdout + (stderr ? `\n\n--- STDERR ---\n${stderr}` : '');
|
|
364
|
-
let specificError;
|
|
365
367
|
try {
|
|
366
|
-
//
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
let resultText = rawText;
|
|
368
|
+
// Robust JSON extraction from stdout
|
|
369
|
+
let jsonEnvelope = null;
|
|
370
|
+
const trimmedStdout = stdout.trim();
|
|
370
371
|
try {
|
|
371
|
-
|
|
372
|
-
if (envelope.session_id && agentName) {
|
|
373
|
-
await saveSessionId(agentName, envelope.session_id);
|
|
374
|
-
}
|
|
375
|
-
// If it's an envelope with a reply field, extract it
|
|
376
|
-
resultText = envelope.reply || envelope.result || rawText;
|
|
372
|
+
jsonEnvelope = JSON.parse(trimmedStdout);
|
|
377
373
|
}
|
|
378
374
|
catch (_) {
|
|
379
|
-
//
|
|
380
|
-
|
|
375
|
+
// If direct parse fails, try to find the last JSON object in the output
|
|
376
|
+
// (claude CLI sometimes outputs logs before the JSON envelope)
|
|
377
|
+
const lastBrace = trimmedStdout.lastIndexOf('}');
|
|
378
|
+
const firstBrace = trimmedStdout.lastIndexOf('{', lastBrace);
|
|
379
|
+
if (firstBrace !== -1 && lastBrace !== -1) {
|
|
380
|
+
try {
|
|
381
|
+
jsonEnvelope = JSON.parse(trimmedStdout.substring(firstBrace, lastBrace + 1));
|
|
382
|
+
}
|
|
383
|
+
catch (__) {
|
|
384
|
+
// Still failed
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
}
|
|
388
|
+
if (jsonEnvelope) {
|
|
389
|
+
let foundSessionId = sessionId;
|
|
390
|
+
if (jsonEnvelope.session_id && agentName) {
|
|
391
|
+
foundSessionId = jsonEnvelope.session_id;
|
|
392
|
+
await saveSessionId(agentName, jsonEnvelope.session_id, options.configPath);
|
|
393
|
+
}
|
|
394
|
+
return resolve({
|
|
395
|
+
result: jsonEnvelope.reply || jsonEnvelope.result || stdout.trim(),
|
|
396
|
+
sessionId: foundSessionId,
|
|
397
|
+
rawOutput: stdout,
|
|
398
|
+
});
|
|
399
|
+
}
|
|
400
|
+
// Fallback to raw text if no JSON found but code was 0
|
|
401
|
+
if (code === 0) {
|
|
402
|
+
return resolve({
|
|
403
|
+
result: stdout.trim(),
|
|
404
|
+
sessionId,
|
|
405
|
+
rawOutput: stdout,
|
|
406
|
+
});
|
|
381
407
|
}
|
|
382
408
|
resolve({
|
|
383
|
-
result:
|
|
384
|
-
|
|
409
|
+
result: '',
|
|
410
|
+
error: 'JSON_PARSE_ERROR',
|
|
411
|
+
rawOutput: fullRaw,
|
|
385
412
|
});
|
|
386
413
|
}
|
|
387
|
-
catch (
|
|
414
|
+
catch (error) {
|
|
388
415
|
resolve({
|
|
389
416
|
result: '',
|
|
390
|
-
error:
|
|
417
|
+
error: `INTERNAL_ERROR: ${error instanceof Error ? error.message : String(error)}`,
|
|
391
418
|
rawOutput: fullRaw,
|
|
392
419
|
});
|
|
393
420
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClaudeRunner.js","sourceRoot":"","sources":["../../src/services/ClaudeRunner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ClaudeRunner.js","sourceRoot":"","sources":["../../src/services/ClaudeRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClineRunner.d.ts","sourceRoot":"","sources":["../../src/services/ClineRunner.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"ClineRunner.d.ts","sourceRoot":"","sources":["../../src/services/ClineRunner.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,WAAW;IACtB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,SAAS,CAAS;;IAOpB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;CA0FlE"}
|
|
@@ -16,7 +16,7 @@ export class ClineRunner {
|
|
|
16
16
|
const { PATHS } = this.config;
|
|
17
17
|
// --- Auto Resume ---
|
|
18
18
|
if (autoResume && agentName && !sessionId) {
|
|
19
|
-
const lastId = await getLastSessionId(agentName);
|
|
19
|
+
const lastId = await getLastSessionId(agentName, options.configPath);
|
|
20
20
|
if (lastId) {
|
|
21
21
|
sessionId = lastId;
|
|
22
22
|
}
|
|
@@ -73,7 +73,7 @@ export class ClineRunner {
|
|
|
73
73
|
return resolve({ result: '', error: `EXIT_CODE_${code}`, rawOutput: stderr });
|
|
74
74
|
}
|
|
75
75
|
if (agentName && sessionId) {
|
|
76
|
-
await saveSessionId(agentName, sessionId);
|
|
76
|
+
await saveSessionId(agentName, sessionId, options.configPath);
|
|
77
77
|
}
|
|
78
78
|
resolve({
|
|
79
79
|
result: stdout.trim(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ClineRunner.js","sourceRoot":"","sources":["../../src/services/ClineRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAgB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ClineRunner.js","sourceRoot":"","sources":["../../src/services/ClineRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeminiRunner.d.ts","sourceRoot":"","sources":["../../src/services/GeminiRunner.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"GeminiRunner.d.ts","sourceRoot":"","sources":["../../src/services/GeminiRunner.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,SAAS,CAAS;;IAOpB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;CA4NlE"}
|
|
@@ -8,7 +8,7 @@ export class GeminiRunner {
|
|
|
8
8
|
timeoutMs;
|
|
9
9
|
constructor() {
|
|
10
10
|
this.config = CONFIG.CLAUDE;
|
|
11
|
-
this.timeoutMs = CONFIG.TIMEOUT_MS ||
|
|
11
|
+
this.timeoutMs = CONFIG.TIMEOUT_MS || 900000; // 15 min default
|
|
12
12
|
}
|
|
13
13
|
async runAgent(options) {
|
|
14
14
|
const { prompt, agentName, autoResume } = options;
|
|
@@ -21,7 +21,7 @@ export class GeminiRunner {
|
|
|
21
21
|
};
|
|
22
22
|
// --- Auto Resume ---
|
|
23
23
|
if (autoResume && agentName && !sessionId) {
|
|
24
|
-
const lastId = await getLastSessionId(agentName);
|
|
24
|
+
const lastId = await getLastSessionId(agentName, options.configPath);
|
|
25
25
|
if (lastId) {
|
|
26
26
|
sessionId = lastId;
|
|
27
27
|
}
|
|
@@ -61,10 +61,12 @@ export class GeminiRunner {
|
|
|
61
61
|
if (fs.existsSync(globalFile)) {
|
|
62
62
|
try {
|
|
63
63
|
fs.copyFileSync(globalFile, localFile);
|
|
64
|
-
|
|
64
|
+
if (!options.silent)
|
|
65
|
+
console.log(`[GeminiRunner] OAuth synchronisé: ${file} vers ${localFile}`);
|
|
65
66
|
}
|
|
66
67
|
catch (err) {
|
|
67
|
-
|
|
68
|
+
if (!options.silent)
|
|
69
|
+
console.error(`[GeminiRunner] Échec synchronisation ${file}: ${err}`);
|
|
68
70
|
}
|
|
69
71
|
}
|
|
70
72
|
}
|
|
@@ -93,7 +95,8 @@ export class GeminiRunner {
|
|
|
93
95
|
mcpToUse = filteredMcp;
|
|
94
96
|
}
|
|
95
97
|
fs.writeFileSync(mcpPath, JSON.stringify(mcpToUse, null, 2));
|
|
96
|
-
|
|
98
|
+
if (!options.silent)
|
|
99
|
+
console.log(`[GeminiRunner] MCP synchronisé: ${mcpPath}`);
|
|
97
100
|
}
|
|
98
101
|
}
|
|
99
102
|
}
|
|
@@ -140,15 +143,39 @@ export class GeminiRunner {
|
|
|
140
143
|
});
|
|
141
144
|
}
|
|
142
145
|
try {
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
const
|
|
146
|
-
|
|
147
|
-
|
|
146
|
+
// Robust JSON extraction from stdout
|
|
147
|
+
let jsonOutput = null;
|
|
148
|
+
const trimmedStdout = stdout.trim();
|
|
149
|
+
try {
|
|
150
|
+
jsonOutput = JSON.parse(trimmedStdout);
|
|
151
|
+
}
|
|
152
|
+
catch (_) {
|
|
153
|
+
const lastBrace = trimmedStdout.lastIndexOf('}');
|
|
154
|
+
const firstBrace = trimmedStdout.lastIndexOf('{', lastBrace);
|
|
155
|
+
if (firstBrace !== -1 && lastBrace !== -1) {
|
|
156
|
+
try {
|
|
157
|
+
jsonOutput = JSON.parse(trimmedStdout.substring(firstBrace, lastBrace + 1));
|
|
158
|
+
}
|
|
159
|
+
catch (__) {
|
|
160
|
+
// Ignore parsing errors
|
|
161
|
+
}
|
|
162
|
+
}
|
|
163
|
+
}
|
|
164
|
+
if (jsonOutput) {
|
|
165
|
+
const resultText = jsonOutput.reply || jsonOutput.result || stdout.trim();
|
|
166
|
+
const newSessionId = jsonOutput.session_id || sessionId;
|
|
167
|
+
if (newSessionId && agentName) {
|
|
168
|
+
await saveSessionId(agentName, newSessionId, options.configPath);
|
|
169
|
+
}
|
|
170
|
+
return resolve({
|
|
171
|
+
result: resultText,
|
|
172
|
+
sessionId: newSessionId,
|
|
173
|
+
rawOutput: stdout,
|
|
174
|
+
});
|
|
148
175
|
}
|
|
149
176
|
resolve({
|
|
150
|
-
result:
|
|
151
|
-
sessionId:
|
|
177
|
+
result: stdout.trim(),
|
|
178
|
+
sessionId: sessionId,
|
|
152
179
|
rawOutput: stdout,
|
|
153
180
|
});
|
|
154
181
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeminiRunner.js","sourceRoot":"","sources":["../../src/services/GeminiRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAgB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"GeminiRunner.js","sourceRoot":"","sources":["../../src/services/GeminiRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KiloRunner.d.ts","sourceRoot":"","sources":["../../src/services/KiloRunner.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,KAAK,GAAG,OAAO,GAAG,cAAc,CAAC;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"KiloRunner.d.ts","sourceRoot":"","sources":["../../src/services/KiloRunner.ts"],"names":[],"mappings":"AAMA,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,IAAI,CAAC,EAAE,MAAM,GAAG,WAAW,GAAG,KAAK,GAAG,OAAO,GAAG,cAAc,CAAC;IAC/D,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAWD,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,CAAqB;IACnC,OAAO,CAAC,SAAS,CAAS;IAE1B,MAAM,CAAC,oBAAoB,SAe3B;;IAOM,kBAAkB,IAAI,OAAO,CAAC;QAAE,EAAE,EAAE,OAAO,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAKhE,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;CAuMlE"}
|
|
@@ -4,11 +4,12 @@ import { spawn } from 'child_process';
|
|
|
4
4
|
import { CONFIG, resolveConfigPath } from '../lib/config.js';
|
|
5
5
|
import { getLastSessionId, saveSessionId } from '../lib/sessions.js';
|
|
6
6
|
const MODEL_MAPPING = {
|
|
7
|
+
'tencent hy3': 'kilo/tencent/hy3-preview:free',
|
|
7
8
|
'step 3.5 flash': 'kilo/stepfun/step-3.5-flash:free',
|
|
8
9
|
'grok code': 'kilo/x-ai/grok-code-fast-1:optimized:free',
|
|
9
10
|
'grok code fast 1 optimised': 'kilo/x-ai/grok-code-fast-1:optimized:free',
|
|
10
|
-
|
|
11
|
-
|
|
11
|
+
elephant: 'kilo/openrouter/elephant-alpha',
|
|
12
|
+
free: 'kilo/openrouter/free',
|
|
12
13
|
};
|
|
13
14
|
export class KiloRunner {
|
|
14
15
|
config;
|
|
@@ -31,30 +32,11 @@ export class KiloRunner {
|
|
|
31
32
|
`;
|
|
32
33
|
constructor() {
|
|
33
34
|
this.config = CONFIG.KILO;
|
|
34
|
-
this.timeoutMs = CONFIG.TIMEOUT_MS ||
|
|
35
|
+
this.timeoutMs = CONFIG.TIMEOUT_MS || 900000; // 15 minutes par défaut
|
|
35
36
|
}
|
|
36
37
|
async verifyInstallation() {
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
return new Promise((resolve) => {
|
|
40
|
-
exec('kilo --version', (error, stdout) => {
|
|
41
|
-
if (error) {
|
|
42
|
-
return resolve({
|
|
43
|
-
ok: false,
|
|
44
|
-
message: `❌ **Kilo CLI introuvable !**\n\nL'exécutable 'kilo' n'est pas installé ou n'est pas dans votre PATH.\n${KiloRunner.INSTALL_INSTRUCTIONS}`
|
|
45
|
-
});
|
|
46
|
-
}
|
|
47
|
-
const version = stdout.trim();
|
|
48
|
-
// Vérification flexible : soit la version exacte, soit une version 7.x
|
|
49
|
-
if (!version.includes(REQUIRED_VERSION) && !version.startsWith('7.')) {
|
|
50
|
-
return resolve({
|
|
51
|
-
ok: false,
|
|
52
|
-
message: `⚠️ **Version Incorrecte détectée : ${version}** (Attendu: ${REQUIRED_VERSION})\n\nIl est fortement recommandé de mettre à jour vers la version officielle v7.x.\n${KiloRunner.INSTALL_INSTRUCTIONS}`
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
resolve({ ok: true });
|
|
56
|
-
});
|
|
57
|
-
});
|
|
38
|
+
const { verifyInstallation: check } = await import('../lib/InstallHelper.js');
|
|
39
|
+
return check('kilo');
|
|
58
40
|
}
|
|
59
41
|
async runAgent(options) {
|
|
60
42
|
const { prompt, agentName, autoResume, mode, cwd } = options;
|
|
@@ -65,7 +47,7 @@ export class KiloRunner {
|
|
|
65
47
|
const agentCustomEnv = {};
|
|
66
48
|
// --- Auto Resume ---
|
|
67
49
|
if (autoResume && agentName && !sessionId) {
|
|
68
|
-
const lastId = await getLastSessionId(agentName);
|
|
50
|
+
const lastId = await getLastSessionId(agentName, options.configPath);
|
|
69
51
|
if (lastId) {
|
|
70
52
|
sessionId = lastId;
|
|
71
53
|
}
|
|
@@ -116,20 +98,22 @@ export class KiloRunner {
|
|
|
116
98
|
argsSpawn.push('--auto');
|
|
117
99
|
argsSpawn.push('--format', 'json');
|
|
118
100
|
if (cwd) {
|
|
119
|
-
argsSpawn.push('--dir',
|
|
101
|
+
argsSpawn.push('--dir', '.');
|
|
120
102
|
}
|
|
121
103
|
return new Promise((resolve) => {
|
|
122
|
-
const isWin = process.platform === 'win32';
|
|
123
104
|
const command = 'kilo';
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
105
|
+
if (!options.silent) {
|
|
106
|
+
console.log(`\n\x1b[33m[Kilo] ⚡ Initialisation de l'agent: ${agentName || 'Anonyme'}\x1b[0m`);
|
|
107
|
+
console.log(`\x1b[33m[Kilo] 🤖 Modèle: ${selectedModel}\x1b[0m`);
|
|
108
|
+
if (mode)
|
|
109
|
+
console.log(`\x1b[33m[Kilo] 🛠️ Mode/Agent: ${mode}\x1b[0m`);
|
|
110
|
+
if (sessionId)
|
|
111
|
+
console.log(`\x1b[33m[Kilo] 📜 Session: ${sessionId}\x1b[0m`);
|
|
112
|
+
console.log(`\x1b[33m[Kilo] 🚀 Commande: ${command} ${argsSpawn.join(' ')}\x1b[0m`);
|
|
113
|
+
}
|
|
130
114
|
const child = spawn(command, argsSpawn, {
|
|
131
115
|
cwd: options.cwd || process.cwd(),
|
|
132
|
-
shell:
|
|
116
|
+
shell: false,
|
|
133
117
|
windowsHide: true,
|
|
134
118
|
env: {
|
|
135
119
|
...process.env,
|
|
@@ -162,7 +146,7 @@ export class KiloRunner {
|
|
|
162
146
|
finalResult += event.part.text;
|
|
163
147
|
}
|
|
164
148
|
else if (event.type === 'message' || event.type === 'reply') {
|
|
165
|
-
finalResult +=
|
|
149
|
+
finalResult += event.content || event.text || '';
|
|
166
150
|
}
|
|
167
151
|
else if (event.type === 'session') {
|
|
168
152
|
lastSessionId = event.id || event.sessionID || lastSessionId;
|
|
@@ -173,7 +157,7 @@ export class KiloRunner {
|
|
|
173
157
|
}
|
|
174
158
|
catch (_e) {
|
|
175
159
|
// Si ce n'est pas du JSON, c'est peut-être du log
|
|
176
|
-
if (!trimmedLine.startsWith('{')) {
|
|
160
|
+
if (!trimmedLine.startsWith('{') && !options.silent) {
|
|
177
161
|
process.stdout.write(`\x1b[36m[Kilo]\x1b[0m ${trimmedLine}\n`);
|
|
178
162
|
}
|
|
179
163
|
}
|
|
@@ -193,7 +177,7 @@ export class KiloRunner {
|
|
|
193
177
|
console.log(`\n\x1b[41m\x1b[37m[Kilo ALERT] QUOTA ATTEINT / MODÈLE ÉPUISÉ\x1b[0m`);
|
|
194
178
|
console.log(`\x1b[31m[Détail] ${chunk.trim()}\x1b[0m`);
|
|
195
179
|
}
|
|
196
|
-
else {
|
|
180
|
+
else if (!options.silent) {
|
|
197
181
|
process.stdout.write(`\x1b[31m[Kilo STDERR]\x1b[0m ${chunk}`);
|
|
198
182
|
}
|
|
199
183
|
});
|
|
@@ -210,7 +194,7 @@ export class KiloRunner {
|
|
|
210
194
|
}
|
|
211
195
|
console.log(`\x1b[32m[Kilo] ✅ Mission terminée (${((Date.now() - startTime) / 1000).toFixed(1)}s)\x1b[0m`);
|
|
212
196
|
if (agentName && lastSessionId) {
|
|
213
|
-
await saveSessionId(agentName, lastSessionId);
|
|
197
|
+
await saveSessionId(agentName, lastSessionId, options.configPath);
|
|
214
198
|
}
|
|
215
199
|
resolve({
|
|
216
200
|
result: finalResult || stdout.trim(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"KiloRunner.js","sourceRoot":"","sources":["../../src/services/KiloRunner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAgB,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"KiloRunner.js","sourceRoot":"","sources":["../../src/services/KiloRunner.ts"],"names":[],"mappings":"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"}
|