@yemi33/minions 0.1.1826 → 0.1.1827
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/CHANGELOG.md +5 -0
- package/bin/minions.js +31 -71
- package/dashboard.js +5 -13
- package/engine/copilot-models.json +1 -1
- package/engine/shared.js +16 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
package/bin/minions.js
CHANGED
|
@@ -40,9 +40,9 @@ const { spawn, spawnSync, execSync } = require('child_process');
|
|
|
40
40
|
|
|
41
41
|
const PKG_ROOT = path.resolve(__dirname, '..');
|
|
42
42
|
const shared = require(path.join(PKG_ROOT, 'engine', 'shared'));
|
|
43
|
+
const { openUrlInBrowser } = shared;
|
|
43
44
|
const { waitForRestartHealth, formatRestartHealthError } = require(path.join(PKG_ROOT, 'engine', 'restart-health'));
|
|
44
45
|
const DASH_PORT = 7331;
|
|
45
|
-
const DASHBOARD_BROWSER_PRESENCE_MAX_AGE_MS = 45000;
|
|
46
46
|
|
|
47
47
|
/** Returns PIDs (as strings) of processes LISTENING on `port`. Empty on no match
|
|
48
48
|
* or when the platform tool (netstat/findstr/lsof) is unavailable. */
|
|
@@ -74,23 +74,10 @@ function killByPort(port) {
|
|
|
74
74
|
|
|
75
75
|
const isPortListening = (port) => getListeningPids(port).length > 0;
|
|
76
76
|
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
const tabs = state && state.tabs && typeof state.tabs === 'object' ? state.tabs : {};
|
|
82
|
-
return Object.values(tabs).some(tab => {
|
|
83
|
-
const lastSeen = Number(tab && tab.lastSeen);
|
|
84
|
-
return Number.isFinite(lastSeen) && now - lastSeen <= DASHBOARD_BROWSER_PRESENCE_MAX_AGE_MS;
|
|
85
|
-
});
|
|
86
|
-
} catch { return false; }
|
|
87
|
-
}
|
|
88
|
-
|
|
89
|
-
// Clear the browser-presence cache. Pre-restart beacons can outlive the
|
|
90
|
-
// browser window that produced them (closed Edge, locked-screen RDP session,
|
|
91
|
-
// stale heuristic timer) and falsely tell `restart` to skip the auto-open. We
|
|
92
|
-
// wipe it during restart so the post-restart probe only counts beacons that
|
|
93
|
-
// arrive AFTER the new dashboard is up — i.e. from a still-living tab.
|
|
77
|
+
// Pre-restart beacons can outlive the browser window that produced them
|
|
78
|
+
// (closed Edge, locked-screen RDP session) and falsely tell restart to skip
|
|
79
|
+
// the auto-open. We wipe the file during restart so the post-restart probe
|
|
80
|
+
// only counts beacons that arrive AFTER the new dashboard is up.
|
|
94
81
|
function _clearDashboardBrowserState(minionsHome) {
|
|
95
82
|
try {
|
|
96
83
|
const fp = path.join(minionsHome, 'engine', 'dashboard-browser.json');
|
|
@@ -113,12 +100,9 @@ async function _waitForBrowserReconnect(minionsHome, { afterMs, timeoutMs = 5000
|
|
|
113
100
|
}
|
|
114
101
|
|
|
115
102
|
function _openInBrowser(url) {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
else execSync(`xdg-open "${url}"`, { stdio: 'ignore' });
|
|
120
|
-
} catch (e) {
|
|
121
|
-
console.log(` Could not auto-open browser: ${e.message}`);
|
|
103
|
+
const result = openUrlInBrowser(url);
|
|
104
|
+
if (!result.ok) {
|
|
105
|
+
console.log(` Could not auto-open browser: ${result.error}`);
|
|
122
106
|
console.log(` Please open ${url} manually.`);
|
|
123
107
|
}
|
|
124
108
|
}
|
|
@@ -180,12 +164,10 @@ function killMinionsProcesses(patterns) {
|
|
|
180
164
|
} catch {}
|
|
181
165
|
}
|
|
182
166
|
|
|
183
|
-
/** Spawn a detached dashboard
|
|
184
|
-
*
|
|
185
|
-
function spawnDashboard(
|
|
186
|
-
const env = { ...process.env };
|
|
187
|
-
if (suppressOpen) env.MINIONS_NO_AUTO_OPEN = '1';
|
|
188
|
-
else delete env.MINIONS_NO_AUTO_OPEN;
|
|
167
|
+
/** Spawn a detached dashboard with self-open suppressed — the CLI decides
|
|
168
|
+
* when to open a browser based on whether a real tab reconnects post-health. */
|
|
169
|
+
function spawnDashboard() {
|
|
170
|
+
const env = { ...process.env, MINIONS_NO_AUTO_OPEN: '1' };
|
|
189
171
|
const proc = spawn(process.execPath, [path.join(MINIONS_HOME, 'dashboard.js')], {
|
|
190
172
|
cwd: MINIONS_HOME, stdio: 'ignore', detached: true, windowsHide: true, env
|
|
191
173
|
});
|
|
@@ -451,13 +433,12 @@ function init() {
|
|
|
451
433
|
const dashWasUp = isPortListening(DASH_PORT);
|
|
452
434
|
const restartStartMs = Date.now();
|
|
453
435
|
if (isUpgrade) {
|
|
454
|
-
// Clear stale beacons so the post-restart probe only counts tabs that
|
|
455
|
-
// reconnect to the NEW dashboard.
|
|
456
|
-
_clearDashboardBrowserState(MINIONS_HOME);
|
|
457
436
|
try { execSync(`node "${path.join(MINIONS_HOME, 'engine.js')}" stop`, { stdio: 'ignore', cwd: MINIONS_HOME, timeout: 10000, windowsHide: true }); } catch {}
|
|
458
437
|
// Free the dashboard port too — without this the new dashboard EADDRINUSE-dies
|
|
459
438
|
// silently and the user keeps running stale code from the old dashboard process.
|
|
460
439
|
killByPort(DASH_PORT);
|
|
440
|
+
// Clear AFTER kill so the old dashboard can't repopulate during shutdown.
|
|
441
|
+
_clearDashboardBrowserState(MINIONS_HOME);
|
|
461
442
|
}
|
|
462
443
|
console.log(isUpgrade
|
|
463
444
|
? `\n Upgrade complete (${pkgVersion}). Restarting engine and dashboard...\n`
|
|
@@ -468,27 +449,20 @@ function init() {
|
|
|
468
449
|
engineProc.unref();
|
|
469
450
|
console.log(` Engine started (PID: ${engineProc.pid})`);
|
|
470
451
|
|
|
471
|
-
|
|
472
|
-
// check based on whether an existing browser tab actually reconnects.
|
|
473
|
-
const dashProc = spawnDashboard(true);
|
|
452
|
+
const dashProc = spawnDashboard();
|
|
474
453
|
console.log(` Dashboard started (PID: ${dashProc.pid})`);
|
|
475
454
|
console.log(` Dashboard: http://localhost:${DASH_PORT}`);
|
|
476
455
|
|
|
477
456
|
void (async () => {
|
|
478
|
-
|
|
479
|
-
|
|
480
|
-
// Hot upgrade: give an existing browser tab up to 5s to reconnect via
|
|
481
|
-
// its 4s auto-refresh poll. If nothing beacons, the tab is gone — open.
|
|
482
|
-
const reconnected = await _waitForBrowserReconnect(MINIONS_HOME, {
|
|
483
|
-
afterMs: restartStartMs, timeoutMs: 5000,
|
|
484
|
-
});
|
|
485
|
-
shouldOpen = !reconnected;
|
|
486
|
-
}
|
|
457
|
+
const shouldOpen = forceOpen || !dashWasUp ||
|
|
458
|
+
!(await _waitForBrowserReconnect(MINIONS_HOME, { afterMs: restartStartMs, timeoutMs: 5000 }));
|
|
487
459
|
if (shouldOpen) {
|
|
488
460
|
console.log(` Opening dashboard in browser...`);
|
|
489
461
|
_openInBrowser(`http://localhost:${DASH_PORT}`);
|
|
490
462
|
}
|
|
491
|
-
})()
|
|
463
|
+
})().catch(err => {
|
|
464
|
+
console.log(` Could not open dashboard: ${err.message}`);
|
|
465
|
+
});
|
|
492
466
|
|
|
493
467
|
// Next steps guidance
|
|
494
468
|
console.log(`
|
|
@@ -740,36 +714,30 @@ if (!cmd || cmd === 'help' || cmd === '--help' || cmd === '-h') {
|
|
|
740
714
|
} else if (cmd === 'add' || cmd === 'remove' || cmd === 'list' || cmd === 'scan') {
|
|
741
715
|
delegate('minions.js', [cmd, ...rest]);
|
|
742
716
|
} else if (cmd === 'restart') {
|
|
743
|
-
// Start both engine and dashboard — the go-to command after a reboot.
|
|
744
717
|
// `--cli` / `--model` flags forward to `engine.js start` so the runtime
|
|
745
718
|
// fleet flips before the daemon spawns (P-6b3f9c2e AC: works on restart).
|
|
746
719
|
ensureInstalled();
|
|
747
720
|
const dashWasUp = isPortListening(DASH_PORT);
|
|
748
|
-
// Mark the restart boundary so post-restart beacon timestamps are unambiguous,
|
|
749
|
-
// and clear stale beacons (browsers that closed without notifying).
|
|
750
721
|
const restartStartMs = Date.now();
|
|
751
|
-
|
|
752
|
-
//
|
|
753
|
-
// one fails. Goal: the old engine is gone before we spawn a new one, even if
|
|
722
|
+
// Layered kill — each step is best-effort, so the next still runs if one
|
|
723
|
+
// fails. Goal: the old engine is gone before we spawn a new one, even if
|
|
754
724
|
// PowerShell is unavailable, the engine is hung, or its cmdline doesn't match.
|
|
755
725
|
const oldEnginePid = readEnginePid(MINIONS_HOME);
|
|
756
|
-
// 1. Graceful stop — short timeout so a hung engine can't block what follows.
|
|
757
726
|
try { execSync(`node "${path.join(MINIONS_HOME, 'engine.js')}" stop`, { stdio: 'ignore', cwd: MINIONS_HOME, timeout: 10000, windowsHide: true }); } catch {}
|
|
758
|
-
//
|
|
759
|
-
//
|
|
727
|
+
// Force-kill the recorded engine PID (NOT the tree — agent children must
|
|
728
|
+
// survive so the new engine can re-attach them via PID files).
|
|
760
729
|
killPidOnly(oldEnginePid);
|
|
761
|
-
// 3. Free dashboard port (catches orphan dashboards with no recorded PID).
|
|
762
730
|
killByPort(DASH_PORT);
|
|
763
|
-
// 4. Belt-and-suspenders cmdline match for anything still alive.
|
|
764
731
|
killMinionsProcesses(['engine.js', 'dashboard.js']);
|
|
732
|
+
// Clear stale beacons AFTER the kill so the old dashboard's last writes
|
|
733
|
+
// can't repopulate the file in the gap between clear and shutdown.
|
|
734
|
+
_clearDashboardBrowserState(MINIONS_HOME);
|
|
765
735
|
const engineProc = spawn(process.execPath, [path.join(MINIONS_HOME, 'engine.js'), 'start', ...rest], {
|
|
766
736
|
cwd: MINIONS_HOME, stdio: 'ignore', detached: true, windowsHide: true
|
|
767
737
|
});
|
|
768
738
|
engineProc.unref();
|
|
769
739
|
console.log(`\n Engine started (PID: ${engineProc.pid})`);
|
|
770
|
-
|
|
771
|
-
// after observing whether an existing browser tab reconnects.
|
|
772
|
-
const dashProc = spawnDashboard(true);
|
|
740
|
+
const dashProc = spawnDashboard();
|
|
773
741
|
console.log(` Dashboard started (PID: ${dashProc.pid})`);
|
|
774
742
|
console.log(` Dashboard: http://localhost:${DASH_PORT}`);
|
|
775
743
|
console.log(' Verifying restart health...');
|
|
@@ -784,13 +752,8 @@ if (!cmd || cmd === 'help' || cmd === '--help' || cmd === '-h') {
|
|
|
784
752
|
}
|
|
785
753
|
console.log(` Restart verified: engine PID ${result.engine.pid}; dashboard healthy.`);
|
|
786
754
|
|
|
787
|
-
|
|
788
|
-
|
|
789
|
-
const reconnected = await _waitForBrowserReconnect(MINIONS_HOME, {
|
|
790
|
-
afterMs: restartStartMs, timeoutMs: 5000,
|
|
791
|
-
});
|
|
792
|
-
shouldOpen = !reconnected;
|
|
793
|
-
}
|
|
755
|
+
const shouldOpen = forceOpen || !dashWasUp ||
|
|
756
|
+
!(await _waitForBrowserReconnect(MINIONS_HOME, { afterMs: restartStartMs, timeoutMs: 5000 }));
|
|
794
757
|
if (shouldOpen) {
|
|
795
758
|
console.log(` Opening dashboard in browser...`);
|
|
796
759
|
_openInBrowser(`http://localhost:${DASH_PORT}`);
|
|
@@ -967,10 +930,7 @@ if (!cmd || cmd === 'help' || cmd === '--help' || cmd === '-h') {
|
|
|
967
930
|
handled = true;
|
|
968
931
|
const url = `http://localhost:${DASH_PORT}`;
|
|
969
932
|
console.log(`\n Dashboard already running: ${url}\n`);
|
|
970
|
-
|
|
971
|
-
const openCmd = process.platform === 'win32' ? `start ${url}` : process.platform === 'darwin' ? `open ${url}` : `xdg-open ${url}`;
|
|
972
|
-
execSync(openCmd, { stdio: 'ignore', windowsHide: true });
|
|
973
|
-
} catch {}
|
|
933
|
+
openUrlInBrowser(url);
|
|
974
934
|
});
|
|
975
935
|
sock.on('error', () => {
|
|
976
936
|
sock.destroy();
|
package/dashboard.js
CHANGED
|
@@ -9422,20 +9422,12 @@ if (require.main === module) {
|
|
|
9422
9422
|
console.log(`\n Auto-refreshes every 4s. Ctrl+C to stop.\n`);
|
|
9423
9423
|
|
|
9424
9424
|
// Auto-open the browser unless suppressed. `minions restart` and the
|
|
9425
|
-
// upgrade path set MINIONS_NO_AUTO_OPEN=1
|
|
9426
|
-
//
|
|
9425
|
+
// upgrade path set MINIONS_NO_AUTO_OPEN=1 because the CLI orchestrates the
|
|
9426
|
+
// open itself after observing whether an existing tab reconnected.
|
|
9427
9427
|
if (!process.env.MINIONS_NO_AUTO_OPEN) {
|
|
9428
|
-
const
|
|
9429
|
-
|
|
9430
|
-
|
|
9431
|
-
exec(`start "" "http://localhost:${PORT}"`);
|
|
9432
|
-
} else if (process.platform === 'darwin') {
|
|
9433
|
-
exec(`open http://localhost:${PORT}`);
|
|
9434
|
-
} else {
|
|
9435
|
-
exec(`xdg-open http://localhost:${PORT}`);
|
|
9436
|
-
}
|
|
9437
|
-
} catch (e) {
|
|
9438
|
-
console.log(` Could not auto-open browser: ${e.message}`);
|
|
9428
|
+
const result = shared.openUrlInBrowser(`http://localhost:${PORT}`);
|
|
9429
|
+
if (!result.ok) {
|
|
9430
|
+
console.log(` Could not auto-open browser: ${result.error}`);
|
|
9439
9431
|
console.log(` Please open http://localhost:${PORT} manually.`);
|
|
9440
9432
|
}
|
|
9441
9433
|
}
|
package/engine/shared.js
CHANGED
|
@@ -251,6 +251,21 @@ function resolveEngineCacheDir(fallbackEngineDir) {
|
|
|
251
251
|
return fallbackEngineDir;
|
|
252
252
|
}
|
|
253
253
|
|
|
254
|
+
// Cross-platform URL opener. Uses execSync so failures fall through the
|
|
255
|
+
// try/catch and the caller sees them. Dashboard self-open and `minions dash`
|
|
256
|
+
// / `minions restart` post-health open all funnel through here.
|
|
257
|
+
function openUrlInBrowser(url) {
|
|
258
|
+
const { execSync } = require('child_process');
|
|
259
|
+
try {
|
|
260
|
+
if (process.platform === 'win32') execSync(`start "" "${url}"`, { stdio: 'ignore', windowsHide: true });
|
|
261
|
+
else if (process.platform === 'darwin') execSync(`open "${url}"`, { stdio: 'ignore' });
|
|
262
|
+
else execSync(`xdg-open "${url}"`, { stdio: 'ignore' });
|
|
263
|
+
return { ok: true };
|
|
264
|
+
} catch (e) {
|
|
265
|
+
return { ok: false, error: e && e.message ? e.message : String(e) };
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
|
|
254
269
|
function _flushLogBuffer() {
|
|
255
270
|
if (_logBuffer.length === 0) return;
|
|
256
271
|
const drained = _logBuffer.splice(0);
|
|
@@ -3380,6 +3395,7 @@ module.exports = {
|
|
|
3380
3395
|
MINIONS_DIR,
|
|
3381
3396
|
ENGINE_DIR,
|
|
3382
3397
|
resolveEngineCacheDir,
|
|
3398
|
+
openUrlInBrowser,
|
|
3383
3399
|
CONTROL_PATH,
|
|
3384
3400
|
COOLDOWNS_PATH,
|
|
3385
3401
|
PR_LINKS_PATH,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yemi33/minions",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.1827",
|
|
4
4
|
"description": "Multi-agent AI dev team that runs from ~/.minions/ — five autonomous agents share a single engine, dashboard, and knowledge base",
|
|
5
5
|
"bin": {
|
|
6
6
|
"minions": "bin/minions.js"
|