@ddtcorex/dsh-maestro-supervisor 0.6.2 → 0.6.4

package/lib/cli.js

@@ -106,19 +106,79 @@ Commands:
                 return writeReport({ reportsRoot, ts, health, gitDiff: diff, logTail: tail, action });
             },
             rollback: async () => {
-                // Find latest LKG and restore
+                const { execSync } = await import('node:child_process');
                 const entries = fs.existsSync(lkgRoot) ? fs.readdirSync(lkgRoot).sort() : [];
                 if (!entries.length)
                     throw new Error('no LKG to rollback to');
-                const latest = entries[entries.length - 1];
-                const src = path.join(lkgRoot, latest);
-                // naive restore: copy files back
+                // Try newest to oldest (up to 3) to find a clean LKG for plugin failures
+                // Extract failing plugin from current log tail if possible
+                let failingPlugin;
+                try {
+                    const tail = fs.readFileSync(path.join(os.homedir(), '.dsh/dsh-web.log'), 'utf8').slice(-5000);
+                    const m = tail.match(/@ddtcorex\/dsh-maestro-[a-z0-9_-]+/i) ?? tail.match(/dsh-maestro-[a-z0-9_-]+/i);
+                    if (m)
+                        failingPlugin = m[0].replace(/^@ddtcorex\//, '');
+                }
+                catch { }
+                const candidates = [...entries].reverse().slice(0, 3);
+                let chosen;
+                for (const cand of candidates) {
+                    if (!failingPlugin) {
+                        chosen = cand;
+                        break;
+                    }
+                    try {
+                        const pkgPath = path.join(lkgRoot, cand, 'profiles/web/package.json');
+                        if (!fs.existsSync(pkgPath)) {
+                            chosen = cand;
+                            break;
+                        }
+                        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf8'));
+                        const bundles = pkg?.dsh?.profile?.bundles ?? [];
+                        const deps = pkg?.dependencies ?? {};
+                        const hasFailing = bundles.some((b) => b.includes(failingPlugin)) || Object.keys(deps).some(k => k.includes(failingPlugin));
+                        if (!hasFailing) {
+                            chosen = cand;
+                            break;
+                        }
+                        console.log(`[supervisor] skipping LKG ${cand} still contains failing plugin ${failingPlugin}`);
+                    }
+                    catch {
+                        chosen = cand;
+                        break;
+                    }
+                }
+                const target = chosen ?? entries[entries.length - 1];
+                const src = path.join(lkgRoot, target);
                 for (const entry of fs.readdirSync(src)) {
                     if (entry === 'manifest.json')
                         continue;
-                    fs.cpSync(path.join(src, entry), path.join(dshHome, entry), { recursive: true, force: true });
+                    const srcPath = path.join(src, entry);
+                    const destPath = path.join(dshHome, entry);
+                    try {
+                        // Skip if src and dest are the same file (e.g. symlink to same target like ~/.dsh/AGENTS.md)
+                        try {
+                            if (fs.existsSync(srcPath) && fs.existsSync(destPath) && fs.realpathSync(srcPath) === fs.realpathSync(destPath))
+                                continue;
+                        }
+                        catch { }
+                        fs.cpSync(srcPath, destPath, { recursive: true, force: true });
+                    }
+                    catch (e) {
+                        if (String(e?.message ?? '').includes('cannot be the same'))
+                            continue;
+                        throw e;
+                    }
+                }
+                console.log(`[supervisor] rolled back to ${target}${failingPlugin ? ` (avoiding ${failingPlugin})` : ''}`);
+                // Reconcile node_modules from restored package.json (critical for link: deps)
+                try {
+                    execSync('pnpm --dir ~/.dsh/profiles/web install --silent', { timeout: 30000, stdio: 'pipe' });
+                    console.log('[supervisor] pnpm install reconciled profiles/web');
+                }
+                catch (e) {
+                    console.log(`[supervisor] pnpm install failed: ${e?.message ?? String(e)}`);
                 }
-                console.log(`[supervisor] rolled back to ${latest}`);
             },
             restartWeb: async () => {
                 const { execSync } = await import('node:child_process');

package/lib/debug-agent.js

@@ -316,9 +316,9 @@ async function resolveLLMConfig() {
         process.env.OMNI_ROUTE_API_URL ??
         process.env.OPENCODE_API_URL ??
         null;
-    // Model: AI_MODEL / DEEPSEEK_MODEL / settings.json domains.review.model / default
+    // Model: AI_MODEL / DEEPSEEK_MODEL / settings.json domains.supervisor.model -> domains.review.model / default
+    // Supervisor has its own picker; falls back to review model for backward compat, then DSH default.
     let model = process.env.AI_MODEL ?? process.env.DEEPSEEK_MODEL ?? process.env.OPENAI_MODEL ?? null;
-    // Try settings.json first (review model is the user's current default model)
     if (!model) {
         try {
             const { readFileSync } = await import('node:fs');
@@ -326,11 +326,20 @@ async function resolveLLMConfig() {
             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')
+            // Prefer supervisor model, fall back to review model (so old installs keep working)
+            const sup = j?.domains?.supervisor?.model?.model ?? j?.domains?.supervisor?.model;
+            const rev = j?.domains?.review?.model?.model ?? j?.domains?.review?.model;
+            let m = null;
+            if (typeof sup === 'string')
+                m = sup;
+            else if (sup?.model && typeof sup.model === 'string')
+                m = sup.model;
+            else if (typeof rev === 'string')
+                m = rev;
+            else if (rev?.model && typeof rev.model === 'string')
+                m = rev.model;
+            if (typeof m === 'string' && m.trim() !== '')
                 model = m;
-            else if (m?.model && typeof m.model === 'string')
-                model = m.model;
         }
         catch { }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ddtcorex/dsh-maestro-supervisor",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "Supervisor daemon for DSH Web resilience — auto-detect crashes, rollback to LKG, report",
   "type": "module",
   "main": "./lib/index.js",