Merge remote-tracking branch 'origin/master' into worktree/web-model-request-retry

# Conflicts:
#	apps/cli/README.i18n.yaml
#	apps/cli/README.md
#	apps/cli/README.zh.md
#	apps/web/tests/snapshots/live-interactions/cancel.expected.md
#	apps/web/tests/snapshots/live-interactions/error-auth.expected.md
#	apps/web/tests/snapshots/live-interactions/retry.expected.md
#	packages/client/runtime/README.i18n.yaml
#	packages/client/runtime/src/client/sessions/session.ts
#	packages/client/ui-conversation/README.i18n.yaml
#	packages/client/ui-conversation/README.zh.md

packages/client/ui-trajectory/src/client/TrajectoryTable.module.css

@@ -103,6 +103,11 @@
   border-bottom: 0;
 }
 
+.table tbody tr[data-request-only='true']:last-child td {
+  /* Retain the lower half of the 16px boundary marker at the table's end. */
+  height: 9px;
+}
+
 .table tbody tr[data-request-only='true'] .turnRail {
   top: -15px;
   bottom: 0;

packages/client/ui-trajectory/src/client/TrajectoryTimeline.module.css

@@ -1,4 +1,7 @@
 .root {
+  position: relative;
+  z-index: 0;
+  isolation: isolate;
   flex: none;
   border-bottom: 1px solid var(--dsw-alias-border-l2);
   user-select: none;

packages/client/ui-trajectory/src/client/views.module.css

@@ -13,11 +13,17 @@
   background: var(--dsw-alias-bg-layer-1);
 }
 
-/* Under the active conversation column (`[data-conversation-scroll]`) the
- * parent owns overflow so the sticky composer stays in the same scrollport. */
-:global([data-conversation-scroll]) .root {
-  overflow: visible;
-  height: auto;
+/* Trajectory keeps the ledger and details panel inside the remaining
+ * conversation height. Only the ledger pane scrolls; the composer remains
+ * the fixed flex sibling below this view. */
+:global([data-conversation-scroll]):has(.root) {
+  overflow: hidden;
+}
+
+:global([data-conversation-scroll]):has(.root) > :first-child {
+  flex: 1 1 0;
+  min-height: 0;
+  overflow: hidden;
 }
 
 .ledger {