@hasna/accounts 0.1.3 → 0.1.5

package/dist/cli.js

@@ -2082,9 +2082,9 @@ var require_commander = __commonJS((exports) => {
 
 // src/cli.ts
 import { spawnSync } from "node:child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync5 } from "node:fs";
+import { existsSync as existsSync10, readFileSync as readFileSync6 } from "node:fs";
 import { homedir as homedir5 } from "node:os";
-import { dirname as dirname5, join as join10 } from "node:path";
+import { dirname as dirname5, join as join11 } from "node:path";
 import { fileURLToPath } from "node:url";
 
 // node_modules/commander/esm.mjs
@@ -6577,6 +6577,7 @@ var toolDefSchema = exports_external.object({
   bin: exports_external.string().min(1),
   loginArgs: exports_external.array(exports_external.string()).optional(),
   loginHint: exports_external.string().optional(),
+  resumeArgs: exports_external.array(exports_external.string()).optional(),
   accountFile: exports_external.string().optional(),
   emailPath: exports_external.array(exports_external.string()).optional()
 });
@@ -6745,6 +6746,7 @@ var BUILTIN_TOOLS = [
     defaultDir: join2(homedir2(), ".claude"),
     bin: "claude",
     loginHint: "run /login inside Claude, then /exit when done",
+    resumeArgs: ["--continue"],
     accountFile: ".claude.json",
     emailPath: ["oauthAccount", "emailAddress"]
   },
@@ -6755,7 +6757,8 @@ var BUILTIN_TOOLS = [
     defaultDir: join2(homedir2(), ".codex"),
     bin: "codex",
     loginArgs: ["login"],
-    loginHint: "complete the Codex login flow for this CODEX_HOME"
+    loginHint: "complete the Codex login flow for this CODEX_HOME",
+    resumeArgs: ["resume", "--last"]
   },
   {
     id: "opencode",
@@ -6768,7 +6771,8 @@ var BUILTIN_TOOLS = [
     defaultDir: join2(homedir2(), ".config", "opencode"),
     bin: "opencode",
     loginArgs: ["auth", "login"],
-    loginHint: "complete opencode auth login for this isolated config/data root"
+    loginHint: "complete opencode auth login for this isolated config/data root",
+    resumeArgs: ["--continue"]
   },
   {
     id: "cursor",
@@ -7575,6 +7579,411 @@ function finalizeLogin(name, toolId) {
   return { profile: updated, applied: false };
 }
 
+// src/lib/switch.ts
+function shellQuote(value) {
+  if (/^[A-Za-z0-9_./:=@+-]+$/.test(value))
+    return value;
+  return `'${value.replaceAll("'", "'\\''")}'`;
+}
+function commandLine(env2, command) {
+  return `${formatEnvAssignments(env2)} ${command.map(shellQuote).join(" ")}`.trim();
+}
+function commandFor(tool, opts) {
+  return [tool.bin, ...opts.resume ? tool.resumeArgs ?? [] : [], ...opts.args ?? []];
+}
+function switchProfile(name, opts = {}) {
+  const profile = getProfile(name, opts.tool);
+  const tool = getTool(profile.tool);
+  const mode = opts.mode ?? "auto";
+  if (!["auto", "apply", "env", "active"].includes(mode)) {
+    throw new AccountsError(`invalid switch mode "${mode}"`);
+  }
+  const env2 = profileEnv(profile, tool);
+  let applied = false;
+  if (mode === "apply" || mode === "auto" && tool.id === "claude") {
+    applyProfile(name, tool.id);
+    applied = true;
+  } else {
+    useProfile(name, tool.id);
+  }
+  const command = commandFor(tool, opts);
+  const restartRequired = opts.resume === true || applied || mode === "env";
+  const message = applied ? `${profile.name} is now the live/default ${tool.label} profile` : `${profile.name} is now the active ${tool.label} profile`;
+  return {
+    profile: getProfile(name, tool.id),
+    tool,
+    applied,
+    active: true,
+    env: env2,
+    exports: formatExportLines(env2),
+    command,
+    commandLine: commandLine(env2, command),
+    restartRequired,
+    message
+  };
+}
+
+// src/lib/supervisor.ts
+import { spawn } from "node:child_process";
+import { createHash } from "node:crypto";
+import { existsSync as existsSync9, mkdirSync as mkdirSync7, readFileSync as readFileSync5, readdirSync, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "node:fs";
+import { createConnection, createServer } from "node:net";
+import { basename, join as join10 } from "node:path";
+var STATE_SUFFIX = ".json";
+function supervisorDir() {
+  return join10(accountsHome(), "supervisors");
+}
+function supervisorStatePath(toolId) {
+  return join10(supervisorDir(), `${toolId}${STATE_SUFFIX}`);
+}
+function supervisorSocketPath(toolId) {
+  if (process.platform === "win32") {
+    const hash = createHash("sha1").update(accountsHome()).digest("hex").slice(0, 12);
+    return `\\\\.\\pipe\\hasna-accounts-${hash}-${toolId}`;
+  }
+  return join10(supervisorDir(), `${toolId}.sock`);
+}
+function nowIso2() {
+  return new Date().toISOString();
+}
+function parseState(raw) {
+  const data = JSON.parse(raw);
+  if (data.version !== 1 || typeof data.tool !== "string" || typeof data.profile !== "string" || typeof data.pid !== "number" || typeof data.socketPath !== "string" || !Array.isArray(data.command)) {
+    return;
+  }
+  return data;
+}
+function readSupervisorState(toolId) {
+  const path = supervisorStatePath(toolId);
+  if (!existsSync9(path))
+    return;
+  try {
+    return parseState(readFileSync5(path, "utf8"));
+  } catch {
+    return;
+  }
+}
+function listSupervisorStates() {
+  const dir = supervisorDir();
+  if (!existsSync9(dir))
+    return [];
+  return readdirSync(dir).filter((name) => name.endsWith(STATE_SUFFIX)).map((name) => basename(name, STATE_SUFFIX)).map((toolId) => readSupervisorState(toolId)).filter((state) => state !== undefined);
+}
+function writeSupervisorState(state) {
+  mkdirSync7(supervisorDir(), { recursive: true });
+  writeFileSync5(supervisorStatePath(state.tool), JSON.stringify(state, null, 2) + `
+`, { mode: 384 });
+}
+function removeSupervisorFiles(toolId) {
+  rmSync2(supervisorStatePath(toolId), { force: true });
+  if (process.platform !== "win32")
+    rmSync2(supervisorSocketPath(toolId), { force: true });
+}
+function processAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+function knownTool(id) {
+  try {
+    return getTool(id);
+  } catch {
+    return;
+  }
+}
+function resolveSupervisorLaunch(target, opts = {}) {
+  const targetTool = knownTool(target);
+  if (opts.profile) {
+    const profile2 = getProfile(opts.profile, opts.tool ?? targetTool?.id);
+    if (targetTool && profile2.tool !== targetTool.id) {
+      throw new AccountsError(`profile "${profile2.name}" belongs to ${profile2.tool}, not ${targetTool.id}`);
+    }
+    return { profile: profile2, tool: getTool(profile2.tool), targetKind: targetTool ? "tool" : "profile" };
+  }
+  if (targetTool && !opts.tool) {
+    const profile2 = currentProfile(targetTool.id) ?? appliedProfile(targetTool.id);
+    if (!profile2) {
+      throw new AccountsError(`no active ${targetTool.label} profile. Run \`accounts use <name> --tool ${targetTool.id}\` or pass --profile.`);
+    }
+    return { profile: profile2, tool: targetTool, targetKind: "tool" };
+  }
+  const profile = getProfile(target, opts.tool);
+  return { profile, tool: getTool(profile.tool), targetKind: "profile" };
+}
+function exitCode(code, signal) {
+  if (code !== null)
+    return code;
+  if (signal === "SIGINT")
+    return 130;
+  if (signal === "SIGTERM")
+    return 143;
+  return signal ? 1 : 0;
+}
+function killChildProcess(child, signal) {
+  if (!child.pid)
+    return;
+  if (process.platform !== "win32") {
+    try {
+      process.kill(-child.pid, signal);
+      return;
+    } catch {}
+  }
+  child.kill(signal);
+}
+function wait(ms) {
+  return new Promise((resolve3) => setTimeout(resolve3, ms));
+}
+async function listen(server, socketPath) {
+  await new Promise((resolve3, reject) => {
+    const onError = (err) => {
+      server.off("listening", onListening);
+      reject(err);
+    };
+    const onListening = () => {
+      server.off("error", onError);
+      resolve3();
+    };
+    server.once("error", onError);
+    server.once("listening", onListening);
+    server.listen(socketPath);
+  });
+}
+async function sendSupervisorRequest(toolId, request, opts = {}) {
+  const timeoutMs = opts.timeoutMs ?? 1500;
+  const socketPath = supervisorSocketPath(toolId);
+  return await new Promise((resolve3, reject) => {
+    const socket = createConnection(socketPath);
+    let buffer = "";
+    let settled = false;
+    const finish = (value) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      socket.destroy();
+      resolve3(value);
+    };
+    const fail = (err) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      socket.destroy();
+      if (opts.allowMissing && (err.code === "ENOENT" || err.code === "ECONNREFUSED")) {
+        resolve3(undefined);
+      } else {
+        reject(new AccountsError(`could not contact accounts supervisor for ${toolId}: ${err.message}`));
+      }
+    };
+    const timer = setTimeout(() => {
+      fail(Object.assign(new Error(`timed out after ${timeoutMs}ms`), { code: "ETIMEDOUT" }));
+    }, timeoutMs);
+    socket.setEncoding("utf8");
+    socket.once("connect", () => {
+      socket.write(JSON.stringify(request) + `
+`);
+    });
+    socket.once("error", fail);
+    socket.on("data", (chunk) => {
+      buffer += chunk;
+      const newline = buffer.indexOf(`
+`);
+      if (newline === -1)
+        return;
+      try {
+        finish(JSON.parse(buffer.slice(0, newline)));
+      } catch (err) {
+        fail(err);
+      }
+    });
+    socket.once("end", () => {
+      if (!settled)
+        fail(new Error("connection closed without a response"));
+    });
+  });
+}
+async function runSupervisedTool(initialProfile, tool, initialArgs = [], opts = {}) {
+  const socketPath = supervisorSocketPath(tool.id);
+  const existing = readSupervisorState(tool.id);
+  if (existing && processAlive(existing.pid)) {
+    throw new AccountsError(`an accounts supervisor for ${tool.label} is already running (pid ${existing.pid})`);
+  }
+  removeSupervisorFiles(tool.id);
+  mkdirSync7(supervisorDir(), { recursive: true });
+  const startedAt = nowIso2();
+  const restartDelayMs = opts.restartDelayMs ?? 350;
+  const log = opts.log ?? (() => {
+    return;
+  });
+  const server = createServer();
+  let profile = initialProfile;
+  let childArgs = initialArgs;
+  let child;
+  let stopping = false;
+  let restarting = false;
+  let settled = false;
+  const state = () => ({
+    version: 1,
+    tool: tool.id,
+    profile: profile.name,
+    pid: process.pid,
+    ...child?.pid ? { childPid: child.pid } : {},
+    socketPath,
+    command: [tool.bin, ...childArgs],
+    startedAt,
+    updatedAt: nowIso2()
+  });
+  const persist = () => writeSupervisorState(state());
+  const stopChild = async () => {
+    const target = child;
+    if (!target || target.exitCode !== null)
+      return;
+    await new Promise((resolve3) => {
+      let done2 = false;
+      const finish = () => {
+        if (done2)
+          return;
+        done2 = true;
+        clearTimeout(killTimer);
+        resolve3();
+      };
+      const killTimer = setTimeout(() => {
+        try {
+          killChildProcess(target, "SIGKILL");
+        } catch {
+          finish();
+        }
+      }, 2500);
+      target.once("exit", finish);
+      try {
+        killChildProcess(target, "SIGTERM");
+      } catch {
+        finish();
+      }
+    });
+  };
+  const cleanup = () => {
+    server.close();
+    removeSupervisorFiles(tool.id);
+    process.off("SIGINT", onSigint);
+    process.off("SIGTERM", onSigterm);
+  };
+  let resolveRun;
+  const done = new Promise((resolve3) => {
+    resolveRun = resolve3;
+  });
+  const finishRun = (code) => {
+    if (settled)
+      return;
+    settled = true;
+    cleanup();
+    resolveRun(code);
+  };
+  const startChild = (nextProfile, nextArgs) => {
+    profile = nextProfile;
+    childArgs = nextArgs;
+    useProfile(profile.name, tool.id);
+    const env2 = profileEnv(profile, tool);
+    log(`accounts supervisor: starting ${tool.bin} for ${profile.name}`);
+    const proc = spawn(tool.bin, childArgs, {
+      stdio: opts.stdio ?? "inherit",
+      env: { ...process.env, ...env2, ACCOUNTS_SUPERVISOR: "1", ACCOUNTS_ACTIVE: profile.name },
+      detached: process.platform !== "win32"
+    });
+    child = proc;
+    persist();
+    proc.once("error", (err) => {
+      log(`accounts supervisor: failed to start ${tool.bin}: ${err.message}`);
+      if (!restarting && !stopping)
+        finishRun(1);
+    });
+    proc.once("exit", (code, signal) => {
+      if (child === proc)
+        child = undefined;
+      persist();
+      if (restarting || stopping)
+        return;
+      finishRun(exitCode(code, signal));
+    });
+  };
+  const restartWith = async (result) => {
+    restarting = true;
+    try {
+      await wait(restartDelayMs);
+      await stopChild();
+      startChild(getProfile(result.profile.name, tool.id), result.command.slice(1));
+    } finally {
+      restarting = false;
+    }
+  };
+  const shutdown = async (code) => {
+    if (stopping)
+      return;
+    stopping = true;
+    await stopChild();
+    finishRun(code);
+  };
+  const handleRequest = async (request) => {
+    if (request.type === "status")
+      return { ok: true, state: state() };
+    if (request.type === "stop") {
+      setTimeout(() => void shutdown(0), 25);
+      return { ok: true, stopping: true, state: state() };
+    }
+    if (request.type !== "switch_profile")
+      return { ok: false, error: "unknown supervisor request" };
+    if (request.tool && request.tool !== tool.id) {
+      return { ok: false, error: `this supervisor runs ${tool.id}, not ${request.tool}` };
+    }
+    try {
+      const result = switchProfile(request.name, {
+        tool: tool.id,
+        mode: request.mode ?? "auto",
+        resume: request.resume ?? true,
+        args: request.args ?? []
+      });
+      log(`accounts supervisor: switching ${tool.id} to ${result.profile.name}`);
+      setTimeout(() => void restartWith(result), 0);
+      return { ok: true, queued: true, result, state: state(), restartDelayMs };
+    } catch (err) {
+      return { ok: false, error: err instanceof Error ? err.message : String(err) };
+    }
+  };
+  server.on("connection", (socket) => {
+    socket.setEncoding("utf8");
+    let buffer = "";
+    socket.on("data", (chunk) => {
+      buffer += chunk;
+      const newline = buffer.indexOf(`
+`);
+      if (newline === -1)
+        return;
+      const line = buffer.slice(0, newline);
+      buffer = buffer.slice(newline + 1);
+      (async () => {
+        let response;
+        try {
+          response = await handleRequest(JSON.parse(line));
+        } catch (err) {
+          response = { ok: false, error: err instanceof Error ? err.message : String(err) };
+        }
+        socket.end(JSON.stringify(response) + `
+`);
+      })();
+    });
+  });
+  const onSigint = () => void shutdown(130);
+  const onSigterm = () => void shutdown(143);
+  process.once("SIGINT", onSigint);
+  process.once("SIGTERM", onSigterm);
+  await listen(server, socketPath);
+  startChild(profile, childArgs);
+  return await done;
+}
+
 // src/cli.ts
 var program2 = new Command;
 function die(message) {
@@ -7584,7 +7993,11 @@ function die(message) {
 function action(fn) {
   return (...args) => {
     try {
-      fn(...args);
+      Promise.resolve(fn(...args)).catch((err) => {
+        if (err instanceof AccountsError)
+          die(err.message);
+        throw err;
+      });
     } catch (err) {
       if (err instanceof AccountsError)
         die(err.message);
@@ -7637,7 +8050,7 @@ program2.command("show").argument("<name>", "profile name").description("show fu
   console.log(`  tool:       ${p.tool} (${getTool(p.tool).label})`);
   console.log(`  active:     ${active ? source_default.green("yes") : source_default.dim("no")}`);
   console.log(`  applied:    ${isApplied ? source_default.magenta("yes") : source_default.dim("no")}`);
-  console.log(`  config dir: ${p.dir}${existsSync9(p.dir) ? "" : source_default.red("  [missing]")}`);
+  console.log(`  config dir: ${p.dir}${existsSync10(p.dir) ? "" : source_default.red("  [missing]")}`);
   console.log(`  email:      ${p.email ?? source_default.dim("(none)")}`);
   console.log(`  created:    ${p.createdAt}`);
   if (p.lastUsedAt)
@@ -7730,8 +8143,52 @@ program2.command("applied").argument("[tool]", "tool id (default: claude)").desc
     die(`no applied profile for "${tool}". Run \`accounts apply <name>\` first.`);
   console.log(p.name);
 }));
+program2.command("switch").argument("<name>", "profile name").argument("[args...]", "extra args passed when printing/launching the tool").description("switch to a profile and print a restart/resume command; use --launch to run it").option("-t, --tool <tool>", "tool when the profile name exists for multiple tools").option("--mode <mode>", "switch mode: auto, apply, env, active", "auto").option("--resume", "include the tool's resume/continue args in the handoff command").option("--launch", "launch the tool after switching").option("--supervisor", "ask a running accounts supervisor to restart the tool").option("--json", "output JSON").action(action(async (name, args, opts) => {
+  if (opts.supervisor && opts.launch)
+    die("--supervisor and --launch cannot be used together");
+  if (opts.supervisor) {
+    const profile = getProfile(name, opts.tool);
+    const response = await sendSupervisorRequest(profile.tool, { type: "switch_profile", name: profile.name, tool: profile.tool, mode: opts.mode, resume: opts.resume ?? true, args }, { allowMissing: true });
+    if (!response) {
+      die(`no running accounts supervisor for ${getTool(profile.tool).label}. Start one with \`accounts run ${profile.tool}\`.`);
+    }
+    if (!response.ok)
+      die(response.error);
+    if (opts.json) {
+      console.log(JSON.stringify(response, null, 2));
+    } else if ("queued" in response) {
+      console.log(source_default.green(`✓ queued supervisor switch to ${source_default.bold(response.result.profile.name)}`));
+      console.log(source_default.dim(`  ${response.state.command.join(" ")} will restart in ${response.restartDelayMs}ms`));
+    } else {
+      console.log(source_default.green("✓ supervisor responded"));
+    }
+    return;
+  }
+  const result = switchProfile(name, { tool: opts.tool, mode: opts.mode, resume: opts.resume, args });
+  if (opts.json) {
+    console.log(JSON.stringify(result, null, 2));
+  } else {
+    console.log(source_default.green(`✓ ${result.message}`));
+    if (result.applied)
+      console.log(source_default.dim("  live/default auth updated"));
+    console.log(source_default.dim(`  restart command: ${result.commandLine}`));
+    if (!opts.launch) {
+      console.log(source_default.yellow("  Exit the current agent session, then run the restart command above."));
+    }
+  }
+  if (opts.launch) {
+    const [bin, ...launchArgs] = result.command;
+    const res = spawnSync(bin, launchArgs, {
+      stdio: "inherit",
+      env: { ...process.env, ...result.env }
+    });
+    if (res.error)
+      die(`failed to launch ${bin}: ${res.error.message}`);
+    process.exit(res.status ?? 0);
+  }
+}));
 var hook = program2.command("hook").description("install a shell wrapper for claude");
-hook.command("install").description(`write ${join10(accountsHome(), "claude-hook.sh")}`).action(action(() => {
+hook.command("install").description(`write ${join11(accountsHome(), "claude-hook.sh")}`).action(action(() => {
   const { path, created } = installHook();
   console.log(source_default.green(created ? `✓ installed hook at ${path}` : `✓ updated hook at ${path}`));
   console.log(source_default.dim(`  add to ~/.zshrc:  ${shellSnippet()}`));
@@ -7753,7 +8210,7 @@ program2.command("env").argument("[name]", "profile name (defaults to the active
   const tool = getTool(profile.tool);
   console.log(formatExportLines(profileEnv(profile, tool)));
 }));
-program2.command("launch").alias("run").argument("<name>", "profile name").argument("[args...]", "extra args passed to the tool binary").description("launch the tool's binary with the profile's config dir active").option("-t, --tool <tool>", "tool when the profile name exists for multiple tools").action(action((name, args, opts) => {
+program2.command("launch").argument("<name>", "profile name").argument("[args...]", "extra args passed to the tool binary").description("launch the tool's binary with the profile's config dir active").option("-t, --tool <tool>", "tool when the profile name exists for multiple tools").action(action((name, args, opts) => {
   const profile = getProfile(name, opts.tool);
   const tool = getTool(profile.tool);
   const env2 = profileEnv(profile, tool);
@@ -7767,6 +8224,65 @@ program2.command("launch").alias("run").argument("<name>", "profile name").argum
     die(`failed to launch ${tool.bin}: ${res.error.message}`);
   process.exit(res.status ?? 0);
 }));
+program2.command("run").argument("<target>", "tool id to supervise (claude, codex, opencode...) or a profile name").argument("[args...]", "extra args passed to the tool binary").description("run a tool under the accounts supervisor so MCP can switch/restart it").option("-p, --profile <name>", "profile to run when target is a tool id").option("-t, --tool <tool>", "tool when target is a profile name").option("--resume", "start with the tool's resume/continue args").action(action(async (target, args, opts) => {
+  const plan = resolveSupervisorLaunch(target, { profile: opts.profile, tool: opts.tool });
+  const runArgs = [...opts.resume ? plan.tool.resumeArgs ?? [] : [], ...args];
+  console.error(source_default.green(`✓ accounts supervisor running ${plan.tool.label} as ${source_default.bold(plan.profile.name)}`));
+  console.error(source_default.dim(`  control: accounts supervisor status ${plan.tool.id}`));
+  console.error(source_default.dim(`  switch:  accounts switch <profile> --tool ${plan.tool.id} --supervisor`));
+  const code = await runSupervisedTool(plan.profile, plan.tool, runArgs, {
+    log: (message) => console.error(source_default.dim(message))
+  });
+  process.exit(code);
+}));
+var supervisor = program2.command("supervisor").description("inspect and control accounts-run supervisors");
+supervisor.command("status").argument("[tool]", "tool id").description("show running supervisor state").option("--json", "output JSON").action(action(async (toolId, opts) => {
+  const state = toolId ? readSupervisorState(toolId) : undefined;
+  const states = toolId ? state ? [state] : [] : listSupervisorStates();
+  const live = [];
+  for (const state2 of states) {
+    const response = await sendSupervisorRequest(state2.tool, { type: "status" }, { allowMissing: true });
+    live.push(response?.ok && "state" in response ? response.state : { ...state2, stale: true });
+  }
+  if (opts.json) {
+    console.log(JSON.stringify(live, null, 2));
+    return;
+  }
+  if (live.length === 0) {
+    console.log(source_default.dim("no accounts supervisors running"));
+    return;
+  }
+  for (const state2 of live) {
+    const stale = "stale" in state2 ? source_default.yellow(" stale") : "";
+    const child = state2.childPid ? ` child:${state2.childPid}` : "";
+    console.log(`${source_default.cyan(state2.tool.padEnd(10))} ${source_default.bold(state2.profile)} pid:${state2.pid}${child}${stale}`);
+    console.log(source_default.dim(`  ${state2.command.join(" ")}`));
+  }
+}));
+supervisor.command("switch").argument("<name>", "profile name").argument("[args...]", "extra args passed after resume/continue args").description("switch a running supervisor to another profile").option("-t, --tool <tool>", "tool when the profile name exists for multiple tools").option("--mode <mode>", "switch mode: auto, apply, env, active", "auto").option("--no-resume", "restart without the tool's resume/continue args").option("--json", "output JSON").action(action(async (name, args, opts) => {
+  const profile = getProfile(name, opts.tool);
+  const response = await sendSupervisorRequest(profile.tool, { type: "switch_profile", name: profile.name, tool: profile.tool, mode: opts.mode, resume: opts.resume !== false, args }, { allowMissing: true });
+  if (!response)
+    die(`no running accounts supervisor for ${getTool(profile.tool).label}`);
+  if (!response.ok)
+    die(response.error);
+  if (opts.json) {
+    console.log(JSON.stringify(response, null, 2));
+    return;
+  }
+  if ("queued" in response) {
+    console.log(source_default.green(`✓ queued supervisor switch to ${source_default.bold(response.result.profile.name)}`));
+    console.log(source_default.dim(`  restart command: ${response.result.commandLine}`));
+  }
+}));
+supervisor.command("stop").argument("<tool>", "tool id").description("stop a running supervisor and its child process").action(action(async (toolId) => {
+  const response = await sendSupervisorRequest(toolId, { type: "stop" }, { allowMissing: true });
+  if (!response)
+    die(`no running accounts supervisor for ${toolId}`);
+  if (!response.ok)
+    die(response.error);
+  console.log(source_default.green(`✓ stopping ${toolId} supervisor`));
+}));
 program2.command("shell").argument("<name>", "profile name").description("open a subshell with the profile's config dir active").option("-t, --tool <tool>", "tool when the profile name exists for multiple tools").action(action((name, opts) => {
   const profile = getProfile(name, opts.tool);
   const tool = getTool(profile.tool);
@@ -7829,7 +8345,7 @@ tools.command("list", { isDefault: true }).description("list supported tools (bu
     console.log(`${source_default.cyan(t.id.padEnd(10))} ${t.label.padEnd(16)} ${source_default.dim(envNames)} → ${source_default.dim(t.defaultDir)}  ${tag}`);
   }
 }));
-tools.command("add").argument("<id>", "tool id, e.g. cursor").description("register a custom tool/app so profiles can target it").requiredOption("--label <label>", 'display name, e.g. "Cursor"').requiredOption("--env-var <VAR>", "env var that points the tool at its config dir").requiredOption("--bin <bin>", "binary to launch").option("--default-dir <path>", "default config dir (default: ~/.<id>)").option("--extra-env <VAR=VALUE...>", "additional env var templates; supports {profileDir}, {profileName}, {toolId}").option("--login-arg <arg...>", "arguments for `accounts login <profile> --tool <id>`").option("--account-file <file>", "file inside the config dir holding the email").option("--email-path <path>", "dot-path to the email inside that file (e.g. account.email)").action(action((id, opts) => {
+tools.command("add").argument("<id>", "tool id, e.g. cursor").description("register a custom tool/app so profiles can target it").requiredOption("--label <label>", 'display name, e.g. "Cursor"').requiredOption("--env-var <VAR>", "env var that points the tool at its config dir").requiredOption("--bin <bin>", "binary to launch").option("--default-dir <path>", "default config dir (default: ~/.<id>)").option("--extra-env <VAR=VALUE...>", "additional env var templates; supports {profileDir}, {profileName}, {toolId}").option("--login-arg <arg...>", "arguments for `accounts login <profile> --tool <id>`").option("--resume-arg <arg...>", "arguments for supervised resume/restart, e.g. --continue").option("--account-file <file>", "file inside the config dir holding the email").option("--email-path <path>", "dot-path to the email inside that file (e.g. account.email)").action(action((id, opts) => {
   const extraEnv = {};
   for (const entry of opts.extraEnv ?? []) {
     const idx = entry.indexOf("=");
@@ -7842,9 +8358,10 @@ tools.command("add").argument("<id>", "tool id, e.g. cursor").description("regis
     label: opts.label,
     envVar: opts.envVar,
     bin: opts.bin,
-    defaultDir: opts.defaultDir ? expandPath(opts.defaultDir) : join10(homedir5(), `.${id}`),
+    defaultDir: opts.defaultDir ? expandPath(opts.defaultDir) : join11(homedir5(), `.${id}`),
     ...Object.keys(extraEnv).length > 0 ? { extraEnv } : {},
     ...opts.loginArg ? { loginArgs: opts.loginArg } : {},
+    ...opts.resumeArg ? { resumeArgs: opts.resumeArg } : {},
     ...opts.accountFile ? { accountFile: opts.accountFile } : {},
     ...opts.emailPath ? { emailPath: opts.emailPath.split(".") } : {}
   };
@@ -7862,7 +8379,7 @@ program2.command("doctor").description("check the store and profile dirs for pro
   const profiles = listProfiles();
   let problems = 0;
   for (const p of profiles) {
-    const missing = !existsSync9(p.dir);
+    const missing = !existsSync10(p.dir);
     const noEmail = !p.email;
     if (missing) {
       console.log(source_default.red(`  ✗ ${p.name}: config dir missing (${p.dir})`));
@@ -7910,9 +8427,9 @@ program2.parseAsync(process.argv);
 function getVersion() {
   try {
     const here = dirname5(fileURLToPath(import.meta.url));
-    for (const candidate of [join10(here, "..", "package.json"), join10(here, "package.json")]) {
-      if (existsSync9(candidate)) {
-        const pkg = JSON.parse(readFileSync5(candidate, "utf8"));
+    for (const candidate of [join11(here, "..", "package.json"), join11(here, "package.json")]) {
+      if (existsSync10(candidate)) {
+        const pkg = JSON.parse(readFileSync6(candidate, "utf8"));
         if (pkg.version)
           return pkg.version;
       }

package/dist/index.d.ts

@@ -10,6 +10,10 @@ export { importProfile, ensureProfileForLogin } from "./lib/import-profile.js";
 export type { ImportOptions } from "./lib/import-profile.js";
 export { finalizeLogin } from "./lib/login.js";
 export type { FinalizeLoginResult } from "./lib/login.js";
+export { switchProfile } from "./lib/switch.js";
+export type { SwitchMode, SwitchOptions, SwitchResult } from "./lib/switch.js";
+export { listSupervisorStates, readSupervisorState, resolveSupervisorLaunch, runSupervisedTool, sendSupervisorRequest, supervisorDir, supervisorSocketPath, supervisorStatePath, } from "./lib/supervisor.js";
+export type { RunSupervisorOptions, SupervisorClientOptions, SupervisorLaunchPlan, SupervisorRequest, SupervisorResponse, SupervisorState, } from "./lib/supervisor.js";
 export { pickProfile } from "./lib/pick.js";
 export type { PickOptions, PickResult } from "./lib/pick.js";
 export { installHook, uninstallHook, hookPath, hookScript, shellSnippet } from "./lib/hook.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,EACL,aAAa,EACb,YAAY,EACZ,OAAO,EACP,SAAS,EACT,aAAa,EACb,aAAa,EACb,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,UAAU,EACV,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC/F,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EACzB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC1F,OAAO,EACL,aAAa,EACb,YAAY,EACZ,OAAO,EACP,SAAS,EACT,aAAa,EACb,aAAa,EACb,gBAAgB,GACjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACL,UAAU,EACV,YAAY,EACZ,WAAW,EACX,UAAU,EACV,UAAU,EACV,aAAa,EACb,aAAa,EACb,aAAa,EACb,aAAa,EACb,UAAU,EACV,cAAc,GACf,MAAM,mBAAmB,CAAC;AAC3B,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClF,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC/E,YAAY,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,YAAY,EAAE,UAAU,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/E,OAAO,EACL,oBAAoB,EACpB,mBAAmB,EACnB,uBAAuB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACb,oBAAoB,EACpB,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,YAAY,EACV,oBAAoB,EACpB,uBAAuB,EACvB,oBAAoB,EACpB,iBAAiB,EACjB,kBAAkB,EAClB,eAAe,GAChB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC/F,OAAO,EACL,2BAA2B,EAC3B,yBAAyB,EACzB,4BAA4B,EAC5B,yBAAyB,EACzB,eAAe,EACf,cAAc,GACf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC"}