overmind-mcp 2.4.2 → 2.5.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/.mcp.json.example +21 -0
- package/README.md +107 -80
- package/assets/overmind.png +0 -0
- package/bin/.gitkeep +0 -0
- package/bin/README.md +34 -0
- package/bin/install-overmind-unix.sh +412 -0
- package/bin/install-overmind-windows.bat +407 -0
- package/dist/bin/cli.js +438 -7
- package/dist/bin/cli.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +3 -2
- package/dist/index.js.map +1 -1
- package/dist/lib/config.d.ts +31 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +19 -27
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/sessions.d.ts +3 -2
- package/dist/lib/sessions.d.ts.map +1 -1
- package/dist/lib/sessions.js +94 -25
- package/dist/lib/sessions.js.map +1 -1
- package/dist/memory/MemoryFactory.d.ts +15 -1
- package/dist/memory/MemoryFactory.d.ts.map +1 -1
- package/dist/memory/MemoryFactory.js +53 -3
- package/dist/memory/MemoryFactory.js.map +1 -1
- package/dist/memory/PostgresMemoryProvider.d.ts +7 -0
- package/dist/memory/PostgresMemoryProvider.d.ts.map +1 -1
- package/dist/memory/PostgresMemoryProvider.js +180 -105
- package/dist/memory/PostgresMemoryProvider.js.map +1 -1
- package/dist/server.d.ts +41 -0
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +152 -26
- package/dist/server.js.map +1 -1
- package/dist/services/AgentManager.d.ts.map +1 -1
- package/dist/services/AgentManager.js +67 -11
- package/dist/services/AgentManager.js.map +1 -1
- package/dist/services/ClaudeRunner.d.ts +8 -0
- package/dist/services/ClaudeRunner.d.ts.map +1 -1
- package/dist/services/ClaudeRunner.js +514 -213
- package/dist/services/ClaudeRunner.js.map +1 -1
- package/dist/services/ClineRunner.d.ts +7 -0
- package/dist/services/ClineRunner.d.ts.map +1 -1
- package/dist/services/ClineRunner.js +80 -11
- package/dist/services/ClineRunner.js.map +1 -1
- package/dist/services/GeminiRunner.d.ts +6 -0
- package/dist/services/GeminiRunner.d.ts.map +1 -1
- package/dist/services/GeminiRunner.js +285 -58
- package/dist/services/GeminiRunner.js.map +1 -1
- package/dist/services/KiloRunner.d.ts +12 -0
- package/dist/services/KiloRunner.d.ts.map +1 -1
- package/dist/services/KiloRunner.js +441 -57
- package/dist/services/KiloRunner.js.map +1 -1
- package/dist/services/OpenClawRunner.d.ts +7 -0
- package/dist/services/OpenClawRunner.d.ts.map +1 -1
- package/dist/services/OpenClawRunner.js +79 -11
- package/dist/services/OpenClawRunner.js.map +1 -1
- package/dist/services/OpenCodeRunner.d.ts +7 -0
- package/dist/services/OpenCodeRunner.d.ts.map +1 -1
- package/dist/services/OpenCodeRunner.js +79 -11
- package/dist/services/OpenCodeRunner.js.map +1 -1
- package/dist/tools/config_example.d.ts +7 -4
- package/dist/tools/config_example.d.ts.map +1 -1
- package/dist/tools/config_example.js +191 -86
- package/dist/tools/config_example.js.map +1 -1
- package/dist/tools/create_agent.d.ts +15 -9
- 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 +36 -18
- 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 +11 -5
- 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 +15 -16
- package/dist/tools/run_agent.d.ts.map +1 -1
- package/dist/tools/run_agent.js +128 -160
- package/dist/tools/run_agent.js.map +1 -1
- package/dist/tools/run_claude.d.ts +8 -3
- package/dist/tools/run_claude.d.ts.map +1 -1
- package/dist/tools/run_claude.js +59 -41
- package/dist/tools/run_claude.js.map +1 -1
- package/dist/tools/run_cline.d.ts +13 -4
- package/dist/tools/run_cline.d.ts.map +1 -1
- package/dist/tools/run_cline.js +55 -43
- package/dist/tools/run_cline.js.map +1 -1
- package/dist/tools/run_gemini.d.ts +13 -4
- package/dist/tools/run_gemini.d.ts.map +1 -1
- package/dist/tools/run_gemini.js +53 -33
- package/dist/tools/run_gemini.js.map +1 -1
- package/dist/tools/run_kilo.d.ts +17 -7
- package/dist/tools/run_kilo.d.ts.map +1 -1
- package/dist/tools/run_kilo.js +68 -41
- package/dist/tools/run_kilo.js.map +1 -1
- package/dist/tools/run_openclaw.d.ts +13 -4
- package/dist/tools/run_openclaw.d.ts.map +1 -1
- package/dist/tools/run_openclaw.js +52 -44
- package/dist/tools/run_openclaw.js.map +1 -1
- package/dist/tools/run_opencode.d.ts +13 -4
- package/dist/tools/run_opencode.d.ts.map +1 -1
- package/dist/tools/run_opencode.js +52 -39
- package/dist/tools/run_opencode.js.map +1 -1
- package/docs/README.md +128 -0
- package/docs/agent_control.md +656 -0
- package/docs/index.html +493 -0
- package/docs/library.html +239 -0
- package/docs/prompt.html +1212 -0
- package/docs/script.js +428 -0
- package/docs/styles.css +2816 -0
- package/package.json +55 -25
- package/scripts/auto-changelog.mjs +132 -0
- package/scripts/auto-install.mjs +322 -0
- package/scripts/install-dependencies.mjs +462 -0
- package/scripts/postgres-manager.mjs +219 -0
- package/scripts/postinstall.mjs +538 -0
- package/scripts/setup-overmind-db.mjs +199 -0
- package/scripts/setup-windows.js +266 -0
- package/scripts/setup.mjs +397 -0
- package/scripts/test-installation.mjs +158 -0
- package/scripts/uninstall.mjs +238 -0
- package/assets/overmind_mcp_pro_banner_v3.png +0 -0
- package/dist/services/QwenRunner.d.ts +0 -19
- package/dist/services/QwenRunner.d.ts.map +0 -1
- package/dist/services/QwenRunner.js +0 -87
- package/dist/services/QwenRunner.js.map +0 -1
- package/dist/services/TraeRunner.d.ts +0 -19
- package/dist/services/TraeRunner.d.ts.map +0 -1
- package/dist/services/TraeRunner.js +0 -88
- package/dist/services/TraeRunner.js.map +0 -1
- package/dist/tools/run_qwen.d.ts +0 -15
- package/dist/tools/run_qwen.d.ts.map +0 -1
- package/dist/tools/run_qwen.js +0 -61
- package/dist/tools/run_qwen.js.map +0 -1
- package/dist/tools/run_trae.d.ts +0 -15
- package/dist/tools/run_trae.d.ts.map +0 -1
- package/dist/tools/run_trae.js +0 -66
- package/dist/tools/run_trae.js.map +0 -1
- package/dist/tools/shell_execute.d.ts +0 -10
- package/dist/tools/shell_execute.d.ts.map +0 -1
- package/dist/tools/shell_execute.js +0 -24
- package/dist/tools/shell_execute.js.map +0 -1
- package/dist/tools/test_agent_control.d.ts +0 -2
- package/dist/tools/test_agent_control.d.ts.map +0 -1
- package/dist/tools/test_agent_control.js +0 -92
- package/dist/tools/test_agent_control.js.map +0 -1
|
@@ -3,20 +3,53 @@ import path from 'path';
|
|
|
3
3
|
import { spawn } from 'child_process';
|
|
4
4
|
import { CONFIG, resolveConfigPath } from '../lib/config.js';
|
|
5
5
|
import { getLastSessionId, saveSessionId } from '../lib/sessions.js';
|
|
6
|
+
import { interpolateEnvVars } from '../lib/envUtils.js';
|
|
7
|
+
import { withSpan } from '../lib/telemetry.js';
|
|
8
|
+
import pino from 'pino';
|
|
9
|
+
import { registerProcess, appendOutput, updateProcessStatus, } from '../lib/processRegistry.js';
|
|
10
|
+
const logger = pino({ name: 'OpenClawRunner' });
|
|
6
11
|
export class OpenClawRunner {
|
|
7
12
|
config;
|
|
8
13
|
timeoutMs;
|
|
14
|
+
tempFiles = [];
|
|
15
|
+
MAX_BUF = 10 * 1024 * 1024; // 10MB
|
|
9
16
|
constructor() {
|
|
10
17
|
this.config = CONFIG.CLAUDE;
|
|
11
|
-
this.timeoutMs = CONFIG.TIMEOUT_MS ||
|
|
18
|
+
this.timeoutMs = CONFIG.TIMEOUT_MS || 900000;
|
|
19
|
+
}
|
|
20
|
+
cleanupTempFiles() {
|
|
21
|
+
for (const tempFile of this.tempFiles) {
|
|
22
|
+
try {
|
|
23
|
+
if (fs.existsSync(tempFile)) {
|
|
24
|
+
fs.unlinkSync(tempFile);
|
|
25
|
+
logger.debug({ tempFile }, 'Cleaned up temp file');
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
catch (err) {
|
|
29
|
+
logger.warn({ tempFile, error: err }, 'Failed to cleanup temp file');
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
this.tempFiles = [];
|
|
12
33
|
}
|
|
13
34
|
async runAgent(options) {
|
|
35
|
+
return withSpan('openclaw.runAgent', async (span) => {
|
|
36
|
+
span.setAttribute('agentName', options.agentName || '');
|
|
37
|
+
span.setAttribute('runner', 'openclaw');
|
|
38
|
+
const result = await this.runAgentInternal(options);
|
|
39
|
+
this.cleanupTempFiles();
|
|
40
|
+
if (options.agentName && result.sessionId) {
|
|
41
|
+
await saveSessionId(options.agentName, result.sessionId, options.configPath, 'openclaw');
|
|
42
|
+
}
|
|
43
|
+
return result;
|
|
44
|
+
}, { agentName: options.agentName || '', runner: 'openclaw' });
|
|
45
|
+
}
|
|
46
|
+
async runAgentInternal(options) {
|
|
14
47
|
const { prompt, agentName, autoResume } = options;
|
|
15
48
|
let { sessionId } = options;
|
|
16
49
|
const { PATHS } = this.config;
|
|
17
50
|
// --- Auto Resume ---
|
|
18
51
|
if (autoResume && agentName && !sessionId) {
|
|
19
|
-
const lastId = await getLastSessionId(agentName);
|
|
52
|
+
const lastId = await getLastSessionId(agentName, options.configPath, 'openclaw');
|
|
20
53
|
if (lastId) {
|
|
21
54
|
sessionId = lastId;
|
|
22
55
|
}
|
|
@@ -25,16 +58,18 @@ export class OpenClawRunner {
|
|
|
25
58
|
// --- Isolation ---
|
|
26
59
|
if (agentName) {
|
|
27
60
|
try {
|
|
28
|
-
const agentSettingsPath = resolveConfigPath(path.join(path.dirname(PATHS.SETTINGS), `settings_${agentName}.json`));
|
|
61
|
+
const agentSettingsPath = resolveConfigPath(path.join(path.dirname(PATHS.SETTINGS), `settings_${agentName}.json`), options.configPath);
|
|
29
62
|
if (fs.existsSync(agentSettingsPath)) {
|
|
30
|
-
|
|
63
|
+
let settings = JSON.parse(fs.readFileSync(agentSettingsPath, 'utf8'));
|
|
64
|
+
// --- New interpolation logic ---
|
|
65
|
+
settings = interpolateEnvVars(settings);
|
|
31
66
|
if (settings.env && settings.env.AGENT_TIMEOUT_MS) {
|
|
32
67
|
customTimeoutMs = parseInt(settings.env.AGENT_TIMEOUT_MS, 10) || customTimeoutMs;
|
|
33
68
|
}
|
|
34
69
|
}
|
|
35
70
|
}
|
|
36
|
-
catch (
|
|
37
|
-
|
|
71
|
+
catch (err) {
|
|
72
|
+
logger.warn({ agentName, error: err }, 'Failed to load agent settings');
|
|
38
73
|
}
|
|
39
74
|
}
|
|
40
75
|
// OpenClaw CLI: `openclaw message send "prompt"` for programmatic invocation
|
|
@@ -43,7 +78,7 @@ export class OpenClawRunner {
|
|
|
43
78
|
const isWin = process.platform === 'win32';
|
|
44
79
|
const command = isWin ? 'openclaw.cmd' : 'openclaw';
|
|
45
80
|
const child = spawn(command, argsSpawn, {
|
|
46
|
-
cwd: process.cwd(),
|
|
81
|
+
cwd: options.cwd || process.cwd(),
|
|
47
82
|
shell: isWin,
|
|
48
83
|
windowsHide: true,
|
|
49
84
|
env: {
|
|
@@ -51,23 +86,56 @@ export class OpenClawRunner {
|
|
|
51
86
|
...(agentName ? { OVERMIND_AGENT_NAME: agentName } : {}),
|
|
52
87
|
},
|
|
53
88
|
});
|
|
89
|
+
if (child.pid) {
|
|
90
|
+
void registerProcess(child.pid, { agentName: agentName || '', runner: 'openclaw', configPath: options.configPath });
|
|
91
|
+
}
|
|
54
92
|
let stdout = '';
|
|
55
93
|
let stderr = '';
|
|
94
|
+
let hardTimeoutTimer = null;
|
|
95
|
+
const cleanup = () => {
|
|
96
|
+
child.stdout?.removeAllListeners();
|
|
97
|
+
child.stderr?.removeAllListeners();
|
|
98
|
+
child.removeAllListeners();
|
|
99
|
+
if (hardTimeoutTimer)
|
|
100
|
+
clearTimeout(hardTimeoutTimer);
|
|
101
|
+
};
|
|
56
102
|
if (child.stdout)
|
|
57
|
-
child.stdout.on('data', (d) =>
|
|
103
|
+
child.stdout.on('data', (d) => {
|
|
104
|
+
const chunk = d.toString();
|
|
105
|
+
if (child.pid)
|
|
106
|
+
void appendOutput(child.pid, chunk, options.configPath);
|
|
107
|
+
if (stdout.length + d.length > this.MAX_BUF)
|
|
108
|
+
stdout = stdout.slice(-this.MAX_BUF);
|
|
109
|
+
else
|
|
110
|
+
stdout += chunk;
|
|
111
|
+
});
|
|
58
112
|
if (child.stderr)
|
|
59
|
-
child.stderr.on('data', (d) =>
|
|
113
|
+
child.stderr.on('data', (d) => {
|
|
114
|
+
if (stderr.length + d.length > this.MAX_BUF)
|
|
115
|
+
stderr = stderr.slice(-this.MAX_BUF);
|
|
116
|
+
else
|
|
117
|
+
stderr += d.toString();
|
|
118
|
+
});
|
|
60
119
|
const timeout = setTimeout(() => {
|
|
61
|
-
child.kill();
|
|
120
|
+
child.kill('SIGTERM');
|
|
121
|
+
hardTimeoutTimer = setTimeout(() => {
|
|
122
|
+
if (!child.killed)
|
|
123
|
+
child.kill('SIGKILL');
|
|
124
|
+
}, 5000);
|
|
125
|
+
cleanup();
|
|
126
|
+
if (child.pid)
|
|
127
|
+
void updateProcessStatus(child.pid, 'failed', null, options.configPath);
|
|
62
128
|
resolve({ result: '', error: 'TIMEOUT', rawOutput: stdout });
|
|
63
129
|
}, customTimeoutMs);
|
|
64
130
|
child.on('close', async (code) => {
|
|
65
131
|
clearTimeout(timeout);
|
|
132
|
+
if (child.pid)
|
|
133
|
+
void updateProcessStatus(child.pid, code === 0 ? 'done' : 'failed', code, options.configPath);
|
|
66
134
|
if (code !== 0 && !stdout) {
|
|
67
135
|
return resolve({ result: '', error: `EXIT_CODE_${code}`, rawOutput: stderr });
|
|
68
136
|
}
|
|
69
137
|
if (agentName && sessionId) {
|
|
70
|
-
await saveSessionId(agentName, sessionId);
|
|
138
|
+
await saveSessionId(agentName, sessionId, options.configPath, 'openclaw');
|
|
71
139
|
}
|
|
72
140
|
resolve({
|
|
73
141
|
result: stdout.trim(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenClawRunner.js","sourceRoot":"","sources":["../../src/services/OpenClawRunner.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":"OpenClawRunner.js","sourceRoot":"","sources":["../../src/services/OpenClawRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,9 @@ export interface RunAgentOptions {
|
|
|
3
3
|
agentName?: string;
|
|
4
4
|
sessionId?: string;
|
|
5
5
|
autoResume?: boolean;
|
|
6
|
+
cwd?: string;
|
|
7
|
+
configPath?: string;
|
|
8
|
+
silent?: boolean;
|
|
6
9
|
}
|
|
7
10
|
export interface RunAgentResult {
|
|
8
11
|
result: string;
|
|
@@ -13,7 +16,11 @@ export interface RunAgentResult {
|
|
|
13
16
|
export declare class OpenCodeRunner {
|
|
14
17
|
private config;
|
|
15
18
|
private timeoutMs;
|
|
19
|
+
private tempFiles;
|
|
20
|
+
private MAX_BUF;
|
|
16
21
|
constructor();
|
|
22
|
+
private cleanupTempFiles;
|
|
17
23
|
runAgent(options: RunAgentOptions): Promise<RunAgentResult>;
|
|
24
|
+
private runAgentInternal;
|
|
18
25
|
}
|
|
19
26
|
//# sourceMappingURL=OpenCodeRunner.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenCodeRunner.d.ts","sourceRoot":"","sources":["../../src/services/OpenCodeRunner.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"OpenCodeRunner.d.ts","sourceRoot":"","sources":["../../src/services/OpenCodeRunner.ts"],"names":[],"mappings":"AAgBA,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,cAAc;IACzB,OAAO,CAAC,MAAM,CAAuB;IACrC,OAAO,CAAC,SAAS,CAAS;IAC1B,OAAO,CAAC,SAAS,CAAgB;IACjC,OAAO,CAAC,OAAO,CAAoB;;IAOnC,OAAO,CAAC,gBAAgB;IAclB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;YAgBnD,gBAAgB;CAuH/B"}
|
|
@@ -3,20 +3,53 @@ import path from 'path';
|
|
|
3
3
|
import { spawn } from 'child_process';
|
|
4
4
|
import { CONFIG, resolveConfigPath } from '../lib/config.js';
|
|
5
5
|
import { getLastSessionId, saveSessionId } from '../lib/sessions.js';
|
|
6
|
+
import { interpolateEnvVars } from '../lib/envUtils.js';
|
|
7
|
+
import { withSpan } from '../lib/telemetry.js';
|
|
8
|
+
import pino from 'pino';
|
|
9
|
+
import { registerProcess, appendOutput, updateProcessStatus, } from '../lib/processRegistry.js';
|
|
10
|
+
const logger = pino({ name: 'OpenCodeRunner' });
|
|
6
11
|
export class OpenCodeRunner {
|
|
7
12
|
config;
|
|
8
13
|
timeoutMs;
|
|
14
|
+
tempFiles = [];
|
|
15
|
+
MAX_BUF = 10 * 1024 * 1024; // 10MB
|
|
9
16
|
constructor() {
|
|
10
17
|
this.config = CONFIG.CLAUDE;
|
|
11
|
-
this.timeoutMs = CONFIG.TIMEOUT_MS ||
|
|
18
|
+
this.timeoutMs = CONFIG.TIMEOUT_MS || 900000;
|
|
19
|
+
}
|
|
20
|
+
cleanupTempFiles() {
|
|
21
|
+
for (const tempFile of this.tempFiles) {
|
|
22
|
+
try {
|
|
23
|
+
if (fs.existsSync(tempFile)) {
|
|
24
|
+
fs.unlinkSync(tempFile);
|
|
25
|
+
logger.debug({ tempFile }, 'Cleaned up temp file');
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
catch (err) {
|
|
29
|
+
logger.warn({ tempFile, error: err }, 'Failed to cleanup temp file');
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
this.tempFiles = [];
|
|
12
33
|
}
|
|
13
34
|
async runAgent(options) {
|
|
35
|
+
return withSpan('opencode.runAgent', async (span) => {
|
|
36
|
+
span.setAttribute('agentName', options.agentName || '');
|
|
37
|
+
span.setAttribute('runner', 'opencode');
|
|
38
|
+
const result = await this.runAgentInternal(options);
|
|
39
|
+
this.cleanupTempFiles();
|
|
40
|
+
if (options.agentName && result.sessionId) {
|
|
41
|
+
await saveSessionId(options.agentName, result.sessionId, options.configPath, 'opencode');
|
|
42
|
+
}
|
|
43
|
+
return result;
|
|
44
|
+
}, { agentName: options.agentName || '', runner: 'opencode' });
|
|
45
|
+
}
|
|
46
|
+
async runAgentInternal(options) {
|
|
14
47
|
const { prompt, agentName, autoResume } = options;
|
|
15
48
|
let { sessionId } = options;
|
|
16
49
|
const { PATHS } = this.config;
|
|
17
50
|
// --- Auto Resume ---
|
|
18
51
|
if (autoResume && agentName && !sessionId) {
|
|
19
|
-
const lastId = await getLastSessionId(agentName);
|
|
52
|
+
const lastId = await getLastSessionId(agentName, options.configPath, 'opencode');
|
|
20
53
|
if (lastId) {
|
|
21
54
|
sessionId = lastId;
|
|
22
55
|
}
|
|
@@ -25,16 +58,18 @@ export class OpenCodeRunner {
|
|
|
25
58
|
// --- Isolation ---
|
|
26
59
|
if (agentName) {
|
|
27
60
|
try {
|
|
28
|
-
const agentSettingsPath = resolveConfigPath(path.join(path.dirname(PATHS.SETTINGS), `settings_${agentName}.json`));
|
|
61
|
+
const agentSettingsPath = resolveConfigPath(path.join(path.dirname(PATHS.SETTINGS), `settings_${agentName}.json`), options.configPath);
|
|
29
62
|
if (fs.existsSync(agentSettingsPath)) {
|
|
30
|
-
|
|
63
|
+
let settings = JSON.parse(fs.readFileSync(agentSettingsPath, 'utf8'));
|
|
64
|
+
// --- New interpolation logic ---
|
|
65
|
+
settings = interpolateEnvVars(settings);
|
|
31
66
|
if (settings.env && settings.env.AGENT_TIMEOUT_MS) {
|
|
32
67
|
customTimeoutMs = parseInt(settings.env.AGENT_TIMEOUT_MS, 10) || customTimeoutMs;
|
|
33
68
|
}
|
|
34
69
|
}
|
|
35
70
|
}
|
|
36
|
-
catch (
|
|
37
|
-
|
|
71
|
+
catch (err) {
|
|
72
|
+
logger.warn({ agentName, error: err }, 'Failed to load agent settings');
|
|
38
73
|
}
|
|
39
74
|
}
|
|
40
75
|
// OpenCode CLI: `opencode run "prompt"` for non-interactive execution
|
|
@@ -45,7 +80,7 @@ export class OpenCodeRunner {
|
|
|
45
80
|
const isWin = process.platform === 'win32';
|
|
46
81
|
const command = isWin ? 'opencode.exe' : 'opencode';
|
|
47
82
|
const child = spawn(command, argsSpawn, {
|
|
48
|
-
cwd: process.cwd(),
|
|
83
|
+
cwd: options.cwd || process.cwd(),
|
|
49
84
|
shell: isWin,
|
|
50
85
|
windowsHide: true,
|
|
51
86
|
env: {
|
|
@@ -53,23 +88,56 @@ export class OpenCodeRunner {
|
|
|
53
88
|
...(agentName ? { OVERMIND_AGENT_NAME: agentName } : {}),
|
|
54
89
|
},
|
|
55
90
|
});
|
|
91
|
+
if (child.pid) {
|
|
92
|
+
void registerProcess(child.pid, { agentName: agentName || '', runner: 'opencode', configPath: options.configPath });
|
|
93
|
+
}
|
|
56
94
|
let stdout = '';
|
|
57
95
|
let stderr = '';
|
|
96
|
+
let hardTimeoutTimer = null;
|
|
97
|
+
const cleanup = () => {
|
|
98
|
+
child.stdout?.removeAllListeners();
|
|
99
|
+
child.stderr?.removeAllListeners();
|
|
100
|
+
child.removeAllListeners();
|
|
101
|
+
if (hardTimeoutTimer)
|
|
102
|
+
clearTimeout(hardTimeoutTimer);
|
|
103
|
+
};
|
|
58
104
|
if (child.stdout)
|
|
59
|
-
child.stdout.on('data', (d) =>
|
|
105
|
+
child.stdout.on('data', (d) => {
|
|
106
|
+
const chunk = d.toString();
|
|
107
|
+
if (child.pid)
|
|
108
|
+
void appendOutput(child.pid, chunk, options.configPath);
|
|
109
|
+
if (stdout.length + d.length > this.MAX_BUF)
|
|
110
|
+
stdout = stdout.slice(-this.MAX_BUF);
|
|
111
|
+
else
|
|
112
|
+
stdout += chunk;
|
|
113
|
+
});
|
|
60
114
|
if (child.stderr)
|
|
61
|
-
child.stderr.on('data', (d) =>
|
|
115
|
+
child.stderr.on('data', (d) => {
|
|
116
|
+
if (stderr.length + d.length > this.MAX_BUF)
|
|
117
|
+
stderr = stderr.slice(-this.MAX_BUF);
|
|
118
|
+
else
|
|
119
|
+
stderr += d.toString();
|
|
120
|
+
});
|
|
62
121
|
const timeout = setTimeout(() => {
|
|
63
|
-
child.kill();
|
|
122
|
+
child.kill('SIGTERM');
|
|
123
|
+
hardTimeoutTimer = setTimeout(() => {
|
|
124
|
+
if (!child.killed)
|
|
125
|
+
child.kill('SIGKILL');
|
|
126
|
+
}, 5000);
|
|
127
|
+
cleanup();
|
|
128
|
+
if (child.pid)
|
|
129
|
+
void updateProcessStatus(child.pid, 'failed', null, options.configPath);
|
|
64
130
|
resolve({ result: '', error: 'TIMEOUT', rawOutput: stdout });
|
|
65
131
|
}, customTimeoutMs);
|
|
66
132
|
child.on('close', async (code) => {
|
|
67
133
|
clearTimeout(timeout);
|
|
134
|
+
if (child.pid)
|
|
135
|
+
void updateProcessStatus(child.pid, code === 0 ? 'done' : 'failed', code, options.configPath);
|
|
68
136
|
if (code !== 0 && !stdout) {
|
|
69
137
|
return resolve({ result: '', error: `EXIT_CODE_${code}`, rawOutput: stderr });
|
|
70
138
|
}
|
|
71
139
|
if (agentName && sessionId) {
|
|
72
|
-
await saveSessionId(agentName, sessionId);
|
|
140
|
+
await saveSessionId(agentName, sessionId, options.configPath, 'opencode');
|
|
73
141
|
}
|
|
74
142
|
resolve({
|
|
75
143
|
result: stdout.trim(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenCodeRunner.js","sourceRoot":"","sources":["../../src/services/OpenCodeRunner.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":"OpenCodeRunner.js","sourceRoot":"","sources":["../../src/services/OpenCodeRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,15 +1,18 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
2
|
export declare const configExampleSchema: z.ZodObject<{
|
|
3
3
|
provider: z.ZodEnum<{
|
|
4
|
+
ilmu: "ilmu";
|
|
4
5
|
glm: "glm";
|
|
5
6
|
minimax: "minimax";
|
|
6
7
|
openrouter: "openrouter";
|
|
8
|
+
overmind: "overmind";
|
|
9
|
+
minimaxi: "minimaxi";
|
|
7
10
|
}>;
|
|
8
|
-
}, z.core.$
|
|
11
|
+
}, z.core.$loose>;
|
|
9
12
|
export declare function configExample(args: z.infer<typeof configExampleSchema>): Promise<{
|
|
10
|
-
content:
|
|
11
|
-
type:
|
|
13
|
+
content: {
|
|
14
|
+
type: "text";
|
|
12
15
|
text: string;
|
|
13
|
-
}
|
|
16
|
+
}[];
|
|
14
17
|
}>;
|
|
15
18
|
//# sourceMappingURL=config_example.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config_example.d.ts","sourceRoot":"","sources":["../../src/tools/config_example.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,mBAAmB
|
|
1
|
+
{"version":3,"file":"config_example.d.ts","sourceRoot":"","sources":["../../src/tools/config_example.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,mBAAmB;;;;;;;;;iBAMhB,CAAC;AAEjB,wBAAsB,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,mBAAmB,CAAC;;;;;GA4Q5E"}
|