@galda/cli 0.10.45 → 0.10.46

package/bin/manager-for-ai.mjs

@@ -7,11 +7,12 @@
 // keyed URL. State lives in ~/.manager-for-ai (never in the npx cache).
 
 import { spawnSync } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
+import { homedir } from 'node:os';
 import { join, resolve, dirname } from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import { createServer } from 'node:net';
-import { isCommandOnPath, resolveConnectedAgents, resolveOpenBrowserDefault } from '../engine/lib.mjs';
+import { isCommandOnPath, resolveConnectedAgents, resolveOpenBrowserDefault, licenseTokenIdentity, classifyRelayClientConflict } from '../engine/lib.mjs';
 
 const ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..');
 const say = (m) => console.log(`[galda] ${m}`);
@@ -103,6 +104,38 @@ process.env.MANAGER_APP_URL = process.env.MANAGER_APP_URL ?? 'https://app.galda.
 // exists — the way to switch to a different account (a stale token otherwise
 // binds you to the previous account).
 if (process.argv.includes('--signin') || process.argv.includes('--login')) process.env.MANAGER_FORCE_SIGNIN = '1';
+// Duplicate-instance guard (2026-07-24). A SECOND `npx @galda/cli` for the SAME
+// account — while a first is already connected to the relay on this machine —
+// used to boot a doomed second manager on a fallback port (4401): its relay-client
+// hits the single-instance PID lock and exits, the supervisor restarts it, it
+// refuses again → an endless "connect / run npx" loop in that instance's UI, since
+// the first instance holds the one relay connection. The PID lock (relay-client.mjs,
+// #5) correctly PREVENTS two relay-clients, but nothing stopped the second SERVER
+// from booting and looping (dogfood 2026-07-24). Catch it here, before we pick a
+// port: if the relay lock is held by a LIVE process for the SAME identity, don't
+// start a second copy — point at the one already running and exit clean (0, not an
+// error: "already running" is not a fault). Skipped when there's no relay
+// (RELAY_URL empty = local-only, no contention), on an explicit account switch
+// (--signin), or the deliberate-second-instance hatch (RELAY_CLIENT_FORCE=1). A
+// DIFFERENT account is NOT caught here — that's a legitimate switch the relay-client
+// offers to take over (classifyRelayClientConflict → offer-switch).
+if (process.env.RELAY_URL && !process.env.MANAGER_FORCE_SIGNIN && process.env.RELAY_CLIENT_FORCE !== '1') {
+  const DATA_DIR = process.env.MANAGER_HOME
+    ?? (existsSync(join(ROOT, '.git')) ? join(ROOT, 'engine') : join(homedir(), '.manager-for-ai'));
+  let lock = null;
+  try { lock = JSON.parse(readFileSync(join(DATA_DIR, 'relay-client.lock'), 'utf8')); } catch { /* no lock yet */ }
+  let alive = false;
+  if (lock && Number.isFinite(lock.pid)) { try { process.kill(lock.pid, 0); alive = true; } catch { alive = false; } }
+  let identity = '';
+  try { identity = licenseTokenIdentity(readFileSync(join(DATA_DIR, 'license.token'), 'utf8').trim()); } catch { /* not signed in */ }
+  const conflict = classifyRelayClientConflict({ existingLock: lock, alive, newIdentity: identity });
+  if (conflict.action === 'refuse' && conflict.reason === 'same-account-already-connected') {
+    say(`Galda is already running for ${conflict.holderIdentity} on this machine (pid ${conflict.holderPid}).`);
+    say(`Open it at ${process.env.MANAGER_APP_URL || 'https://app.galda.app'} — not starting a second copy.`);
+    say('Switch accounts with `npx @galda/cli --signin`, or set MANAGER_HOME to a different folder to run a separate instance.');
+    process.exit(0);
+  }
+}
 // Choose a free port now and pin it for BOTH the server and the relay-client, so
 // a busy 4400 (another manager) no longer stops onboarding — no MANAGER_PORT by hand.
 const wantedPort = Number(process.env.MANAGER_PORT ?? 4400);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galda/cli",
-  "version": "0.10.45",
+  "version": "0.10.46",
   "type": "module",
   "description": "Galda - hand off work to Claude Code or Codex, get proof back. Runs on your existing subscription, no extra API cost.",
   "scripts": {