Skip to content

fix(frontend): inject orchestrator session into cache before navigating #371

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

Open
i-trytoohard wants to merge 2 commits into
base: main
Choose a base branch
from
+27 −2
Open

fix(frontend): inject orchestrator session into cache before navigating #371

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7705c35
fix(frontend): inject orchestrator session into cache before navigating
Jun 21, 2026
6b31d48
chore: format with prettier [skip ci]
github-actions[bot] Jun 21, 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
29 changes: 27 additions & 2 deletions frontend/src/renderer/routes/_shell.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { addRendererExceptionStep, captureRendererEvent, captureRendererExceptio
import { ShellProvider } from "../lib/shell-context";
import { spawnOrchestrator } from "../lib/spawn-orchestrator";
import { readStoredTheme, type Theme, useUiStore } from "../stores/ui-store";
import type { WorkspaceSummary } from "../types/workspace";
import { toAgentProvider, type WorkspaceSession, type WorkspaceSummary } from "../types/workspace";

export const Route = createFileRoute("/_shell")({
// Prefetch the workspace list for the whole shell (parent loaders run before
Expand Down Expand Up @@ -94,7 +94,32 @@ function ShellLayout() {
updateWorkspaces((current) => [workspace, ...current.filter((item) => item.id !== workspace.id)]);
try {
const sessionId = await spawnOrchestrator(workspace.id);
await queryClient.invalidateQueries({ queryKey: workspaceQueryKey });
// Optimistically inject the orchestrator session into the workspace
// cache so SessionView can render immediately — even if the background
// refetch is slow or fails (the daemon is busy with the spawn workload:
// git worktree, provisioning, Zellij runtime). Without this, the cache
// retains the workspace with sessions: [] from the optimistic update
// above, and the staleTime: 10_000 window suppresses a mount-triggered
// refetch in SessionView, so the route shows "Session not found" until
// the 15s refetchInterval fires. See issue #370.
const ts = new Date().toISOString();
const orchestratorSession: WorkspaceSession = {
id: sessionId,
workspaceId: workspace.id,
workspaceName: workspace.name,
title: "orchestrator",
provider: toAgentProvider(input.orchestratorAgent),
kind: "orchestrator",
branch: `session/${sessionId}`,
status: "working",
createdAt: ts,
updatedAt: ts,
prs: [],
};
updateWorkspaces((current) =>
current.map((w) => (w.id === workspace.id ? { ...w, sessions: [orchestratorSession, ...w.sessions] } : w)),
);
await queryClient.refetchQueries({ queryKey: workspaceQueryKey });
void navigate({
to: "/projects/$projectId/sessions/$sessionId",
params: { projectId: workspace.id, sessionId },
Expand Down