From 838814510f04c0e9e31e40b2140e9df3804caec0 Mon Sep 17 00:00:00 2001
From: Florent Klein <4128942+floklein@users.noreply.github.com>
Date: Fri, 13 Nov 2026 19:05:11 +0100
Subject: [PATCH 1/4] fix(web): context row under the composer is rounded and
 spaced from the card

The row's glass background was a full-width square rectangle flush against
the composer card. It is now a rounded pill with a small gap above it.

Fixes #36258

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
---
 apps/web/src/components/chat/ComposerSurface.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/chat/ComposerSurface.tsx b/apps/web/src/components/chat/ComposerSurface.tsx
index e9064f708a21a..8d2ebb0996de3 100644
--- a/apps/web/src/components/chat/ComposerSurface.tsx
+++ b/apps/web/src/components/chat/ComposerSurface.tsx
@@ -74,7 +74,7 @@ function ContextStrip({ className, ...props }: ComponentProps<"div">) {
     <div
       data-slot="composer-context-strip"
       className={cn(
-        "group/composer-context surface-glass relative flex w-full items-center gap-2 overflow-x-clip px-2 pt-2 text-muted-foreground",
+        "group/composer-context surface-glass relative mt-1.5 flex w-full items-center gap-2 overflow-x-clip rounded-xl px-2 py-1 text-muted-foreground",
         className,
       )}
       {...props}

From bc45596e15f8496fef988b858cc6bd99c19c29f1 Mon Sep 17 00:00:00 2001
From: Florent Klein <4128942+floklein@users.noreply.github.com>
Date: Fri, 13 Nov 2026 19:19:46 +0100
Subject: [PATCH 2/4] fix(web): context row uses the composer card's glass and
 outline

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
---
 apps/web/src/components/chat/ComposerSurface.tsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/web/src/components/chat/ComposerSurface.tsx b/apps/web/src/components/chat/ComposerSurface.tsx
index 8d2ebb0996de3..00d0393fa1638 100644
--- a/apps/web/src/components/chat/ComposerSurface.tsx
+++ b/apps/web/src/components/chat/ComposerSurface.tsx
@@ -68,13 +68,16 @@ function Main({ className, ...props }: ComponentProps<"div">) {
   );
 }
 
-/** A row under the card (environment, worktree, branch); page-coloured glass hides the timeline scrolling behind it. */
+/** A row under the card (environment, worktree, branch); the card's glass hides the timeline scrolling behind it. */
 function ContextStrip({ className, ...props }: ComponentProps<"div">) {
   return (
     <div
       data-slot="composer-context-strip"
       className={cn(
-        "group/composer-context surface-glass relative mt-1.5 flex w-full items-center gap-2 overflow-x-clip rounded-xl px-2 py-1 text-muted-foreground",
+        "group/composer-context relative mt-1.5 flex w-full items-center gap-2 overflow-x-clip rounded-xl px-2 py-1 text-muted-foreground shadow-composer dark:shadow-none",
+        "bg-(--chat-composer-glass-surface)/(--glass-opacity) backdrop-blur-(--glass-blur) backdrop-saturate-(--glass-saturation)",
+        "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:bg-(--chat-composer-glass-surface)",
+        outlineClasses,
         className,
       )}
       {...props}

From b0992386ea50e834880c0304c96dd38992b3971a Mon Sep 17 00:00:00 2001
From: Florent Klein <4128942+floklein@users.noreply.github.com>
Date: Fri, 13 Nov 2026 19:47:04 +0100
Subject: [PATCH 3/4] Revert "fix(web): context row uses the composer card's
 glass and outline"

This reverts commit 8019ed0e64cbaf4f7ebff7f8b3886897864afb45.
---
 apps/web/src/components/chat/ComposerSurface.tsx | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/apps/web/src/components/chat/ComposerSurface.tsx b/apps/web/src/components/chat/ComposerSurface.tsx
index 00d0393fa1638..8d2ebb0996de3 100644
--- a/apps/web/src/components/chat/ComposerSurface.tsx
+++ b/apps/web/src/components/chat/ComposerSurface.tsx
@@ -68,16 +68,13 @@ function Main({ className, ...props }: ComponentProps<"div">) {
   );
 }
 
-/** A row under the card (environment, worktree, branch); the card's glass hides the timeline scrolling behind it. */
+/** A row under the card (environment, worktree, branch); page-coloured glass hides the timeline scrolling behind it. */
 function ContextStrip({ className, ...props }: ComponentProps<"div">) {
   return (
     <div
       data-slot="composer-context-strip"
       className={cn(
-        "group/composer-context relative mt-1.5 flex w-full items-center gap-2 overflow-x-clip rounded-xl px-2 py-1 text-muted-foreground shadow-composer dark:shadow-none",
-        "bg-(--chat-composer-glass-surface)/(--glass-opacity) backdrop-blur-(--glass-blur) backdrop-saturate-(--glass-saturation)",
-        "not-supports-[((backdrop-filter:blur(1px))_or_(-webkit-backdrop-filter:blur(1px)))]:bg-(--chat-composer-glass-surface)",
-        outlineClasses,
+        "group/composer-context surface-glass relative mt-1.5 flex w-full items-center gap-2 overflow-x-clip rounded-xl px-2 py-1 text-muted-foreground",
         className,
       )}
       {...props}

From 0542d0a979ab960525fba7453a4aa855305cec9f Mon Sep 17 00:00:00 2001
From: Florent Klein <4128942+floklein@users.noreply.github.com>
Date: Fri, 13 Nov 2026 19:54:01 +0100
Subject: [PATCH 4/4] fix(web): context row gap no longer moves the composer or
 the row's labels

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
---
 apps/web/src/components/chat/ComposerSurface.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/src/components/chat/ComposerSurface.tsx b/apps/web/src/components/chat/ComposerSurface.tsx
index 8d2ebb0996de3..a034395870830 100644
--- a/apps/web/src/components/chat/ComposerSurface.tsx
+++ b/apps/web/src/components/chat/ComposerSurface.tsx
@@ -74,7 +74,7 @@ function ContextStrip({ className, ...props }: ComponentProps<"div">) {
     <div
       data-slot="composer-context-strip"
       className={cn(
-        "group/composer-context surface-glass relative mt-1.5 flex w-full items-center gap-2 overflow-x-clip rounded-xl px-2 py-1 text-muted-foreground",
+        "group/composer-context surface-glass relative mt-1 -mb-1 flex w-full items-center gap-2 overflow-x-clip rounded-xl px-2 py-1 text-muted-foreground",
         className,
       )}
       {...props}