CalvinBackup/gstack
1
0
Fork 0
mirror of https://github.com/garrytan/gstack.git synced 2026-09-11 15:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(pair-agent): consent before killing a healthy headless daemon

Browse Source 
The pair-agent headed switch spawned 'connect --force-restart'
unconditionally — auto-killing a live headless daemon (open tabs, cookies,
logins) in direct contradiction of the iron rule it sits beside ('only an
explicit --force-restart may kill a live daemon'). The CLI now captures
daemon liveness BEFORE ensureServer (which can itself boot a fresh daemon)
and relaunches only when the user passed --force-restart to pair-agent;
otherwise it prints the tab count and continues against the existing daemon.
The /pair-agent skill gains a matching one-way-door consent question
(template half rides the wave's template block).

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Garry Tan
2026-08-17 10:43:54 -07:00
co-authored by Claude Fable 5
parent 565ca9b13b
commit 6955dfa348
3 changed files with 139 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
browse/src/cli.ts
+64 -21
View File
@@ -159,6 +159,22 @@ export async function isServerHealthy(port: number, timeoutMs = 2000): Promise<b
}
}
/** Best-effort tab count via GET /health (no auth, bounded). Returns null
* when the daemon doesn't answer in time or predates the `tabs` field —
* callers degrade to a countless phrasing, never block on this. */
async function fetchDaemonTabCount(port: number, timeoutMs = 2000): Promise<number | null> {
try {
const resp = await fetch(`http://127.0.0.1:${port}/health`, {
signal: AbortSignal.timeout(timeoutMs),
});
if (!resp.ok) return null;
const health = await resp.json() as any;
return typeof health.tabs === 'number' ? health.tabs : null;
} catch {
return null;
}
}
// ─── Process Management ─────────────────────────────────────────
async function killServer(pid: number): Promise<void> {
if (!isProcessAlive(pid)) return;
@@ -1631,6 +1647,19 @@ Refs: After 'snapshot', use @e1, @e2... as selectors:
commandArgs.push(stdin.trim());
}
// #2219 IRON RULE (pair-agent leg): capture whether a LIVE daemon predates
// this invocation BEFORE ensureServer() can start a fresh one. pair-agent's
// headed switch below replaces the daemon via `connect --force-restart` —
// a kill that loses tabs/cookies/logins — so a PRE-EXISTING live daemon may
// only be replaced with the user's explicit --force-restart consent. A
// daemon that ensureServer just booted for this invocation holds no session
// state, so replacing it kills nothing the user had.
let pairAgentPreexistingDaemonAlive = false;
if (command === 'pair-agent') {
const preState = readState();
pairAgentPreexistingDaemonAlive = Boolean(preState?.pid && isProcessAlive(preState.pid));
}
let state = await ensureServer(globalFlags);
// ─── Pair-Agent (post-server, pre-dispatch) ──────────────
@@ -1638,28 +1667,42 @@ Refs: After 'snapshot', use @e1, @e2... as selectors:
// Ensure headed mode — the user should see the browser window
// when sharing it with another agent. Feels safer, more impressive.
if (state.mode !== 'headed' && !hasFlag(commandArgs, '--headless')) {
console.log('[browse] Opening GStack Browser so you can see what the remote agent does...');
// In compiled binaries, process.argv[1] is /$bunfs/... (virtual).
// Use process.execPath which is the real binary on disk.
const browseBin = process.execPath;
// --force-restart: the headed switch is this command's explicit purpose
// (the user asked to SEE the shared browser), and connect's #2219 guard
// would otherwise refuse to replace the healthy headless daemon.
const connectProc = Bun.spawn([browseBin, 'connect', '--force-restart'], {
windowsHide: true,
cwd: process.cwd(),
stdio: ['ignore', 'inherit', 'inherit'],
// Disable parent-PID monitoring: pair-agent needs the server to outlive
// the connect subprocess. Setting to 0 tells the server not to self-terminate.
env: { ...process.env, BROWSE_PARENT_PID: '0' },
});
await connectProc.exited;
// Re-read state after headed mode switch
const newState = readState();
if (newState && await isServerHealthy(newState.port)) {
state = newState as ServerState;
if (pairAgentPreexistingDaemonAlive && !globalFlags.forceRestart) {
// #2219 IRON RULE: only an explicit --force-restart may kill a live
// daemon. The headed switch is nice-to-have; the user's open tabs,
// cookies, and logins are not. Continue against the live headless
// daemon and tell the user how to opt into the headed relaunch.
const tabCount = await fetchDaemonTabCount(state.port);
const tabsPhrase = tabCount === null
? 'open tabs'
: `${tabCount} tab${tabCount === 1 ? '' : 's'}`;
console.warn(`[browse] Live headless daemon has ${tabsPhrase}; continuing against it — pass --force-restart to relaunch headed, losing tabs/cookies.`);
} else {
console.warn('[browse] Could not switch to headed mode. Continuing headless.');
console.log('[browse] Opening GStack Browser so you can see what the remote agent does...');
// In compiled binaries, process.argv[1] is /$bunfs/... (virtual).
// Use process.execPath which is the real binary on disk.
const browseBin = process.execPath;
// --force-restart: reaching this branch means either no live daemon
// predated this invocation (nothing of the user's dies) or the user
// explicitly passed --force-restart to pair-agent (consent given).
// connect's #2219 guard would otherwise refuse to replace the
// healthy headless daemon ensureServer just returned.
const connectProc = Bun.spawn([browseBin, 'connect', '--force-restart'], {
windowsHide: true,
cwd: process.cwd(),
stdio: ['ignore', 'inherit', 'inherit'],
// Disable parent-PID monitoring: pair-agent needs the server to outlive
// the connect subprocess. Setting to 0 tells the server not to self-terminate.
env: { ...process.env, BROWSE_PARENT_PID: '0' },
});
await connectProc.exited;
// Re-read state after headed mode switch
const newState = readState();
if (newState && await isServerHealthy(newState.port)) {
state = newState as ServerState;
} else {
console.warn('[browse] Could not switch to headed mode. Continuing headless.');
}
}
}
await handlePairAgent(state, commandArgs);