phern 0.1.0__tar.gz → 0.2.0__tar.gz

{phern-0.1.0 → phern-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: phern
-Version: 0.1.0
+Version: 0.2.0
 Summary: pH — a Python agent harness with no privileged core: every part is a row in a profile.
 Project-URL: Homepage, https://github.com/chastabor/pH
 Project-URL: Repository, https://github.com/chastabor/pH
@@ -24,19 +24,20 @@ Requires-Python: >=3.12
 Requires-Dist: anyio<5,>=4.4
 Requires-Dist: filelock>=3.15
 Requires-Dist: httpx>=0.27
-Requires-Dist: ph-code-graph==0.1.0
-Requires-Dist: ph-core==0.1.0
-Requires-Dist: ph-rlm==0.1.0
-Requires-Dist: ph-runtime-guest==0.1.0
-Requires-Dist: ph-stabilize==0.1.0
-Requires-Dist: ph-text-index==0.1.0
+Requires-Dist: ph-code-graph==0.2.0
+Requires-Dist: ph-core==0.2.0
+Requires-Dist: ph-rlm==0.2.0
+Requires-Dist: ph-runtime-guest==0.2.0
+Requires-Dist: ph-stabilize==0.2.0
+Requires-Dist: ph-text-index==0.2.0
+Requires-Dist: pyyaml>=6.0
 Requires-Dist: rich>=13.0
 Requires-Dist: textual<9,>=8.2.5
 Requires-Dist: typer>=0.12
 Provides-Extra: local
-Requires-Dist: ph-text-index[local]==0.1.0; extra == 'local'
+Requires-Dist: ph-text-index[local]==0.2.0; extra == 'local'
 Provides-Extra: otel
-Requires-Dist: ph-core[otel]==0.1.0; extra == 'otel'
+Requires-Dist: ph-core[otel]==0.2.0; extra == 'otel'
 Provides-Extra: web
 Requires-Dist: textual-serve>=1.1.3; extra == 'web'
 Description-Content-Type: text/markdown

{phern-0.1.0 → phern-0.2.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "phern"
-version = "0.1.0"
+version = "0.2.0"
 description = "pH — a Python agent harness with no privileged core: every part is a row in a profile."
 readme = "README.md"
 requires-python = ">=3.12"
@@ -45,20 +45,26 @@ dependencies = [
     # `ph.bundles` composes a profile on an install of this package, and one
     # uninstalled from an install of this package takes its profiles out of
     # `phern doctor` rather than breaking the six that remain.
-    "ph-core==0.1.0",
-    "ph-rlm==0.1.0",
-    "ph-stabilize==0.1.0",
-    "ph-text-index==0.1.0",
-    "ph-code-graph==0.1.0",
+    "ph-core==0.2.0",
+    "ph-rlm==0.2.0",
+    "ph-stabilize==0.2.0",
+    "ph-text-index==0.2.0",
+    "ph-code-graph==0.2.0",
     # Reached through `ph-rlm` already; pinned here too because `ph_rlm.kernel`
     # installs it *by name* into `$PH_CACHE/runtime-venv`, so the version this
     # deployment resolves is the version a cell runs against.
-    "ph-runtime-guest==0.1.0",
+    "ph-runtime-guest==0.2.0",
     # Declared although `ph-core` already requires it: `ph_app.daemon` imports
     # `anyio` directly at 20-odd sites and `cancelsafe` is keyed to its
     # internals, so arriving here transitively understated the coupling.
     "anyio>=4.4,<5",
     "filelock>=3.15",
+    # Declared although `ph-core` already requires it, for `anyio`'s reason above:
+    # `ph_app` imports `yaml` directly — `cli.py` to print a composed profile, and
+    # `tui.themes` to write `$PH_HOME/themes/theme-profile.yaml` — so arriving here
+    # transitively understated the coupling. Reading YAML still goes through
+    # ph-core's one safe door (`safe_yaml_load`); this is the writing half.
+    "pyyaml>=6.0",
     "typer>=0.12",
     "rich>=13.0",
     "httpx>=0.27",
@@ -106,13 +112,13 @@ web = ["textual-serve>=1.1.3"]
 # default CUDA wheels. Without it `text_index` and `text_search` still register
 # and still search an index you supply vectors for — what refuses to mount is
 # the row that *computes* them, with a message naming this extra.
-local = ["ph-text-index[local]==0.1.0"]
+local = ["ph-text-index[local]==0.2.0"]
 
 # Exporting the session log to an OTel collector, passed through for the same
 # reason `local` is: `ph-core` owns the row and the refusal message, but `phern`
 # is the name a person installs, so all three of this deployment's extras should
 # be reachable without first learning which member implements which.
-otel = ["ph-core[otel]==0.1.0"]
+otel = ["ph-core[otel]==0.2.0"]
 
 [project.entry-points."ph.plugins"]
 llm-openai-compatible = "ph_app.adapters.openai_compatible:apply"

{phern-0.1.0 → phern-0.2.0}/src/ph_app/adapters/_http.py

@@ -40,7 +40,7 @@ def resolve_secret(ctx: Context, env_name: str, provider: str) -> str:
     """Turn a credential *name* into its value — here, at the edge, and nowhere above (I-3).
 
     The value goes into a local that goes out of scope with the request. Nothing
-    that travelled to get here held it.
+    that traveled to get here held it.
     """
     credentials = ctx.get(CREDENTIALS)
     if credentials is None:

{phern-0.1.0 → phern-0.2.0}/src/ph_app/adapters/_media.py

@@ -125,7 +125,7 @@ async def load_handles(
                 )
             except Exception:
                 # Deliberately broad and deliberately not fatal: an upload is an
-                # optimisation, and a route that can take the bytes inline must
+                # optimization, and a route that can take the bytes inline must
                 # not lose a turn because a file API was down.
                 log.warning(
                     "ph_app.adapters: could not upload %s to %s; sending it inline",

{phern-0.1.0 → phern-0.2.0}/src/ph_app/adapters/anthropic.py

@@ -379,7 +379,7 @@ class AnthropicAdapter:
                     yield chunk
         except LlmError as error:
             # A handle this request referenced is gone — expired early, deleted
-            # from another session, or never honoured. **Forget it first, then
+            # from another session, or never honored. **Forget it first, then
             # let it retry**: `FILE_EXPIRED` is in `TRANSIENT_CODES` precisely
             # because the state that caused it is already cleared by the time the
             # retry runs, so the next attempt re-uploads rather than repeating a
@@ -578,7 +578,7 @@ def _to_anthropic(
 
     `media` holds base64 for the attachments this route will take; anything absent
     from it becomes a pointer. **Nothing is dropped** — a block kind this function
-    does not recognise still reaches the wire, rather than a message that was only an
+    does not recognize still reaches the wire, rather than a message that was only an
     image arriving as an empty text block.
     """
     blocks: list[dict[str, Any]] = []

{phern-0.1.0 → phern-0.2.0}/src/ph_app/adapters/google.py

@@ -101,7 +101,7 @@ ACCEPTED_MEDIA: tuple[str, ...] = (
 """The default for `Config.accepts` — what this provider's own models take.
 
 The widest of the three, and video is the entry that matters: it is the format
-that made upload-and-reference a row rather than an optimisation, and until this
+that made upload-and-reference a row rather than an optimization, and until this
 adapter existed no route pH shipped could declare it honestly."""
 
 UPLOADED_MEDIA: tuple[str, ...] = (
@@ -257,7 +257,7 @@ class GoogleAdapter:
     Self-limiting rather than capped: an entry is written only when the readiness
     budget runs out, and removed the moment the file is usable or turns out to be
     gone — so it holds what this process is still waiting on and nothing else. A
-    restart loses it and pays the transfer again, which is exactly the behaviour
+    restart loses it and pays the transfer again, which is exactly the behavior
     this replaced."""
 
     def _headers(self) -> dict[str, str]:
@@ -291,7 +291,7 @@ class GoogleAdapter:
         again. Now the name is remembered and the next attempt polls it.
 
         Failure of any kind here is caught by `load_handles` and the attachment
-        goes inline — so the worst outcome of a slow provider is the behaviour
+        goes inline — so the worst outcome of a slow provider is the behavior
         every route had before the row.
         """
         spent = self._spent.get(ref.attachment_id, 0)

{phern-0.1.0 → phern-0.2.0}/src/ph_app/adapters/openai_compatible.py

@@ -139,7 +139,7 @@ class WindowProbe(WireModel):
     Measured against a llama.cpp serving Qwen3.8-27B, started `-c 524288
     --parallel 2`: `/props` and both `/slots` entries report 262 144 — the total
     divided, as llama.cpp documents — while `/v1/models` reports `meta.n_ctx`
-    262 144 beside `meta.n_ctx_train` 262 144, its neighbours there being
+    262 144 beside `meta.n_ctx_train` 262 144, its neighbors there being
     `n_vocab`, `n_embd`, `n_params` and `ftype`.
 
     **That server is what settles it.** Its total was 524 288, and the number at
@@ -392,7 +392,7 @@ class OpenAiCompatibleAdapter:
                     yield chunk
         except LlmError as error:
             # A handle this request referenced is gone — expired early, deleted
-            # from another session, or never honoured. Forget it first, then let
+            # from another session, or never honored. Forget it first, then let
             # it retry: `FILE_EXPIRED` is in `TRANSIENT_CODES` precisely because
             # the state that caused it is already cleared by the time the retry
             # runs, so the next attempt re-uploads rather than repeating a request

{phern-0.1.0 → phern-0.2.0}/src/ph_app/agents.py

@@ -43,6 +43,7 @@ from ph.paths import RuntimeDirError, resolve_roots
 from ph.resources import GRACE_SECONDS
 from ph.seams.schedule import ScheduleKind
 from ph.selectors import Selector, matches_any
+from ph.text import duration
 
 from . import verbs
 from .console import TypeOption, console, detail, fail, section, selectors_or_exit
@@ -166,30 +167,12 @@ def _cadence(seconds: float) -> str:
 
     **All five read `0` as off**, each behind its own `if x > 0` in `serve`, and
     for a day only the newest one said so on screen while the other four printed
-    `0s`. `_duration` cannot absorb the rule: zero milliseconds is a real and
+    `0s`. `duration` cannot absorb the rule: zero milliseconds is a real and
     different answer elsewhere (an uptime, a turn that took no measurable time),
     where "off" would be a lie. So the convention lives here, once, next to the
     only four-plus-one readers that share it.
     """
-    return _duration(seconds * 1000) if seconds > 0 else "off"
-
-
-def _duration(milliseconds: object) -> str:
-    """`3d 4h`, `1h 30m`, `12m`, `8s` — the two largest units that are not zero.
-
-    Zeros are dropped rather than kept for shape: a sweep every sixty seconds
-    reads as `1m`, not `1m 0s`, and an hour and a half of quiet is `1h 30m`
-    whether or not the seconds happen to be round.
-    """
-    if not isinstance(milliseconds, int | float):
-        return "—"
-    seconds = int(milliseconds // 1000)
-    parts: list[str] = []
-    for name, size in (("d", 86400), ("h", 3600), ("m", 60), ("s", 1)):
-        count, seconds = divmod(seconds, size)
-        if count:
-            parts.append(f"{count}{name}")
-    return " ".join(parts[:2]) or "0s"
+    return duration(seconds * 1000) if seconds > 0 else "off"
 
 
 def _summary(kind: str, event: JsonObject) -> str:
@@ -466,7 +449,7 @@ def attach(
     Idle is how a root that answered and a root whose last answer failed both
     look, so a script chaining on this had no way to tell them apart and read the
     second as success (P5-04). Only `error` — the kind the loop records when a
-    turn could not be completed. A turn a person cancelled, or one a limit ended,
+    turn could not be completed. A turn a person canceled, or one a limit ended,
     exits 0 and says so on its own line: those are outcomes somebody already
     knows about, and turning them into a failed command would make the ordinary
     way of stopping an agent look like a fault.
@@ -566,9 +549,9 @@ def schedule(
                 CancelScheduleParams(session_id=session, schedule_id=cancel),
             )
         )
-        if not outcome.cancelled:
+        if not outcome.canceled:
             fail(f"[red]no schedule {cancel!r} on {session}[/red]")
-        console.print(f"[dim]cancelled {cancel}[/dim]")
+        console.print(f"[dim]canceled {cancel}[/dim]")
         return
 
     if len(timings) > 1:
@@ -666,12 +649,12 @@ def doctor() -> None:
             (
                 ("socket", facts.socket),
                 ("pid", str(facts.pid)),
-                ("uptime", _duration(facts.uptime_ms)),
+                ("uptime", duration(facts.uptime_ms)),
                 ("protocol", str(facts.protocol_version)),
                 ("capabilities", ", ".join(sorted(facts.capabilities))),
                 ("roots", str(facts.roots)),
                 ("provider", f"{facts.provider} · {facts.model}"),
-                ("passivate after", "off" if passivate is None else _duration(passivate * 1000)),
+                ("passivate after", "off" if passivate is None else duration(passivate * 1000)),
                 ("tick", _cadence(facts.tick_every)),
                 ("sweep", _cadence(facts.sweep_every)),
                 ("heartbeat", _cadence(facts.heartbeat_every)),

{phern-0.1.0 → phern-0.2.0}/src/ph_app/cli.py

@@ -25,7 +25,7 @@ from __future__ import annotations
 import json
 import shlex
 import sys
-from collections.abc import Awaitable, Callable, Sequence
+from collections.abc import Awaitable, Callable, Mapping, Sequence
 from functools import partial
 from pathlib import Path
 from typing import Annotated, Any, Literal, TypeAlias
@@ -146,6 +146,20 @@ def default(
     resume: Annotated[
         str | None, typer.Option("--resume", help="Session id to reopen (tui and web).")
     ] = None,
+    keep_alive: Annotated[
+        str | None,
+        typer.Option(
+            "--keep-alive",
+            help='Keep a daemon this UI starts up for this long after it detaches ("5m").',
+        ),
+    ] = None,
+    new: Annotated[
+        bool,
+        typer.Option(
+            "--new",
+            help="Start a fresh session without offering this directory's previous ones (tui).",
+        ),
+    ] = False,
     no_spawn: Annotated[
         bool,
         typer.Option(
@@ -224,9 +238,14 @@ def default(
                     model=model,
                     patch=patch,
                     keep=keep_daemon,
+                    keep_alive=_spawned_keep_alive(keep_alive, keep=keep_daemon),
                 ),
                 session_id=wanted,
                 spawn=not no_spawn,
+                # `--session`/`--resume` already name one, so they skip the offer
+                # by having an answer; `--new` is for the person who never wants
+                # to be asked.
+                offer_sessions=not new,
             )
         )
         return
@@ -449,24 +468,124 @@ always passes its own value.
 """
 
 
+def _spawned_keep_alive(value: str | None, *, keep: bool) -> str:
+    """The `--keep-alive` a spawned daemon is given, in seconds, refused here on a typo.
+
+    **Parsed at this end, not forwarded as typed.** `phern --keep-alive` does not run
+    a daemon, it composes the argv for one — so a string handed straight through
+    would be refused by a process whose output goes to the null device, and the
+    person would see a UI that could not reach a daemon and no reason why. Same
+    parser, same message, whichever end they typed it at; what crosses is a bare
+    number of seconds, which `keep_alive_seconds` reads back unambiguously.
+
+    CLI first, then `tui.json`, then zero: a person who sets it once should not
+    have to type it, and a person who typed it means this run. The file is read
+    only when they did not, which is also why it is not hoisted — settings are
+    deliberately re-read for each `PHTuiApp`, so that a `/theme` written during
+    a session is picked up when the picker reopens one.
+
+    **`--keep-daemon` and a typed `--keep-alive` are refused together**, because
+    they ask for opposite things: one says the daemon stays, the other says how
+    long it waits before going. A warning would have been the wrong answer to a
+    person who has said two things and meant one of them. A *configured*
+    keep-alive is not a contradiction — nobody typed it for this run — so
+    `--keep-daemon` simply overrides it, and a service daemon has no window.
+
+    `ph_app.tui.config` is imported inside the function for `run_tui`'s reason:
+    it is a front-end module and `phern -p` should not load one to print an
+    answer.
+    """
+    if keep:
+        if value is not None and keep_alive_seconds(value) > 0:
+            raise typer.BadParameter(
+                "--keep-alive and --keep-daemon ask for opposite things: one says when "
+                "the daemon leaves, the other says it stays"
+            )
+        return "0"
+    if value is None:
+        from .tui.config import load_tui_settings
+
+        value = load_tui_settings(resolve_roots().home).daemon_keep_alive
+    return f"{keep_alive_seconds(value):g}"
+
+
+UNITS: Mapping[str, float] = {"s": 1.0, "m": 60.0, "h": 3600.0}
+"""The suffixes a duration option accepts, as seconds each."""
+
+
+def _duration_seconds(value: str, *, unit: float) -> float:
+    """A duration a person typed, as seconds. Negative for "not one".
+
+    One parser for `--keep-alive` and `--passivate-after`, which are the same
+    question asked twice and were two parsers with two refusal shapes. `unit` is
+    what a *bare* number means — seconds for a keep-alive, minutes for a passivation
+    window, which is what each flag's own history established — and a suffix
+    overrides it, so `--passivate-after 30s` now means what it reads like
+    instead of half an hour.
+
+    Negative rather than raising, because the two callers refuse differently:
+    one of them has an `"off"` spelling to check first, and a parser that raised
+    would have to know about it.
+    """
+    text = value.strip().lower()
+    if not text:
+        return -1.0
+    scale = UNITS.get(text[-1])
+    number = text[:-1] if scale is not None else text
+    try:
+        seconds = float(number) * (scale if scale is not None else unit)
+    except ValueError:
+        return -1.0
+    return seconds if seconds >= 0 else -1.0
+
+
+def keep_alive_seconds(value: str) -> float:
+    """`"30s"`, `"5m"`, `"1h"` or a bare number of seconds, as seconds.
+
+    Refused rather than defaulted on a typo, for `_passivation`'s reason: a
+    mistyped duration here is a daemon that leaves immediately or never, and
+    either is a surprise a person attributes to something else a week later.
+
+    **Public, because both ends of the flag have to agree.** `phern daemon
+    --keep-alive` parses it here, and `phern --keep-alive` — which does not run the
+    daemon, it *spawns* one — parses it here too rather than forwarding the
+    string into an argv where a typo would surface as a daemon that refused to
+    start and a UI that said nothing. Same refusal, same message, at whichever
+    end the person typed it.
+
+    **A duration and nothing else.** Whether the daemon is ephemeral is the
+    caller's question, not this one's: `phern daemon` and `phern` express that
+    in opposite directions — one opts into leaving, the other opts into staying
+    — so a parser that also decided it would have to know which command it was
+    serving.
+    """
+    if not value.strip() or value.strip() == "0":
+        return 0.0
+    seconds = _duration_seconds(value, unit=1.0)
+    if seconds < 0:
+        # `typer.BadParameter` like `_passivation` and `_children_cap` beside it,
+        # rather than a hand-built refusal: typer already writes the usage line
+        # and the exit code, and three value parsers on one command refusing in
+        # two different shapes is how one of them comes to say something else.
+        raise typer.BadParameter(f'wants a duration like "30s", "5m" or "90", not "{value}"')
+    return seconds
+
+
 def _passivation(value: str) -> float | None:
-    """`"off"` or a number of minutes, as seconds (P5-05).
+    """`"off"`, a number of minutes, or a suffixed duration, as seconds (P5-05).
 
-    Refused rather than defaulted when it is neither: a typo in a duration is a
-    deployment that silently keeps every root it ever started, and the daemon is
-    the one process where that goes unnoticed for a week.
+    Refused rather than defaulted when it is none of those: a typo in a duration
+    is a deployment that silently keeps every root it ever started, and the
+    daemon is the one process where that goes unnoticed for a week.
     """
     if value.strip().lower() == "off":
         return None
-    try:
-        minutes = float(value)
-    except ValueError:
-        minutes = 0.0
-    if minutes <= 0:
+    seconds = _duration_seconds(value, unit=60.0)
+    if seconds <= 0:
         # One message for one mistake: "not a number" and "not a positive
         # number" are the same correction to the same flag.
         raise typer.BadParameter(f'wants positive minutes or "off", not "{value}"')
-    return minutes * 60.0
+    return seconds
 
 
 def _children_cap(value: int | None) -> list[str]:
@@ -517,6 +636,13 @@ def daemon(
             "--passivate-after", help='Minutes of quiet before a root is released, or "off".'
         ),
     ] = _DEFAULT_PASSIVATION,
+    keep_alive: Annotated[
+        str,
+        typer.Option(
+            "--keep-alive",
+            help='Stay up this long after the last client leaves ("5m"); implies --ephemeral.',
+        ),
+    ] = "0",
     ephemeral: Annotated[
         bool,
         typer.Option("--ephemeral", help="Exit once no client, root or appointment needs this."),
@@ -537,6 +663,9 @@ def daemon(
     """
     from .daemon.server import DaemonUnavailable, serve
 
+    # Parsed before anything is composed or bound, so a mistyped duration is a
+    # usage error rather than a daemon that got as far as printing a socket path.
+    window = keep_alive_seconds(keep_alive)
     composed = profile_or_exit(profile, _children_cap(max_concurrent_children))
     try:
         roots = resolve_roots(create=True)
@@ -566,7 +695,14 @@ def daemon(
                 passivate_after=_passivation(passivate_after),
                 # Off here, on in `spawn_command`: `DaemonServer.ephemeral` says
                 # why the lifetime is decided by who started it (P7-08).
-                ephemeral=ephemeral,
+                #
+                # **A keep-alive implies it.** "Stay up five minutes after the
+                # last client leaves" is a statement about *leaving*, so a person
+                # who typed one has said which lifetime they want; the two flags
+                # were one concept split across two spellings, and the split is
+                # what made `--keep-alive` alone mean nothing and need a warning.
+                ephemeral=ephemeral or window > 0,
+                keep_alive=window,
                 path=socket_path,
             )
         )
@@ -654,7 +790,13 @@ def tab_command(
 
 
 def spawn_command(
-    *, profile: str, provider: str, model: str, patch: Sequence[str] = (), keep: bool = False
+    *,
+    profile: str,
+    provider: str,
+    model: str,
+    patch: Sequence[str] = (),
+    keep: bool = False,
+    keep_alive: str = "0",
 ) -> list[str]:
     """The argv for a daemon a UI starts on its own behalf (P7-08).
 
@@ -669,8 +811,19 @@ def spawn_command(
     a decision rather than a property of the process that happened to spawn it.
     """
     ephemeral = () if keep else ("--ephemeral",)
+    # **The only route a client's preference has to the daemon.** A daemon may not
+    # read a front end's `tui.json` — after P5-14 it may not share a filesystem
+    # with it — so the terminal spells its own keep-alive into the command line it
+    # composes. Omitted when zero, which is the default on both sides.
+    window = ("--keep-alive", keep_alive) if keep_alive not in ("", "0") else ()
     return reinvoke(
-        "daemon", *ephemeral, profile=profile, provider=provider, model=model, patch=patch
+        "daemon",
+        *ephemeral,
+        *window,
+        profile=profile,
+        provider=provider,
+        model=model,
+        patch=patch,
     )
 
 

{phern-0.1.0 → phern-0.2.0}/src/ph_app/console.py

@@ -10,7 +10,7 @@ and P5-11's socket lifetime. Every one of them is a title and a list of pairs,
 and they were already drifting apart in style.
 
 **Data does not go through a console.** `--dump-config` writes YAML and `ph
-events --json` writes JSON, both meant to be piped; Rich colourizes a plain
+events --json` writes JSON, both meant to be piped; Rich colorizes a plain
 string it is asked to print, so with `FORCE_COLOR` set in the environment — as
 CI images and many shells do — those two commands emitted ANSI escapes into
 their own machine-readable output and `yaml.safe_load` refused it with
@@ -50,9 +50,9 @@ err = Console(stderr=True, highlight=False, soft_wrap=True)
 declared here rather than per module: a console setting applied to half the CLI
 is how the two halves come to disagree about what a line looks like.
 
-`highlight=False`: Rich's automatic highlighter re-colours whatever in a plain
+`highlight=False`: Rich's automatic highlighter re-colors whatever in a plain
 string *looks* like a number, a path or a UUID, which in a CLI's prose is an
-arbitrary word coloured for looking like data — `scheduled sch-1 · interval
+arbitrary word colored for looking like data — `scheduled sch-1 · interval
 3600000` came out with the interval in cyan and nothing else. Explicit markup
 still works; only the guessing is off. It is also a third of the cost of
 printing a line, and `phern agents attach` prints one per log event.
@@ -96,7 +96,7 @@ def section(title: str, rows: Iterable[tuple[str, str]]) -> Table:
 def emit(text: str) -> None:
     """Write machine-readable output, unstyled and unwrapped.
 
-    `print` rather than `console.print`: a console decides colour from the
+    `print` rather than `console.print`: a console decides color from the
     environment and width from the terminal, and both are wrong for a document
     another program parses. The one thing this must never do is be clever.
     """

{phern-0.1.0 → phern-0.2.0}/src/ph_app/daemon/cancelsafe.py

@@ -1,4 +1,4 @@
-"""Make a **cancelled** socket readiness wait safe, on every platform (issue 58).
+"""Make a **canceled** socket readiness wait safe, on every platform (issue 58).
 
 anyio has two shapes for waiting on a socket. The hardened one, which
 `AsyncIOBackend.wait_readable` uses and `ph_rlm.kernel.manager` reaches through
@@ -20,7 +20,7 @@ registers the bound `future.set_result` itself and has no such guard:
     await f
 
 Cancel that wait after the loop has already queued the ready handle and
-`set_result` runs on a cancelled future, raising `InvalidStateError` from a bare
+`set_result` runs on a canceled future, raising `InvalidStateError` from a bare
 loop handle with **no frames of ours on the stack** — which is why the captured
 traceback was one line of `asyncio/events.py` and nothing else. The removal
 cannot close the window: done-callbacks are `call_soon`'d, so they run an
@@ -33,7 +33,7 @@ deregister the fd: the done-callback above already does, exactly once, and the
 hardened shape guards its own removal behind a bookkeeping dict for the same
 reason. A guard that removed the fd itself would make anyio's removal a miss —
 `selectors` raises `KeyError` twice, nested, with a `repr(socket)` that costs
-two more syscalls, on every wait rather than only cancelled ones.
+two more syscalls, on every wait rather than only canceled ones.
 
 **This is not a bug in pH.** No package here uses `call_soon`, `call_later`,
 `add_reader` or `add_writer`, and pH's one `future.set_result`
@@ -57,7 +57,7 @@ rather than covered: its default `ProactorEventLoop` has no `add_reader`, and
 `AF_UNIX` is not the daemon's transport there.
 
 **Interim, with a shelf life.** `test_cancelsafe` fails when anyio stops
-registering the shape this recognises, which is how we would learn the fix had
+registering the shape this recognizes, which is how we would learn the fix had
 landed upstream and this module could go.
 
 @module ph_app.daemon.cancelsafe
@@ -84,8 +84,8 @@ def resolves_a_future(callback: object) -> bool:
     Deliberately a *shape* test and not an identity one. `set_result` on the C
     accelerator is a `builtin_method` with no `__func__`, and a `Future`
     subclass may override it — both of which an identity comparison stops
-    recognising. Anything unrecognised is passed through, so the failure is
-    always to today's behaviour rather than to a changed one.
+    recognizing. Anything unrecognized is passed through, so the failure is
+    always to today's behavior rather than to a changed one.
     """
     return isinstance(getattr(callback, "__self__", None), asyncio.Future) and (
         getattr(callback, "__name__", "") == "set_result"
@@ -119,19 +119,19 @@ def _guarding(original: Callable[..., Any]) -> Callable[..., Any]:
             # a `try` and +53 ns as `if not future.done()` — because the
             # exception is only paid on the firing that races, while the check
             # is paid on every readiness event. The check wins only if about
-            # one wait in three is cancelled inside the window; the observed
+            # one wait in three is canceled inside the window; the observed
             # rate is nearer two per thirty full-suite runs. anyio's own
             # hardened `wait_readable` catches for the same reason.
             #
-            # A pre-check would also have to ask `done()`, not `cancelled()`:
+            # A pre-check would also have to ask `done()`, not `canceled()`:
             # `set_result` refuses two states, and the second — an *already
             # resolved* future, fired on again before anyio's done-callback
-            # deregisters the fd — reports `cancelled() is False`. It is the
+            # deregisters the fd — reports `canceled() is False`. It is the
             # rarer of the two here (measured: 1 firing under anyio's shape)
             # but the unbounded one if a deregistration is ever missed.
             #
             # `try`/`except` and not `contextlib.suppress`, same reasoning one
-            # level down: 5.7 ns against 229 ns for identical behaviour, on the
+            # level down: 5.7 ns against 229 ns for identical behavior, on the
             # hottest path the daemon has.
             try:  # noqa: SIM105
                 callback(*args)

{phern-0.1.0 → phern-0.2.0}/src/ph_app/daemon/client.py

@@ -147,7 +147,7 @@ class DaemonClient:
 
         `RootDescription` and not `RootDescription | MutationRepeated`, which is
         what this said: `MutationRepeated` subclasses `RootDescription`, so that
-        union normalises to the left side and asked every caller to narrow
+        union normalizes to the left side and asked every caller to narrow
         something the checker had already flattened. The repeat still arrives
         here — it is simply already the type it claims to be, which is the
         property `MutationRepeated`'s own docstring is about.
@@ -253,7 +253,7 @@ async def connected[T](path: Path, work: Exchange[T]) -> T:
     replies and notifications arrive on the same stream: a caller that read its
     own reply directly would consume a `session.event` it had no way to hand
     back. Closing the stream is what ends the pump, so there is no cancel here —
-    a teardown that cancelled would race the last frame it asked for.
+    a teardown that canceled would race the last frame it asked for.
 
     Here rather than in `phern agents`, because a one-shot exchange is not a CLI
     shape: `ph_app.web.serve` stages a browser's upload this way too, and the