mosaicstack/stack
1
0
Fork 0
Code Issues 28 Pull Requests 7 Actions Packages Projects Releases 15 Wiki Activity

fix(fleet): watch viewer-session leak + workdir test settle-race #601

Merged
jason.woltje merged 1 commits from feat/f3-watch-workdir into main 2026-06-22 01:43:22 +00:00
Conversation 0 Commits 1 Files Changed 2 +22 -11
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/mosaic/framework/tools/fleet/test-start-agent-session.sh
View File

@@ -32,8 +32,15 @@ MOSAIC_AGENT_COMMAND='bash --noprofile --norc -i' \
"$START" "$AGENT"
tmux -L "$SOCKET" has-session -t "=$AGENT:0.0" || fail "agent session was not created"
actual_dir=$(tmux -L "$SOCKET" display-message -p -t "=$AGENT:0.0" '#{pane_current_path}')
[ "$actual_dir" = "$WORKDIR" ] || fail "agent workdir mismatch: $actual_dir"
# Retry: pane_current_path briefly reflects the tmux server's cwd until the pane
# process establishes its own cwd (the -c start dir). Poll until it settles.
actual_dir=""
for _ in $(seq 1 30); do
actual_dir=$(tmux -L "$SOCKET" display-message -p -t "=$AGENT:0.0" '#{pane_current_path}')
[ "$actual_dir" = "$WORKDIR" ] && break
sleep 0.1
done
[ "$actual_dir" = "$WORKDIR" ] || fail "agent workdir mismatch: $actual_dir (expected $WORKDIR)"
# ── Test 2: idempotency (duplicate start prints 'already running') ─────────────
MOSAIC_TMUX_SOCKET="$SOCKET" \

14
packages/mosaic/src/commands/fleet.ts
View File

@@ -1438,15 +1438,19 @@ export function registerFleetAgentCommands(
await runChecked(runner, buildAgentWatchCreateViewerCommand(agent, viewerName, socketName));
let exitCode = 0;
try {
const [bin, args] = splitCommand(buildAgentWatchAttachCommand(viewerName, socketName));
const exitCode = await iRunner(bin, args);
// Best-effort cleanup of the viewer session regardless of how the user detached.
// Errors here are intentionally suppressed — the agent session is unaffected.
exitCode = await iRunner(bin, args);
} finally {
// ALWAYS clean up the viewer session — even if attach threw or the process was
// interrupted — so stale grouped *-watch-* sessions never accumulate. Errors here
// are intentionally suppressed; the agent session is unaffected.
const killResult = await runner(
...splitCommand(buildAgentWatchKillViewerCommand(viewerName, socketName)),
);
void killResult; // result is intentionally ignored
void killResult;
}
if (exitCode !== 0) {
process.exitCode = exitCode;