ai-switch-cli 0.3.0__tar.gz → 0.3.2__tar.gz

{ai_switch_cli-0.3.0 → ai_switch_cli-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-switch-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: One-command provider and model switching for Claude Code and Codex, with session-history checks
 Author: ZidongS
 License: MIT
@@ -78,13 +78,26 @@ Select `glm` or `deepseek`, enter the API key, and activate the generated config
 ai-switch use glm
 ```
 
-`use` lists the models the profile offers and remembers your choice:
+`use` activates the profile and does **not** ask anything: the profile's whole model list is published, so you
+pick the model inside the agent with `/model` (Codex) or its Opus/Sonnet/Haiku categories (Claude Code). The
+default for new sessions is the one you last used, or the profile default. Add `--choose` if you want to be
+asked, or `-m/--model` to set the default directly.
 
 ```text
-This profile provides 2 models:
+Active profile: glm
+Default model: glm-5.3 (new sessions)
+Published models: 3 - switch any time with /model inside codex (Claude Code uses its
+Opus/Sonnet/Haiku mappings), or change the default with -m/--model.
+```
+
+With `--choose` you get the picker instead:
+
+```text
+This profile provides 3 models:
   1) glm-5.3         GLM-5.3 flagship (1M context)  [default]
-  2) glm-5.3-flash   GLM-5.3 flash (fast, 1M context)
-Select model [1-2, Enter=glm-5.3, q=cancel]:
+  2) glm-5.3-flash   GLM-5.3 Flash (fast, text+image, 1M context)
+  3) glm-5-turbo     GLM-5 Turbo (agent-optimized, 200K context)
+Select model [1-3, Enter=glm-5.3, q=cancel]:
 ```
 
 For scripts and servers, choose without prompting (name, unique prefix, or index):
@@ -93,8 +106,11 @@ For scripts and servers, choose without prompting (name, unique prefix, or index
 ai-switch use glm --model glm-5.3-flash
 ai-switch use glm -m 2 -y
 ai-switch use glm --dry-run          # show what would change
+ai-switch use glm -m glm-5.3 --pin   # publish only this model (see below)
 ```
 
+Selecting a model sets the **default for new sessions** in both agents, and the profile's other models stay in the catalogue so you can still switch inside the agent. That means an in-app `/model` choice is a per-session override — and Codex writes its own choice back to `~/.codex/config.toml` when it exits, so the two agents can drift apart without anything else noticing; `ai-switch doctor` reports exactly that. If you want an activation to be exclusive instead, add `--pin`: the published catalogue then holds only the selected model, so Codex's own picker has nothing else to switch to (the next `ai-switch use` without `--pin` restores the full menu).
+
 Edit `~/.codex/config.toml` and `~/.claude/settings.json` for another provider, then save that configuration as a second profile:
 
 ```bash

{ai_switch_cli-0.3.0 → ai_switch_cli-0.3.2}/README.md

@@ -64,13 +64,26 @@ Select `glm` or `deepseek`, enter the API key, and activate the generated config
 ai-switch use glm
 ```
 
-`use` lists the models the profile offers and remembers your choice:
+`use` activates the profile and does **not** ask anything: the profile's whole model list is published, so you
+pick the model inside the agent with `/model` (Codex) or its Opus/Sonnet/Haiku categories (Claude Code). The
+default for new sessions is the one you last used, or the profile default. Add `--choose` if you want to be
+asked, or `-m/--model` to set the default directly.
 
 ```text
-This profile provides 2 models:
+Active profile: glm
+Default model: glm-5.3 (new sessions)
+Published models: 3 - switch any time with /model inside codex (Claude Code uses its
+Opus/Sonnet/Haiku mappings), or change the default with -m/--model.
+```
+
+With `--choose` you get the picker instead:
+
+```text
+This profile provides 3 models:
   1) glm-5.3         GLM-5.3 flagship (1M context)  [default]
-  2) glm-5.3-flash   GLM-5.3 flash (fast, 1M context)
-Select model [1-2, Enter=glm-5.3, q=cancel]:
+  2) glm-5.3-flash   GLM-5.3 Flash (fast, text+image, 1M context)
+  3) glm-5-turbo     GLM-5 Turbo (agent-optimized, 200K context)
+Select model [1-3, Enter=glm-5.3, q=cancel]:
 ```
 
 For scripts and servers, choose without prompting (name, unique prefix, or index):
@@ -79,8 +92,11 @@ For scripts and servers, choose without prompting (name, unique prefix, or index
 ai-switch use glm --model glm-5.3-flash
 ai-switch use glm -m 2 -y
 ai-switch use glm --dry-run          # show what would change
+ai-switch use glm -m glm-5.3 --pin   # publish only this model (see below)
 ```
 
+Selecting a model sets the **default for new sessions** in both agents, and the profile's other models stay in the catalogue so you can still switch inside the agent. That means an in-app `/model` choice is a per-session override — and Codex writes its own choice back to `~/.codex/config.toml` when it exits, so the two agents can drift apart without anything else noticing; `ai-switch doctor` reports exactly that. If you want an activation to be exclusive instead, add `--pin`: the published catalogue then holds only the selected model, so Codex's own picker has nothing else to switch to (the next `ai-switch use` without `--pin` restores the full menu).
+
 Edit `~/.codex/config.toml` and `~/.claude/settings.json` for another provider, then save that configuration as a second profile:
 
 ```bash

{ai_switch_cli-0.3.0 → ai_switch_cli-0.3.2}/ai_switch.py

@@ -23,7 +23,7 @@ Conversation history is never part of a profile
 import argparse, hashlib, json, os, re, shutil, sqlite3, sys, tempfile, time
 from pathlib import Path
 
-VERSION = "0.3.0"
+VERSION = "0.3.2"
 
 
 def _env_path(name, default):
@@ -476,7 +476,7 @@ def resolve_model(catalog, token):
     raise ValueError(f"unknown model '{token}'; this profile offers: {available}")
 
 
-def pick_model(catalog, requested, fallback, assume_yes=False):
+def pick_model(catalog, requested, fallback, assume_yes=False, force=False):
     """Choose the model to activate (no prompting when requested/non-interactive)."""
     if not catalog:
         return requested
@@ -486,7 +486,7 @@ def pick_model(catalog, requested, fallback, assume_yes=False):
         return resolve_model(catalog, requested)
     if fallback not in slugs:
         fallback = catalog["default"] if catalog["default"] in slugs else slugs[0]
-    if assume_yes or not sys.stdin.isatty() or len(entries) == 1:
+    if assume_yes or (not force and (not sys.stdin.isatty() or len(entries) == 1)):
         return fallback
     print(f"This profile provides {len(entries)} models:")
     for index, entry in enumerate(entries, 1):
@@ -517,16 +517,17 @@ def catalog_target(text, catalog_path):
     return catalog_path
 
 
-def build_codex_catalog(d, catalog):
+def build_codex_catalog(d, catalog, include_profile_entries=True):
     """Union of the profile's catalog file and every selectable model entry."""
     entries = {}
-    try:
-        raw = json.loads((d / "codex-models.json").read_text())
-        for entry in (raw.get("models") if isinstance(raw, dict) else raw) or []:
-            if isinstance(entry, dict) and entry.get("slug"):
-                entries[entry["slug"]] = entry
-    except (OSError, ValueError, AttributeError):
-        pass
+    if include_profile_entries:
+        try:
+            raw = json.loads((d / "codex-models.json").read_text())
+            for entry in (raw.get("models") if isinstance(raw, dict) else raw) or []:
+                if isinstance(entry, dict) and entry.get("slug"):
+                    entries[entry["slug"]] = entry
+        except (OSError, ValueError, AttributeError):
+            pass
     for entry in catalog["models"]:
         if isinstance(entry.get("codex"), dict):
             entries[entry["slug"]] = entry["codex"]
@@ -537,7 +538,7 @@ def build_codex_catalog(d, catalog):
     return {"models": ordered}
 
 
-def compute_changes(d, slug):
+def compute_changes(d, slug, pin=False):
     """Return {path: text-or-None}: None means "remove this stale file"."""
     changes, notes = {}, []
     catalog = load_catalog(d)
@@ -556,9 +557,14 @@ def compute_changes(d, slug):
             catalog = dict(catalog, models=catalog["models"] + [entry])
     if text is not None:
         # Every profile publishes its models, so the picker inside Codex lists
-        # them too.
+        # them too.  --pin publishes only the activated one, which removes the
+        # other entries from Codex's own picker.
         if catalog:
-            codex_catalog = build_codex_catalog(d, catalog)
+            if pin and entry:
+                codex_catalog = build_codex_catalog(d, dict(catalog, models=[entry]),
+                                                    include_profile_entries=False)
+            else:
+                codex_catalog = build_codex_catalog(d, catalog)
         if codex_catalog is not None:
             catalog_path = catalog_target(text, CODEX_MODELS)
             changes[catalog_path] = json.dumps(codex_catalog, indent=2) + "\n"
@@ -694,23 +700,34 @@ def cmd_use(args):
     if not any((d / profile_file).exists() for profile_file in PROFILE_FILES):
         raise ValueError(f"profile '{name}' has no Codex or Claude configuration to activate")
     catalog = load_catalog(d)
-    fallback = args.model or last_model(name) or (catalog or {}).get("default")
-    if catalog and args.model and catalog.get("open_ended"):
+    fallback = last_model(name) or (catalog or {}).get("default")
+    slug = args.model or fallback
+    if args.model and catalog and catalog.get("open_ended"):
         try:
             slug = resolve_model(catalog, args.model)
         except ValueError:
             slug = args.model
             print(f"Note: '{args.model}' is not in the profile's model list; using it as-is.", file=sys.stderr)
-    else:
-        slug = pick_model(catalog, args.model, fallback, assume_yes=args.yes)
+    elif args.model and catalog:
+        slug = resolve_model(catalog, args.model)
+    elif catalog and args.choose:
+        # Picking a model here only sets the default for new sessions; every model
+        # of the profile is published, so it can also be changed inside the agent.
+        slug = pick_model(catalog, None, fallback, force=True)
     if slug and catalog is None:
         print(f"Note: profile '{name}' has no model list, using '{slug}' as-is.", file=sys.stderr)
-    changes, notes = compute_changes(d, slug)
+    changes, notes = compute_changes(d, slug, pin=args.pin)
     for note in notes:
         print(f"Note: {note}", file=sys.stderr)
     backup = apply_changes(changes, name, slug, dry_run=args.dry_run)
     if not args.dry_run:
-        print(f"Active profile: {name}" + (f"\nActive model: {slug}" if slug else ""))
+        print(f"Active profile: {name}" + (f"\nDefault model: {slug} (new sessions)" if slug else ""))
+        if args.pin and slug:
+            print(f"Pinned: only '{slug}' is published, so Codex cannot switch to another model.")
+        elif catalog:
+            print(f"Published models: {len(catalog['models'])} - switch any time with /model inside "
+                  "codex (Claude Code uses its Opus/Sonnet/Haiku mappings), or change the default "
+                  "with -m/--model.")
         print(f"Backup: {backup}" if backup else "Backup: nothing to back up (no files existed yet)")
         print("Restart claude/codex so they reload their configuration.")
         if not args.no_check:
@@ -1273,9 +1290,24 @@ def check_report():
         f"{len(transcripts)} transcript(s) under {display_path(projects)}")
 
     state = load_state()
-    add("ok", "Active profile", f"{active_profile() or '(none)'}"
-        + (f", model {state.get('models', {}).get(active_profile())}" if isinstance(state.get("models"), dict)
-           and state.get("models", {}).get(active_profile()) else ""))
+    active = active_profile()
+    recorded = (state.get("models") or {}).get(active) if isinstance(state.get("models"), dict) else None
+    add("ok", "Active profile", f"{active or '(none)'}" + (f", model {recorded}" if recorded else ""))
+    if recorded:
+        # A running agent rewrites its own config on exit, so the live files can
+        # silently diverge from what 'ai-switch use' activated.
+        if model and model != recorded:
+            add("warn", "Codex is not using the model ai-switch activated",
+                f"config.toml has model = {model}, ai-switch activated {recorded}",
+                "A running codex session rewrites config.toml when it exits, so a /model choice made "
+                f"inside codex wins. Close codex and re-run 'ai-switch use {active} -m {recorded}', or use "
+                "--pin so the in-app picker cannot switch away.")
+        claude_model = str(settings.get("model") or "")
+        stem = lambda text: re.split(r"[\[/]", text)[0]
+        if claude_model and stem(claude_model) != stem(str(recorded)):
+            add("warn", "Claude Code is not using the model ai-switch activated",
+                f"settings.json has model = {claude_model}, ai-switch activated {recorded}",
+                f"Re-run 'ai-switch use {active} -m {recorded}' to bring both agents back in sync.")
     profiles = [p.name for p in sorted(PROFILES.iterdir()) if p.is_dir()] if PROFILES.exists() else []
     add("ok" if profiles else "note", "Profiles", ", ".join(profiles) or "none yet")
 
@@ -1365,8 +1397,12 @@ files inside a profile are switched. Restart claude/codex after switching."""
 
     p = sub.add_parser("use", help="activate a profile (optionally choosing a model)")
     p.add_argument("name")
-    p.add_argument("-m", "--model", help="model to activate (name, unique prefix, or 1-based index)")
-    p.add_argument("-y", "--yes", action="store_true", help="never prompt; use the default model")
+    p.add_argument("-m", "--model", help="set the default model for new sessions (name, unique prefix, or index)")
+    p.add_argument("--choose", action="store_true",
+                   help="ask which model the new sessions should start with (the others stay selectable in /model)")
+    p.add_argument("--pin", action="store_true",
+                   help="publish only this model, so Codex's own picker cannot switch to another one")
+    p.add_argument("-y", "--yes", action="store_true", help="accepted for compatibility; use never prompts by default")
     p.add_argument("-n", "--dry-run", action="store_true", help="show what would change")
     p.add_argument("--no-check", action="store_true", help="skip the session-history health check")
     p.set_defaults(fn=cmd_use)

{ai_switch_cli-0.3.0 → ai_switch_cli-0.3.2}/ai_switch_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ai-switch-cli
-Version: 0.3.0
+Version: 0.3.2
 Summary: One-command provider and model switching for Claude Code and Codex, with session-history checks
 Author: ZidongS
 License: MIT
@@ -78,13 +78,26 @@ Select `glm` or `deepseek`, enter the API key, and activate the generated config
 ai-switch use glm
 ```
 
-`use` lists the models the profile offers and remembers your choice:
+`use` activates the profile and does **not** ask anything: the profile's whole model list is published, so you
+pick the model inside the agent with `/model` (Codex) or its Opus/Sonnet/Haiku categories (Claude Code). The
+default for new sessions is the one you last used, or the profile default. Add `--choose` if you want to be
+asked, or `-m/--model` to set the default directly.
 
 ```text
-This profile provides 2 models:
+Active profile: glm
+Default model: glm-5.3 (new sessions)
+Published models: 3 - switch any time with /model inside codex (Claude Code uses its
+Opus/Sonnet/Haiku mappings), or change the default with -m/--model.
+```
+
+With `--choose` you get the picker instead:
+
+```text
+This profile provides 3 models:
   1) glm-5.3         GLM-5.3 flagship (1M context)  [default]
-  2) glm-5.3-flash   GLM-5.3 flash (fast, 1M context)
-Select model [1-2, Enter=glm-5.3, q=cancel]:
+  2) glm-5.3-flash   GLM-5.3 Flash (fast, text+image, 1M context)
+  3) glm-5-turbo     GLM-5 Turbo (agent-optimized, 200K context)
+Select model [1-3, Enter=glm-5.3, q=cancel]:
 ```
 
 For scripts and servers, choose without prompting (name, unique prefix, or index):
@@ -93,8 +106,11 @@ For scripts and servers, choose without prompting (name, unique prefix, or index
 ai-switch use glm --model glm-5.3-flash
 ai-switch use glm -m 2 -y
 ai-switch use glm --dry-run          # show what would change
+ai-switch use glm -m glm-5.3 --pin   # publish only this model (see below)
 ```
 
+Selecting a model sets the **default for new sessions** in both agents, and the profile's other models stay in the catalogue so you can still switch inside the agent. That means an in-app `/model` choice is a per-session override — and Codex writes its own choice back to `~/.codex/config.toml` when it exits, so the two agents can drift apart without anything else noticing; `ai-switch doctor` reports exactly that. If you want an activation to be exclusive instead, add `--pin`: the published catalogue then holds only the selected model, so Codex's own picker has nothing else to switch to (the next `ai-switch use` without `--pin` restores the full menu).
+
 Edit `~/.codex/config.toml` and `~/.claude/settings.json` for another provider, then save that configuration as a second profile:
 
 ```bash

{ai_switch_cli-0.3.0 → ai_switch_cli-0.3.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ai-switch-cli"
-version = "0.3.0"
+version = "0.3.2"
 description = "One-command provider and model switching for Claude Code and Codex, with session-history checks"
 readme = "README.md"
 requires-python = ">=3.9"