codexmgr 0.4.0__tar.gz → 0.4.1__tar.gz

{codexmgr-0.4.0 → codexmgr-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codexmgr
-Version: 0.4.0
+Version: 0.4.1
 Summary: Manage project-local Codex configuration from reusable templates
 Project-URL: Repository, https://github.com/JulianKimmig/codexmgr/
 Keywords: agents,cli,codex,configuration,skills
@@ -474,14 +474,19 @@ codexmgr codex --simple <args...>
 ```
 
 By default, `codexmgr codex` applies the current project config, launches the
-real `codex` command with `CODEX_HOME` set to `<project>/.codex`, and forwards
-Codex arguments unchanged. Codex reads `.codex/config.toml` directly, so
-user-provided `-c` and `--config` arguments retain their normal Codex behavior.
-
-The wrapper links the global authentication file into `.codex/auth.json`. It
-uses `CODEX_GLOBAL_AUTH` when that variable is non-empty and otherwise uses
-`$HOME/.codex/auth.json`. A missing auth source produces a warning but does not
-stop Codex, which can then authenticate normally.
+real `codex` command with `CODEX_HOME` set to
+`<project>/.codex/.runtime`, and forwards Codex arguments unchanged. For a
+trusted project, Codex discovers the tracked `.codex/config.toml` as its
+project configuration independently of `CODEX_HOME`. This keeps generated MCP
+servers and other shared project settings in Git while mutable Codex state is
+written below the ignored `.codex/.runtime` directory. User-provided `-c` and
+`--config` arguments retain their normal Codex behavior.
+
+The wrapper links the global authentication file into
+`.codex/.runtime/auth.json`. It uses `CODEX_GLOBAL_AUTH` when that variable is
+non-empty and otherwise uses `$HOME/.codex/auth.json`. A missing auth source
+produces a warning but does not stop Codex, which can then authenticate within
+the project runtime home.
 
 Use `--simple` immediately after `codex` to run the basic command without
 applying project state, changing the child `CODEX_HOME`, or managing an auth

{codexmgr-0.4.0 → codexmgr-0.4.1}/README.md

@@ -450,14 +450,19 @@ codexmgr codex --simple <args...>
 ```
 
 By default, `codexmgr codex` applies the current project config, launches the
-real `codex` command with `CODEX_HOME` set to `<project>/.codex`, and forwards
-Codex arguments unchanged. Codex reads `.codex/config.toml` directly, so
-user-provided `-c` and `--config` arguments retain their normal Codex behavior.
-
-The wrapper links the global authentication file into `.codex/auth.json`. It
-uses `CODEX_GLOBAL_AUTH` when that variable is non-empty and otherwise uses
-`$HOME/.codex/auth.json`. A missing auth source produces a warning but does not
-stop Codex, which can then authenticate normally.
+real `codex` command with `CODEX_HOME` set to
+`<project>/.codex/.runtime`, and forwards Codex arguments unchanged. For a
+trusted project, Codex discovers the tracked `.codex/config.toml` as its
+project configuration independently of `CODEX_HOME`. This keeps generated MCP
+servers and other shared project settings in Git while mutable Codex state is
+written below the ignored `.codex/.runtime` directory. User-provided `-c` and
+`--config` arguments retain their normal Codex behavior.
+
+The wrapper links the global authentication file into
+`.codex/.runtime/auth.json`. It uses `CODEX_GLOBAL_AUTH` when that variable is
+non-empty and otherwise uses `$HOME/.codex/auth.json`. A missing auth source
+produces a warning but does not stop Codex, which can then authenticate within
+the project runtime home.
 
 Use `--simple` immediately after `codex` to run the basic command without
 applying project state, changing the child `CODEX_HOME`, or managing an auth

{codexmgr-0.4.0 → codexmgr-0.4.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "codexmgr"
-version = "0.4.0"
+version = "0.4.1"
 description = "Manage project-local Codex configuration from reusable templates"
 readme = "README.md"
 requires-python = ">=3.11"

{codexmgr-0.4.0 → codexmgr-0.4.1}/src/codexmgr/__init__.py

@@ -2,4 +2,4 @@
 
 __all__ = ["__version__"]
 
-__version__ = "0.4.0"
+__version__ = "0.4.1"

{codexmgr-0.4.0 → codexmgr-0.4.1}/src/codexmgr/commands/codex_launch.py

@@ -6,6 +6,8 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import TextIO
 
+from ..core.paths import project_codex_dir, project_codex_runtime_dir
+
 
 @dataclass(frozen=True)
 class CodexLaunchRequest:
@@ -47,19 +49,21 @@ def build_project_codex_environment(
         environ: Source process environment, or ``os.environ`` when omitted.
 
     Returns:
-        A copied child environment. ``CODEX_HOME`` points to ``.codex`` when
-        that directory contains ``config.toml``.
+        A copied child environment. ``CODEX_HOME`` points to
+        ``.codex/.runtime`` when the project ``.codex`` directory contains
+        ``config.toml``.
     """
     environment = dict(os.environ if environ is None else environ)
-    project_codex_dir = cwd / ".codex"
-    if not (project_codex_dir / "config.toml").is_file():
+    config_dir = project_codex_dir(cwd)
+    if not (config_dir / "config.toml").is_file():
         return environment
 
-    project_codex_dir.mkdir(parents=True, exist_ok=True)
-    environment["CODEX_HOME"] = str(project_codex_dir)
+    runtime_dir = project_codex_runtime_dir(cwd)
+    runtime_dir.mkdir(parents=True, exist_ok=True)
+    environment["CODEX_HOME"] = str(runtime_dir)
     global_auth = _global_auth_path(environment)
     if global_auth.is_file():
-        _replace_auth_link(project_codex_dir / "auth.json", global_auth)
+        _replace_auth_link(runtime_dir / "auth.json", global_auth)
     else:
         stderr.write(
             "codexmgr codex: warning: no global auth found at "
@@ -87,7 +91,7 @@ def _replace_auth_link(auth_link: Path, global_auth: Path) -> None:
     """Replace the project auth entry with a link to global authentication.
 
     Args:
-        auth_link: Project-local ``.codex/auth.json`` link path.
+        auth_link: Project-local ``.codex/.runtime/auth.json`` link path.
         global_auth: Existing global authentication source file.
 
     Returns:

{codexmgr-0.4.0 → codexmgr-0.4.1}/src/codexmgr/core/paths.py

@@ -36,6 +36,18 @@ def project_codex_dir(cwd: Path) -> Path:
     return cwd / ".codex"
 
 
+def project_codex_runtime_dir(cwd: Path) -> Path:
+    """Return the project-local Codex runtime-home path.
+
+    Args:
+        cwd: Project directory.
+
+    Returns:
+        The ignored ``.codex/.runtime`` directory used as ``CODEX_HOME``.
+    """
+    return project_codex_dir(cwd) / ".runtime"
+
+
 def config_path(cwd: Path) -> Path:
     """Return the project codexmgr.toml path.
 

{codexmgr-0.4.0 → codexmgr-0.4.1}/tests/test_codex_cli.py

@@ -9,7 +9,7 @@ from codexmgr.interface.cli import main
 
 
 def test_build_codex_command_proxies_args_without_flattening_project_config(workspace):
-    """The command relies on project CODEX_HOME instead of injected overrides."""
+    """The command relies on project config instead of injected overrides."""
     project, _ = workspace
     (project / ".codex").mkdir()
     (project / ".codex" / "config.toml").write_text(
@@ -111,21 +111,26 @@ def test_build_codex_command_keeps_repeated_user_lists(workspace):
     ]
 
 
-def test_codex_subcommand_uses_project_home_auth_and_return_code(
+def test_codex_subcommand_uses_project_runtime_home_auth_and_return_code(
     workspace,
     monkeypatch,
 ):
-    """Default launch uses project CODEX_HOME and links the global auth file."""
+    """Default launch isolates runtime state and links the global auth file."""
     project, codex_home = workspace
     (project / ".codex").mkdir()
-    (project / ".codex" / "codexmgr.toml").write_text("", encoding="utf-8")
+    (project / ".codex" / "codexmgr.toml").write_text(
+        '[mcp.servers.example]\ncommand = "example"\n',
+        encoding="utf-8",
+    )
     user_home = project.parent / "user-home"
     global_auth = user_home / ".codex" / "auth.json"
     global_auth.parent.mkdir(parents=True)
     global_auth.write_text('{"token": "test"}\n', encoding="utf-8")
     stale_auth = project.parent / "stale-auth.json"
     stale_auth.write_text('{"token": "stale"}\n', encoding="utf-8")
-    (project / ".codex" / "auth.json").symlink_to(stale_auth)
+    runtime_home = project / ".codex" / ".runtime"
+    runtime_home.mkdir()
+    (runtime_home / "auth.json").symlink_to(stale_auth)
     monkeypatch.delenv("CODEX_GLOBAL_AUTH", raising=False)
     monkeypatch.setenv("HOME", str(user_home))
     monkeypatch.setenv("CODEXMGR_LAUNCH_TEST", "forwarded")
@@ -136,6 +141,9 @@ def test_codex_subcommand_uses_project_home_auth_and_return_code(
         captured["cwd"] = cwd
         captured["codex_home"] = env["CODEX_HOME"]
         captured["environment_marker"] = env["CODEXMGR_LAUNCH_TEST"]
+        captured["runtime_config_exists"] = (
+            project / ".codex" / ".runtime" / "config.toml"
+        ).exists()
         return SimpleNamespace(returncode=42)
 
     monkeypatch.setattr("codexmgr.commands.codex.subprocess.run", fake_run)
@@ -155,10 +163,15 @@ def test_codex_subcommand_uses_project_home_auth_and_return_code(
     assert captured == {
         "command": ["codex", "--help"],
         "cwd": project,
-        "codex_home": str(project / ".codex"),
+        "codex_home": str(runtime_home),
         "environment_marker": "forwarded",
+        "runtime_config_exists": False,
     }
-    auth_link = project / ".codex" / "auth.json"
+    assert runtime_home.is_dir()
+    assert tomllib.loads(
+        (project / ".codex" / "config.toml").read_text(encoding="utf-8")
+    )["mcp_servers"]["example"] == {"command": "example"}
+    auth_link = runtime_home / "auth.json"
     assert auth_link.is_symlink()
     assert auth_link.samefile(global_auth)
 
@@ -199,9 +212,10 @@ def test_codex_subcommand_warns_when_global_auth_is_missing(workspace, monkeypat
     assert captured == {
         "command": ["codex", "exec", "hello"],
         "cwd": project,
-        "codex_home": str(project / ".codex"),
+        "codex_home": str(project / ".codex" / ".runtime"),
     }
-    assert not (project / ".codex" / "auth.json").exists()
+    assert (project / ".codex" / ".runtime").is_dir()
+    assert not (project / ".codex" / ".runtime" / "auth.json").exists()
 
 
 def test_codex_subcommand_simple_mode_runs_basic_codex(workspace, monkeypatch):
@@ -282,7 +296,7 @@ enabled = ["example"]
     assert captured == {
         "command": ["codex", "exec", "hello"],
         "cwd": project,
-        "codex_home": str(project / ".codex"),
+        "codex_home": str(project / ".codex" / ".runtime"),
     }
 
 
@@ -385,7 +399,7 @@ skills = ["strict-skill"]
     assert stdout.getvalue() == ""
     assert stderr.getvalue() == ""
     assert captured["cwd"] == project
-    assert captured["codex_home"] == str(project / ".codex")
+    assert captured["codex_home"] == str(project / ".codex" / ".runtime")
     assert captured["codexmgr_toml"] == ""
     assert captured["config"]["skills"]["config"] == [
         {"path": str(base_skill.resolve()), "enabled": True},
@@ -442,7 +456,7 @@ def test_codex_jit_overlay_snapshots_and_restores_rules(
     assert stdout.getvalue() == ""
     assert stderr.getvalue() == ""
     assert captured["command"] == ["codex", "exec", "hello"]
-    assert captured["codex_home"] == str(project / ".codex")
+    assert captured["codex_home"] == str(project / ".codex" / ".runtime")
     assert captured["rule"] == "# Components\n"
     assert not (project / ".rules").exists()
 

{codexmgr-0.4.0 → codexmgr-0.4.1}/tests/test_paths.py

@@ -2,7 +2,11 @@ from pathlib import Path
 
 import pytest
 
-from codexmgr.core.paths import global_codex_dir, global_codexmgr_dir
+from codexmgr.core.paths import (
+    global_codex_dir,
+    global_codexmgr_dir,
+    project_codex_runtime_dir,
+)
 
 
 def test_defaults_to_home_codex_directory(monkeypatch: pytest.MonkeyPatch):
@@ -33,3 +37,10 @@ def test_codexmgr_home_uses_environment_variable(monkeypatch: pytest.MonkeyPatch
     monkeypatch.setenv("CODEXMGR_HOME", "/tmp/custom-codexmgr-home")
 
     assert global_codexmgr_dir() == Path("/tmp/custom-codexmgr-home")
+
+
+def test_project_codex_runtime_directory_is_nested_below_project_config():
+    """Mutable Codex state has a dedicated home below the project config."""
+    project = Path("/tmp/example-project")
+
+    assert project_codex_runtime_dir(project) == project / ".codex" / ".runtime"

{codexmgr-0.4.0 → codexmgr-0.4.1}/tests/test_project_gitignore.py

@@ -75,7 +75,8 @@ def test_managed_gitignore_ignores_unknown_runtime_state_only(workspace, run_cli
     """Git ignores future runtime names but exposes every codexmgr-owned path."""
     project, codex_home = workspace
     run_cli(["setup"], project, codex_home)
-    runtime_file = project / ".codex" / "future-runtime-state.bin"
+    runtime_file = project / ".codex" / ".runtime" / "future-runtime-state.bin"
+    runtime_file.parent.mkdir()
     runtime_file.write_text("runtime\n", encoding="utf-8")
     agent_file = project / ".codex" / "agents" / "local.toml"
     agent_file.parent.mkdir()
@@ -91,7 +92,7 @@ def test_managed_gitignore_ignores_unknown_runtime_state_only(workspace, run_cli
         text=True,
     )
 
-    assert _git_check_ignore(project, ".codex/future-runtime-state.bin") == 0
+    assert _git_check_ignore(project, ".codex/.runtime/future-runtime-state.bin") == 0
     for managed_path in [
         ".codex/.gitignore",
         ".codex/codexmgr.toml",

{codexmgr-0.4.0 → codexmgr-0.4.1}/uv.lock

@@ -4,7 +4,7 @@ requires-python = ">=3.11"
 
 [[package]]
 name = "codexmgr"
-version = "0.4.0"
+version = "0.4.1"
 source = { editable = "." }
 dependencies = [
     { name = "textual" },