ai-profile-switch 2.2.1 → 2.2.2

package/README.ko.md

@@ -42,6 +42,7 @@ npx ai-profile-switch@latest init
 - 전환은 다음 실행부터 적용됩니다. 이미 켜진 세션은 원래 계정을 그대로 씁니다.
 - 스크립트에서는 `claude` 가 묻지 않고 지금 프로필로 실행합니다.
 - Bash·zsh 프롬프트에서 `command claude` 를 치면 프로필 없이 원래 Claude 가 실행됩니다.
+- IDE 확장(VS Code, JetBrains)과 데스크톱 앱은 셸을 거치지 않아 기본 `~/.claude` 를 계속 씁니다.
 
 ## 프로필끼리 설정 나누기
 
@@ -89,4 +90,8 @@ npx ai-profile-switch@latest install-shell   # 셸 명령 고치기·새로 깔
 - 플랫폼별 안내: [macOS](docs/setup-macos.ko.md) · [Linux](docs/setup-linux.ko.md) · [Windows](docs/setup-windows.ko.md)
 - 이 소스를 직접 쓰려면 레포 폴더에서 `node bin/cli.mjs install-shell` 을 실행합니다.
 
+## 기여하기
+
+버그 신고, 수정, 문서, 다른 AI 코딩 CLI 지원 모두 환영합니다. [CONTRIBUTING.md](CONTRIBUTING.md)(영어)를 먼저 읽고, [good first issue](https://github.com/ftery0/ai-profile-switch/labels/good%20first%20issue) 나 [new tool](https://github.com/ftery0/ai-profile-switch/labels/new%20tool) 라벨이 붙은 이슈에서 골라 주세요. 이슈와 PR 은 영어로 씁니다. 보안 문제는 공개 이슈 대신 [SECURITY.md](SECURITY.md) 에 적힌 대로 알려 주세요.
+
 [MIT](./LICENSE)

package/README.md

@@ -42,6 +42,7 @@ Run these at the terminal prompt. If you are in the Claude chat, enter `/exit` f
 - Switching applies to the next launch. Running sessions keep their account.
 - In scripts, `claude` uses the active profile without asking.
 - At a Bash or zsh prompt, `command claude` runs the original Claude without a profile.
+- IDE extensions (VS Code, JetBrains) and the desktop app don't go through the shell, so they keep using the default `~/.claude`.
 
 ## Share settings across profiles
 
@@ -89,4 +90,8 @@ Coming from `claude-account-switch` or 1.x? Run `npx ai-profile-switch@latest in
 - Platform guides: [macOS](docs/setup-macos.md) · [Linux](docs/setup-linux.md) · [Windows](docs/setup-windows.md)
 - To use this source checkout, run `node bin/cli.mjs install-shell` from the repository root.
 
+## Contributing
+
+Bug reports, fixes, docs, and support for more AI coding CLIs are all welcome. Start with [CONTRIBUTING.md](CONTRIBUTING.md), then pick an issue labeled [good first issue](https://github.com/ftery0/ai-profile-switch/labels/good%20first%20issue) or [new tool](https://github.com/ftery0/ai-profile-switch/labels/new%20tool). Please report security problems privately, as described in [SECURITY.md](SECURITY.md).
+
 [MIT](./LICENSE)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-profile-switch",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Profile switching for AI coding CLIs, starting with Claude Code (formerly claude-account-switch)",
   "type": "module",
   "bin": {
@@ -16,6 +16,7 @@
   },
   "scripts": {
     "test": "node --test",
+    "test:e2e": "bash test/e2e/single-user/run.sh",
     "docs:dev": "vitepress dev website",
     "docs:build": "vitepress build website",
     "docs:preview": "vitepress preview website"
@@ -34,6 +35,10 @@
     "type": "git",
     "url": "git+https://github.com/ftery0/ai-profile-switch.git"
   },
+  "bugs": {
+    "url": "https://github.com/ftery0/ai-profile-switch/issues"
+  },
+  "homepage": "https://ftery0.github.io/ai-profile-switch/",
   "devDependencies": {
     "vitepress": "^1.6.4"
   },

package/src/commands/manage.mjs

@@ -1,7 +1,7 @@
 import * as prompt from '../lib/prompt.mjs';
 import { readMeta } from '../lib/config.mjs';
 import { color, displayWidth, error, intro, sym, warn } from '../lib/ui.mjs';
-import { accountInfo } from '../lib/account.mjs';
+import { accountInfo, refreshUsage } from '../lib/account.mjs';
 import { HOME } from '../lib/constants.mjs';
 import { LANGUAGE_NAMES, language as currentLanguage, relativeTime, t } from '../lib/i18n.mjs';
 import { checkRename, profileDir } from '../lib/profile.mjs';
@@ -74,7 +74,8 @@ export async function manage(args = []) {
   }
 }
 
-function pickProfile(question, meta) {
+async function pickProfile(question, meta) {
+  await refreshUsage(meta.profiles);
   return prompt.select(question, profileChoices(meta.profiles, meta.activeProfile), {
     initial: Math.max(0, meta.profiles.indexOf(meta.activeProfile)), numbered: true, back: true,
   });

package/src/commands/shell.mjs

@@ -7,7 +7,7 @@ import { HOME, IS_WINDOWS } from '../lib/constants.mjs';
 import { installAllShells } from '../lib/shell.mjs';
 import { listProfiles, profileDir, assertRegisteredProfile } from '../lib/profile.mjs';
 import { color, colorFor, intro, meter, outro, success, sym, userError, warn } from '../lib/ui.mjs';
-import { accountInfo } from '../lib/account.mjs';
+import { accountInfo, refreshUsage } from '../lib/account.mjs';
 import { relativeTime, t } from '../lib/i18n.mjs';
 import { syncShared } from '../lib/shared.mjs';
 import { reportConflicts } from './share.mjs';
@@ -118,8 +118,9 @@ export function accountSummary({ email, plan }) {
 export function usageLine({ usage }) {
   if (!usage) return color.dim(t('account.noUsage'));
   const parts = [];
-  if (usage.fiveHour !== null) parts.push(`${t('account.fiveHour')} ${meter(usage.fiveHour)}`);
-  if (usage.weekly !== null) parts.push(`${t('account.weekly')} ${meter(usage.weekly)}`);
+  const reset = key => (usage.reset?.[key] ? ` ${color.dim(t('account.reset'))}` : '');
+  if (usage.fiveHour !== null) parts.push(`${t('account.fiveHour')} ${meter(usage.fiveHour)}${reset('fiveHour')}`);
+  if (usage.weekly !== null) parts.push(`${t('account.weekly')} ${meter(usage.weekly)}${reset('weekly')}`);
   if (usage.savedAt) parts.push(color.dim(t('account.savedAt', { time: relativeTime(usage.savedAt) })));
   return parts.join('   ');
 }
@@ -162,6 +163,7 @@ async function selectProfile({ launching = false } = {}) {
     }
     return selected;
   }
+  await refreshUsage(profiles);
   const choices = profileChoices(profiles, active);
   intro('ai-profile-switch', '', output);
   const selected = await prompt.select(t('picker.question'), choices, {

package/src/lib/account.mjs

@@ -1,6 +1,9 @@
 // Reads what Claude Code saved in a profile, for display only. Nothing is written,
 // and any field with an unexpected shape is left out instead of failing.
+import { execFile } from 'node:child_process';
+import { createHash } from 'node:crypto';
 import { readFileSync, statSync } from 'node:fs';
+import { readFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { PROFILES_DIR } from './constants.mjs';
 
@@ -20,16 +23,88 @@ function percent(window) {
   return typeof value === 'number' && Number.isFinite(value) ? Math.min(100, Math.max(0, Math.round(value))) : null;
 }
 
+// A window whose reset time has passed starts again from zero.
+function hasReset(window, now) {
+  const resetsAt = typeof window?.resets_at === 'string' ? Date.parse(window.resets_at) : NaN;
+  return Number.isFinite(resetsAt) && resetsAt <= now;
+}
+
 // Claude Code keeps usage in an undocumented cache; it may change or disappear.
-function usage(cached, account) {
+function usage(cached, account, now = Date.now()) {
   if (!cached || typeof cached !== 'object') return null;
   if (typeof cached.accountUuid === 'string' && typeof account.accountUuid === 'string'
     && cached.accountUuid !== account.accountUuid) return null;
-  const fiveHour = percent(cached.utilization?.five_hour);
-  const weekly = percent(cached.utilization?.seven_day);
-  if (fiveHour === null && weekly === null) return null;
+  const windows = { fiveHour: cached.utilization?.five_hour, weekly: cached.utilization?.seven_day };
+  const reset = { fiveHour: false, weekly: false };
+  const values = {};
+  for (const [key, window] of Object.entries(windows)) {
+    values[key] = percent(window);
+    if (values[key] !== null && hasReset(window, now)) [values[key], reset[key]] = [0, true];
+  }
+  if (values.fiveHour === null && values.weekly === null) return null;
   const savedAt = Number.isFinite(cached.fetchedAtMs) ? cached.fetchedAtMs : null;
-  return { fiveHour, weekly, savedAt };
+  return { fiveHour: values.fiveHour, weekly: values.weekly, savedAt, reset };
+}
+
+// Usage fetched in this run, by profile name. It wins over the saved cache.
+const live = new Map();
+const USAGE_URL = 'https://api.anthropic.com/api/oauth/usage';
+const FRESH_MS = 60_000;
+
+// Claude Code stores each config folder's sign-in under a keychain item named
+// after the folder path; elsewhere, or without a keychain, in .credentials.json.
+function keychainService(dir) {
+  return `Claude Code-credentials-${createHash('sha256').update(dir).digest('hex').slice(0, 8)}`;
+}
+
+function readKeychain(dir) {
+  return new Promise(resolve => {
+    execFile('security', ['find-generic-password', '-s', keychainService(dir), '-w'], { timeout: 1000 },
+      (err, stdout) => resolve(err ? null : stdout));
+  });
+}
+
+async function readCredentials(dir) {
+  const fromKeychain = process.platform === 'darwin' ? await readKeychain(dir) : null;
+  return fromKeychain ?? readFile(join(dir, '.credentials.json'), 'utf8').catch(() => null);
+}
+
+// An expired token is skipped, not refreshed: refreshing could sign Claude Code out.
+function accessToken(raw, now) {
+  try {
+    const oauth = JSON.parse(raw)?.claudeAiOauth;
+    if (typeof oauth?.accessToken !== 'string' || !oauth.accessToken) return null;
+    if (Number.isFinite(oauth.expiresAt) && oauth.expiresAt <= now + FRESH_MS) return null;
+    return oauth.accessToken;
+  } catch {
+    return null;
+  }
+}
+
+// Asks the usage API for each signed-in profile at once. Anything slow or failing
+// keeps the saved value, so the screen never waits more than timeoutMs.
+export async function refreshUsage(names, { read = readCredentials, request = fetch, timeoutMs = 1500 } = {}) {
+  const now = Date.now();
+  const signal = AbortSignal.timeout(timeoutMs);
+  const due = names.filter(name => !(now - (live.get(name)?.fetchedAtMs ?? 0) < FRESH_MS)
+    && readConfig(join(PROFILES_DIR, name)).oauthAccount);
+  const fetchOne = async name => {
+    try {
+      const token = accessToken(await read(join(PROFILES_DIR, name)), now);
+      if (!token || signal.aborted) return;
+      const response = await request(USAGE_URL, {
+        headers: { Authorization: `Bearer ${token}`, 'anthropic-beta': 'oauth-2025-04-20' }, signal,
+      });
+      const utilization = response.ok ? await response.json() : null;
+      if (utilization && typeof utilization === 'object' && !signal.aborted) {
+        live.set(name, { utilization, fetchedAtMs: Date.now() });
+      }
+    } catch { /* keep the saved value */ }
+  };
+  let timer;
+  const deadline = new Promise(resolve => { timer = setTimeout(resolve, timeoutMs); });
+  await Promise.race([Promise.all(due.map(fetchOne)), deadline]);
+  clearTimeout(timer);
 }
 
 export function accountInfo(name) {
@@ -41,7 +116,7 @@ export function accountInfo(name) {
   return {
     email: typeof account.emailAddress === 'string' && account.emailAddress ? account.emailAddress : null,
     plan: Object.hasOwn(PLANS, account.organizationType) ? PLANS[account.organizationType] : null,
-    usage: usage(config.cachedUsageUtilization, account),
+    usage: usage(live.get(name) ?? config.cachedUsageUtilization, account),
     lastUsed,
   };
 }

package/src/lib/profile.mjs

@@ -231,6 +231,37 @@ function validateJson(source) {
   }
 }
 
+// Claude Code saves absolute paths in its plugin indexes. Copied as they are, a profile would keep
+// loading plugins from the source folder and break once that folder is removed.
+const PLUGIN_INDEXES = ['installed_plugins.json', 'known_marketplaces.json'];
+
+function repointPlugins(plugins, sourceDir, targetDir) {
+  if (!pathExists(plugins) || !lstatSync(plugins).isDirectory()) return;
+  const to = join(targetDir, 'plugins');
+  const prefixes = [...new Set([join(sourceDir, 'plugins'), join(canonicalPath(sourceDir), 'plugins')])];
+  const move = value => {
+    if (typeof value === 'string') {
+      const from = prefixes.find(prefix => value === prefix
+        || value.startsWith(prefix + sep) || value.startsWith(prefix + '/'));
+      return from ? to + value.slice(from.length) : value;
+    }
+    if (Array.isArray(value)) return value.map(move);
+    if (value && typeof value === 'object') {
+      return Object.fromEntries(Object.entries(value).map(([key, item]) => [key, move(item)]));
+    }
+    return value;
+  };
+  for (const name of PLUGIN_INDEXES) {
+    const path = join(plugins, name);
+    if (!pathExists(path) || !lstatSync(path).isFile()) continue;
+    const text = readFileSync(path, 'utf8');
+    let index;
+    try { index = JSON.parse(text); } catch { continue; }
+    const moved = JSON.stringify(move(index), null, 2);
+    if (moved !== JSON.stringify(index, null, 2)) writeFileSync(path, moved + '\n');
+  }
+}
+
 function stageEntry(source, destination) {
   if (!pathExists(source)) return;
   if (pathExists(destination)) {
@@ -293,6 +324,7 @@ function prepareMigration(source, profileName, shareSettings, stage) {
     stageEntry(join(source.directory, entry), join(stagedProfile, entry));
     if (!pathExists(join(stagedProfile, entry))) mkdirSync(join(stagedProfile, entry));
   }
+  repointPlugins(join(stagedProfile, 'plugins'), source.directory, target);
   for (const entry of [...SHARED_FILES, ...SHARED_DIRS]) {
     const shared = shareSettings ? stagedShared : stagedProfile;
     const from = join(source.directory, entry);

package/src/lib/prompt.mjs

@@ -110,6 +110,7 @@ export async function select(message, choices, {
   return new Promise((resolve) => {
     let selected = Math.max(0, Math.min(initial, items.length - 1));
     let height = 0;
+    let top = 0;
     const cursor = cursorControl(output);
     const rail = color.dim(sym.rail);
     const indent = ' '.repeat(numbered ? 5 : 2);
@@ -117,17 +118,22 @@ export async function select(message, choices, {
       ? t(back ? 'prompt.keysNumberedBack' : 'prompt.keysNumbered', { arrows: sym.arrows, max: items.length })
       : t(back ? 'prompt.keysBack' : 'prompt.keys', { arrows: sym.arrows });
 
-    const rows = () => {
+    // The choices from index from up to to, with details under the ones detailed(i) picks.
+    const rows = (detailed = () => true, from = 0, to = items.length) => {
       const lines = [];
-      items.forEach((item, i) => {
+      if (from > 0) lines.push(`${rail}  ${color.dim(t('prompt.moreAbove', { count: from }))}`);
+      items.slice(from, to).forEach((item, offset) => {
+        const i = from + offset;
         const number = numbered ? `${i + 1}  ` : '';
         const head = i === selected
           ? color.cyan(`${sym.cursor} ${number}${item.label}`)
           : `  ${numbered ? `${color.dim(String(i + 1))}  ` : ''}${item.label}`;
         lines.push(`${rail}  ${head}${item.hint ? `  ${item.hint}` : ''}`);
-        for (const detail of item.details ?? []) lines.push(`${rail}  ${indent}${detail}`);
-        if (item.details?.length) lines.push(rail);
+        if (!detailed(i) || !item.details?.length) return;
+        for (const detail of item.details) lines.push(`${rail}  ${indent}${detail}`);
+        lines.push(rail);
       });
+      if (to < items.length) lines.push(`${rail}  ${color.dim(t('prompt.moreBelow', { count: items.length - to }))}`);
       lines.push(`${rail}  ${color.dim(keys)}`, color.dim(sym.railEnd));
       return lines;
     };
@@ -137,10 +143,32 @@ export async function select(message, choices, {
       + Math.max(1, Math.ceil(displayWidth(line) / (output.columns || Infinity))), 0);
     const header = [`${color.cyan(sym.step)}  ${message}`, ...body.map(line => `${rail}  ${line}`)];
 
+    // The cursor can't move up past the top of the window, so a menu taller than the window
+    // can't be redrawn in place: every redraw would push another copy of its first rows into
+    // the scrollback. It shrinks to fit instead: details only under the selected choice, then
+    // only the choices around it. The row under the menu is where the cursor waits.
+    const fits = lines => screenRows(header) + screenRows(lines) < (output.rows || Infinity);
+    const layout = () => {
+      const full = rows();
+      if (fits(full)) return full;
+      const shown = (from, to) => rows(i => i === selected, from, to);
+      if (fits(shown(0, items.length))) return shown(0, items.length);
+      const end = from => {
+        let to = Math.max(from, selected) + 1;
+        while (to < items.length && fits(shown(from, to + 1))) to++;
+        return to;
+      };
+      top = Math.min(top, selected);
+      while (top < selected && !fits(shown(top, end(top)))) top++;
+      return shown(top, end(top));
+    };
+
     const render = () => {
       if (height) output.write(cursor.up(height));
-      const lines = rows();
+      const lines = layout();
       for (const line of lines) output.write(`${cursor.clearLine}${line}\n`);
+      // A shorter menu than last time leaves old rows below it.
+      output.write(cursor.clearDown);
       height = screenRows(lines);
     };
 

package/src/locales/en.mjs

@@ -6,6 +6,8 @@ export default {
   'prompt.keysNumbered': '{arrows} move · 1-{max} pick · Enter select · Esc cancel',
   'prompt.keysBack': '{arrows} move · Enter select · Esc back',
   'prompt.keysNumberedBack': '{arrows} move · 1-{max} pick · Enter select · Esc back',
+  'prompt.moreAbove': '{count} more above',
+  'prompt.moreBelow': '{count} more below',
   'prompt.cancelled': 'cancelled',
   'prompt.yes': 'Yes',
   'prompt.no': 'No',
@@ -26,6 +28,7 @@ export default {
   'account.weekly': 'Weekly',
   'account.noUsage': 'No usage saved yet',
   'account.savedAt': 'as of {time}',
+  'account.reset': 'reset',
   'account.notSignedIn': 'Not signed in yet',
 
   'profile.empty': 'Profile name cannot be empty',
@@ -259,6 +262,7 @@ Without the shell commands, use: npx ai-profile-switch@latest manage [arguments]
     update [--check]           Update this tool; --check only checks
     share [add|remove]         Share CLAUDE.md, skills, agents, … across profiles
     mcp [list]                 Show where old MCP settings went
+    --version, -v              Show the installed version
 
   Run any command with --help for its usage.
 `,

package/src/locales/ko.mjs

@@ -6,6 +6,8 @@ export default {
   'prompt.keysNumbered': '{arrows} 이동 · 1-{max} 바로 선택 · Enter 선택 · Esc 취소',
   'prompt.keysBack': '{arrows} 이동 · Enter 선택 · Esc 뒤로',
   'prompt.keysNumberedBack': '{arrows} 이동 · 1-{max} 바로 선택 · Enter 선택 · Esc 뒤로',
+  'prompt.moreAbove': '위에 {count}개 더',
+  'prompt.moreBelow': '아래에 {count}개 더',
   'prompt.cancelled': '취소했어요',
   'prompt.yes': '예',
   'prompt.no': '아니요',
@@ -26,6 +28,7 @@ export default {
   'account.weekly': '주간',
   'account.noUsage': '아직 저장된 사용량 없음',
   'account.savedAt': '{time} 기준',
+  'account.reset': '초기화됨',
   'account.notSignedIn': '아직 로그인하지 않았어요',
 
   'profile.empty': '프로필 이름을 적어 주세요',
@@ -259,6 +262,7 @@ claude 를 실행하면 프로필을 골라 Claude Code 를 시작해요.
     update [--check]           이 도구 업데이트 (--check 는 확인만)
     share [add|remove]         CLAUDE.md·skills·agents 등을 같이 쓰기
     mcp [list]                 예전 MCP 설정이 어디로 갔는지 보기
+    --version, -v              설치된 버전 보기
 
   명령 뒤에 --help 를 붙이면 사용법이 나와요.
 `,