Merge remote-tracking branch 'refs/remotes/origin/main' into dohooo/team-cloud-sandbox

Author: dohooo

.changeset/colorful-composer-controls.md

@@ -0,0 +1,5 @@
+---
+"helmor": patch
+---
+
+Restore the accent colors on the composer's mode controls — the animated Extra High / Max effort label, the Plan toggle, and the Terminal-Mode toggle.

src/features/composer/index.tsx

@@ -1251,7 +1251,13 @@ export const WorkspaceComposer = memo(function WorkspaceComposer({
 													disabled={toolbarDisabled}
 													className={cn(
 														`flex items-center gap-0.5 ${composerToolbarTriggerClassName}`,
-														composerToolbarActiveClassName,
+														// `effort-max-text` paints via `-webkit-text-fill-color:
+														// transparent` without a `color`, so it needs a muted
+														// baseline to avoid a flash when the gradient class drops.
+														"text-muted-foreground hover:text-muted-foreground",
+														(effectiveEffort === "max" ||
+															effectiveEffort === "xhigh") &&
+															"effort-max-text",
 														toolbarDisabled
 															? "cursor-not-allowed opacity-45 hover:bg-transparent"
 															: null,
@@ -1305,7 +1311,7 @@ export const WorkspaceComposer = memo(function WorkspaceComposer({
 												className={cn(
 													`size-7 justify-center px-0 ${composerToolbarTriggerClassName}`,
 													permissionMode === "plan"
-														? composerToolbarActiveClassName
+														? "text-plan hover:text-plan"
 														: "text-muted-foreground/70 hover:text-muted-foreground/70",
 												)}
 												onToggle={() =>
@@ -1326,7 +1332,7 @@ export const WorkspaceComposer = memo(function WorkspaceComposer({
 														className={cn(
 															`size-7 justify-center px-0 ${composerToolbarTriggerClassName}`,
 															terminalMode
-																? composerToolbarActiveClassName
+																? "text-emerald-500 hover:bg-emerald-500/10 hover:text-emerald-500"
 																: // Pin the hover text color (like the Plan toggle) so the
 																	// toolbar base `hover:text-foreground` can't flash the icon
 																	// white for a frame while `transition-colors` runs on toggle.