@event4u/agent-switch 2.2.0 → 2.3.0

package/dist/locks.js

@@ -87,3 +87,64 @@ export async function withProperLock(target, fn, timeoutMs = DEFAULT_TIMEOUT_MS)
         }
     }
 }
+/**
+ * Synchronous twin of {@link withProperLock} for agent-switch's own small
+ * stores (pools, protection): one read-modify-write at a time across every
+ * CLI and GUI process, so two writers cannot drop each other's change. Same
+ * directory-lock protocol and staleness rule; short waits block the thread
+ * (the critical section is a JSON read and write).
+ */
+export function withFileLockSync(target, fn, timeoutMs = DEFAULT_TIMEOUT_MS) {
+    const lockDir = lockDirFor(target);
+    const deadline = Date.now() + timeoutMs;
+    const nap = new Int32Array(new SharedArrayBuffer(4));
+    fs.mkdirSync(path.dirname(target), { recursive: true });
+    for (;;) {
+        try {
+            fs.mkdirSync(lockDir);
+            break;
+        }
+        catch (err) {
+            // Windows answers EPERM while another process is removing the lock dir.
+            const busy = err?.code === "EEXIST" || (process.platform === "win32" && err?.code === "EPERM");
+            if (!busy)
+                throw err;
+            if (err.code === "EPERM") {
+                if (Date.now() > deadline)
+                    throw err;
+                Atomics.wait(nap, 0, 0, 10);
+                continue;
+            }
+            let stale = false;
+            try {
+                stale = Date.now() - fs.statSync(lockDir).mtimeMs > STALENESS_MS;
+            }
+            catch {
+                continue;
+            }
+            if (stale) {
+                try {
+                    fs.rmdirSync(lockDir);
+                }
+                catch {
+                    /* raced with another taker — loop */
+                }
+                continue;
+            }
+            if (Date.now() > deadline)
+                throw new Error(`timed out waiting for the lock at ${lockDir}`);
+            Atomics.wait(nap, 0, 0, 10 + Math.floor(Math.random() * 15));
+        }
+    }
+    try {
+        return fn();
+    }
+    finally {
+        try {
+            fs.rmdirSync(lockDir);
+        }
+        catch {
+            /* already gone */
+        }
+    }
+}

package/dist/pools.js

@@ -6,6 +6,7 @@
  * and keyed by `provider/name`; a pool may hold profiles of several providers,
  * and a lookup only ever considers members of the provider being started.
  */
+import { withFileLockSync } from "./locks.js";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { ROOT, ensureRoot, labelFor, listAllProfiles, PROFILE_LABELS } from "./profiles.js";
@@ -68,63 +69,75 @@ function mustFind(pools, id) {
     return p;
 }
 export function createPool(name, file = POOLS_FILE, now = new Date()) {
-    const display = name.trim();
-    const id = slugify(display);
-    if (!id)
-        throw new Error("pool name needs at least one letter or digit");
-    const pools = readPools(file);
-    if (pools.some((p) => p.id === id))
-        throw new Error(`a pool "${id}" already exists`);
-    const pool = { id, name: display, members: [], createdAt: now.toISOString() };
-    save([...pools, pool], file);
-    return pool;
+    return withFileLockSync(file, () => {
+        const display = name.trim();
+        const id = slugify(display);
+        if (!id)
+            throw new Error("pool name needs at least one letter or digit");
+        const pools = readPools(file);
+        if (pools.some((p) => p.id === id))
+            throw new Error(`a pool "${id}" already exists`);
+        const pool = { id, name: display, members: [], createdAt: now.toISOString() };
+        save([...pools, pool], file);
+        return pool;
+    });
 }
 /** Renames the display name only — the id stays, so folder rules keep working. */
 export function renamePool(id, name, file = POOLS_FILE) {
-    const pools = readPools(file);
-    const p = mustFind(pools, id);
-    if (!name.trim())
-        throw new Error("pool name must not be empty");
-    p.name = name.trim();
-    save(pools, file);
-    return p;
+    return withFileLockSync(file, () => {
+        const pools = readPools(file);
+        const p = mustFind(pools, id);
+        if (!name.trim())
+            throw new Error("pool name must not be empty");
+        p.name = name.trim();
+        save(pools, file);
+        return p;
+    });
 }
 export function deletePool(id, file = POOLS_FILE) {
-    const pools = readPools(file);
-    mustFind(pools, id);
-    save(pools.filter((p) => p.id !== id), file);
+    return withFileLockSync(file, () => {
+        const pools = readPools(file);
+        mustFind(pools, id);
+        save(pools.filter((p) => p.id !== id), file);
+    });
 }
 export function addPoolMember(id, member, file = POOLS_FILE) {
-    if (!parseMember(member))
-        throw new Error(`"${member}" is not a profile key (expected provider/name, e.g. claude/work)`);
-    const pools = readPools(file);
-    const p = mustFind(pools, id);
-    if (!p.members.includes(member))
-        p.members.push(member);
-    save(pools, file);
-    return p;
+    return withFileLockSync(file, () => {
+        if (!parseMember(member))
+            throw new Error(`"${member}" is not a profile key (expected provider/name, e.g. claude/work)`);
+        const pools = readPools(file);
+        const p = mustFind(pools, id);
+        if (!p.members.includes(member))
+            p.members.push(member);
+        save(pools, file);
+        return p;
+    });
 }
 export function removePoolMember(id, member, file = POOLS_FILE) {
-    const pools = readPools(file);
-    const p = mustFind(pools, id);
-    p.members = p.members.filter((m) => m !== member);
-    save(pools, file);
-    return p;
+    return withFileLockSync(file, () => {
+        const pools = readPools(file);
+        const p = mustFind(pools, id);
+        p.members = p.members.filter((m) => m !== member);
+        save(pools, file);
+        return p;
+    });
 }
 /** Keep memberships pointing at a profile across a rename / drop them on remove. */
 export function renamePoolMember(from, to, file = POOLS_FILE) {
-    const pools = readPools(file);
-    let changed = false;
-    for (const p of pools) {
-        if (!p.members.includes(from))
-            continue;
-        p.members = p.members.filter((m) => m !== from);
-        if (to && !p.members.includes(to))
-            p.members.push(to);
-        changed = true;
-    }
-    if (changed)
-        save(pools, file);
+    return withFileLockSync(file, () => {
+        const pools = readPools(file);
+        let changed = false;
+        for (const p of pools) {
+            if (!p.members.includes(from))
+                continue;
+            p.members = p.members.filter((m) => m !== from);
+            if (to && !p.members.includes(to))
+                p.members.push(to);
+            changed = true;
+        }
+        if (changed)
+            save(pools, file);
+    });
 }
 /**
  * "Suggest from tags": one proposed pool per label in use. A preview only —

package/dist/profiles.js

@@ -1,4 +1,5 @@
 /** Profile roots, per-provider state, layout migration, and shared helpers. */
+import { withFileLockSync } from "./locks.js";
 import * as fs from "node:fs";
 import * as os from "node:os";
 import * as path from "node:path";
@@ -70,6 +71,20 @@ export function configDir(providerId, name) {
 export function browserDir(providerId, name) {
     return path.join(profileDir(providerId, name), "browser");
 }
+/** Present in a profile dir when `import` seeded it with the default install's
+ *  credential: both now share one OAuth lineage, and whichever side refreshes
+ *  first signs the other out. Holds a date only, never a credential. */
+export const SHARED_LOGIN_MARKER = "shares-default-login";
+export function sharesDefaultLogin(providerId, name) {
+    return fs.existsSync(path.join(profileDir(providerId, name), SHARED_LOGIN_MARKER));
+}
+export function setSharesDefaultLogin(providerId, name, on) {
+    const file = path.join(profileDir(providerId, name), SHARED_LOGIN_MARKER);
+    if (!on)
+        return void fs.rmSync(file, { force: true });
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(file, `imported ${new Date().toISOString()}\n`, { mode: 0o600 });
+}
 export function profileExists(providerId, name) {
     return fs.existsSync(configDir(providerId, name));
 }
@@ -219,9 +234,11 @@ export function readOsNotifications() {
     return readState().osNotifications;
 }
 export function setOsNotifications(on) {
-    const state = readState();
-    state.osNotifications = on;
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        state.osNotifications = on;
+        writeState(state);
+    });
 }
 // ---------- single-load guard policy ----------
 /** How the single-load guard reacts to a second load of one profile. */
@@ -230,9 +247,11 @@ export function readGuard() {
 }
 /** Persist the guard policy. */
 export function setGuard(policy) {
-    const state = readState();
-    state.guard = policy;
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        state.guard = policy;
+        writeState(state);
+    });
 }
 // ---------- rebind kill-switch / circuit-breaker (ADR-003) ----------
 /** Current rollback/circuit-breaker state for the `rebind` write path. */
@@ -241,38 +260,58 @@ export function readRebindKillSwitch() {
 }
 /** Persist the rebind kill-switch state (breaker counter + disabled flag). */
 export function writeRebindKillSwitch(next) {
-    const state = readState();
-    state.rebind = normalizeRebindState(next);
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        state.rebind = normalizeRebindState(next);
+        writeState(state);
+    });
 }
 /** Re-enable `rebind`: clear `disabled` + reset the failure counter (`--reset`). */
 export function resetRebindKillSwitch() {
     writeRebindKillSwitch({ ...DEFAULT_REBIND_STATE });
 }
+/** Keys this version does not know are carried over: an older CLI still on
+ *  PATH must not drop a newer one's settings (2.1.0 dropped `disabled`, which
+ *  silently re-enabled disabled accounts). */
 export function writeState(state) {
     ensureRoot();
-    fs.writeFileSync(STATE_FILE, JSON.stringify(state, null, 2) + "\n", { mode: 0o600 });
+    let previous = {};
+    try {
+        const raw = JSON.parse(fs.readFileSync(STATE_FILE, "utf8"));
+        if (raw && typeof raw === "object" && !Array.isArray(raw))
+            previous = raw;
+    }
+    catch {
+        /* absent / unparsable — nothing to keep */
+    }
+    const tmp = `${STATE_FILE}.${process.pid}.tmp`;
+    fs.writeFileSync(tmp, JSON.stringify({ ...previous, ...state }, null, 2) + "\n", { mode: 0o600 });
+    fs.renameSync(tmp, STATE_FILE);
 }
 export function activeFor(providerId) {
     return readState().active[providerId];
 }
 export function setActive(providerId, name) {
-    const state = readState();
-    state.active[providerId] = name;
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        state.active[providerId] = name;
+        writeState(state);
+    });
 }
 export function labelFor(providerId, name) {
     return readState().labels[labelKey(providerId, name)] ?? null;
 }
 /** Set (or clear, with null) a profile's label. */
 export function setLabel(providerId, name, label) {
-    const state = readState();
-    const key = labelKey(providerId, name);
-    if (label)
-        state.labels[key] = label;
-    else
-        delete state.labels[key];
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        const key = labelKey(providerId, name);
+        if (label)
+            state.labels[key] = label;
+        else
+            delete state.labels[key];
+        writeState(state);
+    });
 }
 /** Drop a removed profile's label, colour and disabled flag so they can't
  *  linger as orphans (a reused name starts clean). */
@@ -286,28 +325,32 @@ export function isDisabled(providerId, name) {
 }
 /** Disable (or re-enable) a profile. Disabling the active one clears the slot. */
 export function setDisabled(providerId, name, disabled) {
-    const state = readState();
-    const key = labelKey(providerId, name);
-    state.disabled = state.disabled.filter((k) => k !== key);
-    if (disabled) {
-        state.disabled.push(key);
-        if (state.active[providerId] === name)
-            state.active[providerId] = null;
-    }
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        const key = labelKey(providerId, name);
+        state.disabled = state.disabled.filter((k) => k !== key);
+        if (disabled) {
+            state.disabled.push(key);
+            if (state.active[providerId] === name)
+                state.active[providerId] = null;
+        }
+        writeState(state);
+    });
 }
 export function colorOf(providerId, name) {
     return readState().colors[labelKey(providerId, name)] ?? null;
 }
 /** Set (or clear, with null) a profile's colour. */
 export function setColor(providerId, name, color) {
-    const state = readState();
-    const key = labelKey(providerId, name);
-    if (color)
-        state.colors[key] = color;
-    else
-        delete state.colors[key];
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        const key = labelKey(providerId, name);
+        if (color)
+            state.colors[key] = color;
+        else
+            delete state.colors[key];
+        writeState(state);
+    });
 }
 /**
  * Rename a profile: move its config dir, carry its Claude credential across the
@@ -325,37 +368,39 @@ export function setColor(providerId, name, color) {
  * keychain ops are no-ops, so the re-seed is a harmless same-content rewrite.
  */
 export function renameProfile(providerId, from, to, store = credentialStore()) {
-    if (!profileExists(providerId, from))
-        throw new Error(`profile "${from}" does not exist`);
-    if (profileExists(providerId, to))
-        throw new Error(`profile "${to}" already exists`);
-    const fromConfig = configDir(providerId, from);
-    const toConfig = configDir(providerId, to);
-    // Capture the credential while the old path (and thus the darwin keychain hash)
-    // still resolves. Only Claude uses this store; codex/antigravity keep auth inside
-    // the config dir, which simply moves with the rename.
-    const cred = providerId === "claude" ? store.read(fromConfig) : null;
-    fs.renameSync(profileDir(providerId, from), profileDir(providerId, to));
-    if (cred) {
-        store.clearStale(toConfig); // a stale hashed entry at the new path would shadow the seed (darwin)
-        fs.writeFileSync(path.join(toConfig, ".credentials.json"), cred, { mode: 0o600 });
-        store.removeEntry(fromConfig); // drop the orphaned old-path keychain entry (darwin)
-    }
-    const state = readState();
-    if (state.active[providerId] === from)
-        state.active[providerId] = to;
-    const fromKey = labelKey(providerId, from);
-    const toKey = labelKey(providerId, to);
-    if (state.labels[fromKey] !== undefined) {
-        state.labels[toKey] = state.labels[fromKey];
-        delete state.labels[fromKey];
-    }
-    if (state.colors[fromKey] !== undefined) {
-        state.colors[toKey] = state.colors[fromKey];
-        delete state.colors[fromKey];
-    }
-    state.disabled = state.disabled.map((k) => (k === fromKey ? toKey : k));
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        if (!profileExists(providerId, from))
+            throw new Error(`profile "${from}" does not exist`);
+        if (profileExists(providerId, to))
+            throw new Error(`profile "${to}" already exists`);
+        const fromConfig = configDir(providerId, from);
+        const toConfig = configDir(providerId, to);
+        // Capture the credential while the old path (and thus the darwin keychain hash)
+        // still resolves. Only Claude uses this store; codex/antigravity keep auth inside
+        // the config dir, which simply moves with the rename.
+        const cred = providerId === "claude" ? store.read(fromConfig) : null;
+        fs.renameSync(profileDir(providerId, from), profileDir(providerId, to));
+        if (cred) {
+            store.clearStale(toConfig); // a stale hashed entry at the new path would shadow the seed (darwin)
+            fs.writeFileSync(path.join(toConfig, ".credentials.json"), cred, { mode: 0o600 });
+            store.removeEntry(fromConfig); // drop the orphaned old-path keychain entry (darwin)
+        }
+        const state = readState();
+        if (state.active[providerId] === from)
+            state.active[providerId] = to;
+        const fromKey = labelKey(providerId, from);
+        const toKey = labelKey(providerId, to);
+        if (state.labels[fromKey] !== undefined) {
+            state.labels[toKey] = state.labels[fromKey];
+            delete state.labels[fromKey];
+        }
+        if (state.colors[fromKey] !== undefined) {
+            state.colors[toKey] = state.colors[fromKey];
+            delete state.colors[fromKey];
+        }
+        state.disabled = state.disabled.map((k) => (k === fromKey ? toKey : k));
+        writeState(state);
+    });
 }
 export function readAutoSwitch(providerId) {
     return readState().autoSwitch[providerId];
@@ -365,10 +410,12 @@ export function readAutoSwitchAll() {
     return readState().autoSwitch;
 }
 export function setAutoSwitch(providerId, cfg) {
-    const state = readState();
-    state.autoSwitch[providerId] = normalizeAutoSwitch({ ...state.autoSwitch[providerId], ...cfg });
-    writeState(state);
-    return state.autoSwitch[providerId];
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        state.autoSwitch[providerId] = normalizeAutoSwitch({ ...state.autoSwitch[providerId], ...cfg });
+        writeState(state);
+        return state.autoSwitch[providerId];
+    });
 }
 // ---------- provider enable/disable (per surface) ----------
 /** Every provider's enabled surfaces (for `providers status` / the GUI tab). */
@@ -387,10 +434,12 @@ export function enabledProviders(surface = "cli") {
 }
 /** Enable/disable one surface of a provider; returns its new surface state. */
 export function setProviderSurface(providerId, surface, enabled) {
-    const state = readState();
-    state.providers[providerId] = { ...state.providers[providerId], [surface]: enabled };
-    writeState(state);
-    return state.providers[providerId];
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        state.providers[providerId] = { ...state.providers[providerId], [surface]: enabled };
+        writeState(state);
+        return state.providers[providerId];
+    });
 }
 // ---------- linked binary paths (provider CLI not on PATH) ----------
 /** The user-linked absolute path to a provider's CLI binary, or null. */
@@ -403,12 +452,14 @@ export function readBinaryPaths() {
 }
 /** Link (set) or unlink (null) a provider's CLI binary path. */
 export function setBinaryPath(providerId, binPath) {
-    const state = readState();
-    if (binPath)
-        state.binaryPaths[providerId] = binPath;
-    else
-        delete state.binaryPaths[providerId];
-    writeState(state);
+    return withFileLockSync(STATE_FILE, () => {
+        const state = readState();
+        if (binPath)
+            state.binaryPaths[providerId] = binPath;
+        else
+            delete state.binaryPaths[providerId];
+        writeState(state);
+    });
 }
 // ---------- layout migration: v1 <ROOT>/<name> → <ROOT>/claude/<name> ----------
 /**

package/dist/protection.js

@@ -9,6 +9,7 @@
  * hold the session (Claude Code's own auto-continue), which agent-switch cannot
  * verify from here, so every notice says "warn" — never "paused".
  */
+import { withFileLockSync } from "./locks.js";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { ROOT, ensureRoot } from "./profiles.js";
@@ -46,30 +47,36 @@ export function readProtection(providerId, name, file = PROTECTION_FILE) {
     return normalize(load(file)[key(providerId, name)]);
 }
 export function setProtection(providerId, name, patch, file = PROTECTION_FILE) {
-    if (patch.thresholdPct !== undefined && !validThreshold(patch.thresholdPct)) {
-        throw new Error("threshold must be a whole number between 1 and 100");
-    }
-    const all = load(file);
-    const next = normalize({ ...normalize(all[key(providerId, name)]), ...patch });
-    all[key(providerId, name)] = next;
-    save(all, file);
-    return next;
+    return withFileLockSync(file, () => {
+        if (patch.thresholdPct !== undefined && !validThreshold(patch.thresholdPct)) {
+            throw new Error("threshold must be a whole number between 1 and 100");
+        }
+        const all = load(file);
+        const next = normalize({ ...normalize(all[key(providerId, name)]), ...patch });
+        all[key(providerId, name)] = next;
+        save(all, file);
+        return next;
+    });
 }
 /** Carry a profile's policy across a rename; drop it on remove. */
 export function renameProtection(providerId, from, to, file = PROTECTION_FILE) {
-    const all = load(file);
-    if (!(key(providerId, from) in all))
-        return;
-    all[key(providerId, to)] = all[key(providerId, from)];
-    delete all[key(providerId, from)];
-    save(all, file);
+    return withFileLockSync(file, () => {
+        const all = load(file);
+        if (!(key(providerId, from) in all))
+            return;
+        all[key(providerId, to)] = all[key(providerId, from)];
+        delete all[key(providerId, from)];
+        save(all, file);
+    });
 }
 export function forgetProtection(providerId, name, file = PROTECTION_FILE) {
-    const all = load(file);
-    if (!(key(providerId, name) in all))
-        return;
-    delete all[key(providerId, name)];
-    save(all, file);
+    return withFileLockSync(file, () => {
+        const all = load(file);
+        if (!(key(providerId, name) in all))
+            return;
+        delete all[key(providerId, name)];
+        save(all, file);
+    });
 }
 /**
  * The threshold warning for one profile, or null. Pure. Fires once per reset

package/dist/rebind.js

@@ -30,7 +30,7 @@ import * as nodePath from "node:path";
 import { fetchProfile } from "./api.js";
 import * as keychain from "./keychain.js";
 import { withProperLock } from "./locks.js";
-import { configDir, ROOT, readRebindKillSwitch, writeRebindKillSwitch } from "./profiles.js";
+import { configDir, ROOT, readRebindKillSwitch, sharesDefaultLogin, writeRebindKillSwitch } from "./profiles.js";
 import { freshenToken } from "./token-freshen.js";
 /** <10 min to expiry → refuse (2× Claude Code's own 5-min refresh buffer). */
 export const FRESHEN_FLOOR_MS = 10 * 60 * 1000;
@@ -127,6 +127,7 @@ export function defaultDeps() {
             }
         },
         resolveAccount: resolveAccountViaApi,
+        sharesDefaultLogin: (name) => sharesDefaultLogin("claude", name),
     };
 }
 function credFile(cfgDir) {
@@ -549,6 +550,11 @@ async function performRebind(opts, d) {
     if (account === profile) {
         throw new RebindRefused(`cannot rebind "${profile}" to itself`);
     }
+    for (const name of [profile, account]) {
+        if (d.sharesDefaultLogin?.(name)) {
+            throw new RebindRefused(`"${name}" shares its login with the default install — rebinding would refresh or move it and sign the default install out. Give it its own login first: agent-switch login ${name}`);
+        }
+    }
     const pConfig = configDir("claude", profile);
     const aConfig = configDir("claude", account);
     // Already rebound → RE-SWITCH: put both profiles back on their own accounts

package/dist/service.js

@@ -96,6 +96,22 @@ export function serviceTarget() {
     const me = runInvocation();
     return m.invocation && m.invocation.exec === me.exec && m.invocation.args.join("\0") === me.args.join("\0") ? "this-cli" : "other-cli";
 }
+/** What `update` does with the service once the new version is on disk. Our
+ *  own service is re-installed so it restarts on the new code; one that runs
+ *  another CLI (a dev checkout) is not ours to re-point. */
+export function serviceAfterUpdate(target, interactive) {
+    if (target === "this-cli")
+        return "reinstall";
+    if (target === "other-cli")
+        return "leave";
+    return interactive ? "ask" : "hint";
+}
+/** Runs `service install` through the CLI file on disk — after a self-update
+ *  that is the new version, while this process is still the old one. */
+export function serviceInstallFromDisk() {
+    const { exec, args } = runInvocation();
+    return spawnSync(exec, [args[0], "service", "install"], { stdio: "inherit" }).status ?? 1;
+}
 // ---------- install / uninstall ----------
 export function serviceInstall(log = console.log) {
     const { exec, args } = runInvocation();