From 7ffef72ccedbbc5dc28ff4e4790c0ae14e1d3642 Mon Sep 17 00:00:00 2001
From: usrnk1 <7547651+usrnk1@users.noreply.github.com>
Date: Mon, 19 Oct 2026 15:44:16 +0200
Subject: [PATCH] fix(app): use session loader icon for activity capsule
 (#57087)

---
 .../src/session/composer/activity-chips.css   | 72 +------------------
 .../src/session/composer/activity-chips.tsx   | 37 ++--------
 2 files changed, 7 insertions(+), 102 deletions(-)

diff --git a/packages/app/src/session/composer/activity-chips.css b/packages/app/src/session/composer/activity-chips.css
index 6391d37b8ce..7ba12a853e7 100644
--- a/packages/app/src/session/composer/activity-chips.css
+++ b/packages/app/src/session/composer/activity-chips.css
@@ -1,72 +1,6 @@
-[data-component="session-activity-glyph"] {
-  display: block;
-  flex-shrink: 0;
-  fill: currentColor;
-}
-
-/* One wave runs diagonally across the 5×5 grid, as in the iOS app's agent activity glyph. */
-[data-component="session-activity-glyph"] [data-dot] {
-  animation: session-activity-glyph 1.1s linear infinite;
-  animation-delay: calc(var(--session-activity-glyph-phase, 0ms) + (var(--diagonal) / 8 - 1) * 1.1s);
-}
-
-[data-component="session-activity-glyph"] [data-reduced-motion] {
-  display: none;
-}
-
-@media (prefers-reduced-motion: reduce) {
-  [data-component="session-activity-glyph"] [data-dot] {
-    display: none;
-  }
-
-  [data-component="session-activity-glyph"] [data-reduced-motion] {
-    display: block;
-  }
-}
-
-/* opacity = 0.16 + 0.84 * wave³, wave = (1 + cos 2πt) / 2 */
-@keyframes session-activity-glyph {
-  0%,
-  100% {
-    opacity: 1;
-  }
-  5%,
-  95% {
-    opacity: 0.94;
-  }
-  10%,
-  90% {
-    opacity: 0.782;
-  }
-  15%,
-  85% {
-    opacity: 0.58;
-  }
-  20%,
-  80% {
-    opacity: 0.396;
-  }
-  25%,
-  75% {
-    opacity: 0.265;
-  }
-  30%,
-  70% {
-    opacity: 0.195;
-  }
-  35%,
-  65% {
-    opacity: 0.167;
-  }
-  40%,
-  60% {
-    opacity: 0.16;
-  }
-}
-
 /*
  * The open panel grows out of the capsule, which stays as its bottom row. Everything sits on the capsule's grid:
- * 1px border + 8px padding puts glyphs at x=9; a 15px glyph + 6px gap puts text at x=30.
+ * 1px border + 8px padding puts glyphs at x=9; a 16px glyph + 6px gap puts text at x=31.
  */
 [data-component="menu-v2-content"][data-slot="session-activity-panel"] {
   width: max-content;
@@ -90,8 +24,8 @@
 
   [data-slot="menu-v2-item-content"] > svg:first-child {
     flex: none;
-    width: 15px;
-    height: 15px;
+    width: 16px;
+    height: 16px;
   }
 
   /* A trailing stop button ends 4px in, mirroring the glyph's inset at the start. */
diff --git a/packages/app/src/session/composer/activity-chips.tsx b/packages/app/src/session/composer/activity-chips.tsx
index 62848f64203..c7fe9751127 100644
--- a/packages/app/src/session/composer/activity-chips.tsx
+++ b/packages/app/src/session/composer/activity-chips.tsx
@@ -1,7 +1,8 @@
 import { Icon } from "@opencode/ui/icon"
 import { IconButton } from "@opencode/ui/icon-button"
 import { Menu } from "@opencode/ui/menu"
-import { For, Index, Show } from "solid-js"
+import { SessionProgressIndicatorV2 } from "@opencode/session-ui/v2/session-progress-indicator-v2"
+import { For, Show } from "solid-js"
 import { useLanguage } from "@/runtime/i18n/language"
 import "./activity-chips.css"
 
@@ -76,7 +77,7 @@ export function SessionActivityChips(props: {
             data-slot="session-activity-chip"
             class="flex h-7 min-w-0 max-w-full items-center gap-1.5 rounded-full border border-v2-border-border-base bg-v2-background-bg-base ps-2 pe-2.5 text-[13px] font-[530] leading-text-compact tracking-[-0.04px] whitespace-nowrap tabular-nums text-v2-text-text-base shadow-[var(--v2-elevation-raised)] outline-none duration-150 ease-out animate-in fade-in motion-reduce:animate-none hover:bg-v2-background-bg-layer-01 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-v2-border-border-focus"
           >
-            <SessionActivityGlyph />
+            <SessionProgressIndicatorV2 class="shrink-0" />
             <span class="truncate">{label()}</span>
           </Menu.Trigger>
           <Menu.Portal>
@@ -89,7 +90,7 @@ export function SessionActivityChips(props: {
                   <For each={props.subagents}>
                     {(item) => (
                       <Menu.Item {...row(item)}>
-                        <SessionActivityGlyph class="text-v2-icon-icon-muted" />
+                        <SessionProgressIndicatorV2 class="shrink-0 text-v2-icon-icon-muted" />
                         <span class="shrink-0 font-[530]">
                           {item.agent
                             ? `${item.agent[0].toUpperCase()}${item.agent.slice(1)}`
@@ -137,33 +138,3 @@ export function SessionActivityChips(props: {
   )
 }
 
-// A 5×5 dot matrix with a diagonal wave, ported from the iOS app's AgentActivityGlyph.
-function SessionActivityGlyph(props: { class?: string }) {
-  // Glyphs mounted at different times share one phase, like the iOS glyph's clock-driven wave.
-  const phase = `${-(performance.now() % 1100)}ms`
-
-  return (
-    <svg
-      data-component="session-activity-glyph"
-      class={props.class}
-      width={15}
-      height={15}
-      viewBox="0 0 5 5"
-      aria-hidden="true"
-      style={{ "--session-activity-glyph-phase": phase }}
-    >
-      <Index each={Array.from({ length: 25 })}>
-        {(_, index) => (
-          <circle
-            data-dot
-            cx={(index % 5) + 0.5}
-            cy={Math.floor(index / 5) + 0.5}
-            r={0.31}
-            style={{ "--diagonal": (index % 5) + Math.floor(index / 5) }}
-          />
-        )}
-      </Index>
-      <circle data-reduced-motion cx={2.5} cy={2.5} r={0.75} />
-    </svg>
-  )
-}