github-featured/jackwener--opencli
2
0
Fork 0
Code Issues Pull Requests Deployments Models Agent Notes Packages Projects Releases Wiki Activity

fix(browser): restart stale ready daemon (#1399)

Browse Source
This commit is contained in:
jakevin
2026-05-08 00:39:19 +08:00
committed by GitHub
parent 1fa44bda6b
commit 8d201ae60b
2 changed files with 86 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/browser.test.ts
+21
View File
@@ -205,6 +205,27 @@ describe('BrowserBridge state', () => {
await expect(bridge.connect({ timeout: 0.1 })).rejects.toThrow('Stale daemon could not be replaced');
});
it('attempts stale daemon replacement even when extension is connected', async () => {
vi.spyOn(daemonClient, 'getDaemonHealth').mockResolvedValue({
state: 'ready',
status: {
ok: true,
pid: 1,
uptime: 0,
daemonVersion: '0.0.1',
extensionConnected: true,
pending: 0,
memoryMB: 0,
port: 0,
},
});
vi.spyOn(daemonClient, 'requestDaemonShutdown').mockResolvedValue(false);
const bridge = new BrowserBridge();
await expect(bridge.connect({ timeout: 0.1 })).rejects.toThrow('Stale daemon could not be replaced');
});
});
describe('stealth anti-detection', () => {
src/browser/bridge.ts
+65 -61
View File
@@ -64,10 +64,41 @@ export class BrowserBridge implements IBrowserFactory {
const health = await getDaemonHealth({ contextId });
// Fast path: everything ready
if (health.state === 'ready') return;
// Detect stale daemon before any fast path. A stale daemon can still have
// the extension connected, so this cannot live only in the no-extension branch.
const daemonVersion = health.status?.daemonVersion;
const isStale = !!health.status && (!daemonVersion || daemonVersion !== PKG_VERSION);
let staleDaemonReplaced = false;
if (health.state === 'profile-required') {
if (isStale) {
// Stale daemon — restart it so all browser commands run against the
// currently installed package code, not the old daemon binary.
const reason = daemonVersion
? `v${daemonVersion} ≠ v${PKG_VERSION}`
: `pre-version daemon, CLI is v${PKG_VERSION}`;
if (process.env.OPENCLI_VERBOSE || process.stderr.isTTY) {
process.stderr.write(`⚠️ Stale daemon detected (${reason}). Restarting...\n`);
}
const shutdownAccepted = await requestDaemonShutdown();
const portReleased = shutdownAccepted && await waitForDaemonStop(3000);
if (!portReleased) {
// Stale daemon replacement failed — don't blindly spawn on an occupied port
throw new BrowserConnectError(
'Stale daemon could not be replaced',
`A stale daemon (${reason}) is running but did not shut down.\n` +
' Run manually: opencli daemon stop && opencli doctor',
'daemon-not-running',
);
}
// Port released — fall through to spawn a fresh daemon
staleDaemonReplaced = true;
}
// Fast path: everything ready
if (!staleDaemonReplaced && health.state === 'ready') return;
if (!staleDaemonReplaced && health.state === 'profile-required') {
throw new BrowserConnectError(
'Multiple Browser Bridge profiles are connected',
'Select one with --profile <name>, OPENCLI_PROFILE=<name>, or opencli profile use <name>.\n' +
@@ -76,7 +107,7 @@ export class BrowserBridge implements IBrowserFactory {
);
}
if (health.state === 'profile-disconnected') {
if (!staleDaemonReplaced && health.state === 'profile-disconnected') {
const label = contextId ?? health.status.contextId ?? 'unknown';
throw new BrowserConnectError(
`Browser profile "${label}" is not connected`,
@@ -86,66 +117,39 @@ export class BrowserBridge implements IBrowserFactory {
}
// Daemon running but no extension
if (health.state === 'no-extension') {
// Detect stale daemon: version mismatch OR missing daemonVersion (pre-version daemon)
const daemonVersion = health.status?.daemonVersion;
const isStale = !daemonVersion || daemonVersion !== PKG_VERSION;
if (isStale) {
// Stale daemon — restart it so extension gets a fresh WebSocket endpoint
const reason = daemonVersion
? `v${daemonVersion} ≠ v${PKG_VERSION}`
: `pre-version daemon, CLI is v${PKG_VERSION}`;
if (process.env.OPENCLI_VERBOSE || process.stderr.isTTY) {
process.stderr.write(`⚠️ Stale daemon detected (${reason}). Restarting...\n`);
}
const shutdownAccepted = await requestDaemonShutdown();
const portReleased = shutdownAccepted && await waitForDaemonStop(3000);
if (!portReleased) {
// Stale daemon replacement failed — don't blindly spawn on an occupied port
throw new BrowserConnectError(
'Stale daemon could not be replaced',
`A stale daemon (${reason}) is running but did not shut down.\n` +
' Run manually: opencli daemon stop && opencli doctor',
'daemon-not-running',
);
}
// Port released — fall through to spawn a fresh daemon
} else {
// Same version — wait for extension to connect
if (process.env.OPENCLI_VERBOSE || process.stderr.isTTY) {
process.stderr.write('⏳ Waiting for Chrome/Chromium extension to connect...\n');
process.stderr.write(' Make sure Chrome or Chromium is open and the OpenCLI extension is enabled.\n');
}
if (await this._pollUntilReady(timeoutMs, contextId)) return;
const finalHealth = await getDaemonHealth({ contextId });
if (finalHealth.state === 'profile-required') {
throw new BrowserConnectError(
'Multiple Browser Bridge profiles are connected',
'Select one with --profile <name>, OPENCLI_PROFILE=<name>, or opencli profile use <name>.\n' +
'Run opencli profile list to see connected profiles.',
'profile-required',
);
}
if (finalHealth.state === 'profile-disconnected') {
const label = contextId ?? finalHealth.status.contextId ?? 'unknown';
throw new BrowserConnectError(
`Browser profile "${label}" is not connected`,
'Open the matching Chrome profile and make sure the OpenCLI extension is enabled, or choose another profile with opencli profile use <name>.',
'profile-disconnected',
);
}
if (!staleDaemonReplaced && health.state === 'no-extension') {
// Same version — wait for extension to connect
if (process.env.OPENCLI_VERBOSE || process.stderr.isTTY) {
process.stderr.write('⏳ Waiting for Chrome/Chromium extension to connect...\n');
process.stderr.write(' Make sure Chrome or Chromium is open and the OpenCLI extension is enabled.\n');
}
if (await this._pollUntilReady(timeoutMs, contextId)) return;
const finalHealth = await getDaemonHealth({ contextId });
if (finalHealth.state === 'profile-required') {
throw new BrowserConnectError(
'Browser Bridge extension not connected',
'Make sure Chrome/Chromium is open and the extension is enabled.\n' +
'If the extension is installed, try: opencli daemon stop && opencli doctor\n' +
'If not installed:\n' +
' 1. Download: https://github.com/jackwener/opencli/releases\n' +
' 2. Open chrome://extensions → Developer Mode → Load unpacked',
'extension-not-connected',
'Multiple Browser Bridge profiles are connected',
'Select one with --profile <name>, OPENCLI_PROFILE=<name>, or opencli profile use <name>.\n' +
'Run opencli profile list to see connected profiles.',
'profile-required',
);
}
if (finalHealth.state === 'profile-disconnected') {
const label = contextId ?? finalHealth.status.contextId ?? 'unknown';
throw new BrowserConnectError(
`Browser profile "${label}" is not connected`,
'Open the matching Chrome profile and make sure the OpenCLI extension is enabled, or choose another profile with opencli profile use <name>.',
'profile-disconnected',
);
}
throw new BrowserConnectError(
'Browser Bridge extension not connected',
'Make sure Chrome/Chromium is open and the extension is enabled.\n' +
'If the extension is installed, try: opencli daemon stop && opencli doctor\n' +
'If not installed:\n' +
' 1. Download: https://github.com/jackwener/opencli/releases\n' +
' 2. Open chrome://extensions → Developer Mode → Load unpacked',
'extension-not-connected',
);
}
// No daemon — spawn one