pocketshell 0.3.22__tar.gz → 0.3.24__tar.gz

{pocketshell-0.3.22 → pocketshell-0.3.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pocketshell
-Version: 0.3.22
+Version: 0.3.24
 Summary: Unified server-side Python utility for the PocketShell Android client.
 Project-URL: Homepage, https://github.com/alexeygrigorev/pocketshell
 Project-URL: Issues, https://github.com/alexeygrigorev/pocketshell/issues
@@ -274,8 +274,9 @@ uv sync --group dev
 uv run pytest
 ```
 
-The tests stub `quse.usage.collect_usage` so they run in seconds without
-hitting any provider API.
+The tests stub `pocketshell.usage.subprocess.run` (and the `quse`/`tmuxctl`
+binary resolvers) so they run in seconds without invoking any real binary or
+hitting a provider API.
 
 ## Release flow
 

{pocketshell-0.3.22 → pocketshell-0.3.24}/README.md

@@ -246,8 +246,9 @@ uv sync --group dev
 uv run pytest
 ```
 
-The tests stub `quse.usage.collect_usage` so they run in seconds without
-hitting any provider API.
+The tests stub `pocketshell.usage.subprocess.run` (and the `quse`/`tmuxctl`
+binary resolvers) so they run in seconds without invoking any real binary or
+hitting a provider API.
 
 ## Release flow
 

{pocketshell-0.3.22 → pocketshell-0.3.24}/pyproject.toml

@@ -8,7 +8,7 @@ name = "pocketshell"
 # scripts/check-pypi-version.sh enforces this; .github/workflows/build.yml
 # runs that check before publishing to PyPI. See
 # tools/pocketshell/README.md ("Release flow") for the bump procedure.
-version = "0.3.22"
+version = "0.3.24"
 description = "Unified server-side Python utility for the PocketShell Android client."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -27,10 +27,10 @@ classifiers = [
     "Topic :: Software Development",
     "Topic :: System :: Monitoring",
 ]
-# First PR delegates `pocketshell usage` to the existing `quse` CLI via
-# subprocess (see `pocketshell/usage.py`) so the new utility does not need
-# `quse` published on PyPI. Later PRs will fold the provider-detection
-# implementation in directly. Pin lower-bound only.
+# `pocketshell usage` delegates to the existing `quse` CLI via subprocess
+# (see `pocketshell/usage.py`) so this utility does not need `quse`
+# published on PyPI; the provider-detection implementation may be folded
+# in directly later. Pin lower-bound only.
 dependencies = [
     "click>=8.2.0",
 ]

{pocketshell-0.3.22 → pocketshell-0.3.24}/src/pocketshell/__init__.py

@@ -1,9 +1,9 @@
 """Unified server-side Python utility for the PocketShell Android client.
 
-This package is intended to replace the separately-installed `quse` and
-`tmuxctl` utilities the PocketShell app currently probes for. The first PR
-ships the skeleton plus the `pocketshell usage` subcommand only; later PRs
-will add `jobs`, `agent-log`, `sessions`, `repos`, and daemon mode.
+This package replaces the separately-installed `quse` and `tmuxctl`
+utilities the PocketShell app used to probe for. The app now probes a
+single `pocketshell` binary, which exposes the `usage`, `jobs`,
+`agent-log`, `sessions`, `repos`, and daemon subcommands.
 
 See https://github.com/alexeygrigorev/pocketshell/issues/170.
 """

{pocketshell-0.3.22 → pocketshell-0.3.24}/src/pocketshell/cli.py

@@ -6,10 +6,10 @@ PRs add subgroups: `jobs` (#170 second PR), `sessions` (#218),
 `agent-log` (#217), `daemon` (#219), and `repos` (#220).
 
 Per the D22 locked principle (no backwards compatibility, hard cuts only)
-the eventual goal is for the PocketShell Android app to probe for this
-single binary instead of `quse` / `tmuxctl`. The first PR keeps the
-existing probes in place — parallel detection, not legacy detection — so
-the app keeps working while we ramp up `pocketshell`'s feature parity.
+the PocketShell Android app probes for this single binary instead of
+`quse` / `tmuxctl`: usage runs `pocketshell usage --json` (#231) and jobs
+run `pocketshell jobs ...` (a direct namespace swap from `tmuxctl jobs`).
+The cutover is complete; the app no longer probes the old binaries.
 """
 
 from __future__ import annotations

{pocketshell-0.3.22 → pocketshell-0.3.24}/src/pocketshell/env.py

@@ -465,18 +465,15 @@ def render_export(directory: Path) -> str:
 # ---------------------------------------------------------------------------
 
 
-def _resolve_dir(ctx: click.Context, directory: str, *, must_exist: bool) -> Path:
-    """Expand ``directory`` and validate it as needed.
+def _resolve_dir(ctx: click.Context, directory: str) -> Path:
+    """Expand ``directory`` and require it to be an existing folder.
 
-    ``must_exist`` enforces that the folder is present (read paths);
-    write paths only require the *parent* to exist so a fresh ``.env``
-    can be created in an existing folder.
+    Exits with code 2 if the folder is missing. A fresh ``.env`` / ``.envrc``
+    is created inside an already-existing folder, so the directory itself must
+    be present for both read and write paths.
     """
     path = Path(os.path.expanduser(directory))
-    if must_exist and not path.is_dir():
-        click.echo(f"pocketshell env: directory does not exist: {path}", err=True)
-        ctx.exit(2)
-    if not must_exist and not path.is_dir():
+    if not path.is_dir():
         click.echo(f"pocketshell env: directory does not exist: {path}", err=True)
         ctx.exit(2)
     return path
@@ -514,7 +511,7 @@ def env_list(ctx: click.Context, directory: str, json_output: bool) -> None:
 
     Never prints values (write-only default, D24).
     """
-    path = _resolve_dir(ctx, directory, must_exist=True)
+    path = _resolve_dir(ctx, directory)
     keys = list_keys(path)
     if json_output:
         payload = [
@@ -558,7 +555,7 @@ def env_get(
     Missing keys are simply absent from the output; only a hard error
     (e.g. missing directory) is non-zero.
     """
-    path = _resolve_dir(ctx, directory, must_exist=True)
+    path = _resolve_dir(ctx, directory)
     values = get_values(path, list(keys))
     if json_output:
         click.echo(json.dumps(values, indent=2, sort_keys=True))
@@ -589,7 +586,7 @@ def env_set(ctx: click.Context, directory: str, file_name: str) -> None:
     `ps`/scrollback. Comments, ordering, and untouched keys are
     preserved (surgical rewrite).
     """
-    path = _resolve_dir(ctx, directory, must_exist=True)
+    path = _resolve_dir(ctx, directory)
     raw = sys.stdin.read()
     if not raw.strip():
         click.echo("pocketshell env set: no JSON on stdin", err=True)
@@ -627,7 +624,7 @@ def env_set(ctx: click.Context, directory: str, file_name: str) -> None:
 @click.pass_context
 def env_unset(ctx: click.Context, directory: str, keys: tuple[str, ...]) -> None:
     """Delete the named key(s) from both files, leaving the rest intact."""
-    path = _resolve_dir(ctx, directory, must_exist=True)
+    path = _resolve_dir(ctx, directory)
     unset_keys(path, list(keys))
 
 
@@ -662,8 +659,8 @@ def env_copy(
     file_name: str,
 ) -> None:
     """Copy named keys' values from source folder into the destination."""
-    src = _resolve_dir(ctx, src_dir, must_exist=True)
-    dst = _resolve_dir(ctx, dst_dir, must_exist=True)
+    src = _resolve_dir(ctx, src_dir)
+    dst = _resolve_dir(ctx, dst_dir)
     copy_keys(src, dst, list(keys), dst_file=file_name)
 
 
@@ -675,7 +672,7 @@ def env_copy(
 @click.pass_context
 def env_export(ctx: click.Context, directory: str) -> None:
     """Emit an `eval`-safe `export KEY=value` block merging both files."""
-    path = _resolve_dir(ctx, directory, must_exist=True)
+    path = _resolve_dir(ctx, directory)
     rendered = render_export(path)
     if rendered:
         sys.stdout.write(rendered)

{pocketshell-0.3.22 → pocketshell-0.3.24}/src/pocketshell/jobs.py

@@ -645,9 +645,9 @@ def daemon_start(
     """Run the scheduler loop in the foreground.
 
     This is the canonical `ExecStart=` shape: the process stays alive
-    until SIGTERM (matching the existing `tmuxctl-jobs.service` unit
-    file generated by `HostBootstrapper`). The IPC daemon planned in
-    the daemon-mode spike will eventually replace this entrypoint; that
+    until SIGTERM (matching the `pocketshell-jobs.service` unit file
+    generated by `HostBootstrapper`). The IPC daemon planned in the
+    daemon-mode spike will eventually replace this entrypoint; that
     refactor is explicitly out of scope here.
     """
     args: list[str] = ["jobs", "daemon"]

{pocketshell-0.3.22 → pocketshell-0.3.24}/src/pocketshell/repos.py

@@ -1533,10 +1533,3 @@ def daemon_handler_open(params: dict[str, Any]) -> dict[str, Any]:
         "path": repo.local.path,
         "full_name": repo.full_name,
     }
-
-
-# Back-compat re-export so any in-tree caller that imports
-# ``daemon_handler`` (the original single-handler name) keeps working
-# until the next refactor moves them over. The daemon module itself
-# uses the explicit ``daemon_handler_local`` name.
-daemon_handler = daemon_handler_local

{pocketshell-0.3.22 → pocketshell-0.3.24}/src/pocketshell/sessions.py

@@ -72,32 +72,6 @@ def _tmuxctl_missing_message() -> str:
     )
 
 
-def _run_tmuxctl(args: Sequence[str]) -> int:
-    """Invoke `tmuxctl` with [args]; proxy stdout/stderr and exit code.
-
-    Identical contract to `pocketshell.jobs._run_tmuxctl` /
-    `pocketshell.usage._run_quse` so a consumer that already parses
-    `tmuxctl` output sees a byte-identical payload when routed through
-    `pocketshell sessions ...`.
-    """
-    tmuxctl_path = _resolve_tmuxctl_binary()
-    if tmuxctl_path is None:
-        click.echo(_tmuxctl_missing_message(), err=True)
-        return 127
-
-    completed = subprocess.run(
-        [tmuxctl_path, *args],
-        check=False,
-        capture_output=True,
-        text=True,
-    )
-    if completed.stdout:
-        sys.stdout.write(completed.stdout)
-    if completed.stderr:
-        sys.stderr.write(completed.stderr)
-    return completed.returncode
-
-
 def _run_tmuxctl_capture(args: Sequence[str]) -> dict[str, Any]:
     """Invoke ``tmuxctl`` and return a daemon-friendly raw envelope."""
     tmuxctl_path = _resolve_tmuxctl_binary()

{pocketshell-0.3.22 → pocketshell-0.3.24}/uv.lock

@@ -3,7 +3,7 @@ revision = 3
 requires-python = ">=3.11"
 
 [options]
-exclude-newer = "2026-05-22T22:04:41.504843187Z"
+exclude-newer = "2026-05-29T16:43:17.406243682Z"
 exclude-newer-span = "P7D"
 
 [[package]]
@@ -143,7 +143,7 @@ wheels = [
 
 [[package]]
 name = "pocketshell"
-version = "0.3.15"
+version = "0.3.24"
 source = { editable = "." }
 dependencies = [
     { name = "click" },