2 files changed, 10 insertions, 0 deletions
diff --git a/packages/ui/src/components/session-turn.css b/packages/ui/src/components/session-turn.css
index 3b7d74dc2..c4dd2b839 100644
--- a/packages/ui/src/components/session-turn.css
+++ b/packages/ui/src/components/session-turn.css
@@ -30,6 +30,7 @@
   }
 
   [data-slot="session-turn-sticky-header"] {
+    width: 100%;
     position: sticky;
     top: 0;
     background-color: var(--background-stronger);
diff --git a/packages/ui/src/components/session-turn.tsx b/packages/ui/src/components/session-turn.tsx
index a1c3b97b7..71032be92 100644
--- a/packages/ui/src/components/session-turn.tsx
+++ b/packages/ui/src/components/session-turn.tsx
@@ -242,6 +242,15 @@ export function SessionTurn(
                 }
               })
 
+              // Auto-collapse steps when done working (if user hasn't interacted)
+              createEffect((prev) => {
+                const isWorking = working()
+                if (prev && !isWorking && !userScrolled()) {
+                  setStore("detailsExpanded", false)
+                }
+                return isWorking
+              }, working())
+
               return (
                 <div
                   data-message={message().id}