From f9e892dc8581d0bd6ed04a512cf2780566dd6554 Mon Sep 17 00:00:00 2001
From: Luke Parker <10430890+Hona@users.noreply.github.com>
Date: Fri, 9 Oct 2026 18:40:52 +1000
Subject: [PATCH] feat(app): match the session column to the design and use
 pretty text wrapping (#54020)

---
 .../app/e2e/regression/session-summary.spec.ts     |  6 ++++--
 packages/app/src/composer/dropzone.tsx             |  4 ++--
 .../session/composer/session-composer-region.tsx   |  2 +-
 packages/app/src/session/preparing-composer.tsx    |  2 +-
 packages/app/src/session/route.tsx                 |  2 +-
 .../app/src/session/timeline/message-timeline.tsx  |  4 ++--
 packages/session-ui/src/components/markdown.css    |  5 +++++
 packages/session-ui/src/components/markdown.tsx    |  1 +
 packages/session-ui/src/pierre/index.ts            |  2 ++
 .../src/timeline/session-timeline-row.tsx          |  4 ++--
 packages/ui/src/styles/base.css                    | 14 ++++++++++++++
 packages/ui/src/styles/tailwind/index.css          |  3 +++
 12 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/packages/app/e2e/regression/session-summary.spec.ts b/packages/app/e2e/regression/session-summary.spec.ts
index 869aaa42093..2b503e14917 100644
--- a/packages/app/e2e/regression/session-summary.spec.ts
+++ b/packages/app/e2e/regression/session-summary.spec.ts
@@ -215,6 +215,7 @@ for (const direction of ["ltr", "rtl"] as const) {
     )
 
     const composer = page.locator('[data-component="session-composer-dock"] > div')
+    const timeline = page.locator('[data-slot="session-timeline-scroll"]')
     const summary = page.getByRole("dialog", { name: "Session details", exact: true })
     await expect(row).toBeInViewport()
     const before = { row: (await row.boundingBox())!, composer: (await composer.boundingBox())! }
@@ -229,12 +230,13 @@ for (const direction of ["ltr", "rtl"] as const) {
         return Math.max(Math.abs(message.x - before.row.x), Math.abs(input.x - before.composer.x))
       })
       .toBeLessThan(1)
+    // The capped session column can end before the panel, so the overlay is measured against the whole timeline.
     await expect
       .poll(async () => {
-        const message = (await row.boundingBox())!
+        const view = (await timeline.boundingBox())!
         const details = (await summary.boundingBox())!
 
-        return Math.min(message.x + message.width, details.x + details.width) - Math.max(message.x, details.x)
+        return Math.min(view.x + view.width, details.x + details.width) - Math.max(view.x, details.x)
       })
       .toBeGreaterThan(0)
     const text = summary.getByText(branch, { exact: true })
diff --git a/packages/app/src/composer/dropzone.tsx b/packages/app/src/composer/dropzone.tsx
index b51fb95e1ec..a2263b6e3e7 100644
--- a/packages/app/src/composer/dropzone.tsx
+++ b/packages/app/src/composer/dropzone.tsx
@@ -7,7 +7,7 @@ import { createAnimatedPresence } from "@/runtime/animated-presence"
 export function ComposerDropzone(props: {
   active: boolean
   input?: { image?: boolean; pdf?: boolean }
-  identity?: () => unknown
+  identity?: () => string | undefined
 }) {
   const language = useLanguage()
   const [elements, setElements] = createStore<{ dropzone?: HTMLDivElement }>({})
@@ -52,7 +52,7 @@ export function ComposerDropzone(props: {
         >
           <div class="absolute inset-0 bg-v2-background-bg-base/25" />
           <div
-            class="absolute inset-y-0 left-1/2 w-full -translate-x-1/2 md:max-w-200 2xl:max-w-[1000px]"
+            class="absolute inset-y-0 left-1/2 w-full -translate-x-1/2 md:max-w-session"
             style={{
               "-webkit-mask-image": "linear-gradient(to right, transparent 0%, black 12%, black 88%, transparent 100%)",
               "mask-image": "linear-gradient(to right, transparent 0%, black 12%, black 88%, transparent 100%)",
diff --git a/packages/app/src/session/composer/session-composer-region.tsx b/packages/app/src/session/composer/session-composer-region.tsx
index 196095c6c7a..d4632fc844d 100644
--- a/packages/app/src/session/composer/session-composer-region.tsx
+++ b/packages/app/src/session/composer/session-composer-region.tsx
@@ -31,7 +31,7 @@ export function SessionComposerRegion(props: {
       <div
         classList={{
           "w-full px-3 pointer-events-auto": true,
-          "md:max-w-[1000px] md:mx-auto": controller.centered(),
+          "md:max-w-session md:mx-auto": controller.centered(),
         }}
       >
         <Show when={controller.state.websearch.request()}>
diff --git a/packages/app/src/session/preparing-composer.tsx b/packages/app/src/session/preparing-composer.tsx
index 873c495f076..26cc148f0d8 100644
--- a/packages/app/src/session/preparing-composer.tsx
+++ b/packages/app/src/session/preparing-composer.tsx
@@ -47,7 +47,7 @@ export function PreparingComposer(props: { pending: PendingSession }) {
 
   return (
     <div data-component="session-composer-dock" class="w-full shrink-0 bg-v2-background-bg-base pb-3">
-      <div class="mx-auto w-full max-w-[1000px] px-3">
+      <div class="mx-auto w-full px-3 md:max-w-session">
         <ComposerEditor controller={editor} modelControlsVisible={false} />
       </div>
     </div>
diff --git a/packages/app/src/session/route.tsx b/packages/app/src/session/route.tsx
index 702aa6560cc..c64822659ef 100644
--- a/packages/app/src/session/route.tsx
+++ b/packages/app/src/session/route.tsx
@@ -66,7 +66,7 @@ function PreparingSession(props: { sessionID: string; pending: PendingSession })
       >
         <div data-component="session-preparing" data-workspace-session class="min-h-0 flex-1 overflow-y-auto">
           <SessionIdentityHeader sessionID={props.sessionID} />
-          <div class="mx-auto w-full min-w-0 max-w-[1000px] px-4 pb-5 md:px-5">
+          <div class="mx-auto w-full min-w-0 px-4 pb-5 md:max-w-session md:px-6">
             <SessionUserMessage
               sessionID={props.sessionID}
               message={props.pending.message}
diff --git a/packages/app/src/session/timeline/message-timeline.tsx b/packages/app/src/session/timeline/message-timeline.tsx
index 3656cad3b22..09600c0faca 100644
--- a/packages/app/src/session/timeline/message-timeline.tsx
+++ b/packages/app/src/session/timeline/message-timeline.tsx
@@ -160,7 +160,7 @@ function MessageTimelineView(
     if (!directory) return
     void data.location.vcs.sync({ directory }).catch(() => undefined)
   })
-  const turnPadding = () => "px-4 md:px-5"
+  const turnPadding = () => "px-4 md:px-6"
   const showHeader = createMemo(() => !props.hideHeader && (props.data.showHeader() || workspaceSession()))
   const pinned = createMemo(() => props.pinned)
   const messageByID = projection.messageByID
@@ -410,7 +410,7 @@ function MessageTimelineView(
           <div
             classList={{
               "min-w-0 w-full max-w-full": true,
-              "md:max-w-[1000px] md:mx-auto": props.centered,
+              "md:max-w-session md:mx-auto": props.centered,
             }}
           >
             <div
diff --git a/packages/session-ui/src/components/markdown.css b/packages/session-ui/src/components/markdown.css
index 529aaccdd1a..d13b4cb4e75 100644
--- a/packages/session-ui/src/components/markdown.css
+++ b/packages/session-ui/src/components/markdown.css
@@ -41,6 +41,11 @@
     margin-bottom: 0;
   }
 
+  /* Pretty wrapping would move settled words as each token arrives, so the growing block stays greedy until it completes. */
+  &[data-streaming] > [data-markdown-block]:last-child {
+    text-wrap-style: auto;
+  }
+
   /* Headings: Sized by level, distinguished by color and spacing */
   h1 {
     font-size: 17px;
diff --git a/packages/session-ui/src/components/markdown.tsx b/packages/session-ui/src/components/markdown.tsx
index 1c48833279c..3403b8ef9a7 100644
--- a/packages/session-ui/src/components/markdown.tsx
+++ b/packages/session-ui/src/components/markdown.tsx
@@ -817,6 +817,7 @@ export function Markdown(
   return (
     <div
       data-component="markdown"
+      data-streaming={local.streaming ? "" : undefined}
       dir="auto"
       classList={{
         ...local.classList,
diff --git a/packages/session-ui/src/pierre/index.ts b/packages/session-ui/src/pierre/index.ts
index 2b7b9fe38a2..a00c4c2ccc3 100644
--- a/packages/session-ui/src/pierre/index.ts
+++ b/packages/session-ui/src/pierre/index.ts
@@ -22,6 +22,8 @@ const unsafeCSS = `
     color-mix(in lab, var(--diffs-bg) 98%, var(--diffs-mixer)),
     color-mix(in lab, var(--diffs-bg) 95%, var(--diffs-mixer))
   );
+  /* The app's code wrapping rules do not reach this shadow tree, and pretty is inherited from the page. */
+  text-wrap-style: auto;
 }
 
 [data-diff],
diff --git a/packages/session-ui/src/timeline/session-timeline-row.tsx b/packages/session-ui/src/timeline/session-timeline-row.tsx
index 4484f0a4c41..233452d96e4 100644
--- a/packages/session-ui/src/timeline/session-timeline-row.tsx
+++ b/packages/session-ui/src/timeline/session-timeline-row.tsx
@@ -140,7 +140,7 @@ export function createSessionTimelineRowRenderer(input: {
       : undefined
   }
 
-  const padding = () => input.padding?.() ?? "px-4 md:px-5"
+  const padding = () => input.padding?.() ?? "px-4 md:px-6"
 
   const indexGroupContents = (refs: PartRef[]) => {
     const result = new Map<string, Map<string, SessionMessageAssistant["content"][number]>>()
@@ -470,7 +470,7 @@ export function createSessionTimelineRowRenderer(input: {
       data-timeline-spacing={Predicate.isTagged(props.row, "AssistantPart") ? props.row.spacing : undefined}
       classList={{
         "min-w-0 w-full max-w-full": true,
-        "md:max-w-[1000px] md:mx-auto": input.centered?.(),
+        "md:max-w-session md:mx-auto": input.centered?.(),
         "pt-2": Predicate.isTagged(props.row, "AssistantPart") && props.row.spacing === "tool",
         "pt-4": Predicate.isTagged(props.row, "AssistantPart") && props.row.spacing === "content",
         "pt-6": Predicate.isTagged(props.row, "Error"),
diff --git a/packages/ui/src/styles/base.css b/packages/ui/src/styles/base.css
index ee222399021..ebcc8ad6ccf 100644
--- a/packages/ui/src/styles/base.css
+++ b/packages/ui/src/styles/base.css
@@ -23,6 +23,7 @@
   5. Use the user's configured `sans` font-feature-settings by default.
   6. Use the user's configured `sans` font-variation-settings by default.
   7. Disable tap highlights on iOS.
+  8. Avoid one-word last lines in all wrapped text. Chromium keeps the line count, so heights do not change.
 */
 
 html,
@@ -34,6 +35,7 @@ html,
   font-feature-settings: var(--font-family-sans--font-feature-settings, normal); /* 5 */
   font-variation-settings: var(--font-family-sans--font-variation-settings, normal); /* 6 */
   -webkit-tap-highlight-color: transparent; /* 7 */
+  text-wrap-style: pretty; /* 8 */
 }
 
 /*
@@ -111,6 +113,7 @@ strong {
   2. Use the user's configured `mono` font-feature-settings by default.
   3. Use the user's configured `mono` font-variation-settings by default.
   4. Correct the odd `em` font sizing in all browsers.
+  5. Keep code wrapping greedy so wrapped lines break where an editor would.
 */
 
 code,
@@ -121,6 +124,17 @@ pre {
   font-feature-settings: var(--font-family-mono--font-feature-settings, normal); /* 2 */
   font-variation-settings: var(--font-family-mono--font-variation-settings, normal); /* 3 */
   font-size: 1em; /* 4 */
+  text-wrap-style: auto; /* 5 */
+}
+
+/*
+  Keep earlier lines still while the user types.
+*/
+
+input,
+textarea,
+[contenteditable] {
+  text-wrap-style: stable;
 }
 
 /*
diff --git a/packages/ui/src/styles/tailwind/index.css b/packages/ui/src/styles/tailwind/index.css
index 605fcdd5af6..163f29b9eaa 100644
--- a/packages/ui/src/styles/tailwind/index.css
+++ b/packages/ui/src/styles/tailwind/index.css
@@ -49,6 +49,9 @@
   --container-5xl: 64rem;
   --container-6xl: 72rem;
   --container-7xl: 80rem;
+  /* Shared by the session timeline, composer dock, and drop target so their edges stay aligned.
+     The composer dock's 12px gutter leaves the design's 720px composer. */
+  --container-session: 744px;
 
   --font-sans: var(--font-family-sans);
   --font-sans--font-feature-settings: var(--font-family-sans--font-feature-settings);