pocketshell 0.5.6__tar.gz → 0.5.8__tar.gz

{pocketshell-0.5.6 → pocketshell-0.5.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pocketshell
-Version: 0.5.6
+Version: 0.5.8
 Summary: Unified server-side Python utility for the PocketShell Android and desktop clients.
 Project-URL: Homepage, https://github.com/PocketShell-io/pocketshell-cli
 Project-URL: Issues, https://github.com/PocketShell-io/pocketshell-cli/issues

{pocketshell-0.5.6 → pocketshell-0.5.8}/pyproject.toml

@@ -11,7 +11,7 @@ name = "pocketshell"
 # since the extraction (PocketShell-io/pocketshell#2643): the first
 # self-governed release is 0.5.5, continuing from the last app-coupled
 # release 0.5.4 so `uv tool upgrade pocketshell` stays monotonic.
-version = "0.5.6"
+version = "0.5.8"
 description = "Unified server-side Python utility for the PocketShell Android and desktop clients."
 readme = "README.md"
 requires-python = ">=3.11"

{pocketshell-0.5.6 → pocketshell-0.5.8}/src/pocketshell/profiles.py

@@ -226,6 +226,49 @@ def _aplexer_profiles(
     return _profiles_from_aplexer_json(payload)
 
 
+def resolve_aplexer_profile_arg(
+    name: str,
+    engine: Optional[str] = None,
+    env: Optional[dict[str, str]] = None,
+) -> Optional[str]:
+    """Map a client-facing profile name onto the ``a start --profile`` value.
+
+    The client picker shows the display names from ``profiles list``
+    (``Zcodex``, ``Claude (Z.AI)``), while ``a start --profile`` takes
+    aplexer's profile ids — the lowercase dir stems — matched
+    case-sensitively, and aplexer deliberately omits the engines' default
+    dirs, so the default display names (``Codex`` / ``Claude``) are unknown
+    to it (#2661). Resolution order:
+
+    1. case-insensitive match on an aplexer profile id → that id;
+    2. case-insensitive match on a profile's display name for ``engine``
+       → the aplexer id behind it;
+    3. the engine's default display name → ``None`` (the caller must drop
+       ``--profile`` entirely);
+    4. anything else → ``name`` unchanged, so aplexer produces its
+       authoritative ``unknown profile`` error.
+
+    Probe failure or the ``POCKETSHELL_APLEXER`` kill switches return
+    ``name`` unchanged (branch 4), degrading to the pre-#2661 behaviour.
+    """
+    payload = aplexer.run_json(["profiles"], env=env, feature="profiles")
+    if not isinstance(payload, dict):
+        return name
+    lowered = name.strip().lower()
+    for stem in payload:
+        if isinstance(stem, str) and stem.lower() == lowered:
+            return stem
+    if engine:
+        for stem, entry in payload.items():
+            if not isinstance(entry, dict) or entry.get("engine") != engine:
+                continue
+            if _display_name_for_sibling(engine, str(stem)).lower() == lowered:
+                return str(stem)
+        if _ENGINE_DEFAULT_DISPLAY.get(engine, "").lower() == lowered:
+            return None
+    return name
+
+
 def _profile_key(profile: Profile) -> tuple[str, Optional[str]]:
     """Compare native vs aplexer siblings by engine + config_dir."""
     path = profile.config_dir

{pocketshell-0.5.6 → pocketshell-0.5.8}/src/pocketshell/sessions.py

@@ -15,6 +15,7 @@ import click
 
 from . import aplexer as _aplexer
 from . import memcap as _memcap
+from . import profiles as _profiles
 from . import session_enum as _session_enum
 
 
@@ -195,9 +196,9 @@ def aplexer_start_argv(
     (``user-<uid>.slice``) is root-owned — so every capped create died with
     ``spawn workload: Permission denied (os error 13)`` (#2625; the same
     runner gap PR #2590 documented from the CI side). Inside a user-manager
-    scope the common ancestor is the user-owned ``app.slice`` — the shape
-    every session still had under the tmux arm's ``robust.slice`` before
-    #2561 removed tmux. The scope becomes the worker's home for the
+    scope the common ancestor is the user-owned ``app.slice`` — the
+    placement every session had before #2561 removed the previous session
+    backend. The scope becomes the worker's home for the
     session's whole life (aplexer's record discloses it as
     ``worker_cgroup``), and ``--collect`` reaps the unit once the session
     is gone. Only capped starts wrap: an uncapped ``a start`` (the Docker
@@ -366,7 +367,11 @@ def _create_on_aplexer(
         workspace=workspace,
         tag=name,
         engine=engine,
-        profile=profile,
+        profile=(
+            _profiles.resolve_aplexer_profile_arg(profile, engine=engine)
+            if profile
+            else profile
+        ),
         memory_bytes=memory_bytes,
     )
     code, stdout, stderr = _run_aplexer(argv)

{pocketshell-0.5.6 → pocketshell-0.5.8}/tests/test_profiles.py

@@ -604,3 +604,61 @@ def test_cli_shape_unchanged_with_shadow_probe(
         assert "SECRET" not in json.dumps(entry)
     names = {p["name"] for p in parsed["profiles"]}
     assert {"Claude", "Claude (Z.AI)", "Codex"} <= names
+
+
+# ---------------------------------------------------------------------------
+# resolve_aplexer_profile_arg (#2661): the client picker sends display names
+# ("Zcodex"), `a start --profile` takes aplexer's dir-stem ids ("zcodex"),
+# and aplexer deliberately omits the engines' default dirs ("Codex").
+# ---------------------------------------------------------------------------
+
+
+_APLEXER_PROFILES_PAYLOAD = {
+    "godex": {"engine": "codex", "env": {"CODEX_HOME": "/home/u/.godex"}},
+    "zcodex": {"engine": "codex", "env": {"CODEX_HOME": "/home/u/.zcodex"}},
+    "zlaude": {"engine": "claude", "env": {"CLAUDE_CONFIG_DIR": "/home/u/.zlaude"}},
+}
+
+
+def test_resolve_aplexer_profile_arg_maps_display_name_to_id(tmp_path, monkeypatch):
+    _install_fake_a(tmp_path, monkeypatch, payload=_APLEXER_PROFILES_PAYLOAD)
+    assert profiles.resolve_aplexer_profile_arg("Zcodex", engine="codex") == "zcodex"
+
+
+def test_resolve_aplexer_profile_arg_accepts_the_aplexer_id_verbatim(tmp_path, monkeypatch):
+    _install_fake_a(tmp_path, monkeypatch, payload=_APLEXER_PROFILES_PAYLOAD)
+    assert profiles.resolve_aplexer_profile_arg("zcodex", engine="codex") == "zcodex"
+
+
+def test_resolve_aplexer_profile_arg_is_case_insensitive_on_the_id(tmp_path, monkeypatch):
+    _install_fake_a(tmp_path, monkeypatch, payload=_APLEXER_PROFILES_PAYLOAD)
+    assert profiles.resolve_aplexer_profile_arg("Godex", engine="codex") == "godex"
+
+
+def test_resolve_aplexer_profile_arg_maps_the_known_alias_display_name(tmp_path, monkeypatch):
+    _install_fake_a(tmp_path, monkeypatch, payload=_APLEXER_PROFILES_PAYLOAD)
+    assert profiles.resolve_aplexer_profile_arg("Claude (Z.AI)", engine="claude") == "zlaude"
+
+
+def test_resolve_aplexer_profile_arg_drops_the_engine_default_display_name(tmp_path, monkeypatch):
+    _install_fake_a(tmp_path, monkeypatch, payload=_APLEXER_PROFILES_PAYLOAD)
+    assert profiles.resolve_aplexer_profile_arg("Codex", engine="codex") is None
+
+
+def test_resolve_aplexer_profile_arg_keeps_unknown_names_verbatim(tmp_path, monkeypatch):
+    _install_fake_a(tmp_path, monkeypatch, payload=_APLEXER_PROFILES_PAYLOAD)
+    assert profiles.resolve_aplexer_profile_arg("Nope", engine="codex") == "Nope"
+
+
+def test_resolve_aplexer_profile_arg_degrades_to_passthrough_without_the_probe(
+    tmp_path, monkeypatch
+):
+    monkeypatch.setenv("POCKETSHELL_APLEXER_PROFILES", "0")
+    assert profiles.resolve_aplexer_profile_arg("Zcodex", engine="codex") == "Zcodex"
+
+
+def test_resolve_aplexer_profile_arg_degrades_to_passthrough_on_probe_failure(
+    tmp_path, monkeypatch
+):
+    _install_fake_a(tmp_path, monkeypatch, exit_code=2)
+    assert profiles.resolve_aplexer_profile_arg("Zcodex", engine="codex") == "Zcodex"

{pocketshell-0.5.6 → pocketshell-0.5.8}/tests/test_sessions_create_routing.py

@@ -119,3 +119,65 @@ def test_create_fails_loudly_when_aplexer_cannot_resolve(monkeypatch) -> None:
 
     assert result.exit_code == 127
     assert "could not resolve" in result.output
+
+
+def _start_recording(calls: list[list[str]]):
+    def start(argv: list[str]):
+        calls.append(list(argv))
+        return 0, json.dumps(_record()), ""
+
+    return start
+
+
+def test_create_translates_a_profile_display_name_onto_the_aplexer_id(
+    monkeypatch, tmp_path: Path
+) -> None:
+    """#2661: the picker sends display names; aplexer wants dir-stem ids."""
+    calls: list[list[str]] = []
+    monkeypatch.setattr(sessions, "_resolve_aplexer", lambda: _resolution("/fake/a"))
+    monkeypatch.setattr(sessions, "_aplexer_snapshot", lambda: [])
+    monkeypatch.setattr(sessions._memcap, "resolve_session_mem_bytes", lambda **_: 123)
+    monkeypatch.setattr(sessions, "_run_aplexer", _start_recording(calls))
+    monkeypatch.setattr(
+        sessions._profiles,
+        "resolve_aplexer_profile_arg",
+        lambda name, engine=None: {"Zcodex": "zcodex"}.get(name, name),
+    )
+
+    result = CliRunner().invoke(
+        sessions.sessions_group,
+        [
+            "create", "shell", "--cwd", str(tmp_path),
+            "--engine", "codex", "--profile", "Zcodex", "--json",
+        ],
+    )
+
+    assert result.exit_code == 0, result.output
+    assert calls[0][calls[0].index("--profile") + 1] == "zcodex"
+
+
+def test_create_drops_the_profile_flag_for_the_engine_default_display_name(
+    monkeypatch, tmp_path: Path
+) -> None:
+    """#2661: aplexer omits default dirs, so `--profile Codex` must go away."""
+    calls: list[list[str]] = []
+    monkeypatch.setattr(sessions, "_resolve_aplexer", lambda: _resolution("/fake/a"))
+    monkeypatch.setattr(sessions, "_aplexer_snapshot", lambda: [])
+    monkeypatch.setattr(sessions._memcap, "resolve_session_mem_bytes", lambda **_: 123)
+    monkeypatch.setattr(sessions, "_run_aplexer", _start_recording(calls))
+    monkeypatch.setattr(
+        sessions._profiles,
+        "resolve_aplexer_profile_arg",
+        lambda name, engine=None: None if name == "Codex" else name,
+    )
+
+    result = CliRunner().invoke(
+        sessions.sessions_group,
+        [
+            "create", "shell", "--cwd", str(tmp_path),
+            "--engine", "codex", "--profile", "Codex", "--json",
+        ],
+    )
+
+    assert result.exit_code == 0, result.output
+    assert "--profile" not in calls[0]

{pocketshell-0.5.6 → pocketshell-0.5.8}/uv.lock

@@ -218,7 +218,7 @@ wheels = [
 
 [[package]]
 name = "pocketshell"
-version = "0.5.6"
+version = "0.5.7"
 source = { editable = "." }
 dependencies = [
     { name = "aplexer", marker = "sys_platform == 'linux'" },