Compare commits
1 Commits
996651c6f3
...
feat/f3-wa
| Author | SHA1 | Date | |
|---|---|---|---|
| 234dc56c5f |
@@ -32,8 +32,15 @@ MOSAIC_AGENT_COMMAND='bash --noprofile --norc -i' \
|
|||||||
"$START" "$AGENT"
|
"$START" "$AGENT"
|
||||||
|
|
||||||
tmux -L "$SOCKET" has-session -t "=$AGENT:0.0" || fail "agent session was not created"
|
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}')
|
# Retry: pane_current_path briefly reflects the tmux server's cwd until the pane
|
||||||
[ "$actual_dir" = "$WORKDIR" ] || fail "agent workdir mismatch: $actual_dir"
|
# 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') ─────────────
|
# ── Test 2: idempotency (duplicate start prints 'already running') ─────────────
|
||||||
MOSAIC_TMUX_SOCKET="$SOCKET" \
|
MOSAIC_TMUX_SOCKET="$SOCKET" \
|
||||||
|
|||||||
@@ -1438,15 +1438,19 @@ export function registerFleetAgentCommands(
|
|||||||
|
|
||||||
await runChecked(runner, buildAgentWatchCreateViewerCommand(agent, viewerName, socketName));
|
await runChecked(runner, buildAgentWatchCreateViewerCommand(agent, viewerName, socketName));
|
||||||
|
|
||||||
|
let exitCode = 0;
|
||||||
|
try {
|
||||||
const [bin, args] = splitCommand(buildAgentWatchAttachCommand(viewerName, socketName));
|
const [bin, args] = splitCommand(buildAgentWatchAttachCommand(viewerName, socketName));
|
||||||
const exitCode = await iRunner(bin, args);
|
exitCode = await iRunner(bin, args);
|
||||||
|
} finally {
|
||||||
// Best-effort cleanup of the viewer session regardless of how the user detached.
|
// ALWAYS clean up the viewer session — even if attach threw or the process was
|
||||||
// Errors here are intentionally suppressed — the agent session is unaffected.
|
// interrupted — so stale grouped *-watch-* sessions never accumulate. Errors here
|
||||||
|
// are intentionally suppressed; the agent session is unaffected.
|
||||||
const killResult = await runner(
|
const killResult = await runner(
|
||||||
...splitCommand(buildAgentWatchKillViewerCommand(viewerName, socketName)),
|
...splitCommand(buildAgentWatchKillViewerCommand(viewerName, socketName)),
|
||||||
);
|
);
|
||||||
void killResult; // result is intentionally ignored
|
void killResult;
|
||||||
|
}
|
||||||
|
|
||||||
if (exitCode !== 0) {
|
if (exitCode !== 0) {
|
||||||
process.exitCode = exitCode;
|
process.exitCode = exitCode;
|
||||||
|
|||||||
Reference in New Issue
Block a user