From a3fa6524b744ea062ea0197bb3a0fec7ec9c6b54 Mon Sep 17 00:00:00 2001 From: "Danilo M." Date: Mon, 16 Nov 2026 13:28:21 +0100 Subject: status: nolamp mode and the agent-lamp forward nolamp keeps agent-lamp's bulb dark; notify-sound forwards opencode's event and session to agent-lamp before the quiet check. Co-Authored-By: Claude Opus 5.5 --- desktop/modules/status/README.md | 13 ++++++++++--- desktop/modules/status/StatusPage.qml | 14 ++++++++++++++ desktop/modules/status/notify-sound | 10 +++++++++- desktop/modules/status/statusctl | 2 +- desktop/modules/status/test-notify-sound.sh | 15 ++++++++++++++- desktop/modules/status/test-statusctl.sh | 6 ++++++ shared/Status.qml | 8 ++++++++ 7 files changed, 62 insertions(+), 6 deletions(-) diff --git a/desktop/modules/status/README.md b/desktop/modules/status/README.md index ea069d6..064044e 100644 --- a/desktop/modules/status/README.md +++ b/desktop/modules/status/README.md @@ -1,7 +1,7 @@ # status -Desktop modes as state: `dnd`, `presentation`, `nolock` and `quiet`, owned by -the `Status` singleton and stored as files under `$XDG_RUNTIME_DIR`. A fifth, +Desktop modes as state: `dnd`, `presentation`, `nolock`, `quiet` and `nolamp`, owned by +the `Status` singleton and stored as files under `$XDG_RUNTIME_DIR`. A sixth, `status.gaming`, is written only by the shell's game detector; it is not a mode `statusctl` exposes. @@ -11,6 +11,7 @@ mode `statusctl` exposes. $XDG_RUNTIME_DIR/status.presentation $XDG_RUNTIME_DIR/status.nolock $XDG_RUNTIME_DIR/status.quiet + $XDG_RUNTIME_DIR/status.nolamp $XDG_RUNTIME_DIR/status.gaming Each holds `0` or `1`; a missing file means off. That directory is tmpfs, so a @@ -63,7 +64,7 @@ asks `statusctl quiet get` and plays nothing on a 1. `~/bin/notify-sound` is a symlink to the repo copy, like `statusctl`. notify-sound claude Claude Code's Notification hook - notify-sound opencode-notifier's command hook + notify-sound opencode-notifier's command hook The opencode notifier runs its command for every event, `session_started` and `user_message` included, so an argument with no sound plays nothing; only @@ -71,6 +72,12 @@ The opencode notifier runs its command for every event, `session_started` and are off in `opencode-notifier.json`, and it rereads that file on every event, so neither change needs an opencode restart. +`nolamp` keeps the agent lamp (the sibling agent-lamp repo) dark. The shell +does nothing with it: agent-lamp's renderer reads the file each second and +restores the bulb while it is 1, keeping the agents' states for when it +turns off. `notify-sound` forwards the opencode notifier's two arguments +(` `) to `agent-lamp`, before the quiet check. + ## Game detection Presentation is set automatically while a game runs, so a fullscreen game does diff --git a/desktop/modules/status/StatusPage.qml b/desktop/modules/status/StatusPage.qml index 4741bcc..5a00ded 100644 --- a/desktop/modules/status/StatusPage.qml +++ b/desktop/modules/status/StatusPage.qml @@ -61,6 +61,20 @@ Column { color: Qt.alpha(Theme.text, 0.08) } + StatusRow { + width: page.width + mode: "nolamp" + label: "No lamp" + description: "Keeps the agent lamp dark, for a film. Agents still notify on screen." + value: Status.nolamp + } + + Rectangle { + width: page.width + height: 1 + color: Qt.alpha(Theme.text, 0.08) + } + LockRow { width: page.width } diff --git a/desktop/modules/status/notify-sound b/desktop/modules/status/notify-sound index c028b3e..36efaaa 100755 --- a/desktop/modules/status/notify-sound +++ b/desktop/modules/status/notify-sound @@ -15,7 +15,7 @@ # silence both. Their popups do not come through here and are unaffected. # # notify-sound claude Claude Code's Notification hook -# notify-sound the notifier's command hook +# notify-sound the opencode notifier's command hook # # An argument with no sound plays nothing. That is deliberate: the opencode # notifier runs its command for every event, session_started and @@ -24,6 +24,14 @@ set -u here="$(dirname "$(readlink -f "$0")")" + +# opencode's notifier passes its event and session id: forward them to the +# agent lamp, before the quiet check, since quiet mutes sound and not light. +# Claude Code passes one argument and has hooks of its own for the lamp. +if [[ $# -eq 2 ]] && command -v agent-lamp >/dev/null; then + agent-lamp "$1" "$2" /dev/null 2>&1 & +fi + [[ "$("$here/statusctl" quiet get)" == "1" ]] && exit 0 dir="${NOTIFY_SOUND_DIR:-$HOME/Music/notify}" diff --git a/desktop/modules/status/statusctl b/desktop/modules/status/statusctl index 718ee39..7bbae3e 100755 --- a/desktop/modules/status/statusctl +++ b/desktop/modules/status/statusctl @@ -25,7 +25,7 @@ set -u -MODES="dnd presentation nolock quiet" +MODES="dnd presentation nolock quiet nolamp" DIR="${XDG_RUNTIME_DIR:-/tmp}" usage() { diff --git a/desktop/modules/status/test-notify-sound.sh b/desktop/modules/status/test-notify-sound.sh index 9571d4c..d70893f 100755 --- a/desktop/modules/status/test-notify-sound.sh +++ b/desktop/modules/status/test-notify-sound.sh @@ -13,7 +13,8 @@ # # The one runnable check for notify-sound. A fake paplay first on PATH # records what it was asked to play, and XDG_RUNTIME_DIR is a temporary -# directory, so no sound plays and the live quiet mode is untouched. +# directory, so no sound plays and the live quiet mode is untouched. A fake +# agent-lamp records its arguments, so the real lamp is never driven. # # Usage: ./test-notify-sound.sh (exit 0 = all passed) @@ -27,6 +28,8 @@ export NOTIFY_SOUND_DIR="/sounds" mkdir "$tmp/bin" printf '#!/bin/sh\nprintf "%%s\\n" "$1" >> "%s/played"\n' "$tmp" > "$tmp/bin/paplay" chmod +x "$tmp/bin/paplay" +printf '#!/bin/sh\nprintf "%%s %%s\\n" "$1" "$2" >> "%s/lamp"\n' "$tmp" > "$tmp/bin/agent-lamp" +chmod +x "$tmp/bin/agent-lamp" export PATH="$tmp/bin:$PATH" pass=0 @@ -64,5 +67,15 @@ check "quiet mutes permission" "" "$(play permission)" "$here/statusctl" quiet set 0 check "quiet off plays again" "/sounds/claude-attention.opus" "$(play claude)" +# Two arguments (opencode's event and session) are forwarded to agent-lamp, +# even in quiet mode; Claude's single argument never is. +rm -f "$tmp/lamp" +"$here/notify-sound" claude +"$here/notify-sound" permission ses1 +"$here/statusctl" quiet set 1 +"$here/notify-sound" complete ses2 +sleep 0.2 +check "lamp forward" "permission ses1|complete ses2" "$(paste -sd'|' "$tmp/lamp" 2>/dev/null)" + printf '\n%d passed, %d failed\n' "$pass" "$fail" [[ "$fail" -eq 0 ]] diff --git a/desktop/modules/status/test-statusctl.sh b/desktop/modules/status/test-statusctl.sh index 170101c..8042fd1 100755 --- a/desktop/modules/status/test-statusctl.sh +++ b/desktop/modules/status/test-statusctl.sh @@ -155,5 +155,11 @@ check "quiet set 1" "1" "$("$ctl" quiet get)" "$ctl" quiet toggle check "quiet toggle from 1" "0" "$("$ctl" quiet get)" +# nolamp keeps agent-lamp's bulb dark; a plain mode like quiet. +"$ctl" nolamp set 1 +check "nolamp set 1" "1" "$("$ctl" nolamp get)" +"$ctl" nolamp toggle +check "nolamp toggle from 1" "0" "$("$ctl" nolamp get)" + printf '\n%d passed, %d failed\n' "$pass" "$fail" [[ "$fail" -eq 0 ]] diff --git a/shared/Status.qml b/shared/Status.qml index f32cd35..ab45e99 100644 --- a/shared/Status.qml +++ b/shared/Status.qml @@ -43,9 +43,13 @@ Singleton { // sound scripts read the file through statusctl, so this is only the // drawer's view of it. readonly property bool quiet: quietFile.value + // Keeps agent-lamp's bulb dark; agent-lamp reads the file itself, so + // this is only the drawer's view of it. + readonly property bool nolamp: nolampFile.value readonly property int activeCount: (root.dnd ? 1 : 0) + (root.presentation ? 1 : 0) + (root.nolock ? 1 : 0) + (root.quiet ? 1 : 0) + + (root.nolamp ? 1 : 0) // Set once by shell.qml. IdleInhibitor does nothing with a null window, // and the singleton has no window of its own to offer. @@ -81,6 +85,8 @@ Singleton { nolockFile.write(on); } else if (name === "quiet") { quietFile.write(on); + } else if (name === "nolamp") { + nolampFile.write(on); } } @@ -97,6 +103,7 @@ Singleton { else if (name === "presentation") root.setMode("presentation", !root.presentation); else if (name === "nolock") root.setMode("nolock", !root.nolock); else if (name === "quiet") root.setMode("quiet", !root.quiet); + else if (name === "nolamp") root.setMode("nolamp", !root.nolamp); } // The detector calls this every poll; a write on an unchanged value would @@ -224,6 +231,7 @@ Singleton { ModeFile { id: presFile; path: root.dir + "/status.presentation" } ModeFile { id: nolockFile; path: root.dir + "/status.nolock" } ModeFile { id: quietFile; path: root.dir + "/status.quiet" } + ModeFile { id: nolampFile; path: root.dir + "/status.nolamp" } // Written only by the game detector above, never by statusctl. ModeFile { id: gamingFile; path: root.dir + "/status.gaming" } } -- cgit v1.2.3