pocketshell 0.5.5__tar.gz → 0.5.7__tar.gz

{pocketshell-0.5.5 → pocketshell-0.5.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: pocketshell
-Version: 0.5.5
+Version: 0.5.7
 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.5 → pocketshell-0.5.7}/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.5"
+version = "0.5.7"
 description = "Unified server-side Python utility for the PocketShell Android and desktop clients."
 readme = "README.md"
 requires-python = ">=3.11"

{pocketshell-0.5.5 → pocketshell-0.5.7}/src/pocketshell/sessions.py

@@ -9,6 +9,7 @@ import sys
 import time
 from dataclasses import dataclass
 from typing import Any, Mapping, Optional, Sequence
+from uuid import uuid4
 
 import click
 
@@ -181,7 +182,28 @@ def aplexer_start_argv(
     profile: Optional[str],
     memory_bytes: Optional[int],
 ) -> list[str]:
-    """Build the detached ``a --json start`` invocation."""
+    """Build the detached ``a --json start`` invocation.
+
+    A capped start is wrapped in a transient per-user systemd scope
+    (``systemd-run --user --scope``). aplexer's worker moves the workload
+    into its delegated scope by writing its own pgid into that scope's
+    ``cgroup.procs`` from a pre_exec hook, and cgroup-v2 grants that write
+    only on the common ancestor of the writer's cgroup and the target.
+    Spawned straight from an SSH session, the worker lives in
+    ``session-*.scope``, the workload scope lands under
+    ``user@<uid>.service/app.slice``, and their common ancestor
+    (``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
+    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
+    fixture's ``--mem none``) performs no cgroup migration and must keep
+    working on hosts with no user manager at all.
+    """
     argv = [aplexer_path, "--json", "start", "--workspace", workspace, "--tag", tag]
     if engine:
         argv.extend(["--engine", engine])
@@ -189,6 +211,11 @@ def aplexer_start_argv(
         argv.extend(["--profile", profile])
     if memory_bytes is not None:
         argv.extend(["--memory", str(memory_bytes)])
+        argv = [
+            "systemd-run", "--user", "--scope",
+            "--unit", f"aplexer-launch-{uuid4().hex}",
+            "--collect", "--",
+        ] + argv
     return argv
 
 

{pocketshell-0.5.5 → pocketshell-0.5.7}/tests/test_sessions_create_routing.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
+from types import SimpleNamespace
 
 from click.testing import CliRunner
 
@@ -35,6 +36,7 @@ def test_create_uses_only_aplexer_and_emits_schema_three(monkeypatch, tmp_path:
     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, "uuid4", lambda: SimpleNamespace(hex="deadbeefcafe"))
 
     def start(argv):
         calls.append(list(argv))
@@ -55,12 +57,41 @@ def test_create_uses_only_aplexer_and_emits_schema_three(monkeypatch, tmp_path:
         "created": True,
     }
     assert calls == [[
+        "systemd-run", "--user", "--scope",
+        "--unit", "aplexer-launch-deadbeefcafe", "--collect", "--",
         "/fake/a", "--json", "start", "--workspace", str(tmp_path),
         "--tag", "shell", "--engine", "codex", "--memory", "123",
     ]]
     assert "backend" not in result.output.lower()
 
 
+def test_capped_start_wraps_the_worker_in_a_unique_user_scope() -> None:
+    first = sessions.aplexer_start_argv(
+        aplexer_path="/fake/a", workspace="/work/project", tag="shell",
+        engine=None, profile=None, memory_bytes=123,
+    )
+    second = sessions.aplexer_start_argv(
+        aplexer_path="/fake/a", workspace="/work/project", tag="shell",
+        engine=None, profile=None, memory_bytes=123,
+    )
+    for argv in (first, second):
+        assert argv[:7] == [
+            "systemd-run", "--user", "--scope", "--unit", argv[4], "--collect", "--",
+        ]
+        assert argv[4].startswith("aplexer-launch-")
+        assert "--memory" in argv[7:]
+    assert first[4] != second[4]
+
+
+def test_uncapped_start_is_not_wrapped() -> None:
+    argv = sessions.aplexer_start_argv(
+        aplexer_path="/fake/a", workspace="/work/project", tag="shell",
+        engine=None, profile=None, memory_bytes=None,
+    )
+    assert argv == ["/fake/a", "--json", "start", "--workspace", "/work/project", "--tag", "shell"]
+    assert not any("systemd-run" in part for part in argv)
+
+
 def test_create_reuses_a_live_record_without_starting_again(monkeypatch, tmp_path: Path) -> None:
     starts: list[list[str]] = []
     monkeypatch.setattr(sessions, "_resolve_aplexer", lambda: _resolution("/fake/a"))

{pocketshell-0.5.5 → pocketshell-0.5.7}/uv.lock

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