@vibelord/lanes 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vibelord/lanes",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Installer for Lanes: shared agent terminals over SSH with Zellij views, registry sync, uploads and a phone interface.",
   "license": "MIT",
   "type": "module",

package/payload/lanes/VERSION

@@ -1 +1 @@
-1.6.0
+1.6.1

package/payload/lanes/client/ghostty/lanes-themed-window

@@ -46,9 +46,19 @@ def main():
                 inherited.append(line)
     base.write_text("\n".join(inherited) + "\n")
 
-    lines = [line for line in target.read_text().splitlines() if key_of(line) != "config-file"]
-    lines.extend((f"config-file = {base}",))
     appearance = lanes / "appearance.ghostty"
+    generated = {base.resolve(), appearance.resolve()}
+
+    def own(line):
+        """An include of Lanes' own (the palette chain under ~/.config/lanes) stays; the everyday Ghostty ones are
+        replaced by the filtered base below; an earlier run's base/appearance lines are re-added, not kept."""
+        value = line.split("=", 1)[1].strip().removeprefix("?").strip().strip('"')
+        path = Path(value).expanduser()
+        path = (path if path.is_absolute() else lanes / path).resolve()
+        return path not in generated and path.is_relative_to(lanes.resolve())
+
+    lines = [line for line in target.read_text().splitlines() if key_of(line) != "config-file" or own(line)]
+    lines.extend((f"config-file = {base}",))
     if appearance.is_file():
         lines.append(f"config-file = {appearance}")
     rendered = "\n".join(lines) + "\n"

package/payload/lanes/client/lanes-launch

@@ -384,6 +384,7 @@ dog_ready=
 reader=
 holding=
 now=
+hold_enter=
 limit=
 tree=           # set: a timeout or a signal ends the child's whole process tree (kill_tree), not only the child
 helper_pid=
@@ -528,17 +529,33 @@ kill_tree() {
 }
 # hold <seconds> [jitter]: wait, but Enter continues at once. No raw mode, so there is no terminal state to restore
 # when the window closes mid-wait: a line reader signals this shell instead. End of input (no terminal) is no Enter.
+# The wait is a poll in tenth-second steps, not one `run sleep`: an Enter that landed before a sleep's pid was on
+# record went unserved for the whole wait (DEF-2176), and dash keeps a trap that lands during its blocking `wait`
+# pending until that wait ends — after a foreground step every shell runs it. The reader also leaves a marker, read
+# by the poll, so even a trap not yet run ends the wait. No child is ended by another process: no job notice leaks.
 trap 'if [ -n "$holding" ]; then now=1; [ -z "$child" ] || { kill -TERM "$child"; wait "$child"; } 2>/dev/null; fi' USR1
+hold_poll() {   # hold_poll SECONDS: whole seconds in tenth-second steps; Enter (now, or the reader's marker) ends it
+    steps=$(( ${1%%.*} * 10 )) 2>/dev/null || steps=0
+    while [ "$steps" -gt 0 ]; do
+        if [ -n "$now" ] || [ -e "$hold_enter" ]; then return 0; fi
+        sleep .1
+        steps=$((steps - 1))
+    done
+}
 hold() {
     now=; holding=1
+    hold_enter=${TMPDIR:-/tmp}/lanes-hold-$$.enter
+    rm -f "$hold_enter" 2>/dev/null || :
     exec 9<&0
-    ( IFS= read -r line <&9 && kill -USR1 "$$" ) 2>/dev/null &
+    ( IFS= read -r line <&9 && { : >"$hold_enter" 2>/dev/null || :; kill -USR1 "$$"; } ) 2>/dev/null &
     reader=$!
     exec 9<&-
-    run sleep "$1" || :
-    # Jitter is a second sleep: should its number ever be malformed, the whole wait is still served — no tight loop.
-    if [ -z "$now" ] && [ -n "${2:-}" ]; then run sleep "$2" || :; fi
+    hold_poll "$1"
+    # Jitter is a second wait: should its number ever be malformed, the whole wait is still served — no tight loop.
+    if [ -z "$now" ] && [ ! -e "$hold_enter" ] && [ -n "${2:-}" ]; then hold_poll "$2"; fi
     holding=
+    rm -f "$hold_enter" 2>/dev/null || :
+    hold_enter=
     kill -TERM "$reader" 2>/dev/null || :
     wait "$reader" 2>/dev/null || :
     reader=

package/payload/lanes/client/lanes-window

@@ -40,6 +40,14 @@ elif [ -n "$look" ]; then
     device=$(head -n 1 "$config/device")
     file=$config/ghostty.look.conf
 fi
+# Linux Ghostty: Omarchy's everyday theme sets colours explicitly, which would override the theme pair. The themed
+# launcher rewrites ghostty.conf with those filtered out of the inherited settings; every way in (key binding, desktop
+# entry, this command) prepares it here, before a variant is derived from it (DEF-2175). Without it, the plain config.
+if [ "$(uname -s)" != Darwin ] && command -v ghostty >/dev/null 2>&1 && command -v python3 >/dev/null 2>&1 \
+   && [ -x "$HOME/.local/bin/lanes-themed-window" ]; then
+    "$HOME/.local/bin/lanes-themed-window" --prepare-only >/dev/null \
+        || echo 'lanes-window: the themed Ghostty config did not validate; opening with the plain one' >&2
+fi
 if [ -n "$device" ]; then
     device="$device$look"
     sed "s|^command = .*|command = $launch $device|" "$config/ghostty.conf" > "$file"

package/payload/lanes/docs/INSTALL.md

@@ -265,9 +265,11 @@ cd bw-tools/lanes
 
 OpenSSH is required. Install Ghostty for a dedicated window, or run `lanes-launch` in your existing terminal.
 Linux also supports Foot, plus optional Omarchy/Hyprland shortcuts. The dedicated Ghostty window defaults to
-Catppuccin Latte in light mode and Dracula in dark mode. On Omarchy, its launcher preserves everyday fonts, padding
-and shortcuts while excluding inherited theme colors so this pair takes effect; the everyday Ghostty config is left
-untouched. Tailscale is required when your profile uses
+Catppuccin Latte in light mode and Dracula in dark mode. On Omarchy, the window's config is prepared by every way of
+opening it — the Super+Shift+L binding, the launcher entry, `lanes-window` — and by the installer itself: everyday
+fonts, padding and shortcuts are inherited, inherited theme colors are excluded so this pair takes effect, and Lanes'
+own includes (an opted-in `--palette`) stay; the everyday Ghostty config is left untouched. A window that is already
+open keeps the config it started with: close it and open it again. Tailscale is required when your profile uses
 a tailnet address. When the profile's `LANES_SERVER_NAME` ends in `.ts.net`, the installer checks Tailscale before
 the server: without it, it prints `tailscale: not installed — macOS: brew install --cask tailscale · Linux:
 https://tailscale.com/download` and exits 4 (the client is installed); on a logged-out machine it prints

package/payload/lanes/install.sh

@@ -386,6 +386,11 @@ install_client() {
       if [ "$os" = Darwin ]; then cat "$target/ghostty/macos.conf"; else cat "$target/ghostty/omarchy.conf"; fi
     } > "$config/ghostty.conf"
     install_palette
+    # Linux Ghostty: write the colour-filtered inherited config now (lanes-window does it again on every open), so a
+    # fresh install or update never shows Omarchy's colours over the theme pair (DEF-2175).
+    if [ "$os" != Darwin ] && command -v ghostty >/dev/null 2>&1 && command -v python3 >/dev/null 2>&1; then
+        "$bin/lanes-themed-window" --prepare-only >/dev/null 2>&1 || warn 'Ghostty: the themed config did not validate; the plain config stands'
+    fi
 }
 
 # The Ghostty binary, for its version only: on PATH, else inside the macOS app bundle.

package/payload/manifest.json

@@ -1,8 +1,8 @@
 {
  "name": "@vibelord/lanes",
- "version": "1.6.0",
- "commit": "2383319bbb5d43405c98c6743f921e35ad08d3da",
- "digest": "sha256:ec6424f998618be4b43db226b3b37c2878b31c4e489a65f21446a0cea9019546",
+ "version": "1.6.1",
+ "commit": "3f05cdeda5ec54fef372c7b5f44cc6701040d4c6",
+ "digest": "sha256:abf3e3c8982ff67bf96b2cf154e840925371550e76a0173db04d66c6afa8e009",
  "executables": [
   "bin/lanes",
   "client/ghostty/lanes-themed-window",