Skip to content

fix(web): always run a repo-backed editor on a thread (#6667 follow-up) #6680

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

fix(web): always run a repo-backed editor on a thread (#6667 follow-up) #6680

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
44 changes: 43 additions & 1 deletion 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 @@ -25,6 +25,8 @@ import {
useEffect,
useLayoutEffect,
useRef,
useState,
useSyncExternalStore,
use,
Suspense,
type ReactNode,
Expand All @@ -45,7 +47,10 @@ import { useProjectContext, useVirtualMCP, parseBranchMap } from "@/sdk";
import type { VirtualMCPEntity, SandboxMap } from "@decocms/shared/sdk/types";
import { agentHasClonableSource } from "@/lib/agent-capabilities";
import { generateBranchName } from "@decocms/shared/branch-name";
import { useNavigate, useParams } from "@tanstack/react-router";
import { defaultThreadRuntime } from "@decocms/shared/thread/session-runtime";
import { useThreadManager } from "@/components/chat/store/hooks";
import { findReusableNewChat } from "@/lib/reusable-new-chat";
import { Navigate, useNavigate, useParams } from "@tanstack/react-router";
import { useIsSandboxStartPending } from "@/components/sandbox/hooks/use-sandbox-start";
import { useStatusSounds } from "../../hooks/use-status-sounds";
import { authClient } from "@/lib/auth-client";
Expand Down Expand Up @@ -569,6 +574,17 @@ function AgentInsetProvider() {
const routeThreadId = useRouteThreadId();
/** The agent is the `{-$project}` segment on a destination, `?virtualmcpid=` on the legacy route. */
const virtualMcpId = useRouteVirtualMcpId();
/** A stable thread id to mint when a repo-backed editor arrives with none and
* the user has no idle empty chat to reuse, so a re-render before the URL
* catches up reuses it instead of looping through fresh ones. Generated once
* per mount; only used by the redirect below. */
const [generatedThreadId] = useState(() => crypto.randomUUID());
const { data: session } = authClient.useSession();
const threadManager = useThreadManager();
const threads = useSyncExternalStore(
threadManager.threads.subscribe,
threadManager.threads.get,
);

// Ensure the thread row exists for this URL before rendering the chat. On
// 404 the hook fires COLLECTION_THREADS_CREATE (idempotent) and surfaces a
Expand Down Expand Up @@ -615,6 +631,32 @@ function AgentInsetProvider() {
return () => document.removeEventListener("keydown", handler);
}, []);

/**
* A repo-backed editor's branch is a thread field, so it must run on a thread;
* mint one into `?thread=` before mounting when the URL names none (#6667). The
* Super Agent (no repo) keeps its lazy threadless composer.
*/
if (routeThreadId === null && hasActiveGithubRepo) {
// Focus the user's idle empty chat for this agent, else mint one — as useNavigateToAgent does.
const threadId =
findReusableNewChat(
threads,
virtualMcpId,
session?.user?.id,
defaultThreadRuntime(entity.metadata),
)?.id ?? generatedThreadId;
return (
<Navigate
to="."
replace
search={(prev: Record<string, unknown>) => ({
...prev,
thread: threadId,
})}
/>
);
}

const chatVirtualMcpId = virtualMcpId;

const insetContextValue: InsetContextValue = {
Expand Down
Loading