Everything below the CLI was merged and green against fakes; none of it was
reachable and none of it had ever met a compositor. This wires it up and then
puts the compositor in a position to disagree.
CLI (src/hhstream/cli.py, src/hhstream_session/**)
session container [ID], session reconcile [ID], and the seven pointer verbs
from PLAN §9. `start` still prints the bare session id and nothing else.
`list` gains WS / OUTPUT / POINTER, with the gap marker where a value is
genuinely unknown rather than a blank that reads as zero -- the POINTER
column needs a second, read-only `pointer.state` call because the `list`
reply carries no lease state.
The lease id is cached in `hhstream_session.lease` (under
$XDG_RUNTIME_DIR), because PLAN §9's gesture verbs take no --lease and the
wire requires a lease_id on every one of them; --lease and $HHSTREAM_LEASE
override it, and a `no_lease` refusal drops the stale entry.
Exit codes are the contract's: a gesture with no lease is 9 and never
reaches the broker, and a compositor failure is 10 with a message that says
the session is still running. `kill` now warns about
`session.container_survivors` -- windows the compositor still shows -- and
distinguishes `null` ("could not ask") from `[]`.
`shot`/`record --output NAME` capture one container through `grim -o`; the
frame socket publishes the main output only, so it cannot do it.
Module (nix/module.nix)
sessions.containers.{enable,max,mode,workspaceBase},
sessions.pointer.{enable,leaseTtl,leaseMax}, rendered into the generated
TOML with §10's key names. hhstream-pointer.service: the operator's account,
supplementary group hhstream, After=/BindsTo= the compositor,
Restart=on-failure, KillMode=process, and the command line §3.4 freezes.
tmpfiles for /run/hhstream plus RuntimeDirectoryPreserve on the broker,
without which restarting the broker deletes the driver's socket out from
under it. The runtime-directory length assertion is untouched.
And ExecStartPost on the compositor, opening its IPC directory to its own
group: Hyprland creates <runtime>/hypr with S_IRWXU, so the broker -- a
different account by design -- could not reach the request or event socket
at all, and degraded silently exactly as it is built to.
Checks (checks/**)
vm-ipc: both sockets at their frozen names, measured against sun_path's 108
bytes, and a socket2 subscriber that receives an openwindow for a window the
test creates. The subscriber is the shipped HyprlandIPC, not a second
implementation: this check exists to prove that this client hears this
compositor.
vm-containers: one hh-* output per session at the container mode, the window
on it, a second window of the same application beside it, an unmatched
window quarantined, grim -o isolating one container, teardown removing the
output and freeing the slot. PLAN experiment 3 is answered: `hyprctl output
create headless` works.
vm-pointer: a version-2 virtual pointer, a warp and a click whose
coordinates the *application* reports, BUSY naming the holder, an expired
lease swept with its held button lifted, and a broker restart that leaves
the lock free, the bookmark intact and the driver reachable.
checks/lib gains the guest the three share, their test-script helpers (no
assertions live there), an event-socket subscriber and a Wayland client that
says where it was clicked -- nothing in nixpkgs both honours
$HHSTREAM_APP_ID and reports pointer events.
Reported, not worked around: the broker reads none of the container or
pointer config (policy.py takes [defaults] and [apps] only), `start` has no
no_container field so --no-container is refused rather than silently ignored,
and nix/hyprland-conf.nix sets input:follow_mouse = 0, which sends pointer
events to the focused window only -- measured, with the cursor at the aimed
pixel and no client told. README.dev.md has the evidence for each.
Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01WQy29x9AfHWyzNd1f7XPGK
57 lines
2.1 KiB
Nix
57 lines
2.1 KiB
Nix
# The flake's `checks` output. One file per check; this is only the wiring.
|
|
#
|
|
# unit -- pytest over tests/, against the nix/package.nix build
|
|
# vm-basic -- nixosTest with a fake capture backend: module + wire contract
|
|
# vm-hyprland -- nixosTest with the real compositor and grim
|
|
# vm-sessions -- nixosTest with the real compositor and the session broker
|
|
# vm-ipc -- the compositor's IPC sockets, and an event that arrives
|
|
# vm-containers -- one output and one workspace per session
|
|
# vm-pointer -- the lease, the driver, and a click the application saw
|
|
#
|
|
# What the guests need lives in checks/lib: `test-tools.nix` for the fake
|
|
# capture and the contract asserter, `session-tools.nix` for the event
|
|
# subscriber and the pointer target, `session-machine.nix` for the guest the
|
|
# three session checks share, and `session-prelude.nix` for their test-script
|
|
# helpers.
|
|
#
|
|
# Run them ONE AT A TIME. Each boots a VM with a software-rendered compositor;
|
|
# two at once on a two-core machine make the timing-sensitive assertions flake,
|
|
# and a flaky green is worth less than a slow one.
|
|
{
|
|
pkgs,
|
|
self,
|
|
system,
|
|
}:
|
|
let
|
|
hhstream = self.packages.${system}.hhstream;
|
|
hhsModule = self.nixosModules.default;
|
|
testTools = pkgs.callPackage ./lib/test-tools.nix { };
|
|
# The three session checks take the same five arguments; naming them once
|
|
# keeps a new check from being wired up with a different compositor or a
|
|
# different package than its neighbours.
|
|
sessionArgs = {
|
|
inherit hhstream hhsModule testTools;
|
|
};
|
|
in
|
|
{
|
|
unit = pkgs.callPackage ./unit.nix { inherit hhstream; };
|
|
|
|
vm-basic = pkgs.callPackage ./vm-basic.nix {
|
|
inherit hhstream hhsModule testTools;
|
|
};
|
|
|
|
vm-hyprland = pkgs.callPackage ./vm-hyprland.nix {
|
|
inherit hhstream hhsModule testTools;
|
|
};
|
|
|
|
vm-sessions = pkgs.callPackage ./vm-sessions.nix {
|
|
inherit hhstream hhsModule testTools;
|
|
};
|
|
|
|
vm-ipc = pkgs.callPackage ./vm-ipc.nix sessionArgs;
|
|
|
|
vm-containers = pkgs.callPackage ./vm-containers.nix sessionArgs;
|
|
|
|
vm-pointer = pkgs.callPackage ./vm-pointer.nix sessionArgs;
|
|
}
|