overmind-mcp 0.0.2-alpha
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/LICENSE +21 -0
- package/README.md +137 -0
- package/assets/overmind_core_closeup.png +0 -0
- package/assets/overmind_mcp_banner.png +0 -0
- package/assets/overmind_mcp_banner_slim.png +0 -0
- package/assets/overmind_mcp_final_banner.png +0 -0
- package/assets/overmind_mcp_pro_banner.png +0 -0
- package/assets/overmind_mcp_pro_banner_v2.png +0 -0
- package/assets/overmind_mcp_pro_banner_v3.png +0 -0
- package/assets/terminal_preview.png +0 -0
- package/dist/bin/cli.d.ts +3 -0
- package/dist/bin/cli.d.ts.map +1 -0
- package/dist/bin/cli.js +481 -0
- package/dist/bin/cli.js.map +1 -0
- package/dist/index.d.ts +8 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +8 -0
- package/dist/index.js.map +1 -0
- package/dist/lib/InstallHelper.d.ts +14 -0
- package/dist/lib/InstallHelper.d.ts.map +1 -0
- package/dist/lib/InstallHelper.js +113 -0
- package/dist/lib/InstallHelper.js.map +1 -0
- package/dist/lib/config.d.ts +58 -0
- package/dist/lib/config.d.ts.map +1 -0
- package/dist/lib/config.js +110 -0
- package/dist/lib/config.js.map +1 -0
- package/dist/lib/envUtils.d.ts +10 -0
- package/dist/lib/envUtils.d.ts.map +1 -0
- package/dist/lib/envUtils.js +24 -0
- package/dist/lib/envUtils.js.map +1 -0
- 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/logger.d.ts +8 -0
- package/dist/lib/logger.d.ts.map +1 -0
- package/dist/lib/logger.js +81 -0
- package/dist/lib/logger.js.map +1 -0
- package/dist/lib/modelMapping.d.ts +18 -0
- package/dist/lib/modelMapping.d.ts.map +1 -0
- package/dist/lib/modelMapping.js +88 -0
- package/dist/lib/modelMapping.js.map +1 -0
- package/dist/lib/sessions.d.ts +4 -0
- package/dist/lib/sessions.d.ts.map +1 -0
- package/dist/lib/sessions.js +108 -0
- package/dist/lib/sessions.js.map +1 -0
- package/dist/memory/MemoryFactory.d.ts +11 -0
- package/dist/memory/MemoryFactory.d.ts.map +1 -0
- package/dist/memory/MemoryFactory.js +19 -0
- package/dist/memory/MemoryFactory.js.map +1 -0
- package/dist/memory/PostgresMemoryProvider.d.ts +29 -0
- package/dist/memory/PostgresMemoryProvider.d.ts.map +1 -0
- package/dist/memory/PostgresMemoryProvider.js +372 -0
- package/dist/memory/PostgresMemoryProvider.js.map +1 -0
- package/dist/memory/types.d.ts +70 -0
- package/dist/memory/types.d.ts.map +1 -0
- package/dist/memory/types.js +2 -0
- package/dist/memory/types.js.map +1 -0
- package/dist/prompts/agent_prompts.d.ts +2 -0
- package/dist/prompts/agent_prompts.d.ts.map +1 -0
- package/dist/prompts/agent_prompts.js +21 -0
- package/dist/prompts/agent_prompts.js.map +1 -0
- package/dist/server.d.ts +3 -0
- package/dist/server.d.ts.map +1 -0
- package/dist/server.js +174 -0
- package/dist/server.js.map +1 -0
- package/dist/services/AgentManager.d.ts +28 -0
- package/dist/services/AgentManager.d.ts.map +1 -0
- package/dist/services/AgentManager.js +393 -0
- package/dist/services/AgentManager.js.map +1 -0
- package/dist/services/ClaudeRunner.d.ts +27 -0
- package/dist/services/ClaudeRunner.d.ts.map +1 -0
- package/dist/services/ClaudeRunner.js +426 -0
- package/dist/services/ClaudeRunner.js.map +1 -0
- package/dist/services/ClineRunner.d.ts +23 -0
- package/dist/services/ClineRunner.d.ts.map +1 -0
- package/dist/services/ClineRunner.js +95 -0
- package/dist/services/ClineRunner.js.map +1 -0
- package/dist/services/GeminiRunner.d.ts +23 -0
- package/dist/services/GeminiRunner.d.ts.map +1 -0
- package/dist/services/GeminiRunner.js +236 -0
- package/dist/services/GeminiRunner.js.map +1 -0
- package/dist/services/KiloRunner.d.ts +32 -0
- package/dist/services/KiloRunner.d.ts.map +1 -0
- package/dist/services/KiloRunner.js +413 -0
- package/dist/services/KiloRunner.js.map +1 -0
- package/dist/services/NousHermesRunner.d.ts +24 -0
- package/dist/services/NousHermesRunner.d.ts.map +1 -0
- package/dist/services/NousHermesRunner.js +318 -0
- package/dist/services/NousHermesRunner.js.map +1 -0
- package/dist/services/OpenClawRunner.d.ts +22 -0
- package/dist/services/OpenClawRunner.d.ts.map +1 -0
- package/dist/services/OpenClawRunner.js +89 -0
- package/dist/services/OpenClawRunner.js.map +1 -0
- package/dist/services/OpenCodeRunner.d.ts +22 -0
- package/dist/services/OpenCodeRunner.d.ts.map +1 -0
- package/dist/services/OpenCodeRunner.js +91 -0
- package/dist/services/OpenCodeRunner.js.map +1 -0
- package/dist/services/PromptManager.d.ts +16 -0
- package/dist/services/PromptManager.d.ts.map +1 -0
- package/dist/services/PromptManager.js +54 -0
- package/dist/services/PromptManager.js.map +1 -0
- package/dist/services/QwenCliRunner.d.ts +22 -0
- package/dist/services/QwenCliRunner.d.ts.map +1 -0
- package/dist/services/QwenCliRunner.js +90 -0
- package/dist/services/QwenCliRunner.js.map +1 -0
- package/dist/tools/config_example.d.ts +18 -0
- package/dist/tools/config_example.d.ts.map +1 -0
- package/dist/tools/config_example.js +253 -0
- package/dist/tools/config_example.js.map +1 -0
- package/dist/tools/create_agent.d.ts +41 -0
- package/dist/tools/create_agent.d.ts.map +1 -0
- package/dist/tools/create_agent.js +75 -0
- package/dist/tools/create_agent.js.map +1 -0
- package/dist/tools/get_agent_configs.d.ts +18 -0
- package/dist/tools/get_agent_configs.d.ts.map +1 -0
- package/dist/tools/get_agent_configs.js +43 -0
- package/dist/tools/get_agent_configs.js.map +1 -0
- package/dist/tools/initialization_check.d.ts +2 -0
- package/dist/tools/initialization_check.d.ts.map +1 -0
- package/dist/tools/initialization_check.js +23 -0
- package/dist/tools/initialization_check.js.map +1 -0
- package/dist/tools/manage_agents.d.ts +80 -0
- package/dist/tools/manage_agents.d.ts.map +1 -0
- package/dist/tools/manage_agents.js +161 -0
- package/dist/tools/manage_agents.js.map +1 -0
- package/dist/tools/manage_prompts.d.ts +30 -0
- package/dist/tools/manage_prompts.d.ts.map +1 -0
- package/dist/tools/manage_prompts.js +64 -0
- package/dist/tools/manage_prompts.js.map +1 -0
- package/dist/tools/memory_runs.d.ts +14 -0
- package/dist/tools/memory_runs.d.ts.map +1 -0
- package/dist/tools/memory_runs.js +77 -0
- package/dist/tools/memory_runs.js.map +1 -0
- package/dist/tools/memory_search.d.ts +14 -0
- package/dist/tools/memory_search.d.ts.map +1 -0
- package/dist/tools/memory_search.js +46 -0
- package/dist/tools/memory_search.js.map +1 -0
- package/dist/tools/memory_store.d.ts +26 -0
- package/dist/tools/memory_store.d.ts.map +1 -0
- package/dist/tools/memory_store.js +46 -0
- package/dist/tools/memory_store.js.map +1 -0
- package/dist/tools/metadata.d.ts +20 -0
- package/dist/tools/metadata.d.ts.map +1 -0
- package/dist/tools/metadata.js +240 -0
- package/dist/tools/metadata.js.map +1 -0
- package/dist/tools/run_agent.d.ts +30 -0
- package/dist/tools/run_agent.d.ts.map +1 -0
- package/dist/tools/run_agent.js +80 -0
- package/dist/tools/run_agent.js.map +1 -0
- package/dist/tools/run_agent_cli.d.ts +21 -0
- package/dist/tools/run_agent_cli.d.ts.map +1 -0
- package/dist/tools/run_agent_cli.js +129 -0
- package/dist/tools/run_agent_cli.js.map +1 -0
- package/dist/tools/run_agents_parallel.d.ts +34 -0
- package/dist/tools/run_agents_parallel.d.ts.map +1 -0
- package/dist/tools/run_agents_parallel.js +104 -0
- package/dist/tools/run_agents_parallel.js.map +1 -0
- package/dist/tools/run_claude.d.ts +19 -0
- package/dist/tools/run_claude.d.ts.map +1 -0
- package/dist/tools/run_claude.js +99 -0
- package/dist/tools/run_claude.js.map +1 -0
- package/dist/tools/run_cline.d.ts +28 -0
- package/dist/tools/run_cline.d.ts.map +1 -0
- package/dist/tools/run_cline.js +77 -0
- package/dist/tools/run_cline.js.map +1 -0
- package/dist/tools/run_gemini.d.ts +24 -0
- package/dist/tools/run_gemini.d.ts.map +1 -0
- package/dist/tools/run_gemini.js +81 -0
- package/dist/tools/run_gemini.js.map +1 -0
- package/dist/tools/run_hermes.d.ts +25 -0
- package/dist/tools/run_hermes.d.ts.map +1 -0
- package/dist/tools/run_hermes.js +93 -0
- package/dist/tools/run_hermes.js.map +1 -0
- package/dist/tools/run_kilo.d.ts +32 -0
- package/dist/tools/run_kilo.d.ts.map +1 -0
- package/dist/tools/run_kilo.js +92 -0
- package/dist/tools/run_kilo.js.map +1 -0
- package/dist/tools/run_openclaw.d.ts +24 -0
- package/dist/tools/run_openclaw.d.ts.map +1 -0
- package/dist/tools/run_openclaw.js +74 -0
- package/dist/tools/run_openclaw.js.map +1 -0
- package/dist/tools/run_opencode.d.ts +24 -0
- package/dist/tools/run_opencode.d.ts.map +1 -0
- package/dist/tools/run_opencode.js +74 -0
- package/dist/tools/run_opencode.js.map +1 -0
- package/dist/tools/run_qwencli.d.ts +24 -0
- package/dist/tools/run_qwencli.d.ts.map +1 -0
- package/dist/tools/run_qwencli.js +59 -0
- package/dist/tools/run_qwencli.js.map +1 -0
- package/package.json +86 -0
|
@@ -0,0 +1,318 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { spawn } from 'child_process';
|
|
4
|
+
import { CONFIG, resolveConfigPath } from '../lib/config.js';
|
|
5
|
+
import { getLastSessionId } from '../lib/sessions.js';
|
|
6
|
+
import { interpolateEnvVars } from '../lib/envUtils.js';
|
|
7
|
+
import { resolveKiloModel } from '../lib/modelMapping.js';
|
|
8
|
+
export class NousHermesRunner {
|
|
9
|
+
timeoutMs;
|
|
10
|
+
constructor() {
|
|
11
|
+
this.timeoutMs = CONFIG.TIMEOUT_MS || 900000; // 15 min default
|
|
12
|
+
}
|
|
13
|
+
async runAgent(options) {
|
|
14
|
+
const { prompt, agentName, autoResume, silent } = options;
|
|
15
|
+
let { sessionId } = options;
|
|
16
|
+
// --- Auto Resume ---
|
|
17
|
+
if (autoResume && agentName && !sessionId) {
|
|
18
|
+
const lastId = await getLastSessionId(agentName, options.configPath, 'hermes');
|
|
19
|
+
if (lastId) {
|
|
20
|
+
sessionId = lastId;
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
const agentCustomEnv = {
|
|
24
|
+
...process.env,
|
|
25
|
+
PYTHONIOENCODING: 'utf-8',
|
|
26
|
+
PYTHONUTF8: '1',
|
|
27
|
+
PYTHONUNBUFFERED: '1',
|
|
28
|
+
PYTHONLEGACYWINDOWSSTDIO: '1',
|
|
29
|
+
TERM: 'emacs',
|
|
30
|
+
PROMPT_TOOLKIT_NO_INTERACTIVE: '1',
|
|
31
|
+
// Force non-interactive for prompt_toolkit
|
|
32
|
+
ANSICON: '1',
|
|
33
|
+
// Map OpenRouter key if needed
|
|
34
|
+
OPENROUTER_API_KEY: process.env.OPENROUTER_API_KEY || process.env.OVERMIND_EMBEDDING_KEY,
|
|
35
|
+
// Map NVIDIA NIM key
|
|
36
|
+
NVIDIA_API_KEY: process.env.NVIDIA_API_KEY || process.env.NVAPI_KEY,
|
|
37
|
+
NVIDIA_API_BASE: process.env.NVIDIA_API_BASE || 'https://integrate.api.nvidia.com/v1',
|
|
38
|
+
...(agentName ? { OVERMIND_AGENT_NAME: agentName } : {}),
|
|
39
|
+
};
|
|
40
|
+
const debugLogs = [];
|
|
41
|
+
// --- Isolation / Settings / Prompt ---
|
|
42
|
+
const overmindHermesPath = path.resolve(process.cwd(), '.overmind', 'hermes', agentName ? `agent_${agentName}` : 'central');
|
|
43
|
+
const overmindHermesSubPath = path.join(overmindHermesPath, '.hermes');
|
|
44
|
+
if (!fs.existsSync(overmindHermesSubPath)) {
|
|
45
|
+
fs.mkdirSync(overmindHermesSubPath, { recursive: true });
|
|
46
|
+
}
|
|
47
|
+
// On définit l'environnement pour Hermes
|
|
48
|
+
// IMPORTANT: HERMES_HOME doit pointer vers le dossier contenant config.yaml
|
|
49
|
+
agentCustomEnv.HERMES_HOME = overmindHermesSubPath;
|
|
50
|
+
if (process.platform === 'win32') {
|
|
51
|
+
agentCustomEnv.USERPROFILE = overmindHermesPath;
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
agentCustomEnv.HOME = overmindHermesPath;
|
|
55
|
+
}
|
|
56
|
+
let systemPrompt = '';
|
|
57
|
+
if (agentName) {
|
|
58
|
+
try {
|
|
59
|
+
const settingsDir = path.dirname(CONFIG.CLAUDE.PATHS.SETTINGS);
|
|
60
|
+
const agentSettingsPath = resolveConfigPath(path.join(settingsDir, `settings_${agentName}.json`), options.configPath);
|
|
61
|
+
if (!fs.existsSync(agentSettingsPath)) {
|
|
62
|
+
// Lister les agents disponibles pour aider au debugging
|
|
63
|
+
let availableAgents = [];
|
|
64
|
+
try {
|
|
65
|
+
const files = fs.readdirSync(settingsDir);
|
|
66
|
+
availableAgents = files
|
|
67
|
+
.filter((f) => f.startsWith('settings_') && f.endsWith('.json'))
|
|
68
|
+
.map((f) => f.replace('settings_', '').replace('.json', ''));
|
|
69
|
+
}
|
|
70
|
+
catch (e) {
|
|
71
|
+
console.error(`[NousHermesRunner] ⚠️ Error reading settings directory: ${e}`);
|
|
72
|
+
}
|
|
73
|
+
return {
|
|
74
|
+
result: '',
|
|
75
|
+
error: `INVALID_AGENT: Agent Hermes "${agentName}" non trouvé.
|
|
76
|
+
Veuillez utiliser 'create_agent' au préalable.
|
|
77
|
+
Fichier attendu: ${agentSettingsPath}
|
|
78
|
+
${availableAgents.length > 0 ? `Agents disponibles: ${availableAgents.join(', ')}` : 'Aucun agent disponible'}
|
|
79
|
+
`
|
|
80
|
+
.replace(/\s+/g, ' ')
|
|
81
|
+
.trim(),
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
const settings = JSON.parse(fs.readFileSync(agentSettingsPath, 'utf8'));
|
|
85
|
+
if (!options.model && settings.model) {
|
|
86
|
+
options.model = settings.model;
|
|
87
|
+
}
|
|
88
|
+
if (!options.model && settings.env?.ANTHROPIC_MODEL) {
|
|
89
|
+
options.model = settings.env.ANTHROPIC_MODEL;
|
|
90
|
+
}
|
|
91
|
+
if (settings.env) {
|
|
92
|
+
// Fusion intelligente : préserver les clés critiques (API keys)
|
|
93
|
+
const criticalKeys = [
|
|
94
|
+
'OPENROUTER_API_KEY',
|
|
95
|
+
'NVIDIA_API_KEY',
|
|
96
|
+
'NVIDIA_API_BASE',
|
|
97
|
+
'OVERMIND_EMBEDDING_KEY',
|
|
98
|
+
'OPENAI_API_KEY',
|
|
99
|
+
'OPENAI_API_BASE',
|
|
100
|
+
'OPENAI_BASE_URL',
|
|
101
|
+
'MISTRAL_API_KEY',
|
|
102
|
+
'MISTRAL_API_KEY_2',
|
|
103
|
+
'MISTRAL_API_KEY_3',
|
|
104
|
+
'MISTRAL_API_KEY_4',
|
|
105
|
+
'MISTRAL_API_KEY_5',
|
|
106
|
+
'MISTRAL_API_KEY_6',
|
|
107
|
+
'MISTRAL_API_KEY_7',
|
|
108
|
+
];
|
|
109
|
+
let envCopy = { ...settings.env };
|
|
110
|
+
// --- ENV VARIABLE SUBSTITUTION ($VAR_NAME) ---
|
|
111
|
+
envCopy = interpolateEnvVars(envCopy);
|
|
112
|
+
for (const key of criticalKeys) {
|
|
113
|
+
if (agentCustomEnv[key] && !envCopy[key]) {
|
|
114
|
+
envCopy[key] = agentCustomEnv[key];
|
|
115
|
+
}
|
|
116
|
+
}
|
|
117
|
+
Object.assign(agentCustomEnv, envCopy);
|
|
118
|
+
}
|
|
119
|
+
// --- Load System Prompt (agents/agentName.md) ---
|
|
120
|
+
const agentPromptPath = resolveConfigPath(path.join(path.dirname(settingsDir), 'agents', `${agentName}.md`), options.configPath);
|
|
121
|
+
if (fs.existsSync(agentPromptPath)) {
|
|
122
|
+
systemPrompt = fs.readFileSync(agentPromptPath, 'utf8');
|
|
123
|
+
}
|
|
124
|
+
// --- MCP Config Translation (JSON -> YAML for Hermes) ---
|
|
125
|
+
const agentMcpPath = resolveConfigPath(path.join(path.dirname(settingsDir), `.mcp.${agentName}.json`), options.configPath);
|
|
126
|
+
if (fs.existsSync(agentMcpPath)) {
|
|
127
|
+
try {
|
|
128
|
+
const mcpConfig = JSON.parse(fs.readFileSync(agentMcpPath, 'utf8'));
|
|
129
|
+
const hermesConfigDir = overmindHermesSubPath;
|
|
130
|
+
if (!fs.existsSync(hermesConfigDir))
|
|
131
|
+
fs.mkdirSync(hermesConfigDir, { recursive: true });
|
|
132
|
+
const mcpJsonPath = path.join(hermesConfigDir, 'mcp.json');
|
|
133
|
+
const configYamlPath = path.join(hermesConfigDir, 'config.yaml');
|
|
134
|
+
// Helper pour convertir le format MCP JSON vers le format mcp.json Hermes (identique à Claude Desktop)
|
|
135
|
+
fs.writeFileSync(mcpJsonPath, JSON.stringify(mcpConfig, null, 2), 'utf8');
|
|
136
|
+
// Generer aussi config.yaml (format snake_case attendu par Hermes)
|
|
137
|
+
let yamlContent = 'mcp_servers:\n';
|
|
138
|
+
for (const [name, server] of Object.entries(mcpConfig.mcpServers || {})) {
|
|
139
|
+
const s = server;
|
|
140
|
+
yamlContent += ` ${name}:\n`;
|
|
141
|
+
if (s.command)
|
|
142
|
+
yamlContent += ` command: "${s.command}"\n`;
|
|
143
|
+
if (s.args && Array.isArray(s.args)) {
|
|
144
|
+
yamlContent += ` args:\n`;
|
|
145
|
+
for (const arg of s.args) {
|
|
146
|
+
yamlContent += ` - "${String(arg).replace(/"/g, '\\"')}"\n`;
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
if (s.env && typeof s.env === 'object') {
|
|
150
|
+
yamlContent += ` env:\n`;
|
|
151
|
+
for (const [k, v] of Object.entries(s.env)) {
|
|
152
|
+
yamlContent += ` ${k}: "${String(v).replace(/"/g, '\\"')}"\n`;
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
if (s.url)
|
|
156
|
+
yamlContent += ` url: "${s.url}"\n`;
|
|
157
|
+
}
|
|
158
|
+
fs.writeFileSync(configYamlPath, yamlContent, 'utf8');
|
|
159
|
+
if (!silent)
|
|
160
|
+
console.error(`[NousHermesRunner] 🛠️ Hermes configs (mcp.json & config.yaml) generated in ${hermesConfigDir}`);
|
|
161
|
+
}
|
|
162
|
+
catch (err) {
|
|
163
|
+
console.error(`[NousHermesRunner] ❌ Error translating MCP config: ${err}`);
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
catch (e) {
|
|
168
|
+
if (e instanceof Error && e.message?.includes('INVALID_AGENT'))
|
|
169
|
+
throw e;
|
|
170
|
+
console.error(`[NousHermesRunner] ⚠️ Error processing agent settings: ${e}`);
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
// --- CLI Arguments & Prompt Handling ---
|
|
174
|
+
const finalPrompt = systemPrompt ? `${systemPrompt}\n\n[USER QUERY]:\n${prompt}` : prompt;
|
|
175
|
+
// Nettoyer les sauts de ligne pour l'argument CLI (-q ne supporte pas les \n)
|
|
176
|
+
const cliPrompt = finalPrompt.replace(/\n+/g, ' ').trim();
|
|
177
|
+
// Check command line length (Windows limit 8191)
|
|
178
|
+
if (cliPrompt.length > 7000) {
|
|
179
|
+
console.warn(`[NousHermesRunner] ⚠️ Prompt is very long (${cliPrompt.length} chars). This might fail on Windows.`);
|
|
180
|
+
}
|
|
181
|
+
// En version 0.11.0, on simplifie pour éviter les erreurs d'arguments
|
|
182
|
+
const cleanArgs = ['chat', '-q', cliPrompt, '--source', 'tool', '-Q'];
|
|
183
|
+
if (!silent)
|
|
184
|
+
cleanArgs.push('-v');
|
|
185
|
+
// --- Model & Provider selection ---
|
|
186
|
+
const DEFAULT_MODEL = 'tencent/hy3-preview:free'; // Modèle OpenRouter gratuit
|
|
187
|
+
const originalModel = options.model || DEFAULT_MODEL;
|
|
188
|
+
const model = resolveKiloModel(originalModel);
|
|
189
|
+
const isNvidiaModel = model.includes('deepseek') || model.includes('nvidia');
|
|
190
|
+
const hasNvidiaKey = !!(agentCustomEnv.NVIDIA_API_KEY || agentCustomEnv.NVAPI_KEY);
|
|
191
|
+
const lowModel = model.toLowerCase();
|
|
192
|
+
const isOpenAIModel = lowModel.includes('gpt') ||
|
|
193
|
+
lowModel.includes('o1') ||
|
|
194
|
+
lowModel.includes('o3') ||
|
|
195
|
+
lowModel.includes('minimax') ||
|
|
196
|
+
lowModel.includes('glm');
|
|
197
|
+
const hasOpenAIKey = !!agentCustomEnv.OPENAI_API_KEY;
|
|
198
|
+
const isMistralModel = model.includes('mistral') || model.includes('codestral') || model.includes('devstral');
|
|
199
|
+
const hasMistralKey = !!agentCustomEnv.MISTRAL_API_KEY;
|
|
200
|
+
cleanArgs.push('--model', model);
|
|
201
|
+
if (isOpenAIModel && hasOpenAIKey) {
|
|
202
|
+
if (!silent)
|
|
203
|
+
console.error(`[NousHermesRunner] 🤖 Using OpenAI for ${model}`);
|
|
204
|
+
cleanArgs.push('--provider', 'openai');
|
|
205
|
+
// Nettoyage des clés conflictuelles
|
|
206
|
+
delete agentCustomEnv.OPENROUTER_API_KEY;
|
|
207
|
+
delete agentCustomEnv.NVIDIA_API_KEY;
|
|
208
|
+
delete agentCustomEnv.NVAPI_KEY;
|
|
209
|
+
// Map OPENAI_BASE_URL if present to OPENAI_API_BASE if needed by some tools
|
|
210
|
+
if (agentCustomEnv.OPENAI_BASE_URL && !agentCustomEnv.OPENAI_API_BASE) {
|
|
211
|
+
agentCustomEnv.OPENAI_API_BASE = agentCustomEnv.OPENAI_BASE_URL;
|
|
212
|
+
}
|
|
213
|
+
}
|
|
214
|
+
else if (isMistralModel && hasMistralKey) {
|
|
215
|
+
if (!silent)
|
|
216
|
+
console.error(`[NousHermesRunner] 🌪️ Using Mistral for ${model}`);
|
|
217
|
+
debugLogs.push(`🌪️ Using Mistral provider for ${model}`);
|
|
218
|
+
cleanArgs.push('--provider', 'mistral');
|
|
219
|
+
// Nettoyage des clés conflictuelles
|
|
220
|
+
delete agentCustomEnv.OPENROUTER_API_KEY;
|
|
221
|
+
delete agentCustomEnv.NVIDIA_API_KEY;
|
|
222
|
+
delete agentCustomEnv.NVAPI_KEY;
|
|
223
|
+
delete agentCustomEnv.OPENAI_API_KEY;
|
|
224
|
+
}
|
|
225
|
+
else if (isNvidiaModel && hasNvidiaKey) {
|
|
226
|
+
if (!silent)
|
|
227
|
+
console.error(`[NousHermesRunner] 🎯 Using NVIDIA NIM for ${model}`);
|
|
228
|
+
debugLogs.push(`🎯 Using NVIDIA NIM for ${model}`);
|
|
229
|
+
cleanArgs.push('--provider', 'nvidia');
|
|
230
|
+
}
|
|
231
|
+
else {
|
|
232
|
+
// Fallback OpenRouter pour tout le reste ou si clé NIM manquante
|
|
233
|
+
if (!silent)
|
|
234
|
+
console.error(`[NousHermesRunner] 🌐 Using OpenRouter for ${model}`);
|
|
235
|
+
debugLogs.push(`🌐 Using OpenRouter for ${model} (isMistral: ${isMistralModel}, hasKey: ${hasMistralKey})`);
|
|
236
|
+
cleanArgs.push('--provider', 'openrouter');
|
|
237
|
+
}
|
|
238
|
+
// --- OS Specific Spawn ---
|
|
239
|
+
const spawnCommand = 'C:\\Users\\Deamon\\AppData\\Local\\Programs\\Python\\Python312\\Scripts\\hermes.exe';
|
|
240
|
+
if (!silent) {
|
|
241
|
+
console.error(`[NousHermesRunner] 🚀 Starting Hermes Agent: ${spawnCommand} ${cleanArgs.join(' ')}`);
|
|
242
|
+
}
|
|
243
|
+
return new Promise((resolve) => {
|
|
244
|
+
let resolved = false;
|
|
245
|
+
const safeResolve = (value) => {
|
|
246
|
+
if (!resolved) {
|
|
247
|
+
resolved = true;
|
|
248
|
+
resolve(value);
|
|
249
|
+
}
|
|
250
|
+
};
|
|
251
|
+
const child = spawn(spawnCommand, cleanArgs, {
|
|
252
|
+
cwd: options.cwd || process.cwd(),
|
|
253
|
+
shell: true, // TRUE: permet de résoudre via PATH et gère les wrappers Python/Scripts sur Windows
|
|
254
|
+
windowsHide: true,
|
|
255
|
+
env: agentCustomEnv,
|
|
256
|
+
});
|
|
257
|
+
let stdout = '';
|
|
258
|
+
let stderr = '';
|
|
259
|
+
child.stdout?.on('data', (d) => {
|
|
260
|
+
const chunk = d.toString();
|
|
261
|
+
stdout += chunk;
|
|
262
|
+
if (!silent) {
|
|
263
|
+
process.stderr.write(`[Hermes] ${chunk}`);
|
|
264
|
+
}
|
|
265
|
+
});
|
|
266
|
+
child.stderr?.on('data', (d) => {
|
|
267
|
+
const chunk = d.toString();
|
|
268
|
+
stderr += chunk;
|
|
269
|
+
if (!silent) {
|
|
270
|
+
process.stderr.write(`[Hermes:ERR] ${chunk}`);
|
|
271
|
+
}
|
|
272
|
+
});
|
|
273
|
+
const timeout = setTimeout(() => {
|
|
274
|
+
child.kill();
|
|
275
|
+
// Fallback to SIGKILL after 5 seconds if process still running
|
|
276
|
+
setTimeout(() => {
|
|
277
|
+
if (!child.killed) {
|
|
278
|
+
child.kill('SIGKILL');
|
|
279
|
+
}
|
|
280
|
+
}, 5000);
|
|
281
|
+
safeResolve({
|
|
282
|
+
result: stdout.trim(),
|
|
283
|
+
error: 'TIMEOUT',
|
|
284
|
+
rawOutput: stdout + '\n\n' + stderr,
|
|
285
|
+
model,
|
|
286
|
+
nickname: originalModel !== model ? originalModel : undefined,
|
|
287
|
+
});
|
|
288
|
+
}, this.timeoutMs);
|
|
289
|
+
child.on('close', async (code) => {
|
|
290
|
+
clearTimeout(timeout);
|
|
291
|
+
if (code !== 0 && !stdout) {
|
|
292
|
+
return safeResolve({
|
|
293
|
+
result: '',
|
|
294
|
+
error: `EXIT_CODE_${code}`,
|
|
295
|
+
rawOutput: stderr || stdout,
|
|
296
|
+
model,
|
|
297
|
+
nickname: originalModel !== model ? originalModel : undefined,
|
|
298
|
+
});
|
|
299
|
+
}
|
|
300
|
+
safeResolve({
|
|
301
|
+
result: stdout.trim(),
|
|
302
|
+
sessionId: sessionId,
|
|
303
|
+
rawOutput: stdout,
|
|
304
|
+
model,
|
|
305
|
+
nickname: originalModel !== model ? originalModel : undefined,
|
|
306
|
+
});
|
|
307
|
+
});
|
|
308
|
+
child.on('error', (err) => {
|
|
309
|
+
clearTimeout(timeout);
|
|
310
|
+
safeResolve({ result: '', error: `SPAWN_ERROR: ${err.message}`, rawOutput: '' });
|
|
311
|
+
});
|
|
312
|
+
if (child.stdin) {
|
|
313
|
+
child.stdin.end();
|
|
314
|
+
}
|
|
315
|
+
});
|
|
316
|
+
}
|
|
317
|
+
}
|
|
318
|
+
//# sourceMappingURL=NousHermesRunner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"NousHermesRunner.js","sourceRoot":"","sources":["../../src/services/NousHermesRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
export interface RunAgentOptions {
|
|
2
|
+
prompt: string;
|
|
3
|
+
agentName?: string;
|
|
4
|
+
sessionId?: string;
|
|
5
|
+
autoResume?: boolean;
|
|
6
|
+
cwd?: string;
|
|
7
|
+
configPath?: string;
|
|
8
|
+
silent?: boolean;
|
|
9
|
+
}
|
|
10
|
+
export interface RunAgentResult {
|
|
11
|
+
result: string;
|
|
12
|
+
sessionId?: string;
|
|
13
|
+
error?: string;
|
|
14
|
+
rawOutput?: string;
|
|
15
|
+
}
|
|
16
|
+
export declare class OpenClawRunner {
|
|
17
|
+
private config;
|
|
18
|
+
private timeoutMs;
|
|
19
|
+
constructor();
|
|
20
|
+
runAgent(options: RunAgentOptions): Promise<RunAgentResult>;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=OpenClawRunner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OpenClawRunner.d.ts","sourceRoot":"","sources":["../../src/services/OpenClawRunner.ts"],"names":[],"mappings":"AAOA,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;;IAOpB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;CA0FlE"}
|
|
@@ -0,0 +1,89 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { spawn } from 'child_process';
|
|
4
|
+
import { CONFIG, resolveConfigPath } from '../lib/config.js';
|
|
5
|
+
import { getLastSessionId, saveSessionId } from '../lib/sessions.js';
|
|
6
|
+
import { interpolateEnvVars } from '../lib/envUtils.js';
|
|
7
|
+
export class OpenClawRunner {
|
|
8
|
+
config;
|
|
9
|
+
timeoutMs;
|
|
10
|
+
constructor() {
|
|
11
|
+
this.config = CONFIG.CLAUDE;
|
|
12
|
+
this.timeoutMs = CONFIG.TIMEOUT_MS || 900000;
|
|
13
|
+
}
|
|
14
|
+
async runAgent(options) {
|
|
15
|
+
const { prompt, agentName, autoResume } = options;
|
|
16
|
+
let { sessionId } = options;
|
|
17
|
+
const { PATHS } = this.config;
|
|
18
|
+
// --- Auto Resume ---
|
|
19
|
+
if (autoResume && agentName && !sessionId) {
|
|
20
|
+
const lastId = await getLastSessionId(agentName, options.configPath, 'openclaw');
|
|
21
|
+
if (lastId) {
|
|
22
|
+
sessionId = lastId;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
let customTimeoutMs = this.timeoutMs;
|
|
26
|
+
// --- Isolation ---
|
|
27
|
+
if (agentName) {
|
|
28
|
+
try {
|
|
29
|
+
const agentSettingsPath = resolveConfigPath(path.join(path.dirname(PATHS.SETTINGS), `settings_${agentName}.json`), options.configPath);
|
|
30
|
+
if (fs.existsSync(agentSettingsPath)) {
|
|
31
|
+
let settings = JSON.parse(fs.readFileSync(agentSettingsPath, 'utf8'));
|
|
32
|
+
// --- New interpolation logic ---
|
|
33
|
+
settings = interpolateEnvVars(settings);
|
|
34
|
+
if (settings.env && settings.env.AGENT_TIMEOUT_MS) {
|
|
35
|
+
customTimeoutMs = parseInt(settings.env.AGENT_TIMEOUT_MS, 10) || customTimeoutMs;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
catch (_e) {
|
|
40
|
+
// silent
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
// OpenClaw CLI: `openclaw message send "prompt"` for programmatic invocation
|
|
44
|
+
const argsSpawn = ['message', 'send', prompt];
|
|
45
|
+
return new Promise((resolve) => {
|
|
46
|
+
const isWin = process.platform === 'win32';
|
|
47
|
+
const command = isWin ? 'openclaw.cmd' : 'openclaw';
|
|
48
|
+
const child = spawn(command, argsSpawn, {
|
|
49
|
+
cwd: options.cwd || process.cwd(),
|
|
50
|
+
shell: isWin,
|
|
51
|
+
windowsHide: true,
|
|
52
|
+
env: {
|
|
53
|
+
...process.env,
|
|
54
|
+
...(agentName ? { OVERMIND_AGENT_NAME: agentName } : {}),
|
|
55
|
+
},
|
|
56
|
+
});
|
|
57
|
+
let stdout = '';
|
|
58
|
+
let stderr = '';
|
|
59
|
+
if (child.stdout)
|
|
60
|
+
child.stdout.on('data', (d) => (stdout += d.toString()));
|
|
61
|
+
if (child.stderr)
|
|
62
|
+
child.stderr.on('data', (d) => (stderr += d.toString()));
|
|
63
|
+
const timeout = setTimeout(() => {
|
|
64
|
+
child.kill();
|
|
65
|
+
resolve({ result: '', error: 'TIMEOUT', rawOutput: stdout });
|
|
66
|
+
}, customTimeoutMs);
|
|
67
|
+
child.on('close', async (code) => {
|
|
68
|
+
clearTimeout(timeout);
|
|
69
|
+
if (code !== 0 && !stdout) {
|
|
70
|
+
return resolve({ result: '', error: `EXIT_CODE_${code}`, rawOutput: stderr });
|
|
71
|
+
}
|
|
72
|
+
if (agentName && sessionId) {
|
|
73
|
+
await saveSessionId(agentName, sessionId, options.configPath, 'openclaw');
|
|
74
|
+
}
|
|
75
|
+
resolve({
|
|
76
|
+
result: stdout.trim(),
|
|
77
|
+
sessionId,
|
|
78
|
+
rawOutput: stdout,
|
|
79
|
+
});
|
|
80
|
+
});
|
|
81
|
+
child.on('error', (err) => {
|
|
82
|
+
resolve({ result: '', error: err.message, rawOutput: '' });
|
|
83
|
+
});
|
|
84
|
+
if (child.stdin)
|
|
85
|
+
child.stdin.end();
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
//# sourceMappingURL=OpenClawRunner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OpenClawRunner.js","sourceRoot":"","sources":["../../src/services/OpenClawRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
export interface RunAgentOptions {
|
|
2
|
+
prompt: string;
|
|
3
|
+
agentName?: string;
|
|
4
|
+
sessionId?: string;
|
|
5
|
+
autoResume?: boolean;
|
|
6
|
+
cwd?: string;
|
|
7
|
+
configPath?: string;
|
|
8
|
+
silent?: boolean;
|
|
9
|
+
}
|
|
10
|
+
export interface RunAgentResult {
|
|
11
|
+
result: string;
|
|
12
|
+
sessionId?: string;
|
|
13
|
+
error?: string;
|
|
14
|
+
rawOutput?: string;
|
|
15
|
+
}
|
|
16
|
+
export declare class OpenCodeRunner {
|
|
17
|
+
private config;
|
|
18
|
+
private timeoutMs;
|
|
19
|
+
constructor();
|
|
20
|
+
runAgent(options: RunAgentOptions): Promise<RunAgentResult>;
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=OpenCodeRunner.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OpenCodeRunner.d.ts","sourceRoot":"","sources":["../../src/services/OpenCodeRunner.ts"],"names":[],"mappings":"AAOA,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;;IAOpB,QAAQ,CAAC,OAAO,EAAE,eAAe,GAAG,OAAO,CAAC,cAAc,CAAC;CA2FlE"}
|
|
@@ -0,0 +1,91 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { spawn } from 'child_process';
|
|
4
|
+
import { CONFIG, resolveConfigPath } from '../lib/config.js';
|
|
5
|
+
import { getLastSessionId, saveSessionId } from '../lib/sessions.js';
|
|
6
|
+
import { interpolateEnvVars } from '../lib/envUtils.js';
|
|
7
|
+
export class OpenCodeRunner {
|
|
8
|
+
config;
|
|
9
|
+
timeoutMs;
|
|
10
|
+
constructor() {
|
|
11
|
+
this.config = CONFIG.CLAUDE;
|
|
12
|
+
this.timeoutMs = CONFIG.TIMEOUT_MS || 900000;
|
|
13
|
+
}
|
|
14
|
+
async runAgent(options) {
|
|
15
|
+
const { prompt, agentName, autoResume } = options;
|
|
16
|
+
let { sessionId } = options;
|
|
17
|
+
const { PATHS } = this.config;
|
|
18
|
+
// --- Auto Resume ---
|
|
19
|
+
if (autoResume && agentName && !sessionId) {
|
|
20
|
+
const lastId = await getLastSessionId(agentName, options.configPath, 'opencode');
|
|
21
|
+
if (lastId) {
|
|
22
|
+
sessionId = lastId;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
let customTimeoutMs = this.timeoutMs;
|
|
26
|
+
// --- Isolation ---
|
|
27
|
+
if (agentName) {
|
|
28
|
+
try {
|
|
29
|
+
const agentSettingsPath = resolveConfigPath(path.join(path.dirname(PATHS.SETTINGS), `settings_${agentName}.json`), options.configPath);
|
|
30
|
+
if (fs.existsSync(agentSettingsPath)) {
|
|
31
|
+
let settings = JSON.parse(fs.readFileSync(agentSettingsPath, 'utf8'));
|
|
32
|
+
// --- New interpolation logic ---
|
|
33
|
+
settings = interpolateEnvVars(settings);
|
|
34
|
+
if (settings.env && settings.env.AGENT_TIMEOUT_MS) {
|
|
35
|
+
customTimeoutMs = parseInt(settings.env.AGENT_TIMEOUT_MS, 10) || customTimeoutMs;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
catch (_e) {
|
|
40
|
+
// silent
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
// OpenCode CLI: `opencode run "prompt"` for non-interactive execution
|
|
44
|
+
const argsSpawn = ['run', prompt];
|
|
45
|
+
if (sessionId)
|
|
46
|
+
argsSpawn.push('--session', sessionId);
|
|
47
|
+
return new Promise((resolve) => {
|
|
48
|
+
const isWin = process.platform === 'win32';
|
|
49
|
+
const command = isWin ? 'opencode.exe' : 'opencode';
|
|
50
|
+
const child = spawn(command, argsSpawn, {
|
|
51
|
+
cwd: options.cwd || process.cwd(),
|
|
52
|
+
shell: isWin,
|
|
53
|
+
windowsHide: true,
|
|
54
|
+
env: {
|
|
55
|
+
...process.env,
|
|
56
|
+
...(agentName ? { OVERMIND_AGENT_NAME: agentName } : {}),
|
|
57
|
+
},
|
|
58
|
+
});
|
|
59
|
+
let stdout = '';
|
|
60
|
+
let stderr = '';
|
|
61
|
+
if (child.stdout)
|
|
62
|
+
child.stdout.on('data', (d) => (stdout += d.toString()));
|
|
63
|
+
if (child.stderr)
|
|
64
|
+
child.stderr.on('data', (d) => (stderr += d.toString()));
|
|
65
|
+
const timeout = setTimeout(() => {
|
|
66
|
+
child.kill();
|
|
67
|
+
resolve({ result: '', error: 'TIMEOUT', rawOutput: stdout });
|
|
68
|
+
}, customTimeoutMs);
|
|
69
|
+
child.on('close', async (code) => {
|
|
70
|
+
clearTimeout(timeout);
|
|
71
|
+
if (code !== 0 && !stdout) {
|
|
72
|
+
return resolve({ result: '', error: `EXIT_CODE_${code}`, rawOutput: stderr });
|
|
73
|
+
}
|
|
74
|
+
if (agentName && sessionId) {
|
|
75
|
+
await saveSessionId(agentName, sessionId, options.configPath, 'opencode');
|
|
76
|
+
}
|
|
77
|
+
resolve({
|
|
78
|
+
result: stdout.trim(),
|
|
79
|
+
sessionId,
|
|
80
|
+
rawOutput: stdout,
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
child.on('error', (err) => {
|
|
84
|
+
resolve({ result: '', error: err.message, rawOutput: '' });
|
|
85
|
+
});
|
|
86
|
+
if (child.stdin)
|
|
87
|
+
child.stdin.end();
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
//# sourceMappingURL=OpenCodeRunner.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"OpenCodeRunner.js","sourceRoot":"","sources":["../../src/services/OpenCodeRunner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
export declare class PromptManager {
|
|
2
|
+
private baseDir;
|
|
3
|
+
private agentsDir;
|
|
4
|
+
constructor(customBaseDir?: string);
|
|
5
|
+
createPrompt(name: string, content: string): Promise<{
|
|
6
|
+
filePath: string;
|
|
7
|
+
existed: boolean;
|
|
8
|
+
}>;
|
|
9
|
+
editPrompt(name: string, search: string, replace: string): Promise<{
|
|
10
|
+
success: boolean;
|
|
11
|
+
filePath?: string;
|
|
12
|
+
error?: string;
|
|
13
|
+
}>;
|
|
14
|
+
getPromptContent(name: string): Promise<string | null>;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=PromptManager.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"PromptManager.d.ts","sourceRoot":"","sources":["../../src/services/PromptManager.ts"],"names":[],"mappings":"AAIA,qBAAa,aAAa;IACxB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,SAAS,CAAS;gBAEd,aAAa,CAAC,EAAE,MAAM;IAY5B,YAAY,CAChB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,OAAO,CAAA;KAAE,CAAC;IAa5C,UAAU,CACd,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,OAAO,CAAC;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAmB7D,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;CAQ7D"}
|