diff --git a/.gitignore b/.gitignore
index 16f234a37..d603ab8a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,8 @@ AGENTS.md
 MEMORY.md
 .claude-config/
 .agent-trigger
+.posthog-code/
+.claude/worktrees/
 
 # Testing
 playwright-results/
diff --git a/.posthog-code/environments/twig.toml b/.posthog-code/environments/twig.toml
deleted file mode 100644
index ef7e6fec6..000000000
--- a/.posthog-code/environments/twig.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-id = "a5fe304a-8007-4435-951f-fcc982247457" # DO NOT EDIT MANUALLY
-version = 1
-
-name = "twig"
-
-[setup]
-script = "pnpm install"
diff --git a/apps/code/src/main/services/context-menu/schemas.ts b/apps/code/src/main/services/context-menu/schemas.ts
index 65120b4a3..2db37c6e9 100644
--- a/apps/code/src/main/services/context-menu/schemas.ts
+++ b/apps/code/src/main/services/context-menu/schemas.ts
@@ -37,7 +37,6 @@ const externalAppAction = z.discriminatedUnion("type", [
 const taskAction = z.discriminatedUnion("type", [
   z.object({ type: z.literal("rename") }),
   z.object({ type: z.literal("pin") }),
-  z.object({ type: z.literal("copy-task-id") }),
   z.object({ type: z.literal("suspend") }),
   z.object({ type: z.literal("archive") }),
   z.object({ type: z.literal("archive-prior") }),
diff --git a/apps/code/src/main/services/context-menu/service.ts b/apps/code/src/main/services/context-menu/service.ts
index 1308e2a22..6d89f1a26 100644
--- a/apps/code/src/main/services/context-menu/service.ts
+++ b/apps/code/src/main/services/context-menu/service.ts
@@ -118,7 +118,6 @@ export class ContextMenuService {
     return this.showMenu<TaskAction>([
       this.item(isPinned ? "Unpin" : "Pin", { type: "pin" }),
       this.item("Rename", { type: "rename" }),
-      this.item("Copy Task ID", { type: "copy-task-id" }),
       ...(worktreePath
         ? [
             this.separator(),
@@ -273,11 +272,6 @@ export class ContextMenuService {
     const lastUsedApp = apps.find((app) => app.id === lastUsedAppId) || apps[0];
     const openIn = (appId: string): T =>
       ({ type: "external-app", action: { type: "open-in-app", appId } }) as T;
-    const copyPath: T = {
-      type: "external-app",
-      action: { type: "copy-path" },
-    } as T;
-
     return [
       this.item(`Open in ${lastUsedApp.name}`, openIn(lastUsedApp.id)),
       {
@@ -293,7 +287,6 @@ export class ContextMenuService {
           action: openIn(app.id),
         })),
       },
-      this.item("Copy Path", copyPath, { accelerator: "CmdOrCtrl+Shift+C" }),
     ];
   }
 
diff --git a/apps/code/src/renderer/features/command-center/components/CommandCenterPanel.tsx b/apps/code/src/renderer/features/command-center/components/CommandCenterPanel.tsx
index 1f773a78c..2e24a8862 100644
--- a/apps/code/src/renderer/features/command-center/components/CommandCenterPanel.tsx
+++ b/apps/code/src/renderer/features/command-center/components/CommandCenterPanel.tsx
@@ -87,7 +87,7 @@ function EmptyCell({ cellIndex }: { cellIndex: number }) {
 
   return (
     <Flex align="center" justify="center" height="100%">
-      <Flex direction="column" align="center" gap="2">
+      <Flex direction="column" align="center" gap="2" className="select-none">
         <TaskSelector
           cellIndex={cellIndex}
           open={selectorOpen}
diff --git a/apps/code/src/renderer/features/message-editor/components/DiffStatsIndicator.tsx b/apps/code/src/renderer/features/message-editor/components/DiffStatsIndicator.tsx
deleted file mode 100644
index fbf1c997b..000000000
--- a/apps/code/src/renderer/features/message-editor/components/DiffStatsIndicator.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-import type { DiffStats } from "@features/git-interaction/utils/diffStats";
-import { Text } from "@radix-ui/themes";
-import { useReviewNavigationStore } from "@renderer/features/code-review/stores/reviewNavigationStore";
-import { useTRPC } from "@renderer/trpc";
-import { useQuery } from "@tanstack/react-query";
-
-interface DiffStatsIndicatorProps {
-  repoPath: string | null | undefined;
-  overrideStats?: DiffStats | null;
-  taskId?: string;
-}
-
-export function DiffStatsIndicator({
-  repoPath,
-  overrideStats,
-  taskId,
-}: DiffStatsIndicatorProps) {
-  const trpc = useTRPC();
-  const { data: localStats } = useQuery(
-    trpc.git.getDiffStats.queryOptions(
-      { directoryPath: repoPath as string },
-      {
-        enabled: !!repoPath && !overrideStats,
-        staleTime: 5000,
-        refetchInterval: 5000,
-        placeholderData: (prev) => prev,
-      },
-    ),
-  );
-
-  const diffStats = overrideStats ?? localStats;
-  const reviewMode = useReviewNavigationStore((s) =>
-    taskId ? (s.reviewModes[taskId] ?? "closed") : "closed",
-  );
-  const setReviewMode = useReviewNavigationStore((s) => s.setReviewMode);
-
-  if (!diffStats || diffStats.filesChanged === 0) {
-    return null;
-  }
-
-  const handleClick = () => {
-    if (taskId) {
-      setReviewMode(taskId, reviewMode !== "closed" ? "closed" : "split");
-    }
-  };
-
-  return (
-    <button
-      type="button"
-      onClick={handleClick}
-      className="inline-flex cursor-pointer items-center gap-2 border-none bg-transparent px-1.5 py-0.5"
-      style={{ whiteSpace: "nowrap" }}
-    >
-      <Text
-        size="1"
-        style={{
-          color: "var(--gray-11)",
-          fontFamily: "monospace",
-        }}
-      >
-        {diffStats.filesChanged}{" "}
-        {diffStats.filesChanged === 1 ? "file" : "files"}
-      </Text>
-      <Text
-        size="1"
-        style={{
-          color: "var(--green-9)",
-          fontFamily: "monospace",
-        }}
-      >
-        +{diffStats.linesAdded}
-      </Text>
-      <Text
-        size="1"
-        style={{
-          color: "var(--red-9)",
-          fontFamily: "monospace",
-        }}
-      >
-        -{diffStats.linesRemoved}
-      </Text>
-    </button>
-  );
-}
diff --git a/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx b/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
index 19973c11a..a6a9a7634 100644
--- a/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
+++ b/apps/code/src/renderer/features/message-editor/components/MessageEditor.tsx
@@ -5,7 +5,7 @@ import { useGitQueries } from "@features/git-interaction/hooks/useGitQueries";
 import { getUserPromptsForTask } from "@features/sessions/stores/sessionStore";
 import { useIsWorkspaceCloudRun } from "@features/workspace/hooks/useWorkspace";
 import { useConnectivity } from "@hooks/useConnectivity";
-import { ArrowUp, Circle, Stop } from "@phosphor-icons/react";
+import { ArrowUp, Stop } from "@phosphor-icons/react";
 import { Flex, IconButton, Text, Tooltip } from "@radix-ui/themes";
 import { EditorContent } from "@tiptap/react";
 import { hasOpenOverlay } from "@utils/overlay";
@@ -15,7 +15,6 @@ import { useDraftStore } from "../stores/draftStore";
 import { useTiptapEditor } from "../tiptap/useTiptapEditor";
 import type { EditorHandle } from "../types";
 import { AttachmentsBar } from "./AttachmentsBar";
-import { DiffStatsIndicator } from "./DiffStatsIndicator";
 import { EditorToolbar } from "./EditorToolbar";
 import { ModeIndicatorInput } from "./ModeIndicatorInput";
 
@@ -26,11 +25,6 @@ interface ModeAndBranchRowProps {
   onModeChange?: () => void;
   repoPath?: string | null;
   cloudBranch?: string | null;
-  cloudDiffStats?: {
-    filesChanged: number;
-    linesAdded: number;
-    linesRemoved: number;
-  } | null;
   disabled?: boolean;
   isBashMode?: boolean;
   isCloud?: boolean;
@@ -42,25 +36,16 @@ function ModeAndBranchRow({
   onModeChange,
   repoPath,
   cloudBranch,
-  cloudDiffStats,
   disabled,
   isBashMode,
   isCloud,
   taskId,
 }: ModeAndBranchRowProps) {
-  const { currentBranch: gitBranch, diffStats } = useGitQueries(
-    repoPath ?? undefined,
-  );
+  const { currentBranch: gitBranch } = useGitQueries(repoPath ?? undefined);
   const currentBranch = cloudBranch ?? gitBranch;
 
   const showModeIndicator = !!onModeChange;
   const showBranchSelector = !!currentBranch;
-  const effectiveDiffStats = cloudDiffStats ?? diffStats;
-  const showDiffStats =
-    effectiveDiffStats &&
-    (effectiveDiffStats.filesChanged > 0 ||
-      effectiveDiffStats.linesAdded > 0 ||
-      effectiveDiffStats.linesRemoved > 0);
 
   if (!showModeIndicator && !showBranchSelector && !isBashMode) {
     return null;
@@ -103,20 +88,6 @@ function ModeAndBranchRow({
         wrap="nowrap"
         style={{ minWidth: 0, overflow: "hidden" }}
       >
-        <DiffStatsIndicator
-          repoPath={repoPath}
-          overrideStats={cloudDiffStats}
-          taskId={taskId}
-        />
-        {showBranchSelector && showDiffStats && (
-          <Flex
-            align="center"
-            justify="center"
-            style={{ height: 16, marginRight: -8, flexShrink: 0 }}
-          >
-            <Circle size={4} weight="fill" color="var(--gray-9)" />
-          </Flex>
-        )}
         {showBranchSelector && (
           <Flex style={{ maxWidth: 200, minWidth: 0 }}>
             <BranchSelector
@@ -178,7 +149,6 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
     const isLoading = context?.isLoading ?? false;
     const repoPath = context?.repoPath;
     const cloudBranch = context?.cloudBranch;
-    const cloudDiffStats = context?.cloudDiffStats;
     const isSubmitDisabled = disabled || !isOnline;
 
     const getPromptHistory = useCallback(
@@ -361,7 +331,6 @@ export const MessageEditor = forwardRef<EditorHandle, MessageEditorProps>(
           onModeChange={onModeChange}
           repoPath={repoPath}
           cloudBranch={cloudBranch}
-          cloudDiffStats={cloudDiffStats}
           disabled={disabled}
           isBashMode={isBashMode}
           isCloud={isCloud}
diff --git a/apps/code/src/renderer/features/message-editor/stores/draftStore.ts b/apps/code/src/renderer/features/message-editor/stores/draftStore.ts
index 1429e8a0e..e57eb3c9b 100644
--- a/apps/code/src/renderer/features/message-editor/stores/draftStore.ts
+++ b/apps/code/src/renderer/features/message-editor/stores/draftStore.ts
@@ -7,18 +7,11 @@ import type { EditorContent } from "../utils/content";
 
 type SessionId = string;
 
-export interface CloudDiffStats {
-  filesChanged: number;
-  linesAdded: number;
-  linesRemoved: number;
-}
-
 export interface EditorContext {
   sessionId: string;
   taskId: string | undefined;
   repoPath: string | null | undefined;
   cloudBranch?: string | null;
-  cloudDiffStats?: CloudDiffStats | null;
   disabled: boolean;
   isLoading: boolean;
 }
@@ -87,7 +80,6 @@ export const useDraftStore = create<DraftStore>()(
             taskId: context.taskId ?? existing?.taskId,
             repoPath: context.repoPath ?? existing?.repoPath,
             cloudBranch: context.cloudBranch ?? existing?.cloudBranch,
-            cloudDiffStats: context.cloudDiffStats ?? existing?.cloudDiffStats,
             disabled: context.disabled ?? existing?.disabled ?? false,
             isLoading: context.isLoading ?? existing?.isLoading ?? false,
           };
@@ -96,12 +88,6 @@ export const useDraftStore = create<DraftStore>()(
             existing?.taskId === newContext.taskId &&
             existing?.repoPath === newContext.repoPath &&
             existing?.cloudBranch === newContext.cloudBranch &&
-            existing?.cloudDiffStats?.filesChanged ===
-              newContext.cloudDiffStats?.filesChanged &&
-            existing?.cloudDiffStats?.linesAdded ===
-              newContext.cloudDiffStats?.linesAdded &&
-            existing?.cloudDiffStats?.linesRemoved ===
-              newContext.cloudDiffStats?.linesRemoved &&
             existing?.disabled === newContext.disabled &&
             existing?.isLoading === newContext.isLoading
           ) {
diff --git a/apps/code/src/renderer/features/sessions/components/ConversationView.tsx b/apps/code/src/renderer/features/sessions/components/ConversationView.tsx
index b5bacb4dc..1de710ce5 100644
--- a/apps/code/src/renderer/features/sessions/components/ConversationView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/ConversationView.tsx
@@ -73,6 +73,15 @@ export function ConversationView({
   }
   const firstUserMessageId = firstUserMessageIdRef.current;
 
+  const [initialItemIds] = useState(
+    () =>
+      new Set(
+        conversationItems
+          .filter((i) => i.type === "user_message")
+          .map((i) => i.id),
+      ),
+  );
+
   const pendingPermissions = usePendingPermissionsForTask(taskId ?? "");
   const pendingPermissionsCount = pendingPermissions.size;
   const queuedMessages = useQueuedMessagesForTask(taskId);
@@ -148,6 +157,7 @@ export function ConversationView({
               content={item.content}
               attachments={item.attachments}
               timestamp={item.timestamp}
+              animate={!initialItemIds.has(item.id)}
               sourceUrl={
                 slackThreadUrl && item.id === firstUserMessageId
                   ? slackThreadUrl
@@ -194,7 +204,7 @@ export function ConversationView({
           );
       }
     },
-    [repoPath, taskId, slackThreadUrl, firstUserMessageId],
+    [repoPath, taskId, slackThreadUrl, firstUserMessageId, initialItemIds],
   );
 
   const getItemKey = useCallback((item: ConversationItem) => item.id, []);
diff --git a/apps/code/src/renderer/features/sessions/components/GeneratingIndicator.tsx b/apps/code/src/renderer/features/sessions/components/GeneratingIndicator.tsx
index 8fea0ef1d..e4a0c307a 100644
--- a/apps/code/src/renderer/features/sessions/components/GeneratingIndicator.tsx
+++ b/apps/code/src/renderer/features/sessions/components/GeneratingIndicator.tsx
@@ -152,11 +152,13 @@ export function GeneratingIndicator({
     <Flex
       align="center"
       gap="2"
-      className="select-none text-accent-11"
+      className="select-none"
       style={{ userSelect: "none", WebkitUserSelect: "none" }}
     >
       <Brain size={12} className="ph-pulse" />
-      <Text size="1">{activity}...</Text>
+      <Text size="1" className="text-accent-11">
+        {activity}...
+      </Text>
       <Text size="1" color="gray">
         (Esc to stop
       </Text>
diff --git a/apps/code/src/renderer/features/sessions/components/SessionFooter.tsx b/apps/code/src/renderer/features/sessions/components/SessionFooter.tsx
index f32068d56..5a3c2ff56 100644
--- a/apps/code/src/renderer/features/sessions/components/SessionFooter.tsx
+++ b/apps/code/src/renderer/features/sessions/components/SessionFooter.tsx
@@ -1,5 +1,5 @@
 import type { ContextUsage } from "@features/sessions/hooks/useContextUsage";
-import { Pause } from "@phosphor-icons/react";
+import { Brain, Pause } from "@phosphor-icons/react";
 import { Box, Flex, Text } from "@radix-ui/themes";
 
 import { ContextUsageIndicator } from "./ContextUsageIndicator";
@@ -71,36 +71,28 @@ export function SessionFooter({
   const wasCancelled =
     lastStopReason === "cancelled" || lastStopReason === "refusal";
 
-  if (
+  const showDuration =
     lastGenerationDuration !== null &&
     lastGenerationDuration > 0 &&
-    !wasCancelled
-  ) {
-    return (
-      <Box className="pb-1">
-        <Flex align="center" justify="between" gap="2">
-          <Text
-            size="1"
-            color="gray"
-            style={{ fontVariantNumeric: "tabular-nums" }}
-          >
-            Generated in {formatDuration(lastGenerationDuration)}
-          </Text>
-          <ContextUsageIndicator usage={usage ?? null} />
-        </Flex>
-      </Box>
-    );
-  }
+    !wasCancelled;
 
-  if (usage) {
-    return (
-      <Box className="pb-1">
-        <Flex justify="end">
-          <ContextUsageIndicator usage={usage} />
-        </Flex>
-      </Box>
-    );
-  }
-
-  return null;
+  return (
+    <Box className="pb-1">
+      <Flex align="center" justify="between" gap="2">
+        {showDuration && (
+          <Flex align="center" gap="2" className="select-none text-gray-10">
+            <Brain size={12} />
+            <Text
+              size="1"
+              color="gray"
+              style={{ fontVariantNumeric: "tabular-nums" }}
+            >
+              Generated in {formatDuration(lastGenerationDuration)}
+            </Text>
+          </Flex>
+        )}
+        <ContextUsageIndicator usage={usage ?? null} />
+      </Flex>
+    </Box>
+  );
 }
diff --git a/apps/code/src/renderer/features/sessions/components/SessionView.tsx b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
index b18f24631..1ef6a2bd5 100644
--- a/apps/code/src/renderer/features/sessions/components/SessionView.tsx
+++ b/apps/code/src/renderer/features/sessions/components/SessionView.tsx
@@ -44,11 +44,6 @@ interface SessionViewProps {
   onCancelPrompt: () => void;
   repoPath?: string | null;
   cloudBranch?: string | null;
-  cloudDiffStats?: {
-    filesChanged: number;
-    linesAdded: number;
-    linesRemoved: number;
-  } | null;
   isSuspended?: boolean;
   onRestoreWorktree?: () => void;
   isRestoring?: boolean;
@@ -79,7 +74,6 @@ export function SessionView({
   onCancelPrompt,
   repoPath,
   cloudBranch,
-  cloudDiffStats,
   isSuspended = false,
   onRestoreWorktree,
   isRestoring = false,
@@ -129,14 +123,24 @@ export function SessionView({
   const sessionId = taskId ?? "default";
   const setContext = useDraftStore((s) => s.actions.setContext);
   const requestFocus = useDraftStore((s) => s.actions.requestFocus);
-  setContext(sessionId, {
+
+  useEffect(() => {
+    setContext(sessionId, {
+      taskId,
+      repoPath,
+      cloudBranch,
+      disabled: !isRunning,
+      isLoading: !!isPromptPending,
+    });
+  }, [
+    setContext,
+    sessionId,
     taskId,
     repoPath,
     cloudBranch,
-    cloudDiffStats,
-    disabled: !isRunning,
-    isLoading: !!isPromptPending,
-  });
+    isRunning,
+    isPromptPending,
+  ]);
 
   useHotkeys(
     "shift+tab",
diff --git a/apps/code/src/renderer/features/sessions/components/session-update/UserMessage.tsx b/apps/code/src/renderer/features/sessions/components/session-update/UserMessage.tsx
index 403cdbc8e..06fabfef4 100644
--- a/apps/code/src/renderer/features/sessions/components/session-update/UserMessage.tsx
+++ b/apps/code/src/renderer/features/sessions/components/session-update/UserMessage.tsx
@@ -9,6 +9,7 @@ import {
   SlackLogo,
 } from "@phosphor-icons/react";
 import { Box, Flex, IconButton } from "@radix-ui/themes";
+import { motion } from "framer-motion";
 import { useCallback, useEffect, useRef, useState } from "react";
 import {
   hasFileMentions,
@@ -28,6 +29,7 @@ interface UserMessageProps {
   timestamp?: number;
   sourceUrl?: string;
   attachments?: UserMessageAttachment[];
+  animate?: boolean;
 }
 
 function formatTimestamp(ts: number): string {
@@ -46,6 +48,7 @@ export function UserMessage({
   timestamp,
   sourceUrl,
   attachments = [],
+  animate = true,
 }: UserMessageProps) {
   const containsFileMentions = hasFileMentions(content);
   const showAttachmentChips = attachments.length > 0 && !containsFileMentions;
@@ -61,98 +64,115 @@ export function UserMessage({
     }
   }, []);
 
+  const copiedTimerRef = useRef<ReturnType<typeof setTimeout>>(undefined);
+
+  useEffect(() => {
+    return () => clearTimeout(copiedTimerRef.current);
+  }, []);
+
   const handleCopy = useCallback(() => {
     navigator.clipboard.writeText(content);
     setCopied(true);
-    setTimeout(() => setCopied(false), 2000);
+    clearTimeout(copiedTimerRef.current);
+    copiedTimerRef.current = setTimeout(() => setCopied(false), 2000);
   }, [content]);
 
   return (
-    <Box
-      className="group/msg relative border-l-2 bg-gray-2 py-2 pl-3"
-      style={{ borderColor: "var(--accent-9)" }}
+    <motion.div
+      initial={animate ? { opacity: 0, y: 6 } : false}
+      animate={{ opacity: 1, y: 0 }}
+      transition={animate ? { duration: 0.25, ease: "easeOut" } : undefined}
     >
       <Box
-        ref={contentRef}
-        className="relative overflow-hidden font-medium [&>*:last-child]:mb-0"
-        style={
-          !isExpanded && isOverflowing
-            ? { maxHeight: COLLAPSED_MAX_HEIGHT }
-            : undefined
-        }
+        className="group/msg relative border-l-2 bg-gray-2 py-2 pl-3"
+        style={{ borderColor: "var(--accent-9)" }}
       >
-        {containsFileMentions ? (
-          parseFileMentions(content)
-        ) : (
-          <MarkdownRenderer content={content} />
-        )}
-        {showAttachmentChips && (
-          <Flex wrap="wrap" gap="1" className={content.trim() ? "mt-1.5" : ""}>
-            {attachments.map((attachment) => (
-              <MentionChip
-                key={attachment.id}
-                icon={<File size={12} />}
-                label={attachment.label}
-              />
-            ))}
-          </Flex>
-        )}
-        {!isExpanded && isOverflowing && (
-          <Box
-            className="pointer-events-none absolute inset-x-0 bottom-0 h-12"
-            style={{
-              background: "linear-gradient(transparent, var(--gray-2))",
-            }}
-          />
-        )}
-      </Box>
-      {isOverflowing && (
-        <button
-          type="button"
-          onClick={() => setIsExpanded((prev) => !prev)}
-          className="mt-1 inline-flex items-center gap-1 text-[12px] text-accent-11 hover:text-accent-12"
+        <Box
+          ref={contentRef}
+          className="relative overflow-hidden font-medium [&>*:last-child]:mb-0"
+          style={
+            !isExpanded && isOverflowing
+              ? { maxHeight: COLLAPSED_MAX_HEIGHT }
+              : undefined
+          }
         >
-          {isExpanded ? (
-            <>
-              <CaretUp size={12} />
-              Show less
-            </>
+          {containsFileMentions ? (
+            parseFileMentions(content)
           ) : (
-            <>
-              <CaretDown size={12} />
-              Show more
-            </>
+            <MarkdownRenderer content={content} />
           )}
-        </button>
-      )}
-      {sourceUrl && (
-        <a
-          href={sourceUrl}
-          target="_blank"
-          rel="noopener noreferrer"
-          className="mt-1.5 inline-flex items-center gap-1 text-[12px] text-gray-10 transition-colors hover:text-gray-12"
-        >
-          <SlackLogo size={12} />
-          <span>View Slack thread</span>
-        </a>
-      )}
-      <Box className="absolute top-1 right-1 flex items-center gap-2 opacity-0 transition-opacity group-hover/msg:opacity-100">
-        {timestamp != null && (
-          <span aria-hidden className="text-[11px] text-gray-10">
-            {formatTimestamp(timestamp)}
-          </span>
+          {showAttachmentChips && (
+            <Flex
+              wrap="wrap"
+              gap="1"
+              className={content.trim() ? "mt-1.5" : ""}
+            >
+              {attachments.map((attachment) => (
+                <MentionChip
+                  key={attachment.id}
+                  icon={<File size={12} />}
+                  label={attachment.label}
+                />
+              ))}
+            </Flex>
+          )}
+          {!isExpanded && isOverflowing && (
+            <Box
+              className="pointer-events-none absolute inset-x-0 bottom-0 h-12"
+              style={{
+                background: "linear-gradient(transparent, var(--gray-2))",
+              }}
+            />
+          )}
+        </Box>
+        {isOverflowing && (
+          <button
+            type="button"
+            onClick={() => setIsExpanded((prev) => !prev)}
+            className="mt-1 inline-flex items-center gap-1 text-[12px] text-accent-11 hover:text-accent-12"
+          >
+            {isExpanded ? (
+              <>
+                <CaretUp size={12} />
+                Show less
+              </>
+            ) : (
+              <>
+                <CaretDown size={12} />
+                Show more
+              </>
+            )}
+          </button>
         )}
-        <Tooltip content={copied ? "Copied!" : "Copy message"}>
-          <IconButton
-            size="1"
-            variant="ghost"
-            color={copied ? "green" : "gray"}
-            onClick={handleCopy}
+        {sourceUrl && (
+          <a
+            href={sourceUrl}
+            target="_blank"
+            rel="noopener noreferrer"
+            className="mt-1.5 inline-flex items-center gap-1 text-[12px] text-gray-10 transition-colors hover:text-gray-12"
           >
-            {copied ? <Check size={12} /> : <Copy size={12} />}
-          </IconButton>
-        </Tooltip>
+            <SlackLogo size={12} />
+            <span>View Slack thread</span>
+          </a>
+        )}
+        <Box className="absolute top-1 right-1 flex items-center gap-1.5 rounded-md bg-gray-2 py-0.5 pr-1 pl-2 opacity-0 shadow-sm transition-opacity group-hover/msg:opacity-100">
+          {timestamp != null && (
+            <span aria-hidden className="text-[11px] text-gray-10">
+              {formatTimestamp(timestamp)}
+            </span>
+          )}
+          <Tooltip content={copied ? "Copied!" : "Copy message"}>
+            <IconButton
+              size="1"
+              variant="ghost"
+              color={copied ? "green" : "gray"}
+              onClick={handleCopy}
+            >
+              {copied ? <Check size={12} /> : <Copy size={12} />}
+            </IconButton>
+          </Tooltip>
+        </Box>
       </Box>
-    </Box>
+    </motion.div>
   );
 }
diff --git a/apps/code/src/renderer/features/settings/components/sections/ClaudeCodeSettings.tsx b/apps/code/src/renderer/features/settings/components/sections/ClaudeCodeSettings.tsx
index 313d80022..092c7c4a0 100644
--- a/apps/code/src/renderer/features/settings/components/sections/ClaudeCodeSettings.tsx
+++ b/apps/code/src/renderer/features/settings/components/sections/ClaudeCodeSettings.tsx
@@ -178,7 +178,7 @@ export function ClaudeCodeSettings() {
       <PermissionsSettings />
 
       <SettingRow
-        label="Auto-accept permissions"
+        label="Bypass permissions"
         description="Skip all permission prompts. Claude will run bash commands, edit files, browse the web and use any tool without asking first"
         noBorder
       >
@@ -195,7 +195,7 @@ export function ClaudeCodeSettings() {
             <Warning weight="fill" />
           </Callout.Icon>
           <Callout.Text>
-            Auto-accept is enabled. All actions (shell commands, file edits, web
+            Bypass is enabled. All actions (shell commands, file edits, web
             requests) run without approval. Use shift+tab to cycle to this mode
             per session.
           </Callout.Text>
@@ -211,16 +211,16 @@ export function ClaudeCodeSettings() {
             <Flex align="center" gap="2">
               <Warning size={20} weight="fill" color="var(--red-9)" />
               <Text color="red" weight="bold">
-                Enable auto-accept permissions
+                Enable bypass permissions
               </Text>
             </Flex>
           </AlertDialog.Title>
           <AlertDialog.Description size="2">
             <Flex direction="column" gap="3">
               <Text color="red" weight="medium">
-                With auto-accept enabled, Claude will execute every action
-                without asking — including shell commands, file edits, web
-                requests and any installed MCP tools.
+                With bypass enabled, Claude will execute every action without
+                asking -- including shell commands, file edits, web requests and
+                any installed MCP tools.
               </Text>
               <Text>
                 This mode is intended for sandboxed environments (containers or
@@ -228,7 +228,7 @@ export function ClaudeCodeSettings() {
               </Text>
               <Text weight="medium">
                 By proceeding, you accept all responsibility for actions taken
-                while auto-accept is enabled.
+                while bypass is enabled.
               </Text>
             </Flex>
           </AlertDialog.Description>
diff --git a/apps/code/src/renderer/features/settings/components/sections/CloudEnvironmentsSettings.tsx b/apps/code/src/renderer/features/settings/components/sections/CloudEnvironmentsSettings.tsx
index ffaff5bc6..e9489b4a6 100644
--- a/apps/code/src/renderer/features/settings/components/sections/CloudEnvironmentsSettings.tsx
+++ b/apps/code/src/renderer/features/settings/components/sections/CloudEnvironmentsSettings.tsx
@@ -130,11 +130,9 @@ function NetworkAccessSelect({
   onChange: (v: NetworkAccessLevel) => void;
 }) {
   const [open, setOpen] = useState(false);
-  const current = NETWORK_ACCESS_OPTIONS.find((o) => o.value === value);
-
-  if (!current) {
-    return null;
-  }
+  const current =
+    NETWORK_ACCESS_OPTIONS.find((o) => o.value === value) ??
+    NETWORK_ACCESS_OPTIONS[0];
 
   return (
     <div style={{ position: "relative" }}>
diff --git a/apps/code/src/renderer/features/settings/components/sections/environments/ProjectEnvironmentCard.tsx b/apps/code/src/renderer/features/settings/components/sections/environments/ProjectEnvironmentCard.tsx
index 1195f9cbc..24c45fdf9 100644
--- a/apps/code/src/renderer/features/settings/components/sections/environments/ProjectEnvironmentCard.tsx
+++ b/apps/code/src/renderer/features/settings/components/sections/environments/ProjectEnvironmentCard.tsx
@@ -36,7 +36,7 @@ export function ProjectEnvironmentCard({
         borderRadius: "var(--radius-2)",
       }}
     >
-      <Flex align="center" justify="between" gap="2" px="2" py="2">
+      <Flex align="center" justify="between" gap="2" px="3" py="2">
         <Flex align="center" gap="2" style={{ minWidth: 0, flex: 1 }}>
           <FolderIcon
             size={14}
@@ -68,7 +68,7 @@ export function ProjectEnvironmentCard({
       {environments.length > 0 && (
         <Flex
           direction="column"
-          px="2"
+          px="3"
           style={{ borderTop: "1px solid var(--gray-4)" }}
         >
           {environments.map((env, index) => (
diff --git a/apps/code/src/renderer/features/skills/components/SkillsView.tsx b/apps/code/src/renderer/features/skills/components/SkillsView.tsx
index 34d1a7bef..3dd88b242 100644
--- a/apps/code/src/renderer/features/skills/components/SkillsView.tsx
+++ b/apps/code/src/renderer/features/skills/components/SkillsView.tsx
@@ -29,11 +29,8 @@ export function SkillsView() {
   } = useSkillsSidebarStore();
 
   const selectedSkill = useMemo(() => {
-    if (skills.length === 0) return null;
-    if (selectedPath !== null) {
-      return skills.find((s) => s.path === selectedPath) ?? skills[0];
-    }
-    return skills[0];
+    if (selectedPath === null || skills.length === 0) return null;
+    return skills.find((s) => s.path === selectedPath) ?? null;
   }, [skills, selectedPath]);
 
   const handleSelect = useCallback((path: string) => {
diff --git a/apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx b/apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx
index 1347c7347..965df1b36 100644
--- a/apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx
+++ b/apps/code/src/renderer/features/task-detail/components/TaskLogsPanel.tsx
@@ -1,11 +1,6 @@
 import { BackgroundWrapper } from "@components/BackgroundWrapper";
 import { ErrorBoundary } from "@components/ErrorBoundary";
 import { useFolders } from "@features/folders/hooks/useFolders";
-import {
-  useCloudBranchChangedFiles,
-  useCloudPrChangedFiles,
-} from "@features/git-interaction/hooks/useGitQueries";
-import { computeDiffStats } from "@features/git-interaction/utils/diffStats";
 import { useDraftStore } from "@features/message-editor/stores/draftStore";
 import { ProvisioningView } from "@features/provisioning/components/ProvisioningView";
 import { useProvisioningStore } from "@features/provisioning/stores/provisioningStore";
@@ -23,7 +18,7 @@ import {
 import { Box, Flex } from "@radix-ui/themes";
 import type { Task } from "@shared/types";
 import { getTaskRepository } from "@utils/repository";
-import { useCallback, useEffect, useMemo } from "react";
+import { useCallback, useEffect } from "react";
 
 interface TaskLogsPanelProps {
   taskId: string;
@@ -81,27 +76,11 @@ export function TaskLogsPanel({ taskId, task, hideInput }: TaskLogsPanelProps) {
     handleBashCommand,
   } = useSessionCallbacks({ taskId, task, session, repoPath });
 
-  const cloudOutput = session?.cloudOutput ?? null;
-  const prUrl =
-    isCloud && cloudOutput?.pr_url ? (cloudOutput.pr_url as string) : null;
   const slackThreadUrl =
     typeof task.latest_run?.state?.slack_thread_url === "string"
       ? task.latest_run.state.slack_thread_url
       : undefined;
 
-  const cloudRepo = isCloud ? (task.repository ?? null) : null;
-  const { data: prFiles } = useCloudPrChangedFiles(prUrl);
-  const { data: branchFiles } = useCloudBranchChangedFiles(
-    !prUrl ? cloudRepo : null,
-    !prUrl ? cloudBranch : null,
-  );
-  const cloudDiffStats = useMemo(() => {
-    if (!isCloud) return null;
-    const files = prUrl ? prFiles : branchFiles;
-    if (!files || files.length === 0) return null;
-    return computeDiffStats(files);
-  }, [isCloud, prUrl, prFiles, branchFiles]);
-
   useEffect(() => {
     requestFocus(taskId);
   }, [taskId, requestFocus]);
@@ -152,7 +131,6 @@ export function TaskLogsPanel({ taskId, task, hideInput }: TaskLogsPanelProps) {
               onCancelPrompt={handleCancelPrompt}
               repoPath={repoPath}
               cloudBranch={cloudBranch}
-              cloudDiffStats={cloudDiffStats}
               hasError={hasError}
               errorTitle={errorTitle}
               errorMessage={errorMessage ?? undefined}
diff --git a/apps/code/src/renderer/hooks/useTaskContextMenu.ts b/apps/code/src/renderer/hooks/useTaskContextMenu.ts
index b3ccff57f..c57a2725d 100644
--- a/apps/code/src/renderer/hooks/useTaskContextMenu.ts
+++ b/apps/code/src/renderer/hooks/useTaskContextMenu.ts
@@ -8,7 +8,6 @@ import type { Task } from "@shared/types";
 import { handleExternalAppAction } from "@utils/handleExternalAppAction";
 import { logger } from "@utils/logger";
 import { useCallback, useState } from "react";
-import { toast } from "sonner";
 
 const log = logger.scope("context-menu");
 
@@ -70,10 +69,6 @@ export function useTaskContextMenu() {
           case "pin":
             onTogglePin?.();
             break;
-          case "copy-task-id":
-            navigator.clipboard.writeText(task.id);
-            toast.success("Task ID copied");
-            break;
           case "suspend":
             if (isSuspended) {
               await restoreTask(task.id);
diff --git a/packages/agent/src/adapters/claude/permissions/permission-options.ts b/packages/agent/src/adapters/claude/permissions/permission-options.ts
index aed7a27cf..551be7c31 100644
--- a/packages/agent/src/adapters/claude/permissions/permission-options.ts
+++ b/packages/agent/src/adapters/claude/permissions/permission-options.ts
@@ -100,7 +100,7 @@ export function buildExitPlanModePermissionOptions(): PermissionOption[] {
   if (ALLOW_BYPASS) {
     options.push({
       kind: "allow_always",
-      name: "Yes, auto-accept all permissions",
+      name: "Yes, bypass all permissions",
       optionId: "bypassPermissions",
     });
   }
diff --git a/packages/agent/src/execution-mode.ts b/packages/agent/src/execution-mode.ts
index d3eba723d..57e93317c 100644
--- a/packages/agent/src/execution-mode.ts
+++ b/packages/agent/src/execution-mode.ts
@@ -35,8 +35,8 @@ const availableModes: ModeInfo[] = [
 if (ALLOW_BYPASS) {
   availableModes.push({
     id: "bypassPermissions",
-    name: "Auto-accept Permissions",
-    description: "Auto-accept all permission requests",
+    name: "Bypass Permissions",
+    description: "Bypass all permission prompts",
   });
 }
 
@@ -84,7 +84,7 @@ if (ALLOW_BYPASS) {
   codexModes.push({
     id: "full-access",
     name: "Full Access",
-    description: "Auto-accept all permission requests",
+    description: "Bypass all permission prompts",
   });
 }