@hasna/accounts 0.1.4 → 0.1.5

package/dist/index.js

@@ -4938,6 +4938,366 @@ function switchProfile(name, opts = {}) {
     message
   };
 }
+// src/lib/supervisor.ts
+import { spawn } from "node:child_process";
+import { createHash } from "node:crypto";
+import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync4, readdirSync, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "node:fs";
+import { createConnection, createServer } from "node:net";
+import { basename, join as join9 } from "node:path";
+var STATE_SUFFIX = ".json";
+function supervisorDir() {
+  return join9(accountsHome(), "supervisors");
+}
+function supervisorStatePath(toolId) {
+  return join9(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 join9(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 (!existsSync8(path))
+    return;
+  try {
+    return parseState(readFileSync4(path, "utf8"));
+  } catch {
+    return;
+  }
+}
+function listSupervisorStates() {
+  const dir = supervisorDir();
+  if (!existsSync8(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) {
+  mkdirSync6(supervisorDir(), { recursive: true });
+  writeFileSync4(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);
+  mkdirSync6(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 env = 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, ...env, 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/lib/pick.ts
 import * as readline from "node:readline/promises";
 import { stdin as input, stdout as output } from "node:process";
@@ -4971,8 +5331,8 @@ async function pickProfile(opts = {}) {
   return { profile, mode };
 }
 // src/lib/hook.ts
-import { existsSync as existsSync8, mkdirSync as mkdirSync6, readFileSync as readFileSync4, unlinkSync as unlinkSync3, writeFileSync as writeFileSync4 } from "node:fs";
-import { join as join9 } from "node:path";
+import { existsSync as existsSync9, mkdirSync as mkdirSync7, readFileSync as readFileSync5, unlinkSync as unlinkSync3, writeFileSync as writeFileSync5 } from "node:fs";
+import { join as join10 } from "node:path";
 var HOOK_FILE = "claude-hook.sh";
 var MARKER = "# accounts-claude-hook";
 var NAME_PATTERN = "^[a-z0-9][a-z0-9-]*$";
@@ -4980,7 +5340,7 @@ function shellQuotePath(path) {
   return `'${path.replace(/'/g, `'\\''`)}'`;
 }
 function hookPath() {
-  return join9(accountsHome(), HOOK_FILE);
+  return join10(accountsHome(), HOOK_FILE);
 }
 function hookScript() {
   const quotedHook = shellQuotePath(hookPath());
@@ -5010,16 +5370,16 @@ claude() {
 }
 function installHook() {
   const path = hookPath();
-  mkdirSync6(accountsHome(), { recursive: true });
-  const created = !existsSync8(path);
-  writeFileSync4(path, hookScript(), { mode: 493 });
+  mkdirSync7(accountsHome(), { recursive: true });
+  const created = !existsSync9(path);
+  writeFileSync5(path, hookScript(), { mode: 493 });
   return { path, created };
 }
 function uninstallHook() {
   const path = hookPath();
-  if (!existsSync8(path))
+  if (!existsSync9(path))
     return false;
-  const content = readFileSync4(path, "utf8");
+  const content = readFileSync5(path, "utf8");
   if (!content.includes(MARKER))
     return false;
   unlinkSync3(path);
@@ -5038,17 +5398,24 @@ export {
   uninstallHook,
   toolDefSchema,
   switchProfile,
+  supervisorStatePath,
+  supervisorSocketPath,
+  supervisorDir,
   storeSchema,
   storePath,
   snapshotLiveAuthToProfile,
   snapshotClaudeAuthToProfile,
   shellSnippet,
+  sendSupervisorRequest,
   saveStore,
+  runSupervisedTool,
   restoreClaudeAuthFromProfile,
+  resolveSupervisorLaunch,
   renameProfile,
   removeProfile,
   removeCustomTool,
   redetectEmail,
+  readSupervisorState,
   readClaudeKeychain,
   profilesDir,
   profileSchema,
@@ -5058,6 +5425,7 @@ export {
   pickProfile,
   loadStore,
   listTools,
+  listSupervisorStates,
   listProfiles,
   keychainSupported,
   isSafeProfileName,

package/dist/lib/supervisor.d.ts

@@ -0,0 +1,69 @@
+import { type StdioOptions } from "node:child_process";
+import type { Profile, ToolDef } from "../types.js";
+import { type SwitchMode, type SwitchResult } from "./switch.js";
+export interface SupervisorState {
+    version: 1;
+    tool: string;
+    profile: string;
+    pid: number;
+    childPid?: number;
+    socketPath: string;
+    command: string[];
+    startedAt: string;
+    updatedAt: string;
+}
+export type SupervisorRequest = {
+    type: "status";
+} | {
+    type: "switch_profile";
+    name: string;
+    tool?: string;
+    mode?: SwitchMode;
+    resume?: boolean;
+    args?: string[];
+} | {
+    type: "stop";
+};
+export type SupervisorResponse = {
+    ok: true;
+    state: SupervisorState;
+} | {
+    ok: true;
+    queued: true;
+    result: SwitchResult;
+    state: SupervisorState;
+    restartDelayMs: number;
+} | {
+    ok: true;
+    stopping: true;
+    state: SupervisorState;
+} | {
+    ok: false;
+    error: string;
+};
+export interface SupervisorLaunchPlan {
+    profile: Profile;
+    tool: ToolDef;
+    targetKind: "tool" | "profile";
+}
+export interface RunSupervisorOptions {
+    stdio?: StdioOptions;
+    restartDelayMs?: number;
+    log?: (message: string) => void;
+}
+export interface SupervisorClientOptions {
+    timeoutMs?: number;
+    allowMissing?: boolean;
+}
+export declare function supervisorDir(): string;
+export declare function supervisorStatePath(toolId: string): string;
+export declare function supervisorSocketPath(toolId: string): string;
+export declare function readSupervisorState(toolId: string): SupervisorState | undefined;
+export declare function listSupervisorStates(): SupervisorState[];
+export declare function resolveSupervisorLaunch(target: string, opts?: {
+    profile?: string;
+    tool?: string;
+}): SupervisorLaunchPlan;
+export declare function sendSupervisorRequest(toolId: string, request: SupervisorRequest, opts?: SupervisorClientOptions): Promise<SupervisorResponse | undefined>;
+export declare function runSupervisedTool(initialProfile: Profile, tool: ToolDef, initialArgs?: string[], opts?: RunSupervisorOptions): Promise<number>;
+//# sourceMappingURL=supervisor.d.ts.map

package/dist/lib/supervisor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"supervisor.d.ts","sourceRoot":"","sources":["../../src/lib/supervisor.ts"],"names":[],"mappings":"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"}

package/dist/mcp.js

@@ -17295,6 +17295,103 @@ function switchProfile(name, opts = {}) {
   };
 }
 
+// src/lib/supervisor.ts
+import { createHash } from "node:crypto";
+import { existsSync as existsSync5, mkdirSync as mkdirSync5, readFileSync as readFileSync3, readdirSync, rmSync, writeFileSync as writeFileSync4 } from "node:fs";
+import { createConnection, createServer } from "node:net";
+import { basename, join as join6 } from "node:path";
+var STATE_SUFFIX = ".json";
+function supervisorDir() {
+  return join6(accountsHome(), "supervisors");
+}
+function supervisorStatePath(toolId) {
+  return join6(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 join6(supervisorDir(), `${toolId}.sock`);
+}
+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 (!existsSync5(path))
+    return;
+  try {
+    return parseState(readFileSync3(path, "utf8"));
+  } catch {
+    return;
+  }
+}
+function listSupervisorStates() {
+  const dir = supervisorDir();
+  if (!existsSync5(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);
+}
+async function sendSupervisorRequest(toolId, request, opts = {}) {
+  const timeoutMs = opts.timeoutMs ?? 1500;
+  const socketPath = supervisorSocketPath(toolId);
+  return await new Promise((resolve2, reject) => {
+    const socket = createConnection(socketPath);
+    let buffer = "";
+    let settled = false;
+    const finish = (value) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      socket.destroy();
+      resolve2(value);
+    };
+    const fail = (err) => {
+      if (settled)
+        return;
+      settled = true;
+      clearTimeout(timer);
+      socket.destroy();
+      if (opts.allowMissing && (err.code === "ENOENT" || err.code === "ECONNREFUSED")) {
+        resolve2(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"));
+    });
+  });
+}
+
 // src/mcp.ts
 function ok(data) {
   return { content: [{ type: "text", text: JSON.stringify(data, null, 2) }] };
@@ -17302,7 +17399,7 @@ function ok(data) {
 function fail(message) {
   return { content: [{ type: "text", text: JSON.stringify({ error: message }) }], isError: true };
 }
-var server = new Server({ name: "accounts", version: "0.1.4" }, { capabilities: { tools: {} } });
+var server = new Server({ name: "accounts", version: "0.1.5" }, { capabilities: { tools: {} } });
 server.setRequestHandler(ListToolsRequestSchema, async () => ({
   tools: [
     {
@@ -17320,9 +17417,14 @@ server.setRequestHandler(ListToolsRequestSchema, async () => ({
       description: "Show active and live/applied profile for a tool.",
       inputSchema: { type: "object", properties: { tool: { type: "string" } }, required: ["tool"] }
     },
+    {
+      name: "supervisor_status",
+      description: "Show accounts-run supervisors that can restart an agent process after profile switches.",
+      inputSchema: { type: "object", properties: { tool: { type: "string" } } }
+    },
     {
       name: "switch_profile",
-      description: "Switch to a profile. For Claude this applies live/default auth. Returns restart/resume handoff command; MCP does not kill the parent agent process.",
+      description: "Switch to a profile. If the current agent was started with accounts run, the supervisor restarts it under the new profile; otherwise this returns a restart/resume handoff command.",
       inputSchema: {
         type: "object",
         properties: {
@@ -17351,17 +17453,43 @@ server.setRequestHandler(CallToolRequestSchema, async (req) => {
           return fail("tool is required");
         return ok({ tool, active: currentProfile(tool) ?? null, applied: appliedProfile(tool) ?? null });
       }
+      case "supervisor_status": {
+        const tool = args["tool"];
+        const states = typeof tool === "string" ? listSupervisorStates().filter((state) => state.tool === tool) : listSupervisorStates();
+        return ok({ supervisors: states });
+      }
       case "switch_profile": {
         const name = args["name"];
         if (typeof name !== "string")
           return fail("name is required");
+        const profile = getProfile(name, typeof args["tool"] === "string" ? args["tool"] : undefined);
+        const resume = args["resume"] !== false;
+        const switchArgs = Array.isArray(args["args"]) ? args["args"].filter((value) => typeof value === "string") : undefined;
+        const supervisor = await sendSupervisorRequest(profile.tool, {
+          type: "switch_profile",
+          name: profile.name,
+          tool: profile.tool,
+          mode: typeof args["mode"] === "string" ? args["mode"] : "auto",
+          resume,
+          args: switchArgs
+        }, { allowMissing: true });
+        if (supervisor) {
+          if (!supervisor.ok)
+            return fail(supervisor.error);
+          return ok({
+            supervised: true,
+            ...supervisor,
+            instruction: "Profile switch queued. The accounts supervisor will close this agent process and restart it under the selected profile."
+          });
+        }
         const result = switchProfile(name, {
-          tool: typeof args["tool"] === "string" ? args["tool"] : undefined,
+          tool: profile.tool,
           mode: typeof args["mode"] === "string" ? args["mode"] : "auto",
-          resume: args["resume"] === true,
-          args: Array.isArray(args["args"]) ? args["args"].filter((value) => typeof value === "string") : undefined
+          resume,
+          args: switchArgs
         });
         return ok({
+          supervised: false,
           ...result,
           instruction: result.restartRequired ? "Exit the current agent session and run commandLine to resume under the selected profile." : "Profile switched."
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/accounts",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "description": "Manage and switch between multiple Claude Code (and other AI coding tool) profiles/accounts locally — isolated config dirs, per-account email, one-command switching.",
   "type": "module",
   "main": "dist/index.js",