diff --git a/src/features/agent-graph/renderer/hooks/useGraphCreateTaskDialog.tsx b/src/features/agent-graph/renderer/hooks/useGraphCreateTaskDialog.tsx
index 3daa41d8..7c61db12 100644
--- a/src/features/agent-graph/renderer/hooks/useGraphCreateTaskDialog.tsx
+++ b/src/features/agent-graph/renderer/hooks/useGraphCreateTaskDialog.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useState } from 'react';
 
 import { api } from '@renderer/api';
 import { CreateTaskDialog } from '@renderer/components/team/dialogs/CreateTaskDialog';
diff --git a/src/features/agent-graph/renderer/hooks/useGraphMemberPopoverContext.ts b/src/features/agent-graph/renderer/hooks/useGraphMemberPopoverContext.ts
index 92dcf194..11ea2c25 100644
--- a/src/features/agent-graph/renderer/hooks/useGraphMemberPopoverContext.ts
+++ b/src/features/agent-graph/renderer/hooks/useGraphMemberPopoverContext.ts
@@ -6,29 +6,53 @@ import {
 } from '@renderer/store/slices/teamSlice';
 import { useShallow } from 'zustand/react/shallow';
 
-import type { TeamGraphData } from '../adapters/TeamGraphAdapter';
+import type { AppState } from '@renderer/store/types';
 
-export function useGraphMemberPopoverContext(teamName: string, memberName: string) {
+interface GraphMemberPopoverContext {
+  teamData:
+    | (NonNullable<ReturnType<typeof selectTeamDataForName>> & {
+        members: ReturnType<typeof selectResolvedMembersForTeamName>;
+        messageFeed: [];
+      })
+    | null;
+  teamMembers: ReturnType<typeof selectResolvedMembersForTeamName>;
+  spawnEntry: AppState['memberSpawnStatusesByTeam'][string][string] | undefined;
+  leadActivity: AppState['leadActivityByTeam'][string] | undefined;
+  progress: ReturnType<typeof getCurrentProvisioningProgressForTeam> | null;
+  memberSpawnSnapshot: AppState['memberSpawnSnapshotsByTeam'][string] | undefined;
+  memberSpawnStatuses: AppState['memberSpawnStatusesByTeam'][string] | undefined;
+}
+
+function selectGraphMemberPopoverContext(
+  state: AppState,
+  teamName: string,
+  memberName: string
+): GraphMemberPopoverContext {
+  const snapshot = teamName ? selectTeamDataForName(state, teamName) : null;
+  const teamMembers = teamName ? selectResolvedMembersForTeamName(state, teamName) : [];
+
+  return {
+    teamData: snapshot
+      ? {
+          ...snapshot,
+          members: teamMembers,
+          messageFeed: [],
+        }
+      : null,
+    teamMembers,
+    spawnEntry: teamName ? state.memberSpawnStatusesByTeam[teamName]?.[memberName] : undefined,
+    leadActivity: teamName ? state.leadActivityByTeam[teamName] : undefined,
+    progress: teamName ? getCurrentProvisioningProgressForTeam(state, teamName) : null,
+    memberSpawnSnapshot: teamName ? state.memberSpawnSnapshotsByTeam[teamName] : undefined,
+    memberSpawnStatuses: teamName ? state.memberSpawnStatusesByTeam[teamName] : undefined,
+  };
+}
+
+export function useGraphMemberPopoverContext(
+  teamName: string,
+  memberName: string
+): ReturnType<typeof selectGraphMemberPopoverContext> {
   return useStore(
-    useShallow((state) => {
-      const snapshot = teamName ? selectTeamDataForName(state, teamName) : null;
-      const teamMembers = teamName ? selectResolvedMembersForTeamName(state, teamName) : [];
-
-      return {
-        teamData: snapshot
-          ? {
-              ...snapshot,
-              members: teamMembers,
-              messageFeed: [],
-            }
-          : null,
-        teamMembers,
-        spawnEntry: teamName ? state.memberSpawnStatusesByTeam[teamName]?.[memberName] : undefined,
-        leadActivity: teamName ? state.leadActivityByTeam[teamName] : undefined,
-        progress: teamName ? getCurrentProvisioningProgressForTeam(state, teamName) : null,
-        memberSpawnSnapshot: teamName ? state.memberSpawnSnapshotsByTeam[teamName] : undefined,
-        memberSpawnStatuses: teamName ? state.memberSpawnStatusesByTeam[teamName] : undefined,
-      };
-    })
+    useShallow((state) => selectGraphMemberPopoverContext(state, teamName, memberName))
   );
 }
diff --git a/src/features/agent-graph/renderer/ui/GraphActivityHud.tsx b/src/features/agent-graph/renderer/ui/GraphActivityHud.tsx
index 4e31fec3..0f7fc916 100644
--- a/src/features/agent-graph/renderer/ui/GraphActivityHud.tsx
+++ b/src/features/agent-graph/renderer/ui/GraphActivityHud.tsx
@@ -289,6 +289,15 @@ export const GraphActivityHud = ({
   const handleMessageClick = useCallback((item: TimelineItem) => {
     setExpandedItem(item);
   }, []);
+  const handleMessageKeyDown = useCallback(
+    (event: React.KeyboardEvent<HTMLDivElement>, item: TimelineItem): void => {
+      if (event.key === 'Enter' || event.key === ' ') {
+        event.preventDefault();
+        handleMessageClick(item);
+      }
+    },
+    [handleMessageClick]
+  );
 
   const handleMemberClick = useCallback(
     (member: ResolvedTeamMember) => {
@@ -360,6 +369,52 @@ export const GraphActivityHud = ({
     };
   }, [enabled, forwardWheelToGraph, visibleLanes]);
 
+  const renderLaneEntry = useCallback(
+    (entry: InlineActivityEntry, index: number): React.JSX.Element => {
+      const messageKey = toMessageKey(entry.message);
+      const timelineItem: TimelineItem = {
+        type: 'message',
+        message: entry.message,
+      };
+      const isUnread = !entry.message.read && !readSet.has(messageKey);
+
+      return (
+        <div
+          key={entry.graphItem.id}
+          className="h-[72px] min-h-[72px] min-w-0 max-w-full cursor-pointer overflow-hidden"
+          role="button"
+          tabIndex={0}
+          onClick={() => handleMessageClick(timelineItem)}
+          onKeyDown={(event) => handleMessageKeyDown(event, timelineItem)}
+        >
+          <GraphActivityCard
+            message={entry.message}
+            teamName={teamName}
+            messageContext={messageContext}
+            teamNames={teamNames}
+            teamColorByName={teamColorByName}
+            isUnread={isUnread}
+            zebraShade={index % 2 === 1}
+            onClick={() => handleMessageClick(timelineItem)}
+            onOpenTaskDetail={onOpenTaskDetail}
+            onOpenMemberProfile={onOpenMemberProfile}
+          />
+        </div>
+      );
+    },
+    [
+      handleMessageClick,
+      handleMessageKeyDown,
+      messageContext,
+      onOpenMemberProfile,
+      onOpenTaskDetail,
+      readSet,
+      teamColorByName,
+      teamName,
+      teamNames,
+    ]
+  );
+
   if (!enabled || !teamSnapshot || visibleLanes.length === 0) {
     return null;
   }
@@ -421,43 +476,7 @@ export const GraphActivityHud = ({
                             No recent activity
                           </div>
                         ) : null}
-                        {lane.entries.map((entry, index) => {
-                          const messageKey = toMessageKey(entry.message);
-                          const timelineItem: TimelineItem = {
-                            type: 'message',
-                            message: entry.message,
-                          };
-                          const isUnread = !entry.message.read && !readSet.has(messageKey);
-
-                          return (
-                            <div
-                              key={entry.graphItem.id}
-                              className="h-[72px] min-h-[72px] min-w-0 max-w-full cursor-pointer overflow-hidden"
-                              role="button"
-                              tabIndex={0}
-                              onClick={() => handleMessageClick(timelineItem)}
-                              onKeyDown={(event) => {
-                                if (event.key === 'Enter' || event.key === ' ') {
-                                  event.preventDefault();
-                                  handleMessageClick(timelineItem);
-                                }
-                              }}
-                            >
-                              <GraphActivityCard
-                                message={entry.message}
-                                teamName={teamName}
-                                messageContext={messageContext}
-                                teamNames={teamNames}
-                                teamColorByName={teamColorByName}
-                                isUnread={isUnread}
-                                zebraShade={index % 2 === 1}
-                                onClick={() => handleMessageClick(timelineItem)}
-                                onOpenTaskDetail={onOpenTaskDetail}
-                                onOpenMemberProfile={onOpenMemberProfile}
-                              />
-                            </div>
-                          );
-                        })}
+                        {lane.entries.map(renderLaneEntry)}
 
                         {lane.overflowCount > 0 ? (
                           <button
diff --git a/src/features/agent-graph/renderer/ui/TeamGraphOverlay.tsx b/src/features/agent-graph/renderer/ui/TeamGraphOverlay.tsx
index ca29b0d9..3de4ab0a 100644
--- a/src/features/agent-graph/renderer/ui/TeamGraphOverlay.tsx
+++ b/src/features/agent-graph/renderer/ui/TeamGraphOverlay.tsx
@@ -19,7 +19,11 @@ import { GraphNodePopover } from './GraphNodePopover';
 import { GraphProvisioningHud } from './GraphProvisioningHud';
 import { GraphTransientHandoffHud } from './GraphTransientHandoffHud';
 
-import type { GraphDomainRef, GraphEventPort } from '@claude-teams/agent-graph';
+import type {
+  GraphDomainRef,
+  GraphEventPort,
+  TransientHandoffCard,
+} from '@claude-teams/agent-graph';
 import type {
   MemberActivityFilter,
   MemberDetailTab,
@@ -149,7 +153,7 @@ export const TeamGraphOverlay = ({
               focusNodeIds?: ReadonlySet<string> | null;
               focusEdgeIds?: ReadonlySet<string> | null;
             }) => {
-              cards: import('@claude-teams/agent-graph').TransientHandoffCard[];
+              cards: TransientHandoffCard[];
               time: number;
             };
             worldToScreen?: (x: number, y: number) => { x: number; y: number };
diff --git a/src/features/agent-graph/renderer/ui/TeamGraphTab.tsx b/src/features/agent-graph/renderer/ui/TeamGraphTab.tsx
index a3c184c2..6c1050a1 100644
--- a/src/features/agent-graph/renderer/ui/TeamGraphTab.tsx
+++ b/src/features/agent-graph/renderer/ui/TeamGraphTab.tsx
@@ -19,7 +19,11 @@ import { GraphNodePopover } from './GraphNodePopover';
 import { GraphProvisioningHud } from './GraphProvisioningHud';
 import { GraphTransientHandoffHud } from './GraphTransientHandoffHud';
 
-import type { GraphDomainRef, GraphEventPort } from '@claude-teams/agent-graph';
+import type {
+  GraphDomainRef,
+  GraphEventPort,
+  TransientHandoffCard,
+} from '@claude-teams/agent-graph';
 import type {
   MemberActivityFilter,
   MemberDetailTab,
@@ -169,7 +173,7 @@ export const TeamGraphTab = ({
                 focusNodeIds?: ReadonlySet<string> | null;
                 focusEdgeIds?: ReadonlySet<string> | null;
               }) => {
-                cards: import('@claude-teams/agent-graph').TransientHandoffCard[];
+                cards: TransientHandoffCard[];
                 time: number;
               };
               worldToScreen?: (x: number, y: number) => { x: number; y: number };
diff --git a/src/main/services/team/taskLogs/stream/BoardTaskLogStreamService.ts b/src/main/services/team/taskLogs/stream/BoardTaskLogStreamService.ts
index 05334b11..2789c37f 100644
--- a/src/main/services/team/taskLogs/stream/BoardTaskLogStreamService.ts
+++ b/src/main/services/team/taskLogs/stream/BoardTaskLogStreamService.ts
@@ -15,15 +15,15 @@ import { BoardTaskExactLogSummarySelector } from '../exact/BoardTaskExactLogSumm
 import { isBoardTaskExactLogsReadEnabled } from '../exact/featureGates';
 import { getBoardTaskExactLogFileVersions } from '../exact/fileVersions';
 
-import { OpenCodeTaskLogStreamSource } from './OpenCodeTaskLogStreamSource';
-import { CodexNativeTaskLogStreamSource } from './CodexNativeTaskLogStreamSource';
-import { buildCodexNativeToolSignature } from './CodexNativeTraceProjector';
-import { HistoricalBoardMcpRawProbe } from './HistoricalBoardMcpRawProbe';
-import { TaskLogTranscriptCandidateSelector } from './TaskLogTranscriptCandidateSelector';
 import {
   canonicalizeBoardTaskLogToolName,
   isBoardTaskLogMcpToolName,
 } from './boardTaskLogToolNames';
+import { CodexNativeTaskLogStreamSource } from './CodexNativeTaskLogStreamSource';
+import { buildCodexNativeToolSignature } from './CodexNativeTraceProjector';
+import { HistoricalBoardMcpRawProbe } from './HistoricalBoardMcpRawProbe';
+import { OpenCodeTaskLogStreamSource } from './OpenCodeTaskLogStreamSource';
+import { TaskLogTranscriptCandidateSelector } from './TaskLogTranscriptCandidateSelector';
 
 import type { BoardTaskActivityRecord } from '../activity/BoardTaskActivityRecord';
 import type { BoardTaskExactLogDetailCandidate } from '../exact/BoardTaskExactLogTypes';
@@ -1684,12 +1684,12 @@ export class BoardTaskLogStreamService {
     const cacheKey = this.buildLayoutCacheKey(teamName, taskId);
     const generation = this.getTranscriptDiscoveryGeneration(teamName);
     const cached = this.layoutCache.get(cacheKey);
-    if (cached && cached.generation === generation && cached.expiresAt > Date.now()) {
+    if (cached?.generation === generation && cached.expiresAt > Date.now()) {
       return cached.layout;
     }
 
     const existingInFlight = this.layoutInFlight.get(cacheKey);
-    if (existingInFlight && existingInFlight.generation === generation) {
+    if (existingInFlight?.generation === generation) {
       return await existingInFlight.promise;
     }
 
diff --git a/src/main/services/team/taskLogs/stream/CodexNativeTraceReader.ts b/src/main/services/team/taskLogs/stream/CodexNativeTraceReader.ts
index 44169f2b..9b6e9d58 100644
--- a/src/main/services/team/taskLogs/stream/CodexNativeTraceReader.ts
+++ b/src/main/services/team/taskLogs/stream/CodexNativeTraceReader.ts
@@ -1,8 +1,7 @@
+import { getTeamsBasePath } from '@main/utils/pathDecoder';
 import * as fs from 'fs/promises';
 import * as path from 'path';
 
-import { getTeamsBasePath } from '@main/utils/pathDecoder';
-
 const TRACE_ROOT_SEGMENT = path.join('.member-work-sync', 'runtime-hooks', 'codex-native-traces');
 
 export interface CodexNativeTraceProjection {
diff --git a/src/main/services/team/taskLogs/stream/HistoricalBoardMcpRawProbe.ts b/src/main/services/team/taskLogs/stream/HistoricalBoardMcpRawProbe.ts
index b0e1cf71..77c166d4 100644
--- a/src/main/services/team/taskLogs/stream/HistoricalBoardMcpRawProbe.ts
+++ b/src/main/services/team/taskLogs/stream/HistoricalBoardMcpRawProbe.ts
@@ -1,8 +1,7 @@
+import { getTaskDisplayId } from '@shared/utils/taskIdentity';
 import { createReadStream } from 'fs';
 import * as readline from 'readline';
 
-import { getTaskDisplayId } from '@shared/utils/taskIdentity';
-
 import type { TeamTask } from '@shared/types';
 
 const RAW_PROBE_CONCURRENCY = process.platform === 'win32' ? 4 : 8;
diff --git a/src/main/services/team/taskLogs/stream/boardTaskLogToolNames.ts b/src/main/services/team/taskLogs/stream/boardTaskLogToolNames.ts
index bac041fe..0bf50b85 100644
--- a/src/main/services/team/taskLogs/stream/boardTaskLogToolNames.ts
+++ b/src/main/services/team/taskLogs/stream/boardTaskLogToolNames.ts
@@ -45,10 +45,5 @@ export function isReadOnlyBoardTaskLogToolName(toolName: string | undefined): bo
 }
 
 export function isRecoverableHistoricalBoardTaskLogToolName(toolName: string | undefined): boolean {
-  const canonical = canonicalizeBoardTaskLogToolName(toolName);
-  return (
-    canonical !== null &&
-    (HISTORICAL_BOARD_LIFECYCLE_TOOL_NAMES.has(canonical) ||
-      HISTORICAL_BOARD_ACTION_TOOL_NAMES.has(canonical))
-  );
+  return isBoardTaskLogMcpToolName(toolName);
 }
diff --git a/src/renderer/components/team/taskLogs/TaskLogStreamSection.tsx b/src/renderer/components/team/taskLogs/TaskLogStreamSection.tsx
index 09818aa7..aa4d1c02 100644
--- a/src/renderer/components/team/taskLogs/TaskLogStreamSection.tsx
+++ b/src/renderer/components/team/taskLogs/TaskLogStreamSection.tsx
@@ -19,9 +19,9 @@ import { AlertCircle, Clock, FileText, Loader2 } from 'lucide-react';
 
 import type {
   BoardTaskLogActor,
-  ResolvedTeamMember,
   BoardTaskLogSegment,
   BoardTaskLogStreamResponse,
+  ResolvedTeamMember,
 } from '@shared/types';
 
 interface TaskLogStreamSectionProps {