Skip to content

fix(watch): fold sentinel '-' into the empty session-id path #857

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fujibee merged 3 commits into from
Aug 18, 2026
Merged

fix(watch): fold sentinel '-' into the empty session-id path #857

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4c5ebd
fix(watch): fold sentinel '-' into the empty session-id path (#855)
apstndb Aug 17, 2026
bb1e6e3
test(watch): cite the original #477 contract on the sentinel fold case
apstndb Aug 17, 2026
8a3474a
test(watch): use refute for sentinel absence checks (#855)
apstndb Aug 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions scripts/watch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ source "$(cd "$(dirname "$0")" && pwd)/lib/compat.sh"
# in — notably Grok Build's `monitor` tool, where "$GROK_SESSION_ID" expands to
# empty — still starts the watcher. project_path and agent_type are required.
SESSION_ID="${1:-}"
[ "$SESSION_ID" = "-" ] && SESSION_ID="" # #477: caller sentinel for empty session id
PROJECT_PATH="${2:?Missing project_path}"
AGENT_TYPE="${3:?Missing agent_type}"
ACTIVE_NAME="${4:-}"
Expand Down
21 changes: 21 additions & 0 deletions tests/test_watch.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -845,3 +845,24 @@ _record_handover_events() {
[ "$started" -eq 1 ]
! grep -q "Usage: watch.sh" "$out"
}

# Callers pass "${GROK_SESSION_ID:--}" (and the same pattern for other hosts)
# so a launcher that drops a quoted-empty first arg cannot shift project/type.
# watch.sh must fold "-" into the same generated-fallback path as "" (#236).
@test "watch: sentinel '-' session_id resolves like an empty one (#477)" {
local out="$BATS_TEST_TMPDIR/dash-sid.out"
AGMSG_WATCH_INTERVAL=1 bash "$SCRIPTS/watch.sh" - "$PROJ" claude-code alice >"$out" 2>&1 3>&- &
local pid=$!
# Folded to empty => a generated fallback id, so a watch.agmsg-*.pid appears.
local i started=0
for i in $(seq 1 25); do
if ls "$TEST_SKILL_DIR/run"/watch.agmsg-*.pid >/dev/null 2>&1; then started=1; break; fi
sleep 0.2
done
kill "$pid" 2>/dev/null || true; wait "$pid" 2>/dev/null || true
[ "$started" -eq 1 ]
# No literal "-" session id leaked into the run dir key space.
refute ls "$TEST_SKILL_DIR/run"/watch.-*.pid >/dev/null 2>&1
refute grep -q "Usage: watch.sh" "$out"
refute grep -q "ERROR: unknown agent type" "$out"
}
Loading