diff --git a/electron/command/queryLifecycle.ts b/electron/command/queryLifecycle.ts
index 3a412a9..e391cab 100644
--- a/electron/command/queryLifecycle.ts
+++ b/electron/command/queryLifecycle.ts
@@ -8,6 +8,7 @@ import type { ClaudeSessionLaunchOptions } from './sessionLaunchOptions'
 import { toSdkOptions } from './sessionLaunchOptions'
 import { mapManagedMessagesToSdkInitialMessages } from './sdkHistoryMapper'
 import { adaptClaudeSdkMessage } from '../conversation/runtime/claudeRuntimeAdapter'
+import { ensureSdkCompatEnv } from './sdkCompatEnv'
 import {
   createRuntimeEventEnvelope,
   isTurnScopedRuntimeEventKind,
@@ -41,6 +42,7 @@ let _modulePromise: Promise<OpenCowAgentModule> | null = null
 async function loadSdkModule(): Promise<OpenCowAgentModule> {
   if (!_modulePromise) {
     _modulePromise = (async () => {
+      ensureSdkCompatEnv()
       const entryPath = require.resolve('@opencow-ai/opencow-agent-sdk/dist/sdk.js')
       return import(pathToFileURL(entryPath).href) as Promise<OpenCowAgentModule>
     })()
diff --git a/electron/command/sdkCompatEnv.ts b/electron/command/sdkCompatEnv.ts
new file mode 100644
index 0000000..19e6e86
--- /dev/null
+++ b/electron/command/sdkCompatEnv.ts
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * OpenCow SDK compatibility env defaults.
+ *
+ * The published npm SDK package currently does not ship the vendored
+ * `dist/vendor/ripgrep` fallback, so forcing the SDK onto system `rg`
+ * avoids guaranteed `Glob`/`Grep` failures when a working ripgrep is on PATH.
+ *
+ * Respect explicit user overrides.
+ */
+export function ensureSdkCompatEnv(): void {
+  if (process.env.USE_BUILTIN_RIPGREP === undefined) {
+    process.env.USE_BUILTIN_RIPGREP = '0'
+  }
+}
diff --git a/package.json b/package.json
index b9131bc..bf0dba9 100644
--- a/package.json
+++ b/package.json
@@ -64,7 +64,7 @@
     "@nivo/bar": "^0.99.0",
     "@nivo/calendar": "^0.99.0",
     "@nivo/core": "^0.99.0",
-    "@opencow-ai/opencow-agent-sdk": "^0.1.9",
+    "@opencow-ai/opencow-agent-sdk": "^0.1.10",
     "@pydantic/genai-prices": "0.0.56",
     "@tailwindcss/vite": "^4.2.0",
     "@tiptap/core": "^3.20.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c93595e..a379709 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -71,8 +71,8 @@ importers:
         specifier: ^0.99.0
         version: 0.99.0(react-dom@19.2.4(react@19.2.4))(react@19.2.4)
       '@opencow-ai/opencow-agent-sdk':
-        specifier: ^0.1.9
-        version: 0.1.9(encoding@0.1.13)
+        specifier: ^0.1.10
+        version: 0.1.10(encoding@0.1.13)
       '@pydantic/genai-prices':
         specifier: 0.0.56
         version: 0.0.56
@@ -1444,8 +1444,8 @@ packages:
     resolution: {integrity: sha512-da6KbdNCV5sr1/txD896V+6W0iamFWrvVl8cHkBSPT+YlvmT3DwXa4jxZnQc+gnuTEqSWbBeoSZYTayXH9wXcw==}
     engines: {node: '>= 20'}
 
-  '@opencow-ai/opencow-agent-sdk@0.1.9':
-    resolution: {integrity: sha512-FaYXbsSR3U54XPFYiXl31K8MDDwgKpSg8KOqDj4wBfJsOvhJeO2pW8jX37ohtTzqgJ0/iOFgGvJhbVJCFg6DXA==}
+  '@opencow-ai/opencow-agent-sdk@0.1.10':
+    resolution: {integrity: sha512-4u91hMGjJOZXVstkETY20TkQvGIM5mRf42ntFTwGlUDaTzPEPdfs/9/qssEBAEcYwZhXunmuhBiPIaFhGWIgjw==}
     engines: {node: '>=20.0.0'}
     hasBin: true
 
@@ -4961,10 +4961,6 @@ packages:
     resolution: {integrity: sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==}
     engines: {node: '>=8'}
 
-  strip-ansi@7.1.2:
-    resolution: {integrity: sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==}
-    engines: {node: '>=12'}
-
   strip-ansi@7.2.0:
     resolution: {integrity: sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==}
     engines: {node: '>=12'}
@@ -6364,7 +6360,7 @@ snapshots:
     dependencies:
       string-width: 5.1.2
       string-width-cjs: string-width@4.2.3
-      strip-ansi: 7.1.2
+      strip-ansi: 7.2.0
       strip-ansi-cjs: strip-ansi@6.0.1
       wrap-ansi: 8.1.0
       wrap-ansi-cjs: wrap-ansi@7.0.0
@@ -6808,7 +6804,7 @@ snapshots:
       '@octokit/request-error': 7.1.0
       '@octokit/webhooks-methods': 6.0.0
 
-  '@opencow-ai/opencow-agent-sdk@0.1.9(encoding@0.1.13)':
+  '@opencow-ai/opencow-agent-sdk@0.1.10(encoding@0.1.13)':
     dependencies:
       '@alcalzone/ansi-tokenize': 0.3.0
       '@anthropic-ai/sandbox-runtime': 0.0.46
@@ -10979,10 +10975,6 @@ snapshots:
     dependencies:
       ansi-regex: 5.0.1
 
-  strip-ansi@7.1.2:
-    dependencies:
-      ansi-regex: 6.2.2
-
   strip-ansi@7.2.0:
     dependencies:
       ansi-regex: 6.2.2
diff --git a/src/renderer/components/DetailPanel/SessionPanel/AssistantMessage.tsx b/src/renderer/components/DetailPanel/SessionPanel/AssistantMessage.tsx
index cb3ab82..dec8b0d 100644
--- a/src/renderer/components/DetailPanel/SessionPanel/AssistantMessage.tsx
+++ b/src/renderer/components/DetailPanel/SessionPanel/AssistantMessage.tsx
@@ -14,6 +14,7 @@ import { useRef, useMemo, memo } from 'react'
 import { ContentBlockRenderer } from './ContentBlockRenderer'
 import { ToolBatchCollapsible } from './ToolBatchCollapsible'
 import { useCommandStore, selectStreamingMessage } from '@/stores/commandStore'
+import { cn } from '@/lib/utils'
 import { NativeCapabilityTools } from '@shared/nativeCapabilityToolNames'
 import { isEvoseToolName } from '@shared/evoseNames'
 import type { ManagedSessionMessage, ContentBlock } from '@shared/types'
@@ -86,6 +87,21 @@ function extractLastTextBlockIndex(blocks: ContentBlock[]): number {
   return -1
 }
 
+/**
+ * Compact assistant messages are made entirely of lightweight console rows
+ * (tool pills/results and collapsed thinking toggles) with no prose/image/
+ * document content. Their vertical rhythm should come from the stack
+ * container rather than per-message padding.
+ */
+export function isCompactAssistantContent(blocks: readonly ContentBlock[]): boolean {
+  if (blocks.length === 0) return false
+  return blocks.every((block) =>
+    block.type === 'tool_use' ||
+    block.type === 'tool_result' ||
+    block.type === 'thinking',
+  )
+}
+
 // ---------------------------------------------------------------------------
 // Component
 // ---------------------------------------------------------------------------
@@ -202,86 +218,87 @@ export const AssistantMessage = memo(function AssistantMessage({
   const lastTextBlockIndex = extractLastTextBlockIndex(filteredContent)
   const hasToolUseInMessage = toolCallCount > 0
   const textStreaming = isStreaming && !hasToolUseInMessage
+  const isCompactOnly = isCompactAssistantContent(filteredContent)
+  const rootClassName = cn(
+    isCompactOnly ? 'py-px' : 'py-0.5',
+    'break-words min-w-0',
+  )
+  const compactStackClassName = isCompactOnly && filteredContent.length > 1 ? 'space-y-1' : undefined
+
+  const renderBlock = (block: ContentBlock, index: number) => (
+    <ContentBlockRenderer
+      key={`${block.type}-${index}`}
+      block={block}
+      sessionId={sessionId}
+      isLastTextBlock={index === lastTextBlockIndex}
+      isStreaming={textStreaming}
+      isMessageStreaming={isStreaming}
+      activeToolUseId={activeToolUseId}
+    />
+  )
 
   if (!shouldCollapseInMessageTools) {
+    const renderedBlocks = filteredContent.map(renderBlock)
     return (
-      <div data-msg-id={id} data-msg-role="assistant" className="py-0.5 break-words min-w-0">
-        {filteredContent.map((block, index) => (
-          <ContentBlockRenderer
-            key={`${block.type}-${index}`}
-            block={block}
-            sessionId={sessionId}
-            isLastTextBlock={index === lastTextBlockIndex}
-            isStreaming={textStreaming}
-            isMessageStreaming={isStreaming}
-            activeToolUseId={activeToolUseId}
-          />
-        ))}
+      <div data-msg-id={id} data-msg-role="assistant" className={rootClassName}>
+        {compactStackClassName ? (
+          <div className={compactStackClassName}>
+            {renderedBlocks}
+          </div>
+        ) : renderedBlocks}
       </div>
     )
   }
 
   const segments = splitToolAndNonToolSegments(filteredContent)
-
-  return (
-    <div data-msg-id={id} data-msg-role="assistant" className="py-0.5 break-words min-w-0">
-      {segments.map((segment, segmentIndex) => {
-        if (segment.kind === 'tool') {
-          const segmentContent = segment.blocks.map(({ block }) => block)
-          const segmentToolCallCount = countToolUseBlocks(segmentContent)
-          const shouldKeepExpanded =
-            segmentToolCallCount < IN_MESSAGE_TOOL_COLLAPSE_THRESHOLD ||
-            hasNonBatchableToolUse(segmentContent)
-          if (shouldKeepExpanded) {
-            return (
-              <div key={`${id}-tool-segment-raw-${segmentIndex}-${segment.blocks[0]?.index ?? 0}`}>
-                {segment.blocks.map(({ block, index }) => (
-                  <ContentBlockRenderer
-                    key={`${block.type}-${index}`}
-                    block={block}
-                    sessionId={sessionId}
-                    isLastTextBlock={index === lastTextBlockIndex}
-                    isStreaming={textStreaming}
-                    isMessageStreaming={isStreaming}
-                    activeToolUseId={activeToolUseId}
-                  />
-                ))}
-              </div>
-            )
-          }
-
-          const segmentMessage: ManagedSessionMessage = {
-            id: `${id}-tool-segment-${segmentIndex}`,
-            role: 'assistant',
-            content: segmentContent,
-            timestamp: msg.timestamp,
-            isStreaming,
-            activeToolUseId,
-          }
-          return (
-            <ToolBatchCollapsible
-              key={`${id}-tool-segment-${segmentIndex}-${segment.blocks[0]?.index ?? 0}`}
-              messages={[segmentMessage]}
-              sessionId={sessionId}
-            />
-          )
-        }
+  const renderSegment = (
+    segment: { kind: 'tool' | 'other'; blocks: IndexedContentBlock[] },
+    segmentIndex: number,
+  ) => {
+    if (segment.kind === 'tool') {
+      const segmentContent = segment.blocks.map(({ block }) => block)
+      const segmentToolCallCount = countToolUseBlocks(segmentContent)
+      const shouldKeepExpanded =
+        segmentToolCallCount < IN_MESSAGE_TOOL_COLLAPSE_THRESHOLD ||
+        hasNonBatchableToolUse(segmentContent)
+      if (shouldKeepExpanded) {
         return (
-          <div key={`${id}-other-segment-${segmentIndex}-${segment.blocks[0]?.index ?? 0}`}>
-            {segment.blocks.map(({ block, index }) => (
-              <ContentBlockRenderer
-                key={`${block.type}-${index}`}
-                block={block}
-                sessionId={sessionId}
-                isLastTextBlock={index === lastTextBlockIndex}
-                isStreaming={textStreaming}
-                isMessageStreaming={isStreaming}
-                activeToolUseId={activeToolUseId}
-              />
-            ))}
+          <div key={`${id}-tool-segment-raw-${segmentIndex}-${segment.blocks[0]?.index ?? 0}`}>
+            {segment.blocks.map(({ block, index }) => renderBlock(block, index))}
           </div>
         )
-      })}
+      }
+
+      const segmentMessage: ManagedSessionMessage = {
+        id: `${id}-tool-segment-${segmentIndex}`,
+        role: 'assistant',
+        content: segmentContent,
+        timestamp: msg.timestamp,
+        isStreaming,
+        activeToolUseId,
+      }
+      return (
+        <ToolBatchCollapsible
+          key={`${id}-tool-segment-${segmentIndex}-${segment.blocks[0]?.index ?? 0}`}
+          messages={[segmentMessage]}
+          sessionId={sessionId}
+        />
+      )
+    }
+    return (
+      <div key={`${id}-other-segment-${segmentIndex}-${segment.blocks[0]?.index ?? 0}`}>
+        {segment.blocks.map(({ block, index }) => renderBlock(block, index))}
+      </div>
+    )
+  }
+
+  return (
+    <div data-msg-id={id} data-msg-role="assistant" className={rootClassName}>
+      {compactStackClassName ? (
+        <div className={compactStackClassName}>
+          {segments.map(renderSegment)}
+        </div>
+      ) : segments.map(renderSegment)}
     </div>
   )
 })
diff --git a/src/renderer/components/DetailPanel/SessionPanel/MessageRenderers.tsx b/src/renderer/components/DetailPanel/SessionPanel/MessageRenderers.tsx
index 5d59b91..fe40231 100644
--- a/src/renderer/components/DetailPanel/SessionPanel/MessageRenderers.tsx
+++ b/src/renderer/components/DetailPanel/SessionPanel/MessageRenderers.tsx
@@ -11,6 +11,8 @@
 import { memo } from 'react'
 import { LinkifiedText } from '@/components/ui/LinkifiedText'
 import { ContentBlockRenderer } from './ContentBlockRenderer'
+import { useToolLifecycleMap, type ToolLifecycleMap } from './ToolLifecycleContext'
+import { shouldRenderToolResultBlock } from './ToolResultBlockView'
 import { ContextFileChips } from '@/components/ui/ContextFileChips'
 import { parseContextFiles } from '@/lib/contextFilesParsing'
 import { getSlashDisplayLabel } from '@shared/slashDisplay'
@@ -138,6 +140,9 @@ export const ToolResultUserMessage = memo(function ToolResultUserMessage({
   content: ContentBlock[]
   sessionId?: string
 }) {
+  const toolLifecycleMap = useToolLifecycleMap()
+  if (!hasVisibleToolResultUserMessageContent(content, toolLifecycleMap)) return null
+
   return (
     <div data-msg-id={id} data-msg-role="user-tool-result" className="py-0.5 break-words min-w-0">
       {content.map((block, i) => (
@@ -171,3 +176,21 @@ export const ChatBubbleUserMessage = memo(function ChatBubbleUserMessage({ id, c
     </div>
   )
 })
+
+/**
+ * Engine-emitted user tool-result messages should only reserve space when at
+ * least one block actually renders visible UI.
+ */
+export function hasVisibleToolResultUserMessageContent(
+  content: readonly ContentBlock[],
+  toolLifecycleMap: ToolLifecycleMap,
+): boolean {
+  for (const block of content) {
+    if (block.type === 'image' && block.toolUseId) return true
+    if (block.type === 'tool_result') {
+      const toolName = toolLifecycleMap.get(block.toolUseId)?.name
+      if (shouldRenderToolResultBlock(block, toolName)) return true
+    }
+  }
+  return false
+}
diff --git a/src/renderer/components/DetailPanel/SessionPanel/SessionMessageList.tsx b/src/renderer/components/DetailPanel/SessionPanel/SessionMessageList.tsx
index aa24739..dfb829f 100644
--- a/src/renderer/components/DetailPanel/SessionPanel/SessionMessageList.tsx
+++ b/src/renderer/components/DetailPanel/SessionPanel/SessionMessageList.tsx
@@ -4,7 +4,12 @@ import { useEffect, useRef, useCallback, useMemo, useState, startTransition, mem
 import { useTranslation } from 'react-i18next'
 import { Virtuoso, type VirtuosoHandle, type ListRange } from 'react-virtuoso'
 import { ArrowDown, GitCompare } from 'lucide-react'
-import { UserMessage, ChatBubbleUserMessage, ToolResultUserMessage } from './MessageRenderers'
+import {
+  UserMessage,
+  ChatBubbleUserMessage,
+  ToolResultUserMessage,
+  hasVisibleToolResultUserMessageContent,
+} from './MessageRenderers'
 import { AssistantMessage } from './AssistantMessage'
 import { INCREASE_VIEWPORT_BY, FooterNodeContext, VIRTUOSO_COMPONENTS } from './VirtuosoShell'
 import type { VirtuosoContext, MessageListVariant } from './VirtuosoShell'
@@ -162,6 +167,7 @@ function scanNavAnchors(
 
   for (const msg of newMsgs) {
     if (msg.role === 'user') {
+      if (isToolResultOnlyUserMessage(msg.content)) continue
       inAssistantTurn = false
       const info = getUserMessageDisplayInfo(msg.content)
       if (info.isEmpty) continue
@@ -357,6 +363,8 @@ function SessionMessageList({
     scanToolLifecycle,
     INIT_TOOL_MAP,
   )
+  const toolLifecycleMapRef = useRef(toolLifecycleMap)
+  toolLifecycleMapRef.current = toolLifecycleMap
 
   // ---------------------------------------------------------------------------
   // RC3: Incremental messageGroups — O(delta) per append instead of O(N).
@@ -404,6 +412,13 @@ function SessionMessageList({
       // Filter consumed task events from the delta
       const filtered = newMsgs.filter((msg) => {
         if (msg.role === 'system' && isConsumedTaskEvent(msg.event, consumedIdsRef.current)) return false
+        if (
+          msg.role === 'user' &&
+          isToolResultOnlyUserMessage(msg.content) &&
+          !hasVisibleToolResultUserMessageContent(msg.content, toolLifecycleMapRef.current)
+        ) {
+          return false
+        }
         return true
       })
       if (filtered.length === 0) return prev // copy-on-write: no change
@@ -643,9 +658,11 @@ function SessionMessageList({
   // If in 'browsing' state (user had scrolled up), `followOutput` returned
   // `false` so no Virtuoso scroll was initiated.  We need `engage()` to
   // transition to 'following' and issue the scroll manually.
-  const userMsgCountRef = useRef(messages.filter((m) => m.role === 'user').length)
+  const userMsgCountRef = useRef(
+    messages.filter((m) => m.role === 'user' && !isToolResultOnlyUserMessage(m.content)).length,
+  )
   useEffect(() => {
-    const count = messages.filter((m) => m.role === 'user').length
+    const count = messages.filter((m) => m.role === 'user' && !isToolResultOnlyUserMessage(m.content)).length
     if (count > userMsgCountRef.current) {
       reengageIfBrowsing('smooth')
     }
diff --git a/src/renderer/components/DetailPanel/SessionPanel/SessionStatusBar.tsx b/src/renderer/components/DetailPanel/SessionPanel/SessionStatusBar.tsx
index 5411a88..82496d6 100644
--- a/src/renderer/components/DetailPanel/SessionPanel/SessionStatusBar.tsx
+++ b/src/renderer/components/DetailPanel/SessionPanel/SessionStatusBar.tsx
@@ -9,9 +9,10 @@ import type { SessionHistoryContext } from './sessionHistoryTypes'
 import { ContextWindowRing } from '../../ui/ContextWindowRing'
 import { Tooltip } from '../../ui/Tooltip'
 import { PillDropdown } from '../../ui/PillDropdown'
+import { TodoStatusPill } from './TodoWidgets'
 import { formatDuration, computeActiveDuration } from '@/lib/sessionHelpers'
 import { isProcessCorruptedError } from '../../../lib/sessionErrors'
-import { useStreamingSessionMetrics, useCommandStore } from '@/stores/commandStore'
+import { selectLatestOpenTodos, useStreamingSessionMetrics, useCommandStore } from '@/stores/commandStore'
 import { useStoreWithEqualityFn } from 'zustand/traditional'
 import { shallow } from 'zustand/shallow'
 import { resolveContextDisplayState } from '@shared/contextDisplay'
@@ -137,6 +138,7 @@ export const SessionStatusBar = React.memo(function SessionStatusBar({
   const metrics = useStreamingSessionMetrics(sessionId)
   const activeDurationMs = metrics?.activeDurationMs ?? 0
   const activeStartedAt = metrics?.activeStartedAt ?? null
+  const latestTodos = useCommandStore((s) => selectLatestOpenTodos(s, sessionId))
 
   // Context display — resolves from the full session snapshot.
   // Uses useStoreWithEqualityFn + shallow to avoid re-renders when
@@ -175,6 +177,7 @@ export const SessionStatusBar = React.memo(function SessionStatusBar({
     state === 'stopped' ||
     state === 'error'
   ) && !!onNewSession && !!onNewBlankSession
+  const isTodoPaused = state === 'idle' || state === 'stopped' || state === 'error'
 
   return (
     <div
@@ -204,6 +207,9 @@ export const SessionStatusBar = React.memo(function SessionStatusBar({
       </div>
 
       <div className="flex items-center gap-1 shrink-0">
+        {latestTodos && (
+          <TodoStatusPill todos={latestTodos} isPaused={isTodoPaused} />
+        )}
         {showStop && (
           <button
             onClick={() => onStop?.()}
diff --git a/src/renderer/components/DetailPanel/SessionPanel/TaskWidgets.tsx b/src/renderer/components/DetailPanel/SessionPanel/TaskWidgets.tsx
index 339ac35..2e17d77 100644
--- a/src/renderer/components/DetailPanel/SessionPanel/TaskWidgets.tsx
+++ b/src/renderer/components/DetailPanel/SessionPanel/TaskWidgets.tsx
@@ -409,15 +409,20 @@ export const TaskExecutionView = memo(function TaskExecutionView({
   const prompt = (block.input.prompt as string | undefined) ?? ''
   const hasExpandableContent = !!prompt || !!lifecycle?.summary || !!lifecycle?.resultContent || !!block.progress
   const isRunning = state === 'pending' || state === 'running'
+  const isExpandedCard = expanded && hasExpandableContent
 
   return (
     <div
-      className="mt-1 rounded-xl border border-[hsl(var(--border)/0.5)] bg-[hsl(var(--card))] text-[hsl(var(--card-foreground))]"
+      className={cn(
+        'inline-flex max-w-full align-top border border-[hsl(var(--border)/0.5)] bg-[hsl(var(--card))] text-[hsl(var(--card-foreground))]',
+        isExpandedCard ? 'flex-col rounded-xl' : 'rounded-full',
+      )}
       role="region"
       aria-label={`Sub-agent: ${description}`}
     >
       {/* ── Header — always visible ───────────────────────────────────── */}
       <TaskHeader
+        state={state}
         visual={visual}
         agentLabel={agentLabel}
         description={description}
@@ -447,6 +452,7 @@ export const TaskExecutionView = memo(function TaskExecutionView({
 
 /** Header row: state icon, agent badge, description, and duration/label. */
 function TaskHeader({
+  state,
   visual,
   agentLabel,
   description,
@@ -455,6 +461,7 @@ function TaskHeader({
   hasExpandableContent,
   onToggle,
 }: {
+  state: TaskAgentState
   visual: StateVisual
   agentLabel: string
   description: string
@@ -463,11 +470,18 @@ function TaskHeader({
   hasExpandableContent: boolean
   onToggle: () => void
 }): React.JSX.Element {
+  const trailingMeta = durationMs != null
+    ? formatDuration(durationMs)
+    : state === 'completed'
+      ? null
+      : visual.label
+
   return (
     <button
       onClick={onToggle}
       className={cn(
-        'w-full flex items-center gap-1.5 px-2.5 py-1.5 text-left rounded-xl',
+        'inline-flex max-w-full items-center gap-1.5 self-start text-left',
+        'px-2 py-0.5 rounded-full',
         hasExpandableContent && 'hover:bg-[hsl(var(--foreground)/0.02)] transition-colors',
       )}
       aria-expanded={hasExpandableContent ? expanded : undefined}
@@ -483,17 +497,19 @@ function TaskHeader({
         />
       )}
       <span className={visual.colorClass}>{visual.icon}</span>
-      <span className="text-xs font-medium text-[hsl(var(--foreground))] bg-[hsl(var(--muted)/0.6)] rounded-md px-1.5 py-0.5">
+      <span className="text-xs font-medium text-[hsl(var(--foreground))] bg-[hsl(var(--muted)/0.6)] rounded-md px-1.5 py-px">
         {agentLabel}
       </span>
       {description && (
-        <span className="text-[13px] text-[hsl(var(--muted-foreground))] truncate min-w-0">
+        <span className="text-xs text-[hsl(var(--muted-foreground))] truncate min-w-0">
           {description}
         </span>
       )}
-      <span className={cn('ml-auto text-xs font-mono shrink-0', visual.colorClass)}>
-        {durationMs != null ? formatDuration(durationMs) : visual.label}
-      </span>
+      {trailingMeta && (
+        <span className={cn('ml-auto text-xs font-mono shrink-0', visual.colorClass)}>
+          {trailingMeta}
+        </span>
+      )}
     </button>
   )
 }
diff --git a/src/renderer/components/DetailPanel/SessionPanel/TodoWidgets.tsx b/src/renderer/components/DetailPanel/SessionPanel/TodoWidgets.tsx
index 78d8434..4bd7a3a 100644
--- a/src/renderer/components/DetailPanel/SessionPanel/TodoWidgets.tsx
+++ b/src/renderer/components/DetailPanel/SessionPanel/TodoWidgets.tsx
@@ -113,6 +113,7 @@ export const TodoCard = memo(function TodoCard({
   todos: TodoItem[]
   isPaused?: boolean
 }): React.JSX.Element {
+  const { t } = useTranslation('sessions')
   const [expanded, setExpanded] = useState(false)
   const [showCompleted, setShowCompleted] = useState(false)
 
@@ -120,11 +121,11 @@ export const TodoCard = memo(function TodoCard({
   const activeTodos: TodoItem[] = []
   const pendingTodos: TodoItem[] = []
   const completedTodos: TodoItem[] = []
-  for (const t of todos) {
-    const eff = effectiveStatus(t.status, isPaused)
-    if (eff === 'completed') completedTodos.push(t)
-    else if (eff === 'in_progress' || eff === 'paused') activeTodos.push(t)
-    else pendingTodos.push(t)
+  for (const todo of todos) {
+    const eff = effectiveStatus(todo.status, isPaused)
+    if (eff === 'completed') completedTodos.push(todo)
+    else if (eff === 'in_progress' || eff === 'paused') activeTodos.push(todo)
+    else pendingTodos.push(todo)
   }
 
   // The currently active task name (for collapsed summary)
@@ -137,7 +138,7 @@ export const TodoCard = memo(function TodoCard({
     <div
       className="max-w-lg rounded-xl border border-[hsl(var(--border)/0.5)] bg-[hsl(var(--card))] text-[hsl(var(--card-foreground))]"
       role="region"
-      aria-label="Task list card"
+      aria-label={t('sessionPanel.taskListCardAria')}
     >
       {/* Header — always visible, clickable to expand/collapse */}
       <button
@@ -189,7 +190,7 @@ export const TodoCard = memo(function TodoCard({
                 ) : (
                   <ChevronRight className="w-2.5 h-2.5" />
                 )}
-                {completedTodos.length} completed
+                {t('sessionPanel.completedCount', { count: completedTodos.length })}
               </button>
               {showCompleted && (
                 <TodoList todos={completedTodos} isPaused={isPaused} />
@@ -211,6 +212,7 @@ export const TodoStatusPill = memo(function TodoStatusPill({
   todos: TodoItem[]
   isPaused?: boolean
 }): React.JSX.Element {
+  const { t } = useTranslation('sessions')
   const [popoverOpen, setPopoverOpen] = useState(false)
 
   return (
@@ -223,7 +225,7 @@ export const TodoStatusPill = memo(function TodoStatusPill({
       trigger={
         <button
           className="flex items-center gap-1.5 px-2 py-0.5 text-xs rounded-full border border-[hsl(var(--border))] text-[hsl(var(--muted-foreground))] hover:bg-[hsl(var(--foreground)/0.04)] hover:text-[hsl(var(--accent-foreground))] transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-[hsl(var(--ring))]"
-          aria-label="Toggle task list"
+          aria-label={t('sessionPanel.toggleTaskListAria')}
           aria-expanded={popoverOpen}
         >
           <ListChecks className="w-3 h-3" aria-hidden="true" />
@@ -235,7 +237,7 @@ export const TodoStatusPill = memo(function TodoStatusPill({
         {/* Header — fixed at top of popover */}
         <div className="flex items-center gap-1.5 px-4 py-2 pb-1.5 border-b border-[hsl(var(--border)/0.5)] shrink-0">
           <CheckSquare className="w-3.5 h-3.5 shrink-0 text-[hsl(var(--muted-foreground))]" aria-hidden="true" />
-          <span className="text-xs font-medium text-[hsl(var(--foreground))]">Tasks</span>
+          <span className="text-xs font-medium text-[hsl(var(--foreground))]">{t('sessionPanel.tasks')}</span>
           <span className="ml-auto">
             <TodoStats todos={todos} isPaused={isPaused} />
           </span>
diff --git a/src/renderer/components/DetailPanel/SessionPanel/ToolBatchCollapsible.tsx b/src/renderer/components/DetailPanel/SessionPanel/ToolBatchCollapsible.tsx
index 93c9202..b00b70e 100644
--- a/src/renderer/components/DetailPanel/SessionPanel/ToolBatchCollapsible.tsx
+++ b/src/renderer/components/DetailPanel/SessionPanel/ToolBatchCollapsible.tsx
@@ -5,6 +5,7 @@ import { ChevronRight, AlertTriangle } from 'lucide-react'
 import { ContentBlockRenderer } from './ContentBlockRenderer'
 import { MarkdownFileCard } from './PreviewCards/MarkdownFileCard'
 import { getToolDisplayName } from './toolMeta'
+import { cn } from '../../../lib/utils'
 import { detectLanguage } from '@shared/fileUtils'
 import { isEvoseToolName } from '@shared/evoseNames'
 import { NativeCapabilityTools } from '@shared/nativeCapabilityToolNames'
@@ -136,7 +137,7 @@ export const ToolBatchCollapsible = memo(function ToolBatchCollapsible({
     <div
       data-msg-id={messages[0]?.id}
       data-msg-role="assistant"
-      className="py-0.5"
+      className="py-px"
     >
       {canCollapse && (
         <>
@@ -209,7 +210,11 @@ export const ToolBatchCollapsible = memo(function ToolBatchCollapsible({
 
       {/* ── Expanded content ───────────────────────────────────────────── */}
       {showExpandedContent && (
-        <div className={canCollapse ? 'mt-0.5 border-l-2 border-[hsl(var(--border)/0.3)] pl-1.5 ml-1' : undefined}>
+        <div
+          className={cn(
+            canCollapse && 'mt-0.5 ml-1 space-y-1 border-l-2 border-[hsl(var(--border)/0.3)] pl-1.5',
+          )}
+        >
           {messages.map((msg) => {
             if (msg.role !== 'assistant') return null
 
@@ -227,19 +232,21 @@ export const ToolBatchCollapsible = memo(function ToolBatchCollapsible({
                 key={msg.id}
                 data-msg-id={msg.id}
                 data-msg-role="assistant"
-                className="py-0.5 break-words min-w-0"
+                className="break-words min-w-0"
               >
-                {msg.content.map((block: ContentBlock, index: number) => (
-                  <ContentBlockRenderer
-                    key={`${block.type}-${index}`}
-                    block={block}
-                    sessionId={sessionId}
-                    isLastTextBlock={index === lastTextBlockIndex}
-                    isStreaming={msg.role === 'assistant' ? msg.isStreaming : undefined}
-                    isMessageStreaming={msg.role === 'assistant' ? msg.isStreaming : undefined}
-                    activeToolUseId={msg.role === 'assistant' ? msg.activeToolUseId : undefined}
-                  />
-                ))}
+                <div className={cn(canCollapse && 'space-y-0.5')}>
+                  {msg.content.map((block: ContentBlock, index: number) => (
+                    <ContentBlockRenderer
+                      key={`${block.type}-${index}`}
+                      block={block}
+                      sessionId={sessionId}
+                      isLastTextBlock={index === lastTextBlockIndex}
+                      isStreaming={msg.role === 'assistant' ? msg.isStreaming : undefined}
+                      isMessageStreaming={msg.role === 'assistant' ? msg.isStreaming : undefined}
+                      activeToolUseId={msg.role === 'assistant' ? msg.activeToolUseId : undefined}
+                    />
+                  ))}
+                </div>
               </div>
             )
           })}
diff --git a/src/renderer/components/DetailPanel/SessionPanel/ToolResultBlockView.tsx b/src/renderer/components/DetailPanel/SessionPanel/ToolResultBlockView.tsx
index 4df5ba7..aef923c 100644
--- a/src/renderer/components/DetailPanel/SessionPanel/ToolResultBlockView.tsx
+++ b/src/renderer/components/DetailPanel/SessionPanel/ToolResultBlockView.tsx
@@ -13,8 +13,8 @@
  *    RESULT_CARD_REGISTRY, parse the raw JSON and render the typed card.
  *    Falls through to raw text on parse failure.
  *
- * 3. **Raw text**: Default fallback for all other tools — shows the raw text
- *    content with collapse/expand for long output.
+ * 3. **Raw text**: Default fallback for all other tools — suppresses non-error
+ *    raw output entirely, while still rendering error output with collapse/expand.
  *
  * Tool name resolution works via ToolLifecycleContext:
  *   ToolResultBlock.toolUseId → ToolLifecycleMap → { name } → routing
@@ -57,6 +57,26 @@ interface ToolResultBlockViewProps {
   sessionId?: string
 }
 
+/**
+ * Whether a tool_result block produces any visible UI at all.
+ *
+ * Most successful tool results are intentionally suppressed to avoid repeating
+ * raw payloads in the session stream. Only rich result cards, provenance-backed
+ * media, and error outputs should reserve vertical space.
+ */
+export function shouldRenderToolResultBlock(
+  block: ToolResultBlock,
+  toolName?: string,
+): boolean {
+  if (!block.content) return false
+  if (toolName && shouldSuppressResult(toolName)) return false
+  if (block.isError) return true
+  if (!toolName) return false
+  const renderer = RESULT_CARD_REGISTRY.get(toolName)
+  if (!renderer) return false
+  return renderer(block.content) !== null
+}
+
 // ─── Result Card Registry ───────────────────────────────────────────────────
 
 /**
@@ -143,8 +163,7 @@ export const ToolResultBlockView = memo(function ToolResultBlockView({ block, se
   // Resolve originating tool lifecycle via Context (O(1) Map lookup)
   const toolInfo = useToolLifecycle(block.toolUseId)
 
-  // Path 1: Widget Tools with suppressResult=true — their result is rendered by the Widget.
-  if (toolInfo && shouldSuppressResult(toolInfo.name)) return <></>
+  if (!shouldRenderToolResultBlock(block, toolInfo?.name)) return <></>
 
   // Path 2: Result Card — rich card for tools whose data lives in tool_result.
   if (toolInfo && block.content && !block.isError) {
@@ -160,25 +179,21 @@ export const ToolResultBlockView = memo(function ToolResultBlockView({ block, se
   return <RawToolResult block={block} />
 })
 
-// ─── Raw fallback (extracted for clarity, logic identical to original) ───────
+// ─── Raw fallback ─────────────────────────────────────────────────────────────
 
 function RawToolResult({ block }: { block: ToolResultBlock }): React.JSX.Element {
-  const lines = block.content.split('\n')
+  if (!block.content || !block.isError) return <></>
+  return <RawErrorToolResult content={block.content} />
+}
+
+function RawErrorToolResult({ content }: { content: string }): React.JSX.Element {
+  const lines = content.split('\n')
   const isLong = lines.length > COLLAPSE_THRESHOLD
   const [expanded, setExpanded] = useState(!isLong)
-
-  const displayContent = expanded ? block.content : lines.slice(0, COLLAPSE_THRESHOLD).join('\n')
-
-  if (!block.content) return <></>
+  const displayContent = expanded ? content : lines.slice(0, COLLAPSE_THRESHOLD).join('\n')
 
   return (
-    <div
-      className={`rounded text-xs ${
-        block.isError
-          ? 'border-l-2 border-red-500 pl-2'
-          : 'pl-2'
-      }`}
-    >
+    <div className="rounded text-xs border-l-2 border-red-500 pl-2">
       <pre className="whitespace-pre-wrap break-words font-mono text-[hsl(var(--muted-foreground))] overflow-x-auto leading-normal">
         {displayContent}
       </pre>
diff --git a/src/renderer/lib/todoSnapshot.ts b/src/renderer/lib/todoSnapshot.ts
index 4fbde6c..a96b972 100644
--- a/src/renderer/lib/todoSnapshot.ts
+++ b/src/renderer/lib/todoSnapshot.ts
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { ManagedSessionMessage, TodoWriteItem } from '@shared/types'
+import { getUserMessageDisplayInfo } from '@/components/DetailPanel/SessionPanel/messageDisplayUtils'
 
 /**
  * Parsed TodoWrite snapshot from assistant content blocks.
@@ -69,7 +70,9 @@ function probeTodoSnapshotFromAssistant(
 
 function findCurrentTurnStartIndex(messages: ManagedSessionMessage[]): number {
   for (let i = messages.length - 1; i >= 0; i--) {
-    if (messages[i].role === 'user') return i
+    const msg = messages[i]
+    if (msg.role !== 'user') continue
+    if (!getUserMessageDisplayInfo(msg.content).isEmpty) return i
   }
   return 0
 }
@@ -77,8 +80,9 @@ function findCurrentTurnStartIndex(messages: ManagedSessionMessage[]): number {
 /**
  * Find the latest TodoWrite snapshot within the current turn.
  *
- * "Current turn" is scoped from the latest user message (inclusive) to the end.
- * This prevents stale todos from previous turns from leaking into the footer.
+ * "Current turn" is scoped from the latest visible user input (inclusive) to
+ * the end. Engine-emitted `tool_result` user messages must NOT reset this
+ * boundary; they are transport artifacts within the same turn.
  */
 export function getLatestTodoSnapshotInCurrentTurn(
   messages: ManagedSessionMessage[],
diff --git a/src/renderer/locales/en-US/sessions.json b/src/renderer/locales/en-US/sessions.json
index 836580a..32f07e8 100644
--- a/src/renderer/locales/en-US/sessions.json
+++ b/src/renderer/locales/en-US/sessions.json
@@ -238,6 +238,10 @@
     "starting": "Starting…",
     "completed": "Completed",
     "taskList": "Task list",
+    "tasks": "Tasks",
+    "toggleTaskListAria": "Toggle task list",
+    "taskListCardAria": "Task list card",
+    "completedCount": "{{count}} completed",
     "jumpToLatest": "Latest",
     "jumpToLatestAria": "Jump to latest response",
     "browserUploadStatus_one": "Uploaded {{count}} file",
diff --git a/src/renderer/locales/zh-CN/sessions.json b/src/renderer/locales/zh-CN/sessions.json
index 909cdf1..4b8a340 100644
--- a/src/renderer/locales/zh-CN/sessions.json
+++ b/src/renderer/locales/zh-CN/sessions.json
@@ -238,6 +238,10 @@
     "starting": "启动中…",
     "completed": "已完成",
     "taskList": "任务列表",
+    "tasks": "任务",
+    "toggleTaskListAria": "切换任务列表",
+    "taskListCardAria": "任务列表卡片",
+    "completedCount": "已完成 {{count}} 项",
     "jumpToLatest": "最新",
     "jumpToLatestAria": "跳转到最新回复",
     "browserUploadStatus_one": "已上传 {{count}} 个文件",
diff --git a/tests/unit/command/sdkCompatEnv.test.ts b/tests/unit/command/sdkCompatEnv.test.ts
new file mode 100644
index 0000000..12d0209
--- /dev/null
+++ b/tests/unit/command/sdkCompatEnv.test.ts
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+
+import { afterEach, describe, expect, it } from 'vitest'
+import { ensureSdkCompatEnv } from '../../../electron/command/sdkCompatEnv'
+
+const ORIGINAL_VALUE = process.env.USE_BUILTIN_RIPGREP
+
+describe('ensureSdkCompatEnv', () => {
+  afterEach(() => {
+    if (ORIGINAL_VALUE === undefined) {
+      delete process.env.USE_BUILTIN_RIPGREP
+    } else {
+      process.env.USE_BUILTIN_RIPGREP = ORIGINAL_VALUE
+    }
+  })
+
+  it('defaults SDK ripgrep to system rg when unset', () => {
+    delete process.env.USE_BUILTIN_RIPGREP
+
+    ensureSdkCompatEnv()
+
+    expect(process.env.USE_BUILTIN_RIPGREP).toBe('0')
+  })
+
+  it('respects an explicit override', () => {
+    process.env.USE_BUILTIN_RIPGREP = '1'
+
+    ensureSdkCompatEnv()
+
+    expect(process.env.USE_BUILTIN_RIPGREP).toBe('1')
+  })
+})
diff --git a/tests/unit/components/AssistantMessage.test.tsx b/tests/unit/components/AssistantMessage.test.tsx
index b221af9..2b041fc 100644
--- a/tests/unit/components/AssistantMessage.test.tsx
+++ b/tests/unit/components/AssistantMessage.test.tsx
@@ -5,7 +5,10 @@ import React from 'react'
 import { describe, it, expect, vi } from 'vitest'
 import { render, screen } from '@testing-library/react'
 import '@testing-library/jest-dom/vitest'
-import { AssistantMessage } from '../../../src/renderer/components/DetailPanel/SessionPanel/AssistantMessage'
+import {
+  AssistantMessage,
+  isCompactAssistantContent,
+} from '../../../src/renderer/components/DetailPanel/SessionPanel/AssistantMessage'
 import { NativeCapabilityTools } from '../../../src/shared/nativeCapabilityToolNames'
 import type { ManagedSessionMessage } from '../../../src/shared/types'
 
@@ -37,6 +40,19 @@ function makeAssistantMessage(blocks: ManagedSessionMessage['content']): Managed
 }
 
 describe('AssistantMessage', () => {
+  it('detects compact assistant content only for tool-only blocks', () => {
+    expect(isCompactAssistantContent([
+      { type: 'tool_use', id: 'tu-1', name: 'Read', input: { file_path: 'README.md' } },
+      { type: 'tool_result', toolUseId: 'tu-1', content: 'ok' },
+      { type: 'thinking', thinking: 'next step' },
+    ])).toBe(true)
+
+    expect(isCompactAssistantContent([
+      { type: 'text', text: 'hello' },
+      { type: 'tool_use', id: 'tu-1', name: 'Read', input: { file_path: 'README.md' } },
+    ])).toBe(false)
+  })
+
   it('keeps schedule propose tool segment expanded (not collapsed)', () => {
     const message = makeAssistantMessage([
       {
@@ -69,5 +85,38 @@ describe('AssistantMessage', () => {
     expect(screen.getAllByTestId('block-tool_use').length).toBe(2)
     expect(screen.getAllByTestId('block-tool_result').length).toBe(2)
   })
-})
 
+  it('uses compact outer spacing for tool-only assistant messages', () => {
+    const message = makeAssistantMessage([
+      { type: 'tool_use', id: 'tu-1', name: 'Read', input: { file_path: 'README.md' } },
+    ])
+
+    render(<AssistantMessage message={message} sessionId="session-1" />)
+
+    expect(screen.getByTestId('block-tool_use').parentElement?.className).toContain('py-px')
+  })
+
+  it('uses compact outer spacing for mixed tool and thinking messages', () => {
+    const message = makeAssistantMessage([
+      { type: 'tool_use', id: 'tu-1', name: 'Read', input: { file_path: 'README.md' } },
+      { type: 'thinking', thinking: 'next step' },
+      { type: 'tool_result', toolUseId: 'tu-1', content: 'ok' },
+    ])
+
+    const { container } = render(<AssistantMessage message={message} sessionId="session-1" />)
+
+    const root = container.querySelector('[data-msg-id="msg-1"][data-msg-role="assistant"]') as HTMLElement | null
+    expect(root?.className).toContain('py-px')
+    expect(root?.firstElementChild?.className ?? '').toContain('space-y-1')
+  })
+
+  it('keeps prose assistant messages on the regular vertical rhythm', () => {
+    const message = makeAssistantMessage([
+      { type: 'text', text: 'hello world' },
+    ])
+
+    render(<AssistantMessage message={message} sessionId="session-1" />)
+
+    expect(screen.getByTestId('block-text').parentElement?.className).toContain('py-0.5')
+  })
+})
diff --git a/tests/unit/components/ContentBlockRenderer.test.tsx b/tests/unit/components/ContentBlockRenderer.test.tsx
index 31358ca..7d3e9d0 100644
--- a/tests/unit/components/ContentBlockRenderer.test.tsx
+++ b/tests/unit/components/ContentBlockRenderer.test.tsx
@@ -78,8 +78,9 @@ describe('ContentBlockRenderer', () => {
       toolUseId: 'tu-1',
       content: 'file contents here'
     }
-    render(<ContentBlockRenderer block={block} />)
-    expect(screen.getByText('file contents here')).toBeInTheDocument()
+    const { container } = render(<ContentBlockRenderer block={block} />)
+    expect(container.innerHTML).toBe('')
+    expect(screen.queryByText('file contents here')).not.toBeInTheDocument()
   })
 
   it('renders slash_command with frozen label instead of canonical name', () => {
diff --git a/tests/unit/components/SessionMessageList.test.tsx b/tests/unit/components/SessionMessageList.test.tsx
index f70fee4..6b66279 100644
--- a/tests/unit/components/SessionMessageList.test.tsx
+++ b/tests/unit/components/SessionMessageList.test.tsx
@@ -6,7 +6,13 @@ import { describe, it, expect, vi, beforeEach } from 'vitest'
 import { render, screen } from '@testing-library/react'
 import '@testing-library/jest-dom/vitest'
 import { SessionMessageList } from '../../../src/renderer/components/DetailPanel/SessionPanel/SessionMessageList'
-import type { ManagedSessionMessage, ManagedSessionState, ContentBlock, SystemEvent } from '../../../src/shared/types'
+import type {
+  ManagedSessionMessage,
+  ManagedSessionState,
+  ContentBlock,
+  SystemEvent,
+  ToolResultBlock,
+} from '../../../src/shared/types'
 import { resolveLatestSessionDraft } from '../../../src/shared/sessionDraftOutputParser'
 
 const lifecycleHookMock = vi.hoisted(() => {
@@ -242,6 +248,62 @@ describe('SessionMessageList', () => {
     expect(list.children).toHaveLength(3)
   })
 
+  it('does not split one assistant turn into multiple nav anchors across tool results', () => {
+    render(
+      <SessionMessageList
+        sessionId="test-session"
+        messages={[
+          makeUserMsg(textBlocks('First question'), 'user-1'),
+          makeAssistantMsg([
+            { type: 'tool_use', id: 'tool-1', name: 'Glob', input: { pattern: '*.ts' } },
+          ], { id: 'assistant-turn-1a' }),
+          makeUserMsg([
+            { type: 'tool_result', toolUseId: 'tool-1', content: 'result payload' } as any,
+          ], 'tool-result-1'),
+          makeAssistantMsg(textBlocks('First answer'), { id: 'assistant-turn-1b' }),
+          makeUserMsg(textBlocks('Second question'), 'user-2'),
+          makeAssistantMsg(textBlocks('Second answer'), { id: 'assistant-turn-2' }),
+        ]}
+      />
+    )
+
+    expect(screen.getByLabelText('Message navigation')).toBeInTheDocument()
+    expect(screen.getAllByLabelText(/User message/)).toHaveLength(2)
+    expect(screen.getAllByLabelText(/Assistant message/)).toHaveLength(2)
+  })
+
+  it('filters invisible tool-result user messages so they do not leave empty rows between tool batches', () => {
+    const { container } = render(
+      <SessionMessageList
+        sessionId="test-session"
+        messages={[
+          makeAssistantMsg([
+            { type: 'tool_use', id: 'tu-1', name: 'Read', input: { file_path: 'a.ts' } },
+          ], { id: 'assistant-batch-1a' }),
+          makeAssistantMsg([
+            { type: 'tool_use', id: 'tu-2', name: 'Read', input: { file_path: 'b.ts' } },
+          ], { id: 'assistant-batch-1b' }),
+          makeUserMsg([
+            { type: 'tool_result', toolUseId: 'tu-1', content: 'ok' } satisfies ToolResultBlock,
+          ], 'tool-result-hidden-1'),
+          makeUserMsg([
+            { type: 'tool_result', toolUseId: 'tu-2', content: 'ok' } satisfies ToolResultBlock,
+          ], 'tool-result-hidden-2'),
+          makeAssistantMsg([
+            { type: 'tool_use', id: 'tu-3', name: 'Glob', input: { pattern: '*.ts' } },
+          ], { id: 'assistant-batch-2a' }),
+          makeAssistantMsg([
+            { type: 'tool_use', id: 'tu-4', name: 'Grep', input: { pattern: 'ThemeScheme' } },
+          ], { id: 'assistant-batch-2b' }),
+        ]}
+      />
+    )
+
+    expect(screen.getByRole('button', { name: /Expand 4 tool calls/i })).toBeInTheDocument()
+    expect(container.querySelectorAll('[data-msg-role="user-tool-result"]')).toHaveLength(0)
+    expect(screen.getByRole('list').children).toHaveLength(1)
+  })
+
   it('renders empty state when no messages', () => {
     render(<SessionMessageList sessionId="test-session" messages={[]} />)
     expect(screen.getByRole('list').children).toHaveLength(0)
@@ -432,7 +494,7 @@ describe('SessionMessageList', () => {
       />
     )
     expect(screen.getByText('Read')).toBeInTheDocument()
-    expect(screen.getByText('file contents here')).toBeInTheDocument()
+    expect(screen.queryByText('file contents here')).not.toBeInTheDocument()
     expect(screen.getByText(/Done reading/)).toBeInTheDocument()
   })
 
diff --git a/tests/unit/components/SessionStatusBar.test.tsx b/tests/unit/components/SessionStatusBar.test.tsx
index 977dc78..a33e136 100644
--- a/tests/unit/components/SessionStatusBar.test.tsx
+++ b/tests/unit/components/SessionStatusBar.test.tsx
@@ -14,6 +14,11 @@ import { resolveContextDisplayState } from '../../../src/shared/contextDisplay'
 // We mock the store so the component can read session data in tests.
 
 let mockSessionData: Record<string, Partial<SessionSnapshot>>  = {}
+let mockLatestTodosBySession: Record<string, Array<{
+  content: string
+  status: 'pending' | 'in_progress' | 'completed'
+  activeForm?: string
+}> | null> = {}
 
 vi.mock('@/stores/commandStore', () => {
   // Create a minimal zustand-compatible mock
@@ -24,6 +29,9 @@ vi.mock('@/stores/commandStore', () => {
       ),
       managedSessions: [],
       messagesBySession: {},
+      sessionMessages: {},
+      streamingMessageBySession: {},
+      latestTodosBySession: mockLatestTodosBySession,
     })
     const subscribe = () => () => {}
     const store = (selector: (s: ReturnType<typeof getState>) => unknown) => selector(getState())
@@ -47,6 +55,8 @@ vi.mock('@/stores/commandStore', () => {
         activity: session.activity ?? null,
       }
     },
+    selectLatestOpenTodos: (state: ReturnType<typeof mockStore.getState>, sessionId: string | null) =>
+      (sessionId ? state.latestTodosBySession[sessionId] : null) ?? null,
   }
 })
 
@@ -102,12 +112,21 @@ function makeSession(overrides: Partial<ManagedSessionInfo> = {}): Partial<Sessi
 function setupStore(session: Partial<SessionSnapshot>) {
   const id = (session as { id?: string }).id ?? 'session-1'
   mockSessionData = { [id]: session }
+  mockLatestTodosBySession = {}
+}
+
+function setLatestTodos(
+  sessionId: string,
+  todos: Array<{ content: string; status: 'pending' | 'in_progress' | 'completed'; activeForm?: string }> | null,
+) {
+  mockLatestTodosBySession = { [sessionId]: todos }
 }
 
 describe('SessionStatusBar', () => {
   beforeEach(() => {
     vi.useFakeTimers()
     mockSessionData = {}
+    mockLatestTodosBySession = {}
   })
   afterEach(() => {
     vi.useRealTimers()
@@ -269,6 +288,62 @@ describe('SessionStatusBar', () => {
     expect(durationEl.className).toContain('tabular-nums')
   })
 
+  it('renders todo pill when latest open todos exist', () => {
+    const session = makeSession({ state: 'streaming' })
+    setupStore(session)
+    setLatestTodos('session-1', [
+      { content: 'Task A', status: 'completed' },
+      { content: 'Task B', status: 'pending' },
+    ])
+    render(
+      <SessionStatusBar
+        sessionId="session-1"
+        state="streaming"
+        error={null}
+        stopReason={null}
+        {...defaultProps()}
+      />
+    )
+    expect(screen.getByLabelText('Toggle task list')).toBeInTheDocument()
+    expect(screen.getByText('✓1')).toBeInTheDocument()
+    expect(screen.getByText('○1')).toBeInTheDocument()
+  })
+
+  it('renders paused todo state for in-progress items when session is idle', () => {
+    const session = makeSession({ state: 'idle' })
+    setupStore(session)
+    setLatestTodos('session-1', [
+      { content: 'Task A', status: 'in_progress', activeForm: 'Working on Task A' },
+    ])
+    render(
+      <SessionStatusBar
+        sessionId="session-1"
+        state="idle"
+        error={null}
+        stopReason="completed"
+        {...defaultProps()}
+      />
+    )
+    expect(screen.getByLabelText('Toggle task list')).toBeInTheDocument()
+    expect(screen.getByText('⏸1')).toBeInTheDocument()
+    expect(screen.queryByText('◉1')).toBeNull()
+  })
+
+  it('does not render todo pill when no open todos exist', () => {
+    const session = makeSession({ state: 'streaming' })
+    setupStore(session)
+    render(
+      <SessionStatusBar
+        sessionId="session-1"
+        state="streaming"
+        error={null}
+        stopReason={null}
+        {...defaultProps()}
+      />
+    )
+    expect(screen.queryByLabelText('Toggle task list')).toBeNull()
+  })
+
   it('renders context window ring when contextState.usedTokens > 0', () => {
     const session = makeSession({
       model: 'claude-sonnet-4-6',
diff --git a/tests/unit/components/TaskExecutionView.test.tsx b/tests/unit/components/TaskExecutionView.test.tsx
index 9851ec4..c385d12 100644
--- a/tests/unit/components/TaskExecutionView.test.tsx
+++ b/tests/unit/components/TaskExecutionView.test.tsx
@@ -97,6 +97,14 @@ describe('TaskExecutionView', () => {
     expect(screen.getByText('3.2s')).toBeInTheDocument()
   })
 
+  it('hides the redundant completed status label when no duration is available', () => {
+    renderWithTaskEvents(
+      <TaskExecutionView block={makeTaskBlock()} />,
+      { state: 'completed' },
+    )
+    expect(screen.queryByText('Completed')).toBeNull()
+  })
+
   it('shows "Failed" when lifecycle reports failed', () => {
     renderWithTaskEvents(
       <TaskExecutionView block={makeTaskBlock()} />,
@@ -192,4 +200,42 @@ describe('TaskExecutionView', () => {
     renderWithTaskEvents(<TaskExecutionView block={makeTaskBlock()} />)
     expect(screen.getByRole('region', { name: /Search codebase/ })).toBeInTheDocument()
   })
+
+  it('uses shrink-to-fit pill layout instead of full-width header', () => {
+    renderWithTaskEvents(<TaskExecutionView block={makeTaskBlock()} />)
+    const region = screen.getByRole('region', { name: /Search codebase/ })
+    const toggle = screen.getByRole('button', { expanded: false })
+    const toggleClasses = toggle.className.split(/\s+/)
+    const regionClasses = region.className.split(/\s+/)
+
+    expect(region.className).toContain('inline-flex')
+    expect(toggle.className).toContain('inline-flex')
+    expect(toggleClasses).not.toContain('w-full')
+    expect(regionClasses).toContain('rounded-full')
+    expect(toggleClasses).toContain('py-0.5')
+    expect(toggleClasses).not.toContain('py-1.5')
+  })
+
+  it('keeps the compact pill height when expanded', async () => {
+    const user = userEvent.setup()
+    renderWithTaskEvents(
+      <TaskExecutionView block={makeTaskBlock()} />,
+      { state: 'completed', summary: 'Done' },
+    )
+
+    const toggle = screen.getByRole('button', { expanded: false })
+    await user.click(toggle)
+
+    const expandedClasses = screen.getByRole('button', { expanded: true }).className.split(/\s+/)
+    expect(expandedClasses).toContain('py-0.5')
+    expect(expandedClasses).not.toContain('py-1.5')
+  })
+
+  it('does not add extra outer top margin to the task pill container', () => {
+    renderWithTaskEvents(<TaskExecutionView block={makeTaskBlock()} />)
+    const region = screen.getByRole('region', { name: /Search codebase/ })
+    const regionClasses = region.className.split(/\s+/)
+
+    expect(regionClasses).not.toContain('mt-1')
+  })
 })
diff --git a/tests/unit/components/ToolBatchCollapsible.test.tsx b/tests/unit/components/ToolBatchCollapsible.test.tsx
index 649540c..7ee4480 100644
--- a/tests/unit/components/ToolBatchCollapsible.test.tsx
+++ b/tests/unit/components/ToolBatchCollapsible.test.tsx
@@ -503,7 +503,7 @@ describe('ToolBatchCollapsible', () => {
   }
 
   it('renders collapsed state with tool count', () => {
-    renderBatch([
+    const { container } = renderBatch([
       makeToolOnlyMsg('Read', 'a1'),
       makeToolOnlyMsg('Grep', 'a2'),
       makeToolOnlyMsg('Edit', 'a3')
@@ -512,6 +512,8 @@ describe('ToolBatchCollapsible', () => {
     // Should show "3 tool calls" summary
     expect(screen.getByText(/3 tool calls/)).toBeInTheDocument()
     expect(screen.getByText(/Read, Grep, Edit/)).toBeInTheDocument()
+    const batchRoot = container.querySelector('[data-msg-id="a1"][data-msg-role="assistant"]') as HTMLElement | null
+    expect(batchRoot?.className).toContain('py-px')
   })
 
   it('renders collapsed state with tool count (×N for duplicates)', () => {
@@ -545,8 +547,27 @@ describe('ToolBatchCollapsible', () => {
     const toggle = screen.getByRole('button', { name: /Expand 2 tool calls/ })
     fireEvent.click(toggle)
 
-    // Now tool details should be visible
-    expect(screen.getAllByText('result output')).toHaveLength(2)
+    expect(screen.queryByText('result output')).not.toBeInTheDocument()
+    expect(screen.getByText('Read')).toBeInTheDocument()
+    expect(screen.getByText('Grep')).toBeInTheDocument()
+  })
+
+  it('uses consistent vertical spacing for expanded tool pills', () => {
+    renderBatch([
+      makeToolOnlyMsg('Read', 'a1'),
+      makeToolOnlyMsg('Grep', 'a2')
+    ])
+
+    const toggle = screen.getByRole('button', { name: /Expand 2 tool calls/ })
+    fireEvent.click(toggle)
+
+    const expandedContent = toggle.nextElementSibling as HTMLElement | null
+    expect(expandedContent?.className).toContain('space-y-1')
+
+    const messageContainers = Array.from(expandedContent?.children ?? []) as HTMLElement[]
+    expect(messageContainers).toHaveLength(2)
+    expect(messageContainers[0]?.firstElementChild?.className).toContain('space-y-0.5')
+    expect(messageContainers[1]?.firstElementChild?.className).toContain('space-y-0.5')
   })
 
   it('collapses again on second click', () => {
@@ -557,7 +578,8 @@ describe('ToolBatchCollapsible', () => {
 
     // Expand
     fireEvent.click(screen.getByRole('button', { name: /Expand 2 tool calls/ }))
-    expect(screen.getAllByText('result output')).toHaveLength(2)
+    expect(screen.getByText('Read')).toBeInTheDocument()
+    expect(screen.getByText('Grep')).toBeInTheDocument()
 
     // Collapse
     fireEvent.click(screen.getByRole('button', { name: /Collapse 2 tool calls/ }))
@@ -596,11 +618,16 @@ describe('ToolBatchCollapsible', () => {
   })
 
   it('does not render collapsible summary for a single tool call', () => {
-    renderBatch([makeToolOnlyMsg('Read', 'a1')])
+    const { container } = renderBatch([makeToolOnlyMsg('Read', 'a1')])
 
     expect(screen.queryByRole('button', { name: /Expand 1 tool/i })).toBeNull()
     expect(screen.queryByText(/1 tool call/)).toBeNull()
-    expect(screen.getByText('result output')).toBeInTheDocument()
+    expect(screen.getByText('Read')).toBeInTheDocument()
+    expect(screen.queryByText('result output')).not.toBeInTheDocument()
+
+    const assistantContainers = container.querySelectorAll('[data-msg-id="a1"][data-msg-role="assistant"]')
+    const messageContainer = assistantContainers[assistantContainers.length - 1] as HTMLElement | undefined
+    expect(messageContainer?.firstElementChild?.className ?? '').not.toContain('space-y-0.5')
   })
 
   it('singular "tool call" for single-tool batch edge case', () => {
diff --git a/tests/unit/components/ToolResultBlockView.test.tsx b/tests/unit/components/ToolResultBlockView.test.tsx
index f5ff792..cfb4f19 100644
--- a/tests/unit/components/ToolResultBlockView.test.tsx
+++ b/tests/unit/components/ToolResultBlockView.test.tsx
@@ -6,7 +6,10 @@ import { describe, it, expect } from 'vitest'
 import { render, screen } from '@testing-library/react'
 import userEvent from '@testing-library/user-event'
 import '@testing-library/jest-dom/vitest'
-import { ToolResultBlockView } from '../../../src/renderer/components/DetailPanel/SessionPanel/ToolResultBlockView'
+import {
+  ToolResultBlockView,
+  shouldRenderToolResultBlock,
+} from '../../../src/renderer/components/DetailPanel/SessionPanel/ToolResultBlockView'
 import type { ToolResultBlock } from '../../../src/shared/types'
 
 function makeBlock(overrides: Partial<ToolResultBlock> = {}): ToolResultBlock {
@@ -19,10 +22,17 @@ function makeBlock(overrides: Partial<ToolResultBlock> = {}): ToolResultBlock {
 }
 
 describe('ToolResultBlockView', () => {
-  it('renders short content fully', () => {
-    render(<ToolResultBlockView block={makeBlock()} />)
-    expect(screen.getByText('single line result')).toBeInTheDocument()
-    expect(screen.queryByText(/show more/i)).not.toBeInTheDocument()
+  it('visibility helper treats successful raw tool output as hidden', () => {
+    expect(shouldRenderToolResultBlock(makeBlock())).toBe(false)
+  })
+
+  it('visibility helper keeps error output visible', () => {
+    expect(shouldRenderToolResultBlock(makeBlock({ content: 'Error: not found', isError: true }))).toBe(true)
+  })
+
+  it('suppresses non-error short content entirely', () => {
+    const { container } = render(<ToolResultBlockView block={makeBlock()} />)
+    expect(container.innerHTML).toBe('')
   })
 
   it('renders empty content as nothing', () => {
@@ -30,18 +40,25 @@ describe('ToolResultBlockView', () => {
     expect(container.innerHTML).toBe('')
   })
 
-  it('collapses content > 20 lines by default', () => {
+  it('suppresses non-error long content entirely', () => {
     const longContent = Array.from({ length: 30 }, (_, i) => `line ${i + 1}`).join('\n')
-    render(<ToolResultBlockView block={makeBlock({ content: longContent })} />)
-    // Should show "Show more" button
-    expect(screen.getByText(/show more.*30 lines/i)).toBeInTheDocument()
-    // Should NOT show all lines
+    const { container } = render(<ToolResultBlockView block={makeBlock({ content: longContent })} />)
+    expect(container.innerHTML).toBe('')
+    expect(screen.queryByText(/show more.*30 lines/i)).not.toBeInTheDocument()
     expect(screen.queryByText('line 25')).not.toBeInTheDocument()
   })
 
-  it('expands collapsed content on click', async () => {
+  it('shows long error content collapsed by default', () => {
     const longContent = Array.from({ length: 30 }, (_, i) => `line ${i + 1}`).join('\n')
-    render(<ToolResultBlockView block={makeBlock({ content: longContent })} />)
+    render(<ToolResultBlockView block={makeBlock({ content: longContent, isError: true })} />)
+    expect(screen.getByText(/line 20/)).toBeInTheDocument()
+    expect(screen.queryByText('line 25')).not.toBeInTheDocument()
+    expect(screen.getByText(/show more/i)).toBeInTheDocument()
+  })
+
+  it('expands long error content on show more click', async () => {
+    const longContent = Array.from({ length: 30 }, (_, i) => `line ${i + 1}`).join('\n')
+    render(<ToolResultBlockView block={makeBlock({ content: longContent, isError: true })} />)
 
     await userEvent.click(screen.getByText(/show more/i))
     expect(screen.getByText(/line 25/)).toBeInTheDocument()
@@ -50,26 +67,25 @@ describe('ToolResultBlockView', () => {
 
   it('collapses expanded content on show less click', async () => {
     const longContent = Array.from({ length: 30 }, (_, i) => `line ${i + 1}`).join('\n')
-    render(<ToolResultBlockView block={makeBlock({ content: longContent })} />)
+    render(<ToolResultBlockView block={makeBlock({ content: longContent, isError: true })} />)
 
     await userEvent.click(screen.getByText(/show more/i))
     await userEvent.click(screen.getByText(/show less/i))
     expect(screen.queryByText('line 25')).not.toBeInTheDocument()
   })
 
-  it('shows red border for error results', () => {
+  it('shows error content immediately with red border', () => {
     const { container } = render(
       <ToolResultBlockView block={makeBlock({ content: 'Error: not found', isError: true })} />
     )
+    expect(screen.getByText('Error: not found')).toBeInTheDocument()
     const wrapper = container.firstElementChild
     expect(wrapper?.className).toContain('border-red-500')
   })
 
-  it('does not show red border for non-error results', () => {
-    const { container } = render(
-      <ToolResultBlockView block={makeBlock({ isError: false })} />
-    )
-    const wrapper = container.firstElementChild
-    expect(wrapper?.className).not.toContain('border-red-500')
+  it('does not render reveal or hide controls for error results', () => {
+    render(<ToolResultBlockView block={makeBlock({ content: 'Error: not found', isError: true })} />)
+    expect(screen.queryByText(/show result/i)).not.toBeInTheDocument()
+    expect(screen.queryByText(/hide result/i)).not.toBeInTheDocument()
   })
 })
diff --git a/tests/unit/lib/todoSnapshot.test.ts b/tests/unit/lib/todoSnapshot.test.ts
index de0268c..70485d4 100644
--- a/tests/unit/lib/todoSnapshot.test.ts
+++ b/tests/unit/lib/todoSnapshot.test.ts
@@ -17,6 +17,15 @@ function userMsg(id: string, text: string): ManagedSessionMessage {
   }
 }
 
+function userToolResultMsg(id: string, toolUseId: string, content = 'ok'): ManagedSessionMessage {
+  return {
+    id,
+    role: 'user',
+    timestamp: Date.now(),
+    content: [{ type: 'tool_result', toolUseId, content }],
+  }
+}
+
 function assistantTodoMsg(
   id: string,
   todos: Array<{ content: string; status: 'pending' | 'in_progress' | 'completed'; activeForm?: string }>,
@@ -73,6 +82,25 @@ describe('todoSnapshot', () => {
     expect(getLatestTodoSnapshotInCurrentTurn(messages)).toBeNull()
   })
 
+  it('does not let tool_result-only user messages reset the current turn boundary', () => {
+    const messages: ManagedSessionMessage[] = [
+      userMsg('u1', 'turn'),
+      assistantTodoMsg('a1', [{ content: 'task', status: 'pending' }]),
+      userToolResultMsg('r1', 'a1-todo', 'Todos updated'),
+      {
+        id: 'a2',
+        role: 'assistant',
+        timestamp: Date.now(),
+        content: [{ type: 'text', text: 'Continuing work' }],
+      },
+    ]
+
+    const snapshot = getLatestTodoSnapshotInCurrentTurn(messages)
+    expect(snapshot?.messageId).toBe('a1')
+    expect(snapshot?.turnStartMessageId).toBe('u1')
+    expect(snapshot?.items).toEqual([{ content: 'task', status: 'pending' }])
+  })
+
   it('checks open/completed todo set correctly', () => {
     expect(hasOpenTodos([
       { content: 'A', status: 'completed' },
diff --git a/tests/unit/stores/commandStore.test.ts b/tests/unit/stores/commandStore.test.ts
index a211a14..7d271d3 100644
--- a/tests/unit/stores/commandStore.test.ts
+++ b/tests/unit/stores/commandStore.test.ts
@@ -27,6 +27,44 @@ function makeAssistantMessage(params: {
   }
 }
 
+function makeUserTextMessage(id: string, text: string): ManagedSessionMessage {
+  return {
+    id,
+    role: 'user',
+    timestamp: 1_700_000_000_000,
+    content: [{ type: 'text', text }],
+  }
+}
+
+function makeAssistantTodoMessage(
+  id: string,
+  todos: Array<{ content: string; status: 'pending' | 'in_progress' | 'completed'; activeForm?: string }>,
+): ManagedSessionMessage {
+  return {
+    id,
+    role: 'assistant',
+    timestamp: 1_700_000_000_000,
+    isStreaming: false,
+    content: [
+      {
+        type: 'tool_use',
+        id: `${id}-todo`,
+        name: 'TodoWrite',
+        input: { todos },
+      },
+    ],
+  }
+}
+
+function makeUserToolResultMessage(id: string, toolUseId: string, content = 'ok'): ManagedSessionMessage {
+  return {
+    id,
+    role: 'user',
+    timestamp: 1_700_000_000_000,
+    content: [{ type: 'tool_result', toolUseId, content }],
+  }
+}
+
 describe('commandStore.batchAppendSessionMessages', () => {
   beforeEach(() => {
     useCommandStore.getState().reset()
@@ -195,4 +233,41 @@ describe('commandStore.batchAppendSessionMessages', () => {
     const derived = selectLatestOpenTodos(useCommandStore.getState(), sessionId)
     expect(derived).toEqual([{ content: 'new', status: 'pending' }])
   })
+
+  it('keeps current-turn todos visible after user tool_result messages append', () => {
+    const sessionId = 'session-todo-tool-result'
+    const snapshot = makeManagedSession({
+      id: sessionId,
+      state: 'streaming',
+      messages: [],
+    })
+
+    useCommandStore.setState({
+      managedSessions: [snapshot],
+      sessionById: { [sessionId]: snapshot },
+      sessionMessages: { [sessionId]: [] },
+      streamingMessageBySession: {},
+      latestTodosBySession: {},
+      activeManagedSessionId: sessionId,
+    })
+
+    useCommandStore.getState().appendSessionMessage(sessionId, makeUserTextMessage('u1', 'turn'))
+    useCommandStore.getState().appendSessionMessage(
+      sessionId,
+      makeAssistantTodoMessage('a1', [{ content: 'task', status: 'pending' }]),
+    )
+
+    expect(useCommandStore.getState().latestTodosBySession[sessionId]).toEqual([
+      { content: 'task', status: 'pending' },
+    ])
+
+    useCommandStore.getState().appendSessionMessage(
+      sessionId,
+      makeUserToolResultMessage('r1', 'a1-todo', 'Todos updated'),
+    )
+
+    expect(useCommandStore.getState().latestTodosBySession[sessionId]).toEqual([
+      { content: 'task', status: 'pending' },
+    ])
+  })
 })