codex-switch-helper 1.0.0 → 1.0.1

package/README.md

@@ -36,6 +36,15 @@ csw list                # 验证
 
 `install.sh` 只创建软链，不碰 `~/.codex/` 里任何现有内容。
 
+### 首次使用
+
+若 `~/.codex/profiles/` 还不存在，运行 `csw` / `csw list` 时会**自动**根据当前
+`config.toml` + `auth.json` 建好第一个 profile（例如正在用 anyrouter key 就建
+`anyrouter`；正在用 ChatGPT 登录就建 `official`），并补上受管标记。密钥只复制到
+本机 `profiles/<名>/auth.json`（权限 600），不会上传。
+
+也可手动：`csw init` · 再加中转：`csw add`。
+
 ---
 
 ## 命令速查
@@ -47,6 +56,8 @@ csw list                # 验证
 | `csw add [名字]` | **向导**：新建一个自定义 API-key provider（见下） |
 | `csw list` | 列出所有 profile，`*` 标当前 |
 | `csw status` | 显示当前 profile + 受管块 + auth 模式 |
+| `csw init` | 无 profile 时从当前 Codex 配置自动初始化（有则只展示） |
+| `csw doctor` | 检查/修复 `config.toml` 受管标记 |
 
 > 兼容别名：源码安装后也可使用 `switch` / `codex-switch`（与 `csw` 相同能力）。
 

package/codex-switch

@@ -10,15 +10,19 @@
 # Profiles live in ~/.codex/profiles/<name>/ as { provider.env, auth.json }.
 # Provider endpoints are defined once as [model_providers.<name>] in config.toml.
 #
-# Usage:
-#   codex-switch                 # show current status
-#   codex-switch list            # list profiles
-#   codex-switch doctor          # check/repair the managed block (e.g. after Codex rewrote config.toml)
-#   codex-switch pick            # interactive arrow-key picker (also: `switch`)
-#   codex-switch add [name]      # wizard: create a new custom API-key profile
-#   codex-switch official        # back to ChatGPT login (your original setup)
-#   codex-switch anyrouter       # custom key via anyrouter.top
-#   codex-switch muyuan          # custom key via muyuan.do (free/temp)
+# Usage (command alias: csw):
+#   csw / codex-switch           # interactive picker (via csw) / status (via codex-switch)
+#   csw list                     # list profiles
+#   csw status                   # show current profile + managed block
+#   csw doctor                   # check/repair the managed block (e.g. after Codex rewrote config.toml)
+#   csw init                     # first-run bootstrap if profiles/ is empty
+#   csw pick                     # interactive arrow-key picker
+#   csw add [name]               # wizard: create a new custom API-key profile
+#   csw official                 # back to ChatGPT login (your original setup)
+#   csw <provider>               # e.g. anyrouter / a custom profile name
+#
+# First run: if ~/.codex/profiles is empty, auto-snapshots the live config+auth
+# into a profile so switching works immediately (credentials stay local, mode 600).
 set -euo pipefail
 
 CODEX_HOME="${CODEX_HOME:-$HOME/.codex}"
@@ -32,8 +36,103 @@ END='#__CODEX_SWITCH_END__'
 die(){ echo "codex-switch: error: $*" >&2; exit 1; }
 current(){ [ -f "$ACTIVE_FILE" ] && cat "$ACTIVE_FILE" || echo official; }
 
+# Read a top-level / managed-block string value from config.toml (quoted values).
+# Prefer the managed block when present; ignore keys under [tables].
+_cfg_str(){
+  local key="$1"
+  if [ -f "$CONFIG" ] && grep -q "$BEGIN" "$CONFIG" 2>/dev/null; then
+    awk -v b="$BEGIN" -v e="$END" -v k="$key" '
+      $0==b { p=1; next }
+      $0==e { p=0; next }
+      p && $0 ~ "^[[:space:]]*" k "[[:space:]]*=" {
+        if (match($0, /"[^"]*"/)) { print substr($0, RSTART+1, RLENGTH-2); exit }
+      }' "$CONFIG"
+    return 0
+  fi
+  [ -f "$CONFIG" ] || return 0
+  awk -v k="$key" '
+    /^[[:space:]]*\[/ { exit }
+    $0 ~ "^[[:space:]]*" k "[[:space:]]*=" {
+      if (match($0, /"[^"]*"/)) { print substr($0, RSTART+1, RLENGTH-2); exit }
+    }' "$CONFIG"
+}
+
+# Count usable profiles (dir + provider.env + auth.json).
+_profile_count(){
+  local n=0 d
+  for d in "$PROFILES"/*/; do
+    [ -d "$d" ] || continue
+    [ -f "$d/provider.env" ] && [ -f "$d/auth.json" ] && n=$((n+1))
+  done
+  echo "$n"
+}
+
+# First-run bootstrap: if no profiles exist, snapshot the live Codex config/auth
+# into ~/.codex/profiles/<name>/ so `csw` works immediately after install.
+ensure_profiles(){
+  mkdir -p "$PROFILES"
+  [ "$(_profile_count)" -gt 0 ] && return 0
+
+  echo "codex-switch: no profiles yet — bootstrapping from current Codex setup ..."
+
+  [ -f "$CONFIG" ] || die "no config at $CONFIG (install/run Codex once first)"
+  [ -f "$AUTH" ]   || die "no auth.json at $AUTH (log in to Codex or set an API key first)"
+
+  local model provider mode name
+  model="$(_cfg_str model)"
+  model="${model:-gpt-5.5}"
+  provider="$(_cfg_str model_provider)"
+
+  # Decide chatgpt vs apikey from live auth (never invent credentials).
+  # API-key auth.json has OPENAI_API_KEY; ChatGPT login uses OAuth tokens.
+  if grep -q 'OPENAI_API_KEY' "$AUTH" 2>/dev/null; then
+    mode=apikey
+  else
+    mode=chatgpt
+  fi
+
+  if [ "$mode" = "apikey" ]; then
+    name="${provider:-default}"
+    name="$(printf '%s' "$name" | tr -cd 'A-Za-z0-9_-')"
+    [ -n "$name" ] || name=default
+    mkdir -p "$PROFILES/$name"
+    {
+      echo "MODE=apikey"
+      echo "MODEL=$model"
+      echo "PROVIDER=$name"
+    } > "$PROFILES/$name/provider.env"
+    install -m 600 "$AUTH" "$PROFILES/$name/auth.json"
+    printf '%s\n' "$name" > "$ACTIVE_FILE"
+    echo "  ✓ created profile '$name'  (apikey · provider=$name · model=$model)"
+  else
+    name=official
+    mkdir -p "$PROFILES/$name"
+    {
+      echo "MODE=chatgpt"
+      echo "MODEL=$model"
+    } > "$PROFILES/$name/provider.env"
+    install -m 600 "$AUTH" "$PROFILES/$name/auth.json"
+    printf '%s\n' "$name" > "$ACTIVE_FILE"
+    echo "  ✓ created profile 'official'  (ChatGPT login · model=$model)"
+  fi
+
+  echo "  ✓ snapshotted current auth.json → $PROFILES/$name/auth.json (mode 600)"
+  echo "  credentials never leave this machine"
+
+  # Managed markers so later switches can rewrite the block safely.
+  if ! { grep -q "$BEGIN" "$CONFIG" && grep -q "$END" "$CONFIG"; }; then
+    echo "  ensuring managed markers in config.toml ..."
+    doctor
+  fi
+
+  echo "  Done. Add more providers anytime:  csw add"
+  echo
+}
+
 list(){
+  ensure_profiles
   echo "profiles (current: $(current)):"
+  local d n mark info found=0
   for d in "$PROFILES"/*/; do
     [ -d "$d" ] || continue
     n=$(basename "$d")
@@ -42,7 +141,9 @@ list(){
             if [ "${MODE:-}" = chatgpt ]; then echo "ChatGPT login   model=$MODEL"
             else echo "apikey  provider=$PROVIDER  model=$MODEL"; fi )
     printf "%s%-12s %s\n" "$mark" "$n" "$info"
+    found=1
   done
+  [ "$found" -eq 1 ] || echo "  (none — run: csw add)"
 }
 
 build_block(){ # $1 = profile dir -> prints the managed config block
@@ -154,13 +255,27 @@ use(){
 }
 
 status(){
+  ensure_profiles
   echo "active profile : $(current)"
-  echo "config block   :"; awk -v b="$BEGIN" -v e="$END" '$0==b{p=1} p{print} $0==e{p=0}' "$CONFIG" | sed 's/^/    /'
-  if grep -q '"auth_mode"[[:space:]]*:[[:space:]]*"chatgpt"' "$AUTH" 2>/dev/null; then
+  if [ -f "$CONFIG" ] && grep -q "$BEGIN" "$CONFIG" 2>/dev/null; then
+    echo "config block   :"; awk -v b="$BEGIN" -v e="$END" '$0==b{p=1} p{print} $0==e{p=0}' "$CONFIG" | sed 's/^/    /'
+  else
+    echo "config block   : (no managed markers — run: csw doctor)"
+  fi
+  if [ ! -f "$AUTH" ]; then
+    echo "auth.json      : (missing)"
+  elif grep -q '"auth_mode"[[:space:]]*:[[:space:]]*"chatgpt"' "$AUTH" 2>/dev/null \
+    || { ! grep -q 'OPENAI_API_KEY' "$AUTH" 2>/dev/null && grep -qE '"tokens"|"access_token"' "$AUTH" 2>/dev/null; }; then
     echo "auth.json      : ChatGPT login (OAuth tokens)"
   else
-    local k; k=$(grep -o 'sk-[A-Za-z0-9]\{6\}' "$AUTH" 2>/dev/null | head -1)
-    echo "auth.json      : apikey  ${k:+($k…redacted)}"
+    # Match common sk- prefixes; never print the full key (set -u safe).
+    local k=""
+    k=$(grep -oE 'sk-[A-Za-z0-9]{4,8}' "$AUTH" 2>/dev/null | head -1 || true)
+    if [ -n "$k" ]; then
+      echo "auth.json      : apikey  (${k}...redacted)"
+    else
+      echo "auth.json      : apikey"
+    fi
   fi
 }
 
@@ -168,10 +283,11 @@ status(){
 #   keyboard: ↑/↓ j/k move · Enter confirm · 1-9 direct · q/Esc cancel
 #   mouse:    click to select · wheel to scroll · selection auto-copied to clipboard
 pick(){
+  ensure_profiles
   local profiles=() cur sel=0 i d
   cur="$(current)"
   for d in "$PROFILES"/*/; do [ -d "$d" ] || continue; profiles+=("$(basename "$d")"); done
-  [ ${#profiles[@]} -gt 0 ] || die "no profiles found in $PROFILES"
+  [ ${#profiles[@]} -gt 0 ] || die "no profiles found in $PROFILES (run: csw add)"
   for i in "${!profiles[@]}"; do [ "${profiles[$i]}" = "$cur" ] && sel=$i; done
   local rows=${#profiles[@]}
 
@@ -527,7 +643,7 @@ add(){
   fi
 
   read -r -p "现在就切到 $name? [y/N] " s
-  if [[ "$s" =~ ^[Yy]$ ]]; then echo; use "$name"; else echo "之后用:  switch $name"; fi
+  if [[ "$s" =~ ^[Yy]$ ]]; then echo; use "$name"; else echo "之后用:  csw $name"; fi
 }
 
 cmd="${1:-status}"
@@ -535,11 +651,15 @@ case "$cmd" in
   list|ls)          list ;;
   status|st|"")     status ;;
   pick|menu|i|-i|p) pick ;;
-  add|new)          shift; add "${1:-}" ;;
+  add|new)          ensure_profiles; shift; add "${1:-}" ;;
   doctor|fix)       doctor ;;
-  use)              shift; use "${1:?profile name required}" ;;
+  init|bootstrap)   # force re-run only when empty; always print state
+                    if [ "$(_profile_count)" -eq 0 ]; then ensure_profiles
+                    else echo "profiles already present:"; list; fi ;;
+  use)              ensure_profiles; shift; use "${1:?profile name required}" ;;
   -h|--help|help)   sed -n '2,32p' "$0" ;;
-  *)                if [ -d "$PROFILES/$cmd" ]; then use "$cmd"
+  *)                ensure_profiles
+                    if [ -d "$PROFILES/$cmd" ]; then use "$cmd"
                     else echo "unknown: $cmd"; echo; list
-                         echo; echo "usage: codex-switch [pick|add|list|status|doctor|<profile>]"; exit 1; fi ;;
+                         echo; echo "usage: csw [pick|add|list|status|doctor|init|<profile>]"; exit 1; fi ;;
 esac

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-switch-helper",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Codex-Switch-Helper: one-command switch between official ChatGPT login and third-party API-key providers for OpenAI Codex (zero deps, pure bash)",
   "bin": {
     "csw": "./csw"