@event4u/agent-switch 2.1.0 → 2.3.0

package/dist/shellenv.js

@@ -34,6 +34,9 @@
  * A side effect worth having: a genuinely broken agent-switch now surfaces its
  * error instead of silently degrading the shell onto the default config dir.
  */
+import { spawnSync } from "node:child_process";
+import * as fs from "node:fs";
+import * as path from "node:path";
 import { allProviders } from "./providers.js";
 import { GUARD_REFUSED_EXIT } from "./single-load.js";
 export const SHELLS = ["zsh", "bash", "fish", "powershell"];
@@ -59,11 +62,56 @@ export function detectShell(requested, env = process.env, platform = process.pla
         return "zsh";
     return "zsh"; // sensible POSIX default when $SHELL is unset
 }
+// The CLI the running app activated (`agent-switch activate` writes its path to
+// <home>/active-cli), so a dev build and an installed app each bring their own;
+// a missing or vanished path falls back to agent-switch on PATH.
+const POSIX_BIN = `__agent_switch_bin() {
+  local p
+  p="$(cat "\${AGENT_SWITCH_HOME:-$HOME/.agent-switch}/active-cli" 2>/dev/null)"
+  if [ -n "$p" ] && [ -x "$p" ]; then printf '%s\\n' "$p"
+  elif command -v agent-switch >/dev/null 2>&1; then printf 'agent-switch\\n'
+  fi
+}
+__agent_switch() {
+  local as
+  as="$(__agent_switch_bin)"
+  command "\${as:-agent-switch}" "$@"
+}`;
+const FISH_BIN = `function __agent_switch_bin
+    set -l home $HOME/.agent-switch
+    set -q AGENT_SWITCH_HOME; and set home $AGENT_SWITCH_HOME
+    if test -r $home/active-cli
+        set -l p (cat $home/active-cli)
+        if test -x "$p"
+            echo $p
+            return
+        end
+    end
+    type -q agent-switch; and echo agent-switch
+end
+function __agent_switch
+    set -l as (__agent_switch_bin)
+    test -n "$as"; or set as agent-switch
+    command $as $argv
+end`;
+const POWERSHELL_BIN = `function __agent_switch_bin {
+    $home_ = if ($env:AGENT_SWITCH_HOME) { $env:AGENT_SWITCH_HOME } else { Join-Path $HOME '.agent-switch' }
+    $p = Get-Content -Path (Join-Path $home_ 'active-cli') -ErrorAction SilentlyContinue | Select-Object -First 1
+    if ($p -and (Test-Path $p)) { return $p }
+    if (Get-Command agent-switch -ErrorAction SilentlyContinue) { return 'agent-switch' }
+    return $null
+}
+function __agent_switch {
+    $as = __agent_switch_bin
+    if (-not $as) { $as = 'agent-switch' }
+    if ($as -like '*.js') { & node $as @args } else { & $as @args }
+}`;
 function posixWrapper(binary, envVar, id) {
     return `${binary}() {
-  local dir rc
-  command -v agent-switch >/dev/null 2>&1 || { command ${binary} "$@"; return; }
-  dir="$(command agent-switch dir --provider ${id} --guard)"
+  local dir rc as
+  as="$(__agent_switch_bin)"
+  [ -n "$as" ] || { command ${binary} "$@"; return; }
+  dir="$(command "$as" dir --provider ${id} --guard)"
   rc=$?
   if [ $rc -eq ${GUARD_REFUSED_EXIT} ]; then return $rc; fi
   if [ -n "$dir" ]; then
@@ -75,11 +123,12 @@ function posixWrapper(binary, envVar, id) {
 }
 function fishWrapper(binary, envVar, id) {
     return `function ${binary}
-    if not type -q agent-switch
+    set -l as (__agent_switch_bin)
+    if test -z "$as"
         command ${binary} $argv
         return
     end
-    set -l dir (command agent-switch dir --provider ${id} --guard)
+    set -l dir (command $as dir --provider ${id} --guard)
     set -l rc $status
     if test $rc -eq ${GUARD_REFUSED_EXIT}
         return $rc
@@ -95,8 +144,9 @@ function powershellWrapper(binary, envVar, id) {
     return `function ${binary} {
     $exe = Get-Command ${binary} -CommandType Application -ErrorAction SilentlyContinue | Select-Object -First 1
     if (-not $exe) { Write-Error '${binary} not found on PATH.'; return }
-    if (-not (Get-Command agent-switch -ErrorAction SilentlyContinue)) { & $exe.Source @args; return }
-    $dir = (& agent-switch dir --provider ${id} --guard)
+    $as = __agent_switch_bin
+    if (-not $as) { & $exe.Source @args; return }
+    $dir = (__agent_switch dir --provider ${id} --guard)
     if ($LASTEXITCODE -eq ${GUARD_REFUSED_EXIT}) { return }
     if ($dir) {
         $prev = Get-Item -Path Env:\\${envVar} -ErrorAction SilentlyContinue
@@ -107,8 +157,8 @@ function powershellWrapper(binary, envVar, id) {
     }
 }`;
 }
-function build(header, wrappers, asw) {
-    return [header, ...wrappers, asw].join("\n");
+function build(header, bin, wrappers, asw) {
+    return [header, bin, ...wrappers, asw].join("\n");
 }
 export function shellenvScript(shell) {
     const providers = allProviders();
@@ -117,34 +167,85 @@ export function shellenvScript(shell) {
         const asw = `# Convenience: "asw" lists all; "asw work" switches claude; "asw codex work" switches a provider
 function asw
     if test (count $argv) -eq 0
-        command agent-switch list
+        __agent_switch list
     else if contains -- $argv[1] claude codex antigravity
-        command agent-switch use $argv[2] --provider $argv[1]
+        __agent_switch use $argv[2] --provider $argv[1]
     else
-        command agent-switch use $argv
+        __agent_switch use $argv
     end
 end`;
-        return build(header, providers.map((p) => fishWrapper(p.binary, p.envVar, p.id)), asw);
+        return build(header, FISH_BIN, providers.map((p) => fishWrapper(p.binary, p.envVar, p.id)), asw);
     }
     if (shell === "powershell") {
         const header = `# agent-switch shell integration — add to $PROFILE:  agent-switch shellenv --shell powershell | Out-String | Invoke-Expression`;
         const asw = `# Convenience: "asw" lists all; "asw work" switches claude; "asw codex work" switches a provider
 function asw {
-    if ($args.Count -eq 0) { command agent-switch list; return }
-    if (@('claude','codex','antigravity') -contains $args[0]) { & agent-switch use $args[1] --provider $args[0] }
-    else { & agent-switch use @args }
+    if ($args.Count -eq 0) { __agent_switch list; return }
+    if (@('claude','codex','antigravity') -contains $args[0]) { __agent_switch use $args[1] --provider $args[0] }
+    else { __agent_switch use @args }
 }`;
-        return build(header, providers.map((p) => powershellWrapper(p.binary, p.envVar, p.id)), asw);
+        return build(header, POWERSHELL_BIN, providers.map((p) => powershellWrapper(p.binary, p.envVar, p.id)), asw);
     }
     // zsh + bash share the POSIX snippet.
     const header = `# agent-switch shell integration — add to your rc file:  eval "$(agent-switch shellenv)"`;
     const asw = `# Convenience: "asw" lists all; "asw work" switches claude; "asw codex work" switches a provider
 asw() {
-  if [ $# -eq 0 ]; then command agent-switch list; return; fi
+  if [ $# -eq 0 ]; then __agent_switch list; return; fi
   case "$1" in
-    claude|codex|antigravity) command agent-switch use "$2" --provider "$1" ;;
-    *) command agent-switch use "$@" ;;
+    claude|codex|antigravity) __agent_switch use "$2" --provider "$1" ;;
+    *) __agent_switch use "$@" ;;
   esac
 }`;
-    return build(header, providers.map((p) => posixWrapper(p.binary, p.envVar, p.id)), asw);
+    return build(header, POSIX_BIN, providers.map((p) => posixWrapper(p.binary, p.envVar, p.id)), asw);
+}
+/** The line that loads the integration, per shell (same as the docs table). */
+export const SHELLENV_LINE = {
+    zsh: 'eval "$(agent-switch shellenv)"',
+    bash: 'eval "$(agent-switch shellenv)"',
+    fish: "agent-switch shellenv --shell fish | source",
+    powershell: "agent-switch shellenv --shell powershell | Out-String | Invoke-Expression",
+};
+/** The startup file `shellenv install` writes to. macOS opens login shells,
+ *  which read ~/.bash_profile rather than ~/.bashrc. For PowerShell only the
+ *  shell knows its profile — Windows PowerShell 5.1 and a Documents folder
+ *  redirected to OneDrive both live elsewhere — so it is asked first. */
+export function rcFileFor(shell, home, platform = process.platform, askProfile = powershellProfile) {
+    if (shell === "zsh")
+        return path.join(home, ".zshrc");
+    if (shell === "bash")
+        return path.join(home, platform === "darwin" ? ".bash_profile" : ".bashrc");
+    if (shell === "fish")
+        return path.join(home, ".config", "fish", "config.fish");
+    return askProfile() ?? path.join(home, "Documents", "PowerShell", "Microsoft.PowerShell_profile.ps1");
+}
+/** Which PowerShell to ask first: the one this command runs under. Windows
+ *  PowerShell 5.1 puts only `WindowsPowerShell` paths on PSModulePath; pwsh adds
+ *  its own `PowerShell\7` (or `Documents\PowerShell`) ones. */
+export function powershellOrder(env = process.env) {
+    const p = env.PSModulePath ?? "";
+    const pwsh = /[\\/]PowerShell[\\/](7|Modules)/i.test(p);
+    return !pwsh && /WindowsPowerShell/i.test(p) ? ["powershell", "pwsh"] : ["pwsh", "powershell"];
+}
+/** `$PROFILE` from the PowerShell the user runs, then the other one; null when
+ *  neither answers. */
+export function powershellProfile() {
+    for (const exe of powershellOrder()) {
+        const r = spawnSync(exe, ["-NoProfile", "-NonInteractive", "-Command", "$PROFILE"], { encoding: "utf8", timeout: 5000, windowsHide: true });
+        const out = r.status === 0 ? r.stdout.trim() : "";
+        if (out)
+            return out;
+    }
+    return null;
+}
+/** Append the loader line to the shell's startup file, once. `present` says
+ *  whether any known startup file already loads it (the doctor check). */
+export function installShellIntegration(shell, home, present) {
+    const file = rcFileFor(shell, home);
+    if (present)
+        return { shell, file, alreadyInstalled: true };
+    const before = fs.existsSync(file) ? fs.readFileSync(file, "utf8") : "";
+    const sep = before === "" || before.endsWith("\n") ? "" : "\n";
+    fs.mkdirSync(path.dirname(file), { recursive: true });
+    fs.writeFileSync(file, `${before}${sep}\n# agent-switch shell integration\n${SHELLENV_LINE[shell]}\n`);
+    return { shell, file, alreadyInstalled: false };
 }

package/dist/single-load.js

@@ -25,7 +25,12 @@ import * as path from "node:path";
 import { liveSessionPids } from "./api.js";
 import { pidCwd } from "./sessions.js";
 export const GUARD_POLICIES = ["block", "warn", "off"];
+/** What a state file without a `guard` key meant before 2.2 — kept so an
+ *  upgrade never changes a user's effective guard. */
 export const DEFAULT_GUARD_POLICY = "block";
+/** A fresh install (no state file and no profile yet) starts on `warn`: a second load is
+ *  reported, never refused, so nothing changes how a tool starts. */
+export const FRESH_INSTALL_GUARD_POLICY = "warn";
 export function isGuardPolicy(v) {
     return typeof v === "string" && GUARD_POLICIES.includes(v);
 }

package/dist/token-freshen.js

@@ -152,3 +152,14 @@ export function freshAccessToken(configDir, deps = defaultFreshenDeps()) {
     const creds = deps.readCredential(configDir);
     return creds ? accessTokenOf(creds) : null;
 }
+/**
+ * The token for a usage read. A profile that shares its login with the default
+ * install (seeded by `import`) is never refreshed: whichever side refreshes
+ * first invalidates the other, so its stored token is used only while valid.
+ */
+export function usageToken(configDir, deps, sharesDefaultLogin) {
+    if (!sharesDefaultLogin)
+        return freshAccessToken(configDir, deps);
+    const creds = deps.readCredential(configDir);
+    return creds && !needsFreshen(creds, deps.now(), deps.bufferMs) ? accessTokenOf(creds) : null;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@event4u/agent-switch",
-  "version": "2.1.0",
+  "version": "2.3.0",
   "description": "Switch between multiple Claude Code accounts on macOS, Linux, and Windows via isolated CLAUDE_CONFIG_DIR profiles",
   "repository": {
     "type": "git",