Projects
+
)}
+
{projectsLength === 0 && (
No projects yet
)}
@@ -3294,7 +3306,7 @@ export default function LegacySidebar() {
return null;
}
const activeThread = sidebarThreadByKey.get(routeThreadKey);
- if (!activeThread) return null;
+ if (!activeThread || activeThread.projectId === null) return null;
const physicalKey =
projectPhysicalKeyByScopedRef.get(
scopedProjectKey(scopeProjectRef(activeThread.environmentId, activeThread.projectId)),
@@ -3307,6 +3319,7 @@ export default function LegacySidebar() {
const threadsByProjectKey = useMemo(() => {
const next = new Map();
for (const thread of sidebarThreads) {
+ if (thread.projectId === null) continue;
const physicalKey =
projectPhysicalKeyByScopedRef.get(
scopedProjectKey(scopeProjectRef(thread.environmentId, thread.projectId)),
@@ -3437,7 +3450,8 @@ export default function LegacySidebar() {
...project,
id: project.projectKey,
}));
- const sortableThreads = visibleThreads.map((thread) => {
+ const sortableThreads = visibleThreads.flatMap((thread) => {
+ if (thread.projectId === null) return [];
const physicalKey =
projectPhysicalKeyByScopedRef.get(
scopedProjectKey(scopeProjectRef(thread.environmentId, thread.projectId)),
@@ -3466,42 +3480,50 @@ export default function LegacySidebar() {
const isManualProjectSorting = sidebarProjectSortOrder === "manual";
const visibleSidebarThreadKeys = useMemo(
() =>
- sortedProjects.flatMap((project) => {
- const projectThreads = sortThreads(
- (threadsByProjectKey.get(project.projectKey) ?? []).filter(
- (thread) => thread.archivedAt === null,
- ),
- sidebarThreadSortOrder,
- );
- const projectExpanded = resolveProjectExpanded(
- projectExpandedById,
- projectExpansionPreferenceKeys(project),
- );
- const activeThreadKey = routeThreadKey ?? undefined;
- const pinnedCollapsedThread =
- !projectExpanded && activeThreadKey
- ? (projectThreads.find(
- (thread) =>
- scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)) ===
- activeThreadKey,
- ) ?? null)
- : null;
- const shouldShowThreadPanel = projectExpanded || pinnedCollapsedThread !== null;
- if (!shouldShowThreadPanel) {
- return [];
- }
- const isThreadListExpanded = expandedThreadListsByProject.has(project.projectKey);
- const hasOverflowingThreads = projectThreads.length > sidebarThreadPreviewCount;
- const previewThreads =
- isThreadListExpanded || !hasOverflowingThreads
- ? projectThreads
- : projectThreads.slice(0, sidebarThreadPreviewCount);
- const renderedThreads = pinnedCollapsedThread ? [pinnedCollapsedThread] : previewThreads;
- return renderedThreads.map((thread) =>
- scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)),
- );
- }),
+ sortedProjects
+ .flatMap((project) => {
+ const projectThreads = sortThreads(
+ (threadsByProjectKey.get(project.projectKey) ?? []).filter(
+ (thread) => thread.archivedAt === null,
+ ),
+ sidebarThreadSortOrder,
+ );
+ const projectExpanded = resolveProjectExpanded(
+ projectExpandedById,
+ projectExpansionPreferenceKeys(project),
+ );
+ const activeThreadKey = routeThreadKey ?? undefined;
+ const pinnedCollapsedThread =
+ !projectExpanded && activeThreadKey
+ ? (projectThreads.find(
+ (thread) =>
+ scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)) ===
+ activeThreadKey,
+ ) ?? null)
+ : null;
+ const shouldShowThreadPanel = projectExpanded || pinnedCollapsedThread !== null;
+ if (!shouldShowThreadPanel) {
+ return [];
+ }
+ const isThreadListExpanded = expandedThreadListsByProject.has(project.projectKey);
+ const hasOverflowingThreads = projectThreads.length > sidebarThreadPreviewCount;
+ const previewThreads =
+ isThreadListExpanded || !hasOverflowingThreads
+ ? projectThreads
+ : projectThreads.slice(0, sidebarThreadPreviewCount);
+ const renderedThreads = pinnedCollapsedThread ? [pinnedCollapsedThread] : previewThreads;
+ return renderedThreads.map((thread) =>
+ scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)),
+ );
+ })
+ .concat(
+ visibleThreads
+ .filter((thread) => thread.projectId === null)
+ .toSorted((left, right) => right.updatedAt.localeCompare(left.updatedAt))
+ .map((thread) => scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id))),
+ ),
[
+ visibleThreads,
sidebarThreadSortOrder,
sidebarThreadPreviewCount,
expandedThreadListsByProject,
diff --git a/apps/web/src/components/NoProjectsHero.tsx b/apps/web/src/components/NoProjectsHero.tsx
index 09bd92c82ec2..5bff0beb6bc4 100644
--- a/apps/web/src/components/NoProjectsHero.tsx
+++ b/apps/web/src/components/NoProjectsHero.tsx
@@ -19,13 +19,20 @@ export function NoProjectsHero() {
What should we work on?
- Add a project to start your first thread.
+ Add a project, or start a quick chat from New thread.
-
+
+
-
- {newWorktree && (
-
@@ -5765,7 +5760,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
preserveComposerFocusOnPointerDown
onPreviousPendingQuestion={onPreviousActivePendingUserInputQuestion}
onInterrupt={handleInterruptPrimaryAction}
- onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryAction}
+ onImplementPlanInNewThread={onImplementPlanInNewThread}
/>
) : null}
@@ -5871,7 +5866,7 @@ export const ChatComposer = memo(function ChatComposer(props: ChatComposerProps)
showSendWhileRunning={isMobileViewport}
onPreviousPendingQuestion={onPreviousActivePendingUserInputQuestion}
onInterrupt={handleInterruptPrimaryAction}
- onImplementPlanInNewThread={handleImplementPlanInNewThreadPrimaryAction}
+ onImplementPlanInNewThread={onImplementPlanInNewThread}
compactDisabled={
compactDisabled || noProviderAvailable || isSendBusy || isConnecting
}
diff --git a/apps/web/src/components/chat/ComposerPrimaryActions.tsx b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
index 91c54b75ed03..579ca833cfbe 100644
--- a/apps/web/src/components/chat/ComposerPrimaryActions.tsx
+++ b/apps/web/src/components/chat/ComposerPrimaryActions.tsx
@@ -34,7 +34,7 @@ interface ComposerPrimaryActionsProps {
showSendWhileRunning?: boolean;
onPreviousPendingQuestion: () => void;
onInterrupt: () => void;
- onImplementPlanInNewThread: () => void;
+ onImplementPlanInNewThread: (() => void) | undefined;
}
const formatPendingPrimaryActionLabel = (input: {
@@ -185,36 +185,43 @@ export const ComposerPrimaryActions = memo(function ComposerPrimaryActions({
-
+
+
+
+
+
+
+ )}
);
}
diff --git a/apps/web/src/quickChatAttachmentStorage.ts b/apps/web/src/quickChatAttachmentStorage.ts
new file mode 100644
index 000000000000..090abf903a38
--- /dev/null
+++ b/apps/web/src/quickChatAttachmentStorage.ts
@@ -0,0 +1,7 @@
+import { createQuickChatAttachmentStorage } from "@t3tools/client-runtime/operations/quickChats";
+
+export const quickChatAttachmentStorage = createQuickChatAttachmentStorage({
+ getItem: (key) => window.localStorage.getItem(key),
+ setItem: (key, value) => window.localStorage.setItem(key, value),
+ removeItem: (key) => window.localStorage.removeItem(key),
+});
diff --git a/docs/user/thread-sidebar.md b/docs/user/thread-sidebar.md
index 305496f7ea37..c2bfa3ccfcd4 100644
--- a/docs/user/thread-sidebar.md
+++ b/docs/user/thread-sidebar.md
@@ -23,9 +23,14 @@ In the New thread picker, press **Ctrl+0** to start a quick chat, or **Cmd+0** o
To turn a quick chat into project work, finish the current turn and choose
**Attach to project** from its menu on web or desktop, or above the conversation
-on mobile. Select a project in the same environment. Enable **Create a new
-worktree** and choose its base branch if you want a separate workspace. The chat
-keeps its history and subsequent turns use the selected workspace.
+on mobile. Select a project in the same environment, then choose its local
+checkout, an existing worktree, or a new worktree. Use the branch picker to
+select an existing worktree or the base for a new one. The chat keeps its history
+and subsequent turns use the selected workspace. If attachment fails, reopening
+the dialog restores the prepared worktree for retry.
+
+Project tools such as the file browser, terminal, and Git controls become
+available after attachment.
Quick chats use the agent's normal permission settings.
diff --git a/packages/client-runtime/src/operations/quickChats.test.ts b/packages/client-runtime/src/operations/quickChats.test.ts
new file mode 100644
index 000000000000..649f24810120
--- /dev/null
+++ b/packages/client-runtime/src/operations/quickChats.test.ts
@@ -0,0 +1,95 @@
+import {
+ EnvironmentId,
+ ProjectId,
+ ProviderDriverKind,
+ ProviderInstanceId,
+ ThreadId,
+ type ServerProvider,
+ type VcsListRefsResult,
+} from "@t3tools/contracts";
+import { expect, it } from "vite-plus/test";
+import {
+ createQuickChatAttachmentStorage,
+ prepareQuickChatWorktree,
+ quickChatModelSelection,
+} from "./quickChats";
+
+const ready: ServerProvider = {
+ instanceId: ProviderInstanceId.make("ready"),
+ driver: ProviderDriverKind.make("codex"),
+ enabled: true,
+ installed: true,
+ version: null,
+ status: "ready",
+ auth: { status: "authenticated" },
+ checkedAt: "2026-01-01T00:00:00Z",
+ models: [{ slug: "model", name: "Model", isCustom: false, capabilities: {} }],
+ slashCommands: [],
+ skills: [],
+};
+
+it("skips an errored preferred provider and selects an available agent", () => {
+ const failed: ServerProvider = {
+ ...ready,
+ instanceId: ProviderInstanceId.make("failed"),
+ status: "error",
+ };
+ const settings = { defaultModelSelection: { instanceId: failed.instanceId, model: "model" } };
+ expect(quickChatModelSelection({ providers: [failed, ready], settings })).toEqual({
+ instanceId: ready.instanceId,
+ model: "model",
+ });
+ expect(quickChatModelSelection({ providers: [failed], settings })).toBeNull();
+});
+
+it("recovers the same worktree after losing its creation response and reloading storage", async () => {
+ const disk = new Map