Skip to content

fix(staged): show the requested session in SessionModal #768

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
matt2e merged 6 commits into from
Jun 5, 2026
Merged

fix(staged): show the requested session in SessionModal #768

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3befcf
fix(staged): always reload requested session in SessionModal
matt2e Jun 5, 2026
64b7b13
fix(staged): skip transcript clear when reopening same session
matt2e Jun 5, 2026
37198e7
chore(staged): add diagnostic logging to SessionModal load path
matt2e Jun 5, 2026
ea7204c
fix(staged): untrack slog reactive reads to stop infinite load loop
matt2e Jun 5, 2026
98fc669
fix(staged): untrack session?.id read in loadSession prologue
matt2e Jun 5, 2026
7603ed2
chore(staged): remove SessionModal diagnostic logging
matt2e Jun 5, 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
21 changes: 17 additions & 4 deletions apps/staged/src/lib/features/sessions/SessionModal.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,11 @@
stopPolling();
return;
}
// Reset the teardown guard deterministically before loading, in the same
// flush. `closed` is a plain (non-reactive) variable, so writing it here
// does not retrigger this effect — which is exactly why relying on a
// separately-declared reset effect raced ahead of this load.
closed = false;
stopPolling();
loadSession().then(() => {
if (closed || !open || sessionId !== id) return;
Expand All @@ -437,6 +442,18 @@
/** Initial full load. */
async function loadSession() {
if (closed) return;
// Clear prior session state when loading a *different* session so a
// bail-out or in-flight load can never paint the previously-viewed
// session — show a clean loading state for the requested id instead. When
// reopening the same session, keep the existing transcript so it stays
// visible (and correct) rather than flashing a loading state. Read the
// currently-loaded id via untrack so this synchronous prologue never
// subscribes the calling load effect to `session` — which it mutates
// below, otherwise re-triggering the effect in a tight infinite loop.
if (untrack(() => session?.id) !== sessionId) {
session = null;
messages = [];
}
loading = true;
error = null;
try {
Expand Down Expand Up @@ -893,10 +910,6 @@
onClose();
}

$effect(() => {
if (open) closed = false;
});

/** Group consecutive tool_call / tool_result messages into pairs */
type ToolPair = {
call: SessionMessage;
Expand Down