@ddtcorex/dsh-maestro-supervisor 0.5.0 → 0.5.2

package/lib/debug-agent.js

@@ -193,7 +193,8 @@ async function defaultDryBoot() {
         const { execSync } = await import('node:child_process');
         const tmp = execSync('mktemp -d', { encoding: 'utf-8' }).trim();
         const port = Math.floor(19000 + Math.random() * 1000);
-        const out = execSync(`timeout 8 bash -c 'DSH_HOME=${tmp} pnpm --dir /home/kai/Work/htdocs/maestro-harness/deepseek-harness dsh web --port ${port} --no-open >${tmp}/dsh.log 2>&1 & pid=\\$!; for i in \\$(seq 1 5); do sleep 1; if curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:${port}/ 2>&1 | grep -q 200; then kill \\$pid 2>/dev/null || true; wait \\$pid 2>/dev/null || true; echo ok; exit 0; fi; done; kill \\$pid 2>/dev/null || true; wait \\$pid 2>/dev/null || true; echo fail; exit 1'`, { encoding: 'utf-8', timeout: 12000 });
+        // Use spawn-based dry-boot to avoid nested quoting hell (prev \\$! / \\$(seq) caused syntax error)
+        const out = execSync(`timeout 8 bash -c 'DSH_HOME=${tmp} pnpm --dir /home/kai/Work/htdocs/maestro-harness/deepseek-harness dsh web --port ${port} --no-open >${tmp}/dsh.log 2>&1 & pid=$!; for i in $(seq 1 5); do sleep 1; if curl -s -o /dev/null -w "%{http_code}" http://127.0.0.1:${port}/ 2>&1 | grep -q 200; then kill $pid 2>/dev/null || true; wait $pid 2>/dev/null || true; echo ok; exit 0; fi; done; kill $pid 2>/dev/null || true; wait $pid 2>/dev/null || true; echo fail; exit 1'`, { encoding: 'utf-8', timeout: 12000 });
         execSync(`rm -rf ${tmp}`);
         return out.includes('ok');
     }
@@ -202,17 +203,17 @@ async function defaultDryBoot() {
     }
 }
 async function defaultFetchLLM(prompt) {
-    const key = await resolveApiKey();
-    if (!key)
-        throw new Error('no api key — set DEEPSEEK_API_KEY or ~/.dsh/.credentials.yaml');
-    const res = await fetch('https://api.deepseek.com/v1/chat/completions', {
+    const cfg = await resolveLLMConfig();
+    if (!cfg.key)
+        throw new Error('no api key — set DEEPSEEK_API_KEY / OMNI_ROUTE_API_KEY / OPENCODE_GO_API_KEY / OPENAI_API_KEY or ~/.dsh/.credentials.yaml or AI_API_KEY');
+    const res = await fetch(cfg.url, {
         method: 'POST',
         headers: {
             'Content-Type': 'application/json',
-            'Authorization': `Bearer ${key}`,
+            'Authorization': `Bearer ${cfg.key}`,
         },
         body: JSON.stringify({
-            model: 'deepseek-chat',
+            model: cfg.model,
             temperature: 0.2,
             messages: [
                 { role: 'system', content: 'You are a systematic-debugging agent for DSH Web resilience. Follow the 4 phases: root cause, pattern analysis, hypothesis, implementation. Always propose minimal single-file fix.' },
@@ -225,25 +226,65 @@ async function defaultFetchLLM(prompt) {
     const j = await res.json();
     return j.choices?.[0]?.message?.content ?? JSON.stringify(j);
 }
-async function resolveApiKey() {
-    if (process.env.DEEPSEEK_API_KEY)
-        return process.env.DEEPSEEK_API_KEY;
-    if (process.env.OPENCODE_GO_API_KEY)
-        return process.env.OPENCODE_GO_API_KEY;
+async function resolveLLMConfig() {
+    // Custom AI provider: env overrides, then credentials.yaml, then settings.json, then defaults
+    // Url: AI_API_URL / DEEPSEEK_API_URL / OPENAI_API_BASE / OMNI_ROUTE_API_URL -> default deepseek
+    const url = process.env.AI_API_URL ??
+        process.env.DEAPSEEK_API_URL ??
+        process.env.DEEPSEEK_API_URL ??
+        process.env.OPENAI_API_BASE ??
+        process.env.OMNI_ROUTE_API_URL ??
+        process.env.OPENCODE_API_URL ??
+        'https://api.deepseek.com/v1/chat/completions';
+    // Model: AI_MODEL / DEEPSEEK_MODEL / settings.json domains.review.model
+    let model = process.env.AI_MODEL ?? process.env.DEEPSEEK_MODEL ?? process.env.OPENAI_MODEL ?? 'deepseek-chat';
     try {
         const { readFileSync } = await import('node:fs');
         const { homedir } = await import('node:os');
-        const p = `${homedir()}/.dsh/.credentials.yaml`;
-        const content = readFileSync(p, 'utf-8');
-        const m = content.match(/DEEPSEEK_API_KEY:\s*["']?([^"'\n]+)["']?/);
-        if (m)
-            return m[1].trim();
-        const m2 = content.match(/OPENCODE_GO_API_KEY:\s*["']?([^"'\n]+)["']?/);
-        if (m2)
-            return m2[1].trim();
+        const settingsPath = `${homedir()}/.dsh/maestro/settings.json`;
+        const raw = readFileSync(settingsPath, 'utf-8');
+        const j = JSON.parse(raw);
+        const m = j?.domains?.review?.model?.model ?? j?.domains?.review?.model;
+        if (typeof m === 'string' && !process.env.AI_MODEL && !process.env.DEEPSEEK_MODEL)
+            model = m;
+        else if (m?.model && typeof m.model === 'string' && !process.env.AI_MODEL)
+            model = m.model;
     }
     catch { }
-    return null;
+    // Key: AI_API_KEY / DEEPSEEK_API_KEY / OMNI_ROUTE_API_KEY / OPENCODE_GO_API_KEY / OPENAI_API_KEY
+    let key = process.env.AI_API_KEY ??
+        process.env.DEEPSEEK_API_KEY ??
+        process.env.OMNI_ROUTE_API_KEY ??
+        process.env.OPENCODE_GO_API_KEY ??
+        process.env.OPENAI_API_KEY ??
+        null;
+    if (!key) {
+        try {
+            const { readFileSync } = await import('node:fs');
+            const { homedir } = await import('node:os');
+            const p = `${homedir()}/.dsh/.credentials.yaml`;
+            const content = readFileSync(p, 'utf-8');
+            const keys = ['AI_API_KEY', 'DEEPSEEK_API_KEY', 'OMNI_ROUTE_API_KEY', 'OPENCODE_GO_API_KEY', 'OPENAI_API_KEY'];
+            for (const k of keys) {
+                const m = content.match(new RegExp(`${k}:\\s*["']?([^"'\\n]+)["']?`));
+                if (m) {
+                    key = m[1].trim();
+                    break;
+                }
+            }
+        }
+        catch { }
+    }
+    // If url is base without /v1/chat/completions, append
+    let finalUrl = url;
+    if (!url.includes('/v1/') && !url.includes('/chat/completions')) {
+        finalUrl = url.replace(/\/$/, '') + '/v1/chat/completions';
+    }
+    return { key, url: finalUrl, model };
+}
+async function resolveApiKey() {
+    const cfg = await resolveLLMConfig();
+    return cfg.key;
 }
 export function _resetDebugAgentForTest() {
     lastRun = 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddtcorex/dsh-maestro-supervisor",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "description": "Supervisor daemon for DSH Web resilience — auto-detect crashes, rollback to LKG, report",
   "type": "module",
   "bin": {