diff --git a/agent-teams-controller/src/internal/tasks.js b/agent-teams-controller/src/internal/tasks.js
index f18ed959..67f61eab 100644
--- a/agent-teams-controller/src/internal/tasks.js
+++ b/agent-teams-controller/src/internal/tasks.js
@@ -164,7 +164,19 @@ function setTaskStatus(context, taskId, status, actor) {
 }
 
 function startTask(context, taskId, actor) {
-  return setTaskStatus(context, taskId, 'in_progress', actor);
+  const task = setTaskStatus(context, taskId, 'in_progress', actor);
+  // Clear stale kanban entry (e.g. 'approved' or 'review') when task is reopened
+  try {
+    const kanbanStore = require('./kanbanStore.js');
+    const state = kanbanStore.readKanbanState(context.paths, context.teamName);
+    if (state.tasks[task.id]) {
+      delete state.tasks[task.id];
+      kanbanStore.writeKanbanState(context.paths, context.teamName, state);
+    }
+  } catch {
+    // Best-effort: task status already updated, kanban cleanup failure is non-fatal
+  }
+  return task;
 }
 
 function completeTask(context, taskId, actor) {
@@ -212,10 +224,19 @@ function addTaskComment(context, taskId, flags) {
     ...(Array.isArray(flags.attachments) ? { attachments: flags.attachments } : {}),
   });
 
-  maybeNotifyTaskOwnerOnComment(context, result.task, result.comment, {
-    inserted: result.inserted,
-    notifyOwner: flags.notifyOwner,
-  });
+  try {
+    maybeNotifyTaskOwnerOnComment(context, result.task, result.comment, {
+      inserted: result.inserted,
+      notifyOwner: flags.notifyOwner,
+    });
+  } catch (notifyError) {
+    // Best-effort: comment is already persisted, notification failure must not fail the call
+    if (typeof console !== 'undefined' && console.warn) {
+      console.warn(
+        `[tasks] owner notification failed for task ${taskId}: ${String(notifyError)}`
+      );
+    }
+  }
 
   return {
     commentId: result.comment.id,
diff --git a/agent-teams-controller/test/controller.test.js b/agent-teams-controller/test/controller.test.js
index 82d6adb7..6f03a1b5 100644
--- a/agent-teams-controller/test/controller.test.js
+++ b/agent-teams-controller/test/controller.test.js
@@ -532,4 +532,32 @@ describe('agent-teams-controller API', () => {
     controller.processes.unregisterProcess({ id: 'stale-entry' });
     expect(controller.processes.listProcesses()).toEqual([]);
   });
+
+  it('task_add_comment succeeds even when owner notification write fails', () => {
+    const claudeDir = makeClaudeDir();
+    const controller = createController({ teamName: 'my-team', claudeDir });
+    const task = controller.tasks.createTask({
+      subject: 'Comment resilience',
+      owner: 'bob',
+      notifyOwner: false,
+    });
+
+    // Make inboxes directory read-only to force notification write failure
+    const inboxDir = path.join(claudeDir, 'teams', 'my-team', 'inboxes');
+    fs.mkdirSync(inboxDir, { recursive: true });
+    // Write a broken file that will cause JSON parse failure on append
+    fs.writeFileSync(path.join(inboxDir, 'bob.json'), 'NOT VALID JSON');
+
+    // Comment should still succeed despite notification failure
+    const commented = controller.tasks.addTaskComment(task.id, {
+      from: 'alice',
+      text: 'This should persist despite notification failure.',
+    });
+
+    expect(commented.commentId).toBeTruthy();
+    expect(commented.task.comments).toHaveLength(1);
+    expect(commented.task.comments[0].text).toBe(
+      'This should persist despite notification failure.'
+    );
+  });
 });
diff --git a/mcp-server/test/tools.test.ts b/mcp-server/test/tools.test.ts
index 82bf5cae..0499ee0d 100644
--- a/mcp-server/test/tools.test.ts
+++ b/mcp-server/test/tools.test.ts
@@ -260,9 +260,11 @@ describe('agent-teams-mcp tools', () => {
       })
     );
     expect(approved.reviewState).toBe('approved');
-    const ownerInboxPath = path.join(claudeDir, 'teams', teamName, 'inboxes', 'alice.json');
-    const ownerInbox = JSON.parse(fs.readFileSync(ownerInboxPath, 'utf8'));
-    expect(ownerInbox.at(-1).leadSessionId).toBe('session-review-1');
+    {
+      const approvedInboxPath = path.join(claudeDir, 'teams', teamName, 'inboxes', 'alice.json');
+      const approvedInbox = JSON.parse(fs.readFileSync(approvedInboxPath, 'utf8'));
+      expect(approvedInbox.at(-1).leadSessionId).toBe('session-review-1');
+    }
 
     const kanbanState = parseJsonToolResult(
       await getTool('kanban_get').execute({
@@ -549,4 +551,48 @@ describe('agent-teams-mcp tools', () => {
       }).success
     ).toBe(false);
   });
+
+  it('task_add_comment succeeds even when owner inbox write fails', async () => {
+    const claudeDir = makeClaudeDir();
+    const teamName = 'resilience';
+
+    const task = parseJsonToolResult(
+      await getTool('task_create').execute({
+        claudeDir,
+        teamName,
+        subject: 'Comment resilience test',
+        owner: 'alice',
+        notifyOwner: false,
+      })
+    );
+
+    // Corrupt the inbox file to force notification failure
+    const inboxDir = path.join(claudeDir, 'teams', teamName, 'inboxes');
+    fs.mkdirSync(inboxDir, { recursive: true });
+    fs.writeFileSync(path.join(inboxDir, 'alice.json'), 'BROKEN JSON');
+
+    const commented = parseJsonToolResult(
+      await getTool('task_add_comment').execute({
+        claudeDir,
+        teamName,
+        taskId: task.id,
+        text: 'Comment should persist despite broken inbox',
+        from: 'bob',
+      })
+    );
+
+    expect(commented.commentId).toBeTruthy();
+
+    // Verify the comment is actually persisted on the task
+    const reloaded = parseJsonToolResult(
+      await getTool('task_get').execute({
+        claudeDir,
+        teamName,
+        taskId: task.id,
+      })
+    );
+
+    expect(reloaded.comments).toHaveLength(1);
+    expect(reloaded.comments[0].text).toBe('Comment should persist despite broken inbox');
+  });
 });
diff --git a/src/main/services/team/TeamDataService.ts b/src/main/services/team/TeamDataService.ts
index 9bcaa825..fc5a3ce1 100644
--- a/src/main/services/team/TeamDataService.ts
+++ b/src/main/services/team/TeamDataService.ts
@@ -13,7 +13,7 @@ import {
   AGENT_BLOCK_OPEN,
   stripAgentBlocks,
 } from '@shared/constants/agentBlocks';
-import { getMemberColor } from '@shared/constants/memberColors';
+import { getMemberColorByName } from '@shared/constants/memberColors';
 import { createLogger } from '@shared/utils/logger';
 import { getKanbanColumnFromReviewState, normalizeReviewState } from '@shared/utils/reviewState';
 import { formatTaskDisplayLabel } from '@shared/utils/taskIdentity';
@@ -622,7 +622,7 @@ export class TeamDataService {
       role: request.role?.trim() || undefined,
       workflow: request.workflow?.trim() || undefined,
       agentType: 'general-purpose',
-      color: getMemberColor(members.filter((m) => !m.removedAt).length),
+      color: getMemberColorByName(name),
       joinedAt: Date.now(),
     };
 
@@ -662,7 +662,7 @@ export class TeamDataService {
     const joinedAt = Date.now();
     const nextByName = new Set<string>();
 
-    const nextActive: TeamMember[] = request.members.map((member, index) => {
+    const nextActive: TeamMember[] = request.members.map((member) => {
       const name = member.name.trim();
       if (!name) throw new Error('Member name cannot be empty');
       if (name.toLowerCase() === 'team-lead') {
@@ -681,7 +681,7 @@ export class TeamDataService {
         role: member.role?.trim() || undefined,
         workflow: member.workflow?.trim() || undefined,
         agentType: prev?.agentType ?? 'general-purpose',
-        color: prev?.color ?? getMemberColor(index),
+        color: prev?.color ?? getMemberColorByName(name),
         joinedAt: prev?.joinedAt ?? joinedAt,
         removedAt: undefined,
       };
@@ -1113,7 +1113,7 @@ export class TeamDataService {
     await atomicWriteAsync(configPath, JSON.stringify(config, null, 2));
     await this.membersMetaStore.writeMembers(
       request.teamName,
-      request.members.map((member, index) => ({
+      request.members.map((member) => ({
         name: (() => {
           const name = member.name.trim();
           if (!name) throw new Error('Member name cannot be empty');
@@ -1129,7 +1129,7 @@ export class TeamDataService {
         })(),
         role: member.role?.trim() || undefined,
         agentType: 'general-purpose',
-        color: getMemberColor(index),
+        color: getMemberColorByName(member.name.trim()),
         joinedAt,
       }))
     );
diff --git a/src/main/services/team/TeamMemberResolver.ts b/src/main/services/team/TeamMemberResolver.ts
index 34c2096e..b011af30 100644
--- a/src/main/services/team/TeamMemberResolver.ts
+++ b/src/main/services/team/TeamMemberResolver.ts
@@ -93,7 +93,10 @@ export class TeamMemberResolver {
       const ownedTasks = tasks.filter((task) => task.owner === name);
       const currentTask =
         ownedTasks.find(
-          (task) => task.status === 'in_progress' && task.kanbanColumn !== 'approved'
+          (task) =>
+            task.status === 'in_progress' &&
+            task.reviewState !== 'approved' &&
+            task.kanbanColumn !== 'approved'
         ) ?? null;
       const memberMessages = messages.filter((message) => message.from === name);
       const latestMessage = memberMessages[0] ?? null;
diff --git a/src/main/services/team/TeamProvisioningService.ts b/src/main/services/team/TeamProvisioningService.ts
index a2c94df6..b508e867 100644
--- a/src/main/services/team/TeamProvisioningService.ts
+++ b/src/main/services/team/TeamProvisioningService.ts
@@ -19,7 +19,7 @@ import {
   AGENT_BLOCK_OPEN,
   stripAgentBlocks,
 } from '@shared/constants/agentBlocks';
-import { getMemberColor } from '@shared/constants/memberColors';
+import { getMemberColorByName } from '@shared/constants/memberColors';
 import { DEFAULT_TOOL_APPROVAL_SETTINGS } from '@shared/types/team';
 import { resolveLanguageName } from '@shared/utils/agentLanguage';
 import { parseCliArgs } from '@shared/utils/cliArgsParser';
@@ -566,6 +566,7 @@ Communication protocol (CRITICAL — you are running headless, no one sees your
 - Example: if you receive <teammate-message teammate_id="alice">...</teammate-message>, respond with SendMessage(type: "message", recipient: "alice", content: "your reply").
 
 Message formatting:
+- When mentioning teammates by name in messages and text output, always use @ prefix (e.g. @alice, @bob) for UI highlighting. Do NOT use @ in tool parameters (recipient, owner, etc.) — those require plain names.
 ${agentBlockPolicy}
 
 ${membersFooter}`;
@@ -1155,6 +1156,30 @@ export class TeamProvisioningService {
     }
   }
 
+  private persistInboxMessage(teamName: string, recipient: string, message: InboxMessage): void {
+    try {
+      createController({
+        teamName,
+        claudeDir: getClaudeBasePath(),
+      }).messages.sendMessage({
+        member: recipient,
+        from: message.from,
+        text: message.text,
+        timestamp: message.timestamp,
+        summary: message.summary,
+        messageId: message.messageId,
+        source: message.source,
+        leadSessionId: message.leadSessionId,
+        attachments: message.attachments,
+        color: message.color,
+        toolSummary: message.toolSummary,
+        toolCalls: message.toolCalls,
+      });
+    } catch (error) {
+      logger.warn(`[${teamName}] inbox-message persist for ${recipient} failed: ${String(error)}`);
+    }
+  }
+
   private getMemberRelayKey(teamName: string, memberName: string): string {
     return `${teamName}:${memberName.trim()}`;
   }
@@ -2923,12 +2948,24 @@ export class TeamProvisioningService {
       };
 
       this.pushLiveLeadProcessMessage(run.teamName, msg);
-      this.persistSentMessage(run.teamName, msg);
-      this.teamChangeEmitter?.({
-        type: 'inbox',
-        teamName: run.teamName,
-        detail: 'sentMessages.json',
-      });
+
+      if (recipient === 'user') {
+        // User-directed messages go to sentMessages.json (canonical outbound store)
+        this.persistSentMessage(run.teamName, msg);
+        this.teamChangeEmitter?.({
+          type: 'inbox',
+          teamName: run.teamName,
+          detail: 'sentMessages.json',
+        });
+      } else {
+        // Non-user messages go to canonical recipient inbox for relay delivery
+        this.persistInboxMessage(run.teamName, recipient, msg);
+        this.teamChangeEmitter?.({
+          type: 'inbox',
+          teamName: run.teamName,
+          detail: `inboxes/${recipient}.json`,
+        });
+      }
 
       logger.debug(
         `[${run.teamName}] Captured SendMessage→${recipient} from stdout: ${cleanContent.slice(0, 100)}`
@@ -5183,12 +5220,12 @@ export class TeamProvisioningService {
     try {
       await this.membersMetaStore.writeMembers(
         teamName,
-        teammateMembers.map((member, index) => ({
+        teammateMembers.map((member) => ({
           name: member.name.trim(),
           role: member.role?.trim() || undefined,
           workflow: member.workflow?.trim() || undefined,
           agentType: 'general-purpose',
-          color: getMemberColor(index),
+          color: getMemberColorByName(member.name.trim()),
           joinedAt,
         }))
       );
diff --git a/src/renderer/components/chat/AIChatGroup.tsx b/src/renderer/components/chat/AIChatGroup.tsx
index fb522b3b..c0ee3a45 100644
--- a/src/renderer/components/chat/AIChatGroup.tsx
+++ b/src/renderer/components/chat/AIChatGroup.tsx
@@ -385,6 +385,12 @@ const AIChatGroupInner = ({
   // Determine if there's content to toggle
   const hasToggleContent = enhanced.displayItems.length > 0;
 
+  // Last thinking text for collapsed preview
+  const lastThought = useMemo(() => {
+    const thinkingItems = enhanced.displayItems.filter((d) => d.type === 'thinking');
+    return thinkingItems.at(-1)?.content?.slice(0, 200) ?? null;
+  }, [enhanced.displayItems]);
+
   // Handle item click - toggle inline expansion using store action
   const handleItemClick = (itemId: string): void => {
     toggleDisplayItemExpansion(aiGroup.id, itemId);
@@ -501,6 +507,11 @@ const AIChatGroupInner = ({
         </div>
       )}
 
+      {/* Last thought preview in collapsed state */}
+      {hasToggleContent && !isExpanded && lastThought && (
+        <div className="truncate px-6 pb-1 text-xs text-text-muted">{lastThought}</div>
+      )}
+
       {/* Expandable Content */}
       {hasToggleContent && isExpanded && (
         <div className="py-2 pl-2">
diff --git a/src/renderer/components/team/CollapsibleTeamSection.tsx b/src/renderer/components/team/CollapsibleTeamSection.tsx
index fb78dd64..83f95343 100644
--- a/src/renderer/components/team/CollapsibleTeamSection.tsx
+++ b/src/renderer/components/team/CollapsibleTeamSection.tsx
@@ -79,7 +79,7 @@ export const CollapsibleTeamSection = ({
       >
         <button
           type="button"
-          className={`absolute inset-0 z-0 cursor-pointer transition-colors ${isOpen ? 'rounded-t-md bg-white/[0.07] hover:bg-white/[0.1]' : 'rounded-md bg-white/[0.04] hover:bg-white/[0.08]'}`}
+          className={`absolute inset-0 z-0 cursor-pointer transition-colors ${isOpen ? 'rounded-t-md bg-[var(--color-section-bg-open)] hover:bg-[var(--color-section-hover-open)]' : 'rounded-md bg-[var(--color-section-bg)] hover:bg-[var(--color-section-hover)]'}`}
           onClick={() => setOpen((prev) => !prev)}
           aria-label={isOpen ? 'Collapse section' : 'Expand section'}
         />
diff --git a/src/renderer/components/team/activity/ActiveTasksBlock.tsx b/src/renderer/components/team/activity/ActiveTasksBlock.tsx
index 2f9e3128..89625ede 100644
--- a/src/renderer/components/team/activity/ActiveTasksBlock.tsx
+++ b/src/renderer/components/team/activity/ActiveTasksBlock.tsx
@@ -23,7 +23,13 @@ export const ActiveTasksBlock = ({
   const { isLight } = useTheme();
   const colorMap = buildMemberColorMap(members);
   const taskMap = new Map(tasks.map((t) => [t.id, t]));
-  const working = members.filter((m) => m.currentTaskId != null);
+  const working = members.filter((m) => {
+    if (!m.currentTaskId) return false;
+    const task = taskMap.get(m.currentTaskId);
+    // Defense-in-depth: hide banner for approved/completed tasks even if currentTaskId is stale
+    if (task && (task.reviewState === 'approved' || task.status === 'completed')) return false;
+    return true;
+  });
   if (working.length === 0) return null;
 
   return (
diff --git a/src/renderer/components/team/activity/LeadThoughtsGroup.tsx b/src/renderer/components/team/activity/LeadThoughtsGroup.tsx
index af7e8a60..af8b4660 100644
--- a/src/renderer/components/team/activity/LeadThoughtsGroup.tsx
+++ b/src/renderer/components/team/activity/LeadThoughtsGroup.tsx
@@ -342,24 +342,10 @@ const LeadThoughtItem = ({
     <div ref={wrapperRef}>
       <div ref={contentRef}>
         {showDivider && (
-          <div className="mx-auto flex w-2/5 items-center justify-center gap-[5px] py-px">
-            <hr
-              className="flex-1 border-0"
-              style={{
-                height: '1px',
-                backgroundColor: 'var(--color-border-emphasis)',
-              }}
-            />
-            <span className="shrink-0 font-mono text-[9px]" style={{ color: CARD_ICON_MUTED }}>
+          <div className="py-px text-center">
+            <span className="font-mono text-[9px]" style={{ color: CARD_ICON_MUTED }}>
               {formatTimeWithSec(thought.timestamp)}
             </span>
-            <hr
-              className="flex-1 border-0"
-              style={{
-                height: '1px',
-                backgroundColor: 'var(--color-border-emphasis)',
-              }}
-            />
           </div>
         )}
         <div className="group/thought relative flex text-[11px]">
@@ -746,6 +732,20 @@ export const LeadThoughtsGroupRow = ({
           )}
         </div>
 
+        {/* Last thought preview when body is collapsed */}
+        {!isBodyVisible && newest.text && (
+          <div
+            className="truncate border-t px-3 py-1 text-[11px]"
+            style={{
+              borderColor: 'var(--color-border-subtle)',
+              color: CARD_TEXT_LIGHT,
+              opacity: 0.7,
+            }}
+          >
+            {newest.text.slice(0, 200)}
+          </div>
+        )}
+
         {/* Scrollable body — live thoughts follow bottom unless user scrolls up */}
         {isBodyVisible ? (
           <div
diff --git a/src/renderer/components/team/attachments/ImageLightbox.tsx b/src/renderer/components/team/attachments/ImageLightbox.tsx
index 4d7b6c1e..28232b0a 100644
--- a/src/renderer/components/team/attachments/ImageLightbox.tsx
+++ b/src/renderer/components/team/attachments/ImageLightbox.tsx
@@ -1,7 +1,7 @@
 import 'yet-another-react-lightbox/styles.css';
 import 'yet-another-react-lightbox/plugins/counter.css';
 
-import { useMemo } from 'react';
+import { createContext, useContext, useEffect, useRef, useMemo } from 'react';
 
 import Lightbox from 'yet-another-react-lightbox';
 import Counter from 'yet-another-react-lightbox/plugins/counter';
@@ -10,6 +10,21 @@ import Zoom from 'yet-another-react-lightbox/plugins/zoom';
 
 import type { Plugin, Slide } from 'yet-another-react-lightbox';
 
+// ---------------------------------------------------------------------------
+// LightboxLock context — allows a parent (e.g. Dialog) to know when a
+// lightbox is open so it can block dismiss events.
+// ---------------------------------------------------------------------------
+
+type LightboxLockCallback = (open: boolean) => void;
+
+const LightboxLockContext = createContext<LightboxLockCallback | null>(null);
+
+/**
+ * Wrap a Dialog (or any dismissable container) with this provider and pass a
+ * callback that receives `true` when a lightbox opens and `false` when it closes.
+ */
+export const LightboxLockProvider = LightboxLockContext.Provider;
+
 export interface ImageLightboxSlide {
   src: string;
   alt?: string;
@@ -30,6 +45,8 @@ interface ImageLightboxProps {
   enableZoom?: boolean;
   enableFullscreen?: boolean;
   showCounter?: boolean;
+  /** Called when lightbox open state changes (useful for parent components to block dismiss). */
+  onOpenChange?: (open: boolean) => void;
 }
 
 export const ImageLightbox = ({
@@ -42,6 +59,7 @@ export const ImageLightbox = ({
   enableZoom = true,
   enableFullscreen = true,
   showCounter,
+  onOpenChange,
 }: ImageLightboxProps): React.JSX.Element | null => {
   const slides = useMemo<Slide[]>(() => {
     if (slidesProp && slidesProp.length > 0) {
@@ -63,6 +81,29 @@ export const ImageLightbox = ({
     return list;
   }, [enableZoom, enableFullscreen, showCounter, slides.length]);
 
+  // Resolve the lightbox lock callback: explicit prop takes priority, then context.
+  const contextLock = useContext(LightboxLockContext);
+  const lockCallback = onOpenChange ?? contextLock;
+  const lockCallbackRef = useRef(lockCallback);
+  lockCallbackRef.current = lockCallback;
+
+  // Track our notified state to avoid double-calling.
+  const notifiedOpenRef = useRef(false);
+
+  // Notify parent on mount when open=true and on unmount.
+  useEffect(() => {
+    if (open && !notifiedOpenRef.current) {
+      notifiedOpenRef.current = true;
+      lockCallbackRef.current?.(true);
+    }
+    return () => {
+      if (notifiedOpenRef.current) {
+        notifiedOpenRef.current = false;
+        lockCallbackRef.current?.(false);
+      }
+    };
+  }, [open]);
+
   if (!open || slides.length === 0) return null;
 
   return (
diff --git a/src/renderer/components/team/dialogs/CreateTeamDialog.tsx b/src/renderer/components/team/dialogs/CreateTeamDialog.tsx
index 5a079e97..5bd3cae5 100644
--- a/src/renderer/components/team/dialogs/CreateTeamDialog.tsx
+++ b/src/renderer/components/team/dialogs/CreateTeamDialog.tsx
@@ -28,7 +28,7 @@ import { useFileListCacheWarmer } from '@renderer/hooks/useFileListCacheWarmer';
 import { useTheme } from '@renderer/hooks/useTheme';
 import { cn } from '@renderer/lib/utils';
 import { normalizePath } from '@renderer/utils/pathNormalize';
-import { getMemberColor } from '@shared/constants/memberColors';
+import { getMemberColorByName } from '@shared/constants/memberColors';
 import { AlertTriangle, CheckCircle2, Info, Loader2, X } from 'lucide-react';
 
 import { AdvancedCliSection } from './AdvancedCliSection';
@@ -254,7 +254,8 @@ export const CreateTeamDialog = ({
 
   // Re-read localStorage when advancedKey changes
   useEffect(() => {
-    const storedEnabled = localStorage.getItem(`team:lastWorktreeEnabled:${advancedKey}`) === 'true';
+    const storedEnabled =
+      localStorage.getItem(`team:lastWorktreeEnabled:${advancedKey}`) === 'true';
     const storedName = localStorage.getItem(`team:lastWorktreeName:${advancedKey}`) ?? '';
     setWorktreeEnabledRaw(storedEnabled && Boolean(storedName));
     setWorktreeNameRaw(storedName);
@@ -497,7 +498,7 @@ export const CreateTeamDialog = ({
         ? [{ id: 'team-lead', name: 'team-lead', subtitle: 'Team Lead', color: 'blue' }]
         : members
             .filter((m) => m.name.trim())
-            .map((m, index) => ({
+            .map((m) => ({
               id: m.id,
               name: m.name.trim(),
               subtitle:
@@ -506,7 +507,7 @@ export const CreateTeamDialog = ({
                   : m.roleSelection && m.roleSelection !== NO_ROLE
                     ? m.roleSelection
                     : undefined,
-              color: getMemberColor(index),
+              color: getMemberColorByName(m.name.trim()),
             })),
     [members, soloTeam]
   );
diff --git a/src/renderer/components/team/dialogs/StatusHistoryTimeline.tsx b/src/renderer/components/team/dialogs/StatusHistoryTimeline.tsx
index 6dfbb974..ea95f9e7 100644
--- a/src/renderer/components/team/dialogs/StatusHistoryTimeline.tsx
+++ b/src/renderer/components/team/dialogs/StatusHistoryTimeline.tsx
@@ -1,3 +1,4 @@
+import { MemberBadge } from '@renderer/components/team/MemberBadge';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
 import { cn } from '@renderer/lib/utils';
 import {
@@ -5,15 +6,17 @@ import {
   TASK_STATUS_LABELS,
   TASK_STATUS_STYLES,
 } from '@renderer/utils/memberHelpers';
-import { ArrowRight, Eye, MessageSquareX, Play, Plus, ShieldCheck } from 'lucide-react';
+import { ArrowRight, Eye, MessageSquareX, Plus, ShieldCheck } from 'lucide-react';
 
 import type { TaskHistoryEvent, TeamReviewState, TeamTaskStatus } from '@shared/types';
 
 interface WorkflowTimelineProps {
   events: TaskHistoryEvent[];
+  /** Map of member name → color name for colored badges. */
+  memberColorMap?: Map<string, string>;
 }
 
-export const WorkflowTimeline = ({ events }: WorkflowTimelineProps) => {
+export const WorkflowTimeline = ({ events, memberColorMap }: WorkflowTimelineProps) => {
   if (events.length === 0) {
     return (
       <div className="px-3 py-2 text-xs text-[var(--color-text-muted)]">
@@ -43,10 +46,14 @@ export const WorkflowTimeline = ({ events }: WorkflowTimelineProps) => {
                   <span className="shrink-0 font-mono text-[10px] text-[var(--color-text-muted)]">
                     {time}
                   </span>
-                  <EventContent event={event} />
+                  <EventContent event={event} memberColorMap={memberColorMap} />
                   {event.actor ? (
-                    <span className="ml-auto shrink-0 text-[10px] text-[var(--color-text-muted)]">
-                      by {event.actor}
+                    <span className="ml-auto shrink-0">
+                      <MemberBadge
+                        name={event.actor}
+                        color={memberColorMap?.get(event.actor)}
+                        size="sm"
+                      />
                     </span>
                   ) : null}
                 </div>
@@ -65,7 +72,13 @@ export const WorkflowTimeline = ({ events }: WorkflowTimelineProps) => {
 /** Keep old name as re-export for backwards compatibility during migration. */
 export const StatusHistoryTimeline = WorkflowTimeline;
 
-const EventContent = ({ event }: { event: TaskHistoryEvent }) => {
+const EventContent = ({
+  event,
+  memberColorMap,
+}: {
+  event: TaskHistoryEvent;
+  memberColorMap?: Map<string, string>;
+}) => {
   switch (event.type) {
     case 'task_created':
       return (
@@ -89,7 +102,12 @@ const EventContent = ({ event }: { event: TaskHistoryEvent }) => {
           <Eye size={10} className="text-purple-400" />
           Review requested
           {event.reviewer ? (
-            <span className="text-[10px] text-[var(--color-text-muted)]">({event.reviewer})</span>
+            <MemberBadge
+              name={event.reviewer}
+              color={memberColorMap?.get(event.reviewer)}
+              size="sm"
+              hideAvatar
+            />
           ) : null}
         </span>
       );
diff --git a/src/renderer/components/team/dialogs/TaskCommentsSection.tsx b/src/renderer/components/team/dialogs/TaskCommentsSection.tsx
index 6bf7448c..6d9af857 100644
--- a/src/renderer/components/team/dialogs/TaskCommentsSection.tsx
+++ b/src/renderer/components/team/dialogs/TaskCommentsSection.tsx
@@ -53,6 +53,8 @@ interface TaskCommentsSectionProps {
   onTaskIdClick?: (taskId: string) => void;
   /** Extra className on the outer comments container (e.g. negative margins for edge-to-edge). */
   containerClassName?: string;
+  /** Snapshot of unread comment IDs captured when the dialog opened. Blue dot is shown for these. */
+  unreadCommentIds?: Set<string>;
 }
 
 /** Convert `#<task-display-id>` in plain text to markdown links with task:// protocol. */
@@ -83,6 +85,7 @@ export const TaskCommentsSection = ({
   onReply,
   onTaskIdClick,
   containerClassName,
+  unreadCommentIds,
 }: TaskCommentsSectionProps): React.JSX.Element => {
   const addTaskComment = useStore((s) => s.addTaskComment);
   const addingComment = useStore((s) => s.addingComment);
@@ -207,6 +210,9 @@ export const TaskCommentsSection = ({
                   }
                 >
                   <div className="mb-1 flex items-center gap-2 text-[10px] text-[var(--color-text-muted)]">
+                    {unreadCommentIds?.has(comment.id) ? (
+                      <span className="size-2 shrink-0 rounded-full bg-blue-500" />
+                    ) : null}
                     <MemberBadge
                       name={comment.author}
                       color={colorMap.get(comment.author)}
diff --git a/src/renderer/components/team/dialogs/TaskDetailDialog.tsx b/src/renderer/components/team/dialogs/TaskDetailDialog.tsx
index 720a81f4..4bcfc997 100644
--- a/src/renderer/components/team/dialogs/TaskDetailDialog.tsx
+++ b/src/renderer/components/team/dialogs/TaskDetailDialog.tsx
@@ -1,7 +1,10 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
 import { MarkdownViewer } from '@renderer/components/chat/viewers/MarkdownViewer';
-import { ImageLightbox } from '@renderer/components/team/attachments/ImageLightbox';
+import {
+  ImageLightbox,
+  LightboxLockProvider,
+} from '@renderer/components/team/attachments/ImageLightbox';
 import { CollapsibleTeamSection } from '@renderer/components/team/CollapsibleTeamSection';
 import { FileIcon } from '@renderer/components/team/editor/FileIcon';
 import { MemberBadge } from '@renderer/components/team/MemberBadge';
@@ -20,7 +23,7 @@ import { Input } from '@renderer/components/ui/input';
 import { MemberSelect } from '@renderer/components/ui/MemberSelect';
 import { Textarea } from '@renderer/components/ui/textarea';
 import { Tooltip, TooltipContent, TooltipTrigger } from '@renderer/components/ui/tooltip';
-import { markAsRead } from '@renderer/services/commentReadStorage';
+import { getLastReadTimestamp } from '@renderer/services/commentReadStorage';
 import { useStore } from '@renderer/store';
 import { isImageMimeType } from '@renderer/utils/attachmentUtils';
 import {
@@ -178,6 +181,14 @@ export const TaskDetailDialog = ({
     author: string;
     text: string;
   } | null>(null);
+
+  // Track whether a lightbox is open to block Dialog dismiss events.
+  // Using a ref for synchronous reads (no render cycle delay) + a stable
+  // callback so context consumers never cause re-renders.
+  const lightboxOpenRef = useRef(false);
+  const setLightboxOpen = useCallback((isOpen: boolean) => {
+    lightboxOpenRef.current = isOpen;
+  }, []);
   const handleReply = useCallback(
     (author: string, text: string) => {
       if (currentTask) setReplyTo({ taskId: currentTask.id, author, text });
@@ -196,13 +207,29 @@ export const TaskDetailDialog = ({
       ? { author: replyTo.author, text: replyTo.text }
       : null;
 
+  // Snapshot unread comment IDs when dialog opens — these will show blue dots.
+  // Dots persist for the duration of the dialog session; markAsRead happens
+  // per-comment via IntersectionObserver inside TaskCommentsSection.
+  const unreadSnapshotRef = useRef<Set<string>>(new Set());
   useEffect(() => {
-    if (!open || !currentTask) return;
+    if (!open || !currentTask) {
+      unreadSnapshotRef.current = new Set();
+      return;
+    }
     const comments = currentTask.comments ?? [];
-    if (comments.length === 0) return;
-    const latest = Math.max(...comments.map((c) => new Date(c.createdAt).getTime()));
-    if (latest > 0) markAsRead(teamName, currentTask.id, latest);
-  }, [open, teamName, currentTask]);
+    if (comments.length === 0) {
+      unreadSnapshotRef.current = new Set();
+      return;
+    }
+    const lastRead = getLastReadTimestamp(teamName, currentTask.id);
+    const unread = new Set<string>();
+    for (const c of comments) {
+      if (new Date(c.createdAt).getTime() > lastRead) {
+        unread.add(c.id);
+      }
+    }
+    unreadSnapshotRef.current = unread;
+  }, [open, teamName, currentTask?.id]); // eslint-disable-line react-hooks/exhaustive-deps
 
   // Collect image attachments from comments for the Attachments section
   const commentImageAttachments = useMemo(() => {
@@ -328,622 +355,639 @@ export const TaskDetailDialog = ({
   const allowLeadExecutionPreview = true;
 
   return (
-    <Dialog open={open} onOpenChange={(v) => !v && onClose()}>
-      <DialogContent className="sm:min-w-[500px] sm:max-w-4xl">
-        <DialogHeader>
-          <div className="flex items-center gap-2">
-            <Badge variant="secondary" className="px-1.5 py-0 text-[10px] font-normal">
-              {formatTaskDisplayLabel(currentTask)}
-            </Badge>
-            <span
-              className={`inline-flex rounded-full px-2 py-0.5 text-[10px] font-medium ${statusStyle.bg} ${statusStyle.text}`}
-            >
-              {statusLabel}
-            </span>
-            {currentTask.reviewState === 'needsFix' ? (
-              <span
-                className={`inline-flex rounded-full px-2 py-0.5 text-[10px] font-medium ${REVIEW_STATE_DISPLAY.needsFix.bg} ${REVIEW_STATE_DISPLAY.needsFix.text}`}
-              >
-                {REVIEW_STATE_DISPLAY.needsFix.label}
-              </span>
-            ) : null}
-            {headerExtra ? <div className="ml-auto mr-4">{headerExtra}</div> : null}
-          </div>
-          {editingSubject ? (
+    <Dialog
+      open={open}
+      onOpenChange={(v) => {
+        if (!v && lightboxOpenRef.current) return;
+        if (!v) onClose();
+      }}
+    >
+      <DialogContent
+        className="sm:min-w-[500px] sm:max-w-4xl"
+        onInteractOutside={(e) => {
+          if (lightboxOpenRef.current) e.preventDefault();
+        }}
+        onEscapeKeyDown={(e) => {
+          if (lightboxOpenRef.current) e.preventDefault();
+        }}
+      >
+        <LightboxLockProvider value={setLightboxOpen}>
+          <DialogHeader>
             <div className="flex items-center gap-2">
-              <Input
-                autoFocus
-                value={subjectDraft}
-                onChange={(e) => setSubjectDraft(e.target.value)}
-                onKeyDown={(e) => {
-                  if (e.key === 'Enter') void saveSubject();
-                  if (e.key === 'Escape') setEditingSubject(false);
-                }}
-                onBlur={() => void saveSubject()}
-                disabled={savingSubject}
-                className="h-8 text-base"
-              />
-              {savingSubject ? <Loader2 size={14} className="animate-spin" /> : null}
-            </div>
-          ) : (
-            <DialogTitle
-              className="group flex cursor-pointer items-center gap-1.5 text-base hover:text-[var(--color-text)]"
-              onClick={startEditSubject}
-            >
-              {currentTask.subject}
-              <Pencil
-                size={12}
-                className="shrink-0 text-[var(--color-text-muted)] opacity-0 transition-opacity group-hover:opacity-100"
-              />
-            </DialogTitle>
-          )}
-          {currentTask.activeForm ? (
-            <DialogDescription>{currentTask.activeForm}</DialogDescription>
-          ) : null}
-        </DialogHeader>
-
-        {/* Metadata */}
-        <div className="flex flex-wrap items-center gap-x-4 gap-y-2 text-xs">
-          <div className="flex min-w-0 items-center gap-2">
-            {canReassign ? (
-              <MemberSelect
-                members={members}
-                value={currentTask.owner ?? null}
-                onChange={(v) => onOwnerChange(currentTask.id, v)}
-                allowUnassigned
-                size="sm"
-                className="min-w-[160px]"
-              />
-            ) : currentTask.owner ? (
-              <MemberBadge
-                name={currentTask.owner}
-                color={colorMap.get(currentTask.owner)}
-                size="md"
-              />
-            ) : (
-              <span className="text-xs italic text-[var(--color-text-muted)]">Unassigned</span>
-            )}
-          </div>
-          {currentTask.createdBy ? (
-            <div className="flex items-center gap-1.5 text-[var(--color-text-muted)]">
-              <PenLine size={12} />
-              <span className="text-[var(--color-text-secondary)]">{currentTask.createdBy}</span>
-            </div>
-          ) : null}
-          {currentTask.createdAt
-            ? (() => {
-                const date = new Date(currentTask.createdAt);
-                return isNaN(date.getTime()) ? null : (
-                  <div className="flex items-center gap-1.5 text-[var(--color-text-muted)]">
-                    <Clock size={12} />
-                    <span className="text-[var(--color-text-secondary)]">
-                      {formatDistanceToNow(date, { addSuffix: true })}
-                    </span>
-                  </div>
-                );
-              })()
-            : null}
-          {onDeleteTask && currentTask ? (
-            <Button
-              variant="ghost"
-              size="sm"
-              className="ml-auto h-6 gap-1 text-xs text-[var(--color-text-muted)] hover:text-red-400"
-              onClick={() => {
-                onDeleteTask(currentTask.id);
-                handleClose();
-              }}
-            >
-              <Trash2 size={12} />
-              Delete
-            </Button>
-          ) : null}
-        </div>
-
-        {/* Clarification banner */}
-        {currentTask.needsClarification ? (
-          <div
-            className={`flex items-center justify-between rounded-md px-3 py-2 text-xs ${
-              currentTask.needsClarification === 'user'
-                ? 'border border-red-500/20 bg-red-500/10 text-red-400'
-                : 'border border-blue-500/20 bg-blue-500/10 text-blue-400'
-            }`}
-          >
-            <span className="flex items-center gap-1.5">
-              <HelpCircle size={14} />
-              {currentTask.needsClarification === 'user'
-                ? 'Awaiting clarification from you'
-                : 'Awaiting clarification from team lead'}
-            </span>
-            <Button
-              variant="ghost"
-              size="sm"
-              className="h-6 text-xs"
-              onClick={(e) => {
-                e.stopPropagation();
-                void setTaskNeedsClarification(teamName, currentTask.id, null);
-              }}
-            >
-              Mark resolved
-            </Button>
-          </div>
-        ) : null}
-
-        {/* Description */}
-        <CollapsibleTeamSection
-          title="Description"
-          icon={<AlignLeft size={14} />}
-          contentClassName="pl-2.5"
-          headerClassName="-mx-6 w-[calc(100%+3rem)]"
-          headerContentClassName="pl-6"
-          defaultOpen
-        >
-          {editingDescription ? (
-            <div className="space-y-2">
-              <div className="flex items-center gap-2">
-                <button
-                  type="button"
-                  className={`flex items-center gap-1 rounded px-2 py-1 text-xs transition-colors ${
-                    !descriptionPreview
-                      ? 'bg-[var(--color-surface-raised)] text-[var(--color-text)]'
-                      : 'text-[var(--color-text-muted)] hover:text-[var(--color-text-secondary)]'
-                  }`}
-                  onClick={() => setDescriptionPreview(false)}
+              <Badge variant="secondary" className="px-1.5 py-0 text-[10px] font-normal">
+                {formatTaskDisplayLabel(currentTask)}
+              </Badge>
+              <span
+                className={`inline-flex rounded-full px-2 py-0.5 text-[10px] font-medium ${statusStyle.bg} ${statusStyle.text}`}
+              >
+                {statusLabel}
+              </span>
+              {currentTask.reviewState === 'needsFix' ? (
+                <span
+                  className={`inline-flex rounded-full px-2 py-0.5 text-[10px] font-medium ${REVIEW_STATE_DISPLAY.needsFix.bg} ${REVIEW_STATE_DISPLAY.needsFix.text}`}
                 >
-                  <Pencil size={12} />
-                  Edit
-                </button>
-                <button
-                  type="button"
-                  className={`flex items-center gap-1 rounded px-2 py-1 text-xs transition-colors ${
-                    descriptionPreview
-                      ? 'bg-[var(--color-surface-raised)] text-[var(--color-text)]'
-                      : 'text-[var(--color-text-muted)] hover:text-[var(--color-text-secondary)]'
-                  }`}
-                  onClick={() => setDescriptionPreview(true)}
-                >
-                  <Eye size={12} />
-                  Preview
-                </button>
-              </div>
-              {descriptionPreview ? (
-                <div className="max-h-[200px] overflow-y-auto rounded border border-[var(--color-border)] p-2">
-                  {descriptionDraft.trim() ? (
-                    <MarkdownViewer content={descriptionDraft} maxHeight="max-h-[180px]" />
-                  ) : (
-                    <p className="text-xs text-[var(--color-text-muted)]">Nothing to preview</p>
-                  )}
-                </div>
-              ) : (
-                <Textarea
-                  autoFocus
-                  value={descriptionDraft}
-                  onChange={(e) => setDescriptionDraft(e.target.value)}
-                  disabled={savingDescription}
-                  rows={6}
-                  className="text-xs"
-                  placeholder="Task description (supports markdown)"
-                />
-              )}
-              <div className="flex items-center gap-2">
-                <Button
-                  size="sm"
-                  className="h-7 text-xs"
-                  disabled={savingDescription}
-                  onClick={() => void saveDescription()}
-                >
-                  {savingDescription ? (
-                    <Loader2 size={12} className="mr-1 animate-spin" />
-                  ) : (
-                    <Check size={12} className="mr-1" />
-                  )}
-                  Save
-                </Button>
-                <Button
-                  variant="ghost"
-                  size="sm"
-                  className="h-7 text-xs"
-                  disabled={savingDescription}
-                  onClick={() => setEditingDescription(false)}
-                >
-                  <X size={12} className="mr-1" />
-                  Cancel
-                </Button>
-              </div>
-            </div>
-          ) : currentTask.description ? (
-            <div className="group relative">
-              <ExpandableContent collapsedHeight={200}>
-                <MarkdownViewer content={currentTask.description} maxHeight="max-h-none" bare />
-              </ExpandableContent>
-              <Tooltip>
-                <TooltipTrigger asChild>
-                  <button
-                    type="button"
-                    className="absolute right-0 top-0 rounded p-1 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:bg-[var(--color-surface-raised)] hover:text-[var(--color-text)] group-hover:opacity-100"
-                    onClick={startEditDescription}
-                  >
-                    <Pencil size={12} />
-                  </button>
-                </TooltipTrigger>
-                <TooltipContent side="top">Edit description</TooltipContent>
-              </Tooltip>
-            </div>
-          ) : (
-            <button
-              type="button"
-              className="text-xs text-[var(--color-text-muted)] transition-colors hover:text-[var(--color-text-secondary)]"
-              onClick={startEditDescription}
-            >
-              Click to add description...
-            </button>
-          )}
-        </CollapsibleTeamSection>
-
-        {/* Attachments */}
-        <CollapsibleTeamSection
-          title="Attachments"
-          icon={<ImageIcon size={14} />}
-          badge={
-            (currentTask.attachments?.length ?? 0) + commentImageAttachments.length > 0
-              ? (currentTask.attachments?.length ?? 0) + commentImageAttachments.length
-              : undefined
-          }
-          contentClassName="pl-2.5"
-          headerClassName="-mx-6 w-[calc(100%+3rem)]"
-          headerContentClassName="pl-6"
-          defaultOpen={
-            (currentTask.attachments?.length ?? 0) > 0 || commentImageAttachments.length > 0
-          }
-        >
-          <TaskAttachments
-            teamName={teamName}
-            taskId={currentTask.id}
-            attachments={currentTask.attachments ?? []}
-          />
-          {commentImageAttachments.length > 0 ? (
-            <CommentImagesGrid
-              items={commentImageAttachments}
-              teamName={teamName}
-              taskId={currentTask.id}
-            />
-          ) : null}
-        </CollapsibleTeamSection>
-
-        {/* Changes */}
-        {variant === 'team' && isTaskCompleted && onViewChanges ? (
-          <CollapsibleTeamSection
-            title="Changes"
-            icon={<FileDiff size={14} />}
-            badge={taskChangesFiles ? taskChangesFiles.length : undefined}
-            contentClassName="pl-2.5"
-            headerClassName="-mx-6 w-[calc(100%+3rem)]"
-            headerContentClassName="pl-6"
-            defaultOpen={taskKnownHasChanges}
-          >
-            {changeSetLoading || (!taskChangesFiles && taskKnownHasChanges) ? (
-              <div className="flex items-center gap-2 py-2 text-xs text-[var(--color-text-muted)]">
-                <Loader2 size={14} className="animate-spin" />
-                Loading changes...
-              </div>
-            ) : taskChangesFiles && taskChangesFiles.length > 0 ? (
-              <div className="max-h-[200px] space-y-0.5 overflow-y-auto">
-                {taskChangesFiles.map((file) => (
-                  <div
-                    key={file.filePath}
-                    className="group flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-xs transition-colors hover:bg-[var(--color-surface-raised)]"
-                  >
-                    <FileIcon
-                      fileName={file.relativePath.split('/').pop() ?? file.relativePath}
-                      className="size-3.5"
-                    />
-                    <button
-                      type="button"
-                      className="min-w-0 flex-1 truncate text-left font-mono text-[var(--color-text-secondary)] transition-colors hover:text-[var(--color-text)]"
-                      onClick={() => {
-                        handleClose();
-                        onViewChanges(currentTask.id, file.filePath);
-                      }}
-                    >
-                      {file.relativePath}
-                    </button>
-                    <span className="flex shrink-0 items-center gap-1.5">
-                      {file.linesAdded > 0 ? (
-                        <span className="text-emerald-400">+{file.linesAdded}</span>
-                      ) : null}
-                      {file.linesRemoved > 0 ? (
-                        <span className="text-red-400">-{file.linesRemoved}</span>
-                      ) : null}
-                    </span>
-                    <span className="flex shrink-0 items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
-                      <Tooltip>
-                        <TooltipTrigger asChild>
-                          <button
-                            type="button"
-                            className="rounded p-1 text-[var(--color-text-muted)] transition-colors hover:bg-[var(--color-border-emphasis)] hover:text-[var(--color-text)]"
-                            onClick={() => {
-                              handleClose();
-                              onViewChanges(currentTask.id, file.filePath);
-                            }}
-                          >
-                            <GitCompareArrows size={13} />
-                          </button>
-                        </TooltipTrigger>
-                        <TooltipContent side="top">Review diff</TooltipContent>
-                      </Tooltip>
-                      {onOpenInEditor ? (
-                        <Tooltip>
-                          <TooltipTrigger asChild>
-                            <button
-                              type="button"
-                              className="rounded p-1 text-[var(--color-text-muted)] transition-colors hover:bg-[var(--color-border-emphasis)] hover:text-[var(--color-text)]"
-                              onClick={() => onOpenInEditor(file.filePath)}
-                            >
-                              <SquarePen size={13} />
-                            </button>
-                          </TooltipTrigger>
-                          <TooltipContent side="top">Open in editor</TooltipContent>
-                        </Tooltip>
-                      ) : null}
-                    </span>
-                  </div>
-                ))}
-              </div>
-            ) : (
-              <p className="text-xs text-[var(--color-text-muted)]">No file changes detected</p>
-            )}
-          </CollapsibleTeamSection>
-        ) : null}
-
-        {/* Execution Logs — sessions that reference this task */}
-        {variant === 'team' ? (
-          <CollapsibleTeamSection
-            title="Execution Logs"
-            icon={<ScrollText size={14} />}
-            headerExtra={
-              logsRefreshing || executionPreviewOnline ? (
-                <span className="flex items-center gap-2 text-[10px] text-[var(--color-text-muted)]">
-                  {executionPreviewOnline ? (
-                    <span
-                      className="pointer-events-none relative inline-flex size-2 shrink-0"
-                      title="Online"
-                    >
-                      <span className="absolute inline-flex size-full animate-ping rounded-full bg-emerald-400 opacity-50" />
-                      <span className="relative inline-flex size-2 rounded-full bg-emerald-400" />
-                    </span>
-                  ) : null}
-                  {logsRefreshing ? (
-                    <span className="flex items-center gap-1">
-                      <Loader2 size={10} className="animate-spin" />
-                      Updating...
-                    </span>
-                  ) : null}
+                  {REVIEW_STATE_DISPLAY.needsFix.label}
                 </span>
-              ) : null
-            }
+              ) : null}
+              {headerExtra ? <div className="ml-auto mr-4">{headerExtra}</div> : null}
+            </div>
+            {editingSubject ? (
+              <div className="flex items-center gap-2">
+                <Input
+                  autoFocus
+                  value={subjectDraft}
+                  onChange={(e) => setSubjectDraft(e.target.value)}
+                  onKeyDown={(e) => {
+                    if (e.key === 'Enter') void saveSubject();
+                    if (e.key === 'Escape') setEditingSubject(false);
+                  }}
+                  onBlur={() => void saveSubject()}
+                  disabled={savingSubject}
+                  className="h-8 text-base"
+                />
+                {savingSubject ? <Loader2 size={14} className="animate-spin" /> : null}
+              </div>
+            ) : (
+              <DialogTitle
+                className="group flex cursor-pointer items-center gap-1.5 text-base hover:text-[var(--color-text)]"
+                onClick={startEditSubject}
+              >
+                {currentTask.subject}
+                <Pencil
+                  size={12}
+                  className="shrink-0 text-[var(--color-text-muted)] opacity-0 transition-opacity group-hover:opacity-100"
+                />
+              </DialogTitle>
+            )}
+            {currentTask.activeForm ? (
+              <DialogDescription>{currentTask.activeForm}</DialogDescription>
+            ) : null}
+          </DialogHeader>
+
+          {/* Metadata */}
+          <div className="flex flex-wrap items-center gap-x-4 gap-y-2 text-xs">
+            <div className="flex min-w-0 items-center gap-2">
+              {canReassign ? (
+                <MemberSelect
+                  members={members}
+                  value={currentTask.owner ?? null}
+                  onChange={(v) => onOwnerChange(currentTask.id, v)}
+                  allowUnassigned
+                  size="sm"
+                  className="min-w-[160px]"
+                />
+              ) : currentTask.owner ? (
+                <MemberBadge
+                  name={currentTask.owner}
+                  color={colorMap.get(currentTask.owner)}
+                  size="md"
+                />
+              ) : (
+                <span className="text-xs italic text-[var(--color-text-muted)]">Unassigned</span>
+              )}
+            </div>
+            {currentTask.createdBy ? (
+              <div className="flex items-center gap-1.5 text-[var(--color-text-muted)]">
+                <PenLine size={12} />
+                <span className="text-[var(--color-text-secondary)]">{currentTask.createdBy}</span>
+              </div>
+            ) : null}
+            {currentTask.createdAt
+              ? (() => {
+                  const date = new Date(currentTask.createdAt);
+                  return isNaN(date.getTime()) ? null : (
+                    <div className="flex items-center gap-1.5 text-[var(--color-text-muted)]">
+                      <Clock size={12} />
+                      <span className="text-[var(--color-text-secondary)]">
+                        {formatDistanceToNow(date, { addSuffix: true })}
+                      </span>
+                    </div>
+                  );
+                })()
+              : null}
+            {onDeleteTask && currentTask ? (
+              <Button
+                variant="ghost"
+                size="sm"
+                className="ml-auto h-6 gap-1 text-xs text-[var(--color-text-muted)] hover:text-red-400"
+                onClick={() => {
+                  onDeleteTask(currentTask.id);
+                  handleClose();
+                }}
+              >
+                <Trash2 size={12} />
+                Delete
+              </Button>
+            ) : null}
+          </div>
+
+          {/* Clarification banner */}
+          {currentTask.needsClarification ? (
+            <div
+              className={`flex items-center justify-between rounded-md px-3 py-2 text-xs ${
+                currentTask.needsClarification === 'user'
+                  ? 'border border-red-500/20 bg-red-500/10 text-red-400'
+                  : 'border border-blue-500/20 bg-blue-500/10 text-blue-400'
+              }`}
+            >
+              <span className="flex items-center gap-1.5">
+                <HelpCircle size={14} />
+                {currentTask.needsClarification === 'user'
+                  ? 'Awaiting clarification from you'
+                  : 'Awaiting clarification from team lead'}
+              </span>
+              <Button
+                variant="ghost"
+                size="sm"
+                className="h-6 text-xs"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  void setTaskNeedsClarification(teamName, currentTask.id, null);
+                }}
+              >
+                Mark resolved
+              </Button>
+            </div>
+          ) : null}
+
+          {/* Description */}
+          <CollapsibleTeamSection
+            title="Description"
+            icon={<AlignLeft size={14} />}
             contentClassName="pl-2.5"
             headerClassName="-mx-6 w-[calc(100%+3rem)]"
             headerContentClassName="pl-6"
             defaultOpen
           >
-            <div className="min-w-0">
-              <MemberLogsTab
-                teamName={teamName}
-                taskId={currentTask.id}
-                taskOwner={currentTask.owner}
-                taskStatus={currentTask.status}
-                taskWorkIntervals={currentTask.workIntervals}
-                onRefreshingChange={setLogsRefreshing}
-                // Only show a "latest messages" preview when this task is owned by a subagent.
-                // For lead-owned tasks, the lead session is a mixed stream (lead + multiple agents),
-                // so filtering to "just the member messages" is unreliable and easy to mislead.
-                showSubagentPreview={Boolean(currentTask.owner) && !isLeadOwnedTask}
-                // Temporary debug option: for lead-owned tasks, show quick preview from lead session.
-                showLeadPreview={allowLeadExecutionPreview && isLeadOwnedTask}
-                onPreviewOnlineChange={setExecutionPreviewOnline}
-              />
-            </div>
-          </CollapsibleTeamSection>
-        ) : null}
-
-        {blockedByIds.length > 0 ||
-        blocksIds.length > 0 ||
-        relatedIds.length > 0 ||
-        relatedByIds.length > 0 ||
-        kanbanTaskState ? (
-          <div className="space-y-2">
-            {/* Dependencies */}
-            {blockedByIds.length > 0 ? (
-              <div className="flex flex-wrap items-center gap-1.5">
-                <span className="inline-flex items-center gap-0.5 text-xs text-yellow-300">
-                  <ArrowLeftFromLine size={12} />
-                  Blocked by
-                </span>
-                {blockedByIds.map((id) => {
-                  const depTask = taskMap.get(id);
-                  const isCompleted = depTask?.status === 'completed';
-                  return (
-                    <button
-                      key={id}
-                      type="button"
-                      className={`inline-flex items-center rounded px-1.5 py-0.5 text-[10px] font-medium transition-colors ${
-                        isCompleted
-                          ? 'bg-emerald-500/15 text-emerald-400 hover:bg-emerald-500/25'
-                          : 'bg-yellow-500/15 text-yellow-300 hover:bg-yellow-500/25'
-                      } cursor-pointer`}
-                      title={
-                        depTask
-                          ? `${formatTaskDisplayLabel(depTask)}: ${depTask.subject}`
-                          : `#${deriveTaskDisplayId(id)}`
-                      }
-                      onClick={() => handleDependencyClick(id)}
-                    >
-                      {depTask ? formatTaskDisplayLabel(depTask) : `#${deriveTaskDisplayId(id)}`}
-                    </button>
-                  );
-                })}
-              </div>
-            ) : null}
-
-            {blocksIds.length > 0 ? (
-              <div className="flex flex-wrap items-center gap-1.5">
-                <span className="inline-flex items-center gap-0.5 text-xs text-blue-400">
-                  <ArrowRightFromLine size={12} />
-                  Blocks
-                </span>
-                {blocksIds.map((id) => {
-                  const depTask = taskMap.get(id);
-                  const isCompleted = depTask?.status === 'completed';
-                  return (
-                    <button
-                      key={id}
-                      type="button"
-                      className={`inline-flex items-center rounded px-1.5 py-0.5 text-[10px] font-medium transition-colors ${
-                        isCompleted
-                          ? 'bg-emerald-500/15 text-emerald-400 hover:bg-emerald-500/25'
-                          : 'bg-blue-500/15 text-blue-400 hover:bg-blue-500/25'
-                      } cursor-pointer`}
-                      title={
-                        depTask
-                          ? `${formatTaskDisplayLabel(depTask)}: ${depTask.subject}`
-                          : `#${deriveTaskDisplayId(id)}`
-                      }
-                      onClick={() => handleDependencyClick(id)}
-                    >
-                      {depTask ? formatTaskDisplayLabel(depTask) : `#${deriveTaskDisplayId(id)}`}
-                    </button>
-                  );
-                })}
-              </div>
-            ) : null}
-
-            {/* Related tasks (explicit) */}
-            {relatedIds.length > 0 || relatedByIds.length > 0 ? (
+            {editingDescription ? (
               <div className="space-y-2">
-                <div className="flex items-center gap-1.5 text-xs font-medium text-[var(--color-text-muted)]">
-                  <Link2 size={12} />
-                  Related tasks
+                <div className="flex items-center gap-2">
+                  <button
+                    type="button"
+                    className={`flex items-center gap-1 rounded px-2 py-1 text-xs transition-colors ${
+                      !descriptionPreview
+                        ? 'bg-[var(--color-surface-raised)] text-[var(--color-text)]'
+                        : 'text-[var(--color-text-muted)] hover:text-[var(--color-text-secondary)]'
+                    }`}
+                    onClick={() => setDescriptionPreview(false)}
+                  >
+                    <Pencil size={12} />
+                    Edit
+                  </button>
+                  <button
+                    type="button"
+                    className={`flex items-center gap-1 rounded px-2 py-1 text-xs transition-colors ${
+                      descriptionPreview
+                        ? 'bg-[var(--color-surface-raised)] text-[var(--color-text)]'
+                        : 'text-[var(--color-text-muted)] hover:text-[var(--color-text-secondary)]'
+                    }`}
+                    onClick={() => setDescriptionPreview(true)}
+                  >
+                    <Eye size={12} />
+                    Preview
+                  </button>
                 </div>
-
-                {relatedIds.length > 0 ? (
-                  <div className="flex flex-wrap items-center gap-1.5">
-                    <span className="text-xs text-[var(--color-text-muted)]">Links</span>
-                    {relatedIds.map((id) => {
-                      const depTask = taskMap.get(id);
-                      return (
-                        <button
-                          key={`related:${currentTask.id}:${id}`}
-                          type="button"
-                          className="inline-flex items-center rounded bg-purple-500/15 px-1.5 py-0.5 text-[10px] font-medium text-purple-300 transition-colors hover:bg-purple-500/25"
-                          title={
-                            depTask
-                              ? `${formatTaskDisplayLabel(depTask)}: ${depTask.subject}`
-                              : `#${deriveTaskDisplayId(id)}`
-                          }
-                          onClick={() => handleDependencyClick(id)}
-                        >
-                          {depTask
-                            ? formatTaskDisplayLabel(depTask)
-                            : `#${deriveTaskDisplayId(id)}`}
-                        </button>
-                      );
-                    })}
+                {descriptionPreview ? (
+                  <div className="max-h-[200px] overflow-y-auto rounded border border-[var(--color-border)] p-2">
+                    {descriptionDraft.trim() ? (
+                      <MarkdownViewer content={descriptionDraft} maxHeight="max-h-[180px]" />
+                    ) : (
+                      <p className="text-xs text-[var(--color-text-muted)]">Nothing to preview</p>
+                    )}
                   </div>
-                ) : null}
-
-                {relatedByIds.length > 0 ? (
-                  <div className="flex flex-wrap items-center gap-1.5">
-                    <span className="text-xs text-[var(--color-text-muted)]">Linked from</span>
-                    {relatedByIds.map((id) => {
-                      const depTask = taskMap.get(id);
-                      return (
-                        <button
-                          key={`related-by:${currentTask.id}:${id}`}
-                          type="button"
-                          className="inline-flex items-center rounded bg-fuchsia-500/15 px-1.5 py-0.5 text-[10px] font-medium text-fuchsia-300 transition-colors hover:bg-fuchsia-500/25"
-                          title={
-                            depTask
-                              ? `${formatTaskDisplayLabel(depTask)}: ${depTask.subject}`
-                              : `#${deriveTaskDisplayId(id)}`
-                          }
-                          onClick={() => handleDependencyClick(id)}
-                        >
-                          {depTask
-                            ? formatTaskDisplayLabel(depTask)
-                            : `#${deriveTaskDisplayId(id)}`}
-                        </button>
-                      );
-                    })}
-                  </div>
-                ) : null}
+                ) : (
+                  <Textarea
+                    autoFocus
+                    value={descriptionDraft}
+                    onChange={(e) => setDescriptionDraft(e.target.value)}
+                    disabled={savingDescription}
+                    rows={6}
+                    className="text-xs"
+                    placeholder="Task description (supports markdown)"
+                  />
+                )}
+                <div className="flex items-center gap-2">
+                  <Button
+                    size="sm"
+                    className="h-7 text-xs"
+                    disabled={savingDescription}
+                    onClick={() => void saveDescription()}
+                  >
+                    {savingDescription ? (
+                      <Loader2 size={12} className="mr-1 animate-spin" />
+                    ) : (
+                      <Check size={12} className="mr-1" />
+                    )}
+                    Save
+                  </Button>
+                  <Button
+                    variant="ghost"
+                    size="sm"
+                    className="h-7 text-xs"
+                    disabled={savingDescription}
+                    onClick={() => setEditingDescription(false)}
+                  >
+                    <X size={12} className="mr-1" />
+                    Cancel
+                  </Button>
+                </div>
               </div>
-            ) : null}
-
-            {/* Review info */}
-            {kanbanTaskState ? (
-              <div className="flex items-center gap-2">
-                {kanbanTaskState.reviewer ? (
-                  <span className="text-xs text-[var(--color-text-secondary)]">
-                    Reviewer: {kanbanTaskState.reviewer}
-                  </span>
-                ) : null}
-                {kanbanTaskState.errorDescription ? (
-                  <span className="text-xs text-red-400">{kanbanTaskState.errorDescription}</span>
-                ) : null}
+            ) : currentTask.description ? (
+              <div className="group relative">
+                <ExpandableContent collapsedHeight={200}>
+                  <MarkdownViewer content={currentTask.description} maxHeight="max-h-none" bare />
+                </ExpandableContent>
+                <Tooltip>
+                  <TooltipTrigger asChild>
+                    <button
+                      type="button"
+                      className="absolute right-0 top-0 rounded p-1 text-[var(--color-text-muted)] opacity-0 transition-opacity hover:bg-[var(--color-surface-raised)] hover:text-[var(--color-text)] group-hover:opacity-100"
+                      onClick={startEditDescription}
+                    >
+                      <Pencil size={12} />
+                    </button>
+                  </TooltipTrigger>
+                  <TooltipContent side="top">Edit description</TooltipContent>
+                </Tooltip>
               </div>
-            ) : null}
-          </div>
-        ) : null}
+            ) : (
+              <button
+                type="button"
+                className="text-xs text-[var(--color-text-muted)] transition-colors hover:text-[var(--color-text-secondary)]"
+                onClick={startEditDescription}
+              >
+                Click to add description...
+              </button>
+            )}
+          </CollapsibleTeamSection>
 
-        {/* Workflow History */}
-        {currentTask.historyEvents && currentTask.historyEvents.length > 0 ? (
+          {/* Attachments */}
           <CollapsibleTeamSection
-            title="Workflow History"
-            icon={<History size={14} />}
-            badge={currentTask.historyEvents.length}
+            title="Attachments"
+            icon={<ImageIcon size={14} />}
+            badge={
+              (currentTask.attachments?.length ?? 0) + commentImageAttachments.length > 0
+                ? (currentTask.attachments?.length ?? 0) + commentImageAttachments.length
+                : undefined
+            }
             contentClassName="pl-2.5"
             headerClassName="-mx-6 w-[calc(100%+3rem)]"
             headerContentClassName="pl-6"
-            defaultOpen={false}
+            defaultOpen={
+              (currentTask.attachments?.length ?? 0) > 0 || commentImageAttachments.length > 0
+            }
           >
-            <WorkflowTimeline events={currentTask.historyEvents} />
-          </CollapsibleTeamSection>
-        ) : null}
-
-        {/* Comments */}
-        <CollapsibleTeamSection
-          title="Comments"
-          icon={<MessageSquare size={14} />}
-          badge={
-            (currentTask.comments?.length ?? 0) > 0
-              ? (currentTask.comments?.length ?? 0)
-              : undefined
-          }
-          contentClassName="overflow-x-visible pl-0"
-          headerClassName="-mx-6 w-[calc(100%+3rem)]"
-          headerContentClassName="pl-6"
-          defaultOpen
-        >
-          <div className="pl-2.5">
-            <TaskCommentInput
+            <TaskAttachments
               teamName={teamName}
               taskId={currentTask.id}
-              members={members}
-              replyTo={effectiveReplyTo}
-              onClearReply={clearReply}
+              attachments={currentTask.attachments ?? []}
             />
-          </div>
-          <TaskCommentsSection
-            teamName={teamName}
-            taskId={currentTask.id}
-            comments={currentTask.comments ?? []}
-            members={members}
-            hideHeader
-            hideInput
-            onReply={handleReply}
-            onTaskIdClick={onScrollToTask ? (taskId) => handleDependencyClick(taskId) : undefined}
-            containerClassName="-mx-6"
-          />
-        </CollapsibleTeamSection>
+            {commentImageAttachments.length > 0 ? (
+              <CommentImagesGrid
+                items={commentImageAttachments}
+                teamName={teamName}
+                taskId={currentTask.id}
+              />
+            ) : null}
+          </CollapsibleTeamSection>
+
+          {/* Changes */}
+          {variant === 'team' && isTaskCompleted && onViewChanges ? (
+            <CollapsibleTeamSection
+              title="Changes"
+              icon={<FileDiff size={14} />}
+              badge={taskChangesFiles ? taskChangesFiles.length : undefined}
+              contentClassName="pl-2.5"
+              headerClassName="-mx-6 w-[calc(100%+3rem)]"
+              headerContentClassName="pl-6"
+              defaultOpen={taskKnownHasChanges}
+            >
+              {changeSetLoading || (!taskChangesFiles && taskKnownHasChanges) ? (
+                <div className="flex items-center gap-2 py-2 text-xs text-[var(--color-text-muted)]">
+                  <Loader2 size={14} className="animate-spin" />
+                  Loading changes...
+                </div>
+              ) : taskChangesFiles && taskChangesFiles.length > 0 ? (
+                <div className="max-h-[200px] space-y-0.5 overflow-y-auto">
+                  {taskChangesFiles.map((file) => (
+                    <div
+                      key={file.filePath}
+                      className="group flex w-full items-center gap-2 rounded px-2 py-1.5 text-left text-xs transition-colors hover:bg-[var(--color-surface-raised)]"
+                    >
+                      <FileIcon
+                        fileName={file.relativePath.split('/').pop() ?? file.relativePath}
+                        className="size-3.5"
+                      />
+                      <button
+                        type="button"
+                        className="min-w-0 flex-1 truncate text-left font-mono text-[var(--color-text-secondary)] transition-colors hover:text-[var(--color-text)]"
+                        onClick={() => {
+                          handleClose();
+                          onViewChanges(currentTask.id, file.filePath);
+                        }}
+                      >
+                        {file.relativePath}
+                      </button>
+                      <span className="flex shrink-0 items-center gap-1.5">
+                        {file.linesAdded > 0 ? (
+                          <span className="text-emerald-400">+{file.linesAdded}</span>
+                        ) : null}
+                        {file.linesRemoved > 0 ? (
+                          <span className="text-red-400">-{file.linesRemoved}</span>
+                        ) : null}
+                      </span>
+                      <span className="flex shrink-0 items-center gap-0.5 opacity-0 transition-opacity group-hover:opacity-100">
+                        <Tooltip>
+                          <TooltipTrigger asChild>
+                            <button
+                              type="button"
+                              className="rounded p-1 text-[var(--color-text-muted)] transition-colors hover:bg-[var(--color-border-emphasis)] hover:text-[var(--color-text)]"
+                              onClick={() => {
+                                handleClose();
+                                onViewChanges(currentTask.id, file.filePath);
+                              }}
+                            >
+                              <GitCompareArrows size={13} />
+                            </button>
+                          </TooltipTrigger>
+                          <TooltipContent side="top">Review diff</TooltipContent>
+                        </Tooltip>
+                        {onOpenInEditor ? (
+                          <Tooltip>
+                            <TooltipTrigger asChild>
+                              <button
+                                type="button"
+                                className="rounded p-1 text-[var(--color-text-muted)] transition-colors hover:bg-[var(--color-border-emphasis)] hover:text-[var(--color-text)]"
+                                onClick={() => onOpenInEditor(file.filePath)}
+                              >
+                                <SquarePen size={13} />
+                              </button>
+                            </TooltipTrigger>
+                            <TooltipContent side="top">Open in editor</TooltipContent>
+                          </Tooltip>
+                        ) : null}
+                      </span>
+                    </div>
+                  ))}
+                </div>
+              ) : (
+                <p className="text-xs text-[var(--color-text-muted)]">No file changes detected</p>
+              )}
+            </CollapsibleTeamSection>
+          ) : null}
+
+          {/* Execution Logs — sessions that reference this task */}
+          {variant === 'team' ? (
+            <CollapsibleTeamSection
+              title="Execution Logs"
+              icon={<ScrollText size={14} />}
+              headerExtra={
+                logsRefreshing || executionPreviewOnline ? (
+                  <span className="flex items-center gap-2 text-[10px] text-[var(--color-text-muted)]">
+                    {executionPreviewOnline ? (
+                      <span
+                        className="pointer-events-none relative inline-flex size-2 shrink-0"
+                        title="Online"
+                      >
+                        <span className="absolute inline-flex size-full animate-ping rounded-full bg-emerald-400 opacity-50" />
+                        <span className="relative inline-flex size-2 rounded-full bg-emerald-400" />
+                      </span>
+                    ) : null}
+                    {logsRefreshing ? (
+                      <span className="flex items-center gap-1">
+                        <Loader2 size={10} className="animate-spin" />
+                        Updating...
+                      </span>
+                    ) : null}
+                  </span>
+                ) : null
+              }
+              contentClassName="pl-2.5"
+              headerClassName="-mx-6 w-[calc(100%+3rem)]"
+              headerContentClassName="pl-6"
+              defaultOpen
+            >
+              <div className="min-w-0">
+                <MemberLogsTab
+                  teamName={teamName}
+                  taskId={currentTask.id}
+                  taskOwner={currentTask.owner}
+                  taskStatus={currentTask.status}
+                  taskWorkIntervals={currentTask.workIntervals}
+                  onRefreshingChange={setLogsRefreshing}
+                  // Only show a "latest messages" preview when this task is owned by a subagent.
+                  // For lead-owned tasks, the lead session is a mixed stream (lead + multiple agents),
+                  // so filtering to "just the member messages" is unreliable and easy to mislead.
+                  showSubagentPreview={Boolean(currentTask.owner) && !isLeadOwnedTask}
+                  // Temporary debug option: for lead-owned tasks, show quick preview from lead session.
+                  showLeadPreview={allowLeadExecutionPreview && isLeadOwnedTask}
+                  onPreviewOnlineChange={setExecutionPreviewOnline}
+                />
+              </div>
+            </CollapsibleTeamSection>
+          ) : null}
+
+          {blockedByIds.length > 0 ||
+          blocksIds.length > 0 ||
+          relatedIds.length > 0 ||
+          relatedByIds.length > 0 ||
+          kanbanTaskState ? (
+            <div className="space-y-2">
+              {/* Dependencies */}
+              {blockedByIds.length > 0 ? (
+                <div className="flex flex-wrap items-center gap-1.5">
+                  <span className="inline-flex items-center gap-0.5 text-xs text-yellow-300">
+                    <ArrowLeftFromLine size={12} />
+                    Blocked by
+                  </span>
+                  {blockedByIds.map((id) => {
+                    const depTask = taskMap.get(id);
+                    const isCompleted = depTask?.status === 'completed';
+                    return (
+                      <button
+                        key={id}
+                        type="button"
+                        className={`inline-flex items-center rounded px-1.5 py-0.5 text-[10px] font-medium transition-colors ${
+                          isCompleted
+                            ? 'bg-emerald-500/15 text-emerald-400 hover:bg-emerald-500/25'
+                            : 'bg-yellow-500/15 text-yellow-300 hover:bg-yellow-500/25'
+                        } cursor-pointer`}
+                        title={
+                          depTask
+                            ? `${formatTaskDisplayLabel(depTask)}: ${depTask.subject}`
+                            : `#${deriveTaskDisplayId(id)}`
+                        }
+                        onClick={() => handleDependencyClick(id)}
+                      >
+                        {depTask ? formatTaskDisplayLabel(depTask) : `#${deriveTaskDisplayId(id)}`}
+                      </button>
+                    );
+                  })}
+                </div>
+              ) : null}
+
+              {blocksIds.length > 0 ? (
+                <div className="flex flex-wrap items-center gap-1.5">
+                  <span className="inline-flex items-center gap-0.5 text-xs text-blue-400">
+                    <ArrowRightFromLine size={12} />
+                    Blocks
+                  </span>
+                  {blocksIds.map((id) => {
+                    const depTask = taskMap.get(id);
+                    const isCompleted = depTask?.status === 'completed';
+                    return (
+                      <button
+                        key={id}
+                        type="button"
+                        className={`inline-flex items-center rounded px-1.5 py-0.5 text-[10px] font-medium transition-colors ${
+                          isCompleted
+                            ? 'bg-emerald-500/15 text-emerald-400 hover:bg-emerald-500/25'
+                            : 'bg-blue-500/15 text-blue-400 hover:bg-blue-500/25'
+                        } cursor-pointer`}
+                        title={
+                          depTask
+                            ? `${formatTaskDisplayLabel(depTask)}: ${depTask.subject}`
+                            : `#${deriveTaskDisplayId(id)}`
+                        }
+                        onClick={() => handleDependencyClick(id)}
+                      >
+                        {depTask ? formatTaskDisplayLabel(depTask) : `#${deriveTaskDisplayId(id)}`}
+                      </button>
+                    );
+                  })}
+                </div>
+              ) : null}
+
+              {/* Related tasks (explicit) */}
+              {relatedIds.length > 0 || relatedByIds.length > 0 ? (
+                <div className="space-y-2">
+                  <div className="flex items-center gap-1.5 text-xs font-medium text-[var(--color-text-muted)]">
+                    <Link2 size={12} />
+                    Related tasks
+                  </div>
+
+                  {relatedIds.length > 0 ? (
+                    <div className="flex flex-wrap items-center gap-1.5">
+                      <span className="text-xs text-[var(--color-text-muted)]">Links</span>
+                      {relatedIds.map((id) => {
+                        const depTask = taskMap.get(id);
+                        return (
+                          <button
+                            key={`related:${currentTask.id}:${id}`}
+                            type="button"
+                            className="inline-flex items-center rounded bg-purple-500/15 px-1.5 py-0.5 text-[10px] font-medium text-purple-300 transition-colors hover:bg-purple-500/25"
+                            title={
+                              depTask
+                                ? `${formatTaskDisplayLabel(depTask)}: ${depTask.subject}`
+                                : `#${deriveTaskDisplayId(id)}`
+                            }
+                            onClick={() => handleDependencyClick(id)}
+                          >
+                            {depTask
+                              ? formatTaskDisplayLabel(depTask)
+                              : `#${deriveTaskDisplayId(id)}`}
+                          </button>
+                        );
+                      })}
+                    </div>
+                  ) : null}
+
+                  {relatedByIds.length > 0 ? (
+                    <div className="flex flex-wrap items-center gap-1.5">
+                      <span className="text-xs text-[var(--color-text-muted)]">Linked from</span>
+                      {relatedByIds.map((id) => {
+                        const depTask = taskMap.get(id);
+                        return (
+                          <button
+                            key={`related-by:${currentTask.id}:${id}`}
+                            type="button"
+                            className="inline-flex items-center rounded bg-fuchsia-500/15 px-1.5 py-0.5 text-[10px] font-medium text-fuchsia-300 transition-colors hover:bg-fuchsia-500/25"
+                            title={
+                              depTask
+                                ? `${formatTaskDisplayLabel(depTask)}: ${depTask.subject}`
+                                : `#${deriveTaskDisplayId(id)}`
+                            }
+                            onClick={() => handleDependencyClick(id)}
+                          >
+                            {depTask
+                              ? formatTaskDisplayLabel(depTask)
+                              : `#${deriveTaskDisplayId(id)}`}
+                          </button>
+                        );
+                      })}
+                    </div>
+                  ) : null}
+                </div>
+              ) : null}
+
+              {/* Review info */}
+              {kanbanTaskState ? (
+                <div className="flex items-center gap-2">
+                  {kanbanTaskState.reviewer ? (
+                    <span className="text-xs text-[var(--color-text-secondary)]">
+                      Reviewer: {kanbanTaskState.reviewer}
+                    </span>
+                  ) : null}
+                  {kanbanTaskState.errorDescription ? (
+                    <span className="text-xs text-red-400">{kanbanTaskState.errorDescription}</span>
+                  ) : null}
+                </div>
+              ) : null}
+            </div>
+          ) : null}
+
+          {/* Workflow History */}
+          {currentTask.historyEvents && currentTask.historyEvents.length > 0 ? (
+            <CollapsibleTeamSection
+              title="Workflow History"
+              icon={<History size={14} />}
+              badge={currentTask.historyEvents.length}
+              contentClassName="pl-2.5"
+              headerClassName="-mx-6 w-[calc(100%+3rem)]"
+              headerContentClassName="pl-6"
+              defaultOpen={false}
+            >
+              <WorkflowTimeline events={currentTask.historyEvents} memberColorMap={colorMap} />
+            </CollapsibleTeamSection>
+          ) : null}
+
+          {/* Comments */}
+          <CollapsibleTeamSection
+            title="Comments"
+            icon={<MessageSquare size={14} />}
+            badge={
+              (currentTask.comments?.length ?? 0) > 0
+                ? (currentTask.comments?.length ?? 0)
+                : undefined
+            }
+            contentClassName="overflow-x-visible pl-0"
+            headerClassName="-mx-6 w-[calc(100%+3rem)]"
+            headerContentClassName="pl-6"
+            defaultOpen
+          >
+            <div className="pl-2.5">
+              <TaskCommentInput
+                teamName={teamName}
+                taskId={currentTask.id}
+                members={members}
+                replyTo={effectiveReplyTo}
+                onClearReply={clearReply}
+              />
+            </div>
+            <TaskCommentsSection
+              teamName={teamName}
+              taskId={currentTask.id}
+              comments={currentTask.comments ?? []}
+              members={members}
+              hideHeader
+              hideInput
+              onReply={handleReply}
+              onTaskIdClick={onScrollToTask ? (taskId) => handleDependencyClick(taskId) : undefined}
+              containerClassName="-mx-6"
+              unreadCommentIds={unreadSnapshotRef.current}
+            />
+          </CollapsibleTeamSection>
+        </LightboxLockProvider>
       </DialogContent>
     </Dialog>
   );
diff --git a/src/renderer/components/team/members/MemberDraftRow.tsx b/src/renderer/components/team/members/MemberDraftRow.tsx
index e8e86c5b..e8eddd8a 100644
--- a/src/renderer/components/team/members/MemberDraftRow.tsx
+++ b/src/renderer/components/team/members/MemberDraftRow.tsx
@@ -9,7 +9,7 @@ import { getTeamColorSet } from '@renderer/constants/teamColors';
 import { useDraftPersistence } from '@renderer/hooks/useDraftPersistence';
 import { useFileListCacheWarmer } from '@renderer/hooks/useFileListCacheWarmer';
 import { reconcileChips, removeChipTokenFromText } from '@renderer/utils/chipUtils';
-import { getMemberColor } from '@shared/constants/memberColors';
+import { getMemberColorByName } from '@shared/constants/memberColors';
 import { ChevronDown, ChevronRight, Info } from 'lucide-react';
 
 import type { MemberDraft } from './membersEditorTypes';
@@ -47,7 +47,9 @@ export const MemberDraftRow = ({
   projectPath,
   mentionSuggestions = [],
 }: MemberDraftRowProps): React.JSX.Element => {
-  const memberColorSet = getTeamColorSet(getMemberColor(index));
+  const memberColorSet = getTeamColorSet(
+    getMemberColorByName(member.name.trim() || `member-${index}`)
+  );
   const [workflowExpanded, setWorkflowExpanded] = useState(false);
   const [modelExpanded, setModelExpanded] = useState(false);
 
diff --git a/src/renderer/components/team/members/MembersEditorSection.tsx b/src/renderer/components/team/members/MembersEditorSection.tsx
index 06122f27..7a435ad2 100644
--- a/src/renderer/components/team/members/MembersEditorSection.tsx
+++ b/src/renderer/components/team/members/MembersEditorSection.tsx
@@ -3,7 +3,7 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { Button } from '@renderer/components/ui/button';
 import { Label } from '@renderer/components/ui/label';
 import { CUSTOM_ROLE, NO_ROLE, PRESET_ROLES } from '@renderer/constants/teamRoles';
-import { getMemberColor } from '@shared/constants/memberColors';
+import { getMemberColorByName } from '@shared/constants/memberColors';
 
 import { MembersJsonEditor } from '../dialogs/MembersJsonEditor';
 
@@ -154,7 +154,7 @@ export const MembersEditorSection = ({
     () =>
       members
         .filter((m) => m.name.trim())
-        .map((m, i) => ({
+        .map((m) => ({
           id: m.id,
           name: m.name.trim(),
           subtitle:
@@ -163,7 +163,7 @@ export const MembersEditorSection = ({
               : m.roleSelection && m.roleSelection !== NO_ROLE
                 ? m.roleSelection
                 : undefined,
-          color: getMemberColor(i),
+          color: getMemberColorByName(m.name.trim()),
         })),
     [members]
   );
diff --git a/src/renderer/index.css b/src/renderer/index.css
index 1d324ac9..06f8bcbd 100644
--- a/src/renderer/index.css
+++ b/src/renderer/index.css
@@ -243,6 +243,12 @@
   --step-warning-text: #fde68a;
   --step-warning-border: rgba(245, 158, 11, 0.4);
   --step-warning-bg: rgba(245, 158, 11, 0.1);
+
+  /* Collapsible section backgrounds (sidebar) */
+  --color-section-bg: rgba(255, 255, 255, 0.04);
+  --color-section-bg-open: rgba(255, 255, 255, 0.07);
+  --color-section-hover: rgba(255, 255, 255, 0.08);
+  --color-section-hover-open: rgba(255, 255, 255, 0.1);
 }
 
 /* File icon glow — halo so dark icons stay visible on dark backgrounds */
@@ -490,6 +496,12 @@
   --step-warning-text: #b45309;
   --step-warning-border: rgba(180, 83, 9, 0.4);
   --step-warning-bg: rgba(245, 158, 11, 0.1);
+
+  /* Collapsible section backgrounds (sidebar) */
+  --color-section-bg: rgba(0, 0, 0, 0.04);
+  --color-section-bg-open: rgba(0, 0, 0, 0.07);
+  --color-section-hover: rgba(0, 0, 0, 0.08);
+  --color-section-hover-open: rgba(0, 0, 0, 0.1);
 }
 
 /* rehype-highlight (highlight.js) — map hljs classes to app theme variables */
diff --git a/src/renderer/services/commentReadStorage.ts b/src/renderer/services/commentReadStorage.ts
index 26578d91..b96d27be 100644
--- a/src/renderer/services/commentReadStorage.ts
+++ b/src/renderer/services/commentReadStorage.ts
@@ -7,8 +7,32 @@ const STALE_THRESHOLD_MS = 30 * 24 * 60 * 60 * 1000; // 30 days
 
 type ReadState = Record<string, number>; // key = "teamName/taskId", value = timestamp
 
-let cache: ReadState = {};
-let loaded = false;
+// --- localStorage fallback ---
+function lsLoad(): ReadState | null {
+  try {
+    const raw = localStorage.getItem(LS_KEY);
+    if (!raw) return null;
+    const parsed: unknown = JSON.parse(raw);
+    return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
+      ? (parsed as ReadState)
+      : null;
+  } catch {
+    return null;
+  }
+}
+
+function lsSave(state: ReadState): void {
+  try {
+    localStorage.setItem(LS_KEY, JSON.stringify(state));
+  } catch {
+    // localStorage full or unavailable — silently ignore
+  }
+}
+
+// Synchronous init from localStorage — guarantees first render sees read state
+const lsInitial = lsLoad();
+let cache: ReadState = lsInitial ?? {};
+let loaded = lsInitial !== null && Object.keys(lsInitial).length > 0;
 let idbAvailable = true; // flips to false on first IndexedDB failure
 let saveTimer: ReturnType<typeof setTimeout> | null = null;
 const listeners = new Set<() => void>();
@@ -48,26 +72,10 @@ export function getUnreadCount(
   return comments.filter((c) => new Date(c.createdAt).getTime() > lastRead).length;
 }
 
-// --- localStorage fallback ---
-function lsLoad(): ReadState | null {
-  try {
-    const raw = localStorage.getItem(LS_KEY);
-    if (!raw) return null;
-    const parsed: unknown = JSON.parse(raw);
-    return parsed && typeof parsed === 'object' && !Array.isArray(parsed)
-      ? (parsed as ReadState)
-      : null;
-  } catch {
-    return null;
-  }
-}
-
-function lsSave(state: ReadState): void {
-  try {
-    localStorage.setItem(LS_KEY, JSON.stringify(state));
-  } catch {
-    // localStorage full or unavailable — silently ignore
-  }
+/** Return the last-read timestamp for a team/task pair (0 if never read). */
+export function getLastReadTimestamp(teamName: string, taskId: string): number {
+  const key = `${teamName}/${taskId}`;
+  return cache[key] ?? 0;
 }
 
 // --- Internal ---
@@ -90,41 +98,38 @@ function scheduleSave(): void {
 async function load(): Promise<void> {
   if (loaded) return;
 
-  // Try IndexedDB first
+  // IDB may have fresher data — merge with max timestamp per key
   if (hasIndexedDB() && idbAvailable) {
     try {
       const stored = await get<ReadState>(IDB_KEY);
       if (stored && typeof stored === 'object') {
-        cache = { ...stored, ...cache };
+        const merged = { ...cache };
+        for (const [k, v] of Object.entries(stored)) {
+          merged[k] = Math.max(merged[k] ?? 0, v);
+        }
+        cache = merged;
         notify();
       }
-      loaded = true;
-      return;
     } catch {
-      // IndexedDB broken — fall back to localStorage silently
       idbAvailable = false;
     }
   }
 
-  // Fallback: localStorage
-  const stored = lsLoad();
-  if (stored) {
-    cache = { ...stored, ...cache };
-    notify();
-  }
   loaded = true;
 }
 
 async function save(): Promise<void> {
+  // Always write to localStorage (sync, reliable)
+  lsSave(cache);
+
+  // Also write to IndexedDB (async, primary)
   if (idbAvailable && hasIndexedDB()) {
     try {
       await set(IDB_KEY, cache);
-      return;
     } catch {
       idbAvailable = false;
     }
   }
-  lsSave(cache);
 }
 
 export async function cleanupStale(): Promise<void> {
@@ -142,20 +147,20 @@ export async function cleanupStale(): Promise<void> {
     return { cleaned: result, changed };
   };
 
+  const { cleaned, changed } = clean(cache);
+  if (!changed) return;
+
+  // Update in-memory cache
+  cache = cleaned;
+  notify();
+
+  // Persist to both storages
+  lsSave(cleaned);
   if (idbAvailable && hasIndexedDB()) {
     try {
-      const stored = await get<ReadState>(IDB_KEY);
-      if (!stored) return;
-      const { cleaned, changed } = clean(stored);
-      if (changed) await set(IDB_KEY, cleaned);
-      return;
+      await set(IDB_KEY, cleaned);
     } catch {
       idbAvailable = false;
     }
   }
-
-  const stored = lsLoad();
-  if (!stored) return;
-  const { cleaned, changed } = clean(stored);
-  if (changed) lsSave(cleaned);
 }
diff --git a/src/renderer/utils/memberHelpers.ts b/src/renderer/utils/memberHelpers.ts
index 8fb8c53b..7d10a8e9 100644
--- a/src/renderer/utils/memberHelpers.ts
+++ b/src/renderer/utils/memberHelpers.ts
@@ -1,4 +1,4 @@
-import { getMemberColor, MEMBER_COLOR_PALETTE } from '@shared/constants/memberColors';
+import { getMemberColorByName, MEMBER_COLOR_PALETTE } from '@shared/constants/memberColors';
 
 import type {
   LeadActivityState,
@@ -95,29 +95,31 @@ export function buildMemberColorMap(members: MemberColorInput[]): Map<string, st
   const usedColors = new Set<string>();
 
   const paletteSize = MEMBER_COLOR_PALETTE.length;
-  let nextFallback = 0;
   for (const member of active) {
     let color = member.color;
     if (!color || usedColors.has(color)) {
-      // Search for an unused palette color, but cap iterations to avoid
-      // an infinite loop when there are more members than palette colors.
-      const searchStart = nextFallback;
-      while (usedColors.has(getMemberColor(nextFallback))) {
-        nextFallback++;
-        if (nextFallback - searchStart >= paletteSize) {
-          // All palette colors exhausted — reuse by cycling
-          break;
+      // Deterministic fallback: hash the member name to a palette color.
+      // If that color is already taken, linear-probe for the next free one.
+      color = getMemberColorByName(member.name);
+      if (usedColors.has(color)) {
+        const startIdx = MEMBER_COLOR_PALETTE.indexOf(
+          color as (typeof MEMBER_COLOR_PALETTE)[number]
+        );
+        for (let offset = 1; offset < paletteSize; offset++) {
+          const candidate = MEMBER_COLOR_PALETTE[(startIdx + offset) % paletteSize];
+          if (!usedColors.has(candidate)) {
+            color = candidate;
+            break;
+          }
         }
       }
-      color = getMemberColor(nextFallback);
-      nextFallback++;
     }
     map.set(member.name, color);
     usedColors.add(color);
   }
 
   for (let i = 0; i < removed.length; i++) {
-    map.set(removed[i].name, removed[i].color ?? getMemberColor(active.length + i));
+    map.set(removed[i].name, removed[i].color ?? getMemberColorByName(removed[i].name));
   }
 
   map.set('user', 'user');
diff --git a/src/shared/constants/memberColors.ts b/src/shared/constants/memberColors.ts
index 79079fef..3d2fe442 100644
--- a/src/shared/constants/memberColors.ts
+++ b/src/shared/constants/memberColors.ts
@@ -90,3 +90,24 @@ export type MemberColorName = (typeof MEMBER_COLOR_PALETTE)[number];
 export function getMemberColor(index: number): string {
   return MEMBER_COLOR_PALETTE[index % MEMBER_COLOR_PALETTE.length];
 }
+
+/**
+ * Simple deterministic hash for a string → non-negative integer.
+ * Uses djb2 algorithm for good distribution across the palette.
+ */
+function hashStringToIndex(str: string): number {
+  let hash = 5381;
+  for (let i = 0; i < str.length; i++) {
+    hash = ((hash << 5) + hash + str.charCodeAt(i)) | 0;
+  }
+  return Math.abs(hash);
+}
+
+/**
+ * Get a stable color for a member name.
+ * The color is deterministic — same name always maps to the same palette entry,
+ * regardless of member order or team size.
+ */
+export function getMemberColorByName(name: string): string {
+  return MEMBER_COLOR_PALETTE[hashStringToIndex(name) % MEMBER_COLOR_PALETTE.length];
+}
diff --git a/test/main/services/team/TeamMemberResolver.test.ts b/test/main/services/team/TeamMemberResolver.test.ts
index bd51b928..d2c17f5e 100644
--- a/test/main/services/team/TeamMemberResolver.test.ts
+++ b/test/main/services/team/TeamMemberResolver.test.ts
@@ -2,7 +2,12 @@ import { describe, expect, it } from 'vitest';
 
 import { TeamMemberResolver } from '../../../../src/main/services/team/TeamMemberResolver';
 
-import type { InboxMessage, TeamConfig, TeamTask } from '../../../../src/shared/types/team';
+import type {
+  InboxMessage,
+  TeamConfig,
+  TeamTask,
+  TeamTaskWithKanban,
+} from '../../../../src/shared/types/team';
 
 describe('TeamMemberResolver', () => {
   it('builds roster from config + meta + inbox only', () => {
@@ -65,4 +70,74 @@ describe('TeamMemberResolver', () => {
     expect(names).toContain('team-lead');
     expect(names).toContain('alice');
   });
+
+  it('sets currentTaskId for in_progress task', () => {
+    const resolver = new TeamMemberResolver();
+    const config: TeamConfig = {
+      name: 'Team',
+      members: [{ name: 'bob', agentType: 'general-purpose' }],
+    };
+    const tasks: TeamTaskWithKanban[] = [
+      { id: 't1', subject: 'Work', status: 'in_progress', owner: 'bob' },
+    ];
+    const members = resolver.resolveMembers(config, [], [], tasks, []);
+    const bob = members.find((m) => m.name === 'bob');
+    expect(bob?.currentTaskId).toBe('t1');
+  });
+
+  it('clears currentTaskId when task is approved via kanbanColumn', () => {
+    const resolver = new TeamMemberResolver();
+    const config: TeamConfig = {
+      name: 'Team',
+      members: [{ name: 'bob', agentType: 'general-purpose' }],
+    };
+    const tasks: TeamTaskWithKanban[] = [
+      {
+        id: 't1',
+        subject: 'Work',
+        status: 'in_progress',
+        owner: 'bob',
+        reviewState: 'approved',
+        kanbanColumn: 'approved',
+      },
+    ];
+    const members = resolver.resolveMembers(config, [], [], tasks, []);
+    const bob = members.find((m) => m.name === 'bob');
+    expect(bob?.currentTaskId).toBeNull();
+  });
+
+  it('clears currentTaskId when task reviewState is approved even without kanbanColumn', () => {
+    const resolver = new TeamMemberResolver();
+    const config: TeamConfig = {
+      name: 'Team',
+      members: [{ name: 'bob', agentType: 'general-purpose' }],
+    };
+    const tasks: TeamTaskWithKanban[] = [
+      {
+        id: 't1',
+        subject: 'Work',
+        status: 'in_progress',
+        owner: 'bob',
+        reviewState: 'approved',
+        // kanbanColumn not set — stale data scenario
+      },
+    ];
+    const members = resolver.resolveMembers(config, [], [], tasks, []);
+    const bob = members.find((m) => m.name === 'bob');
+    expect(bob?.currentTaskId).toBeNull();
+  });
+
+  it('clears currentTaskId when task status is completed', () => {
+    const resolver = new TeamMemberResolver();
+    const config: TeamConfig = {
+      name: 'Team',
+      members: [{ name: 'bob', agentType: 'general-purpose' }],
+    };
+    const tasks: TeamTaskWithKanban[] = [
+      { id: 't1', subject: 'Work', status: 'completed', owner: 'bob' },
+    ];
+    const members = resolver.resolveMembers(config, [], [], tasks, []);
+    const bob = members.find((m) => m.name === 'bob');
+    expect(bob?.currentTaskId).toBeNull();
+  });
 });
diff --git a/test/main/services/team/TeamProvisioningServiceLiveMessages.test.ts b/test/main/services/team/TeamProvisioningServiceLiveMessages.test.ts
index 06f2f8f4..950e0401 100644
--- a/test/main/services/team/TeamProvisioningServiceLiveMessages.test.ts
+++ b/test/main/services/team/TeamProvisioningServiceLiveMessages.test.ts
@@ -42,6 +42,22 @@ const hoisted = vi.hoisted(() => {
       files.set(p, JSON.stringify(rows));
       return message;
     }),
+    sendInboxMessage: vi.fn(
+      (teamName: string, message: Record<string, unknown>) => {
+        const member =
+          typeof message.member === 'string'
+            ? message.member
+            : typeof message.to === 'string'
+              ? message.to
+              : 'unknown';
+        const p = `/mock/teams/${teamName}/inboxes/${member}.json`;
+        const current = files.get(p);
+        const rows = current ? (JSON.parse(current) as unknown[]) : [];
+        rows.push(message);
+        files.set(p, JSON.stringify(rows));
+        return { deliveredToInbox: true, messageId: 'mock-id', message };
+      }
+    ),
   };
 });
 
@@ -67,6 +83,8 @@ vi.mock('agent-teams-controller', () => ({
     messages: {
       appendSentMessage: (message: Record<string, unknown>) =>
         hoisted.appendSentMessage(teamName, message),
+      sendMessage: (message: Record<string, unknown>) =>
+        hoisted.sendInboxMessage(teamName, message),
     },
   }),
 }));
@@ -146,6 +164,7 @@ describe('TeamProvisioningService pre-ready live messages', () => {
   beforeEach(() => {
     hoisted.files.clear();
     hoisted.appendSentMessage.mockClear();
+    hoisted.sendInboxMessage.mockClear();
   });
 
   it('pre-ready assistant text is added to liveLeadProcessMessages', () => {
@@ -301,7 +320,9 @@ describe('TeamProvisioningService pre-ready live messages', () => {
     expect(live[0].to).toBe('team-lead');
     expect(live[0].text).toBe('Need clarification on #abcd1234');
     expect(live[0].source).toBe('lead_process');
-    expect(hoisted.appendSentMessage).toHaveBeenCalledTimes(1);
+    // Non-user recipient → delivered to inbox, not sentMessages
+    expect(hoisted.sendInboxMessage).toHaveBeenCalledTimes(1);
+    expect(hoisted.appendSentMessage).not.toHaveBeenCalled();
   });
 
   it('post-ready path also uses the unified helper', () => {
@@ -325,4 +346,80 @@ describe('TeamProvisioningService pre-ready live messages', () => {
       expect.objectContaining({ type: 'lead-message', teamName: 'my-team' })
     );
   });
+
+  it('SendMessage(to:teammate) creates inbox row and emits inbox detail for recipient', () => {
+    const service = new TeamProvisioningService();
+    seedConfig('my-team');
+    const emitter = vi.fn<(event: TeamChangeEvent) => void>();
+    service.setTeamChangeEmitter(emitter);
+    const run = attachRun(service, 'my-team', { provisioningComplete: true });
+
+    callHandleStreamJsonMessage(service, run, {
+      type: 'assistant',
+      content: [
+        {
+          type: 'tool_use',
+          name: 'SendMessage',
+          input: {
+            type: 'message',
+            recipient: 'alice',
+            content: 'Please check the migration.',
+            summary: 'Migration check',
+          },
+        },
+      ],
+    });
+
+    // Delivered to recipient inbox, not sentMessages
+    expect(hoisted.sendInboxMessage).toHaveBeenCalledTimes(1);
+    expect(hoisted.sendInboxMessage).toHaveBeenCalledWith(
+      'my-team',
+      expect.objectContaining({ member: 'alice' })
+    );
+    expect(hoisted.appendSentMessage).not.toHaveBeenCalled();
+
+    // Emits inbox event for the specific recipient
+    expect(emitter).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'inbox',
+        teamName: 'my-team',
+        detail: 'inboxes/alice.json',
+      })
+    );
+  });
+
+  it('SendMessage(to:user) still persists to sentMessages.json', () => {
+    const service = new TeamProvisioningService();
+    seedConfig('my-team');
+    const emitter = vi.fn<(event: TeamChangeEvent) => void>();
+    service.setTeamChangeEmitter(emitter);
+    const run = attachRun(service, 'my-team', { provisioningComplete: true });
+
+    callHandleStreamJsonMessage(service, run, {
+      type: 'assistant',
+      content: [
+        {
+          type: 'tool_use',
+          name: 'SendMessage',
+          input: {
+            type: 'message',
+            recipient: 'user',
+            content: 'Task completed!',
+            summary: 'Done',
+          },
+        },
+      ],
+    });
+
+    expect(hoisted.appendSentMessage).toHaveBeenCalledTimes(1);
+    expect(hoisted.sendInboxMessage).not.toHaveBeenCalled();
+
+    expect(emitter).toHaveBeenCalledWith(
+      expect.objectContaining({
+        type: 'inbox',
+        teamName: 'my-team',
+        detail: 'sentMessages.json',
+      })
+    );
+  });
 });
diff --git a/test/main/services/team/TeamProvisioningServiceRelay.test.ts b/test/main/services/team/TeamProvisioningServiceRelay.test.ts
index f0771c04..ea9a241f 100644
--- a/test/main/services/team/TeamProvisioningServiceRelay.test.ts
+++ b/test/main/services/team/TeamProvisioningServiceRelay.test.ts
@@ -50,6 +50,22 @@ const hoisted = vi.hoisted(() => {
       files.set(sentMessagesPath, JSON.stringify(rows));
       return message;
     }),
+    sendInboxMessage: vi.fn(
+      (teamName: string, message: Record<string, unknown>) => {
+        const member =
+          typeof message.member === 'string'
+            ? message.member
+            : typeof message.to === 'string'
+              ? message.to
+              : 'unknown';
+        const p = `/mock/teams/${teamName}/inboxes/${member}.json`;
+        const current = files.get(p);
+        const rows = current ? (JSON.parse(current) as unknown[]) : [];
+        rows.push(message);
+        files.set(p, JSON.stringify(rows));
+        return { deliveredToInbox: true, messageId: 'mock-id', message };
+      }
+    ),
     setAtomicWriteShouldFail: (next: boolean) => {
       atomicWriteShouldFail = next;
     },
@@ -85,6 +101,8 @@ vi.mock('agent-teams-controller', () => ({
     messages: {
       appendSentMessage: (message: Record<string, unknown>) =>
         hoisted.appendSentMessage(teamName, message),
+      sendMessage: (message: Record<string, unknown>) =>
+        hoisted.sendInboxMessage(teamName, message),
     },
   }),
 }));