diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
index 860ac08e..c821e1c9 100644
--- a/apps/web/src/app/page.tsx
+++ b/apps/web/src/app/page.tsx
@@ -1,23 +1,16 @@
 "use client";
 
-import { Thread } from "@/components/thread";
-import { ThreadProvider } from "@/providers/Thread";
-import { StreamProvider } from "@/providers/Stream";
 import { Toaster } from "@/components/ui/sonner";
 import React from "react";
-import { GitHubAppProvider } from "@/providers/GitHubApp";
+import AuthStatus from "@/components/github/auth-status";
 
-export default function DemoPage(): React.ReactNode {
+export default function Page(): React.ReactNode {
   return (
     <React.Suspense fallback={<div>Loading (layout)...</div>}>
       <Toaster />
-      <GitHubAppProvider>
-        <ThreadProvider>
-          <StreamProvider>
-            <Thread />
-          </StreamProvider>
-        </ThreadProvider>
-      </GitHubAppProvider>
+      <div className="w-full">
+        <AuthStatus />
+      </div>
     </React.Suspense>
   );
 }
diff --git a/apps/web/src/components/github/auth-status.tsx b/apps/web/src/components/github/auth-status.tsx
index bb0e263c..9fa51e44 100644
--- a/apps/web/src/components/github/auth-status.tsx
+++ b/apps/web/src/components/github/auth-status.tsx
@@ -2,35 +2,29 @@
 import { useEffect, useState } from "react";
 import { Button } from "@/components/ui/button";
 import { GitHubSVG } from "@/components/icons/github";
-import { LogOut } from "lucide-react";
-import { Badge } from "@/components/ui/badge";
-import {
-  Popover,
-  PopoverContent,
-  PopoverTrigger,
-} from "@/components/ui/popover";
-
-const GITHUB_APP_INSTALL_URL = "/api/github/installation";
-const GITHUB_LOGIN_URL = "/api/auth/github/login";
-const GITHUB_LOGOUT_URL = "/api/auth/logout";
-
-interface GitHubUser {
-  login: string;
-  avatar_url: string;
-  html_url: string;
-  name?: string;
-  email?: string;
-}
+import { ArrowRight } from "lucide-react";
+import { LangGraphLogoSVG } from "../icons/langgraph";
+import { useGitHubToken } from "@/hooks/useGitHubToken";
 
 export default function AuthStatus() {
   const [isAuth, setIsAuth] = useState<boolean | null>(null);
-  const [isLoading, setIsLoading] = useState(true);
-  const [isInstalled, setIsInstalled] = useState<boolean | null>(null);
-  const [isInstallLoading, setIsInstallLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [user, setUser] = useState<GitHubUser | null>(null);
-  const [userLoading, setUserLoading] = useState(false);
-  const [popoverOpen, setPopoverOpen] = useState(false);
+  const [isLoading, setIsLoading] = useState(false);
+
+  const [hasGitHubAppInstalled, setHasGitHubAppInstalled] = useState<
+    boolean | null
+  >(() => {
+    if (typeof window === "undefined") return null;
+    const cached = localStorage.getItem("github_app_installed");
+    return cached === "true" ? true : cached === "false" ? false : null;
+  });
+
+  const [isCheckingAppInstallation, setIsCheckingAppInstallation] =
+    useState(false);
+  const {
+    token: githubToken,
+    fetchToken: fetchGitHubToken,
+    isLoading: isTokenLoading,
+  } = useGitHubToken();
 
   useEffect(() => {
     checkAuthStatus();
@@ -38,225 +32,170 @@ export default function AuthStatus() {
 
   useEffect(() => {
     if (isAuth) {
-      checkAppInstallation();
-      fetchGitHubUser();
-    } else {
-      setIsInstalled(null);
-      setUser(null);
+      const cachedInstallationStatus = localStorage.getItem(
+        "github_app_installed",
+      );
+      if (cachedInstallationStatus === "true") {
+        setHasGitHubAppInstalled(true);
+        // Fetch token if we don't have one yet
+        if (!githubToken && !isTokenLoading) {
+          fetchGitHubToken();
+        }
+      } else if (cachedInstallationStatus === "false") {
+        setHasGitHubAppInstalled(false);
+      } else {
+        checkGitHubAppInstallation();
+      }
     }
-  }, [isAuth]);
+  }, [isAuth, githubToken]);
 
   const checkAuthStatus = async () => {
-    setIsLoading(true);
     try {
       const response = await fetch("/api/auth/status");
       const data = await response.json();
       setIsAuth(data.authenticated);
-    } catch (err) {
+    } catch (error) {
+      console.error("Error checking auth status:", error);
       setIsAuth(false);
-    } finally {
-      setIsLoading(false);
     }
   };
 
-  const checkAppInstallation = async () => {
-    setIsInstallLoading(true);
+  const checkGitHubAppInstallation = async () => {
+    setIsCheckingAppInstallation(true);
     try {
       const response = await fetch("/api/github/repositories");
       if (response.ok) {
-        setIsInstalled(true);
+        setHasGitHubAppInstalled(true);
+        localStorage.setItem("github_app_installed", "true");
+
+        await fetchGitHubToken();
       } else {
-        const data = await response.json();
-        if (data.error && data.error.includes("installation")) {
-          setIsInstalled(false);
+        const errorData = await response.json();
+        if (errorData.error.includes("installation")) {
+          setHasGitHubAppInstalled(false);
+          localStorage.setItem("github_app_installed", "false");
         } else {
-          setError(data.error || "Unknown error");
+          setHasGitHubAppInstalled(false);
+          localStorage.setItem("github_app_installed", "false");
         }
       }
-    } catch (err) {
-      setError("Failed to check GitHub App installation status");
+    } catch (error) {
+      console.error("Error checking GitHub App installation:", error);
+      setHasGitHubAppInstalled(false);
+      localStorage.setItem("github_app_installed", "false");
     } finally {
-      setIsInstallLoading(false);
-    }
-  };
-
-  const fetchGitHubUser = async () => {
-    setUserLoading(true);
-    try {
-      const response = await fetch("/api/auth/user");
-      if (response.ok) {
-        const data = await response.json();
-        setUser(data.user);
-      } else {
-        setUser(null);
-      }
-    } catch {
-      setUser(null);
-    } finally {
-      setUserLoading(false);
+      setIsCheckingAppInstallation(false);
     }
   };
 
   const handleLogin = () => {
-    window.location.href = GITHUB_LOGIN_URL;
-  };
-
-  const handleLogout = async () => {
     setIsLoading(true);
-    try {
-      await fetch(GITHUB_LOGOUT_URL, { method: "POST" });
-      window.location.href = "/";
-    } catch {
-      setIsLoading(false);
-    }
+    window.location.href = "/api/auth/github/login";
   };
 
-  const handleInstall = () => {
-    window.location.href = GITHUB_APP_INSTALL_URL;
+  const handleInstallGitHubApp = () => {
+    setIsLoading(true);
+
+    localStorage.removeItem("github_app_installed");
+    window.location.href = "/api/github/installation";
   };
 
-  return (
-    <div className="flex items-center gap-2">
-      {isLoading ? (
-        <Button
-          variant="outline"
-          size="sm"
-          disabled
-        >
-          <GitHubSVG
-            width="16"
-            height="16"
-          />{" "}
-          Checking...
-        </Button>
-      ) : isAuth ? (
-        <Popover
-          open={popoverOpen}
-          onOpenChange={setPopoverOpen}
-        >
-          <PopoverTrigger asChild>
-            <Button
-              variant="outline"
-              size="sm"
-              className="flex items-center gap-2"
-              onClick={() => setPopoverOpen((open) => !open)}
-            >
-              {userLoading ? (
-                <span className="h-5 w-5 animate-pulse rounded-full bg-gray-200" />
-              ) : user && user.avatar_url ? (
-                <img
-                  src={user.avatar_url}
-                  alt={user.login}
-                  className="h-5 w-5 rounded-full border border-gray-300"
-                />
-              ) : (
-                <GitHubSVG
-                  width="16"
-                  height="16"
-                />
-              )}
-              {user && user.login ? (
-                <span className="font-mono text-xs">{user.login}</span>
-              ) : (
-                <span className="font-mono text-xs">GitHub User</span>
-              )}
-            </Button>
-          </PopoverTrigger>
-          <PopoverContent
-            align="end"
-            className="w-64 p-3"
-          >
-            <div className="flex flex-col gap-2">
-              {userLoading ? (
-                <div className="flex items-center gap-2">
-                  <span className="h-8 w-8 animate-pulse rounded-full bg-gray-200" />
-                  <div className="flex-1">
-                    <div className="mb-1 h-3 w-20 animate-pulse rounded bg-gray-200" />
-                    <div className="h-3 w-32 animate-pulse rounded bg-gray-100" />
-                  </div>
-                </div>
-              ) : user ? (
-                <div className="mb-2 flex items-center gap-3">
-                  <img
-                    src={user.avatar_url}
-                    alt={user.login}
-                    className="h-8 w-8 rounded-full border border-gray-300"
-                  />
-                  <div>
-                    <div className="font-semibold">
-                      {user.name || user.login}
-                    </div>
-                    <div className="text-xs text-gray-500">
-                      {user.email || user.login}
-                    </div>
-                  </div>
-                </div>
-              ) : null}
-              {isInstallLoading ? (
-                <Button
-                  variant="outline"
-                  size="sm"
-                  disabled
-                >
-                  <GitHubSVG
-                    width="16"
-                    height="16"
-                  />{" "}
-                  Checking App...
-                </Button>
-              ) : isInstalled === false ? (
-                <Button
-                  variant="outline"
-                  size="sm"
-                  onClick={handleInstall}
-                  disabled={isInstallLoading}
-                  className="w-full"
-                >
-                  <GitHubSVG
-                    width="16"
-                    height="16"
-                  />{" "}
-                  Install GitHub App
-                </Button>
-              ) : isInstalled === true ? (
-                <Badge
-                  variant="secondary"
-                  className="flex w-full items-center justify-center gap-1"
-                >
-                  <GitHubSVG
-                    width="14"
-                    height="14"
-                  />{" "}
-                  App Installed
-                </Badge>
-              ) : null}
-              <Button
-                variant="outline"
-                size="sm"
-                onClick={handleLogout}
-                disabled={isLoading}
-                className="flex w-full items-center gap-2"
-              >
-                <LogOut className="size-4" /> Logout
-              </Button>
+  if (!isAuth) {
+    return (
+      <div className="flex min-h-screen w-full items-center justify-center p-4">
+        <div className="animate-in fade-in-0 zoom-in-95 flex w-full max-w-3xl flex-col rounded-lg border shadow-lg">
+          <div className="flex flex-col gap-4 border-b p-6">
+            <div className="flex flex-col items-start gap-2">
+              <LangGraphLogoSVG className="h-7" />
+              <h1 className="text-xl font-semibold tracking-tight">
+                Get started
+              </h1>
             </div>
-          </PopoverContent>
-        </Popover>
-      ) : (
-        <Button
-          variant="outline"
-          onClick={handleLogin}
-          disabled={isLoading}
-          size="sm"
-        >
-          <GitHubSVG
-            width="16"
-            height="16"
-          />{" "}
-          Connect GitHub
-        </Button>
-      )}
-      {error && <span className="ml-2 text-xs text-red-500">{error}</span>}
-    </div>
-  );
+            <p className="text-muted-foreground">
+              Connect your GitHub account to get started with Open SWE.
+            </p>
+            <Button
+              onClick={handleLogin}
+              disabled={isLoading}
+            >
+              <GitHubSVG
+                width="16"
+                height="16"
+              />
+              {isLoading ? "Connecting..." : "Connect GitHub"}
+            </Button>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (isAuth && hasGitHubAppInstalled === false && !isTokenLoading) {
+    return (
+      <div className="flex min-h-screen w-full items-center justify-center p-4">
+        <div className="animate-in fade-in-0 zoom-in-95 flex w-full max-w-3xl flex-col rounded-lg border shadow-lg">
+          <div className="flex flex-col gap-4 border-b p-6">
+            <div className="flex flex-col items-start gap-2">
+              <LangGraphLogoSVG className="h-7" />
+              <h1 className="text-xl font-semibold tracking-tight">
+                One more step
+              </h1>
+            </div>
+            <div className="text-muted-foreground flex items-center gap-2 text-sm">
+              <span className="rounded-full bg-green-100 px-2 py-1 text-xs font-medium text-green-800">
+                1. GitHub Login ✓
+              </span>
+              <ArrowRight className="h-3 w-3" />
+              <span className="rounded-full bg-blue-100 px-2 py-1 text-xs font-medium text-blue-800">
+                2. Repository Access
+              </span>
+            </div>
+            <p className="text-muted-foreground">
+              Great! Now we need access to your GitHub repositories. Install our
+              GitHub App to grant access to specific repositories.
+            </p>
+            <div className="rounded-md border border-amber-200 bg-amber-50 p-3 text-sm text-amber-800">
+              <p>
+                You'll be redirected to GitHub where you can select which
+                repositories to grant access to.
+              </p>
+            </div>
+            <Button
+              onClick={handleInstallGitHubApp}
+              disabled={isLoading || isCheckingAppInstallation}
+              className="bg-black hover:bg-gray-800"
+            >
+              <GitHubSVG
+                width="16"
+                height="16"
+              />
+              {isLoading || isCheckingAppInstallation
+                ? "Loading..."
+                : "Install GitHub App"}
+            </Button>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (!githubToken) {
+    return (
+      <div className="flex min-h-screen w-full items-center justify-center p-4">
+        <div className="animate-in fade-in-0 zoom-in-95 flex w-full max-w-3xl flex-col rounded-lg border shadow-lg">
+          <div className="flex flex-col gap-4 border-b p-6">
+            <div className="flex flex-col items-start gap-2">
+              <LangGraphLogoSVG className="h-7" />
+              <h1 className="text-xl font-semibold tracking-tight">
+                Loading...
+              </h1>
+            </div>
+            <p className="text-muted-foreground">
+              Setting up your GitHub integration...
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  }
 }
diff --git a/apps/web/src/components/github/github-oauth-button.tsx b/apps/web/src/components/github/github-oauth-button.tsx
index dfe633b7..ec9a545e 100644
--- a/apps/web/src/components/github/github-oauth-button.tsx
+++ b/apps/web/src/components/github/github-oauth-button.tsx
@@ -1,35 +1,12 @@
 "use client";
 
-import { useState, useEffect } from "react";
-import { Button } from "@/components/ui/button";
-import { GitHubSVG } from "@/components/icons/github";
+import { useState } from "react";
 import { LogOut } from "lucide-react";
 import { TooltipIconButton } from "../ui/tooltip-icon-button";
 
-export function GitHubOAuthButton() {
-  const [isAuth, setIsAuth] = useState<boolean | null>(null);
+export function GitHubLogoutButton() {
   const [isLoading, setIsLoading] = useState(false);
 
-  useEffect(() => {
-    checkAuthStatus();
-  }, []);
-
-  const checkAuthStatus = async () => {
-    try {
-      const response = await fetch("/api/auth/status");
-      const data = await response.json();
-      setIsAuth(data.authenticated);
-    } catch (error) {
-      console.error("Error checking auth status:", error);
-      setIsAuth(false);
-    }
-  };
-
-  const handleLogin = () => {
-    setIsLoading(true);
-    window.location.href = "/api/auth/github/login";
-  };
-
   const handleLogout = async () => {
     setIsLoading(true);
     try {
@@ -38,7 +15,6 @@ export function GitHubOAuthButton() {
       });
       if (response.ok) {
         localStorage.removeItem("github_app_installed");
-        setIsAuth(false);
         window.location.href = "/";
       } else {
         console.error("Logout failed");
@@ -50,47 +26,15 @@ export function GitHubOAuthButton() {
     }
   };
 
-  if (isAuth === null) {
-    return (
-      <Button
-        variant="outline"
-        disabled
-        className="text-xs"
-        size="sm"
-      >
-        <GitHubSVG
-          width="16"
-          height="16"
-        />
-        Checking...
-      </Button>
-    );
-  }
-
-  if (isAuth) {
-    return (
-      <TooltipIconButton
-        tooltip="Logout"
-        onClick={handleLogout}
-        disabled={isLoading}
-        className="text-xs"
-        size="sm"
-      >
-        <LogOut className="size-4" />
-      </TooltipIconButton>
-    );
-  }
-
   return (
-    <Button
-      variant="outline"
-      onClick={handleLogin}
+    <TooltipIconButton
+      tooltip="Logout"
+      onClick={handleLogout}
       disabled={isLoading}
       className="text-xs"
       size="sm"
     >
-      <GitHubSVG />
-      {isLoading ? "Connecting..." : "Connect GitHub"}
-    </Button>
+      <LogOut className="size-4" />
+    </TooltipIconButton>
   );
 }
diff --git a/apps/web/src/components/thread/index.tsx b/apps/web/src/components/thread/index.tsx
deleted file mode 100644
index 3b02a2f0..00000000
--- a/apps/web/src/components/thread/index.tsx
+++ /dev/null
@@ -1,670 +0,0 @@
-import { v4 as uuidv4 } from "uuid";
-import { ReactNode, useEffect, useRef } from "react";
-import { motion } from "framer-motion";
-import { cn } from "@/lib/utils";
-import { useStreamContext } from "@/providers/Stream";
-import { useState, FormEvent } from "react";
-import { Button } from "../ui/button";
-import { Checkpoint, Message } from "@langchain/langgraph-sdk";
-import { AssistantMessage, AssistantMessageLoading } from "./messages/ai";
-import { HumanMessage } from "./messages/human";
-import { ensureToolCallsHaveResponses } from "@/lib/ensure-tool-responses";
-import { LangGraphLogoSVG } from "../icons/langgraph";
-import { TooltipIconButton } from "../ui/tooltip-icon-button";
-import {
-  ArrowDown,
-  LoaderCircle,
-  PanelRightOpen,
-  PanelRightClose,
-  SquarePen,
-  Settings,
-  FilePlus2,
-} from "lucide-react";
-import { ThemeToggle } from "../theme-toggle";
-import { useQueryState, parseAsBoolean, parseAsString } from "nuqs";
-import { StickToBottom, useStickToBottomContext } from "use-stick-to-bottom";
-import TaskListSidebar from "../task-list-sidebar";
-import { toast } from "sonner";
-import { useMediaQuery } from "@/hooks/useMediaQuery";
-import { Label } from "../ui/label";
-import { useFileUpload } from "@/hooks/useFileUpload";
-import { ContentBlocksPreview } from "./ContentBlocksPreview";
-import { useGitHubAppProvider } from "@/providers/GitHubApp";
-import TaskList from "../task-list";
-import { ConfigurationSidebar } from "../configuration-sidebar";
-import { DEFAULT_CONFIG_KEY, useConfigStore } from "@/hooks/useConfigStore";
-import { RepositoryBranchSelectors } from "../github/repo-branch-selectors";
-import { useRouter } from "next/navigation";
-import { OpenPRButton } from "../github/open-pr-button";
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from "../ui/tooltip";
-import { BaseMessage } from "@langchain/core/messages";
-import { TaskPlanView } from "../tasks";
-import { useTaskPlan } from "../tasks/useTaskPlan";
-import { isProposedPlanInterrupt } from "@/lib/plan-utils";
-import { HumanResponse } from "@langchain/langgraph/prebuilt";
-import {
-  INITIALIZE_NODE_ID,
-  mapCustomEventsToSteps,
-} from "@open-swe/shared/open-swe/custom-node-events";
-import { DO_NOT_RENDER_ID_PREFIX } from "@open-swe/shared/constants";
-import AuthStatus from "../github/auth-status";
-
-function StickyToBottomContent(props: {
-  content: ReactNode;
-  footer?: ReactNode;
-  className?: string;
-  contentClassName?: string;
-}) {
-  const context = useStickToBottomContext();
-  return (
-    <div
-      ref={context.scrollRef}
-      style={{ width: "100%", height: "100%" }}
-      className={props.className}
-    >
-      <div
-        ref={context.contentRef}
-        className={props.contentClassName}
-      >
-        {props.content}
-      </div>
-
-      {props.footer}
-    </div>
-  );
-}
-
-function ScrollToBottom(props: { className?: string }) {
-  const { isAtBottom, scrollToBottom } = useStickToBottomContext();
-
-  if (isAtBottom) return null;
-  return (
-    <Button
-      variant="outline"
-      className={props.className}
-      onClick={() => scrollToBottom()}
-    >
-      <ArrowDown className="h-4 w-4" />
-      <span>Scroll to bottom</span>
-    </Button>
-  );
-}
-
-export function Thread() {
-  const { push } = useRouter();
-  const { selectedRepository } = useGitHubAppProvider();
-  const { getConfig } = useConfigStore();
-  const { taskPlan } = useTaskPlan();
-
-  const [threadId, _setThreadId] = useQueryState("threadId");
-  const [taskId, setTaskId] = useQueryState("taskId", parseAsString);
-  const [chatHistoryOpen, setChatHistoryOpen] = useQueryState(
-    "chatHistoryOpen",
-    parseAsBoolean.withDefault(false),
-  );
-  const [configSidebarOpen, setConfigSidebarOpen] = useState(false);
-
-  const isTaskView = !!taskId;
-  const isThreadView = !!threadId;
-
-  // Track previous states to detect navigation changes
-  const prevTaskId = useRef(taskId);
-  const prevThreadId = useRef(threadId);
-
-  useEffect(() => {
-    const isNavigatingToTask = !prevTaskId.current && taskId;
-    const isNavigatingToThread = !prevThreadId.current && threadId;
-    if ((isNavigatingToTask || isNavigatingToThread) && !chatHistoryOpen) {
-      setChatHistoryOpen(true);
-    }
-    prevTaskId.current = taskId;
-    prevThreadId.current = threadId;
-  }, [taskId, threadId, chatHistoryOpen, setChatHistoryOpen]);
-
-  useEffect(() => {
-    if (taskId && typeof window !== "undefined") {
-      // TaskId format is "${threadId}-${taskIndex}", so we can extract the threadId directly
-      const taskThreadId = taskId.split("-").slice(0, -1).join("-");
-      if (taskThreadId && taskThreadId !== threadId) {
-        _setThreadId(taskThreadId);
-      }
-    }
-  }, [taskId, threadId, _setThreadId]);
-
-  const [input, setInput] = useState("");
-  const {
-    contentBlocks,
-    setContentBlocks,
-    handleFileUpload,
-    dropRef,
-    removeBlock,
-    dragOver,
-    handlePaste,
-  } = useFileUpload();
-  const [firstTokenReceived, setFirstTokenReceived] = useState(false);
-  const isLargeScreen = useMediaQuery("(min-width: 1024px)");
-
-  const stream = useStreamContext();
-  const messages = stream.messages;
-  const isLoading = stream.isLoading;
-  const customEvents = stream.customEvents;
-
-  const lastError = useRef<string | undefined>(undefined);
-
-  const setThreadId = (id: string | null) => {
-    _setThreadId(id);
-
-    if (id === null) {
-      setTaskId(null);
-    }
-  };
-
-  useEffect(() => {
-    if (!stream.error) {
-      lastError.current = undefined;
-      return;
-    }
-    try {
-      const message = (stream.error as any).message;
-      if (!message || lastError.current === message) {
-        return;
-      }
-
-      lastError.current = message;
-      toast.error("An error occurred. Please try again.", {
-        description: (
-          <p>
-            <strong>Error:</strong> <code>{message}</code>
-          </p>
-        ),
-        richColors: true,
-        closeButton: true,
-      });
-    } catch {
-      console.error("Error in stream", stream.error);
-    }
-  }, [stream.error]);
-
-  const prevMessageLength = useRef(0);
-  useEffect(() => {
-    if (
-      messages.length !== prevMessageLength.current &&
-      messages?.length &&
-      messages[messages.length - 1].type === "ai"
-    ) {
-      setFirstTokenReceived(true);
-    }
-
-    prevMessageLength.current = messages.length;
-  }, [messages]);
-
-  const handleSubmit = (e: FormEvent) => {
-    e.preventDefault();
-    if ((input.trim().length === 0 && contentBlocks.length === 0) || isLoading)
-      return;
-
-    if (!selectedRepository) {
-      toast.error("Please select a repository first", {
-        description:
-          "You need to select a repository before sending a message.",
-        richColors: true,
-        closeButton: true,
-      });
-      return;
-    }
-
-    setFirstTokenReceived(false);
-
-    if (isProposedPlanInterrupt(stream.interrupt)) {
-      const resume: HumanResponse[] = [
-        {
-          type: "response",
-          args: input.trim(),
-        },
-      ];
-      stream.submit(
-        {},
-        {
-          command: {
-            resume,
-          },
-        },
-      );
-      if (contentBlocks.length > 0) {
-        toast.warning(
-          "Content blocks were not submitted with the plan response.",
-          {
-            richColors: true,
-            closeButton: true,
-          },
-        );
-      }
-      setInput("");
-      setContentBlocks([]);
-      return;
-    }
-
-    const newHumanMessage: Message = {
-      id: uuidv4(),
-      type: "human",
-      content: [
-        ...(input.trim().length > 0 ? [{ type: "text", text: input }] : []),
-        ...contentBlocks,
-      ] as Message["content"],
-    };
-
-    const toolMessages = ensureToolCallsHaveResponses(stream.messages);
-
-    const newMessages = [
-      ...toolMessages,
-      newHumanMessage,
-    ] as unknown as BaseMessage[];
-    stream.submit(
-      {
-        messages: newMessages,
-        internalMessages: newMessages,
-        targetRepository: selectedRepository,
-      },
-      {
-        streamMode: ["values"],
-        optimisticValues: (prev) => ({
-          ...prev,
-          messages: [
-            ...(prev.messages ?? []),
-            ...toolMessages,
-            newHumanMessage,
-          ] as unknown as BaseMessage[],
-        }),
-        config: {
-          recursion_limit: 400,
-          configurable: {
-            ...getConfig(threadId || DEFAULT_CONFIG_KEY),
-          },
-        },
-        metadata: {
-          graph_id: process.env.NEXT_PUBLIC_ASSISTANT_ID ?? "open-swe",
-        },
-      },
-    );
-
-    setInput("");
-    setContentBlocks([]);
-  };
-
-  const handleRegenerate = (
-    parentCheckpoint: Checkpoint | null | undefined,
-  ) => {
-    // Do this so the loading state is correct
-    prevMessageLength.current = prevMessageLength.current - 1;
-    setFirstTokenReceived(false);
-    stream.submit(undefined, {
-      checkpoint: parentCheckpoint,
-      streamMode: ["values"],
-      config: {
-        recursion_limit: 400,
-        configurable: {
-          ...getConfig(threadId || DEFAULT_CONFIG_KEY),
-        },
-      },
-      metadata: {
-        graph_id: process.env.NEXT_PUBLIC_ASSISTANT_ID ?? "open-swe",
-      },
-    });
-  };
-
-  const chatStarted = !!threadId || !!messages.length;
-  const hasNoAIOrToolMessages = !messages.find(
-    (m) => m.type === "ai" || m.type === "tool",
-  );
-  const isLastMessageHuman = messages[messages.length - 1]?.type === "human";
-
-  const initializeEvents = customEvents.filter(
-    (e) => e.nodeId === INITIALIZE_NODE_ID,
-  );
-
-  const steps = mapCustomEventsToSteps(initializeEvents);
-  const allSuccess =
-    steps.length > 0 && steps.every((s) => s.status === "success");
-
-  let initStatus: "loading" | "generating" | "done" = "generating";
-  if (allSuccess) {
-    initStatus = "done";
-  }
-
-  return (
-    <div className="flex h-screen w-full overflow-hidden">
-      <div className="relative hidden lg:flex">
-        <motion.div
-          className="absolute z-20 h-full overflow-hidden border-r bg-white"
-          style={{ width: 300 }}
-          animate={
-            isLargeScreen
-              ? { x: chatHistoryOpen ? 0 : -300 }
-              : { x: chatHistoryOpen ? 0 : -300 }
-          }
-          initial={{ x: -300 }}
-          transition={
-            isLargeScreen
-              ? { type: "spring", stiffness: 300, damping: 30 }
-              : { duration: 0 }
-          }
-        >
-          <div
-            className="relative h-full"
-            style={{ width: 300 }}
-          >
-            <TaskListSidebar onCollapse={() => setChatHistoryOpen(false)} />
-          </div>
-        </motion.div>
-      </div>
-
-      <div className="grid w-full grid-cols-[1fr_0fr] transition-all duration-500">
-        <motion.div
-          className={cn(
-            "relative flex min-w-0 flex-1 flex-col overflow-hidden",
-            !chatStarted && "grid-rows-[1fr]",
-          )}
-          layout={isLargeScreen}
-          animate={{
-            marginLeft: chatHistoryOpen ? (isLargeScreen ? 300 : 0) : 0,
-            width: chatHistoryOpen
-              ? isLargeScreen
-                ? "calc(100% - 300px)"
-                : "100%"
-              : "100%",
-          }}
-          transition={
-            isLargeScreen
-              ? { type: "spring", stiffness: 300, damping: 30 }
-              : { duration: 0 }
-          }
-        >
-          {!chatStarted && (
-            <div className="absolute top-0 left-0 z-10 flex w-full items-center justify-between gap-3 p-2 pl-4">
-              <div>
-                {(!chatHistoryOpen || !isLargeScreen) && (
-                  <Button
-                    className="hover:bg-gray-100"
-                    variant="ghost"
-                    onClick={() => setChatHistoryOpen((p) => !p)}
-                  >
-                    {chatHistoryOpen ? (
-                      <PanelRightOpen className="size-5" />
-                    ) : (
-                      <PanelRightClose className="size-5" />
-                    )}
-                  </Button>
-                )}
-              </div>
-              <div className="absolute top-2 right-4 flex items-center gap-2 text-gray-700">
-                <AuthStatus />
-                <TooltipIconButton
-                  tooltip="Configuration"
-                  variant="ghost"
-                  onClick={() => {
-                    setConfigSidebarOpen(true);
-                  }}
-                >
-                  <Settings className="size-4" />
-                </TooltipIconButton>
-                <ThemeToggle />
-              </div>
-            </div>
-          )}
-          {chatStarted && (
-            <div className="relative z-10 grid grid-cols-10 items-start gap-3 p-2">
-              <div className="relative col-span-2 flex items-center justify-start gap-2">
-                <div className="absolute left-0 z-10">
-                  {(!chatHistoryOpen || !isLargeScreen) && (
-                    <Button
-                      className="hover:bg-gray-100"
-                      variant="ghost"
-                      onClick={() => setChatHistoryOpen((p) => !p)}
-                    >
-                      {chatHistoryOpen ? (
-                        <PanelRightOpen className="size-5" />
-                      ) : (
-                        <PanelRightClose className="size-5" />
-                      )}
-                    </Button>
-                  )}
-                </div>
-                <motion.button
-                  className="flex cursor-pointer items-center gap-2"
-                  onClick={() => push("/")}
-                  animate={{
-                    marginLeft: !chatHistoryOpen ? 48 : 0,
-                  }}
-                  transition={{
-                    type: "spring",
-                    stiffness: 300,
-                    damping: 30,
-                  }}
-                >
-                  <LangGraphLogoSVG
-                    width={32}
-                    height={32}
-                  />
-                  <span className="text-xl font-semibold tracking-tight">
-                    Open SWE
-                  </span>
-                </motion.button>
-              </div>
-
-              <div className="col-span-6 mx-auto flex w-sm justify-center md:w-md lg:w-lg xl:w-xl">
-                {taskPlan && (
-                  <TaskPlanView
-                    taskPlan={taskPlan}
-                    onTaskChange={() => {}}
-                  />
-                )}
-              </div>
-
-              <div className="col-span-2 flex items-center justify-end gap-2 text-gray-700">
-                <AuthStatus />
-                <OpenPRButton />
-                <TooltipIconButton
-                  tooltip="Configuration"
-                  variant="ghost"
-                  onClick={() => {
-                    setConfigSidebarOpen(true);
-                  }}
-                >
-                  <Settings className="size-4" />
-                </TooltipIconButton>
-              </div>
-
-              <div className="from-background to-background/0 absolute inset-x-0 top-full h-5 bg-gradient-to-b" />
-            </div>
-          )}
-
-          <StickToBottom
-            className="relative flex-1 overflow-hidden"
-            initial={false}
-          >
-            <StickyToBottomContent
-              className={cn(
-                "absolute inset-0 overflow-y-scroll px-4 [&::-webkit-scrollbar]:w-1.5 [&::-webkit-scrollbar-thumb]:rounded-full [&::-webkit-scrollbar-thumb]:bg-gray-300 [&::-webkit-scrollbar-track]:bg-transparent",
-                !chatStarted && "mt-[10vh] flex flex-col items-stretch",
-                chatStarted && "grid grid-rows-[1fr_auto]",
-              )}
-              contentClassName="pt-8 pb-16  max-w-3xl mx-auto flex flex-col gap-4 w-full"
-              content={
-                <>
-                  {messages
-                    .filter((m) => !m.id?.startsWith(DO_NOT_RENDER_ID_PREFIX))
-                    .map((message, index) =>
-                      message.type === "human" ? (
-                        <HumanMessage
-                          key={message.id || `${message.type}-${index}`}
-                          message={message}
-                          isLoading={isLoading}
-                        />
-                      ) : (
-                        <AssistantMessage
-                          key={message.id || `${message.type}-${index}`}
-                          message={message}
-                          isLoading={isLoading}
-                          handleRegenerate={handleRegenerate}
-                          thread={stream}
-                        />
-                      ),
-                    )}
-                  {/* Special rendering case where there are no AI/tool messages, but there is an interrupt.
-                    We need to render it outside of the messages list, since there are no messages to render */}
-                  {(hasNoAIOrToolMessages || isLastMessageHuman) &&
-                    !!stream.interrupt && (
-                      <AssistantMessage
-                        key="interrupt-msg"
-                        message={undefined}
-                        isLoading={isLoading}
-                        handleRegenerate={handleRegenerate}
-                        forceRenderInterrupt={true}
-                        thread={stream}
-                      />
-                    )}
-                  {isLoading &&
-                    !firstTokenReceived &&
-                    initializeEvents.length === 0 && (
-                      <AssistantMessageLoading />
-                    )}
-                </>
-              }
-              footer={
-                <div
-                  className={cn(
-                    "flex flex-col items-center gap-8 bg-white",
-                    !isTaskView && !isThreadView
-                      ? "mb-32 pb-32"
-                      : "sticky bottom-0",
-                  )}
-                >
-                  {!chatStarted && (
-                    <div className="flex items-center gap-3">
-                      <LangGraphLogoSVG className="h-8 flex-shrink-0" />
-                      <h1 className="text-2xl font-semibold tracking-tight">
-                        Open SWE
-                      </h1>
-                    </div>
-                  )}
-
-                  <ScrollToBottom className="animate-in fade-in-0 zoom-in-95 absolute bottom-full left-1/2 mb-4 -translate-x-1/2" />
-
-                  <div
-                    ref={dropRef}
-                    className={cn(
-                      "bg-muted relative z-10 mx-auto mb-8 w-full max-w-3xl rounded-2xl shadow-xs transition-all",
-                      dragOver
-                        ? "border-primary border-2 border-dotted"
-                        : "border border-solid",
-                    )}
-                  >
-                    <form
-                      onSubmit={handleSubmit}
-                      className="mx-auto grid max-w-3xl grid-rows-[1fr_auto] gap-2"
-                    >
-                      <ContentBlocksPreview
-                        blocks={contentBlocks}
-                        onRemove={removeBlock}
-                      />
-                      <textarea
-                        value={input}
-                        onChange={(e) => setInput(e.target.value)}
-                        onPaste={handlePaste}
-                        onKeyDown={(e) => {
-                          if (
-                            e.key === "Enter" &&
-                            !e.shiftKey &&
-                            !e.metaKey &&
-                            !e.nativeEvent.isComposing
-                          ) {
-                            e.preventDefault();
-                            const el = e.target as HTMLElement | undefined;
-                            const form = el?.closest("form");
-                            form?.requestSubmit();
-                          }
-                        }}
-                        placeholder="Type your message..."
-                        className="field-sizing-content resize-none border-none bg-transparent p-3.5 pb-0 shadow-none ring-0 outline-none focus:ring-0 focus:outline-none"
-                      />
-
-                      <div className="flex items-center gap-1 p-2 pt-4">
-                        <TooltipProvider>
-                          <Tooltip>
-                            <TooltipTrigger>
-                              <Label
-                                htmlFor="file-input"
-                                className="mx-1 flex h-8 w-8 cursor-pointer items-center justify-center rounded-full border-[1px] border-gray-300 bg-inherit text-gray-500 hover:text-gray-700"
-                              >
-                                <FilePlus2 className="size-4" />
-                              </Label>
-                            </TooltipTrigger>
-                            <TooltipContent>Attach files</TooltipContent>
-                          </Tooltip>
-                        </TooltipProvider>
-
-                        <input
-                          id="file-input"
-                          type="file"
-                          onChange={handleFileUpload}
-                          multiple
-                          accept="image/jpeg,image/png,image/gif,image/webp,application/pdf"
-                          className="hidden"
-                        />
-                        <RepositoryBranchSelectors />
-                        {chatStarted && (
-                          <TooltipIconButton
-                            tooltip="New thread"
-                            variant="outline"
-                            onClick={() => setThreadId(null)}
-                            className="ml-1 h-8 w-8 rounded-full border-gray-300 bg-inherit text-gray-500 hover:text-gray-700"
-                          >
-                            <SquarePen className="size-4" />
-                          </TooltipIconButton>
-                        )}
-
-                        {stream.isLoading ? (
-                          <Button
-                            key="stop"
-                            onClick={() => stream.stop()}
-                            className="ml-auto"
-                          >
-                            <LoaderCircle className="size-4 animate-spin" />
-                            Cancel
-                          </Button>
-                        ) : (
-                          <Button
-                            type="submit"
-                            className="ml-auto shadow-md transition-all"
-                            disabled={
-                              isLoading ||
-                              (!input.trim() && contentBlocks.length === 0)
-                            }
-                          >
-                            Send
-                          </Button>
-                        )}
-                      </div>
-                    </form>
-                  </div>
-
-                  {!isTaskView && !isThreadView && <TaskList />}
-                </div>
-              }
-            />
-          </StickToBottom>
-        </motion.div>
-      </div>
-
-      <ConfigurationSidebar
-        open={configSidebarOpen}
-        onClose={() => setConfigSidebarOpen(false)}
-      />
-    </div>
-  );
-}
diff --git a/apps/web/src/components/v2/default-view.tsx b/apps/web/src/components/v2/default-view.tsx
index ecd6f345..a9a55bb3 100644
--- a/apps/web/src/components/v2/default-view.tsx
+++ b/apps/web/src/components/v2/default-view.tsx
@@ -26,6 +26,7 @@ import { ThreadCard, ThreadCardLoading } from "./thread-card";
 import { GitHubInstallationBanner } from "../github/installation-banner";
 import { QuickActions } from "./quick-actions";
 import { useState } from "react";
+import { GitHubLogoutButton } from "../github/github-oauth-button";
 
 interface DefaultViewProps {
   threads: ThreadDisplayInfo[];
@@ -69,6 +70,7 @@ export function DefaultView({ threads, threadsLoading }: DefaultViewProps) {
               <div className="bg-muted h-1 w-1 rounded-full"></div>
             </div>
             <ThemeToggle />
+            <GitHubLogoutButton />
           </div>
         </div>
       </div>