substrate-setup 0.4.0__tar.gz → 0.5.0__tar.gz

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/CHANGELOG.md

@@ -1,5 +1,29 @@
 # Changelog
 
+## 0.5.0 — 2026-05-30
+
+- **Coexist with account switchers (cc-switch, cockpit).** `configure` now
+  detects a running account-switcher (`~/.cc-switch/`, `~/.antigravity_cockpit/`)
+  and, for the `claude-code` and `codex` agents, leaves the shared config file
+  (`~/.claude/settings.json`, `~/.codex/config.toml`) untouched rather than
+  fighting the switcher over the same keys. It prints guidance instead:
+  add Substrate as a provider *inside* the switcher (recommended), or use a
+  one-off shell override.
+  - New `--force` flag takes over the file anyway (still backs it up first).
+  - The "refused to overwrite" message for foreign `ANTHROPIC_*` keys now names
+    the likely cause and points at the shell-override and `--force` paths,
+    instead of only "delete the keys".
+  - Agents already managed by substrate-setup (marker present) keep updating
+    normally — the guard only applies to first-time takeovers.
+
+## 0.4.1 — 2026-05-30
+
+- Fix `substrate-setup --version` reporting a stale number. `__version__` is
+  now derived from the installed package metadata
+  (`importlib.metadata.version`) instead of a hand-maintained string, so it
+  can never drift from `pyproject.toml` again. (0.4.0 shipped with a leftover
+  `__version__ = "0.3.1"`; the compatibility fix itself was unaffected.)
+
 ## 0.4.0 — 2026-05-30
 
 - Lower the supported Python floor from **3.12 to 3.8**. Nothing in the tool

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: substrate-setup
-Version: 0.4.0
+Version: 0.5.0
 Summary: One-shot local configurator for coding agents against a Substrate gateway
 Project-URL: Homepage, https://github.com/FrankXiaA/substrate-solutions
 Project-URL: Source, https://github.com/FrankXiaA/substrate-solutions/tree/main/substrate-api/substrate_setup
@@ -96,6 +96,31 @@ Subset with `--agents-only hermes,aider`. Preview without writing: `--dry-run`.
 | `claude-code` | `~/.claude/settings.json` env block (`ANTHROPIC_BASE_URL`, `ANTHROPIC_AUTH_TOKEN`, `ANTHROPIC_MODEL`). The `/model` picker stays opus/sonnet/haiku — use `claude --model openai/<id>` for any other Substrate model. Requires Substrate's `/v1/messages` endpoint — shipped in gateway Phase 1. |
 | `codex` | `~/.codex/config.toml` `[model_providers.substrate]` block with `wire_api = "responses"`. API key is auto-persisted (see above). Requires Substrate's `/v1/responses` endpoint — shipped in gateway Phase 2. |
 
+### Coexisting with account switchers (cc-switch, cockpit) — 0.5.0+
+
+If you use an account-switcher like [cc-switch](https://github.com/farion1231/cc-switch)
+or [cockpit](https://github.com/jlcodes99/cockpit-tools), it already owns
+`~/.claude/settings.json` and/or `~/.codex/config.toml` — it rewrites the
+`ANTHROPIC_*` env block / `[model_providers.*]` on every switch. substrate-setup
+and the switcher can't both own the same keys, so `configure` **detects the
+switcher and leaves those files untouched**, printing guidance instead of
+fighting it. (`hermes`, `cursor`, `aider`, `continue` are unaffected — they use
+their own files.)
+
+**Recommended: add Substrate as a provider inside your switcher**, then switch to
+it when you want the gateway:
+
+- **Claude Code** — `ANTHROPIC_BASE_URL = https://substrate-solutions-api.fly.dev`
+  (no `/v1`), `ANTHROPIC_AUTH_TOKEN = <your sk-substrate-… key>`
+- **Codex** — `base_url = https://substrate-solutions-api.fly.dev/v1`,
+  `wire_api = "responses"`, key = your `sk-substrate-…`
+
+Alternatives:
+- **One-off Claude Code session:** `export ANTHROPIC_BASE_URL=… ANTHROPIC_AUTH_TOKEN=…`
+  before `claude` — shell env overrides the switcher's settings file, touches nothing.
+- **Let substrate-setup own the file anyway:** re-run with `--force` (it backs up
+  the file first). Note your switcher will then overwrite it on its next switch.
+
 ### Heads-up: tool calling on Gemini 3.1 Pro Preview
 
 If your CLI agent (Hermes, Aider, etc.) uses tool calling against

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/README.md

@@ -61,6 +61,31 @@ Subset with `--agents-only hermes,aider`. Preview without writing: `--dry-run`.
 | `claude-code` | `~/.claude/settings.json` env block (`ANTHROPIC_BASE_URL`, `ANTHROPIC_AUTH_TOKEN`, `ANTHROPIC_MODEL`). The `/model` picker stays opus/sonnet/haiku — use `claude --model openai/<id>` for any other Substrate model. Requires Substrate's `/v1/messages` endpoint — shipped in gateway Phase 1. |
 | `codex` | `~/.codex/config.toml` `[model_providers.substrate]` block with `wire_api = "responses"`. API key is auto-persisted (see above). Requires Substrate's `/v1/responses` endpoint — shipped in gateway Phase 2. |
 
+### Coexisting with account switchers (cc-switch, cockpit) — 0.5.0+
+
+If you use an account-switcher like [cc-switch](https://github.com/farion1231/cc-switch)
+or [cockpit](https://github.com/jlcodes99/cockpit-tools), it already owns
+`~/.claude/settings.json` and/or `~/.codex/config.toml` — it rewrites the
+`ANTHROPIC_*` env block / `[model_providers.*]` on every switch. substrate-setup
+and the switcher can't both own the same keys, so `configure` **detects the
+switcher and leaves those files untouched**, printing guidance instead of
+fighting it. (`hermes`, `cursor`, `aider`, `continue` are unaffected — they use
+their own files.)
+
+**Recommended: add Substrate as a provider inside your switcher**, then switch to
+it when you want the gateway:
+
+- **Claude Code** — `ANTHROPIC_BASE_URL = https://substrate-solutions-api.fly.dev`
+  (no `/v1`), `ANTHROPIC_AUTH_TOKEN = <your sk-substrate-… key>`
+- **Codex** — `base_url = https://substrate-solutions-api.fly.dev/v1`,
+  `wire_api = "responses"`, key = your `sk-substrate-…`
+
+Alternatives:
+- **One-off Claude Code session:** `export ANTHROPIC_BASE_URL=… ANTHROPIC_AUTH_TOKEN=…`
+  before `claude` — shell env overrides the switcher's settings file, touches nothing.
+- **Let substrate-setup own the file anyway:** re-run with `--force` (it backs up
+  the file first). Note your switcher will then overwrite it on its next switch.
+
 ### Heads-up: tool calling on Gemini 3.1 Pro Preview
 
 If your CLI agent (Hermes, Aider, etc.) uses tool calling against

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "substrate-setup"
-version = "0.4.0"
+version = "0.5.0"
 description = "One-shot local configurator for coding agents against a Substrate gateway"
 readme = "README.md"
 requires-python = ">=3.8"

substrate_setup-0.5.0/substrate_setup/__init__.py

@@ -0,0 +1,14 @@
+"""substrate-setup — one-shot configurator for coding agents.
+
+See https://github.com/FrankXiaA/substrate-solutions for the gateway it
+configures against.
+"""
+from importlib.metadata import PackageNotFoundError, version
+
+try:
+    # Single source of truth: read the version from the installed package
+    # metadata (driven by pyproject.toml) so it can never drift from the
+    # published release. ``importlib.metadata`` is stdlib since Python 3.8.
+    __version__ = version("substrate-setup")
+except PackageNotFoundError:  # pragma: no cover - running from a source tree
+    __version__ = "0.0.0+unknown"

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/substrate_setup/agents/base.py

@@ -47,6 +47,9 @@ class ConfigureContext:
     catalog: list[CatalogEntry]
     catalog_source: str            # "live" or "fallback"
     dry_run: bool
+    # Override the account-switcher coexistence guard (cc-switch / cockpit):
+    # write claude-code / codex config even when a switcher owns the file.
+    force: bool = False
 
 
 class Agent(ABC):

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/substrate_setup/agents/claude_code.py

@@ -50,6 +50,7 @@ from substrate_setup.env_persist import (
     format_persist_message_for_user,
     persist_substrate_api_key,
 )
+from substrate_setup.switchers import coexistence_message, detect_switchers
 
 MANAGED_ENV_KEYS_MARKER = "_substrate_setup_managed_env_keys"
 MANAGED_ENV_KEYS: list[str] = [
@@ -141,6 +142,23 @@ def _restrict_file_mode(path: Path) -> None:
         pass
 
 
+def _coexistence_guidance(ctx: ConfigureContext, switchers: list[str]) -> str:
+    base = _strip_v1_suffix(ctx.base_url)
+    return coexistence_message(
+        switchers,
+        pretty_name="Claude Code",
+        config_label="~/.claude/settings.json",
+        provider_lines=[
+            f"ANTHROPIC_BASE_URL   = {base}",
+            "ANTHROPIC_AUTH_TOKEN = <your sk-substrate-... key>",
+        ],
+        shell_lines=[
+            f"export ANTHROPIC_BASE_URL={base}",
+            "export ANTHROPIC_AUTH_TOKEN=<your sk-substrate-... key>",
+        ],
+    )
+
+
 class ClaudeCodeAgent(Agent):
     name = "claude-code"
     pretty_name = "Claude Code"
@@ -180,7 +198,15 @@ class ClaudeCodeAgent(Agent):
             env_block = {}
 
         if not _has_managed_marker(payload):
-            if _user_owns_anthropic_env(env_block):
+            switchers = detect_switchers()
+            if switchers and not ctx.force:
+                print(_coexistence_guidance(ctx, switchers))
+                return AgentResult(
+                    ResultStatus.PRINT_ONLY,
+                    f"left {settings_path} to {' / '.join(switchers)} "
+                    "(re-run with --force to manage it anyway)",
+                )
+            if not ctx.force and _user_owns_anthropic_env(env_block):
                 if _existing_matches_substrate_shape(env_block, ctx):
                     notes.append(
                         "Claude Code settings.json had substrate-shaped env "
@@ -189,10 +215,18 @@ class ClaudeCodeAgent(Agent):
                 else:
                     return AgentResult(
                         ResultStatus.ERROR,
-                        "Claude Code settings.json has user-owned ANTHROPIC_* "
-                        "env keys but no substrate-setup marker; refused to "
-                        "overwrite. To take over, delete those keys from "
-                        "settings.json and re-run substrate-setup.",
+                        "Claude Code settings.json has ANTHROPIC_* env keys "
+                        "that substrate-setup doesn't manage (no marker). "
+                        "Another tool (e.g. an account switcher like cc-switch) "
+                        "may own this file, so substrate-setup won't overwrite "
+                        "it.\n"
+                        "  - To use Substrate without disturbing it: export "
+                        "ANTHROPIC_BASE_URL and ANTHROPIC_AUTH_TOKEN in your "
+                        "shell before running `claude` (shell env wins over "
+                        "settings.json).\n"
+                        "  - To let substrate-setup take over: re-run with "
+                        "--force (it backs up settings.json first), or delete "
+                        "those keys and re-run.",
                         tuple(backups),
                     )
 

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/substrate_setup/agents/codex.py

@@ -60,6 +60,7 @@ from substrate_setup.env_persist import (
     format_persist_message_for_user,
     persist_substrate_api_key,
 )
+from substrate_setup.switchers import coexistence_message, detect_switchers
 
 PROVIDER_KEY = "substrate"
 ENV_KEY_NAME = "SUBSTRATE_API_KEY"
@@ -136,6 +137,19 @@ def _restrict_file_mode(path: Path) -> None:
         pass
 
 
+def _coexistence_guidance(ctx: ConfigureContext, switchers: list[str]) -> str:
+    return coexistence_message(
+        switchers,
+        pretty_name="Codex",
+        config_label="~/.codex/config.toml",
+        provider_lines=[
+            f'base_url = "{ctx.base_url}"',
+            f'wire_api = "{WIRE_API}"',
+            f'env_key  = "{ENV_KEY_NAME}"   (set it to your sk-substrate-... key)',
+        ],
+    )
+
+
 class CodexAgent(Agent):
     name = "codex"
     pretty_name = "Codex"
@@ -168,13 +182,21 @@ class CodexAgent(Agent):
             cfg_path.read_text(encoding="utf-8") if cfg_path.exists() else ""
         )
         if not _has_marker_comment(existing_text):
+            switchers = detect_switchers()
+            if switchers and not ctx.force:
+                print(_coexistence_guidance(ctx, switchers))
+                return AgentResult(
+                    ResultStatus.PRINT_ONLY,
+                    f"left {cfg_path} to {' / '.join(switchers)} "
+                    "(re-run with --force to manage it anyway)",
+                )
             providers = data.get("model_providers")
             existing_substrate = (
                 providers.get(PROVIDER_KEY)
                 if isinstance(providers, dict)
                 else None
             )
-            if isinstance(existing_substrate, dict):
+            if isinstance(existing_substrate, dict) and not ctx.force:
                 if _existing_substrate_block_matches(data, ctx):
                     notes.append(
                         "Codex config.toml had a substrate-shaped block but "

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/substrate_setup/cli.py

@@ -49,6 +49,12 @@ def _common_flags_parser() -> argparse.ArgumentParser:
     )
     p.add_argument("--dry-run", action="store_true", help="Mutate nothing")
     p.add_argument("--quiet", action="store_true", help="Summary only")
+    p.add_argument(
+        "--force",
+        action="store_true",
+        help="Manage claude-code/codex config even if an account switcher "
+        "(cc-switch, cockpit) owns it",
+    )
     return p
 
 
@@ -178,6 +184,7 @@ def _build_ctx(
         catalog=catalog,
         catalog_source=source,
         dry_run=args.dry_run,
+        force=args.force,
     )
 
 

substrate_setup-0.5.0/substrate_setup/switchers.py

@@ -0,0 +1,73 @@
+"""Detect third-party account-switcher tools that co-manage our config files.
+
+The ``claude-code`` and ``codex`` adapters write into ``~/.claude/settings.json``
+and ``~/.codex/config.toml`` — the same files tools like **cc-switch** and
+**cockpit** rewrite on every account switch. When such a tool is present,
+substrate-setup must not silently fight it: ``configure()`` leaves the file
+untouched and prints coexistence guidance, unless the user passes ``--force``.
+
+Detection is a best-effort heuristic — presence of the tool's data directory:
+
+  - cc-switch (https://github.com/farion1231/cc-switch) → ``~/.cc-switch/``
+    (holds ``cc-switch.db``)
+  - cockpit  (https://github.com/jlcodes99/cockpit-tools) → ``~/.antigravity_cockpit/``
+"""
+from __future__ import annotations
+
+from pathlib import Path
+
+# Display name -> home-relative marker whose existence signals the tool is
+# installed and managing local CLI configs.
+_SWITCHER_MARKERS: dict[str, str] = {
+    "cc-switch": ".cc-switch",
+    "cockpit": ".antigravity_cockpit",
+}
+
+
+def detect_switchers() -> list[str]:
+    """Return display names of detected account-switcher tools, sorted."""
+    home = Path.home()
+    return sorted(
+        name for name, rel in _SWITCHER_MARKERS.items() if (home / rel).exists()
+    )
+
+
+def coexistence_message(
+    switchers: list[str],
+    *,
+    pretty_name: str,
+    config_label: str,
+    provider_lines: list[str],
+    shell_lines: list[str] | None = None,
+) -> str:
+    """Build the guidance printed when a switcher owns an agent's config file.
+
+    ``provider_lines`` are the fields to enter when adding Substrate as a
+    provider inside the switcher (the recommended path). ``shell_lines``, when
+    given, show a one-off shell override (shell env wins over the switcher's
+    config file for Claude Code; Codex has no equivalent, so it omits this).
+    """
+    names = " / ".join(switchers)
+    provider = "\n".join(f"      {ln}" for ln in provider_lines)
+    parts = [
+        f"{pretty_name}: detected {names}, which manages {config_label}.",
+        "  substrate-setup left it untouched so it can't clobber your account "
+        "switching.",
+        "",
+        f"  To use Substrate, add it as a provider in {names} (recommended):",
+        provider,
+    ]
+    if shell_lines:
+        shell = "\n".join(f"      {ln}" for ln in shell_lines)
+        parts += [
+            "",
+            "  Or, for a one-off session, set these in your shell (shell env",
+            "  takes precedence over the switcher's config file):",
+            shell,
+        ]
+    parts += [
+        "",
+        f"  To let substrate-setup manage {config_label} anyway, "
+        "re-run with --force.",
+    ]
+    return "\n".join(parts)

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/tests/agents/test_claude_code.py

@@ -30,13 +30,14 @@ SAMPLE_CATALOG = [
 ]
 
 
-def _ctx(*, dry_run: bool = False) -> ConfigureContext:
+def _ctx(*, dry_run: bool = False, force: bool = False) -> ConfigureContext:
     return ConfigureContext(
         base_url="https://gw.example/v1",
         api_key=VALID_KEY,
         catalog=SAMPLE_CATALOG,
         catalog_source="live",
         dry_run=dry_run,
+        force=force,
     )
 
 

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/tests/agents/test_codex.py

@@ -37,13 +37,14 @@ SAMPLE_CATALOG = [
 ]
 
 
-def _ctx(*, dry_run: bool = False) -> ConfigureContext:
+def _ctx(*, dry_run: bool = False, force: bool = False) -> ConfigureContext:
     return ConfigureContext(
         base_url="https://gw.example/v1",
         api_key=VALID_KEY,
         catalog=SAMPLE_CATALOG,
         catalog_source="live",
         dry_run=dry_run,
+        force=force,
     )
 
 

substrate_setup-0.5.0/tests/test_switchers.py

@@ -0,0 +1,197 @@
+"""Tests for account-switcher coexistence (cc-switch / cockpit).
+
+substrate-setup's claude-code and codex adapters share config files with
+account-switcher tools. When such a tool is detected, configure() must leave
+the file untouched and print guidance, unless --force is passed. Files already
+managed by substrate-setup (marker present) keep updating normally.
+"""
+from __future__ import annotations
+
+import json
+import sys
+
+import pytest
+
+try:
+    import tomllib
+except ImportError:  # pragma: no cover
+    import tomli as tomllib  # type: ignore[no-redef]
+
+from substrate_setup.agents.base import ConfigureContext, ResultStatus
+from substrate_setup.agents.claude_code import MANAGED_ENV_KEYS, ClaudeCodeAgent
+from substrate_setup.agents.codex import MARKER_COMMENT_PATTERN, CodexAgent
+from substrate_setup.catalog import CatalogEntry
+from substrate_setup.switchers import coexistence_message, detect_switchers
+
+VALID_KEY = "sk-substrate-abcdefghijklmnopqrstuv"
+SAMPLE_CATALOG = [
+    CatalogEntry(
+        id="anthropic/claude-sonnet-4-6", provider="anthropic",
+        display_name="Claude Sonnet 4.6", description="...",
+    ),
+]
+
+
+def _ctx(*, force: bool = False) -> ConfigureContext:
+    return ConfigureContext(
+        base_url="https://gw.example/v1",
+        api_key=VALID_KEY,
+        catalog=SAMPLE_CATALOG,
+        catalog_source="live",
+        dry_run=False,
+        force=force,
+    )
+
+
+@pytest.fixture
+def home_dir(tmp_path, monkeypatch):
+    monkeypatch.setattr(sys, "platform", "linux")
+    monkeypatch.setenv("HOME", str(tmp_path))
+    monkeypatch.setenv("USERPROFILE", str(tmp_path))
+    monkeypatch.setenv("PATH", "")
+    return tmp_path
+
+
+# ─── detect_switchers ────────────────────────────────────────────────────────
+
+
+def test_no_switchers_detected(home_dir):
+    assert detect_switchers() == []
+
+
+def test_detects_cc_switch(home_dir):
+    (home_dir / ".cc-switch").mkdir()
+    assert detect_switchers() == ["cc-switch"]
+
+
+def test_detects_cockpit(home_dir):
+    (home_dir / ".antigravity_cockpit").mkdir()
+    assert detect_switchers() == ["cockpit"]
+
+
+def test_detects_both_sorted(home_dir):
+    (home_dir / ".cc-switch").mkdir()
+    (home_dir / ".antigravity_cockpit").mkdir()
+    assert detect_switchers() == ["cc-switch", "cockpit"]
+
+
+# ─── coexistence_message ─────────────────────────────────────────────────────
+
+
+def test_message_includes_names_provider_and_force():
+    msg = coexistence_message(
+        ["cc-switch"],
+        pretty_name="Claude Code",
+        config_label="~/.claude/settings.json",
+        provider_lines=["ANTHROPIC_BASE_URL = https://x"],
+        shell_lines=["export ANTHROPIC_BASE_URL=https://x"],
+    )
+    assert "cc-switch" in msg
+    assert "~/.claude/settings.json" in msg
+    assert "ANTHROPIC_BASE_URL = https://x" in msg
+    assert "--force" in msg
+    assert "shell" in msg.lower()
+
+
+def test_message_omits_shell_section_when_not_given():
+    msg = coexistence_message(
+        ["cockpit"],
+        pretty_name="Codex",
+        config_label="~/.codex/config.toml",
+        provider_lines=['base_url = "https://x/v1"'],
+    )
+    assert "one-off session" not in msg
+    assert "--force" in msg
+
+
+# ─── claude-code coexistence ─────────────────────────────────────────────────
+
+
+def test_claude_defers_to_switcher(home_dir, capsys):
+    (home_dir / ".cc-switch").mkdir()
+    (home_dir / ".claude").mkdir()
+    (home_dir / ".claude" / "settings.json").write_text(
+        '{"env": {}}', encoding="utf-8"
+    )
+    res = ClaudeCodeAgent().configure(_ctx())
+    assert res.status == ResultStatus.PRINT_ONLY
+    data = json.loads((home_dir / ".claude" / "settings.json").read_text())
+    assert "_substrate_setup_managed_env_keys" not in data
+    out = capsys.readouterr().out
+    assert "cc-switch" in out and "--force" in out
+
+
+def test_claude_force_overrides_switcher(home_dir):
+    (home_dir / ".cc-switch").mkdir()
+    (home_dir / ".claude").mkdir()
+    (home_dir / ".claude" / "settings.json").write_text(
+        '{"env": {"ANTHROPIC_BASE_URL": "https://other"}}', encoding="utf-8"
+    )
+    res = ClaudeCodeAgent().configure(_ctx(force=True))
+    assert res.status == ResultStatus.SUCCESS
+    data = json.loads((home_dir / ".claude" / "settings.json").read_text())
+    assert data["_substrate_setup_managed_env_keys"] == MANAGED_ENV_KEYS
+    assert data["env"]["ANTHROPIC_BASE_URL"] == "https://gw.example"
+
+
+def test_claude_already_managed_updates_despite_switcher(home_dir):
+    (home_dir / ".cc-switch").mkdir()
+    (home_dir / ".claude").mkdir()
+    payload = {
+        "env": {
+            "ANTHROPIC_BASE_URL": "https://gw.example",
+            "ANTHROPIC_AUTH_TOKEN": VALID_KEY,
+            "ANTHROPIC_MODEL": "anthropic/claude-sonnet-4-6",
+        },
+        "_substrate_setup_managed_env_keys": MANAGED_ENV_KEYS,
+    }
+    (home_dir / ".claude" / "settings.json").write_text(
+        json.dumps(payload), encoding="utf-8"
+    )
+    res = ClaudeCodeAgent().configure(_ctx())
+    assert res.status == ResultStatus.SUCCESS
+
+
+def test_claude_refusal_message_mentions_shell_and_force(home_dir):
+    # foreign ANTHROPIC_* with NO known switcher present → improved refusal
+    (home_dir / ".claude").mkdir()
+    (home_dir / ".claude" / "settings.json").write_text(
+        '{"env": {"ANTHROPIC_BASE_URL": "https://other", '
+        '"ANTHROPIC_AUTH_TOKEN": "sk-ext-xxxxxxxxxxxxxxxxxxxx"}}',
+        encoding="utf-8",
+    )
+    res = ClaudeCodeAgent().configure(_ctx())
+    assert res.status == ResultStatus.ERROR
+    assert "--force" in res.message
+    assert "shell" in res.message.lower()
+
+
+# ─── codex coexistence ───────────────────────────────────────────────────────
+
+
+def test_codex_defers_to_switcher(home_dir, capsys):
+    (home_dir / ".antigravity_cockpit").mkdir()
+    (home_dir / ".codex").mkdir()
+    (home_dir / ".codex" / "config.toml").write_text(
+        'model = "gpt-5.5"\n', encoding="utf-8"
+    )
+    res = CodexAgent().configure(_ctx())
+    assert res.status == ResultStatus.PRINT_ONLY
+    text = (home_dir / ".codex" / "config.toml").read_text()
+    assert not text.startswith("# substrate-setup-managed")
+    out = capsys.readouterr().out
+    assert "cockpit" in out and "--force" in out
+
+
+def test_codex_force_overrides_switcher(home_dir):
+    (home_dir / ".antigravity_cockpit").mkdir()
+    (home_dir / ".codex").mkdir()
+    (home_dir / ".codex" / "config.toml").write_text(
+        'model_provider = "openai"\n', encoding="utf-8"
+    )
+    res = CodexAgent().configure(_ctx(force=True))
+    assert res.status == ResultStatus.SUCCESS
+    text = (home_dir / ".codex" / "config.toml").read_text()
+    assert MARKER_COMMENT_PATTERN.match(text.splitlines()[0]) is not None
+    data = tomllib.loads(text)
+    assert data["model_provider"] == "substrate"

{substrate_setup-0.4.0 → substrate_setup-0.5.0}/uv.lock

@@ -722,7 +722,7 @@ wheels = [
 
 [[package]]
 name = "substrate-setup"
-version = "0.4.0"
+version = "0.5.0"
 source = { editable = "." }
 dependencies = [
     { name = "httpx" },

substrate_setup-0.4.0/substrate_setup/__init__.py

@@ -1,6 +0,0 @@
-"""substrate-setup — one-shot configurator for coding agents.
-
-See https://github.com/FrankXiaA/substrate-solutions for the gateway it
-configures against.
-"""
-__version__ = "0.3.1"