diff options
| author | user <user@clank> | 2026-08-12 20:46:39 +0200 |
|---|---|---|
| committer | user <user@clank> | 2026-08-12 20:46:39 +0200 |
| commit | 045ed6a48a4f65abdafe8222e548b758fb6626a0 (patch) | |
| tree | 71d9c770fb02bf2383155f6eda00d78c91cbfd1f | |
| parent | sl0p: double-click a tab to rename it (diff) | |
| download | sl0ppi-045ed6a48a4f65abdafe8222e548b758fb6626a0.tar.gz sl0ppi-045ed6a48a4f65abdafe8222e548b758fb6626a0.tar.xz sl0ppi-045ed6a48a4f65abdafe8222e548b758fb6626a0.zip | |
build: ship sl0pstatus, and install every plugin the package carries
Phase 3: `make package` now produces a tarball that provably works on a machine
with no node, npm, bun or rust.
Two bugs the clean-room test found, neither visible until a session actually
started:
- the default layout builds its status bar out of zjstatus, which we were not
shipping at all (vendored as sl0pstatus/ in the preceding commits)
- install.sh installed a hardcoded plugin list, so zjstatus.wasm would not
have reached the config dir even once staged
Also: layouts/*.kdl still pointed at ~/.config/zellij, missed by the rename pass
because that pass only rewrote config.kdl.
Verified end to end, from the tarball, in a throwaway HOME with node/npm/bun/
cargo shadowed by stubs that fail loudly if invoked:
sl0ppij --version -> sl0ppij 0.45.0+sl0p1
pi --version -> 0.84.1 (on the bundled bun)
pir --help -> ok
sl0ppij -s realtest -> session starts under a pty, config "Well defined",
fork pane titles render, both wasm plugins load,
no errors beyond the first-run permission cache
Artifact: sl0ppi-0.1.0-x86_64-linux.tar.gz, 83M, + .sha256.
| -rw-r--r-- | FORKS.md | 23 | ||||
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | config/README.md | 4 | ||||
| -rw-r--r-- | config/layouts/default.kdl | 4 | ||||
| -rw-r--r-- | config/layouts/default.swap.kdl | 2 | ||||
| -rw-r--r-- | docs/architecture.md | 6 | ||||
| -rw-r--r-- | docs/roadmap.md | 43 | ||||
| -rwxr-xr-x | packaging/install.sh | 12 | ||||
| -rwxr-xr-x | packaging/stage.sh | 7 |
9 files changed, 91 insertions, 15 deletions
@@ -48,6 +48,29 @@ test "$(git rev-parse HEAD:sl0ppij)" = "$(git -C <fork> rev-parse sl0p/base^{tre The standalone fork repo stays alive purely as the rebase workbench; the monorepo is authoritative for what ships. +### sl0pstatus ← zjstatus + +| | | +|---|---| +| upstream | https://github.com/dj95/zjstatus | +| upstream version | `0.24.0` | +| upstream base commit | `74f36b4` — *chore: bump version to v0.24.0*, 2026-07-15 | +| lives at | `sl0pstatus/` | +| patches on top | 1 commit (`sl0p: double-click a tab to rename it`) | +| builds to | `zjstatus.wasm` (cargo package name is still `zjstatus`) | +| standalone repo | `ssh://git@git.sl0p.foo:39327/srv/git/sl0pstatus.git`, branch `sl0p` | + +Not optional decoration: `config/layouts/default.kdl` replaces zellij's stock +tab-bar and status-bar with this plugin, so without it the default layout starts +with a "failed to load plugin from disk" error and no status bar. + +It depends on the *released* `zellij-tile` 0.44.3 from crates.io, not on +sl0ppij's in-tree one — the plugin API is stable across that gap. Our build +reproduces the previously hand-built `zjstatus.wasm` in the live config dir +byte-for-byte. + +Same rebase procedure as sl0ppij, with `sl0pstatus/` as the prefix. + ## Pinned, not forked ### pi (the agent) @@ -11,6 +11,7 @@ PKG := sl0ppi-$(VERSION)-x86_64-linux ROOT := $(CURDIR) FORK := $(ROOT)/sl0ppij +STATUS := $(ROOT)/sl0pstatus STAGE := $(ROOT)/packaging/stage/$(PKG) OUT := $(ROOT)/packaging/out VENDOR := $(ROOT)/vendor/cache @@ -39,6 +40,7 @@ help: ## Show this help version: ## Print the sl0ppi version and what it is built from @echo "sl0ppi $(VERSION)" @echo "sl0ppij $$(grep -m1 '^version = ' $(FORK)/Cargo.toml | cut -d'"' -f2)" + @echo "sl0pstatus $$(grep -m1 '^version = ' $(STATUS)/Cargo.toml | cut -d'"' -f2)" @echo "pi (pinned) $(PI_VERSION)" @echo "bun (pinned) $(BUN_VERSION)" @@ -55,8 +57,9 @@ build: ## Release build of sl0ppij (LTO, ~3min — not for the edit loop) @echo "-> $(FORK)/target/release/$(BIN_NAME)" .PHONY: plugins -plugins: ## Build the in-tree wasm plugins (pane-finder) +plugins: ## Build the in-tree wasm plugins (pane-finder, sl0pstatus) cd $(FORK)/sl0p/zj-pane-finder && cargo build --release --target wasm32-wasip1 + cd $(STATUS) && cargo build --release --target wasm32-wasip1 .PHONY: check check: ## Cheap compile gate diff --git a/config/README.md b/config/README.md index 0db29ac..64e3b2d 100644 --- a/config/README.md +++ b/config/README.md @@ -10,6 +10,7 @@ versioned by hand-rolled `config.kdl.pre-<thing>` backups. | `layouts/default.kdl` | the default tab layout | | `layouts/default.swap.kdl` | responsive swap layouts (stacked-pane behaviour) | | `themes/gruber-darker-pop.kdl` | the default theme | +| — | the layouts require **both** shipped wasm plugins: `zjstatus.wasm` (built from `sl0pstatus/`) *is* the status bar, and `pane-finder.wasm` is bound in `config.kdl` | | `themes/templeos.kdl` | alternate 16-color VGA theme | | `answers.example.md` | seed for a project's `.pi-answers.md` (answer-picker buttons) | @@ -22,7 +23,8 @@ Do not edit the live dotfiles directly any more — they are now a build output. Repointed at sl0ppij's own dirs now that the rename has landed (docs/rename.md): -- `file:~/.config/sl0ppij/plugins/pane-finder.wasm` +- `file:~/.config/sl0ppij/plugins/pane-finder.wasm` (config.kdl) +- `file:~/.config/sl0ppij/plugins/zjstatus.wasm` (layouts/default.kdl) - builtin plugins use the `sl0ppij:` URL scheme (`zellij:` still parses) - comments no longer reference `~/.config/zellij` or the old `~/lol/zellij` checkout diff --git a/config/layouts/default.kdl b/config/layouts/default.kdl index aa86a86..81ccb53 100644 --- a/config/layouts/default.kdl +++ b/config/layouts/default.kdl @@ -1,4 +1,4 @@ -// ~/.config/zellij/layouts/default.kdl +// ~/.config/sl0ppij/layouts/default.kdl // zjstatus bar, palette-matched to themes/gruber-darker-pop.kdl. // // WHY THIS FILE EXISTS: a layout named `default` is what zellij applies to every @@ -22,7 +22,7 @@ layout { default_tab_template { children pane size=1 borderless=true { - plugin location="file:~/.config/zellij/plugins/zjstatus.wasm" { + plugin location="file:~/.config/sl0ppij/plugins/zjstatus.wasm" { // ── palette: lifted verbatim from gruber-darker-pop.kdl ────── color_bg "#181818" // 24 24 24 theme background diff --git a/config/layouts/default.swap.kdl b/config/layouts/default.swap.kdl index 4e97b79..1a5714b 100644 --- a/config/layouts/default.swap.kdl +++ b/config/layouts/default.swap.kdl @@ -1,4 +1,4 @@ -// ~/.config/zellij/layouts/default.swap.kdl +// ~/.config/sl0ppij/layouts/default.swap.kdl // Zellij's stock swap layouts, restored. // // Defining layouts/default.kdl overrides the built-in default layout, which diff --git a/docs/architecture.md b/docs/architecture.md index 822fe30..4eea4ca 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -33,6 +33,11 @@ prefixed `sl0p:`. The parts that matter for integration: `sl0ppij/sl0p/zj-pane-finder/`, deliberately its own cargo workspace so its size-optimised profile applies. +**sl0pstatus** (`sl0pstatus/`) is a fork of `zjstatus`, the status bar the +default layout uses in place of zellij's stock tab-bar + status-bar. It is a +separate wasm plugin built against the released `zellij-tile`, not part of the +sl0ppij workspace. + **pi-ext** (`pi-ext/`) is the other end of that protocol: TypeScript extensions loaded by pi. Five of them speak OSC 5577 (`answer-picker`, `last-prompt`, `sl0p-footer`, `slop-tool-boxes`, `user-prompt-frame`). @@ -46,6 +51,7 @@ shipped as one thing. | path | role | |---|---| | `sl0ppij/` | the fork. Self-contained: rebases against upstream zellij happen here. | +| `sl0pstatus/` | forked `zjstatus` status bar (wasm plugin) the default layout depends on. | | `pi-ext/` | pi extensions + `pir` CLI helper. | | `config/` | the opinionated default environment (keybinds, layouts, themes). | | `packaging/` | turn the above into a tarball someone else can install. | diff --git a/docs/roadmap.md b/docs/roadmap.md index 7a7bf1f..e5964d6 100644 --- a/docs/roadmap.md +++ b/docs/roadmap.md @@ -30,18 +30,45 @@ Left for later (both need work disproportionate to their value right now): - [ ] decide whether the opinionated defaults are also *compiled in* as fallbacks, so a bare `sl0ppij` with no config dir still looks right -## Phase 3 — prove the artifact +## Phase 3 — prove the artifact ✅ -- [ ] `make package` end to end (needs a release build; see "Disk" below) -- [ ] install the tarball into a throwaway `HOME` and smoke-test: - session starts, theme+layout apply, pane-finder plugin loads, `pi` runs on - the bundled runtime, OSC 5577 frames render, `pir` resumes -- [ ] decide `gnu` vs `musl` for the release target. The fork's toolchain - already lists `x86_64-unknown-linux-musl`; static musl is the better - "runs on any box" story and should probably become the default. +- [x] `make package` end to end → `sl0ppi-0.1.0-x86_64-linux.tar.gz` (83M, + 328M staged) + sha256 +- [x] installed into a throwaway `HOME` on a minimal PATH **with `node`, `npm`, + `bun`, `cargo` replaced by poison stubs that fail loudly**: `sl0ppij`, + `pi` (0.84.1, on the bundled bun) and `pir` all run. Nothing reached for a + system runtime. +- [x] real session started under a pty from the installed tree: config loads + ("Well defined"), layout + fork pane titles render, both wasm plugins + load. Only log line on a fresh profile is the benign "permission cache + file not found". +- [x] **found and fixed two real packaging bugs** (see below) +- [ ] decide `gnu` vs `musl` for the release target. Currently `gnu`, so the + binary inherits this box's glibc floor. The fork's toolchain already lists + `x86_64-unknown-linux-musl`; static musl is the better "runs on any box" + story and should probably become the default before anyone else installs + this. - [ ] optional: `bun build --compile` pi into a single executable instead of shipping 183M of `node_modules` — but only if runtime-loaded `.ts` extensions still work in a compiled bundle. Test before committing to it. +- [ ] optional: pre-seed the plugin permission cache so a fresh install does not + open on a "Allow? (y/n)" prompt. + +### What the smoke test caught + +Both were invisible to `make package` and to any amount of reading: + +1. **`zjstatus` was missing entirely.** The config snapshot commit dropped it as + "a third-party blob no longer referenced by config.kdl" — true of `config.kdl`, + false of `layouts/default.kdl`, which builds the whole status bar out of it. + It turned out to be a *third fork* (`sl0pstatus/`, now vendored) whose live + `.wasm` was a custom build. Sessions started with a plugin load error. +2. **`install.sh` installed a hardcoded plugin list**, so even once staged, + `zjstatus.wasm` never reached the config dir. Now it installs whatever the + package contains. + +Both failure modes only appear *after* a session starts, which is the argument +for keeping the clean-room session test in the release routine. ## Phase 4 — the `sl0ppi` CLI diff --git a/packaging/install.sh b/packaging/install.sh index 967da5c..07650a3 100755 --- a/packaging/install.sh +++ b/packaging/install.sh @@ -101,8 +101,14 @@ done for f in "$SHARE/sl0ppij/themes/"*.kdl; do install_config_file "$f" "$CONFIG_DIR/themes/$(basename "$f")" done -# plugins are build outputs, not user files: always overwrite -run install -m644 "$SHARE/sl0ppij/plugins/pane-finder.wasm" "$CONFIG_DIR/plugins/pane-finder.wasm" +# plugins are build outputs, not user files: always overwrite. Install whatever +# the package contains rather than a hardcoded list -- the shipped layout needs +# zjstatus.wasm as well as pane-finder.wasm, and a missing one only shows up as +# a runtime "failed to load plugin from disk" once a session starts. +for f in "$SHARE/sl0ppij/plugins/"*.wasm; do + [ -e "$f" ] || { warn "package contains no plugins"; break; } + run install -m644 "$f" "$CONFIG_DIR/plugins/$(basename "$f")" +done # --- pi extensions --------------------------------------------------------- run mkdir -p "$PI_EXT_DIR" @@ -128,3 +134,5 @@ if command -v zellij >/dev/null 2>&1; then fi say "start with: sl0ppij" +echo " On the very first launch the status bar plugin asks for permissions" +echo " (\"... Allow? (y/n)\") -- press y once and it is remembered." diff --git a/packaging/stage.sh b/packaging/stage.sh index 737d448..e280344 100755 --- a/packaging/stage.sh +++ b/packaging/stage.sh @@ -40,10 +40,16 @@ need "$FORK_BIN" build install -m755 "$FORK_BIN" "$STAGE/bin/$BIN_NAME" # --- wasm plugins ---------------------------------------------------------- +# Both are load-bearing for the shipped config: config.kdl binds pane-finder, +# and layouts/default.kdl replaces the stock tab-bar+status-bar with zjstatus. PANE_FINDER="$ROOT/sl0ppij/target/wasm32-wasip1/release/zj-pane-finder.wasm" need "$PANE_FINDER" plugins install -m644 "$PANE_FINDER" "$STAGE/share/sl0ppij/plugins/pane-finder.wasm" +ZJSTATUS="$ROOT/sl0pstatus/target/wasm32-wasip1/release/zjstatus.wasm" +need "$ZJSTATUS" plugins +install -m644 "$ZJSTATUS" "$STAGE/share/sl0ppij/plugins/zjstatus.wasm" + # --- opinionated config ---------------------------------------------------- install -m644 "$ROOT/config/config.kdl" "$STAGE/share/sl0ppij/config.kdl" install -m644 "$ROOT/config/layouts/"*.kdl "$STAGE/share/sl0ppij/layouts/" @@ -76,6 +82,7 @@ echo "$VERSION" > "$STAGE/VERSION" { echo "sl0ppi $VERSION" echo "sl0ppij $(grep -m1 '^version = ' "$ROOT/sl0ppij/Cargo.toml" | cut -d'"' -f2)" + echo "sl0pstatus $(grep -m1 '^version = ' "$ROOT/sl0pstatus/Cargo.toml" | cut -d'"' -f2)" echo "pi $PI_VERSION" echo "bun $BUN_VERSION" } > "$STAGE/MANIFEST" |
