codex-sw 0.3.0 → 0.3.1

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.3.1 - 2026-04-12
+
+- Added strict App profile guard: `app open/use` now requires existing and logged-in profile.
+- Added `import-default` to migrate data from `~/.codex` into a profile.
+- Added `--sync|--no-sync` for `login`, `use`, and `switch` with overwrite sync (excluding `auth.json`).
+- Updated `--help` and README docs for sync and migration workflows.
+
 ## 0.3.0 - 2026-04-12
 
 - Added `codex-sw` namespaced entrypoint (kept `codex-switcher` compatibility).
@@ -14,3 +21,6 @@
 - Added expanded smoke tests.
 - Added npm release helper: `npm run release:npm`.
 - Added `publishConfig` (public + npmjs registry) and publish guide docs.
+- Added `import-default` command to migrate existing `~/.codex` data into a profile.
+- Changed `app open/use` to require existing and logged-in profile (no silent auto-create).
+- Added `login --sync` and `use/switch --sync` overwrite sync (all files except `auth.json`).

package/README.md

@@ -25,13 +25,20 @@ codex-sw check
 codex-sw add work
 codex-sw add personal
 
-codex-sw use work
-codex-sw login
+codex-sw use work --sync
+codex-sw login --sync
 codex-sw exec -- login status
 
+codex-sw switch personal --sync
 codex-sw app use personal
 ```
 
+## Sync options
+
+- `login --sync`: sync `~/.codex` into the target profile (excluding `auth.json`).
+- `use/switch --sync`: sync current CLI profile into target profile (excluding `auth.json`).
+- `--no-sync`: keep strict isolation without data copy (default).
+
 ## Command reference
 
 See plugin guide:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-sw",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Profile-based account switcher for Codex CLI and Codex App using isolated CODEX_HOME directories.",
   "license": "MIT",
   "author": "wangxt",

package/plugins/codex-switcher/.codex-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "codex-switcher",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Profile-based account switcher for Codex CLI and Codex App without modifying upstream source.",
   "author": {
     "name": "wangxt",

package/plugins/codex-switcher/README.md

@@ -15,13 +15,14 @@ Profile-based account switcher for Codex CLI and Codex App without modifying ups
 codex-sw add <profile>
 codex-sw remove <profile> [--force]
 codex-sw list
-codex-sw use <profile>
-codex-sw switch <profile>
+codex-sw import-default <profile> [--with-auth] [--force]
+codex-sw use <profile> [--sync|--no-sync]
+codex-sw switch <profile> [--sync|--no-sync]
 codex-sw current [cli|app]
 codex-sw status
 
 codex-sw exec -- <codex args...>
-codex-sw login [profile]
+codex-sw login [profile] [--sync|--no-sync]
 codex-sw logout [profile]
 codex-sw env [profile]
 
@@ -43,17 +44,49 @@ codex-sw doctor [--fix]
 codex-sw add work
 codex-sw add personal
 
-codex-sw use work
-codex-sw login
+codex-sw use work --sync
+codex-sw login --sync
 codex-sw exec -- login status
 
+codex-sw switch personal --sync
 codex-sw app use personal
 ```
 
+## Migrate Existing App/CLI Data
+
+If your existing data is in `~/.codex`, import it into a profile first:
+
+```bash
+codex-sw import-default work
+```
+
+This copies records/projects/history but excludes `auth.json` by default.
+If you want to carry login state too:
+
+```bash
+codex-sw import-default work --with-auth
+```
+
+## Sync Behavior
+
+- `login --sync`: overwrite sync from default `~/.codex` to target profile, excluding `auth.json`.
+- `use/switch --sync`: overwrite sync from current CLI profile to target profile, excluding `auth.json`.
+- `--no-sync`: explicit no-sync mode (default behavior).
+
+Examples:
+
+```bash
+codex-sw login work --sync
+codex-sw switch personal --sync
+codex-sw use work --no-sync
+```
+
 ## Notes
 
 - Codex App is single-instance on macOS; switching App profile requires restart.
 - `codex-sw app stop` only stops app instances started and tracked by `codex-sw`.
+- `codex-sw app open/use <profile>` requires that profile already exists and is logged in.
+- `--sync` uses overwrite strategy (not merge): source overwrites target for all files except `auth.json`.
 - `codex-sw status` exit codes:
   - `0`: both current profiles logged in
   - `1`: at least one current profile not logged in

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

@@ -17,13 +17,14 @@ Usage:
   codex-sw add <profile>
   codex-sw remove <profile> [--force]
   codex-sw list
-  codex-sw use <profile>
-  codex-sw switch <profile>
+  codex-sw import-default <profile> [--with-auth] [--force]
+  codex-sw use <profile> [--sync|--no-sync]
+  codex-sw switch <profile> [--sync|--no-sync]
   codex-sw current [cli|app]
   codex-sw status
 
   codex-sw exec -- <codex args...>
-  codex-sw login [profile]
+  codex-sw login [profile] [--sync|--no-sync]
   codex-sw logout [profile]
   codex-sw env [profile]
 
@@ -42,6 +43,12 @@ Usage:
 Compatibility:
   codex-switcher <same-commands>
 
+Sync behavior:
+  --sync     enable overwrite sync (excluding auth.json)
+             - login --sync: ~/.codex -> target profile
+             - use/switch --sync: current CLI profile -> target profile
+  --no-sync  disable sync explicitly (default)
+
 Environment overrides:
   CODEX_SWITCHER_STATE_DIR
   CODEX_SWITCHER_PROFILES_DIR
@@ -49,6 +56,7 @@ Environment overrides:
   CODEX_SWITCHER_APP_LOG
   CODEX_SWITCHER_SWITCH_LOG
   CODEX_SWITCHER_LOCK_WAIT_SECONDS
+  CODEX_SWITCHER_DEFAULT_HOME
 USAGE
 }
 
@@ -400,19 +408,116 @@ cmd_list() {
   done
 }
 
+cmd_import_default() {
+  local profile="$1"
+  local with_auth="$2"
+  local force="$3"
+  local src dst
+
+  src="${CODEX_SWITCHER_DEFAULT_HOME:-$HOME/.codex}"
+  validate_profile_name "$profile"
+  [[ -d "$src" ]] || err "default codex home not found: $src"
+  ensure_profile "$profile"
+  dst="$(profile_path "$profile")"
+
+  if [[ "$force" == "true" ]]; then
+    find "$dst" -mindepth 1 -maxdepth 1 -exec rm -rf -- {} + 2>/dev/null || true
+  else
+    if find "$dst" -mindepth 1 -maxdepth 1 | grep -q .; then
+      err "profile '$profile' is not empty. use --force to overwrite"
+    fi
+  fi
+
+  if command -v rsync >/dev/null 2>&1; then
+    if [[ "$with_auth" == "true" ]]; then
+      rsync -a "$src/" "$dst/"
+    else
+      rsync -a --exclude 'auth.json' "$src/" "$dst/"
+    fi
+  else
+    if [[ "$with_auth" == "true" ]]; then
+      (cd "$src" && tar cf - .) | (cd "$dst" && tar xpf -)
+    else
+      (cd "$src" && tar cf - --exclude ./auth.json .) | (cd "$dst" && tar xpf -)
+    fi
+  fi
+
+  chmod 700 "$dst" 2>/dev/null || true
+  log_event INFO "import_default profile=$profile src=$src with_auth=$with_auth force=$force"
+  echo "Imported default data to profile: $profile"
+  if [[ "$with_auth" != "true" ]]; then
+    echo "Auth not imported. Run: $SCRIPT_NAME login $profile"
+  fi
+}
+
+sync_overwrite_excluding_auth() {
+  local src="$1"
+  local dst="$2"
+
+  [[ -d "$src" ]] || err "sync source not found: $src"
+  mkdir -p "$dst"
+
+  if command -v rsync >/dev/null 2>&1; then
+    rsync -a --checksum --delete --exclude 'auth.json' "$src/" "$dst/"
+  else
+    find "$dst" -mindepth 1 -maxdepth 1 ! -name 'auth.json' -exec rm -rf -- {} + 2>/dev/null || true
+    (cd "$src" && tar cf - --exclude ./auth.json .) | (cd "$dst" && tar xpf -)
+  fi
+  chmod 700 "$dst" 2>/dev/null || true
+}
+
+sync_default_to_profile() {
+  local profile="$1"
+  local src dst
+  src="${CODEX_SWITCHER_DEFAULT_HOME:-$HOME/.codex}"
+  dst="$(profile_path "$profile")"
+  [[ -d "$src" ]] || err "default codex home not found: $src"
+  ensure_profile "$profile"
+  sync_overwrite_excluding_auth "$src" "$dst"
+  log_event INFO "sync_default profile=$profile src=$src"
+  echo "Synced default data to profile: $profile (auth.json excluded)"
+}
+
+sync_profile_to_profile() {
+  local from_profile="$1"
+  local to_profile="$2"
+  local src dst
+
+  if [[ "$from_profile" == "$to_profile" ]]; then
+    return 0
+  fi
+
+  src="$(profile_path "$from_profile")"
+  dst="$(profile_path "$to_profile")"
+  require_profile_exists "$from_profile"
+  ensure_profile "$to_profile"
+  sync_overwrite_excluding_auth "$src" "$dst"
+  log_event INFO "sync_profile from=$from_profile to=$to_profile"
+  echo "Synced profile data: $from_profile -> $to_profile (auth.json excluded)"
+}
+
 cmd_use() {
   local profile="$1"
+  local sync_mode="${2:-false}"
+  local from_profile
   validate_profile_name "$profile"
+
+  if [[ "$sync_mode" == "true" ]]; then
+    from_profile="$(read_current cli || true)"
+    validate_profile_name "$from_profile"
+    sync_profile_to_profile "$from_profile" "$profile"
+  fi
+
   ensure_profile "$profile"
   set_current cli "$profile"
-  log_event INFO "cli_use profile=$profile"
+  log_event INFO "cli_use profile=$profile sync=$sync_mode"
   echo "Switched CLI profile to: $profile"
   echo "Run in current shell if needed:"
   echo "  export CODEX_HOME='$(profile_path "$profile")'"
 }
 
 cmd_switch() {
-  cmd_use "$1"
+  cmd_use "$1" "${2:-false}"
 }
 
 cmd_current() {
@@ -482,9 +587,13 @@ cmd_exec() {
 
 cmd_login() {
   local profile="${1:-$(read_current cli || true)}"
+  local sync_mode="${2:-false}"
   validate_profile_name "$profile"
   ensure_profile "$profile"
-  log_event INFO "cli_login profile=$profile"
+  if [[ "$sync_mode" == "true" ]]; then
+    sync_default_to_profile "$profile"
+  fi
+  log_event INFO "cli_login profile=$profile sync=$sync_mode"
   run_codex_for_profile "$profile" login
 }
 
@@ -506,10 +615,14 @@ cmd_env() {
 cmd_app_open() {
   local profile="$1"
   shift
-  local app_bin pid
+  local app_bin pid login_state
 
   validate_profile_name "$profile"
-  ensure_profile "$profile"
+  require_profile_exists "$profile"
+  login_state="$(login_state_for_profile "$profile")"
+  if [[ "$login_state" != "logged-in" ]]; then
+    err "profile '$profile' is not logged in. run: $SCRIPT_NAME login $profile"
+  fi
   app_bin="$(resolve_app_bin)"
 
   app_stop_managed >/dev/null
@@ -819,13 +932,53 @@ main() {
       [[ "$#" -eq 0 ]] || err "usage: $SCRIPT_NAME list"
       cmd_list
       ;;
+    import-default)
+      [[ "$#" -ge 1 ]] || err "usage: $SCRIPT_NAME import-default <profile> [--with-auth] [--force]"
+      local profile="$1"
+      local with_auth="false"
+      local force="false"
+      shift
+      while [[ "$#" -gt 0 ]]; do
+        case "$1" in
+          --with-auth)
+            with_auth="true"
+            ;;
+          --force)
+            force="true"
+            ;;
+          *)
+            err "unknown option: $1"
+            ;;
+        esac
+        shift
+      done
+      with_lock cmd_import_default "$profile" "$with_auth" "$force"
+      ;;
     use)
-      [[ "$#" -eq 1 ]] || err "usage: $SCRIPT_NAME use <profile>"
-      with_lock cmd_use "$1"
+      [[ "$#" -ge 1 && "$#" -le 2 ]] || err "usage: $SCRIPT_NAME use <profile> [--sync|--no-sync]"
+      local profile="$1"
+      local sync="false"
+      if [[ "${2:-}" == "--sync" ]]; then
+        sync="true"
+      elif [[ "${2:-}" == "--no-sync" || -z "${2:-}" ]]; then
+        :
+      else
+        err "unknown option: ${2:-}"
+      fi
+      with_lock cmd_use "$profile" "$sync"
       ;;
     switch)
-      [[ "$#" -eq 1 ]] || err "usage: $SCRIPT_NAME switch <profile>"
-      with_lock cmd_switch "$1"
+      [[ "$#" -ge 1 && "$#" -le 2 ]] || err "usage: $SCRIPT_NAME switch <profile> [--sync|--no-sync]"
+      local profile="$1"
+      local sync="false"
+      if [[ "${2:-}" == "--sync" ]]; then
+        sync="true"
+      elif [[ "${2:-}" == "--no-sync" || -z "${2:-}" ]]; then
+        :
+      else
+        err "unknown option: ${2:-}"
+      fi
+      with_lock cmd_switch "$profile" "$sync"
       ;;
     current)
       [[ "$#" -le 1 ]] || err "usage: $SCRIPT_NAME current [cli|app]"
@@ -839,8 +992,28 @@ main() {
       cmd_exec "$@"
       ;;
     login)
-      [[ "$#" -le 1 ]] || err "usage: $SCRIPT_NAME login [profile]"
-      with_lock cmd_login "${1:-}"
+      [[ "$#" -le 2 ]] || err "usage: $SCRIPT_NAME login [profile] [--sync|--no-sync]"
+      local profile=""
+      local sync="false"
+      local arg
+      for arg in "$@"; do
+        case "$arg" in
+          --sync)
+            sync="true"
+            ;;
+          --no-sync)
+            sync="false"
+            ;;
+          *)
+            if [[ -z "$profile" ]]; then
+              profile="$arg"
+            else
+              err "unknown option: $arg"
+            fi
+            ;;
+        esac
+      done
+      with_lock cmd_login "${profile:-}" "$sync"
       ;;
     logout)
       [[ "$#" -le 1 ]] || err "usage: $SCRIPT_NAME logout [profile]"

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

@@ -54,6 +54,12 @@ export CODEX_SWITCHER_STATE_DIR="$STATE"
 export CODEX_SWITCHER_PROFILES_DIR="$PROFILES"
 export CODEX_SWITCHER_APP_BIN="$BIN/fake-codex-app"
 export CODEX_SWITCHER_LOCK_WAIT_SECONDS=2
+export CODEX_SWITCHER_DEFAULT_HOME="$TMPBASE/default-home"
+
+mkdir -p "$CODEX_SWITCHER_DEFAULT_HOME/memories"
+echo '{"auth_mode":"chatgpt"}' > "$CODEX_SWITCHER_DEFAULT_HOME/auth.json"
+echo '{"projects":["demo"]}' > "$CODEX_SWITCHER_DEFAULT_HOME/state_5.sqlite"
+echo '{"memo":"persist"}' > "$CODEX_SWITCHER_DEFAULT_HOME/memories/demo.json"
 
 check_out="$("$SW" check)"
 echo "$check_out" | grep -q "check: ok"
@@ -66,8 +72,54 @@ echo "$init_out" | grep -q "\[dry-run\]"
 [[ "$("$SW" current cli)" == "personal" ]]
 
 "$SW" login personal
-"$SW" app use work
+"$SW" login sync-login --sync
+[[ -f "$PROFILES/sync-login/state_5.sqlite" ]]
+[[ -f "$PROFILES/sync-login/memories/demo.json" ]]
+[[ -f "$PROFILES/sync-login/auth.json" ]]
+
+echo '{"auth_mode":"api_key","owner":"personal"}' > "$PROFILES/personal/auth.json"
+echo '{"auth_mode":"api_key","owner":"work"}' > "$PROFILES/work/auth.json"
+echo "from-personal-newer" > "$PROFILES/personal/history.jsonl"
+echo "from-work-older-baseline" > "$PROFILES/work/history.jsonl"
+"$SW" switch work --sync
+[[ "$("$SW" current cli)" == "work" ]]
+grep -q "from-personal-newer" "$PROFILES/work/history.jsonl"
+grep -q '"owner":"work"' "$PROFILES/work/auth.json"
+grep -q '"owner":"personal"' "$PROFILES/personal/auth.json"
+
+"$SW" import-default imported
+[[ -f "$PROFILES/imported/state_5.sqlite" ]]
+[[ -f "$PROFILES/imported/memories/demo.json" ]]
+[[ ! -f "$PROFILES/imported/auth.json" ]]
+set +e
+CODEX_HOME="$PROFILES/imported" codex login status >/tmp/codex_sw_imported_login 2>&1
+imported_login_rc=$?
+set -e
+[[ "$imported_login_rc" -ne 0 ]]
+
+"$SW" import-default imported-auth --with-auth
+[[ -f "$PROFILES/imported-auth/auth.json" ]]
+CODEX_HOME="$PROFILES/imported-auth" codex login status >/tmp/codex_sw_imported_auth_login 2>&1
+[[ "$?" -eq 0 ]]
+
+"$SW" logout work
+
+set +e
+"$SW" app open ghost >/tmp/codex_sw_app_open_missing 2>&1
+app_open_missing_rc=$?
+set -e
+[[ "$app_open_missing_rc" -ne 0 ]]
+grep -q "profile 'ghost' not found" /tmp/codex_sw_app_open_missing
+
+set +e
+"$SW" app use work >/tmp/codex_sw_app_use_unauthed 2>&1
+app_use_unauthed_rc=$?
+set -e
+[[ "$app_use_unauthed_rc" -ne 0 ]]
+grep -q "profile 'work' is not logged in" /tmp/codex_sw_app_use_unauthed
+
 "$SW" login work
+"$SW" app use work
 [[ "$("$SW" app current)" == "work" ]]
 
 set +e
@@ -75,16 +127,16 @@ set +e
 status_rc=$?
 set -e
 [[ "$status_rc" -eq 0 ]]
-grep -q "cli(personal): logged-in" /tmp/codex_sw_status_1
+grep -q "cli(work): logged-in" /tmp/codex_sw_status_1
 grep -q "app(work): logged-in" /tmp/codex_sw_status_1
 
-"$SW" logout personal
+"$SW" logout work
 set +e
 "$SW" status >/tmp/codex_sw_status_2
 status_rc=$?
 set -e
 [[ "$status_rc" -eq 1 ]]
-grep -q "cli(personal): not-logged-in" /tmp/codex_sw_status_2
+grep -q "cli(work): not-logged-in" /tmp/codex_sw_status_2
 
 "$SW" app status >/tmp/codex_sw_app_status_1
 [[ "$?" -eq 0 ]]