feat(web-shell): improve thinking and tool progress display

docs/design/web-shell-thinking-and-tool-progress.md

@@ -0,0 +1,17 @@
+# Web Shell compact mode and tool progress
+
+## Goal
+
+Update the existing Web Shell compact mode to hide transcript thinking without changing model behavior, make parallel tool summaries describe every active foreground tool until all tools finish, and keep thinking/tool elapsed times stable across transcript replay.
+
+## Design
+
+`App` keeps the existing `Ctrl+O` compact-mode shortcut, context, Help terminology, and `ui.compactMode` workspace-setting write. Compact mode no longer switches message bodies to their old condensed cards. Instead, `MessageList` removes thinking rows only from its rendered item list, leaving the transcript and model behavior unchanged.
+
+In compact mode, regular tool groups separated only by hidden thinking are merged within the same activity sequence. Outside compact mode, visible thinking preserves the original interleaved transcript order. User, assistant, system, plan, approval, agent, todo, and question UI boundaries remain separate. Running tool summaries are derived from all active foreground tools and reuse the existing tool descriptions. Completed summaries remain unchanged and appear only after no tool is active. Expanded tool rows reuse the existing tool-kind icons.
+
+Transcript blocks retain the first and latest daemon timestamps. When a block carries an authoritative pair with a positive elapsed interval, thinking and tool messages keep the daemon-measured duration but anchor it onto the client clock, so every start/end timestamp stays in one domain and remains comparable across tools. Live durations use the same projection, avoiding mixed-clock subtraction while still surviving transcript replay. Legacy and partial records without a usable daemon pair use the client-time pair. Consecutive thinking blocks merge regardless of which timing source produced them, accumulating each block's own duration.
+
+## Compatibility
+
+The existing compact-mode concept and persistence path remain unchanged. No new setting, URL parameter, public transcript prop, or `localStorage` key is introduced. The read-only `WebShellTranscript` remains outside compact mode.

packages/sdk-typescript/src/daemon/ui/transcript.ts

@@ -292,7 +292,7 @@ function applyDaemonTranscriptEvent(
       // those reasons; the post-reconnect `tool_call_update` stream
       // will deliver the real terminal status.
       if (event.reason === 'cancelled' || event.reason === 'error') {
-        propagateCancellationToInFlightTools(next);
+        propagateCancellationToInFlightTools(next, event);
       }
       break;
     case 'assistant.usage':
@@ -376,7 +376,7 @@ function applyDaemonTranscriptEvent(
       // UIs don't show a tool spinning forever after a peer cancel.
       // Idempotent — safe if the daemon also later emits terminal
       // tool_call_update frames.
-      propagateCancellationToInFlightTools(next);
+      propagateCancellationToInFlightTools(next, event);
       if (event.reason !== 'forward_failed') {
         appendPromptCancelledBlock(next, event);
       }
@@ -444,7 +444,7 @@ function handleStateResyncRequired(
     lastDeliveredId: event.lastDeliveredId,
     earliestAvailableId: event.earliestAvailableId,
   };
-  propagateCancellationToInFlightTools(state);
+  propagateCancellationToInFlightTools(state, event);
   appendStatusBlock(
     state,
     'error',
@@ -498,11 +498,15 @@ function finalizeStreamingTextBlock(
     if (event?.eventId !== undefined) block.eventId = event.eventId;
     // Preserve the text event's own timestamp during history replay; later
     // finalize/status events can be much newer and would skew message times.
-    if (
-      block.serverTimestamp === undefined &&
-      event?.serverTimestamp !== undefined
-    ) {
-      block.serverTimestamp = event.serverTimestamp;
+    if (event?.serverTimestamp !== undefined) {
+      if (block.serverTimestamp === undefined) {
+        // Degraded-record fallback: the block was never stamped while
+        // streaming, so the terminator's stamp approximates its first
+        // observed time rather than being the true start.
+        block.serverTimestamp = event.serverTimestamp;
+      } else {
+        block.serverUpdatedAt = event.serverTimestamp;
+      }
     }
   }
 }
@@ -650,7 +654,8 @@ function appendTextDelta(
     existing.updatedAt = state.now;
     if (event.eventId !== undefined) existing.eventId = event.eventId;
     if (event.serverTimestamp !== undefined) {
-      existing.serverTimestamp = event.serverTimestamp;
+      existing.serverTimestamp ??= event.serverTimestamp;
+      existing.serverUpdatedAt = event.serverTimestamp;
     }
     if ('meta' in event && event.meta) {
       existing.meta = { ...existing.meta, ...event.meta };
@@ -687,15 +692,15 @@ function appendTextDelta(
 
   if (parentId != null) {
     if (kind === 'assistant') {
-      clearActiveThoughtForParent(state, parentId);
+      clearActiveThoughtForParent(state, parentId, event);
     }
     if (kind === 'thought') {
-      clearActiveAssistantForParent(state, parentId);
+      clearActiveAssistantForParent(state, parentId, event);
     }
   } else {
     if (kind !== 'user') state.activeUserBlockId = undefined;
-    if (kind !== 'assistant') clearActiveAssistant(state);
-    if (kind !== 'thought') clearActiveThought(state);
+    if (kind !== 'assistant') clearActiveAssistant(state, event);
+    if (kind !== 'thought') clearActiveThought(state, event);
   }
 }
 
@@ -776,6 +781,9 @@ function upsertToolBlock(
     }
     existing.updatedAt = state.now;
     if (event.eventId !== undefined) existing.eventId = event.eventId;
+    if (event.serverTimestamp !== undefined) {
+      existing.serverUpdatedAt = event.serverTimestamp;
+    }
     if (event.details) existing.details = event.details;
     if (compactTaskOutput) delete existing.content;
     else if (event.content !== undefined) existing.content = event.content;
@@ -884,7 +892,10 @@ function upsertToolBlock(
     updatedAt: state.now,
     ...(event.eventId !== undefined ? { eventId: event.eventId } : {}),
     ...(event.serverTimestamp !== undefined
-      ? { serverTimestamp: event.serverTimestamp }
+      ? {
+          serverTimestamp: event.serverTimestamp,
+          serverUpdatedAt: event.serverTimestamp,
+        }
       : {}),
     ...(event.sourceRecordIds
       ? { sourceRecordIds: [...event.sourceRecordIds] }
@@ -930,7 +941,7 @@ function upsertToolBlock(
   // never points at it. Effective-status keeps the pointer in sync
   // with what was actually written to the block.
   updateCurrentToolPointer(state, event.toolCallId, event.status ?? 'pending');
-  clearActiveText(state, event.parentToolCallId);
+  clearActiveText(state, event.parentToolCallId, event);
 }
 
 function discardToolBlock(
@@ -1019,6 +1030,7 @@ function findLatestInFlightToolCallId(
  */
 function propagateCancellationToInFlightTools(
   state: DaemonTranscriptState,
+  event?: DaemonUiEvent,
 ): void {
   // Skip trimmed sentinels up front. Without this filter
   // each cancellation walked the entire historical tool-call index (which
@@ -1033,6 +1045,9 @@ function propagateCancellationToInFlightTools(
     if (!IN_FLIGHT_TOOL_STATUSES.has(block.status)) continue;
     block.status = 'cancelled';
     block.updatedAt = state.now;
+    if (event?.serverTimestamp !== undefined) {
+      block.serverUpdatedAt = event.serverTimestamp;
+    }
   }
   state.currentToolCallId = undefined;
 }
@@ -1068,7 +1083,7 @@ function appendShellBlock(
     ...(event.stream ? { stream: event.stream } : {}),
   };
   appendBlock(state, block);
-  clearActiveText(state);
+  clearActiveText(state, undefined, event);
 }
 
 function appendUserShellBlock(
@@ -1113,7 +1128,7 @@ function appendUserShellBlock(
   };
   state.pendingUserShellCommand = undefined;
   appendBlock(state, block);
-  clearActiveText(state);
+  clearActiveText(state, undefined, event);
 }
 
 function upsertPermissionBlock(
@@ -1155,7 +1170,7 @@ function upsertPermissionBlock(
   };
   appendBlock(state, block);
   state.permissionBlockByRequestId[event.requestId] = block.id;
-  clearActiveText(state);
+  clearActiveText(state, undefined, event);
 }
 
 function resolvePermissionBlock(
@@ -1208,7 +1223,7 @@ function resolvePermissionBlock(
   };
   appendBlock(state, block);
   state.permissionBlockByRequestId[event.requestId] = block.id;
-  clearActiveText(state);
+  clearActiveText(state, undefined, event);
 }
 
 function appendStatusBlock(
@@ -1263,7 +1278,7 @@ function appendStatusBlock(
       : {}),
   };
   appendBlock(state, block);
-  if (opts.clearActiveText !== false) clearActiveText(state);
+  if (opts.clearActiveText !== false) clearActiveText(state, undefined, event);
   // Opt-out only protects the streaming assistant/thought block; the user
   // pointer must still reset, otherwise a later mergeable user.text.delta
   // (e.g. a peer client's prompt echo) appends onto the command echo block.
@@ -1287,7 +1302,7 @@ function appendPromptCancelledBlock(
       : {}),
   };
   appendBlock(state, block);
-  clearActiveText(state);
+  clearActiveText(state, undefined, event);
 }
 
 function createTextBlock(
@@ -1308,7 +1323,9 @@ function createTextBlock(
     createdAt: state.now,
     updatedAt: state.now,
     ...(eventId !== undefined ? { eventId } : {}),
-    ...(serverTimestamp !== undefined ? { serverTimestamp } : {}),
+    ...(serverTimestamp !== undefined
+      ? { serverTimestamp, serverUpdatedAt: serverTimestamp }
+      : {}),
     ...(sourceRecordIds ? { sourceRecordIds: [...sourceRecordIds] } : {}),
     ...(meta ? { meta: { ...meta } } : {}),
   };
@@ -1609,12 +1626,17 @@ function allocateBlockId(state: DaemonTranscriptState, prefix: string): string {
 function clearActiveText(
   state: DaemonTranscriptState,
   parentToolCallId?: string,
+  event?: DaemonUiEvent,
 ): void {
+  // Terminator events close the streaming block but do not own its content:
+  // stamp the server-time boundary while keeping the block's eventId, which
+  // anchors replay ordering.
+  const stamp = event ? { ...event, eventId: undefined } : undefined;
   if (parentToolCallId) {
-    clearActiveAssistantForParent(state, parentToolCallId);
-    clearActiveThoughtForParent(state, parentToolCallId);
+    clearActiveAssistantForParent(state, parentToolCallId, stamp);
+    clearActiveThoughtForParent(state, parentToolCallId, stamp);
   } else {
-    finishAssistant(state);
+    finishAssistant(state, stamp);
     state.activeUserBlockId = undefined;
   }
 }

packages/sdk-typescript/src/daemon/ui/types.ts

@@ -826,6 +826,8 @@ export interface DaemonTranscriptBlockBase {
    * display: clients viewing the same session see the same value.
    */
   serverTimestamp?: number;
+  /** Daemon-authoritative wall clock for the latest event merged into this block. */
+  serverUpdatedAt?: number;
   /** Ordered persisted ChatRecord identities that contributed to this block. */
   sourceRecordIds?: readonly string[];
   /**