diff --git a/README.md b/README.md
index edc82630a..d8ca48654 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 > [!IMPORTANT]
-> PostHog Code is pre-alpha and not production-ready. Interested? Email jonathan@posthog.com
+> PostHog Code is pre-alpha and not production-ready. Interested? Join our [Discord](https://discord.gg/posthog)
 
 **[Download the latest version](https://github.com/PostHog/code/releases/latest)**
 
diff --git a/apps/code/src/main/platform-adapters/electron-notifier.ts b/apps/code/src/main/platform-adapters/electron-notifier.ts
index 744b828bd..25749f459 100644
--- a/apps/code/src/main/platform-adapters/electron-notifier.ts
+++ b/apps/code/src/main/platform-adapters/electron-notifier.ts
@@ -30,7 +30,6 @@ export class ElectronNotifier implements INotifier {
   public setUnreadIndicator(on: boolean): void {
     if (on) {
       app.dock?.setBadge("•");
-      this.mainWindow.getBrowserWindow()?.flashFrame(true);
     } else {
       app.dock?.setBadge("");
       this.mainWindow.getBrowserWindow()?.flashFrame(false);
diff --git a/apps/code/src/renderer/components/HeaderRow.tsx b/apps/code/src/renderer/components/HeaderRow.tsx
index cdfa8da1a..713003eb8 100644
--- a/apps/code/src/renderer/components/HeaderRow.tsx
+++ b/apps/code/src/renderer/components/HeaderRow.tsx
@@ -101,7 +101,7 @@ export function HeaderRow() {
           align="center"
           justify="end"
           gap="2"
-          pr="1"
+          pr="3"
           pl="2"
           style={{
             height: "100%",
diff --git a/apps/code/src/renderer/features/inbox/components/detail/ReportTaskLogs.tsx b/apps/code/src/renderer/features/inbox/components/detail/ReportTaskLogs.tsx
index 9750abc76..1e5ec6556 100644
--- a/apps/code/src/renderer/features/inbox/components/detail/ReportTaskLogs.tsx
+++ b/apps/code/src/renderer/features/inbox/components/detail/ReportTaskLogs.tsx
@@ -408,8 +408,6 @@ export function ReportTaskLogs({
             const row = isInteractive ? (
               showRunAction ? (
                 // biome-ignore lint/a11y/useSemanticElements: a <button> can't contain the nested run-action <button>
-                // biome-ignore lint/a11y/useKeyWithClickEvents: keyboard handled via onKeyDown
-                // biome-ignore lint/a11y/noStaticElementInteractions: role="button" makes this interactive
                 <div
                   key={relationship}
                   role="button"
diff --git a/apps/code/src/renderer/features/message-editor/components/IssuePicker.tsx b/apps/code/src/renderer/features/message-editor/components/IssuePicker.tsx
index 6f3bfe6bc..aa4ab1cfd 100644
--- a/apps/code/src/renderer/features/message-editor/components/IssuePicker.tsx
+++ b/apps/code/src/renderer/features/message-editor/components/IssuePicker.tsx
@@ -62,7 +62,7 @@ export function IssuePicker({
     }
   }, [open]);
 
-  const { data: issues = [] } = useQuery(
+  const { data: issues = [], isFetching } = useQuery(
     trpc.git.searchGithubIssues.queryOptions(
       {
         directoryPath: repoPath,
@@ -104,7 +104,9 @@ export function IssuePicker({
           showTrigger={false}
           placeholder="Search issues..."
         />
-        <ComboboxEmpty>No issues found.</ComboboxEmpty>
+        <ComboboxEmpty>
+          {isFetching ? "Searching..." : "No issues found."}
+        </ComboboxEmpty>
         <ComboboxList>
           {(issue: Issue) => (
             <ComboboxItem
diff --git a/apps/code/src/renderer/features/onboarding/components/GitIntegrationStep.tsx b/apps/code/src/renderer/features/onboarding/components/GitIntegrationStep.tsx
index 757389879..79cdfe3a6 100644
--- a/apps/code/src/renderer/features/onboarding/components/GitIntegrationStep.tsx
+++ b/apps/code/src/renderer/features/onboarding/components/GitIntegrationStep.tsx
@@ -248,31 +248,6 @@ export function GitIntegrationStep({
                 </Flex>
               </motion.div>
 
-              {alternativeConnectedProject && selectedProject && (
-                <Callout.Root color="blue" variant="soft">
-                  <Callout.Text>
-                    GitHub is already connected on{" "}
-                    <Text weight="bold">
-                      {alternativeConnectedProject.name}
-                    </Text>{" "}
-                    ({alternativeConnectedProject.organization.name}). Switch to
-                    that project, or click Connect to install a new integration
-                    on <Text weight="bold">{selectedProject.name}</Text>.
-                  </Callout.Text>
-                  <Flex mt="2">
-                    <Button
-                      size="1"
-                      variant="soft"
-                      onClick={() =>
-                        setSelectedProjectId(alternativeConnectedProject.id)
-                      }
-                    >
-                      Switch to {alternativeConnectedProject.name}
-                    </Button>
-                  </Flex>
-                </Callout.Root>
-              )}
-
               {/* Local folder picker */}
               <motion.div
                 initial={{ opacity: 0, y: 8 }}
@@ -393,6 +368,33 @@ export function GitIntegrationStep({
                 </Box>
               </motion.div>
 
+              {alternativeConnectedProject && selectedProject && (
+                <Callout.Root color="blue" variant="soft">
+                  <Callout.Text>
+                    GitHub is already connected on{" "}
+                    <Text weight="bold">
+                      {alternativeConnectedProject.name}
+                    </Text>{" "}
+                    ({alternativeConnectedProject.organization.name}). Switch to
+                    that project, or click{" "}
+                    <Text weight="bold">Connect GitHub</Text> below to install a
+                    new integration on{" "}
+                    <Text weight="bold">{selectedProject.name}</Text>.
+                  </Callout.Text>
+                  <Flex mt="2">
+                    <Button
+                      size="1"
+                      variant="soft"
+                      onClick={() =>
+                        setSelectedProjectId(alternativeConnectedProject.id)
+                      }
+                    >
+                      Switch to {alternativeConnectedProject.name}
+                    </Button>
+                  </Flex>
+                </Callout.Root>
+              )}
+
               {/* GitHub integration */}
               <motion.div
                 initial={{ opacity: 0, y: 8 }}
diff --git a/apps/code/src/renderer/features/panels/components/DraggableTab.tsx b/apps/code/src/renderer/features/panels/components/DraggableTab.tsx
index 120342b52..14ef78145 100644
--- a/apps/code/src/renderer/features/panels/components/DraggableTab.tsx
+++ b/apps/code/src/renderer/features/panels/components/DraggableTab.tsx
@@ -130,7 +130,7 @@ export const DraggableTab: React.FC<DraggableTabProps> = ({
       align="center"
       gap="1"
       pl="3"
-      pr={onClose ? "1" : "3"}
+      pr={onClose ? "2" : "3"}
       className={`group relative flex-shrink-0 select-none border-r border-b-2 transition-colors ${draggable ? "cursor-grab" : "cursor-pointer"}`}
       style={{
         borderRightColor: "var(--gray-6)",
@@ -178,6 +178,7 @@ export const DraggableTab: React.FC<DraggableTabProps> = ({
         <Box
           style={{
             width: "14px",
+            marginLeft: "2px",
             display: "flex",
             alignItems: "center",
             justifyContent: "center",
diff --git a/apps/code/src/renderer/features/sessions/components/SessionView.tsx b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
index 9e4c51393..9cd8e0b6d 100644
--- a/apps/code/src/renderer/features/sessions/components/SessionView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
@@ -348,21 +348,30 @@ export function SessionView({
   return (
     <ContextMenu.Root>
       <ContextMenu.Trigger>
-        <Flex
-          direction="column"
-          height="100%"
-          className="relative bg-background"
-          onClick={handlePaneClick}
-          onDragEnter={handleDragEnter}
-          onDragLeave={handleDragLeave}
-          onDragOver={handleDragOver}
-          onDrop={handleDrop}
-        >
-          {isSuspended ? (
-            <>
-              {showRawLogs ? (
-                <RawLogsView events={events} />
-              ) : (
+        {showRawLogs ? (
+          <Flex
+            direction="column"
+            height="100%"
+            className="relative bg-background"
+          >
+            <RawLogsView
+              events={events}
+              onClose={() => setShowRawLogs(false)}
+            />
+          </Flex>
+        ) : (
+          <Flex
+            direction="column"
+            height="100%"
+            className="relative bg-background"
+            onClick={handlePaneClick}
+            onDragEnter={handleDragEnter}
+            onDragLeave={handleDragLeave}
+            onDragOver={handleDragOver}
+            onDrop={handleDrop}
+          >
+            {isSuspended ? (
+              <>
                 <ConversationView
                   events={events}
                   isPromptPending={isPromptPending}
@@ -371,69 +380,65 @@ export function SessionView({
                   taskId={taskId}
                   slackThreadUrl={slackThreadUrl}
                 />
-              )}
-              <Box className="border-gray-4 border-t">
-                <Box className="mx-auto max-w-[750px] p-2">
-                  <Flex
-                    align="center"
-                    justify="between"
-                    gap="3"
-                    py="2"
-                    px="3"
-                    className="rounded-2 bg-gray-3"
-                  >
-                    <Flex align="center" gap="2">
-                      <Pause
-                        size={14}
-                        weight="duotone"
-                        color="var(--gray-11)"
-                      />
-                      <Text size="1" weight="medium">
-                        Worktree suspended
-                      </Text>
-                      <Text size="1" color="gray">
-                        Worktree was removed to save disk space
-                      </Text>
+                <Box className="border-gray-4 border-t">
+                  <Box className="mx-auto max-w-[750px] p-2">
+                    <Flex
+                      align="center"
+                      justify="between"
+                      gap="3"
+                      py="2"
+                      px="3"
+                      className="rounded-2 bg-gray-3"
+                    >
+                      <Flex align="center" gap="2">
+                        <Pause
+                          size={14}
+                          weight="duotone"
+                          color="var(--gray-11)"
+                        />
+                        <Text size="1" weight="medium">
+                          Worktree suspended
+                        </Text>
+                        <Text size="1" color="gray">
+                          Worktree was removed to save disk space
+                        </Text>
+                      </Flex>
+                      {onRestoreWorktree && (
+                        <Button
+                          variant="outline"
+                          size="1"
+                          onClick={onRestoreWorktree}
+                          disabled={isRestoring}
+                        >
+                          {isRestoring ? (
+                            <>
+                              <Spinner size={14} className="animate-spin" />
+                              Restoring...
+                            </>
+                          ) : (
+                            "Restore worktree"
+                          )}
+                        </Button>
+                      )}
                     </Flex>
-                    {onRestoreWorktree && (
-                      <Button
-                        variant="outline"
-                        size="1"
-                        onClick={onRestoreWorktree}
-                        disabled={isRestoring}
-                      >
-                        {isRestoring ? (
-                          <>
-                            <Spinner size={14} className="animate-spin" />
-                            Restoring...
-                          </>
-                        ) : (
-                          "Restore worktree"
-                        )}
-                      </Button>
-                    )}
-                  </Flex>
+                  </Box>
                 </Box>
-              </Box>
-            </>
-          ) : isInitializing ? (
-            isCloud ? (
-              <CloudInitializingView cloudStatus={cloudStatus} />
-            ) : (
-              <Flex
-                align="center"
-                justify="center"
-                className="absolute inset-0 bg-background"
-              >
-                <Spinner size={32} className="animate-spin text-gray-9" />
-              </Flex>
-            )
-          ) : (
-            <>
-              <DropZoneOverlay isVisible={isDraggingFile} />
-              {showRawLogs ? (
-                <RawLogsView events={events} />
+              </>
+            ) : isInitializing ? (
+              isCloud ? (
+                <CloudInitializingView cloudStatus={cloudStatus} />
               ) : (
+                <Flex
+                  align="center"
+                  justify="center"
+                  className="absolute inset-0 bg-background"
+                >
+                  <Spinner size={32} className="animate-spin text-gray-9" />
+                </Flex>
+              )
+            ) : (
+              <>
+                <DropZoneOverlay isVisible={isDraggingFile} />
                 <ConversationView
                   events={events}
                   isPromptPending={isPromptPending}
@@ -443,126 +448,138 @@ export function SessionView({
                   slackThreadUrl={slackThreadUrl}
                   compact={compact}
                 />
-              )}
 
-              <PlanStatusBar plan={latestPlan} />
+                <PlanStatusBar plan={latestPlan} />
 
-              {hasError ? (
-                <Flex
-                  align="center"
-                  justify="center"
-                  direction="column"
-                  gap="2"
-                  className="absolute inset-0 bg-background"
-                >
-                  <Warning size={32} weight="duotone" color="var(--red-9)" />
-                  {errorTitle && (
-                    <Text size="3" weight="bold" align="center" color="red">
-                      {errorTitle}
-                    </Text>
-                  )}
-                  <Text
-                    size={errorTitle ? "2" : "3"}
-                    weight={errorTitle ? "regular" : "medium"}
+                {hasError ? (
+                  <Flex
                     align="center"
-                    color={errorTitle ? "gray" : "red"}
-                    className="max-w-md px-4"
+                    justify="center"
+                    direction="column"
+                    gap="2"
+                    className="absolute inset-0 bg-background"
                   >
-                    {errorMessage}
-                  </Text>
-                  <Flex gap="2" mt="2">
-                    {onRetry && (
-                      <Button variant="soft" size="2" onClick={onRetry}>
-                        Retry
-                      </Button>
-                    )}
-                    {onNewSession && (
-                      <Button
-                        variant="soft"
-                        size="2"
-                        color="green"
-                        onClick={onNewSession}
-                      >
-                        New Session
-                      </Button>
+                    <Warning size={32} weight="duotone" color="var(--red-9)" />
+                    {errorTitle && (
+                      <Text size="3" weight="bold" align="center" color="red">
+                        {errorTitle}
+                      </Text>
                     )}
-                  </Flex>
-                </Flex>
-              ) : hideInput ? null : firstPendingPermission ? (
-                <Box className="border-gray-4 border-t">
-                  <Box className="mx-auto max-w-[750px] p-2">
-                    <PermissionSelector
-                      toolCall={firstPendingPermission.toolCall}
-                      options={firstPendingPermission.options}
-                      onSelect={handlePermissionSelect}
-                      onCancel={handlePermissionCancel}
-                    />
-                  </Box>
-                </Box>
-              ) : (
-                <Box className="relative border-gray-4 border-t">
-                  <Box
-                    className={`absolute inset-0 flex items-center justify-center gap-2 transition-opacity duration-200 ${
-                      isRunning
-                        ? "pointer-events-none opacity-0"
-                        : "opacity-100"
-                    }`}
-                    style={{ minHeight: 66 }}
-                  >
-                    <Spinner size={28} className="animate-spin text-gray-9" />
-                    <Text size="3" color="gray">
-                      Connecting to agent...
+                    <Text
+                      size={errorTitle ? "2" : "3"}
+                      weight={errorTitle ? "regular" : "medium"}
+                      align="center"
+                      color={errorTitle ? "gray" : "red"}
+                      className="max-w-md px-4"
+                    >
+                      {errorMessage}
                     </Text>
+                    <Flex gap="2" mt="2">
+                      {onRetry && (
+                        <Button variant="soft" size="2" onClick={onRetry}>
+                          Retry
+                        </Button>
+                      )}
+                      {onNewSession && (
+                        <Button
+                          variant="soft"
+                          size="2"
+                          color="green"
+                          onClick={onNewSession}
+                        >
+                          New Session
+                        </Button>
+                      )}
+                    </Flex>
+                  </Flex>
+                ) : hideInput ? null : firstPendingPermission ? (
+                  <Box className="border-gray-4 border-t">
+                    <Box className="mx-auto max-w-[750px] p-2">
+                      <PermissionSelector
+                        toolCall={firstPendingPermission.toolCall}
+                        options={firstPendingPermission.options}
+                        onSelect={handlePermissionSelect}
+                        onCancel={handlePermissionCancel}
+                      />
+                    </Box>
                   </Box>
-                  <Box
-                    className={`transition-all duration-300 ease-out ${
-                      isRunning
-                        ? "translate-y-0 opacity-100"
-                        : "pointer-events-none translate-y-4 opacity-0"
-                    }`}
-                  >
+                ) : (
+                  <Box className="relative border-gray-4 border-t">
                     <Box
-                      className={compact ? "p-1" : "mx-auto max-w-[750px] p-2"}
+                      className={`absolute inset-0 flex items-center justify-center gap-2 transition-opacity duration-200 ${
+                        isRunning
+                          ? "pointer-events-none opacity-0"
+                          : "opacity-100"
+                      }`}
+                      style={{ minHeight: 66 }}
                     >
-                      <PromptInput
-                        ref={editorRef}
-                        sessionId={sessionId}
-                        placeholder="Type a message... @ to mention files, ! for bash mode, / for skills"
-                        disabled={!isRunning}
-                        isLoading={!!isPromptPending}
-                        isActiveSession={isActiveSession}
-                        taskId={taskId}
-                        repoPath={repoPath}
-                        modeOption={modeOption}
-                        onModeChange={modeOption ? handleModeChange : undefined}
-                        allowBypassPermissions={allowBypassPermissions}
-                        enableBashMode={!isCloudRun}
-                        modelSelector={
-                          <ModelSelector
-                            taskId={taskId}
-                            disabled={!isRunning}
-                          />
+                      <Spinner size={28} className="animate-spin text-gray-9" />
+                      <Text size="3" color="gray">
+                        Connecting to agent...
+                      </Text>
+                    </Box>
+                    <Box
+                      className={`transition-all duration-300 ease-out ${
+                        isRunning
+                          ? "translate-y-0 opacity-100"
+                          : "pointer-events-none translate-y-4 opacity-0"
+                      }`}
+                    >
+                      <Box
+                        className={
+                          compact ? "p-1" : "mx-auto max-w-[750px] p-2"
                         }
-                        onBeforeSubmit={onBeforeSubmit}
-                        onSubmit={handleSubmit}
-                        onBashCommand={onBashCommand}
-                        onCancel={onCancelPrompt}
-                      />
+                      >
+                        <PromptInput
+                          ref={editorRef}
+                          sessionId={sessionId}
+                          placeholder="Type a message... @ to mention files, ! for bash mode, / for skills"
+                          disabled={!isRunning}
+                          isLoading={!!isPromptPending}
+                          isActiveSession={isActiveSession}
+                          taskId={taskId}
+                          repoPath={repoPath}
+                          modeOption={modeOption}
+                          onModeChange={
+                            modeOption ? handleModeChange : undefined
+                          }
+                          allowBypassPermissions={allowBypassPermissions}
+                          enableBashMode={!isCloudRun}
+                          modelSelector={
+                            <ModelSelector
+                              taskId={taskId}
+                              disabled={!isRunning}
+                            />
+                          }
+                          onBeforeSubmit={onBeforeSubmit}
+                          onSubmit={handleSubmit}
+                          onBashCommand={onBashCommand}
+                          onCancel={onCancelPrompt}
+                        />
+                      </Box>
                     </Box>
                   </Box>
-                </Box>
-              )}
-            </>
-          )}
-        </Flex>
+                )}
+              </>
+            )}
+          </Flex>
+        )}
       </ContextMenu.Trigger>
       <ContextMenu.Content size="1">
-        <ContextMenu.CheckboxItem
-          checked={showRawLogs}
-          onCheckedChange={setShowRawLogs}
+        <ContextMenu.Item
+          onSelect={() => {
+            const text = window.getSelection()?.toString();
+            if (text) {
+              navigator.clipboard.writeText(text);
+            }
+          }}
         >
-          Show raw logs
-        </ContextMenu.CheckboxItem>
+          Copy
+        </ContextMenu.Item>
+        <ContextMenu.Separator />
+        <ContextMenu.Item onSelect={() => setShowRawLogs(!showRawLogs)}>
+          {showRawLogs ? "Back to conversation" : "Show raw logs"}
+        </ContextMenu.Item>
       </ContextMenu.Content>
     </ContextMenu.Root>
   );
diff --git a/apps/code/src/renderer/features/sessions/components/raw-logs/RawLogsHeader.tsx b/apps/code/src/renderer/features/sessions/components/raw-logs/RawLogsHeader.tsx
index 835ae0892..f51e0f94a 100644
--- a/apps/code/src/renderer/features/sessions/components/raw-logs/RawLogsHeader.tsx
+++ b/apps/code/src/renderer/features/sessions/components/raw-logs/RawLogsHeader.tsx
@@ -1,4 +1,4 @@
-import { Copy, MagnifyingGlass } from "@phosphor-icons/react";
+import { Copy, MagnifyingGlass, X } from "@phosphor-icons/react";
 import { Box, Flex, IconButton, Text, TextField } from "@radix-ui/themes";
 import type { RefObject } from "react";
 
@@ -9,6 +9,7 @@ interface RawLogsHeaderProps {
   showSearch: boolean;
   onToggleSearch: () => void;
   onCopyAll: () => void;
+  onClose: () => void;
   onSearchChange: (query: string) => void;
   searchInputRef: RefObject<HTMLInputElement | null>;
 }
@@ -20,6 +21,7 @@ export function RawLogsHeader({
   showSearch,
   onToggleSearch,
   onCopyAll,
+  onClose,
   onSearchChange,
   searchInputRef,
 }: RawLogsHeaderProps) {
@@ -27,13 +29,13 @@ export function RawLogsHeader({
     <Box className="p-4 pb-2">
       <Flex direction="column" gap="2">
         <Flex justify="between" align="center">
-          <Text size="2" weight="medium" color="gray">
+          <Text size="3" weight="medium" color="gray">
             Raw Logs ({filteredCount}
             {searchQuery && ` of ${totalCount}`} events)
           </Text>
-          <Flex gap="1">
+          <Flex gap="3">
             <IconButton
-              size="1"
+              size="2"
               variant="ghost"
               color="gray"
               onClick={() => {
@@ -42,16 +44,27 @@ export function RawLogsHeader({
                   setTimeout(() => searchInputRef.current?.focus(), 0);
                 }
               }}
+              title="Search logs"
             >
-              <MagnifyingGlass size={12} />
+              <MagnifyingGlass size={16} />
             </IconButton>
             <IconButton
-              size="1"
+              size="2"
               variant="ghost"
               color="gray"
               onClick={onCopyAll}
+              title="Copy all logs"
+            >
+              <Copy size={16} />
+            </IconButton>
+            <IconButton
+              size="2"
+              variant="ghost"
+              color="gray"
+              onClick={onClose}
+              title="Back to conversation"
             >
-              <Copy size={12} />
+              <X size={16} />
             </IconButton>
           </Flex>
         </Flex>
diff --git a/apps/code/src/renderer/features/sessions/components/raw-logs/RawLogsView.tsx b/apps/code/src/renderer/features/sessions/components/raw-logs/RawLogsView.tsx
index 09a79086b..77325cee6 100644
--- a/apps/code/src/renderer/features/sessions/components/raw-logs/RawLogsView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/raw-logs/RawLogsView.tsx
@@ -13,6 +13,7 @@ import { RawLogsHeader } from "./RawLogsHeader";
 
 interface RawLogsViewProps {
   events: AcpMessage[];
+  onClose: () => void;
 }
 
 interface FilteredEvent {
@@ -20,7 +21,7 @@ interface FilteredEvent {
   originalIndex: number;
 }
 
-export function RawLogsView({ events }: RawLogsViewProps) {
+export function RawLogsView({ events, onClose }: RawLogsViewProps) {
   const searchInputRef = useRef<HTMLInputElement>(null);
   const searchQuery = useSearchQuery();
   const showSearch = useShowSearch();
@@ -71,6 +72,7 @@ export function RawLogsView({ events }: RawLogsViewProps) {
         showSearch={showSearch}
         onToggleSearch={toggleSearch}
         onCopyAll={copyAllLogs}
+        onClose={onClose}
         onSearchChange={setSearchQuery}
         searchInputRef={searchInputRef}
       />
diff --git a/apps/code/src/renderer/features/sidebar/components/items/TaskItem.tsx b/apps/code/src/renderer/features/sidebar/components/items/TaskItem.tsx
index 572852549..3429cdeda 100644
--- a/apps/code/src/renderer/features/sidebar/components/items/TaskItem.tsx
+++ b/apps/code/src/renderer/features/sidebar/components/items/TaskItem.tsx
@@ -63,6 +63,7 @@ function TaskHoverToolbar({
               e.stopPropagation();
               onTogglePin();
             }}
+            onDoubleClick={(e) => e.stopPropagation()}
             onKeyDown={(e) => {
               if (e.key === "Enter" || e.key === " ") {
                 e.preventDefault();
@@ -86,6 +87,7 @@ function TaskHoverToolbar({
               e.stopPropagation();
               onArchive();
             }}
+            onDoubleClick={(e) => e.stopPropagation()}
             onKeyDown={(e) => {
               if (e.key === "Enter" || e.key === " ") {
                 e.preventDefault();
diff --git a/apps/code/src/renderer/features/terminal/services/TerminalManager.ts b/apps/code/src/renderer/features/terminal/services/TerminalManager.ts
index 162356b88..1c5c5f242 100644
--- a/apps/code/src/renderer/features/terminal/services/TerminalManager.ts
+++ b/apps/code/src/renderer/features/terminal/services/TerminalManager.ts
@@ -86,7 +86,7 @@ function getTerminalTheme(isDarkMode: boolean) {
         foreground: "#0d0d0d",
         cursor: "#f54d00",
         cursorAccent: "#f2f3ee",
-        selectionBackground: "rgba(245, 77, 0, 0.2)",
+        selectionBackground: "rgba(245, 77, 0, 0.95)",
         selectionForeground: "#0d0d0d",
       };
 }
diff --git a/apps/code/src/renderer/features/tour/components/TourOverlay.tsx b/apps/code/src/renderer/features/tour/components/TourOverlay.tsx
index 4bce14c95..e9eee97c0 100644
--- a/apps/code/src/renderer/features/tour/components/TourOverlay.tsx
+++ b/apps/code/src/renderer/features/tour/components/TourOverlay.tsx
@@ -112,13 +112,17 @@ export function TourOverlay() {
 
     const el = document.querySelector(selector);
     if (el) {
+      if (el.getAttribute("data-tour-ready") === "true") {
+        tryAdvance();
+        return;
+      }
+
       observer.observe(el, {
         subtree: true,
         childList: true,
         characterData: true,
         attributes: true,
       });
-      resetTimer();
     }
 
     return () => {
@@ -132,6 +136,13 @@ export function TourOverlay() {
   const overlayBlocked = settingsOpen || commandMenuOpen;
   const isActive = !!(tour && step && targetRect && !overlayBlocked);
 
+  const handleNext = () => {
+    if (activeTourId && step) {
+      advancedRef.current = true;
+      advance(activeTourId, step.id);
+    }
+  };
+
   return (
     <>
       <SpotlightOverlay targetRect={isActive ? targetRect : null} />
@@ -141,6 +152,7 @@ export function TourOverlay() {
           stepNumber={activeStepIndex + 1}
           totalSteps={tour.steps.length}
           onDismiss={dismiss}
+          onNext={handleNext}
           targetRect={targetRect}
         />
       )}
diff --git a/apps/code/src/renderer/features/tour/components/TourTooltip.tsx b/apps/code/src/renderer/features/tour/components/TourTooltip.tsx
index 12f6a74fb..334168664 100644
--- a/apps/code/src/renderer/features/tour/components/TourTooltip.tsx
+++ b/apps/code/src/renderer/features/tour/components/TourTooltip.tsx
@@ -11,6 +11,7 @@ interface TourTooltipProps {
   stepNumber: number;
   totalSteps: number;
   onDismiss: () => void;
+  onNext: () => void;
   targetRect: DOMRect;
 }
 
@@ -150,6 +151,7 @@ export function TourTooltip({
   stepNumber,
   totalSteps,
   onDismiss,
+  onNext,
   targetRect,
 }: TourTooltipProps) {
   const isDarkMode = useThemeStore((s) => s.isDarkMode);
@@ -259,15 +261,20 @@ export function TourTooltip({
                 <Text size="1" style={{ color: "var(--gray-9)" }}>
                   {stepNumber}/{totalSteps}
                 </Text>
-                <Button
-                  size="1"
-                  variant="ghost"
-                  color="gray"
-                  onClick={onDismiss}
-                  style={{ opacity: 0.5 }}
-                >
-                  Skip tour
-                </Button>
+                <Flex align="center" gap="2">
+                  <Button
+                    size="1"
+                    variant="ghost"
+                    color="gray"
+                    onClick={onDismiss}
+                    style={{ opacity: 0.5 }}
+                  >
+                    Skip tour
+                  </Button>
+                  <Button size="1" variant="ghost" onClick={onNext}>
+                    Next
+                  </Button>
+                </Flex>
               </Flex>
             </Flex>
           </motion.div>
diff --git a/apps/code/src/renderer/features/workspace/hooks/useBranchMismatchDialog.test.ts b/apps/code/src/renderer/features/workspace/hooks/useBranchMismatchDialog.test.ts
index ebcbc0a9f..621f666af 100644
--- a/apps/code/src/renderer/features/workspace/hooks/useBranchMismatchDialog.test.ts
+++ b/apps/code/src/renderer/features/workspace/hooks/useBranchMismatchDialog.test.ts
@@ -109,12 +109,12 @@ describe("useBranchMismatchDialog", () => {
       const { result } = renderDialog({ shouldWarn: true });
       const clearEditor = vi.fn();
 
-      let allowed: boolean;
+      let allowed = true;
       act(() => {
         allowed = result.current.handleBeforeSubmit("hello", clearEditor);
       });
 
-      expect(allowed!).toBe(false);
+      expect(allowed).toBe(false);
       expect(result.current.dialogProps?.open).toBe(true);
       expect(clearEditor).not.toHaveBeenCalled();
       expect(mockTrack).toHaveBeenCalledWith(
diff --git a/packages/agent/src/adapters/claude/hooks.ts b/packages/agent/src/adapters/claude/hooks.ts
index d896fb9d6..a9a3073f1 100644
--- a/packages/agent/src/adapters/claude/hooks.ts
+++ b/packages/agent/src/adapters/claude/hooks.ts
@@ -127,11 +127,10 @@ export type OnModeChange = (mode: CodeExecutionMode) => Promise<void>;
 
 interface CreatePostToolUseHookParams {
   onModeChange?: OnModeChange;
-  logger?: Logger;
 }
 
 export const createPostToolUseHook =
-  ({ onModeChange, logger }: CreatePostToolUseHookParams): HookCallback =>
+  ({ onModeChange }: CreatePostToolUseHookParams): HookCallback =>
   async (
     input: HookInput,
     toolUseID: string | undefined,
diff --git a/packages/agent/src/adapters/claude/session/options.ts b/packages/agent/src/adapters/claude/session/options.ts
index 56ce6a3eb..88a245556 100644
--- a/packages/agent/src/adapters/claude/session/options.ts
+++ b/packages/agent/src/adapters/claude/session/options.ts
@@ -119,7 +119,7 @@ function buildHooks(
   enrichedReadCache: EnrichedReadCache | undefined,
   registeredAgents: ReadonlySet<string>,
 ): Options["hooks"] {
-  const postToolUseHooks = [createPostToolUseHook({ onModeChange, logger })];
+  const postToolUseHooks = [createPostToolUseHook({ onModeChange })];
   if (enrichmentDeps && enrichedReadCache) {
     postToolUseHooks.push(
       createReadEnrichmentHook(enrichmentDeps, enrichedReadCache),