From c47dca92e73faa4a7d8d4e2179c0afa47af37098 Mon Sep 17 00:00:00 2001
From: Jake Leventhal <jakeleventhal@me.com>
Date: Tue, 14 Jul 2026 19:40:19 -0400
Subject: [PATCH 1/4] Add standalone chats sidebar section

---
 apps/web/src/components/CommandPalette.tsx |  10 +-
 apps/web/src/components/Sidebar.tsx        | 279 ++++++++++++++++++++-
 apps/web/src/generalChats.test.ts          |  59 +++++
 apps/web/src/generalChats.ts               |  33 +++
 apps/web/src/hooks/useHandleNewThread.ts   |   3 +-
 5 files changed, 366 insertions(+), 18 deletions(-)
 create mode 100644 apps/web/src/generalChats.test.ts
 create mode 100644 apps/web/src/generalChats.ts

diff --git a/apps/web/src/components/CommandPalette.tsx b/apps/web/src/components/CommandPalette.tsx
index 8dccf984457..65fbf09d02f 100644
--- a/apps/web/src/components/CommandPalette.tsx
+++ b/apps/web/src/components/CommandPalette.tsx
@@ -112,6 +112,7 @@ import { AzureDevOpsIcon, BitbucketIcon, GitHubIcon, GitLabIcon } from "./Icons"
 import { ProjectFavicon } from "./ProjectFavicon";
 import { ThreadRowLeadingStatus, ThreadRowTrailingStatus } from "./ThreadStatusIndicators";
 import { primaryServerKeybindingsAtom } from "../state/server";
+import { excludeGeneralChatsProject } from "../generalChats";
 import { resolveShortcutCommand } from "../keybindings";
 import {
   Command,
@@ -474,6 +475,7 @@ function OpenCommandPaletteDialog(props: {
   const { activeDraftThread, activeThread, defaultProjectRef, handleNewThread } =
     useHandleNewThread();
   const projects = useProjects();
+  const regularProjects = useMemo(() => excludeGeneralChatsProject(projects), [projects]);
   const threads = useThreadShells();
   const keybindings = useAtomValue(primaryServerKeybindingsAtom);
   const [viewStack, setViewStack] = useState<CommandPaletteView[]>([]);
@@ -653,7 +655,7 @@ function OpenCommandPaletteDialog(props: {
   const projectSearchItems = useMemo(
     () =>
       buildProjectActionItems({
-        projects,
+        projects: regularProjects,
         valuePrefix: "project",
         icon: (project) => (
           <ProjectFavicon
@@ -664,13 +666,13 @@ function OpenCommandPaletteDialog(props: {
         ),
         runProject: openProjectFromSearch,
       }),
-    [openProjectFromSearch, projects],
+    [openProjectFromSearch, regularProjects],
   );
 
   const projectThreadItems = useMemo(
     () =>
       buildProjectActionItems({
-        projects,
+        projects: regularProjects,
         valuePrefix: "new-thread-in",
         shortcutCommand: "chat.new",
         icon: (project) => (
@@ -692,7 +694,7 @@ function OpenCommandPaletteDialog(props: {
           );
         },
       }),
-    [activeDraftThread, activeThread, defaultProjectRef, handleNewThread, projects],
+    [activeDraftThread, activeThread, defaultProjectRef, handleNewThread, regularProjects],
   );
 
   const allThreadItems = useMemo(
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 21525b56b77..6860148f858 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -43,8 +43,10 @@ import { restrictToFirstScrollableAncestor, restrictToVerticalAxis } from "@dnd-
 import { CSS } from "@dnd-kit/utilities";
 import {
   type ContextMenuItem,
+  DEFAULT_MODEL,
   DEFAULT_SERVER_SETTINGS,
   ProjectId,
+  ProviderInstanceId,
   type ScopedThreadRef,
   type ResolvedKeybindingsConfig,
   type SidebarProjectGroupingMode,
@@ -221,6 +223,13 @@ import {
   type SidebarProjectSnapshot,
 } from "../sidebarProjectGrouping";
 import { SidebarProviderUpdatePill } from "./sidebar/SidebarProviderUpdatePill";
+import {
+  excludeGeneralChatsProject,
+  findGeneralChatsProject,
+  GENERAL_CHATS_PROJECT_ID,
+  GENERAL_CHATS_PROJECT_TITLE,
+  GENERAL_CHATS_WORKSPACE_ROOT,
+} from "../generalChats";
 const SIDEBAR_SORT_LABELS: Record<SidebarProjectSortOrder, string> = {
   updated_at: "Last user message",
   created_at: "Created at",
@@ -931,6 +940,7 @@ interface SidebarProjectThreadListProps {
   openPrLink: (event: React.MouseEvent<HTMLElement>, prUrl: string) => void;
   expandThreadListForProject: (projectKey: string) => void;
   collapseThreadListForProject: (projectKey: string) => void;
+  emptyLabel?: string;
 }
 
 const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
@@ -971,6 +981,7 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
     openPrLink,
     expandThreadListForProject,
     collapseThreadListForProject,
+    emptyLabel = "No threads yet",
   } = props;
   const showMoreButtonRender = useMemo(() => <button type="button" />, []);
   const showLessButtonRender = useMemo(() => <button type="button" />, []);
@@ -986,7 +997,7 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
             data-thread-selection-safe
             className="flex h-6 w-full translate-x-0 items-center px-2 text-left text-[10px] text-muted-foreground/60"
           >
-            <span>No threads yet</span>
+            <span>{emptyLabel}</span>
           </div>
         </SidebarMenuSubItem>
       ) : null}
@@ -1063,6 +1074,7 @@ const SidebarProjectThreadList = memo(function SidebarProjectThreadList(
 
 interface SidebarProjectItemProps {
   project: SidebarProjectSnapshot;
+  mode?: "project" | "chats";
   isThreadListExpanded: boolean;
   activeRouteThreadKey: string | null;
   newThreadShortcutLabel: string | null;
@@ -1083,6 +1095,7 @@ interface SidebarProjectItemProps {
 const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjectItemProps) {
   const {
     project,
+    mode = "project",
     isThreadListExpanded,
     activeRouteThreadKey,
     newThreadShortcutLabel,
@@ -1099,6 +1112,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
     isManualProjectSorting,
     dragHandleProps,
   } = props;
+  const isChats = mode === "chats";
   const threadSortOrder = useClientSettings<SidebarThreadSortOrder>(
     (settings) => settings.sidebarThreadSortOrder,
   );
@@ -1191,9 +1205,10 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
   sidebarThreadByKeyRef.current = sidebarThreadByKey;
   const projectThreads = sidebarThreads;
   const projectPreferenceKeys = useMemo(() => projectExpansionPreferenceKeys(project), [project]);
-  const projectExpanded = useUiStateStore((state) =>
+  const storedProjectExpanded = useUiStateStore((state) =>
     resolveProjectExpanded(state.projectExpandedById, projectPreferenceKeys),
   );
+  const projectExpanded = isChats || storedProjectExpanded;
   const threadLastVisitedAts = useUiStateStore(
     useShallow((state) =>
       projectThreads.map(
@@ -1852,11 +1867,13 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
             : null;
       const seedContext = resolveSidebarNewThreadSeedContext({
         projectId: member.id,
-        defaultEnvMode: resolveSidebarNewThreadEnvMode({
-          defaultEnvMode:
-            serverConfigs.get(member.environmentId)?.settings.defaultThreadEnvMode ??
-            DEFAULT_SERVER_SETTINGS.defaultThreadEnvMode,
-        }),
+        defaultEnvMode: isChats
+          ? "local"
+          : resolveSidebarNewThreadEnvMode({
+              defaultEnvMode:
+                serverConfigs.get(member.environmentId)?.settings.defaultThreadEnvMode ??
+                DEFAULT_SERVER_SETTINGS.defaultThreadEnvMode,
+            }),
         activeThread:
           currentActiveThread && currentActiveThread.projectId === member.id
             ? {
@@ -1904,7 +1921,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
         }
       })();
     },
-    [handleNewThread, isMobile, router, serverConfigs, setOpenMobile],
+    [handleNewThread, isChats, isMobile, router, serverConfigs, setOpenMobile],
   );
 
   const handleCreateThreadClick = useCallback(
@@ -2127,7 +2144,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
         [
           { id: "rename", label: "Rename thread" },
           { id: "mark-unread", label: "Mark unread" },
-          { id: "copy-path", label: "Copy Path" },
+          ...(!isChats ? [{ id: "copy-path", label: "Copy Path" }] : []),
           { id: "copy-thread-id", label: "Copy Thread ID" },
           { id: "delete", label: "Delete", destructive: true, icon: "trash" },
         ],
@@ -2190,6 +2207,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
       copyPathToClipboard,
       copyThreadIdToClipboard,
       deleteThread,
+      isChats,
       markThreadUnread,
       memberProjectByScopedKey,
       project.workspaceRoot,
@@ -2199,7 +2217,10 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
 
   return (
     <>
-      <div className="group/project-header relative">
+      <div
+        className={isChats ? "hidden" : "group/project-header relative"}
+        aria-hidden={isChats || undefined}
+      >
         <SidebarMenuButton
           ref={isManualProjectSorting ? dragHandleProps?.setActivatorNodeRef : undefined}
           size="sm"
@@ -2340,6 +2361,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
         openPrLink={openPrLink}
         expandThreadListForProject={expandThreadListForProject}
         collapseThreadListForProject={collapseThreadListForProject}
+        emptyLabel={isChats ? "No chats yet" : "No threads yet"}
       />
 
       <Dialog
@@ -2852,6 +2874,10 @@ interface SidebarProjectsContentProps {
   handleNewThread: ReturnType<typeof useNewThreadHandler>;
   archiveThread: ReturnType<typeof useThreadActions>["archiveThread"];
   deleteThread: ReturnType<typeof useThreadActions>["deleteThread"];
+  generalChatsProject: SidebarProjectSnapshot | null;
+  activeGeneralChatsThreadKey: string | null;
+  createGeneralChat: () => void;
+  isCreatingGeneralChat: boolean;
   sortedProjects: readonly SidebarProjectSnapshot[];
   expandedThreadListsByProject: ReadonlySet<string>;
   activeRouteProjectKey: string | null;
@@ -2893,6 +2919,10 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
     handleNewThread,
     archiveThread,
     deleteThread,
+    generalChatsProject,
+    activeGeneralChatsThreadKey,
+    createGeneralChat,
+    isCreatingGeneralChat,
     sortedProjects,
     expandedThreadListsByProject,
     activeRouteProjectKey,
@@ -2984,6 +3014,65 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
         </SidebarGroup>
       ) : null}
       <LocalSecondaryStatus />
+      <SidebarGroup className="px-2 pt-2 pb-1">
+        <div className="mb-1 flex items-center justify-between pl-2 pr-1.5">
+          <span className="text-[10px] font-medium uppercase tracking-wider text-muted-foreground/60">
+            Chats
+          </span>
+          <Tooltip>
+            <TooltipTrigger
+              render={
+                <button
+                  type="button"
+                  aria-label="Create new chat"
+                  data-testid="sidebar-new-chat-trigger"
+                  className="inline-flex h-6 min-w-6 cursor-pointer items-center justify-center rounded-md px-[calc(--spacing(1)-1px)] text-muted-foreground/60 transition-colors hover:bg-accent hover:text-foreground disabled:cursor-not-allowed disabled:opacity-50"
+                  disabled={isCreatingGeneralChat}
+                  onClick={createGeneralChat}
+                />
+              }
+            >
+              {isCreatingGeneralChat ? (
+                <LoaderIcon className="size-3.5 animate-spin" />
+              ) : (
+                <SquarePenIcon className="size-3.5" />
+              )}
+            </TooltipTrigger>
+            <TooltipPopup side="right">New chat</TooltipPopup>
+          </Tooltip>
+        </div>
+        <SidebarMenu>
+          {generalChatsProject ? (
+            <SidebarProjectListRow
+              mode="chats"
+              project={generalChatsProject}
+              isThreadListExpanded={expandedThreadListsByProject.has(
+                generalChatsProject.projectKey,
+              )}
+              activeRouteThreadKey={activeGeneralChatsThreadKey}
+              newThreadShortcutLabel={null}
+              handleNewThread={handleNewThread}
+              archiveThread={archiveThread}
+              deleteThread={deleteThread}
+              threadJumpLabelByKey={threadJumpLabelByKey}
+              attachThreadListAutoAnimateRef={attachThreadListAutoAnimateRef}
+              expandThreadListForProject={expandThreadListForProject}
+              collapseThreadListForProject={collapseThreadListForProject}
+              dragInProgressRef={dragInProgressRef}
+              suppressProjectClickAfterDragRef={suppressProjectClickAfterDragRef}
+              suppressProjectClickForContextMenuRef={suppressProjectClickForContextMenuRef}
+              isManualProjectSorting={false}
+              dragHandleProps={null}
+            />
+          ) : (
+            <SidebarMenuItem className="w-full" data-thread-selection-safe>
+              <div className="flex h-6 w-full items-center px-3 text-[10px] text-muted-foreground/60">
+                No chats yet
+              </div>
+            </SidebarMenuItem>
+          )}
+        </SidebarMenu>
+      </SidebarGroup>
       <SidebarGroup className="px-2 py-2">
         <div className="mb-1 flex items-center justify-between pl-2 pr-1.5">
           <span className="text-[10px] font-medium uppercase tracking-wider text-muted-foreground/60">
@@ -3103,7 +3192,8 @@ const SidebarProjectsContent = memo(function SidebarProjectsContent(
 });
 
 export default function Sidebar() {
-  const projects = useProjects();
+  const allProjects = useProjects();
+  const projects = useMemo(() => excludeGeneralChatsProject(allProjects), [allProjects]);
   const sidebarThreads = useThreadShells();
   const projectExpandedById = useUiStateStore((store) => store.projectExpandedById);
   const projectOrder = useUiStateStore((store) => store.projectOrder);
@@ -3118,6 +3208,11 @@ export default function Sidebar() {
   const sidebarThreadPreviewCount = useClientSettings((s) => s.sidebarThreadPreviewCount);
   const updateSettings = useUpdateClientSettings();
   const handleNewThread = useNewThreadHandler();
+  const createProject = useAtomCommand(projectEnvironment.create, {
+    reportFailure: false,
+  });
+  const [isCreatingGeneralChat, setIsCreatingGeneralChat] = useState(false);
+  const creatingGeneralChatRef = useRef(false);
   const { archiveThread, deleteThread } = useThreadActions();
   const { isMobile, setOpenMobile } = useSidebar();
   const routeThreadRef = useParams({
@@ -3146,6 +3241,10 @@ export default function Sidebar() {
   const shortcutModifiers = useShortcutModifierState();
   const { environments } = useEnvironments();
   const primaryEnvironmentId = usePrimaryEnvironmentId();
+  const generalChatsProject = useMemo(
+    () => findGeneralChatsProject(allProjects, primaryEnvironmentId),
+    [allProjects, primaryEnvironmentId],
+  );
   const environmentLabelById = useMemo(
     () =>
       new Map(
@@ -3209,6 +3308,27 @@ export default function Sidebar() {
     projectGroupingSettings,
     primaryEnvironmentId,
   ]);
+  const generalChatsSidebarProject = useMemo<SidebarProjectSnapshot | null>(() => {
+    if (generalChatsProject === null) {
+      return null;
+    }
+
+    return (
+      buildSidebarProjectSnapshots({
+        projects: [generalChatsProject],
+        settings: projectGroupingSettings,
+        primaryEnvironmentId,
+        resolveEnvironmentLabel: (environmentId) => environmentLabelById.get(environmentId) ?? null,
+        isDesktopLocalEnvironment: (environmentId) => desktopLocalEnvironmentIds.has(environmentId),
+      })[0] ?? null
+    );
+  }, [
+    desktopLocalEnvironmentIds,
+    environmentLabelById,
+    generalChatsProject,
+    primaryEnvironmentId,
+    projectGroupingSettings,
+  ]);
 
   const sidebarProjectByKey = useMemo(
     () => new Map(sidebarProjects.map((project) => [project.projectKey, project] as const)),
@@ -3224,6 +3344,13 @@ export default function Sidebar() {
       ),
     [sidebarThreads],
   );
+  const activeGeneralChatsThreadKey = useMemo(() => {
+    if (routeThreadKey === null) {
+      return null;
+    }
+    const activeThread = sidebarThreadByKey.get(routeThreadKey);
+    return activeThread?.projectId === GENERAL_CHATS_PROJECT_ID ? routeThreadKey : null;
+  }, [routeThreadKey, sidebarThreadByKey]);
   // Resolve the active route's project key to a logical key so it matches the
   // sidebar's grouped project entries.
   const activeRouteProjectKey = useMemo(() => {
@@ -3297,6 +3424,100 @@ export default function Sidebar() {
     [clearSelection, isMobile, navigate, setOpenMobile, setSelectionAnchor],
   );
 
+  const createGeneralChat = useCallback(() => {
+    if (creatingGeneralChatRef.current) {
+      return;
+    }
+    if (primaryEnvironmentId === null) {
+      toastManager.add(
+        stackedThreadToast({
+          type: "error",
+          title: "Could not create chat",
+          description: "The primary environment is not connected yet.",
+        }),
+      );
+      return;
+    }
+
+    creatingGeneralChatRef.current = true;
+    setIsCreatingGeneralChat(true);
+    void (async () => {
+      try {
+        const projectRef = scopeProjectRef(primaryEnvironmentId, GENERAL_CHATS_PROJECT_ID);
+        if (generalChatsProject === null) {
+          const createResult = await createProject({
+            environmentId: primaryEnvironmentId,
+            input: {
+              projectId: GENERAL_CHATS_PROJECT_ID,
+              title: GENERAL_CHATS_PROJECT_TITLE,
+              workspaceRoot: GENERAL_CHATS_WORKSPACE_ROOT,
+              createWorkspaceRootIfMissing: true,
+              defaultModelSelection: {
+                instanceId: ProviderInstanceId.make("codex"),
+                model: DEFAULT_MODEL,
+              },
+            },
+          });
+          if (createResult._tag === "Failure") {
+            if (!isAtomCommandInterrupted(createResult)) {
+              const error = squashAtomCommandFailure(createResult);
+              toastManager.add(
+                stackedThreadToast({
+                  type: "error",
+                  title: "Could not create chat",
+                  description: error instanceof Error ? error.message : "An error occurred.",
+                }),
+              );
+            }
+            return;
+          }
+        }
+
+        const navigationResult = await settlePromise(() =>
+          handleNewThread(projectRef, {
+            branch: null,
+            worktreePath: null,
+            envMode: "local",
+            startFromOrigin: false,
+          }),
+        );
+        if (navigationResult._tag === "Failure") {
+          const error = squashAtomCommandFailure(navigationResult);
+          toastManager.add(
+            stackedThreadToast({
+              type: "error",
+              title: "Could not create chat",
+              description: error instanceof Error ? error.message : "An error occurred.",
+            }),
+          );
+          return;
+        }
+
+        if (isMobile) {
+          setOpenMobile(false);
+        }
+      } catch (error) {
+        toastManager.add(
+          stackedThreadToast({
+            type: "error",
+            title: "Could not create chat",
+            description: error instanceof Error ? error.message : "An error occurred.",
+          }),
+        );
+      } finally {
+        creatingGeneralChatRef.current = false;
+        setIsCreatingGeneralChat(false);
+      }
+    })();
+  }, [
+    createProject,
+    generalChatsProject,
+    handleNewThread,
+    isMobile,
+    primaryEnvironmentId,
+    setOpenMobile,
+  ]);
+
   const projectDnDSensors = useSensors(
     useSensor(PointerSensor, {
       activationConstraint: { distance: 6 },
@@ -3369,6 +3590,31 @@ export default function Sidebar() {
     () => sidebarThreads.filter((thread) => thread.archivedAt === null),
     [sidebarThreads],
   );
+  const visibleGeneralChatsThreadKeys = useMemo(() => {
+    if (generalChatsSidebarProject === null) {
+      return [];
+    }
+    const chats = sortThreads(
+      visibleThreads.filter(
+        (thread) =>
+          thread.environmentId === generalChatsSidebarProject.environmentId &&
+          thread.projectId === GENERAL_CHATS_PROJECT_ID,
+      ),
+      sidebarThreadSortOrder,
+    );
+    const renderedChats = expandedThreadListsByProject.has(generalChatsSidebarProject.projectKey)
+      ? chats
+      : chats.slice(0, sidebarThreadPreviewCount);
+    return renderedChats.map((thread) =>
+      scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)),
+    );
+  }, [
+    expandedThreadListsByProject,
+    generalChatsSidebarProject,
+    sidebarThreadPreviewCount,
+    sidebarThreadSortOrder,
+    visibleThreads,
+  ]);
   const sortedProjects = useMemo(() => {
     const sortableProjects = sidebarProjects.map((project) => ({
       ...project,
@@ -3402,8 +3648,9 @@ export default function Sidebar() {
   ]);
   const isManualProjectSorting = sidebarProjectSortOrder === "manual";
   const visibleSidebarThreadKeys = useMemo(
-    () =>
-      sortedProjects.flatMap((project) => {
+    () => [
+      ...visibleGeneralChatsThreadKeys,
+      ...sortedProjects.flatMap((project) => {
         const projectThreads = sortThreads(
           (threadsByProjectKey.get(project.projectKey) ?? []).filter(
             (thread) => thread.archivedAt === null,
@@ -3438,6 +3685,7 @@ export default function Sidebar() {
           scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)),
         );
       }),
+    ],
     [
       sidebarThreadSortOrder,
       sidebarThreadPreviewCount,
@@ -3446,6 +3694,7 @@ export default function Sidebar() {
       routeThreadKey,
       sortedProjects,
       threadsByProjectKey,
+      visibleGeneralChatsThreadKeys,
     ],
   );
   const threadJumpCommandByKey = useMemo(() => {
@@ -3725,6 +3974,10 @@ export default function Sidebar() {
             handleNewThread={handleNewThread}
             archiveThread={archiveThread}
             deleteThread={deleteThread}
+            generalChatsProject={generalChatsSidebarProject}
+            activeGeneralChatsThreadKey={activeGeneralChatsThreadKey}
+            createGeneralChat={createGeneralChat}
+            isCreatingGeneralChat={isCreatingGeneralChat}
             sortedProjects={sortedProjects}
             expandedThreadListsByProject={expandedThreadListsByProject}
             activeRouteProjectKey={activeRouteProjectKey}
diff --git a/apps/web/src/generalChats.test.ts b/apps/web/src/generalChats.test.ts
new file mode 100644
index 00000000000..45c3f6cc939
--- /dev/null
+++ b/apps/web/src/generalChats.test.ts
@@ -0,0 +1,59 @@
+import { EnvironmentId, ProjectId } from "@t3tools/contracts";
+import { describe, expect, it } from "vite-plus/test";
+
+import type { Project } from "./types";
+import {
+  excludeGeneralChatsProject,
+  findGeneralChatsProject,
+  GENERAL_CHATS_PROJECT_ID,
+  isGeneralChatsProject,
+} from "./generalChats";
+
+const LOCAL_ENVIRONMENT_ID = EnvironmentId.make("local");
+const REMOTE_ENVIRONMENT_ID = EnvironmentId.make("remote");
+
+function makeProject(input: {
+  readonly id: ProjectId;
+  readonly environmentId?: EnvironmentId;
+  readonly title?: string;
+}): Project {
+  return {
+    id: input.id,
+    environmentId: input.environmentId ?? LOCAL_ENVIRONMENT_ID,
+    title: input.title ?? "Project",
+    workspaceRoot: "/workspace",
+    repositoryIdentity: null,
+    defaultModelSelection: null,
+    scripts: [],
+    createdAt: "2026-01-01T00:00:00.000Z",
+    updatedAt: "2026-01-01T00:00:00.000Z",
+  };
+}
+
+describe("general chats project", () => {
+  it("recognizes the reserved project id", () => {
+    expect(isGeneralChatsProject(makeProject({ id: GENERAL_CHATS_PROJECT_ID }))).toBe(true);
+    expect(isGeneralChatsProject(makeProject({ id: ProjectId.make("regular") }))).toBe(false);
+  });
+
+  it("finds chats only in the requested environment", () => {
+    const localChats = makeProject({ id: GENERAL_CHATS_PROJECT_ID });
+    const remoteChats = makeProject({
+      id: GENERAL_CHATS_PROJECT_ID,
+      environmentId: REMOTE_ENVIRONMENT_ID,
+    });
+
+    expect(findGeneralChatsProject([remoteChats, localChats], LOCAL_ENVIRONMENT_ID)).toBe(
+      localChats,
+    );
+    expect(findGeneralChatsProject([localChats], REMOTE_ENVIRONMENT_ID)).toBeNull();
+    expect(findGeneralChatsProject([localChats], null)).toBeNull();
+  });
+
+  it("keeps the reserved project out of normal project lists", () => {
+    const regularProject = makeProject({ id: ProjectId.make("regular") });
+    const chatsProject = makeProject({ id: GENERAL_CHATS_PROJECT_ID });
+
+    expect(excludeGeneralChatsProject([chatsProject, regularProject])).toEqual([regularProject]);
+  });
+});
diff --git a/apps/web/src/generalChats.ts b/apps/web/src/generalChats.ts
new file mode 100644
index 00000000000..2cb11a0eee1
--- /dev/null
+++ b/apps/web/src/generalChats.ts
@@ -0,0 +1,33 @@
+import type { EnvironmentId, ProjectId } from "@t3tools/contracts";
+import { ProjectId as ProjectIdSchema } from "@t3tools/contracts";
+
+import type { Project } from "./types";
+
+export const GENERAL_CHATS_PROJECT_ID = ProjectIdSchema.make("t3code-general-chats");
+export const GENERAL_CHATS_PROJECT_TITLE = "Chats";
+export const GENERAL_CHATS_WORKSPACE_ROOT = "~/.t3/chats";
+
+export function isGeneralChatsProject(
+  project: Pick<Project, "id">,
+): project is Pick<Project, "id"> & { readonly id: ProjectId } {
+  return project.id === GENERAL_CHATS_PROJECT_ID;
+}
+
+export function findGeneralChatsProject(
+  projects: ReadonlyArray<Project>,
+  environmentId: EnvironmentId | null,
+): Project | null {
+  if (environmentId === null) {
+    return null;
+  }
+
+  return (
+    projects.find(
+      (project) => project.environmentId === environmentId && isGeneralChatsProject(project),
+    ) ?? null
+  );
+}
+
+export function excludeGeneralChatsProject(projects: ReadonlyArray<Project>): Project[] {
+  return projects.filter((project) => !isGeneralChatsProject(project));
+}
diff --git a/apps/web/src/hooks/useHandleNewThread.ts b/apps/web/src/hooks/useHandleNewThread.ts
index 1b1c07b31c9..ca74e1339b7 100644
--- a/apps/web/src/hooks/useHandleNewThread.ts
+++ b/apps/web/src/hooks/useHandleNewThread.ts
@@ -28,6 +28,7 @@ import { resolveNewDraftStartFromOrigin } from "../lib/chatThreadActions";
 import { resolveThreadRouteTarget } from "../threadRoutes";
 import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
 import { useClientSettings } from "./useSettings";
+import { excludeGeneralChatsProject } from "../generalChats";
 
 export function useNewThreadHandler() {
   const projects = useProjects();
@@ -206,7 +207,7 @@ export function useHandleNewThread() {
   const projects = useProjects();
   const orderedProjects = useMemo(() => {
     return orderItemsByPreferredIds({
-      items: projects,
+      items: excludeGeneralChatsProject(projects),
       preferredIds: projectOrder,
       getId: getProjectOrderKey,
       getPreferenceIds: (project) => [

From 2bbfe703fbfe78f355e038b97227399f06d4ae3a Mon Sep 17 00:00:00 2001
From: Jake Leventhal <jakeleventhal@me.com>
Date: Tue, 14 Jul 2026 19:59:34 -0400
Subject: [PATCH 2/4] Fix standalone chat controls and archive flow

---
 apps/web/src/components/ChatView.tsx          |  1 +
 apps/web/src/components/Sidebar.tsx           |  8 +--
 .../src/components/chat/ChatHeader.test.ts    | 19 +++++-
 apps/web/src/components/chat/ChatHeader.tsx   | 65 +++++++++++--------
 apps/web/src/generalChats.test.ts             | 15 +++++
 apps/web/src/generalChats.ts                  | 10 +++
 apps/web/src/hooks/useThreadActions.ts        |  6 +-
 7 files changed, 89 insertions(+), 35 deletions(-)

diff --git a/apps/web/src/components/ChatView.tsx b/apps/web/src/components/ChatView.tsx
index f5ea5bb1eba..ef96e9a24bf 100644
--- a/apps/web/src/components/ChatView.tsx
+++ b/apps/web/src/components/ChatView.tsx
@@ -5039,6 +5039,7 @@ function ChatViewContent(props: ChatViewProps) {
             activeThreadId={activeThread.id}
             {...(routeKind === "draft" && draftId ? { draftId } : {})}
             activeThreadTitle={activeThread.title}
+            activeProjectId={activeProject?.id}
             activeProjectName={activeProject?.title}
             openInCwd={gitCwd}
             activeProjectScripts={activeProject?.scripts}
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 6860148f858..ebad9c72e37 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -226,6 +226,7 @@ import { SidebarProviderUpdatePill } from "./sidebar/SidebarProviderUpdatePill";
 import {
   excludeGeneralChatsProject,
   findGeneralChatsProject,
+  GENERAL_CHAT_NEW_THREAD_OPTIONS,
   GENERAL_CHATS_PROJECT_ID,
   GENERAL_CHATS_PROJECT_TITLE,
   GENERAL_CHATS_WORKSPACE_ROOT,
@@ -3474,12 +3475,7 @@ export default function Sidebar() {
         }
 
         const navigationResult = await settlePromise(() =>
-          handleNewThread(projectRef, {
-            branch: null,
-            worktreePath: null,
-            envMode: "local",
-            startFromOrigin: false,
-          }),
+          handleNewThread(projectRef, GENERAL_CHAT_NEW_THREAD_OPTIONS),
         );
         if (navigationResult._tag === "Failure") {
           const error = squashAtomCommandFailure(navigationResult);
diff --git a/apps/web/src/components/chat/ChatHeader.test.ts b/apps/web/src/components/chat/ChatHeader.test.ts
index d716092fc3e..e7296026885 100644
--- a/apps/web/src/components/chat/ChatHeader.test.ts
+++ b/apps/web/src/components/chat/ChatHeader.test.ts
@@ -1,7 +1,22 @@
-import { EnvironmentId } from "@t3tools/contracts";
+import { EnvironmentId, ProjectId } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
 
-import { shouldShowOpenInPicker } from "./ChatHeader";
+import { GENERAL_CHATS_PROJECT_ID } from "../../generalChats";
+import { shouldShowOpenInPicker, shouldShowProjectHeaderActions } from "./ChatHeader";
+
+describe("shouldShowProjectHeaderActions", () => {
+  it("hides repository and project actions for standalone chats", () => {
+    expect(shouldShowProjectHeaderActions(GENERAL_CHATS_PROJECT_ID)).toBe(false);
+  });
+
+  it("shows actions for normal projects", () => {
+    expect(shouldShowProjectHeaderActions(ProjectId.make("project-1"))).toBe(true);
+  });
+
+  it("preserves the default behavior without an active project", () => {
+    expect(shouldShowProjectHeaderActions(undefined)).toBe(true);
+  });
+});
 
 describe("shouldShowOpenInPicker", () => {
   const primaryEnvironmentId = EnvironmentId.make("environment-primary");
diff --git a/apps/web/src/components/chat/ChatHeader.tsx b/apps/web/src/components/chat/ChatHeader.tsx
index ef3ec863d0b..0e0ce9130c1 100644
--- a/apps/web/src/components/chat/ChatHeader.tsx
+++ b/apps/web/src/components/chat/ChatHeader.tsx
@@ -1,6 +1,7 @@
 import {
   type EnvironmentId,
   type EditorId,
+  type ProjectId,
   type ProjectScript,
   type ResolvedKeybindingsConfig,
   type ThreadId,
@@ -17,12 +18,14 @@ import ProjectScriptsControl, {
 import { OpenInPicker } from "./OpenInPicker";
 import { usePrimaryEnvironmentId } from "../../state/environments";
 import { cn } from "~/lib/utils";
+import { GENERAL_CHATS_PROJECT_ID } from "../../generalChats";
 
 interface ChatHeaderProps {
   activeThreadEnvironmentId: EnvironmentId;
   activeThreadId: ThreadId;
   draftId?: DraftId;
   activeThreadTitle: string;
+  activeProjectId: ProjectId | undefined;
   activeProjectName: string | undefined;
   openInCwd: string | null;
   activeProjectScripts: ReadonlyArray<ProjectScript> | undefined;
@@ -52,11 +55,16 @@ export function shouldShowOpenInPicker(input: {
   );
 }
 
+export function shouldShowProjectHeaderActions(activeProjectId: ProjectId | undefined): boolean {
+  return activeProjectId !== GENERAL_CHATS_PROJECT_ID;
+}
+
 export const ChatHeader = memo(function ChatHeader({
   activeThreadEnvironmentId,
   activeThreadId,
   draftId,
   activeThreadTitle,
+  activeProjectId,
   activeProjectName,
   openInCwd,
   activeProjectScripts,
@@ -76,6 +84,7 @@ export const ChatHeader = memo(function ChatHeader({
     activeThreadEnvironmentId,
     primaryEnvironmentId,
   });
+  const showProjectHeaderActions = shouldShowProjectHeaderActions(activeProjectId);
   return (
     <div className="@container/header-actions flex min-w-0 flex-1 items-center gap-2 sm:gap-3">
       <div className="flex min-w-0 flex-1 items-center gap-2 overflow-hidden sm:gap-3">
@@ -100,32 +109,36 @@ export const ChatHeader = memo(function ChatHeader({
           rightPanelOpen ? "pr-0" : "pr-16",
         )}
       >
-        {activeProjectScripts && (
-          <ProjectScriptsControl
-            scripts={activeProjectScripts}
-            keybindings={keybindings}
-            preferredScriptId={preferredScriptId}
-            onRunScript={onRunProjectScript}
-            onAddScript={onAddProjectScript}
-            onUpdateScript={onUpdateProjectScript}
-            onDeleteScript={onDeleteProjectScript}
-          />
-        )}
-        {showOpenInPicker && (
-          <OpenInPicker
-            environmentId={activeThreadEnvironmentId}
-            keybindings={keybindings}
-            availableEditors={availableEditors}
-            openInCwd={openInCwd}
-          />
-        )}
-        {activeProjectName && (
-          <GitActionsControl
-            gitCwd={gitCwd}
-            activeThreadRef={scopeThreadRef(activeThreadEnvironmentId, activeThreadId)}
-            {...(draftId ? { draftId } : {})}
-          />
-        )}
+        {showProjectHeaderActions ? (
+          <>
+            {activeProjectScripts && (
+              <ProjectScriptsControl
+                scripts={activeProjectScripts}
+                keybindings={keybindings}
+                preferredScriptId={preferredScriptId}
+                onRunScript={onRunProjectScript}
+                onAddScript={onAddProjectScript}
+                onUpdateScript={onUpdateProjectScript}
+                onDeleteScript={onDeleteProjectScript}
+              />
+            )}
+            {showOpenInPicker && (
+              <OpenInPicker
+                environmentId={activeThreadEnvironmentId}
+                keybindings={keybindings}
+                availableEditors={availableEditors}
+                openInCwd={openInCwd}
+              />
+            )}
+            {activeProjectName && (
+              <GitActionsControl
+                gitCwd={gitCwd}
+                activeThreadRef={scopeThreadRef(activeThreadEnvironmentId, activeThreadId)}
+                {...(draftId ? { draftId } : {})}
+              />
+            )}
+          </>
+        ) : null}
       </div>
     </div>
   );
diff --git a/apps/web/src/generalChats.test.ts b/apps/web/src/generalChats.test.ts
index 45c3f6cc939..83c1d6aec44 100644
--- a/apps/web/src/generalChats.test.ts
+++ b/apps/web/src/generalChats.test.ts
@@ -5,7 +5,9 @@ import type { Project } from "./types";
 import {
   excludeGeneralChatsProject,
   findGeneralChatsProject,
+  GENERAL_CHAT_NEW_THREAD_OPTIONS,
   GENERAL_CHATS_PROJECT_ID,
+  getGeneralChatNewThreadOptions,
   isGeneralChatsProject,
 } from "./generalChats";
 
@@ -56,4 +58,17 @@ describe("general chats project", () => {
 
     expect(excludeGeneralChatsProject([chatsProject, regularProject])).toEqual([regularProject]);
   });
+
+  it("forces replacement drafts for chats to stay local", () => {
+    expect(getGeneralChatNewThreadOptions(GENERAL_CHATS_PROJECT_ID)).toBe(
+      GENERAL_CHAT_NEW_THREAD_OPTIONS,
+    );
+    expect(getGeneralChatNewThreadOptions(ProjectId.make("regular"))).toBeUndefined();
+    expect(GENERAL_CHAT_NEW_THREAD_OPTIONS).toEqual({
+      branch: null,
+      worktreePath: null,
+      envMode: "local",
+      startFromOrigin: false,
+    });
+  });
 });
diff --git a/apps/web/src/generalChats.ts b/apps/web/src/generalChats.ts
index 2cb11a0eee1..1a34976fdc5 100644
--- a/apps/web/src/generalChats.ts
+++ b/apps/web/src/generalChats.ts
@@ -6,6 +6,12 @@ import type { Project } from "./types";
 export const GENERAL_CHATS_PROJECT_ID = ProjectIdSchema.make("t3code-general-chats");
 export const GENERAL_CHATS_PROJECT_TITLE = "Chats";
 export const GENERAL_CHATS_WORKSPACE_ROOT = "~/.t3/chats";
+export const GENERAL_CHAT_NEW_THREAD_OPTIONS = {
+  branch: null,
+  worktreePath: null,
+  envMode: "local",
+  startFromOrigin: false,
+} as const;
 
 export function isGeneralChatsProject(
   project: Pick<Project, "id">,
@@ -31,3 +37,7 @@ export function findGeneralChatsProject(
 export function excludeGeneralChatsProject(projects: ReadonlyArray<Project>): Project[] {
   return projects.filter((project) => !isGeneralChatsProject(project));
 }
+
+export function getGeneralChatNewThreadOptions(projectId: ProjectId) {
+  return projectId === GENERAL_CHATS_PROJECT_ID ? GENERAL_CHAT_NEW_THREAD_OPTIONS : undefined;
+}
diff --git a/apps/web/src/hooks/useThreadActions.ts b/apps/web/src/hooks/useThreadActions.ts
index 07655ad30d7..b08756dde69 100644
--- a/apps/web/src/hooks/useThreadActions.ts
+++ b/apps/web/src/hooks/useThreadActions.ts
@@ -26,6 +26,7 @@ import { formatWorktreePathForDisplay, getOrphanedWorktreePathForThread } from "
 import { stackedThreadToast, toastManager } from "../components/ui/toast";
 import { useClientSettings } from "./useSettings";
 import { useAtomCommand } from "../state/use-atom-command";
+import { getGeneralChatNewThreadOptions } from "../generalChats";
 
 export class ThreadArchiveBlockedError extends Schema.TaggedErrorClass<ThreadArchiveBlockedError>()(
   "ThreadArchiveBlockedError",
@@ -118,7 +119,10 @@ export function useThreadActions() {
 
       if (shouldNavigateToDraft) {
         const navigationResult = await settlePromise(() =>
-          handleNewThreadRef.current(scopeProjectRef(thread.environmentId, thread.projectId)),
+          handleNewThreadRef.current(
+            scopeProjectRef(thread.environmentId, thread.projectId),
+            getGeneralChatNewThreadOptions(thread.projectId),
+          ),
         );
         if (navigationResult._tag === "Failure") {
           return navigationResult;

From 04b25e9ad73fcdaa1def09ec934832891239e289 Mon Sep 17 00:00:00 2001
From: Jake Leventhal <jakeleventhal@me.com>
Date: Tue, 14 Jul 2026 20:35:38 -0400
Subject: [PATCH 3/4] fix(web): address general chats review feedback

---
 apps/web/src/components/Sidebar.tsx      | 60 ++++++++++++++----------
 apps/web/src/generalChats.test.ts        | 36 ++++++++++++++
 apps/web/src/generalChats.ts             | 30 ++++++++++++
 apps/web/src/hooks/useHandleNewThread.ts | 53 ++++++++++++---------
 4 files changed, 134 insertions(+), 45 deletions(-)

diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index ebad9c72e37..7eeb29dae7a 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -187,6 +187,7 @@ import { useThreadSelectionStore } from "../threadSelectionStore";
 import { useOpenAddProjectCommandPalette } from "../commandPaletteContext";
 import {
   getSidebarThreadIdsToPrewarm,
+  getVisibleThreadsForProject,
   resolveAdjacentThreadId,
   isContextMenuPointerDown,
   isTrailingDoubleClick,
@@ -230,6 +231,7 @@ import {
   GENERAL_CHATS_PROJECT_ID,
   GENERAL_CHATS_PROJECT_TITLE,
   GENERAL_CHATS_WORKSPACE_ROOT,
+  isGeneralChatsProjectAlreadyExistsError,
 } from "../generalChats";
 const SIDEBAR_SORT_LABELS: Record<SidebarProjectSortOrder, string> = {
   updated_at: "Last user message",
@@ -1331,27 +1333,24 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
         },
       });
     };
-    const hasOverflowingThreads = visibleProjectThreads.length > sidebarThreadPreviewCount;
-    const previewThreads =
-      isThreadListExpanded || !hasOverflowingThreads
-        ? visibleProjectThreads
-        : visibleProjectThreads.slice(0, sidebarThreadPreviewCount);
-    const visibleThreadKeys = new Set(
-      [...previewThreads, ...(pinnedCollapsedThread ? [pinnedCollapsedThread] : [])].map((thread) =>
-        scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)),
-      ),
-    );
+    const activeThreadId = visibleProjectThreads.find(
+      (thread) =>
+        scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)) === activeRouteThreadKey,
+    )?.id;
+    const threadVisibility = getVisibleThreadsForProject({
+      threads: visibleProjectThreads,
+      activeThreadId,
+      isThreadListExpanded,
+      previewLimit: sidebarThreadPreviewCount,
+    });
     const renderedThreads = pinnedCollapsedThread
       ? [pinnedCollapsedThread]
-      : visibleProjectThreads.filter((thread) =>
-          visibleThreadKeys.has(scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id))),
-        );
-    const hiddenThreads = visibleProjectThreads.filter(
-      (thread) =>
-        !visibleThreadKeys.has(scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id))),
-    );
+      : threadVisibility.visibleThreads;
+    const hiddenThreads = pinnedCollapsedThread
+      ? visibleProjectThreads.filter((thread) => thread.id !== pinnedCollapsedThread.id)
+      : threadVisibility.hiddenThreads;
     return {
-      hasOverflowingThreads,
+      hasOverflowingThreads: threadVisibility.hasHiddenThreads,
       hiddenThreadStatus: resolveProjectStatusIndicator(
         hiddenThreads.map((thread) => resolveProjectThreadStatus(thread)),
       ),
@@ -1360,6 +1359,7 @@ const SidebarProjectItem = memo(function SidebarProjectItem(props: SidebarProjec
       shouldShowThreadPanel: projectExpanded || pinnedCollapsedThread !== null,
     };
   }, [
+    activeRouteThreadKey,
     isThreadListExpanded,
     pinnedCollapsedThread,
     projectExpanded,
@@ -3460,8 +3460,11 @@ export default function Sidebar() {
             },
           });
           if (createResult._tag === "Failure") {
-            if (!isAtomCommandInterrupted(createResult)) {
-              const error = squashAtomCommandFailure(createResult);
+            if (isAtomCommandInterrupted(createResult)) {
+              return;
+            }
+            const error = squashAtomCommandFailure(createResult);
+            if (!isGeneralChatsProjectAlreadyExistsError(error)) {
               toastManager.add(
                 stackedThreadToast({
                   type: "error",
@@ -3469,8 +3472,8 @@ export default function Sidebar() {
                   description: error instanceof Error ? error.message : "An error occurred.",
                 }),
               );
+              return;
             }
-            return;
           }
         }
 
@@ -3598,13 +3601,22 @@ export default function Sidebar() {
       ),
       sidebarThreadSortOrder,
     );
-    const renderedChats = expandedThreadListsByProject.has(generalChatsSidebarProject.projectKey)
-      ? chats
-      : chats.slice(0, sidebarThreadPreviewCount);
+    const activeThreadId = chats.find(
+      (thread) =>
+        scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)) ===
+        activeGeneralChatsThreadKey,
+    )?.id;
+    const renderedChats = getVisibleThreadsForProject({
+      threads: chats,
+      activeThreadId,
+      isThreadListExpanded: expandedThreadListsByProject.has(generalChatsSidebarProject.projectKey),
+      previewLimit: sidebarThreadPreviewCount,
+    }).visibleThreads;
     return renderedChats.map((thread) =>
       scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)),
     );
   }, [
+    activeGeneralChatsThreadKey,
     expandedThreadListsByProject,
     generalChatsSidebarProject,
     sidebarThreadPreviewCount,
diff --git a/apps/web/src/generalChats.test.ts b/apps/web/src/generalChats.test.ts
index 83c1d6aec44..9489f0cd812 100644
--- a/apps/web/src/generalChats.test.ts
+++ b/apps/web/src/generalChats.test.ts
@@ -8,7 +8,9 @@ import {
   GENERAL_CHAT_NEW_THREAD_OPTIONS,
   GENERAL_CHATS_PROJECT_ID,
   getGeneralChatNewThreadOptions,
+  isGeneralChatsProjectAlreadyExistsError,
   isGeneralChatsProject,
+  resolveGeneralChatNewThreadOptions,
 } from "./generalChats";
 
 const LOCAL_ENVIRONMENT_ID = EnvironmentId.make("local");
@@ -71,4 +73,38 @@ describe("general chats project", () => {
       startFromOrigin: false,
     });
   });
+
+  it("overrides contextual options for every new general chat", () => {
+    expect(
+      resolveGeneralChatNewThreadOptions(GENERAL_CHATS_PROJECT_ID, {
+        branch: "feature/contextual-branch",
+        worktreePath: "/workspace/contextual-worktree",
+        envMode: "worktree",
+        startFromOrigin: true,
+      }),
+    ).toEqual(GENERAL_CHAT_NEW_THREAD_OPTIONS);
+
+    const regularOptions = { branch: "feature/regular", envMode: "worktree" } as const;
+    expect(resolveGeneralChatNewThreadOptions(ProjectId.make("regular"), regularOptions)).toBe(
+      regularOptions,
+    );
+  });
+
+  it("recognizes only the exact duplicate general chats project invariant", () => {
+    expect(
+      isGeneralChatsProjectAlreadyExistsError({
+        _tag: "OrchestrationCommandInvariantError",
+        commandType: "project.create",
+        detail: `Project '${GENERAL_CHATS_PROJECT_ID}' already exists and cannot be created twice.`,
+      }),
+    ).toBe(true);
+    expect(
+      isGeneralChatsProjectAlreadyExistsError({
+        _tag: "OrchestrationCommandInvariantError",
+        commandType: "project.create",
+        detail: "Failed to create the workspace root.",
+      }),
+    ).toBe(false);
+    expect(isGeneralChatsProjectAlreadyExistsError(new Error("already exists"))).toBe(false);
+  });
 });
diff --git a/apps/web/src/generalChats.ts b/apps/web/src/generalChats.ts
index 1a34976fdc5..9e15088f7d1 100644
--- a/apps/web/src/generalChats.ts
+++ b/apps/web/src/generalChats.ts
@@ -1,6 +1,7 @@
 import type { EnvironmentId, ProjectId } from "@t3tools/contracts";
 import { ProjectId as ProjectIdSchema } from "@t3tools/contracts";
 
+import type { DraftThreadEnvMode } from "./composerDraftStore";
 import type { Project } from "./types";
 
 export const GENERAL_CHATS_PROJECT_ID = ProjectIdSchema.make("t3code-general-chats");
@@ -13,6 +14,13 @@ export const GENERAL_CHAT_NEW_THREAD_OPTIONS = {
   startFromOrigin: false,
 } as const;
 
+export interface GeneralChatNewThreadOptions {
+  readonly branch?: string | null;
+  readonly worktreePath?: string | null;
+  readonly envMode?: DraftThreadEnvMode;
+  readonly startFromOrigin?: boolean;
+}
+
 export function isGeneralChatsProject(
   project: Pick<Project, "id">,
 ): project is Pick<Project, "id"> & { readonly id: ProjectId } {
@@ -41,3 +49,25 @@ export function excludeGeneralChatsProject(projects: ReadonlyArray<Project>): Pr
 export function getGeneralChatNewThreadOptions(projectId: ProjectId) {
   return projectId === GENERAL_CHATS_PROJECT_ID ? GENERAL_CHAT_NEW_THREAD_OPTIONS : undefined;
 }
+
+export function resolveGeneralChatNewThreadOptions(
+  projectId: ProjectId,
+  options?: GeneralChatNewThreadOptions,
+): GeneralChatNewThreadOptions | undefined {
+  const generalChatOptions = getGeneralChatNewThreadOptions(projectId);
+  return generalChatOptions ? { ...options, ...generalChatOptions } : options;
+}
+
+export function isGeneralChatsProjectAlreadyExistsError(error: unknown): boolean {
+  if (typeof error !== "object" || error === null) {
+    return false;
+  }
+
+  const candidate = error as Record<string, unknown>;
+  return (
+    candidate._tag === "OrchestrationCommandInvariantError" &&
+    candidate.commandType === "project.create" &&
+    candidate.detail ===
+      `Project '${GENERAL_CHATS_PROJECT_ID}' already exists and cannot be created twice.`
+  );
+}
diff --git a/apps/web/src/hooks/useHandleNewThread.ts b/apps/web/src/hooks/useHandleNewThread.ts
index ca74e1339b7..88855cec48e 100644
--- a/apps/web/src/hooks/useHandleNewThread.ts
+++ b/apps/web/src/hooks/useHandleNewThread.ts
@@ -28,7 +28,7 @@ import { resolveNewDraftStartFromOrigin } from "../lib/chatThreadActions";
 import { resolveThreadRouteTarget } from "../threadRoutes";
 import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
 import { useClientSettings } from "./useSettings";
-import { excludeGeneralChatsProject } from "../generalChats";
+import { excludeGeneralChatsProject, resolveGeneralChatNewThreadOptions } from "../generalChats";
 
 export function useNewThreadHandler() {
   const projects = useProjects();
@@ -50,6 +50,7 @@ export function useNewThreadHandler() {
         startFromOrigin?: boolean;
       },
     ): Promise<void> => {
+      const resolvedOptions = resolveGeneralChatNewThreadOptions(projectRef.projectId, options);
       const {
         getDraftSessionByLogicalProjectKey,
         getDraftSession,
@@ -69,10 +70,10 @@ export function useNewThreadHandler() {
       const logicalProjectKey = project
         ? deriveLogicalProjectKeyFromSettings(project, projectGroupingSettings)
         : scopedProjectKey(projectRef);
-      const hasBranchOption = options?.branch !== undefined;
-      const hasWorktreePathOption = options?.worktreePath !== undefined;
-      const hasEnvModeOption = options?.envMode !== undefined;
-      const hasStartFromOriginOption = options?.startFromOrigin !== undefined;
+      const hasBranchOption = resolvedOptions?.branch !== undefined;
+      const hasWorktreePathOption = resolvedOptions?.worktreePath !== undefined;
+      const hasEnvModeOption = resolvedOptions?.envMode !== undefined;
+      const hasStartFromOriginOption = resolvedOptions?.startFromOrigin !== undefined;
       const storedDraftThread = getDraftSessionByLogicalProjectKey(logicalProjectKey);
       const storedDraftThreadRef = storedDraftThread
         ? scopeThreadRef(storedDraftThread.environmentId, storedDraftThread.threadId)
@@ -98,10 +99,14 @@ export function useNewThreadHandler() {
             hasStartFromOriginOption
           ) {
             setDraftThreadContext(reusableStoredDraftThread.draftId, {
-              ...(hasBranchOption ? { branch: options?.branch ?? null } : {}),
-              ...(hasWorktreePathOption ? { worktreePath: options?.worktreePath ?? null } : {}),
-              ...(hasEnvModeOption ? { envMode: options?.envMode } : {}),
-              ...(hasStartFromOriginOption ? { startFromOrigin: options?.startFromOrigin } : {}),
+              ...(hasBranchOption ? { branch: resolvedOptions?.branch ?? null } : {}),
+              ...(hasWorktreePathOption
+                ? { worktreePath: resolvedOptions?.worktreePath ?? null }
+                : {}),
+              ...(hasEnvModeOption ? { envMode: resolvedOptions?.envMode } : {}),
+              ...(hasStartFromOriginOption
+                ? { startFromOrigin: resolvedOptions?.startFromOrigin }
+                : {}),
             });
           }
           setLogicalProjectDraftThreadId(
@@ -138,10 +143,14 @@ export function useNewThreadHandler() {
           hasStartFromOriginOption
         ) {
           setDraftThreadContext(currentRouteTarget.draftId, {
-            ...(hasBranchOption ? { branch: options?.branch ?? null } : {}),
-            ...(hasWorktreePathOption ? { worktreePath: options?.worktreePath ?? null } : {}),
-            ...(hasEnvModeOption ? { envMode: options?.envMode } : {}),
-            ...(hasStartFromOriginOption ? { startFromOrigin: options?.startFromOrigin } : {}),
+            ...(hasBranchOption ? { branch: resolvedOptions?.branch ?? null } : {}),
+            ...(hasWorktreePathOption
+              ? { worktreePath: resolvedOptions?.worktreePath ?? null }
+              : {}),
+            ...(hasEnvModeOption ? { envMode: resolvedOptions?.envMode } : {}),
+            ...(hasStartFromOriginOption
+              ? { startFromOrigin: resolvedOptions?.startFromOrigin }
+              : {}),
           });
         }
         setLogicalProjectDraftThreadId(logicalProjectKey, projectRef, currentRouteTarget.draftId, {
@@ -149,10 +158,12 @@ export function useNewThreadHandler() {
           createdAt: latestActiveDraftThread.createdAt,
           runtimeMode: latestActiveDraftThread.runtimeMode,
           interactionMode: latestActiveDraftThread.interactionMode,
-          ...(hasBranchOption ? { branch: options?.branch ?? null } : {}),
-          ...(hasWorktreePathOption ? { worktreePath: options?.worktreePath ?? null } : {}),
-          ...(hasEnvModeOption ? { envMode: options?.envMode } : {}),
-          ...(hasStartFromOriginOption ? { startFromOrigin: options?.startFromOrigin } : {}),
+          ...(hasBranchOption ? { branch: resolvedOptions?.branch ?? null } : {}),
+          ...(hasWorktreePathOption ? { worktreePath: resolvedOptions?.worktreePath ?? null } : {}),
+          ...(hasEnvModeOption ? { envMode: resolvedOptions?.envMode } : {}),
+          ...(hasStartFromOriginOption
+            ? { startFromOrigin: resolvedOptions?.startFromOrigin }
+            : {}),
         });
         return Promise.resolve();
       }
@@ -160,16 +171,16 @@ export function useNewThreadHandler() {
       const draftId = newDraftId();
       const threadId = newThreadId();
       const createdAt = new Date().toISOString();
-      const initialEnvMode = options?.envMode ?? environmentSettings.defaultThreadEnvMode;
+      const initialEnvMode = resolvedOptions?.envMode ?? environmentSettings.defaultThreadEnvMode;
       return (async () => {
         setLogicalProjectDraftThreadId(logicalProjectKey, projectRef, draftId, {
           threadId,
           createdAt,
-          branch: options?.branch ?? null,
-          worktreePath: options?.worktreePath ?? null,
+          branch: resolvedOptions?.branch ?? null,
+          worktreePath: resolvedOptions?.worktreePath ?? null,
           envMode: initialEnvMode,
           startFromOrigin:
-            options?.startFromOrigin ??
+            resolvedOptions?.startFromOrigin ??
             resolveNewDraftStartFromOrigin({
               envMode: initialEnvMode,
               newWorktreesStartFromOrigin: environmentSettings.newWorktreesStartFromOrigin,

From 8d7cf85806363bbb0f45f0adef4adc31142b0d4b Mon Sep 17 00:00:00 2001
From: Jake Leventhal <jakeleventhal@me.com>
Date: Tue, 14 Jul 2026 21:41:28 -0400
Subject: [PATCH 4/4] fix: resolve remaining standalone chats issues from PR

---
 .../archive/archivedThreadList.test.ts        | 20 +++++++
 .../features/archive/archivedThreadList.ts    |  4 ++
 .../src/features/home/homeThreadList.test.ts  | 18 +++++++
 .../src/features/home/homeThreadList.ts       | 14 ++++-
 .../features/threads/NewTaskDraftScreen.tsx   |  5 +-
 .../threads/new-task-flow-provider.tsx        |  9 +++-
 apps/mobile/src/lib/repositoryGroups.test.ts  | 21 ++++++++
 apps/mobile/src/lib/repositoryGroups.ts       | 10 +++-
 apps/web/src/components/CommandPalette.tsx    | 52 +++++++++----------
 apps/web/src/components/Sidebar.tsx           | 33 +++++++++---
 apps/web/src/generalChats.ts                  | 28 +++++-----
 apps/web/src/hooks/useHandleNewThread.ts      | 17 +++---
 apps/web/src/state/entities.ts                | 42 +++++++++++++++
 packages/client-runtime/package.json          |  4 ++
 .../client-runtime/src/generalChats.test.ts   | 28 ++++++++++
 packages/client-runtime/src/generalChats.ts   | 25 +++++++++
 16 files changed, 268 insertions(+), 62 deletions(-)
 create mode 100644 packages/client-runtime/src/generalChats.test.ts
 create mode 100644 packages/client-runtime/src/generalChats.ts

diff --git a/apps/mobile/src/features/archive/archivedThreadList.test.ts b/apps/mobile/src/features/archive/archivedThreadList.test.ts
index 6cd530ab37d..9b69b2c0643 100644
--- a/apps/mobile/src/features/archive/archivedThreadList.test.ts
+++ b/apps/mobile/src/features/archive/archivedThreadList.test.ts
@@ -1,4 +1,5 @@
 import type { ArchivedSnapshotEntry } from "@t3tools/client-runtime/state/threads";
+import { GENERAL_CHATS_PROJECT_ID } from "@t3tools/client-runtime/general-chats";
 import type { OrchestrationProjectShell, OrchestrationThreadShell } from "@t3tools/contracts";
 import { EnvironmentId, ProjectId, ProviderInstanceId, ThreadId } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
@@ -61,6 +62,25 @@ function makeSnapshot(
 }
 
 describe("buildArchivedThreadGroups", () => {
+  it("keeps archived standalone chats out of the mobile archive", () => {
+    const chatsProject = makeProject({ id: GENERAL_CHATS_PROJECT_ID, title: "Chats" });
+    const chatsThread = makeThread({
+      id: ThreadId.make("chat-thread"),
+      projectId: GENERAL_CHATS_PROJECT_ID,
+      title: "Archived chat",
+    });
+
+    expect(
+      buildArchivedThreadGroups({
+        snapshots: [makeSnapshot([chatsProject], [chatsThread])],
+        environmentLabels: {},
+        environmentId: null,
+        searchQuery: "",
+        sortOrder: "newest",
+      }),
+    ).toEqual([]);
+  });
+
   it("groups archived threads by project and sorts newest first", () => {
     const project = makeProject({ id: ProjectId.make("project-1"), title: "T3 Code" });
     const older = makeThread({
diff --git a/apps/mobile/src/features/archive/archivedThreadList.ts b/apps/mobile/src/features/archive/archivedThreadList.ts
index 6146bba2044..cd4324572f3 100644
--- a/apps/mobile/src/features/archive/archivedThreadList.ts
+++ b/apps/mobile/src/features/archive/archivedThreadList.ts
@@ -1,4 +1,5 @@
 import type { ArchivedSnapshotEntry } from "@t3tools/client-runtime/state/threads";
+import { isGeneralChatsProjectId } from "@t3tools/client-runtime/general-chats";
 import {
   scopeProject,
   scopeThreadShell,
@@ -55,6 +56,9 @@ export function buildArchivedThreadGroups(input: {
     }
 
     for (const rawProject of entry.snapshot.projects) {
+      if (isGeneralChatsProjectId(rawProject.id)) {
+        continue;
+      }
       const project = scopeProject(entry.environmentId, rawProject);
       const projectThreads = threadsByProjectId.get(project.id) ?? [];
       const groupMatches =
diff --git a/apps/mobile/src/features/home/homeThreadList.test.ts b/apps/mobile/src/features/home/homeThreadList.test.ts
index 8f13000b9e2..b8675a13b9e 100644
--- a/apps/mobile/src/features/home/homeThreadList.test.ts
+++ b/apps/mobile/src/features/home/homeThreadList.test.ts
@@ -2,6 +2,7 @@ import type {
   EnvironmentProject,
   EnvironmentThreadShell,
 } from "@t3tools/client-runtime/state/shell";
+import { GENERAL_CHATS_PROJECT_ID } from "@t3tools/client-runtime/general-chats";
 import { EnvironmentId, ProjectId, ProviderInstanceId, ThreadId } from "@t3tools/contracts";
 import { describe, expect, it } from "vite-plus/test";
 
@@ -65,6 +66,23 @@ function buildGroups(
 }
 
 describe("buildHomeThreadGroups", () => {
+  it("keeps standalone chats out of the normal mobile thread groups", () => {
+    const environmentId = EnvironmentId.make("environment-1");
+    const chatsProject = makeProject({
+      environmentId,
+      id: GENERAL_CHATS_PROJECT_ID,
+      title: "Chats",
+    });
+    const chatsThread = makeThread({
+      environmentId,
+      id: ThreadId.make("chat-thread"),
+      projectId: GENERAL_CHATS_PROJECT_ID,
+      title: "Ad hoc chat",
+    });
+
+    expect(buildGroups([chatsProject], [chatsThread])).toEqual([]);
+  });
+
   it("sorts the newest thread first regardless of snapshot order", () => {
     const environmentId = EnvironmentId.make("environment-1");
     const project = makeProject({
diff --git a/apps/mobile/src/features/home/homeThreadList.ts b/apps/mobile/src/features/home/homeThreadList.ts
index cada956d8bb..839e91766f3 100644
--- a/apps/mobile/src/features/home/homeThreadList.ts
+++ b/apps/mobile/src/features/home/homeThreadList.ts
@@ -2,6 +2,11 @@ import {
   deriveLogicalProjectKey,
   deriveProjectGroupLabel,
 } from "@t3tools/client-runtime/state/project-grouping";
+import {
+  excludeGeneralChatsProject,
+  excludeGeneralChatsThreads,
+  isGeneralChatsProjectId,
+} from "@t3tools/client-runtime/general-chats";
 import type {
   EnvironmentProject,
   EnvironmentThreadShell,
@@ -100,10 +105,12 @@ export function buildHomeThreadGroups(input: {
   readonly now?: number;
 }): ReadonlyArray<HomeThreadGroup> {
   const now = input.now ?? Date.now();
+  const projects = excludeGeneralChatsProject(input.projects);
+  const threads = excludeGeneralChatsThreads(input.threads);
   const groups = new Map<string, MutableHomeThreadGroup>();
   const groupKeyByProjectKey = new Map<string, string>();
 
-  for (const project of input.projects) {
+  for (const project of projects) {
     if (input.environmentId !== null && project.environmentId !== input.environmentId) {
       continue;
     }
@@ -123,6 +130,9 @@ export function buildHomeThreadGroups(input: {
   }
 
   for (const pendingTask of input.pendingTasks ?? []) {
+    if (isGeneralChatsProjectId(pendingTask.creation.projectId)) {
+      continue;
+    }
     if (input.environmentId !== null && pendingTask.message.environmentId !== input.environmentId) {
       continue;
     }
@@ -161,7 +171,7 @@ export function buildHomeThreadGroups(input: {
     groups.get(groupKey)?.pendingTasks.push(pendingTask);
   }
 
-  for (const thread of input.threads) {
+  for (const thread of threads) {
     if (thread.archivedAt !== null) {
       continue;
     }
diff --git a/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx b/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
index dd8216dcecf..8814e2ccc35 100644
--- a/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
+++ b/apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
@@ -12,6 +12,7 @@ import {
   isAtomCommandInterrupted,
   squashAtomCommandFailure,
 } from "@t3tools/client-runtime/state/runtime";
+import { isGeneralChatsProjectId } from "@t3tools/client-runtime/general-chats";
 
 import { ComposerEditor, type ComposerEditorHandle } from "../../components/ComposerEditor";
 import {
@@ -143,7 +144,9 @@ export function NewTaskDraftScreen(props: {
       const directProject =
         projects.find(
           (project) =>
-            project.environmentId === initialEnvironmentId && project.id === initialProjectId,
+            project.environmentId === initialEnvironmentId &&
+            project.id === initialProjectId &&
+            !isGeneralChatsProjectId(project.id),
         ) ?? null;
 
       if (directProject) {
diff --git a/apps/mobile/src/features/threads/new-task-flow-provider.tsx b/apps/mobile/src/features/threads/new-task-flow-provider.tsx
index ee2bde9d971..b21d74853d2 100644
--- a/apps/mobile/src/features/threads/new-task-flow-provider.tsx
+++ b/apps/mobile/src/features/threads/new-task-flow-provider.tsx
@@ -24,6 +24,10 @@ import type { DraftComposerImageAttachment } from "../../lib/composerImages";
 import type { ModelOption, ProviderGroup } from "../../lib/modelOptions";
 import { buildModelOptions, groupByProvider } from "../../lib/modelOptions";
 import { groupProjectsByRepository } from "../../lib/repositoryGroups";
+import {
+  excludeGeneralChatsProject,
+  isGeneralChatsProjectId,
+} from "@t3tools/client-runtime/general-chats";
 import { scopedProjectKey } from "../../lib/scopedEntities";
 import { appAtomRegistry } from "../../state/atom-registry";
 import {
@@ -166,7 +170,8 @@ type NewTaskFlowContextValue = {
 const NewTaskFlowContext = React.createContext<NewTaskFlowContextValue | null>(null);
 
 export function NewTaskFlowProvider(props: React.PropsWithChildren) {
-  const projects = useProjects();
+  const allProjects = useProjects();
+  const projects = useMemo(() => excludeGeneralChatsProject(allProjects), [allProjects]);
   const threads = useThreadShells();
   const { savedConnectionsById } = useSavedRemoteConnections();
 
@@ -625,7 +630,7 @@ export function NewTaskFlowProvider(props: React.PropsWithChildren) {
 
   const beginEditingPendingTask = useCallback((messageId: string): boolean => {
     const message = findQueuedPendingTask(messageId);
-    if (!message?.creation) {
+    if (!message?.creation || isGeneralChatsProjectId(message.creation.projectId)) {
       return false;
     }
     const draftKey = pendingTaskDraftKey(message.messageId);
diff --git a/apps/mobile/src/lib/repositoryGroups.test.ts b/apps/mobile/src/lib/repositoryGroups.test.ts
index 8cea5df2307..0dcba965b8a 100644
--- a/apps/mobile/src/lib/repositoryGroups.test.ts
+++ b/apps/mobile/src/lib/repositoryGroups.test.ts
@@ -4,6 +4,7 @@ import { EnvironmentId, ProjectId, ProviderInstanceId, ThreadId } from "@t3tools
 
 import { groupProjectsByRepository } from "./repositoryGroups";
 import { EnvironmentProject, EnvironmentThreadShell } from "@t3tools/client-runtime/state/shell";
+import { GENERAL_CHATS_PROJECT_ID } from "@t3tools/client-runtime/general-chats";
 
 function makeProject(
   input: Partial<EnvironmentProject> & Pick<EnvironmentProject, "environmentId" | "id" | "title">,
@@ -187,4 +188,24 @@ describe("groupProjectsByRepository", () => {
     expect(groups[0]?.title).toBe("Scratchpad");
     expect(groups[0]?.subtitle).toBeNull();
   });
+
+  it("keeps the app-managed Chats project out of mobile project pickers", () => {
+    const environmentId = EnvironmentId.make("env-local");
+    const chatsProject = makeProject({
+      environmentId,
+      id: GENERAL_CHATS_PROJECT_ID,
+      title: "Chats",
+    });
+    const chatsThread = makeThread({
+      environmentId,
+      id: ThreadId.make("chat-thread"),
+      projectId: GENERAL_CHATS_PROJECT_ID,
+      title: "Ad hoc chat",
+      modelSelection: { instanceId: ProviderInstanceId.make("codex"), model: "gpt-5.4" },
+    });
+
+    expect(groupProjectsByRepository({ projects: [chatsProject], threads: [chatsThread] })).toEqual(
+      [],
+    );
+  });
 });
diff --git a/apps/mobile/src/lib/repositoryGroups.ts b/apps/mobile/src/lib/repositoryGroups.ts
index bf4c2f3fccd..c574d54f261 100644
--- a/apps/mobile/src/lib/repositoryGroups.ts
+++ b/apps/mobile/src/lib/repositoryGroups.ts
@@ -1,5 +1,9 @@
 import * as Order from "effect/Order";
 import * as Arr from "effect/Array";
+import {
+  excludeGeneralChatsProject,
+  excludeGeneralChatsThreads,
+} from "@t3tools/client-runtime/general-chats";
 import type { RepositoryIdentity } from "@t3tools/contracts";
 
 import { scopedProjectKey } from "./scopedEntities";
@@ -62,9 +66,11 @@ export function groupProjectsByRepository(input: {
   readonly projects: ReadonlyArray<EnvironmentProject>;
   readonly threads: ReadonlyArray<EnvironmentThreadShell>;
 }): ReadonlyArray<RepositoryGroup> {
+  const projects = excludeGeneralChatsProject(input.projects);
+  const threads = excludeGeneralChatsThreads(input.threads);
   const threadsByProjectKey = new Map<string, EnvironmentThreadShell[]>();
 
-  for (const thread of input.threads) {
+  for (const thread of threads) {
     const key = scopedProjectKey(thread.environmentId, thread.projectId);
     const existing = threadsByProjectKey.get(key);
     if (existing) {
@@ -76,7 +82,7 @@ export function groupProjectsByRepository(input: {
 
   const grouped = new Map<string, RepositoryGroup>();
 
-  for (const project of input.projects) {
+  for (const project of projects) {
     const key = deriveRepositoryGroupKey(project);
     const projectKey = scopedProjectKey(project.environmentId, project.id);
     const threads = Arr.sortWith(
diff --git a/apps/web/src/components/CommandPalette.tsx b/apps/web/src/components/CommandPalette.tsx
index 65fbf09d02f..ef74363ff18 100644
--- a/apps/web/src/components/CommandPalette.tsx
+++ b/apps/web/src/components/CommandPalette.tsx
@@ -964,34 +964,34 @@ function OpenCommandPaletteDialog(props: {
 
   const actionItems: Array<CommandPaletteActionItem | CommandPaletteSubmenuItem> = [];
 
-  if (projects.length > 0) {
-    const activeProjectTitle = currentProjectId
-      ? (projectTitleById.get(currentProjectId) ?? null)
-      : null;
+  const activeProjectTitle = currentProjectId
+    ? (projectTitleById.get(currentProjectId) ?? null)
+    : null;
 
-    if (activeProjectTitle) {
-      actionItems.push({
-        kind: "action",
-        value: "action:new-thread",
-        searchTerms: ["new thread", "chat", "create", "draft"],
-        title: (
-          <>
-            New thread in <span className="font-semibold">{activeProjectTitle}</span>
-          </>
-        ),
-        icon: <SquarePenIcon className={ITEM_ICON_CLASS} />,
-        shortcutCommand: "chat.new",
-        run: async () => {
-          await startNewThreadFromContext({
-            activeDraftThread,
-            activeThread: activeThread ?? undefined,
-            defaultProjectRef,
-            handleNewThread,
-          });
-        },
-      });
-    }
+  if (activeProjectTitle) {
+    actionItems.push({
+      kind: "action",
+      value: "action:new-thread",
+      searchTerms: ["new thread", "chat", "create", "draft"],
+      title: (
+        <>
+          New thread in <span className="font-semibold">{activeProjectTitle}</span>
+        </>
+      ),
+      icon: <SquarePenIcon className={ITEM_ICON_CLASS} />,
+      shortcutCommand: "chat.new",
+      run: async () => {
+        await startNewThreadFromContext({
+          activeDraftThread,
+          activeThread: activeThread ?? undefined,
+          defaultProjectRef,
+          handleNewThread,
+        });
+      },
+    });
+  }
 
+  if (regularProjects.length > 0) {
     actionItems.push({
       kind: "submenu",
       value: "action:new-thread-in",
diff --git a/apps/web/src/components/Sidebar.tsx b/apps/web/src/components/Sidebar.tsx
index 7eeb29dae7a..2dcdfe7dc55 100644
--- a/apps/web/src/components/Sidebar.tsx
+++ b/apps/web/src/components/Sidebar.tsx
@@ -87,6 +87,7 @@ import {
   useServerConfigs,
   useThreadShells,
   useThreadShellsForProjectRefs,
+  waitForProject,
 } from "../state/entities";
 import { selectThreadTerminalUiState, useTerminalUiStateStore } from "../terminalUiStateStore";
 import { useThreadRunningTerminalIds } from "../state/terminalSessions";
@@ -3475,6 +3476,18 @@ export default function Sidebar() {
               return;
             }
           }
+
+          const provisionedProject = await waitForProject(projectRef);
+          if (provisionedProject === null) {
+            toastManager.add(
+              stackedThreadToast({
+                type: "error",
+                title: "Could not create chat",
+                description: "The chat workspace is still syncing. Try again in a moment.",
+              }),
+            );
+            return;
+          }
         }
 
         const navigationResult = await settlePromise(() =>
@@ -3682,13 +3695,19 @@ export default function Sidebar() {
         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;
+        const activeThreadId = projectThreads.find(
+          (thread) =>
+            scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)) === activeThreadKey,
+        )?.id;
+        const threadVisibility = getVisibleThreadsForProject({
+          threads: projectThreads,
+          activeThreadId,
+          isThreadListExpanded: expandedThreadListsByProject.has(project.projectKey),
+          previewLimit: sidebarThreadPreviewCount,
+        });
+        const renderedThreads = pinnedCollapsedThread
+          ? [pinnedCollapsedThread]
+          : threadVisibility.visibleThreads;
         return renderedThreads.map((thread) =>
           scopedThreadKey(scopeThreadRef(thread.environmentId, thread.id)),
         );
diff --git a/apps/web/src/generalChats.ts b/apps/web/src/generalChats.ts
index 9e15088f7d1..cd568c6286a 100644
--- a/apps/web/src/generalChats.ts
+++ b/apps/web/src/generalChats.ts
@@ -1,12 +1,22 @@
+import {
+  excludeGeneralChatsProject,
+  GENERAL_CHATS_PROJECT_ID,
+  GENERAL_CHATS_PROJECT_TITLE,
+  GENERAL_CHATS_WORKSPACE_ROOT,
+  isGeneralChatsProject,
+} from "@t3tools/client-runtime/general-chats";
 import type { EnvironmentId, ProjectId } from "@t3tools/contracts";
-import { ProjectId as ProjectIdSchema } from "@t3tools/contracts";
 
 import type { DraftThreadEnvMode } from "./composerDraftStore";
 import type { Project } from "./types";
 
-export const GENERAL_CHATS_PROJECT_ID = ProjectIdSchema.make("t3code-general-chats");
-export const GENERAL_CHATS_PROJECT_TITLE = "Chats";
-export const GENERAL_CHATS_WORKSPACE_ROOT = "~/.t3/chats";
+export {
+  excludeGeneralChatsProject,
+  GENERAL_CHATS_PROJECT_ID,
+  GENERAL_CHATS_PROJECT_TITLE,
+  GENERAL_CHATS_WORKSPACE_ROOT,
+  isGeneralChatsProject,
+};
 export const GENERAL_CHAT_NEW_THREAD_OPTIONS = {
   branch: null,
   worktreePath: null,
@@ -21,12 +31,6 @@ export interface GeneralChatNewThreadOptions {
   readonly startFromOrigin?: boolean;
 }
 
-export function isGeneralChatsProject(
-  project: Pick<Project, "id">,
-): project is Pick<Project, "id"> & { readonly id: ProjectId } {
-  return project.id === GENERAL_CHATS_PROJECT_ID;
-}
-
 export function findGeneralChatsProject(
   projects: ReadonlyArray<Project>,
   environmentId: EnvironmentId | null,
@@ -42,10 +46,6 @@ export function findGeneralChatsProject(
   );
 }
 
-export function excludeGeneralChatsProject(projects: ReadonlyArray<Project>): Project[] {
-  return projects.filter((project) => !isGeneralChatsProject(project));
-}
-
 export function getGeneralChatNewThreadOptions(projectId: ProjectId) {
   return projectId === GENERAL_CHATS_PROJECT_ID ? GENERAL_CHAT_NEW_THREAD_OPTIONS : undefined;
 }
diff --git a/apps/web/src/hooks/useHandleNewThread.ts b/apps/web/src/hooks/useHandleNewThread.ts
index 88855cec48e..3e3f34ec090 100644
--- a/apps/web/src/hooks/useHandleNewThread.ts
+++ b/apps/web/src/hooks/useHandleNewThread.ts
@@ -23,7 +23,13 @@ import {
   getProjectOrderKey,
   selectProjectGroupingSettings,
 } from "../logicalProject";
-import { readThreadShell, useProjects, useServerConfigs, useThread } from "../state/entities";
+import {
+  readProject,
+  readThreadShell,
+  useProjects,
+  useServerConfigs,
+  useThread,
+} from "../state/entities";
 import { resolveNewDraftStartFromOrigin } from "../lib/chatThreadActions";
 import { resolveThreadRouteTarget } from "../threadRoutes";
 import { legacyProjectCwdPreferenceKey, useUiStateStore } from "../uiStateStore";
@@ -31,7 +37,6 @@ import { useClientSettings } from "./useSettings";
 import { excludeGeneralChatsProject, resolveGeneralChatNewThreadOptions } from "../generalChats";
 
 export function useNewThreadHandler() {
-  const projects = useProjects();
   const serverConfigs = useServerConfigs();
   const projectGroupingSettings = useClientSettings(selectProjectGroupingSettings);
   const router = useRouter();
@@ -60,11 +65,7 @@ export function useNewThreadHandler() {
         setLogicalProjectDraftThreadId,
       } = useComposerDraftStore.getState();
       const currentRouteTarget = getCurrentRouteTarget();
-      const project = projects.find(
-        (candidate) =>
-          candidate.id === projectRef.projectId &&
-          candidate.environmentId === projectRef.environmentId,
-      );
+      const project = readProject(projectRef);
       const environmentSettings =
         serverConfigs.get(projectRef.environmentId)?.settings ?? DEFAULT_SERVER_SETTINGS;
       const logicalProjectKey = project
@@ -195,7 +196,7 @@ export function useNewThreadHandler() {
         });
       })();
     },
-    [getCurrentRouteTarget, projectGroupingSettings, projects, router, serverConfigs],
+    [getCurrentRouteTarget, projectGroupingSettings, router, serverConfigs],
   );
 }
 
diff --git a/apps/web/src/state/entities.ts b/apps/web/src/state/entities.ts
index b4fc8cc5e80..532a0b69815 100644
--- a/apps/web/src/state/entities.ts
+++ b/apps/web/src/state/entities.ts
@@ -176,6 +176,48 @@ export function readProject(ref: ScopedProjectRef): EnvironmentProject | null {
   return appAtomRegistry.get(environmentProjects.projectAtom(ref));
 }
 
+export async function waitForProject(
+  ref: ScopedProjectRef,
+  timeoutMs = 2_000,
+): Promise<EnvironmentProject | null> {
+  const projectAtom = environmentProjects.projectAtom(ref);
+  const getProject = () => appAtomRegistry.get(projectAtom);
+  const project = getProject();
+  if (project !== null) {
+    return project;
+  }
+
+  return await new Promise<EnvironmentProject | null>((resolve) => {
+    let settled = false;
+    let timeoutId: ReturnType<typeof globalThis.setTimeout> | null = null;
+    const finish = (result: EnvironmentProject | null) => {
+      if (settled) {
+        return;
+      }
+      settled = true;
+      if (timeoutId !== null) {
+        globalThis.clearTimeout(timeoutId);
+      }
+      unsubscribe();
+      resolve(result);
+    };
+
+    const unsubscribe = appAtomRegistry.subscribe(projectAtom, (nextProject) => {
+      if (nextProject !== null) {
+        finish(nextProject);
+      }
+    });
+
+    const currentProject = getProject();
+    if (currentProject !== null) {
+      finish(currentProject);
+      return;
+    }
+
+    timeoutId = globalThis.setTimeout(() => finish(null), timeoutMs);
+  });
+}
+
 export function readThreadShell(ref: ScopedThreadRef): EnvironmentThreadShell | null {
   return appAtomRegistry.get(environmentThreadShells.threadShellAtom(ref));
 }
diff --git a/packages/client-runtime/package.json b/packages/client-runtime/package.json
index d9e19889721..9e4f6a669be 100644
--- a/packages/client-runtime/package.json
+++ b/packages/client-runtime/package.json
@@ -19,6 +19,10 @@
       "types": "./src/errors/index.ts",
       "default": "./src/errors/index.ts"
     },
+    "./general-chats": {
+      "types": "./src/generalChats.ts",
+      "default": "./src/generalChats.ts"
+    },
     "./rpc": {
       "types": "./src/rpc/index.ts",
       "default": "./src/rpc/index.ts"
diff --git a/packages/client-runtime/src/generalChats.test.ts b/packages/client-runtime/src/generalChats.test.ts
new file mode 100644
index 00000000000..26168dea086
--- /dev/null
+++ b/packages/client-runtime/src/generalChats.test.ts
@@ -0,0 +1,28 @@
+import { ProjectId, ThreadId } from "@t3tools/contracts";
+import { describe, expect, it } from "vite-plus/test";
+
+import {
+  excludeGeneralChatsProject,
+  excludeGeneralChatsThreads,
+  GENERAL_CHATS_PROJECT_ID,
+  isGeneralChatsProject,
+  isGeneralChatsProjectId,
+} from "./generalChats.ts";
+
+describe("general chats identity", () => {
+  it("recognizes and excludes the reserved project across clients", () => {
+    const regularProjectId = ProjectId.make("project-1");
+    const projects = [{ id: GENERAL_CHATS_PROJECT_ID }, { id: regularProjectId }];
+    const threads = [
+      { id: ThreadId.make("chat-1"), projectId: GENERAL_CHATS_PROJECT_ID },
+      { id: ThreadId.make("thread-1"), projectId: regularProjectId },
+    ];
+
+    expect(isGeneralChatsProjectId(GENERAL_CHATS_PROJECT_ID)).toBe(true);
+    expect(isGeneralChatsProject(projects[0]!)).toBe(true);
+    expect(excludeGeneralChatsProject(projects)).toEqual([{ id: regularProjectId }]);
+    expect(excludeGeneralChatsThreads(threads)).toEqual([
+      { id: ThreadId.make("thread-1"), projectId: regularProjectId },
+    ]);
+  });
+});
diff --git a/packages/client-runtime/src/generalChats.ts b/packages/client-runtime/src/generalChats.ts
new file mode 100644
index 00000000000..4c600226c5e
--- /dev/null
+++ b/packages/client-runtime/src/generalChats.ts
@@ -0,0 +1,25 @@
+import { ProjectId } from "@t3tools/contracts";
+
+export const GENERAL_CHATS_PROJECT_ID = ProjectId.make("t3code-general-chats");
+export const GENERAL_CHATS_PROJECT_TITLE = "Chats";
+export const GENERAL_CHATS_WORKSPACE_ROOT = "~/.t3/chats";
+
+export function isGeneralChatsProjectId(projectId: ProjectId): boolean {
+  return projectId === GENERAL_CHATS_PROJECT_ID;
+}
+
+export function isGeneralChatsProject<T extends { readonly id: ProjectId }>(project: T): boolean {
+  return isGeneralChatsProjectId(project.id);
+}
+
+export function excludeGeneralChatsProject<T extends { readonly id: ProjectId }>(
+  projects: ReadonlyArray<T>,
+): T[] {
+  return projects.filter((project) => !isGeneralChatsProject(project));
+}
+
+export function excludeGeneralChatsThreads<T extends { readonly projectId: ProjectId }>(
+  threads: ReadonlyArray<T>,
+): T[] {
+  return threads.filter((thread) => !isGeneralChatsProjectId(thread.projectId));
+}