@wangxt0223/codex-switcher 0.6.3 → 0.6.5

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## 0.6.5 - 2026-04-12
+
+- Removed `LAST ACTIVITY` from `list` default output columns.
+- `list` now prints: `ENV / HOME / ACCOUNT / EMAIL / PLAN / 5H USAGE / WEEKLY USAGE / SOURCE`.
+- Updated command help text, Chinese/English README docs, and smoke-test assertions for the new column layout.
+
+## 0.6.4 - 2026-04-12
+
+- Updated `list` output columns to include `HOME` and a dedicated `SOURCE` column (`api`/`local`).
+- Changed `LAST ACTIVITY` to absolute `MM-DD HH:MM` format and aligned weekly reset display to the same date+time style.
+- Improved last-activity fallback behavior: when API omits activity timestamp, fallback to local session-derived time.
+- Updated Chinese/English README and plugin docs for the latest `list` output schema.
+- Updated smoke tests for `HOME`/`SOURCE` columns and absolute-time assertions.
+- Removed accidental package self-dependency from `package.json`.
+
 ## 0.6.3 - 2026-04-12
 
 - Changed `list` email rendering to show plain email only (removed `(account)` prefix).

package/README.en.md

@@ -81,7 +81,7 @@ Commands below use `codex-sw` (all are equivalent under `codex-switcher`):
 | Account | `codex-sw account logout [account] [--env <env>] [--target cli\|app\|both]` | Logout account |
 | Account | `codex-sw account current [cli\|app]` | Show current env/account pointer |
 | Usage proxy | `codex-sw proxy [<host:port>\|off\|test]` | Configure/test usage API proxy (only affects `list`) |
-| Query/Run | `codex-sw list` | Show `ENV/ACCOUNT/EMAIL/PLAN/5H/WEEKLY/LAST ACTIVITY` |
+| Query/Run | `codex-sw list` | Show `ENV/HOME/ACCOUNT/EMAIL/PLAN/5H/WEEKLY/SOURCE` |
 | Query/Run | `codex-sw status` | Show login status for current CLI/App pointers |
 | Query/Run | `codex-sw current [cli\|app]` | Show current env/account |
 | Query/Run | `codex-sw exec -- <codex args...>` | Run `codex` under current CLI env/account |
@@ -101,6 +101,7 @@ Commands below use `codex-sw` (all are equivalent under `codex-switcher`):
 | Maintenance | `codex-sw init [--shell zsh\|bash] [--dry-run]` | Initialize PATH bootstrap |
 | Maintenance | `codex-sw upgrade [--dry-run]` | Upgrade from npm |
 | Maintenance | `codex-sw recover [--dry-run]` | Recover corrupted pointers |
+| Maintenance | `codex-sw version` | Print current tool version |
 | Maintenance | `codex-sw check` | Basic health checks |
 | Maintenance | `codex-sw doctor [--fix]` | Deep diagnostics and optional auto-fix |
 | Maintenance | `codex-sw --help` | Show full help |

package/README.md

@@ -78,7 +78,7 @@ codex-switcher account use corp --env project-a
 | 账号管理 | `codex-sw account logout [account] [--env <env>] [--target cli\|app\|both]` | 注销账号（删除对应 auth） |
 | 账号管理 | `codex-sw account current [cli\|app]` | 查看当前 env/account 指针 |
 | 用量代理 | `codex-sw proxy [<host:port>\|off\|test]` | 设置/关闭/测试“用量 API”代理（仅影响 `list`） |
-| 查询执行 | `codex-sw list` | 展示 `ENV/ACCOUNT/EMAIL/PLAN/5H/WEEKLY/LAST ACTIVITY` |
+| 查询执行 | `codex-sw list` | 展示 `ENV/HOME/ACCOUNT/EMAIL/PLAN/5H/WEEKLY/SOURCE` |
 | 查询执行 | `codex-sw status` | 检查 CLI/App 当前登录状态 |
 | 查询执行 | `codex-sw current [cli\|app]` | 查看当前 env/account |
 | 查询执行 | `codex-sw exec -- <codex args...>` | 在当前 CLI env/account 下执行 `codex` |
@@ -98,6 +98,7 @@ codex-switcher account use corp --env project-a
 | 维护命令 | `codex-sw init [--shell zsh\|bash] [--dry-run]` | 初始化 PATH 快捷命令 |
 | 维护命令 | `codex-sw upgrade [--dry-run]` | 升级到最新 npm 版本 |
 | 维护命令 | `codex-sw recover [--dry-run]` | 自动恢复损坏指针 |
+| 维护命令 | `codex-sw version` | 输出当前工具版本号 |
 | 维护命令 | `codex-sw check` | 基础健康检查 |
 | 维护命令 | `codex-sw doctor [--fix]` | 深度检查并可选自动修复 |
 | 维护命令 | `codex-sw --help` | 查看完整帮助 |

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wangxt0223/codex-switcher",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "description": "Env + account switcher for Codex CLI and Codex App with shared env data and per-account auth.",
   "license": "MIT",
   "author": "wangxt",
@@ -43,8 +43,5 @@
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
-  },
-  "dependencies": {
-    "@wangxt0223/codex-switcher": "^0.6.0"
   }
 }

package/plugins/codex-switcher/README.en.md

@@ -49,6 +49,8 @@ codex-switcher app logout [account]
 codex-switcher app status
 codex-switcher app stop
 codex-switcher app current
+
+codex-switcher version
 ```
 
 ## Typical Flow
@@ -72,13 +74,14 @@ codex-switcher account use corp --env project-a
 
 `codex-switcher list` prints:
 
-`ENV / ACCOUNT / EMAIL / PLAN / 5H USAGE / WEEKLY USAGE / LAST ACTIVITY`
+`ENV / HOME / ACCOUNT / EMAIL / PLAN / 5H USAGE / WEEKLY USAGE / SOURCE`
 
 Usage data strategy:
 
 - API first (`chatgpt.com/backend-api/wham/usage`)
 - Auto fallback to local `sessions/*.jsonl` on API failure
-- `LAST ACTIVITY` appends source marker `(api)` or `(local)`
+- `5H USAGE` / `WEEKLY USAGE` reset time is unified to `MM-DD HH:MM` (example: `89% (04-19 11:45)`)
+- `SOURCE` is shown as a dedicated column (`api` or `local`)
 - You can configure a dedicated proxy for this usage API via `codex-switcher proxy 127.0.0.1:7899` (only affects `list`)
 - If no manual proxy is configured, env/system proxy settings are auto-detected for usage API requests
 

package/plugins/codex-switcher/README.md

@@ -49,6 +49,8 @@ codex-switcher app logout [account]
 codex-switcher app status
 codex-switcher app stop
 codex-switcher app current
+
+codex-switcher version
 ```
 
 ## 典型流程
@@ -72,13 +74,14 @@ codex-switcher account use corp --env project-a
 
 `codex-switcher list` 默认输出：
 
-`ENV / ACCOUNT / EMAIL / PLAN / 5H USAGE / WEEKLY USAGE / LAST ACTIVITY`
+`ENV / HOME / ACCOUNT / EMAIL / PLAN / 5H USAGE / WEEKLY USAGE / SOURCE`
 
 其中用量数据策略为：
 
 - 默认优先 API（`chatgpt.com/backend-api/wham/usage`）
 - API 失败自动回退本地 `sessions/*.jsonl`
-- `LAST ACTIVITY` 列会追加 `(api)` 或 `(local)` 标记来源
+- `5H USAGE` / `WEEKLY USAGE` 的重置时间统一为 `MM-DD HH:MM`（例如 `89% (04-19 11:45)`）
+- `SOURCE` 独立显示 `api` 或 `local`
 - 可通过 `codex-switcher proxy 127.0.0.1:7899` 为该用量 API 单独配置代理（仅影响 `list`）
 - 未手动设置时会自动检测环境变量/系统代理并用于用量 API 请求
 

package/plugins/codex-switcher/scripts/codex-switcher

@@ -75,6 +75,7 @@ Usage:
   codex-sw init [--shell zsh|bash] [--dry-run]
   codex-sw upgrade [--dry-run]
   codex-sw recover [--dry-run]
+  codex-sw version
   codex-sw check
   codex-sw doctor [--fix]
 
@@ -86,7 +87,7 @@ Notes:
   - Same-env account switch only swaps auth.json and does not sync shared data.
   - `proxy` only affects usage API calls used by `list`.
   - If manual proxy is not set, usage API proxy is auto-detected from env/system proxy settings.
-  - `list` prints: EMAIL / PLAN / 5H USAGE / WEEKLY USAGE / LAST ACTIVITY (+ env/account context).
+  - `list` prints: ENV / HOME / ACCOUNT / EMAIL / PLAN / 5H USAGE / WEEKLY USAGE / SOURCE.
   - Usage metrics are API-first and automatically fallback to local sessions; source is shown as (api|local).
 USAGE
 }
@@ -314,6 +315,19 @@ clear_usage_proxy() {
   rm -f -- "$USAGE_PROXY_FILE"
 }
 
+display_path_for_output() {
+  local path="$1"
+  if [[ "$path" == "$HOME" ]]; then
+    echo "~"
+    return
+  fi
+  if [[ "$path" == "$HOME/"* ]]; then
+    echo "~/${path#$HOME/}"
+    return
+  fi
+  echo "$path"
+}
+
 set_current_env() {
   local target="$1"
   local env="$2"
@@ -1132,9 +1146,10 @@ PY
 
 cmd_list() {
   local cli_env app_env cli_account app_account
-  local env account marks auth_file home metrics
-  local email plan usage_5h usage_weekly last_activity source
-  local usage_proxy="" usage_info="" usage_proxy_source=""
+  local env account marks auth_file home home_display metrics
+  local email plan usage_5h usage_weekly source
+  local _last_activity=""
+  local usage_proxy="" usage_info=""
 
   cli_env="$(read_current_env cli || true)"
   app_env="$(read_current_env app || true)"
@@ -1142,12 +1157,13 @@ cmd_list() {
   app_account="$(read_current_account app || true)"
   usage_info="$(resolve_usage_proxy_with_source || true)"
   if [[ -n "$usage_info" ]]; then
-    IFS=$'\t' read -r usage_proxy_source usage_proxy <<< "$usage_info"
+    IFS=$'\t' read -r _ usage_proxy <<< "$usage_info"
   fi
 
-  printf '%-12s %-30s %-44s %-10s %-16s %-18s %s\n' "ENV" "ACCOUNT" "EMAIL" "PLAN" "5H USAGE" "WEEKLY USAGE" "LAST ACTIVITY"
+  printf '%-12s %-28s %-30s %-38s %-10s %-20s %-20s %s\n' "ENV" "HOME" "ACCOUNT" "EMAIL" "PLAN" "5H USAGE" "WEEKLY USAGE" "SOURCE"
   while IFS= read -r env; do
     home="$(env_home_path "$env")"
+    home_display="$(display_path_for_output "$home")"
     ensure_env_home "$env"
     local found=0
     while IFS= read -r account; do
@@ -1156,7 +1172,6 @@ cmd_list() {
       plan=""
       usage_5h=""
       usage_weekly=""
-      last_activity=""
       source=""
       marks=""
       [[ "$env" == "$cli_env" && "$account" == "$cli_account" ]] && marks="${marks} [cli-current]"
@@ -1166,18 +1181,16 @@ cmd_list() {
 
       metrics="$(collect_profile_metrics_tsv "$account" "$auth_file" "$home" "$usage_proxy" || true)"
       if [[ -n "$metrics" ]]; then
-        IFS=$'\t' read -r email plan usage_5h usage_weekly last_activity source <<< "$metrics"
+        IFS=$'\t' read -r email plan usage_5h usage_weekly _last_activity source <<< "$metrics"
       fi
       email="${email:-($account)-}"
       plan="${plan:-unknown}"
       usage_5h="${usage_5h:--}"
       usage_weekly="${usage_weekly:--}"
-      last_activity="${last_activity:--}"
       source="${source:-local}"
       [[ "$source" == "api" || "$source" == "local" ]] || source="local"
-      last_activity="${last_activity} (${source})"
 
-      printf '%-12s %-30s %-44s %-10s %-16s %-18s %s\n' "$env" "$account$marks" "$email" "$plan" "$usage_5h" "$usage_weekly" "$last_activity"
+      printf '%-12s %-28s %-30s %-38s %-10s %-20s %-20s %s\n' "$env" "$home_display" "$account$marks" "$email" "$plan" "$usage_5h" "$usage_weekly" "$source"
     done < <(list_accounts_for_env "$env")
 
     if [[ "$found" -eq 0 ]]; then
@@ -1185,21 +1198,18 @@ cmd_list() {
       plan=""
       usage_5h=""
       usage_weekly=""
-      last_activity=""
       source=""
       metrics="$(collect_profile_metrics_tsv "-" "$home/auth.json" "$home" "$usage_proxy" || true)"
       if [[ -n "$metrics" ]]; then
-        IFS=$'\t' read -r email plan usage_5h usage_weekly last_activity source <<< "$metrics"
+        IFS=$'\t' read -r email plan usage_5h usage_weekly _last_activity source <<< "$metrics"
       fi
       email="${email:--}"
       plan="${plan:-unknown}"
       usage_5h="${usage_5h:--}"
       usage_weekly="${usage_weekly:--}"
-      last_activity="${last_activity:--}"
       source="${source:-local}"
       [[ "$source" == "api" || "$source" == "local" ]] || source="local"
-      last_activity="${last_activity} (${source})"
-      printf '%-12s %-30s %-44s %-10s %-16s %-18s %s\n' "$env" "-" "$email" "$plan" "$usage_5h" "$usage_weekly" "$last_activity"
+      printf '%-12s %-28s %-30s %-38s %-10s %-20s %-20s %s\n' "$env" "$home_display" "-" "$email" "$plan" "$usage_5h" "$usage_weekly" "$source"
     fi
   done < <(list_env_names | sort -u)
 }
@@ -1605,6 +1615,10 @@ cmd_check() {
   echo "check: ok"
 }
 
+cmd_version() {
+  echo "$(switcher_version)"
+}
+
 cmd_doctor() {
   local fix="${1:-false}"
   local issues=0
@@ -2178,6 +2192,10 @@ main() {
       fi
       with_lock cmd_recover "$dry"
       ;;
+    version)
+      [[ "$#" -eq 0 ]] || err "usage: $SCRIPT_NAME version"
+      cmd_version
+      ;;
     check)
       [[ "$#" -eq 0 ]] || err "usage: $SCRIPT_NAME check"
       cmd_check

package/plugins/codex-switcher/scripts/profile-metrics.py

@@ -6,7 +6,6 @@ import json
 import os
 import subprocess
 import sys
-import time
 from typing import Any, Dict, Optional
 
 
@@ -223,22 +222,15 @@ def format_usage(window: Optional[Dict[str, Any]]) -> str:
     percent = clamp_percent(float(window["remaining_percent"]))
     reset_epoch = window.get("reset_epoch")
     if isinstance(reset_epoch, int):
-        reset_text = dt.datetime.fromtimestamp(reset_epoch).strftime("%H:%M")
+        reset_text = dt.datetime.fromtimestamp(reset_epoch).strftime("%m-%d %H:%M")
         return f"{percent}% ({reset_text})"
     return f"{percent}%"
 
 
-def format_relative(last_epoch: Optional[int], now_epoch: int) -> str:
+def format_last_activity(last_epoch: Optional[int]) -> str:
     if not isinstance(last_epoch, int):
         return DASH
-    delta = max(0, now_epoch - last_epoch)
-    if delta < 60:
-        return "just now"
-    if delta < 3600:
-        return f"{delta // 60}m ago"
-    if delta < 86400:
-        return f"{delta // 3600}h ago"
-    return f"{delta // 86400}d ago"
+    return dt.datetime.fromtimestamp(last_epoch).strftime("%m-%d %H:%M")
 
 
 def collect_local_metrics(data_path: str) -> Dict[str, Any]:
@@ -326,7 +318,6 @@ def collect_api_metrics(access_token: str, account_id: str, usage_proxy: str, ti
 
 def main() -> int:
     args = parse_args()
-    now_epoch = int(time.time())
     auth_data = load_json(args.auth_file)
     tokens = auth_data.get("tokens")
     if not isinstance(tokens, dict):
@@ -352,7 +343,8 @@ def main() -> int:
         plan_from_claims = normalize_plan(auth_data.get("chatgpt_plan_type") or auth_data.get("plan_type"))
 
     api_metrics = collect_api_metrics(access_token, account_id, args.usage_proxy, args.timeout_seconds)
-    metrics = api_metrics if api_metrics is not None else collect_local_metrics(args.data_path)
+    local_metrics = collect_local_metrics(args.data_path)
+    metrics = api_metrics if api_metrics is not None else local_metrics
 
     windows = metrics.get("windows")
     if not isinstance(windows, dict):
@@ -374,8 +366,12 @@ def main() -> int:
 
     last_activity_epoch = metrics.get("last_activity_epoch")
     if not isinstance(last_activity_epoch, int):
-        last_activity_epoch = None
-    last_activity = format_relative(last_activity_epoch, now_epoch)
+        fallback_last_activity = local_metrics.get("last_activity_epoch")
+        if isinstance(fallback_last_activity, int):
+            last_activity_epoch = fallback_last_activity
+        else:
+            last_activity_epoch = None
+    last_activity = format_last_activity(last_activity_epoch)
 
     if email:
         display_email = email

package/plugins/codex-switcher/scripts/test-switcher.sh

@@ -99,9 +99,11 @@ echo '{"memo":"persist"}' > "$DEFAULT_HOME/shared.json"
 check_out="$("$SW" check)"
 echo "$check_out" | grep -Eq '^version: [0-9]+\.[0-9]+\.[0-9]+$'
 echo "$check_out" | grep -q "check: ok"
+echo "$("$SW" version)" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$'
 link_check_out="$("$SW_LINK" check)"
 echo "$link_check_out" | grep -Eq '^version: [0-9]+\.[0-9]+\.[0-9]+$'
 echo "$link_check_out" | grep -q "check: ok"
+echo "$("$SW_LINK" version)" | grep -Eq '^[0-9]+\.[0-9]+\.[0-9]+$'
 [[ "$("$SW" proxy)" == "usage_api_proxy: off" ]]
 "$SW" proxy 127.0.0.1:7899
 [[ "$("$SW" proxy)" == "usage_api_proxy: http://127.0.0.1:7899 (manual)" ]]
@@ -174,21 +176,25 @@ grep -q '{"shared":"project"}' "$ENVS/project/home/shared.json"
 
 "$SW" list >/tmp/codex_sw_list_api
 grep -q "ENV" /tmp/codex_sw_list_api
+grep -q "HOME" /tmp/codex_sw_list_api
 grep -q "ACCOUNT" /tmp/codex_sw_list_api
 grep -q "EMAIL" /tmp/codex_sw_list_api
 grep -q "PLAN" /tmp/codex_sw_list_api
 grep -q "5H USAGE" /tmp/codex_sw_list_api
 grep -q "WEEKLY USAGE" /tmp/codex_sw_list_api
-grep -q "LAST ACTIVITY" /tmp/codex_sw_list_api
+grep -q "SOURCE" /tmp/codex_sw_list_api
+! grep -q "LAST ACTIVITY" /tmp/codex_sw_list_api
 grep -q "personal@example.com" /tmp/codex_sw_list_api
-grep -q "(api)" /tmp/codex_sw_list_api
+grep -Eq "[[:space:]]+api$" /tmp/codex_sw_list_api
 grep -q "60% (" /tmp/codex_sw_list_api
 grep -q "80% (" /tmp/codex_sw_list_api
+grep -Eq "60% \\([0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}\\)" /tmp/codex_sw_list_api
+grep -Eq "80% \\([0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}\\)" /tmp/codex_sw_list_api
 grep -q "proxy=http://127.0.0.1:7899" "$CODEX_SWITCHER_TEST_CURL_LOG"
 
 "$SW_LINK" list >/tmp/codex_sw_list_symlink
 grep -q "personal@example.com" /tmp/codex_sw_list_symlink
-grep -q "(api)" /tmp/codex_sw_list_symlink
+grep -Eq "[[:space:]]+api$" /tmp/codex_sw_list_symlink
 
 mkdir -p "$ENVS/project/home/sessions/2026/04/12"
 cat > "$ENVS/project/home/sessions/2026/04/12/rollout-test.jsonl" <<'JSONL'
@@ -199,9 +205,11 @@ export CODEX_SWITCHER_TEST_CURL_MODE="fail"
 [[ "$("$SW" proxy)" == "usage_api_proxy: off" ]]
 : > "$CODEX_SWITCHER_TEST_CURL_LOG"
 "$SW" list >/tmp/codex_sw_list_local
-grep -q "(local)" /tmp/codex_sw_list_local
+grep -Eq "[[:space:]]+local$" /tmp/codex_sw_list_local
 grep -q "75% (" /tmp/codex_sw_list_local
 grep -q "30% (" /tmp/codex_sw_list_local
+grep -Eq "75% \\([0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}\\)" /tmp/codex_sw_list_local
+grep -Eq "30% \\([0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}\\)" /tmp/codex_sw_list_local
 grep -q "^proxy=$" "$CODEX_SWITCHER_TEST_CURL_LOG"
 
 export CODEX_SWITCHER_TEST_CURL_MODE="success"