Skip to content

refactor(agent-shell): dedupe the duplicate useSessionRuntime(virtualMcpId) call #6678

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
pedrofrxncx merged 1 commit into from
Aug 28, 2026
Merged

refactor(agent-shell): dedupe the duplicate useSessionRuntime(virtualMcpId) call #6678

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 3 additions & 5 deletions apps/web/src/layouts/agent-shell-layout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,13 +286,12 @@ function VmEventsBridge({
*/
const { org } = useProjectContext();
const autoFreshBranchEnabled = useOrgFlag("cms_auto_fresh_branch");
const { runtime: cmsRuntime, resolved: cmsRuntimeResolved } =
useSessionRuntime(virtualMcpId);
const sessionState = useSessionRuntime(virtualMcpId);
const freshBranchForThreadRef = useRef<string | null>(null);
const staleCheckEnabled =
autoFreshBranchEnabled &&
cmsRuntimeResolved &&
cmsRuntime === "cms" &&
sessionState.resolved &&
sessionState.runtime === "cms" &&
!!org?.slug &&
!!currentBranch &&
// oxlint-disable-next-line ban-ref-current-assignment/ban-ref-current-assignment -- read-only dedup probe; recorded inside the effect after firing
Expand Down Expand Up @@ -331,7 +330,6 @@ function VmEventsBridge({
// SANDBOX_START (covers the booting window; SandboxLifecycleProvider's
// auto-start shares this mutation key, so `useIsSandboxStartPending`
// observes it).
const sessionState = useSessionRuntime(virtualMcpId);
/** `null` until the answer is real — never act on the project default. */
const sessionRuntime = sessionState.resolved ? sessionState.runtime : null;
const isStartPending = useIsSandboxStartPending(
Expand Down
Loading