@carjms/codexswitch 0.3.3 → 0.3.5

package/README.ko.md

@@ -203,7 +203,8 @@ cxs list                # 계정별 5h/week 사용량 % 확인
 | `cxs login [이름]` | 새 계정 로그인 후 저장 (기존 로그인 유지, 이름 생략 시 이메일 사용) |
 | `cxs import [이름]` | 현재 `~/.codex`에 로그인된 계정을 저장소로 가져오기 |
 | `cxs add-key <이름> [키]` | OpenAI API 키 계정 등록 (키 생략 시 `$OPENAI_API_KEY` 사용) |
-| `cxs list` | 계정 목록: 활성 표시(`*`), 이메일, 플랜, 우선순위, 한도 상태 |
+| `cxs list` | 계정 목록: 활성 표시, 이메일, 플랜, 우선순위, 한도 상태, 사용량 % |
+| `cxs usage [이름]` | 계정별 사용량 대시보드: 5시간/주간 게이지 바, 리셋 카운트다운, 다음 로테이션 계정 (별칭: `status`) |
 | `cxs use <이름>` | 활성 계정 전환 |
 | `cxs current` | 현재 활성 계정 확인 |
 | `cxs next` | 설정된 순서의 다음 계정으로 전환 (끝에 오면 처음으로 순환) |
@@ -217,6 +218,7 @@ cxs list                # 계정별 5h/week 사용량 % 확인
 | `cxs export <파일>` | 전체 계정·설정 백업 (⚠️ 토큰 포함 — 비밀번호처럼 취급) |
 | `cxs restore <파일>` | 백업 파일에서 계정 복원 (다른 PC 이전용) |
 | `cxs completion <bash\|zsh>` | 셸 자동완성 스크립트 출력 |
+| `cxs <그 외 명령>` | codex로 그대로 전달 — `cxs resume`, `cxs goal ...`, `cxs apply` 등 codex의 모든 명령을 관리 계정으로 바로 사용 가능 |
 | `cxs remove <이름>` | 계정 삭제 |
 | `cxs rename <옛이름> <새이름>` | 계정 이름 변경 |
 | `cxs disable / enable <이름>` | 로테이션에서 임시 제외 / 복귀 |

package/README.md

@@ -205,7 +205,8 @@ cxs list                # per-account 5h/week usage columns
 | `cxs login [name]` | Log in to a new account and store it (existing login untouched; defaults to the email as the name) |
 | `cxs import [name]` | Import the account currently in `~/.codex` |
 | `cxs add-key <name> [key]` | Register an OpenAI API-key account (falls back to `$OPENAI_API_KEY`) |
-| `cxs list` | List accounts: active marker (`*`), email, plan, priority, limit status |
+| `cxs list` | List accounts: active marker, email, plan, priority, limit status, usage % |
+| `cxs usage [name]` | Per-account usage dashboard: 5h/weekly gauge bars, reset countdowns, next rotation pick (alias: `status`) |
 | `cxs use <name>` | Switch the active account |
 | `cxs current` | Show the active account |
 | `cxs next` | Switch to the next account in rotation order (wraps around) |
@@ -219,6 +220,7 @@ cxs list                # per-account 5h/week usage columns
 | `cxs export <file>` | Back up all accounts + settings (⚠️ contains tokens — treat like a password) |
 | `cxs restore <file>` | Restore accounts from a backup (for moving machines) |
 | `cxs completion <bash\|zsh>` | Print a shell completion script |
+| `cxs <anything else>` | Forwarded to codex under the managed account — `cxs resume`, `cxs goal ...`, `cxs apply` all work like their codex counterparts |
 | `cxs remove <name>` | Delete an account |
 | `cxs rename <old> <new>` | Rename an account |
 | `cxs disable / enable <name>` | Temporarily exclude from / restore to rotation |

package/bin/codex-switch.js

@@ -4,7 +4,8 @@
 require('../src/cli.js').main(process.argv.slice(2)).then(
   (code) => process.exit(code || 0),
   (err) => {
-    console.error(`error: ${err && err.message ? err.message : err}`);
+    const ui = require('../src/ui.js');
+    console.error(ui.fail(`${ui.red('error:')} ${err && err.message ? err.message : err}`));
     process.exit(1);
   }
 );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@carjms/codexswitch",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Multi-account manager for OpenAI Codex CLI with quota-based rotation (inspired by KarpelesLab/teamclaude)",
   "license": "MIT",
   "repository": {

package/src/cli.js

@@ -6,6 +6,7 @@ const path = require('path');
 const { readJSONSafe, writeJSONAtomic, authInfo, ensureDir, fmtDate, fmtRemaining, table } = require('./util.js');
 const store = require('./store.js');
 const runner = require('./runner.js');
+const ui = require('./ui.js');
 
 const HELP = `codexswitch — multi-account manager for the OpenAI Codex CLI
 
@@ -13,7 +14,9 @@ Accounts
   login [name]            log in to a new account (isolated "codex login") and store it
   import [name]           import the account currently in ~/.codex/auth.json
   add-key <name> [key]    register an OpenAI API-key account (or read $OPENAI_API_KEY)
-  list                    list stored accounts (alias: accounts, status)
+  list                    list stored accounts (alias: accounts)
+  usage [name]            per-account 5h/weekly usage gauges with reset times
+                          (alias: status)
   use <name>              make <name> the active account in ~/.codex
   current                 show the active account
   next                    switch to the next account in rotation order (wraps around)
@@ -48,6 +51,10 @@ Maintenance
   completion <bash|zsh>   print a shell completion script
   help                    show this help
 
+Anything else is forwarded to codex under the managed account, so commands
+like "codexswitch resume", "codexswitch goal ..." or "codexswitch apply"
+work exactly like their codex counterparts.
+
 Environment
   CODEX_SWITCH_HOME       data dir (default ~/.codex-switch)
   CODEX_HOME              codex config dir codexswitch manages (default ~/.codex)
@@ -84,7 +91,7 @@ function storeAccount(name, auth) {
   delete meta.accounts[name].disabled;
   delete meta.accounts[name].limitedUntil;
   store.saveMeta(meta);
-  out(`${existed ? 'updated' : 'added'} account "${name}"${info.email ? ` (${info.email}, ${info.plan || 'unknown plan'})` : ''}`);
+  out(ui.ok(`${existed ? 'updated' : 'added'} account ${ui.bold(`"${name}"`)}${info.email ? ui.dim(` (${info.email}, ${info.plan || 'unknown plan'})`) : ''}`));
   return name;
 }
 
@@ -107,7 +114,7 @@ function cmdLogin(args) {
   store.ensureDirs();
   const tmp = fs.mkdtempSync(path.join(os.tmpdir(), 'codexswitch-login-'));
   try {
-    out('opening codex login in an isolated profile (your current account is untouched)...');
+    out(ui.info('opening codex login in an isolated profile (your current account is untouched)...'));
     const r = runner.spawnCodexSync(['login'], {
       env: { ...process.env, CODEX_HOME: tmp },
       stdio: 'inherit',
@@ -136,30 +143,34 @@ function cmdList() {
   }
   const now = Date.now();
   const meta = store.loadMeta();
-  const pct = (win) => (win && typeof win.pct === 'number' ? `${Math.round(win.pct)}%` : '-');
+  const pct = (win, threshold) => {
+    if (!win || typeof win.pct !== 'number') return ui.dim('-');
+    const v = `${Math.round(win.pct)}%`;
+    return win.pct >= threshold ? ui.red(v) : win.pct >= 70 ? ui.yellow(v) : ui.green(v);
+  };
   const rows = accounts.map((a) => {
     const over = store.overThreshold(a, meta, now);
     const status = a.disabled
-      ? 'disabled'
+      ? ui.red('disabled')
       : a.limitedUntil && a.limitedUntil > now
-        ? `limited ${fmtRemaining(a.limitedUntil)}`
+        ? ui.yellow(`limited ${fmtRemaining(a.limitedUntil)}`)
         : over
-          ? `over-${over}`
-          : 'ok';
+          ? ui.yellow(`over-${over}`)
+          : ui.green('ok');
     return [
-      a.active ? '*' : '',
-      a.name,
-      a.email,
+      a.active ? ui.green('●') : '',
+      a.active ? ui.bold(a.name) : a.name,
+      ui.dim(a.email || '-'),
       a.plan,
       a.priority,
       status,
-      pct(a.usage && a.usage.p5h),
-      pct(a.usage && a.usage.weekly),
-      fmtDate(a.lastRefresh),
+      pct(a.usage && a.usage.p5h, meta.threshold5h),
+      pct(a.usage && a.usage.weekly, meta.thresholdWeekly),
+      ui.dim(fmtDate(a.lastRefresh)),
     ];
   });
   out(table(rows, ['', 'name', 'email', 'plan', 'prio', 'status', '5h', 'week', 'token refreshed']));
-  out(`(rotate threshold: 5h ${meta.threshold5h}% / weekly ${meta.thresholdWeekly}% — change with "codexswitch threshold")`);
+  out(ui.dim(`(rotate threshold: 5h ${meta.threshold5h}% / weekly ${meta.thresholdWeekly}% — change with "codexswitch threshold")`));
 }
 
 function cmdUse(args) {
@@ -175,7 +186,7 @@ function cmdUse(args) {
   meta.accounts[name].lastUsed = Date.now();
   store.saveMeta(meta);
   const info = authInfo(auth);
-  out(`now using "${name}"${info.email ? ` (${info.email}, ${info.plan || 'unknown plan'})` : ''}`);
+  out(ui.ok(`now using ${ui.bold(`"${name}"`)}${info.email ? ui.dim(` (${info.email}, ${info.plan || 'unknown plan'})`) : ''}`));
 }
 
 function cmdCurrent() {
@@ -192,9 +203,9 @@ function cmdCurrent() {
     (info.email && accounts.find((a) => a.email === info.email)) ||
     accounts.find((a) => a.accountId === info.accountId);
   const name = match ? match.name : '(not stored — run "codexswitch import")';
-  const note = meta.active && match && meta.active !== match.name ? ` (meta says "${meta.active}" — out of sync)` : '';
-  out(`active: ${name}${note}`);
-  out(`  email: ${info.email || '-'}\n  plan:  ${info.plan || '-'}\n  token refreshed: ${fmtDate(info.lastRefresh)}`);
+  const note = meta.active && match && meta.active !== match.name ? ui.yellow(` (meta says "${meta.active}" — out of sync)`) : '';
+  out(`active: ${ui.bold(name)}${note}`);
+  out(ui.dim(`  email: ${info.email || '-'}\n  plan:  ${info.plan || '-'}\n  token refreshed: ${fmtDate(info.lastRefresh)}`));
 }
 
 function cmdNext() {
@@ -332,6 +343,49 @@ function cmdModel(args) {
   out(`default model set to "${meta.model}" (applied to run/exec)`);
 }
 
+// Per-account usage dashboard: gauge bars for the 5h / weekly windows with
+// reset countdowns, based on what codex recorded in its session files.
+function cmdUsage(args) {
+  const meta = store.loadMeta();
+  let accounts = store.listAccounts();
+  if (args[0]) {
+    accounts = accounts.filter((a) => a.name === args[0]);
+    if (accounts.length === 0) throw new Error(`no such account: ${args[0]}`);
+  }
+  if (accounts.length === 0) {
+    out('no accounts yet — add one with "codexswitch login" or "codexswitch import"');
+    return;
+  }
+  const now = Date.now();
+  const bar = (pct, threshold) => {
+    const width = 20;
+    const filled = Math.max(0, Math.min(width, Math.round((pct / 100) * width)));
+    const paint = pct >= threshold ? ui.red : pct >= 70 ? ui.yellow : ui.green;
+    return `[${paint('█'.repeat(filled))}${ui.dim('░'.repeat(width - filled))}]`;
+  };
+  const line = (label, win, threshold) => {
+    if (!win || typeof win.pct !== 'number') return `  ${label} ${ui.dim('no data')}`;
+    const pct = Math.round(win.pct);
+    const reset = win.resetAt && win.resetAt > now ? ` resets in ${fmtRemaining(win.resetAt)}` : '';
+    const overMark = win.pct >= threshold ? ` ${ui.red(`≥ threshold ${threshold}%`)}` : '';
+    return `  ${label} ${bar(win.pct, threshold)} ${String(pct).padStart(3)}%${ui.dim(reset)}${overMark}`;
+  };
+  for (const a of accounts) {
+    const mark = a.active ? ui.green('●') : ' ';
+    const state = a.disabled ? ui.red(' [disabled]') : a.limitedUntil && a.limitedUntil > now ? ui.yellow(` [limited ${fmtRemaining(a.limitedUntil)}]`) : '';
+    out(`${mark} ${ui.bold(a.name)}${ui.dim(` (${a.plan || a.email || '-'})`)}${state}`);
+    if (!a.usage) {
+      out(ui.dim('  no usage data yet — codex records it during runs (try "codexswitch run" once)'));
+    } else {
+      out(line('5h    ', a.usage.p5h, meta.threshold5h));
+      out(line('weekly', a.usage.weekly, meta.thresholdWeekly));
+      if (a.usage.at) out(ui.dim(`  measured ${fmtDate(a.usage.at)}`));
+    }
+  }
+  const next = store.pickAccount();
+  out(ui.dim(`\nrotation would pick: ${next ? next.name : '(none usable)'} · threshold 5h ${meta.threshold5h}% / weekly ${meta.thresholdWeekly}%`));
+}
+
 // Rotate-early thresholds: how full the 5h / weekly window may get before
 // the account is skipped in rotation.
 function cmdThreshold(args) {
@@ -415,7 +469,7 @@ function cmdNames() {
 }
 
 const COMMANDS =
-  'login import add-key list use current next run exec order model remove rename ' +
+  'login import add-key list usage use current next run exec order model remove rename ' +
   'enable disable priority clear-limit cooldown threshold patterns export restore sync completion help';
 
 function cmdCompletion(args) {
@@ -468,7 +522,7 @@ async function cmdRun(args) {
   } else if (meta.model && rest.length === 0) {
     rest = ['-m', meta.model];
   }
-  out(`[codexswitch] running codex as "${name}"`);
+  out(ui.info(`running codex as ${ui.bold(`"${name}"`)}`));
   const startTs = Date.now();
   const res = await runner.runCodex(name, rest);
   runner.recordUsage(name, res.profile, startTs);
@@ -511,7 +565,7 @@ async function cmdExec(args) {
     }
     tried.push(name);
     console.error(
-      `[codexswitch] exec as "${name}"${attempt > 0 ? ` (attempt ${attempt + 1}${useResume ? ', resuming session' : ''})` : ''}`
+      ui.info(`exec as ${ui.bold(`"${name}"`)}${ui.dim(attempt > 0 ? ` (attempt ${attempt + 1}${useResume ? ', resuming session' : ''})` : '')}`)
     );
     // On rotation, continue the same session with the next account instead
     // of restarting the whole prompt — the session files are shared.
@@ -523,6 +577,7 @@ async function cmdExec(args) {
     runner.recordUsage(name, res.profile, startTs);
     if (res.code === 0) {
       store.clearLimited(name);
+      console.error(ui.ok(`done as ${ui.bold(`"${name}"`)}`));
       warnIfOverThreshold(name);
       return 0;
     }
@@ -533,7 +588,7 @@ async function cmdExec(args) {
         useResume = true;
       }
       console.error(
-        `[codexswitch] "${name}" hit a usage/rate limit (paused until ${fmtDate(until)}) — rotating${useResume ? ' and resuming the session' : ''}`
+        ui.warn(`"${name}" hit a usage/rate limit (paused until ${fmtDate(until)}) — rotating${useResume ? ' and resuming the session' : ''}`)
       );
       continue;
     }
@@ -542,13 +597,13 @@ async function cmdExec(args) {
       // rotation and keep the task going on the next one.
       setFlag(name, { disabled: true });
       console.error(
-        `[codexswitch] "${name}" has a revoked/invalid login — disabled. Fix it with: codexswitch login ${name}`
+        ui.fail(`"${name}" has a revoked/invalid login — disabled. Fix it with: ${ui.bold(`codexswitch login ${name}`)}`)
       );
       continue;
     }
     return res.code; // real failure, don't burn other accounts on it
   }
-  console.error('[codexswitch] all accounts are rate-limited, over threshold, or disabled');
+  console.error(ui.fail('all accounts are rate-limited, over threshold, or disabled'));
   return 2;
 }
 
@@ -560,7 +615,7 @@ function warnIfOverThreshold(name) {
   if (blocked) {
     const pct = blocked === '5h' ? account.usage.p5h.pct : account.usage.weekly.pct;
     console.error(
-      `[codexswitch] "${name}" is at ${Math.round(pct)}% of its ${blocked} limit (threshold ${blocked === '5h' ? meta.threshold5h : meta.thresholdWeekly}%) — the next exec will rotate to another account`
+      ui.warn(`"${name}" is at ${Math.round(pct)}% of its ${blocked} limit (threshold ${blocked === '5h' ? meta.threshold5h : meta.thresholdWeekly}%) — the next exec will rotate to another account`)
     );
   }
 }
@@ -572,7 +627,12 @@ async function main(argv) {
     case 'help':
     case '--help':
     case '-h':
-      out(HELP);
+      out(
+        HELP.replace(/^(codexswitch)(?= —)/, ui.bold('$1')).replace(
+          /^(Accounts|Running codex|Settings|Maintenance|Environment)$/gm,
+          (s) => ui.bold(ui.cyan(s))
+        )
+      );
       return 0;
     case 'login':
       return cmdLogin(args), 0;
@@ -580,8 +640,10 @@ async function main(argv) {
       return cmdImport(args), 0;
     case 'list':
     case 'accounts':
-    case 'status':
       return cmdList(), 0;
+    case 'usage':
+    case 'status':
+      return cmdUsage(args), 0;
     case 'use':
       return cmdUse(args), 0;
     case 'current':
@@ -638,7 +700,10 @@ async function main(argv) {
     case 'exec':
       return cmdExec(args);
     default:
-      throw new Error(`unknown command "${cmd}" (see "codexswitch help")`);
+      // Forward everything else to codex under the managed account, so
+      // codexswitch is a drop-in replacement: "cxs goal", "cxs resume", ...
+      console.error(ui.info(ui.dim(`forwarding to codex: codex ${argv.join(' ')}`)));
+      return cmdRun(argv);
   }
 }
 

package/src/ui.js

@@ -0,0 +1,35 @@
+'use strict';
+
+// Tiny ANSI color layer (zero deps). Colors turn off automatically when the
+// output is piped, or when NO_COLOR is set — so scripts and tests always see
+// plain text (https://no-color.org).
+const enabled =
+  process.env.NO_COLOR == null &&
+  process.env.FORCE_COLOR !== '0' &&
+  (Boolean(process.stdout.isTTY) || Boolean(process.env.FORCE_COLOR));
+
+const wrap = (open, close) => (s) => (enabled ? `[${open}m${s}[${close}m` : String(s));
+
+const green = wrap(32, 39);
+const red = wrap(31, 39);
+const yellow = wrap(33, 39);
+const cyan = wrap(36, 39);
+const dim = wrap(2, 22);
+const bold = wrap(1, 22);
+
+module.exports = {
+  enabled,
+  green,
+  red,
+  yellow,
+  cyan,
+  dim,
+  bold,
+  // status line prefixes — one glyph per kind keeps progress scannable
+  ok: (s) => `${green('✓')} ${s}`,
+  info: (s) => `${cyan('›')} ${s}`,
+  warn: (s) => `${yellow('⚠')} ${s}`,
+  fail: (s) => `${red('✗')} ${s}`,
+  // strip ANSI codes (for width calculations)
+  visible: (s) => String(s).replace(/\[[0-9;]*m/g, ''),
+};

package/src/util.js

@@ -85,14 +85,17 @@ function fmtRemaining(untilTs) {
   if (ms <= 0) return 'now';
   const h = Math.floor(ms / 3600000);
   const m = Math.round((ms % 3600000) / 60000);
+  if (h >= 48) return `${Math.floor(h / 24)}d${h % 24}h`;
   return h > 0 ? `${h}h${m}m` : `${m}m`;
 }
 
 function table(rows, headers) {
+  const { visible, dim } = require('./ui.js');
   const all = [headers, ...rows].map((r) => r.map((c) => String(c == null ? '-' : c)));
-  const widths = headers.map((_, i) => Math.max(...all.map((r) => r[i].length)));
-  const line = (r) => r.map((c, i) => c.padEnd(widths[i])).join('  ').trimEnd();
-  return [line(all[0]), line(widths.map((w) => '-'.repeat(w))), ...all.slice(1).map(line)].join('\n');
+  const widths = headers.map((_, i) => Math.max(...all.map((r) => visible(r[i]).length)));
+  const pad = (c, w) => c + ' '.repeat(Math.max(0, w - visible(c).length));
+  const line = (r) => r.map((c, i) => pad(c, widths[i])).join('  ').trimEnd();
+  return [dim(line(all[0])), dim(line(widths.map((w) => '-'.repeat(w)))), ...all.slice(1).map(line)].join('\n');
 }
 
 module.exports = {