@pheem49/mint 1.16.0 → 1.18.0

package/src/renderer/src/css/chat.css

@@ -120,13 +120,25 @@
   align-items: flex-start;
 }
 
-/* Activity dashboards need the chat column, not the reply text's intrinsic width. */
+/* Activity dashboards & file changes need the full chat column, not the reply text's intrinsic width. */
 .message.ai-message:has(.agent-activity-history),
+.message.ai-message:has(.file-changes-summary-container),
+.message.ai-message:has(.file-changes-card),
+.message.ai-message:has(.chat-artifact-cards),
+.message.ai-message:has(.chat-artifact-card),
 .message.ai-message.agent-activity-message {
   align-self: stretch;
   width: 100%;
 }
+.message:has(.source-links-popover) {
+  position: relative;
+  z-index: 30;
+}
 .message.ai-message:has(.agent-activity-history) > .bubble-wrapper,
+.message.ai-message:has(.file-changes-summary-container) > .bubble-wrapper,
+.message.ai-message:has(.file-changes-card) > .bubble-wrapper,
+.message.ai-message:has(.chat-artifact-cards) > .bubble-wrapper,
+.message.ai-message:has(.chat-artifact-card) > .bubble-wrapper,
 .agent-activity-history { width: 100%; }
 
 .message-time {
@@ -170,6 +182,34 @@
   color: var(--text-primary);
 }
 
+.provider-chip-logo {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 13px;
+  height: 13px;
+  flex-shrink: 0;
+  vertical-align: middle;
+}
+
+.provider-chip-logo img {
+  width: 100%;
+  height: 100%;
+  object-fit: contain;
+  display: block;
+}
+
+.provider-chip-logo.is-monochrome {
+  background-color: var(--provider-brand-color, currentColor);
+  -webkit-mask-repeat: no-repeat;
+  mask-repeat: no-repeat;
+  -webkit-mask-size: contain;
+  mask-size: contain;
+  -webkit-mask-position: center;
+  mask-position: center;
+  display: inline-block;
+}
+
 .provider-chip-dot {
   width: 6px;
   height: 6px;
@@ -375,10 +415,30 @@
 .user-message .message-bubble {
   background: linear-gradient(135deg, var(--accent) 0%, color-mix(in srgb, var(--accent) 70%, #000000) 100%);
   color: var(--text-on-accent);
-  border-radius: 22px 22px 6px 22px;
+  border-radius: var(--radius-xl) var(--radius-xl) var(--radius-xs, 4px) var(--radius-xl);
   box-shadow: var(--glow-accent-md), inset 1px 1px 0 rgba(255, 255, 255, 0.2);
 }
 
+.chat-attached-document-card {
+  width: 100%;
+  box-sizing: border-box;
+}
+
+.user-message .chat-attached-document-card {
+  background: color-mix(in srgb, rgba(0, 0, 0, 0.38) 85%, var(--surface-bg, #18181b));
+  border: 1px solid rgba(255, 255, 255, 0.18);
+  backdrop-filter: blur(8px);
+  -webkit-backdrop-filter: blur(8px);
+}
+
+.user-message .chat-attached-document-card:hover {
+  border-color: rgba(255, 255, 255, 0.3);
+}
+
+.chat-attached-document-toggle-action:hover {
+  filter: brightness(1.15);
+}
+
 .ai-message {
   transform-origin: bottom left;
 }
@@ -393,6 +453,7 @@
   box-shadow: none;
   color: var(--text-chat, var(--text-main));
   padding: 0; /* keep spacing handled by wrapper */
+  width: 100%;
 }
 
 .message.ai-message.thinking-message .message-bubble {
@@ -461,12 +522,17 @@
   margin-bottom: 8px;
 }
 
+.chat-list-block {
+  margin: 4px 0;
+  white-space: normal;
+}
+
 .chat-list-item {
   display: flex;
   align-items: flex-start;
   gap: 10px;
-  margin: 4px 0 4px 4px;
-  line-height: 1.74;
+  margin: 3px 0 3px 4px;
+  line-height: 1.68;
 }
 
 .chat-list-bullet {
@@ -502,6 +568,11 @@
   color: var(--text-chat, var(--text-main));
 }
 
+.chat-list-text > .chat-list-block {
+  margin: 4px 0 2px 0;
+  white-space: normal;
+}
+
 .chat-link {
   color: var(--interactive-fg-hover);
   text-decoration: underline;
@@ -521,13 +592,13 @@
 }
 
 .chat-inline-code {
-  background: var(--bg-surface-soft);
-  border: 1px solid var(--border-default);
-  padding: 2px 7px;
-  border-radius: 6px;
-  font-family: 'Fira Code', monospace;
-  font-size: 0.86em;
-  color: var(--text-chat);
+  background: var(--bg-surface-hover, rgba(127, 127, 127, 0.14));
+  border: none;
+  padding: 1.5px 5px;
+  border-radius: var(--radius-xs, 4px);
+  font-family: 'Fira Code', ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
+  font-size: 0.88em;
+  color: var(--text-chat, inherit);
   letter-spacing: -0.01em;
 }
 
@@ -579,7 +650,7 @@
   display: flex;
   gap: 12px;
   background: rgba(0, 0, 0, 0.15);
-  border-radius: var(--radius-2xl);
+  border-radius: var(--radius-composer, 24px);
   padding: 6px;
   border: 1px solid var(--border);
   border-top: 1px solid var(--border-light);
@@ -650,16 +721,16 @@
 
 #chat-tool-btn,
 #screen-capture-btn {
-  background: transparent;
-  color: var(--text-muted);
-  border: 1px solid var(--border);
+  background: var(--btn-gray-bg, transparent);
+  color: var(--btn-gray-fg, var(--text-muted));
+  border: 1px solid var(--btn-gray-border, var(--border));
 }
 
 #chat-tool-btn:hover,
 #screen-capture-btn:hover {
-  background: color-mix(in srgb, var(--accent) 15%, transparent);
-  color: var(--interactive-fg);
-  border-color: color-mix(in srgb, var(--accent) 40%, transparent);
+  background: var(--btn-gray-bg-hover, color-mix(in srgb, var(--accent) 15%, transparent));
+  color: var(--interactive-fg, #ffffff);
+  border-color: var(--accent-border, color-mix(in srgb, var(--accent) 40%, transparent));
 }
 
 .action-card {
@@ -745,7 +816,7 @@
 .approval-tool-icon-wrapper {
   width: 28px;
   height: 28px;
-  border-radius: 7px;
+  border-radius: var(--radius-sm, 8px);
   background: var(--bg-surface-soft);
   border: 1px solid var(--border-subtle);
   display: flex;
@@ -787,12 +858,18 @@
   border-color: var(--border-subtle);
 }
 
+.approval-badge-chip.plan {
+  background: var(--accent-subtle, rgba(105, 230, 166, 0.12));
+  color: var(--accent, #69e6a6);
+  border: 1px solid var(--accent-border, rgba(105, 230, 166, 0.3));
+}
+
 .approval-content-box {
   width: 100%;
   box-sizing: border-box;
   background: var(--bg-surface-soft);
   border: 1px solid var(--border-subtle);
-  border-radius: 9px;
+  border-radius: var(--radius-md, 10px);
   padding: 10px 14px;
   font-family: 'Fira Code', ui-monospace, monospace;
   font-size: 0.84rem;
@@ -816,6 +893,17 @@
   text-align: left;
 }
 
+.approval-content-box.plan-review-content {
+  font-family: inherit;
+  font-size: 0.9rem;
+  line-height: 1.55;
+  background: var(--bg-surface-soft, rgba(255, 255, 255, 0.04));
+  border: 1px solid var(--border-subtle, rgba(255, 255, 255, 0.08));
+  border-radius: var(--radius-md, 10px);
+  padding: 12px 16px;
+  white-space: normal;
+}
+
 .approval-reason-text {
   width: 100%;
   font-size: 0.78rem;
@@ -851,7 +939,7 @@
   padding: 10px 13px;
   background: var(--bg-surface-soft);
   border: 1px solid var(--border-subtle);
-  border-radius: 10px;
+  border-radius: var(--radius-lg, 14px);
   cursor: pointer;
   text-align: left;
   transition: all 0.16s cubic-bezier(0.16, 1, 0.3, 1);
@@ -888,7 +976,7 @@
 .claude-choice-key {
   width: 22px;
   height: 22px;
-  border-radius: 6px;
+  border-radius: var(--radius-xs, 6px);
   background: var(--bg-surface-soft);
   border: 1px solid var(--border-default);
   display: flex;
@@ -970,7 +1058,7 @@
   padding: 9px 12px;
   background: var(--bg-input);
   border: 1px solid var(--border-default);
-  border-radius: 8px;
+  border-radius: var(--radius-sm, 8px);
   color: var(--text-main);
   font-size: 0.84rem;
   font-family: inherit;
@@ -1093,15 +1181,24 @@
   border-color: color-mix(in srgb, var(--status-error, #ef4444) 50%, transparent);
 }
 
+.file-changes-summary-container {
+  width: 100%;
+  align-self: stretch;
+  margin: 6px 0;
+  box-sizing: border-box;
+}
+
 .file-changes-card {
+  width: 100% !important;
   border: 1px solid var(--border) !important;
   border-radius: var(--radius-md, 8px) !important;
   padding: 0 !important;
-  background: var(--surface-bg, #1e1e20) !important;
+  background: var(--bg-surface-raised, #18181b) !important;
   margin-top: 4px;
   overflow: hidden;
   display: flex;
   flex-direction: column;
+  box-sizing: border-box;
 }
 
 .file-changes-summary-row {
@@ -1109,72 +1206,92 @@
   display: flex;
   gap: 12px;
   justify-content: space-between;
-  min-height: 48px;
-  padding: 8px 12px;
+  min-height: 38px;
+  padding: 6px 14px;
+  box-sizing: border-box;
+  cursor: pointer;
+  user-select: none;
+  transition: background 0.15s ease;
+}
+
+.file-changes-summary-row:hover {
+  background: color-mix(in srgb, var(--text-main) 3%, transparent);
+}
+
+.file-changes-summary-row.is-open {
   border-bottom: 1px solid var(--border);
 }
 
-.file-changes-summary {
+.file-changes-summary-toggle {
+  display: inline-flex;
   align-items: center;
-  display: flex;
   gap: 8px;
   min-width: 0;
+  flex: 1;
 }
 
-.file-changes-summary-copy {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  min-width: 0;
+.file-changes-summary-label {
+  color: var(--text-main, #f1f5f9);
+  font-size: 0.88rem;
+  font-weight: 500;
+  white-space: nowrap;
 }
 
-.file-changes-summary-icon {
-  align-items: center;
-  background: color-mix(in srgb, var(--accent) 12%, transparent);
-  border-radius: 7px;
-  color: var(--interactive-fg);
+.file-changes-summary-counts {
   display: inline-flex;
-  flex: 0 0 30px;
-  font-size: 1rem;
-  font-weight: 700;
-  height: 30px;
-  justify-content: center;
+  align-items: center;
+  gap: 6px;
+  font-size: 0.84rem;
+  font-weight: 600;
+  line-height: 1;
 }
 
-.file-changes-summary-label {
-  color: var(--text-main);
-  font-size: 0.84rem;
+.file-changes-count-add {
+  color: var(--interactive-fg, var(--status-success, #22c55e));
   font-weight: 600;
 }
 
-.file-changes-summary-counts {
-  display: inline-flex;
-  gap: 5px;
-  font-size: 0.75rem;
-  line-height: 1.2;
+.file-changes-count-del {
+  color: var(--status-error, #ef4444);
+  font-weight: 600;
+}
+
+.file-changes-chevron {
+  color: var(--text-muted, #94a3b8);
+  transition: transform 0.18s ease;
+  flex-shrink: 0;
+  margin-left: 2px;
+}
+
+.file-changes-chevron.is-open {
+  transform: rotate(90deg);
 }
 
 .file-changes-summary-actions {
-  align-items: center;
   display: inline-flex;
-  flex: 0 0 auto;
-  gap: 7px;
+  align-items: center;
+  gap: 8px;
+  flex-shrink: 0;
 }
 
 .file-changes-review-btn {
-  background: color-mix(in srgb, var(--text-main) 5%, transparent);
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  background: color-mix(in srgb, var(--text-main) 6%, transparent);
   border: 1px solid var(--border);
-  border-radius: var(--radius-xs, 5px);
-  color: var(--text-main);
+  border-radius: var(--radius-sm, 6px);
+  color: var(--text-main, #f1f5f9);
   cursor: pointer;
   font: inherit;
-  font-size: 0.75rem;
-  padding: 5px 10px;
+  font-size: 0.78rem;
+  font-weight: 500;
+  padding: 4px 10px;
   transition: background 0.15s ease, border-color 0.15s ease;
 }
 
 .file-changes-review-btn:hover {
-  background: color-mix(in srgb, var(--text-main) 10%, transparent);
+  background: color-mix(in srgb, var(--text-main) 12%, transparent);
   border-color: var(--border-light, var(--border));
 }
 
@@ -1294,56 +1411,72 @@
   color: var(--interactive-fg-hover);
 }
 
-.file-changes-diff-box {
-  margin-top: 6px;
-  background: var(--input-bg, #0a0a0b);
-  border-radius: var(--radius-sm, 6px);
-  padding: 8px;
+.file-changes-item[draggable="true"] {
+  cursor: grab;
+}
+
+.file-changes-item[draggable="true"]:active {
+  cursor: grabbing;
+}
+
+.file-changes-mention-btn {
+  display: inline-flex;
+  align-items: center;
+  gap: 3px;
+  padding: 1px 6px;
+  font-size: 0.68rem;
+  border-radius: var(--radius-xs, 4px);
+  background: color-mix(in srgb, var(--surface-strong, #1f293d) 60%, transparent);
+  color: var(--text-muted, #94a3b8);
   border: 1px solid var(--border);
-  overflow-x: auto;
-  max-height: 300px;
+  cursor: pointer;
+  font-weight: 500;
+  transition: all 0.15s ease;
 }
 
-.file-changes-diff-hunk {
-  font-size: 0.74rem;
-  font-family: 'Fira Code', 'Courier New', Courier, monospace;
-  line-height: 1.45;
+.file-changes-mention-btn:hover {
+  background: color-mix(in srgb, var(--accent) 18%, transparent);
+  color: var(--interactive-fg);
+  border-color: color-mix(in srgb, var(--accent) 35%, transparent);
 }
 
-.file-changes-diff-del {
-  background: color-mix(in srgb, var(--status-error, #ef4444) 10%, transparent);
-  border-left: 3px solid var(--status-error, #ef4444);
-  padding: 4px 6px;
-  color: var(--text-chat, var(--text-main));
-  white-space: pre-wrap;
+.agent-activity-target-text.is-file-target,
+.agent-activity-subitem-target.is-file-target {
+  cursor: grab;
+  text-decoration: underline dotted color-mix(in srgb, var(--text-muted) 50%, transparent);
 }
 
-.file-changes-diff-add {
-  background: color-mix(in srgb, var(--accent) 10%, transparent);
-  border-left: 3px solid var(--accent);
-  padding: 4px 6px;
-  color: var(--text-chat, var(--text-main));
-  white-space: pre-wrap;
+.agent-activity-target-text.is-file-target:active,
+.agent-activity-subitem-target.is-file-target:active {
+  cursor: grabbing;
 }
 
-.file-changes-diff-sign-del {
-  color: var(--status-error, #ef4444);
-  margin-right: 6px;
-  user-select: none;
+.agent-activity-mention-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
+  padding: 0;
+  font-size: 0.65rem;
   font-weight: 600;
-  display: inline-block;
-  min-width: 10px;
+  border-radius: var(--radius-xs, 4px);
+  background: transparent;
+  color: var(--text-muted);
+  border: 1px solid transparent;
+  cursor: pointer;
+  transition: all 0.15s ease;
+  margin-right: 4px;
 }
 
-.file-changes-diff-sign-add {
+.agent-activity-mention-btn:hover {
+  background: color-mix(in srgb, var(--accent) 20%, transparent);
   color: var(--interactive-fg);
-  margin-right: 6px;
-  user-select: none;
-  font-weight: 600;
-  display: inline-block;
-  min-width: 10px;
+  border-color: color-mix(in srgb, var(--accent) 35%, transparent);
 }
 
+
+
 /* Full-panel code review view */
 .code-review-page {
   display: flex;
@@ -1446,7 +1579,7 @@
 .code-review-filetype {
   align-items: center;
   background: color-mix(in srgb, var(--accent) 13%, transparent);
-  border-radius: 4px;
+  border-radius: var(--radius-xs, 6px);
   color: var(--interactive-fg);
   display: inline-flex;
   font-size: 0.58rem;
@@ -1593,31 +1726,31 @@
 }
 
 .agent-activity-status[data-state="done"] {
-  border-color: rgba(16, 185, 129, 0.35);
-  color: #34d399;
-  background: rgba(16, 185, 129, 0.08);
+  border-color: var(--status-success-border);
+  color: var(--status-success-fg);
+  background: var(--status-success-bg);
 }
 
 .agent-activity-status[data-state="done"]::before {
-  background: #34d399;
-  box-shadow: 0 0 6px #34d399;
+  background: var(--status-success-fg);
+  box-shadow: 0 0 6px var(--status-success-fg);
 }
 
 .agent-activity-status[data-state="error"] {
-  border-color: rgba(239, 68, 68, 0.35);
-  color: #f87171;
-  background: rgba(239, 68, 68, 0.08);
+  border-color: var(--status-error-border);
+  color: var(--status-error-fg);
+  background: var(--status-error-bg);
 }
 
 .agent-activity-status[data-state="error"]::before {
-  background: #f87171;
-  box-shadow: 0 0 6px #f87171;
+  background: var(--status-error-fg);
+  box-shadow: 0 0 6px var(--status-error-fg);
 }
 
 .agent-activity-status[data-state="cancelled"] {
-  border-color: rgba(148, 163, 184, 0.28);
+  border-color: var(--border-default);
   color: var(--text-muted);
-  background: rgba(148, 163, 184, 0.05);
+  background: var(--bg-surface-soft);
 }
 
 .agent-activity-status[data-state="cancelled"]::before {
@@ -1625,13 +1758,13 @@
 }
 
 .agent-activity-status[data-state="approval"] {
-  border-color: rgba(245, 158, 11, 0.4);
-  color: #fbbf24;
-  background: rgba(245, 158, 11, 0.12);
+  border-color: var(--status-warning-border);
+  color: var(--status-warning-fg);
+  background: var(--status-warning-bg);
 }
 
 .agent-activity-status[data-state="approval"]::before {
-  background: #fbbf24;
+  background: var(--status-warning-fg);
   animation: pulse-ring-amber 1.8s infinite;
 }
 
@@ -1734,7 +1867,7 @@
   flex-shrink: 0;
   background: color-mix(in srgb, var(--accent, #38bdf8) 10%, transparent);
   padding: 1px 6px;
-  border-radius: 4px;
+  border-radius: var(--radius-xs, 6px);
   border: 1px solid color-mix(in srgb, var(--accent, #38bdf8) 20%, transparent);
 }
 
@@ -1757,7 +1890,7 @@
 
 .agent-activity-badge {
   align-items: center;
-  border-radius: 4px;
+  border-radius: var(--radius-xs, 6px);
   display: inline-flex;
   flex-shrink: 0;
   font-size: 0.65rem;
@@ -1769,15 +1902,15 @@
 }
 
 .agent-activity-badge.retry {
-  background: rgba(245, 158, 11, 0.16);
-  border: 1px solid rgba(245, 158, 11, 0.35);
-  color: #fbbf24;
+  background: var(--status-warning-bg);
+  border: 1px solid var(--status-warning-border);
+  color: var(--status-warning-fg);
 }
 
 .agent-activity-badge.error {
-  background: rgba(239, 68, 68, 0.16);
-  border: 1px solid rgba(239, 68, 68, 0.35);
-  color: #f87171;
+  background: var(--status-error-bg);
+  border: 1px solid var(--status-error-border);
+  color: var(--status-error-fg);
 }
 
 .agent-activity-chevron {
@@ -1845,7 +1978,7 @@
   color: var(--text-muted);
   background: var(--bg-surface-soft);
   border: 1px solid var(--border-subtle);
-  border-radius: 10px;
+  border-radius: var(--radius-sm, 8px);
 }
 
 .agent-activity-group-subitems {
@@ -1862,7 +1995,7 @@
   padding: 3px 12px 3px 8px;
   font-size: 0.78rem;
   color: var(--text-muted, #94a3b8);
-  border-radius: 4px;
+  border-radius: var(--radius-xs, 6px);
   transition: background 0.12s ease, color 0.12s ease;
 }
 
@@ -1899,7 +2032,7 @@
 
 .agent-activity-subitem-output {
   margin: 2px 10px 6px 24px;
-  border-radius: 6px;
+  border-radius: var(--radius-xs, 6px);
 }
 
 .agent-activity-output {
@@ -2029,7 +2162,7 @@
 
 .thinking-block-content::-webkit-scrollbar-thumb {
   background: rgba(148, 163, 184, 0.22);
-  border-radius: 2px;
+  border-radius: var(--radius-2xs, 4px);
 }
 
 .thinking-block-step + .thinking-block-step {
@@ -2147,8 +2280,8 @@
   font-size: 11.5px;
   padding: 1px 4px;
   background: rgba(255, 255, 255, 0.05);
-  border: 1px solid var(--border, rgba(255, 255, 255, 0.06));
-  border-radius: 3px;
+  border: none;
+  border-radius: var(--radius-xs, 4px);
   color: var(--text-muted, #cbd5e1);
 }
 
@@ -2157,7 +2290,7 @@
 .thinking-block-content .chat-code-block {
   margin: 6px 0;
   padding: 8px 10px;
-  border-radius: 6px;
+  border-radius: var(--radius-xs, 6px);
   background: rgba(0, 0, 0, 0.2);
   border: 1px solid var(--border, rgba(255, 255, 255, 0.06));
   font-size: 11.5px;
@@ -2504,7 +2637,7 @@ input:checked + .slider:before {
   flex: none;
   display: flex;
   flex-direction: column;
-  padding: 44px 28px 24px 0;
+  padding: 44px 28px 12px 0;
   background: transparent;
   border: 0;
   border-radius: 0;
@@ -2619,7 +2752,7 @@ input:checked + .slider:before {
 .user-message .message-bubble {
   background: linear-gradient(135deg, var(--surface-strong), color-mix(in srgb, var(--accent) 16%, var(--surface-strong)));
   border: 1px solid var(--border-default);
-  border-radius: 22px 22px 6px 22px;
+  border-radius: var(--radius-xl) var(--radius-xl) var(--radius-xs, 4px) var(--radius-xl);
   color: var(--text-main);
   box-shadow: none;
 }
@@ -2636,6 +2769,7 @@ input:checked + .slider:before {
   box-shadow: none !important;
   border-radius: 0 !important;
   padding: 0 !important;
+  width: 100%;
 }
 
 .input-area {
@@ -2743,65 +2877,215 @@ input:checked + .slider:before {
   }
 }
 
-/* Project context is the first row of the composer, not a promotional CTA. */
-.project-context-row {
-  position: relative;
-  min-width: 0;
+/* Subagent Status Strip (Docked above composer) */
+.subagent-status-strip {
   display: flex;
-  align-items: center;
+  flex-direction: column;
   gap: 6px;
-  min-height: 44px;
-  padding: 5px 8px;
-  background: var(--input-bg);
-  border: 1px solid var(--border);
-  border-bottom: 0;
-  border-radius: var(--radius-xl) var(--radius-xl) 0 0;
+  max-width: calc(100% - 28px);
+  margin: 0 auto 8px;
+  padding: 8px 12px;
+  background: var(--bg-surface-raised, #18181b);
+  border: 1px solid var(--border-subtle, #27272a);
+  border-radius: var(--radius-md, 8px);
+  box-shadow: var(--shadow-xs, 0 1px 2px rgba(0, 0, 0, 0.1));
+  font-size: 0.75rem;
+  line-height: 1.35;
+  transition: border-color 140ms ease, box-shadow 140ms ease;
+  user-select: none;
 }
 
-.project-context-row + .smart-context-bar {
-  border-top-color: var(--border-subtle);
-  border-radius: 0;
+.subagent-status-strip[role="button"] {
+  cursor: pointer;
 }
 
-.git-branch-selector {
-  position: relative;
-  display: flex;
-  flex: 0 1 auto;
-  min-width: 0;
-  max-width: 38%;
+.subagent-status-strip[role="button"]:hover {
+  border-color: var(--border-strong, #3f3f46);
+  box-shadow: var(--shadow-sm, 0 2px 4px rgba(0, 0, 0, 0.15));
 }
 
-.git-branch-trigger {
-  min-width: 0;
-  min-height: 32px;
-  max-width: 100%;
-  padding: 0 9px;
+.subagent-status-strip-header {
   display: flex;
   align-items: center;
-  gap: 7px;
-  color: var(--text-secondary);
-  background: transparent;
-  border: 0;
-  border-radius: var(--radius-md);
-  cursor: pointer;
+  justify-content: space-between;
+  gap: 8px;
+  padding-bottom: 4px;
+  border-bottom: 1px solid var(--border-subtle, #27272a);
 }
 
-.git-branch-trigger:hover:not(:disabled),
-.git-branch-trigger[aria-expanded='true'] {
-  color: var(--text-primary);
-  background: var(--bg-surface-hover);
+.subagent-status-strip-header-left {
+  display: flex;
+  align-items: center;
+  gap: 6px;
 }
 
-.git-branch-trigger:focus-visible {
-  position: relative;
-  z-index: 2;
-  outline: 2px solid var(--border-focus, var(--accent));
-  outline-offset: -2px;
+.subagent-status-strip-title {
+  font-weight: 600;
+  color: var(--text-primary, #f4f4f5);
 }
 
-.git-branch-trigger:disabled {
-  cursor: default;
-  opacity: 0.55;
+.subagent-status-strip-hint {
+  font-size: 0.7rem;
+  color: var(--flavor-mint, #10b981);
+}
+
+.subagent-status-spinner,
+.subagent-status-row-spinner {
+  display: inline-block;
+  width: 10px;
+  height: 10px;
+  border: 1.5px solid var(--border-subtle, #3f3f46);
+  border-top-color: var(--flavor-mint, #10b981);
+  border-radius: 50%;
+  animation: subagent-strip-spin 700ms linear infinite;
+}
+
+@keyframes subagent-strip-spin {
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+.subagent-status-icon-check,
+.subagent-status-row-check {
+  color: var(--flavor-mint, #10b981);
+  font-weight: bold;
+}
+
+.subagent-status-icon-alert,
+.subagent-status-row-cross {
+  color: #ef4444;
+  font-weight: bold;
+}
+
+.subagent-status-strip-list {
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+}
+
+.subagent-status-strip-row {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  padding: 2px 4px;
+  border-radius: var(--radius-sm, 4px);
+  background: var(--bg-surface-subtle, rgba(255, 255, 255, 0.02));
+}
+
+.subagent-status-strip-row-main {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-width: 0;
+  overflow: hidden;
+}
+
+.subagent-status-strip-tag {
+  color: var(--flavor-mint, #10b981);
+  font-weight: 600;
+  white-space: nowrap;
+}
+
+.subagent-status-strip-desc {
+  color: var(--text-secondary, #a1a1aa);
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.subagent-status-strip-timing {
+  font-size: 0.7rem;
+  color: var(--text-muted, #71717a);
+  white-space: nowrap;
+}
+
+/* Project context is the first row of the composer, not a promotional CTA. */
+.project-context-row {
+  position: relative;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  min-height: 34px;
+  padding: 4px 10px;
+  background: var(--input-bg);
+  border: 1px solid var(--border);
+  border-bottom: 1px solid color-mix(in srgb, var(--border) 45%, transparent);
+  border-radius: var(--radius-composer, 20px) var(--radius-composer, 20px) 0 0;
+}
+
+.project-context-row .workspace-select-btn,
+.project-context-row .git-branch-trigger {
+  min-height: 26px;
+  height: 26px;
+  padding: 0 8px;
+  font-size: 0.76rem;
+  border-radius: var(--radius-sm, 8px);
+}
+
+.project-context-row .git-branch-trigger {
+  background: var(--surface-strong);
+  border: 1px solid var(--border-subtle);
+  color: var(--text-primary);
+  transition: background-color 120ms ease, border-color 120ms ease, color 120ms ease;
+}
+
+.project-context-row .git-branch-trigger:hover:not(:disabled),
+.project-context-row .git-branch-trigger[aria-expanded='true'] {
+  background: var(--bg-surface-hover);
+  border-color: var(--border);
+  color: var(--text-primary);
+}
+
+.project-context-row + #chat-form,
+.project-context-row + .smart-context-bar {
+  border-top-color: var(--border-subtle);
+  border-radius: 0;
+}
+
+.git-branch-selector {
+  position: relative;
+  display: flex;
+  flex: 0 1 auto;
+  min-width: 0;
+  max-width: 38%;
+}
+
+.git-branch-trigger {
+  min-width: 0;
+  min-height: 32px;
+  max-width: 100%;
+  padding: 0 9px;
+  display: flex;
+  align-items: center;
+  gap: 7px;
+  color: var(--text-primary);
+  background: var(--surface-strong);
+  border: 1px solid var(--border-subtle);
+  border-radius: var(--radius-md);
+  cursor: pointer;
+  transition: background-color 120ms ease, border-color 120ms ease, color 120ms ease;
+}
+
+.git-branch-trigger:hover:not(:disabled),
+.git-branch-trigger[aria-expanded='true'] {
+  color: var(--text-primary);
+  background: var(--bg-surface-hover);
+  border-color: var(--border);
+}
+
+.git-branch-trigger:focus-visible {
+  position: relative;
+  z-index: 2;
+  outline: 2px solid var(--border-focus, var(--accent));
+  outline-offset: -2px;
+}
+
+.git-branch-trigger:disabled {
+  cursor: default;
+  opacity: 0.55;
 }
 
 .git-branch-icon,
@@ -2837,7 +3121,7 @@ input:checked + .slider:before {
   height: 5px;
   flex: 0 0 5px;
   border-radius: 50%;
-  background: var(--accent);
+  background: var(--status-warning, #f59e0b);
 }
 
 .git-branch-menu {
@@ -2846,16 +3130,30 @@ input:checked + .slider:before {
   right: auto;
   bottom: calc(100% + 8px);
   z-index: 80;
-  width: min(320px, calc(100vw - 48px));
+  width: min(320px, calc(100vw - 32px));
   padding: 6px;
   color: var(--text-primary);
-  background: var(--bg-surface-raised);
-  border: 1px solid var(--border-default);
-  border-radius: var(--radius-md);
-  box-shadow: var(--shadow-lg);
+  background: var(--panel-bg, #18181b);
+  border: 1px solid var(--border);
+  border-radius: var(--radius-xl, 16px);
+  box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.4), 0 8px 10px -6px rgba(0, 0, 0, 0.3);
+  backdrop-filter: var(--glass-blur);
+  -webkit-backdrop-filter: var(--glass-blur);
+  animation: git-branch-popover-in 0.15s cubic-bezier(0.16, 1, 0.3, 1);
   overflow-y: auto;
 }
 
+@keyframes git-branch-popover-in {
+  from {
+    opacity: 0;
+    transform: translateY(4px) scale(0.98);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0) scale(1);
+  }
+}
+
 .git-branch-menu.align-right {
   left: auto;
   right: 0;
@@ -2867,19 +3165,23 @@ input:checked + .slider:before {
 }
 
 .git-branch-search {
-  height: 34px;
-  padding: 0 10px;
+  height: 32px;
+  padding: 0 9px;
   display: flex;
   align-items: center;
   gap: 8px;
+  margin-bottom: 4px;
   color: var(--text-muted);
-  background: var(--input-bg);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-sm);
+  background: var(--surface-strong, rgba(255, 255, 255, 0.05));
+  border: 1px solid var(--border-default, rgba(255, 255, 255, 0.08));
+  border-radius: var(--radius-md, 10px);
+  transition: all 0.15s ease;
 }
 
 .git-branch-search:focus-within {
-  border-color: var(--border-focus, var(--accent));
+  border-color: var(--border-strong, rgba(255, 255, 255, 0.22));
+  background: var(--surface-strong, rgba(255, 255, 255, 0.08));
+  color: var(--text-primary);
 }
 
 .git-branch-search input {
@@ -2890,7 +3192,7 @@ input:checked + .slider:before {
   border: 0;
   outline: 0;
   font: inherit;
-  font-size: 0.76rem;
+  font-size: 0.78rem;
 }
 
 .git-branch-search input::placeholder {
@@ -2898,33 +3200,40 @@ input:checked + .slider:before {
 }
 
 .git-branch-menu-heading {
-  padding: 10px 8px 5px;
+  padding: 6px 8px 4px;
   color: var(--text-muted);
-  font-size: 0.66rem;
+  font-size: 0.68rem;
   font-weight: 600;
-  letter-spacing: 0.06em;
-  text-transform: none;
+  letter-spacing: 0.05em;
+  text-transform: uppercase;
 }
 
 .git-branch-list {
   max-height: 180px;
   overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
+  scrollbar-width: thin;
 }
 
 .git-branch-option {
   width: 100%;
-  min-height: 34px;
+  min-height: 32px;
   padding: 6px 8px;
   display: grid;
-  grid-template-columns: 18px minmax(0, 1fr) 16px;
+  grid-template-columns: 16px minmax(0, 1fr) auto;
   align-items: center;
-  gap: 7px;
+  gap: 9px;
   color: var(--text-secondary);
   background: transparent;
-  border: 0;
-  border-radius: var(--radius-sm);
+  border: 1px solid transparent;
+  border-radius: var(--radius-md, 10px);
   text-align: left;
   cursor: pointer;
+  font-size: 0.8rem;
+  font-weight: 500;
+  transition: all 0.12s ease;
 }
 
 .git-branch-option span:nth-child(2) {
@@ -2936,17 +3245,24 @@ input:checked + .slider:before {
 .git-branch-option:hover:not(:disabled),
 .git-branch-option:focus-visible {
   color: var(--text-primary);
-  background: var(--bg-surface-hover);
+  background: var(--bg-surface-hover, rgba(255, 255, 255, 0.06));
   outline: 0;
 }
 
+.git-branch-option:hover:not(:disabled) .git-branch-option-icon,
+.git-branch-option:focus-visible .git-branch-option-icon {
+  color: var(--text-primary);
+}
+
 .git-branch-option[aria-selected='true'] {
   color: var(--text-primary);
-  background: var(--bg-surface-soft);
+  background: var(--bg-surface-hover, rgba(255, 255, 255, 0.08));
+  border-color: var(--border, rgba(255, 255, 255, 0.16));
 }
 
-.git-branch-option[aria-selected='true'] svg {
-  color: var(--interactive-fg);
+.git-branch-option[aria-selected='true'] .git-branch-option-icon,
+.git-branch-option[aria-selected='true'] .git-branch-option-check {
+  color: var(--text-primary);
 }
 
 .git-branch-option:disabled {
@@ -2955,8 +3271,42 @@ input:checked + .slider:before {
 }
 
 .git-branch-option-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
   color: var(--text-muted);
-  font-size: 0.9rem;
+  flex-shrink: 0;
+  transition: color 0.12s ease;
+}
+
+.git-branch-option-check {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 16px;
+  height: 16px;
+  color: var(--accent, #10b981);
+  flex-shrink: 0;
+}
+
+.git-branch-track-label {
+  display: inline-flex;
+  align-items: center;
+  padding: 1px 7px;
+  font-size: 0.66rem;
+  font-weight: 500;
+  color: var(--text-muted);
+  background: var(--surface-strong);
+  border: 1px solid var(--border-subtle);
+  border-radius: var(--radius-full, 999px);
+  transition: all 0.12s ease;
+}
+
+.git-branch-option:hover .git-branch-track-label {
+  color: var(--text-primary);
+  border-color: var(--border);
 }
 
 .git-branch-empty {
@@ -2968,14 +3318,16 @@ input:checked + .slider:before {
 
 .git-branch-error {
   margin-top: 6px;
-  padding: 8px;
+  padding: 8px 10px;
   display: flex;
   align-items: flex-start;
   justify-content: space-between;
   gap: 10px;
   color: var(--status-error, #ef4444);
-  border-top: 1px solid var(--border-subtle);
-  font-size: 0.7rem;
+  background: color-mix(in srgb, var(--status-error, #ef4444) 10%, transparent);
+  border-radius: var(--radius-md, 8px);
+  border: 1px solid color-mix(in srgb, var(--status-error, #ef4444) 25%, transparent);
+  font-size: 0.72rem;
   line-height: 1.35;
 }
 
@@ -2987,155 +3339,191 @@ input:checked + .slider:before {
   cursor: pointer;
   font: inherit;
   font-weight: 600;
-}
-
-.git-branch-track-label {
-  color: var(--text-muted);
-  font-size: 0.64rem;
-  text-align: right;
+  text-decoration: underline;
 }
 
 .git-branch-actions {
   margin-top: 6px;
   padding-top: 6px;
-  display: grid;
+  display: flex;
+  flex-direction: column;
+  gap: 2px;
   border-top: 1px solid var(--border-subtle);
 }
 
 .git-branch-actions button {
-  min-height: 34px;
+  min-height: 32px;
   padding: 6px 8px;
   display: flex;
   align-items: center;
-  gap: 8px;
+  gap: 9px;
   color: var(--text-secondary);
   background: transparent;
-  border: 0;
-  border-radius: var(--radius-sm);
+  border: 1px solid transparent;
+  border-radius: var(--radius-md, 10px);
+  font-size: 0.8rem;
+  font-weight: 500;
   text-align: left;
   cursor: pointer;
+  transition: all 0.12s ease;
+}
+
+.git-branch-actions button svg {
+  color: var(--text-muted);
+  flex-shrink: 0;
+  transition: color 0.12s ease;
 }
 
 .git-branch-actions button:hover,
 .git-branch-actions button:focus-visible {
   color: var(--text-primary);
-  background: var(--bg-surface-hover);
+  background: var(--bg-surface-hover, rgba(255, 255, 255, 0.06));
   outline: 0;
 }
 
+.git-branch-actions button:hover svg,
+.git-branch-actions button:focus-visible svg {
+  color: var(--text-primary);
+}
+
 .git-branch-view-header {
   min-height: 34px;
-  display: grid;
-  grid-template-columns: 30px minmax(0, 1fr) auto;
+  display: flex;
   align-items: center;
-  gap: 6px;
+  gap: 8px;
+  padding: 2px 2px 8px;
   border-bottom: 1px solid var(--border-subtle);
 }
 
 .git-branch-view-header > button {
-  min-width: 30px;
-  height: 30px;
-  padding: 0 7px;
+  width: 28px;
+  height: 28px;
+  padding: 0;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
   color: var(--text-muted);
   background: transparent;
-  border: 0;
-  border-radius: var(--radius-sm);
+  border: 1px solid transparent;
+  border-radius: var(--radius-md, 8px);
   cursor: pointer;
+  transition: all 0.12s ease;
 }
 
 .git-branch-view-header > button:hover:not(:disabled),
 .git-branch-view-header > button:focus-visible {
   color: var(--text-primary);
   background: var(--bg-surface-hover);
+  border-color: var(--border-subtle);
   outline: 0;
 }
 
 .git-branch-view-header strong {
-  overflow: hidden;
-  font-size: 0.76rem;
+  flex: 1;
+  color: var(--text-primary);
+  font-size: 0.82rem;
   font-weight: 600;
-  text-overflow: ellipsis;
-  white-space: nowrap;
 }
 
 .git-branch-create {
-  display: grid;
-  gap: 9px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  padding-top: 8px;
 }
 
 .git-branch-create > label {
-  margin-top: 3px;
   color: var(--text-muted);
-  font-size: 0.68rem;
-  font-weight: 600;
+  font-size: 0.72rem;
+  font-weight: 500;
 }
 
 .git-branch-create > input {
-  height: 36px;
+  height: 34px;
   padding: 0 10px;
   color: var(--text-primary);
-  background: var(--input-bg);
-  border: 1px solid var(--border);
-  border-radius: var(--radius-sm);
+  background: var(--surface-strong, rgba(255, 255, 255, 0.05));
+  border: 1px solid var(--border-default, rgba(255, 255, 255, 0.08));
+  border-radius: var(--radius-md, 10px);
   outline: 0;
   font: inherit;
-  font-size: 0.76rem;
+  font-size: 0.8rem;
+  transition: all 0.15s ease;
 }
 
 .git-branch-create > input:focus {
-  border-color: var(--border-focus, var(--accent));
+  border-color: var(--border-strong, rgba(255, 255, 255, 0.22));
+  background: var(--surface-strong, rgba(255, 255, 255, 0.08));
 }
 
 .git-branch-create > p {
   margin: 0;
   color: var(--text-muted);
-  font-size: 0.68rem;
+  font-size: 0.72rem;
   line-height: 1.4;
 }
 
 .git-branch-create > p strong {
-  color: var(--text-secondary);
-  font-weight: 500;
+  color: var(--text-primary);
+  font-weight: 600;
 }
 
 .git-branch-create-submit {
-  min-height: 34px;
-  color: var(--text-on-accent);
-  background: var(--accent);
+  height: 32px;
+  padding: 0 12px;
+  color: var(--accent-contrast, #ffffff);
+  background: linear-gradient(135deg, var(--accent), var(--accent-hover, var(--accent)));
   border: 0;
-  border-radius: var(--radius-sm);
-  cursor: pointer;
-  font: inherit;
-  font-size: 0.74rem;
+  border-radius: var(--radius-md, 10px);
+  font-size: 0.78rem;
   font-weight: 600;
+  cursor: pointer;
+  transition: all 0.15s ease;
 }
 
 .git-branch-create-submit:hover:not(:disabled) {
-  background: var(--accent-hover);
+  opacity: 0.92;
+  transform: translateY(-1px);
 }
 
 .git-branch-create-submit:focus-visible {
-  outline: 2px solid var(--border-focus, var(--accent));
-  outline-offset: 2px;
+  outline: 2px solid var(--accent);
+  outline-offset: 1px;
 }
 
 .git-branch-create-submit:disabled {
-  cursor: default;
-  opacity: 0.45;
+  cursor: not-allowed;
+  opacity: 0.5;
 }
 
 .git-branch-menu.is-graph {
-  width: min(540px, calc(100vw - 48px));
+  width: min(540px, calc(100vw - 32px));
 }
 
 .git-graph-view {
-  display: grid;
-  gap: 6px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
 }
 
 .git-graph-refresh {
   width: auto;
-  font-size: 0.68rem;
+  height: 26px;
+  padding: 0 9px;
+  font-size: 0.72rem;
+  font-weight: 500;
+  border-radius: var(--radius-sm, 6px);
+  background: var(--surface-strong);
+  border: 1px solid var(--border-subtle);
+  color: var(--text-secondary);
+  cursor: pointer;
+  transition: all 0.12s ease;
+}
+
+.git-graph-refresh:hover:not(:disabled) {
+  background: var(--bg-surface-hover);
+  color: var(--text-primary);
+  border-color: var(--border);
 }
 
 .git-graph-output {
@@ -3145,12 +3533,12 @@ input:checked + .slider:before {
   padding: 10px;
   overflow: auto;
   color: var(--text-secondary);
-  background: var(--input-bg);
-  border: 1px solid var(--border-subtle);
-  border-radius: var(--radius-sm);
+  background: var(--surface-strong, rgba(255, 255, 255, 0.04));
+  border: 1px solid var(--border-default, rgba(255, 255, 255, 0.08));
+  border-radius: var(--radius-md, 10px);
   font-family: var(--font-mono, monospace);
-  font-size: 0.68rem;
-  line-height: 1.65;
+  font-size: 0.72rem;
+  line-height: 1.6;
   tab-size: 14;
   white-space: pre;
 }
@@ -3165,7 +3553,7 @@ input:checked + .slider:before {
   display: grid;
   place-items: center;
   color: var(--text-muted);
-  font-size: 0.74rem;
+  font-size: 0.76rem;
 }
 
 @media (max-width: 1100px) {
@@ -3221,7 +3609,7 @@ input:checked + .slider:before {
   background: var(--input-bg);
   border: 1px solid var(--border);
   border-bottom: 0;
-  border-radius: var(--radius-xl) var(--radius-xl) 0 0;
+  border-radius: var(--radius-composer, 24px) var(--radius-composer, 24px) 0 0;
   display: flex;
   align-items: center;
   flex-wrap: wrap;
@@ -3314,26 +3702,28 @@ input:checked + .slider:before {
 }
 
 #chat-form {
-  min-height: 88px;
+  min-height: 62px;
   display: grid;
   grid-template-columns: 32px 32px minmax(0, 1fr) 32px 32px;
-  grid-template-rows: auto minmax(48px, auto) 32px;
+  grid-template-rows: auto minmax(26px, auto) 32px;
   align-items: end;
   gap: 6px;
-  padding: 10px 14px 10px 14px;
+  padding: 6px 12px 8px 12px;
   background: var(--input-bg);
   border: 1px solid var(--border);
-  border-radius: var(--radius-xl);
+  border-radius: var(--radius-composer, 20px);
   box-shadow: none;
   backdrop-filter: var(--glass-blur);
   -webkit-backdrop-filter: var(--glass-blur);
 }
 
+.project-context-row + #chat-form,
 .smart-context-bar + #chat-form {
+  border-top: 0;
   border-top-left-radius: 0;
   border-top-right-radius: 0;
-  border-bottom-left-radius: var(--radius-xl);
-  border-bottom-right-radius: var(--radius-xl);
+  border-bottom-left-radius: var(--radius-composer, 20px);
+  border-bottom-right-radius: var(--radius-composer, 20px);
 }
 
 #chat-form:focus-within {
@@ -3393,8 +3783,62 @@ input:checked + .slider:before {
   cursor: pointer;
 }
 
+.composer-file-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 3px 8px 3px 10px;
+  border-radius: var(--radius-full, 9999px);
+  background: color-mix(in srgb, var(--surface-strong, #1e293b) 82%, var(--accent) 14%);
+  border: 1px solid color-mix(in srgb, var(--accent) 30%, var(--border, rgba(148, 163, 184, 0.2)));
+  color: var(--text-primary, #f1f5f9);
+  font-size: 0.78rem;
+  font-weight: 500;
+  max-width: 260px;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12);
+  transition: border-color 0.15s ease, background 0.15s ease;
+}
+
+.composer-file-chip:hover {
+  border-color: var(--accent);
+  background: color-mix(in srgb, var(--surface-strong, #1e293b) 75%, var(--accent) 20%);
+}
+
+.composer-file-chip-icon {
+  display: inline-flex;
+  align-items: center;
+  color: var(--accent);
+  flex-shrink: 0;
+}
+
+.composer-file-chip-name {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.composer-file-chip-remove {
+  background: transparent;
+  border: 0;
+  padding: 2px;
+  margin-left: 2px;
+  color: var(--text-muted, #94a3b8);
+  cursor: pointer;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border-radius: 50%;
+  transition: color 0.15s ease, background 0.15s ease;
+  flex-shrink: 0;
+}
+
+.composer-file-chip-remove:hover {
+  color: var(--status-error, #ef4444);
+  background: rgba(239, 68, 68, 0.12);
+}
+
 #chat-form:not(:has(.mint-attachment)) {
-  grid-template-rows: minmax(48px, auto) 32px;
+  grid-template-rows: minmax(26px, auto) 32px;
 }
 
 #chat-form:not(:has(.mint-attachment)) #chat-input {
@@ -3404,20 +3848,45 @@ input:checked + .slider:before {
 #chat-form:not(:has(.mint-attachment)) .chat-tool-menu-wrap,
 #chat-form:not(:has(.mint-attachment)) #screen-capture-btn,
 #chat-form:not(:has(.mint-attachment)) .chat-provider-select,
+#chat-form:not(:has(.mint-attachment)) .chat-composer-pills,
 #chat-form:not(:has(.mint-attachment)) #send-btn {
   grid-row: 2;
 }
 
+.chat-composer-pills {
+  grid-column: 3;
+  grid-row: 3;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  min-width: 0;
+  width: 100%;
+  position: static;
+}
+
+.chat-composer-pills .model-selector-container {
+  grid-column: auto;
+  grid-row: auto;
+  position: static;
+  min-width: 0;
+  flex-shrink: 1;
+}
+
+.chat-composer-pills .chat-mode-selector-wrap {
+  flex-shrink: 0;
+}
+
 #chat-input {
   grid-column: 1 / -1;
   grid-row: 2;
   align-self: start;
-  min-height: 48px;
-  max-height: 120px;
-  padding: 12px 0;
+  min-height: 26px;
+  max-height: 140px;
+  padding: 3px 2px 2px 2px;
   color: var(--text-main);
-  font-size: 1rem;
-  line-height: 1.5;
+  font-size: 0.94rem;
+  line-height: 1.45;
   resize: none;
   overflow-y: auto;
   border: 0;
@@ -3642,15 +4111,43 @@ input:checked + .slider:before {
   box-shadow: none;
 }
 
-#send-btn:hover,
-#chat-tool-btn:hover,
-#screen-capture-btn:hover {
-  background: var(--panel-raised);
-  transform: none;
+:root[data-accent-mode="monochrome"] #send-btn,
+:root[data-accent-mode="gray"] #send-btn {
+  background: var(--btn-gray-bg, #17171a);
+  color: #ffffff;
+  border: 1px solid var(--btn-gray-border, rgba(255, 255, 255, 0.12));
+}
+
+:root[data-accent-mode="monochrome"] #send-btn:hover,
+:root[data-accent-mode="gray"] #send-btn:hover {
+  background: var(--btn-gray-bg-hover, #222227);
+  color: #ffffff;
+}
+
+[data-theme="light"][data-accent-mode="monochrome"] #send-btn,
+[data-theme="light"][data-accent-mode="gray"] #send-btn {
+  background: var(--btn-gray-bg, #334155);
+  color: #ffffff;
+  border: 1px solid rgba(15, 23, 42, 0.2);
+}
+
+[data-theme="light"][data-accent-mode="monochrome"] #send-btn:hover,
+[data-theme="light"][data-accent-mode="gray"] #send-btn:hover {
+  background: var(--btn-gray-bg-hover, #1e293b);
+  color: #ffffff;
 }
 
 #send-btn:hover {
   background: var(--accent-hover);
+  transform: none;
+}
+
+#chat-tool-btn:hover,
+#screen-capture-btn:hover {
+  background: var(--btn-gray-bg-hover, var(--panel-raised));
+  border-color: var(--accent-border, var(--btn-gray-border-hover));
+  color: #ffffff;
+  transform: none;
 }
 
 #chat-tool-btn {
@@ -3724,7 +4221,7 @@ input:checked + .slider:before {
   backdrop-filter: blur(20px) saturate(180%);
   -webkit-backdrop-filter: blur(20px) saturate(180%);
   border: 1px solid var(--border-subtle, rgba(255, 255, 255, 0.08));
-  border-radius: var(--radius-xl, 14px);
+  border-radius: var(--radius-full, 9999px);
   box-shadow: 0 8px 24px -4px rgba(0, 0, 0, 0.35),
               0 1px 0 0 rgba(255, 255, 255, 0.04) inset;
   position: sticky;
@@ -3782,7 +4279,7 @@ input:checked + .slider:before {
   padding: 2px 8px;
   background: rgba(255, 255, 255, 0.06);
   border: 1px solid rgba(255, 255, 255, 0.08);
-  border-radius: var(--radius-sm, 6px);
+  border-radius: var(--radius-full, 9999px);
   font-size: 0.76rem;
   font-weight: 500;
   color: var(--text-secondary, #94a3b8);
@@ -3832,7 +4329,7 @@ input:checked + .slider:before {
   justify-content: center;
   width: 30px;
   height: 30px;
-  border-radius: 8px;
+  border-radius: var(--radius-full, 9999px);
   background: color-mix(in srgb, var(--bg-surface, #202632) 70%, transparent);
   border: 1px solid color-mix(in srgb, var(--border, rgba(255, 255, 255, 0.08)) 80%, transparent);
   color: var(--text-muted, #94a3b8);
@@ -3862,8 +4359,8 @@ input:checked + .slider:before {
   gap: 5px;
   background: color-mix(in srgb, var(--bg-surface, #202632) 80%, transparent);
   border: 1px solid var(--border-default, rgba(255, 255, 255, 0.1));
-  border-radius: var(--radius-xs, 6px);
-  padding: 3px 9px;
+  border-radius: var(--radius-full, 9999px);
+  padding: 4px 11px;
   color: var(--text-primary);
   font-size: 0.8rem;
   font-weight: 500;
@@ -3889,14 +4386,19 @@ input:checked + .slider:before {
   display: inline-flex;
   align-items: center;
   gap: 6px;
-  padding: 2px 8px;
-  border-radius: 6px;
-  background: color-mix(in srgb, var(--accent, #10b981) 10%, transparent);
-  border: 1px solid color-mix(in srgb, var(--accent, #10b981) 20%, transparent);
+  padding: 4px 10px;
+  border-radius: var(--radius-full, 9999px);
+  background: color-mix(in srgb, var(--bg-surface, #202632) 80%, transparent);
+  border: 1px solid var(--border-default, rgba(255, 255, 255, 0.1));
   font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
-  font-size: 0.8rem;
-  font-weight: 600;
-  color: var(--interactive-fg);
+  font-size: 0.78rem;
+  font-weight: 500;
+  color: var(--text-secondary);
+  user-select: none;
+}
+
+.chat-header .tools-panel-toggle {
+  border-radius: var(--radius-full, 9999px);
 }
 
 .drag-drop-overlay {
@@ -4056,6 +4558,50 @@ input:checked + .slider:before {
   color: #dc2626;
 }
 
+[data-theme="light"] .project-context-row {
+  background: #ffffff;
+  border-color: rgba(15, 23, 42, 0.16);
+}
+
+[data-theme="light"] .project-context-row .git-branch-trigger {
+  background: #f1f5f9;
+  border-color: rgba(15, 23, 42, 0.1);
+  color: #334155;
+}
+
+[data-theme="light"] .project-context-row .git-branch-trigger:hover,
+[data-theme="light"] .project-context-row .git-branch-trigger[aria-expanded='true'] {
+  background: #e2e8f0;
+  border-color: rgba(15, 23, 42, 0.18);
+  color: #0f172a;
+}
+
+[data-theme="light"] .git-branch-menu {
+  background: #ffffff;
+  border-color: rgba(15, 23, 42, 0.12);
+  box-shadow: 0 10px 25px -5px rgba(0, 0, 0, 0.1), 0 8px 10px -6px rgba(0, 0, 0, 0.05);
+}
+
+[data-theme="light"] .git-branch-search {
+  background: #f8fafc;
+  border-color: rgba(15, 23, 42, 0.1);
+}
+
+[data-theme="light"] .git-branch-option:hover,
+[data-theme="light"] .git-branch-actions button:hover {
+  background: #f1f5f9;
+}
+
+[data-theme="light"] .git-branch-option[aria-selected='true'] {
+  background: #e2e8f0;
+  border-color: rgba(15, 23, 42, 0.18);
+}
+
+[data-theme="light"] .git-graph-output {
+  background: #f8fafc;
+  border-color: rgba(15, 23, 42, 0.1);
+}
+
 [data-theme="light"] .smart-context-bar,
 [data-theme="light"] #chat-form {
   background: #ffffff;
@@ -4098,3 +4644,664 @@ input:checked + .slider:before {
   background: #e2e8f0;
   color: #0f172a;
 }
+
+[data-theme="studio"] .user-message .message-bubble {
+  background: #1c1c1c;
+  border: 1px solid rgba(255, 255, 255, 0.1);
+  color: #e1e1e1;
+}
+
+.chat-artifact-open-btn:hover {
+  background: color-mix(in srgb, var(--text-main, #ffffff) 14%, transparent) !important;
+  border-color: var(--border-light, var(--border)) !important;
+}
+
+/* Inline Message Editing */
+.inline-edit-container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  min-width: 300px;
+  max-width: 680px;
+  gap: 8px;
+  margin-bottom: 4px;
+}
+
+.inline-edit-textarea {
+  width: 100%;
+  min-height: 58px;
+  max-height: 400px;
+  padding: 12px 14px;
+  font: inherit;
+  font-size: 0.95rem;
+  line-height: 1.5;
+  color: var(--text-main, #ffffff);
+  background: var(--bg-surface-raised, #18181b);
+  border: 1px solid var(--accent);
+  border-radius: var(--radius-xl, 14px);
+  box-shadow: 0 0 0 1px color-mix(in srgb, var(--accent) 30%, transparent), 0 4px 12px rgba(0, 0, 0, 0.15);
+  resize: none;
+  outline: none;
+  box-sizing: border-box;
+  transition: border-color 0.15s ease, box-shadow 0.15s ease;
+}
+
+.inline-edit-textarea:focus {
+  border-color: var(--accent);
+  box-shadow: 0 0 0 2px color-mix(in srgb, var(--accent) 45%, transparent), 0 4px 16px rgba(0, 0, 0, 0.2);
+}
+
+.inline-edit-footer {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 12px;
+  padding: 0 2px;
+}
+
+.inline-edit-hint {
+  color: var(--text-muted, #71717a);
+  font-size: 0.72rem;
+  letter-spacing: 0.01em;
+  user-select: none;
+}
+
+.inline-edit-actions {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.inline-edit-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 6px 14px;
+  font-size: 0.8rem;
+  font-weight: 500;
+  border-radius: var(--radius-md, 8px);
+  cursor: pointer;
+  transition: all 0.15s ease;
+  border: 1px solid transparent;
+  line-height: 1.2;
+}
+
+.inline-edit-btn.cancel {
+  background: transparent;
+  border-color: var(--border, rgba(255, 255, 255, 0.15));
+  color: var(--text-soft, var(--text-muted, #a1a1aa));
+}
+
+.inline-edit-btn.cancel:hover {
+  background: var(--bg-surface-soft, rgba(255, 255, 255, 0.08));
+  color: var(--text-main, #ffffff);
+}
+
+.inline-edit-btn.submit {
+  background: var(--accent);
+  color: var(--text-on-accent, #ffffff);
+  box-shadow: 0 2px 8px color-mix(in srgb, var(--accent) 35%, transparent);
+}
+
+.inline-edit-btn.submit:hover:not(:disabled) {
+  filter: brightness(1.1);
+  transform: translateY(-1px);
+}
+
+.inline-edit-btn.submit:disabled {
+  opacity: 0.45;
+  cursor: not-allowed;
+  transform: none;
+}
+
+/* Modern Developer-Centric Activity Timeline (Claude Code / Cursor Style) */
+.modern-activity-history {
+  margin-bottom: 12px;
+}
+
+.modern-activity-toggle {
+  display: flex;
+  flex-direction: column;
+  align-items: flex-start;
+  gap: 3px;
+  background: transparent !important;
+  border: none !important;
+  padding: 4px 6px;
+  cursor: pointer;
+  border-radius: var(--radius-xs, 4px);
+  text-align: left;
+  width: 100%;
+  transition: background 0.15s ease;
+}
+
+.modern-activity-toggle:hover {
+  background: color-mix(in srgb, var(--panel-soft) 40%, transparent) !important;
+}
+
+.modern-activity-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: 8px;
+  margin-bottom: 2px;
+}
+
+.modern-activity-header-left {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+}
+
+.modern-activity-duration {
+  font-size: 0.96rem;
+  font-weight: 500;
+  color: var(--text-soft);
+  letter-spacing: -0.01em;
+}
+
+.modern-activity-subheader {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 0.92rem;
+  color: var(--text-muted);
+  user-select: none;
+  padding: 1px 2px;
+  border-radius: var(--radius-xs, 4px);
+  transition: color 0.15s ease;
+}
+
+.modern-activity-subheader:hover {
+  color: var(--text-soft);
+}
+
+.modern-activity-natural-summary {
+  font-size: 0.92rem;
+  color: var(--text-muted);
+}
+
+.modern-activity-subchevron {
+  color: var(--text-muted);
+  transition: transform 0.18s ease;
+}
+
+.modern-activity-subchevron.is-open {
+  transform: rotate(180deg);
+}
+
+.modern-activity-card {
+  padding: 2px 0 6px 0;
+  border: none !important;
+  background: transparent !important;
+  box-shadow: none !important;
+}
+
+.agent-activity-card-history,
+.modern-activity-content {
+  margin-left: 0 !important;
+  padding: 2px 0 6px 0 !important;
+  border: none !important;
+  box-sizing: border-box;
+  width: 100%;
+}
+
+.modern-activity-list {
+  display: flex;
+  flex-direction: column;
+  gap: 3px;
+  padding-top: 4px;
+  margin-left: 12px;
+  padding-left: 8px;
+  border-left: 1.5px solid color-mix(in srgb, var(--border) 60%, transparent);
+  max-width: calc(100% - 12px);
+  box-sizing: border-box;
+}
+
+/* 100% Borderless & Transparent Timeline Rows (Eliminating all legacy boxed borders) */
+.modern-activity-list .agent-activity-item,
+.modern-activity-list .agent-activity-group,
+.modern-activity-list .agent-activity-thought-step,
+.modern-timeline-group,
+.modern-timeline-thought-item {
+  border: none !important;
+  background: transparent !important;
+  box-shadow: none !important;
+  border-radius: var(--radius-xs, 4px) !important;
+  overflow: visible !important;
+  margin: 0 !important;
+}
+
+.modern-timeline-row {
+  display: flex;
+  align-items: center;
+  gap: 9px;
+  min-height: 28px;
+  padding: 3px 6px;
+  border-radius: var(--radius-xs, 4px);
+  font-size: 0.94rem;
+  line-height: 1.45;
+  color: var(--text-soft);
+  transition: background 0.12s ease, color 0.12s ease;
+  user-select: none;
+  border: none !important;
+  background: transparent !important;
+}
+
+.modern-timeline-row:hover {
+  background: color-mix(in srgb, var(--panel-soft) 50%, transparent) !important;
+  color: var(--text-main);
+}
+
+.modern-activity-list .agent-activity-thought-header,
+.modern-activity-list .agent-activity-group-header,
+.modern-thought-row,
+.modern-group-row {
+  border: none !important;
+  background: transparent !important;
+  min-height: 28px !important;
+  padding: 3px 6px !important;
+  box-shadow: none !important;
+  border-radius: var(--radius-xs, 4px) !important;
+}
+
+.modern-activity-list .agent-activity-thought-header:hover,
+.modern-activity-list .agent-activity-group-header:hover,
+.modern-thought-row:hover,
+.modern-group-row:hover {
+  background: color-mix(in srgb, var(--panel-soft) 50%, transparent) !important;
+}
+
+.modern-timeline-verb {
+  font-size: 0.92rem;
+  font-weight: 500;
+  color: var(--text-muted);
+  flex-shrink: 0;
+  min-width: 48px;
+}
+
+.modern-timeline-icon-wrap {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 17px;
+  height: 17px;
+  flex-shrink: 0;
+}
+
+.modern-timeline-target {
+  flex: 1;
+  min-width: 0;
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 0.94rem;
+  font-weight: 450;
+  color: var(--text-main);
+}
+
+.modern-timeline-line-range {
+  font-family: var(--font-mono, monospace);
+  font-size: 0.85rem;
+  color: var(--text-muted);
+  margin-left: 2px;
+  flex-shrink: 0;
+}
+
+.modern-timeline-diff-stats {
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+  font-family: var(--font-mono, monospace);
+  font-size: 0.88rem;
+  font-weight: 500;
+  margin-left: 6px;
+  flex-shrink: 0;
+}
+
+.diff-stat-add {
+  color: #4ade80;
+}
+
+.diff-stat-del {
+  color: #f87171;
+}
+
+.modern-timeline-status-col {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  margin-left: auto;
+  flex-shrink: 0;
+}
+
+.modern-timeline-count-badge {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0 6px;
+  min-width: 18px;
+  height: 18px;
+  font-size: 0.74rem;
+  font-weight: 600;
+  border-radius: 9999px;
+  background: color-mix(in srgb, var(--panel-soft) 70%, transparent);
+  color: var(--text-muted);
+}
+
+.modern-timeline-chevron {
+  color: var(--text-muted);
+  transition: transform 0.18s ease;
+  flex-shrink: 0;
+}
+
+.modern-timeline-chevron.inline-chevron {
+  margin-left: 4px;
+}
+
+.modern-timeline-chevron.is-open {
+  transform: rotate(90deg);
+}
+
+.modern-timeline-thought-item {
+  display: flex;
+  flex-direction: column;
+}
+
+.modern-thought-row {
+  cursor: pointer;
+  display: flex;
+  align-items: center;
+}
+
+.modern-timeline-thought-label {
+  font-size: 0.92rem;
+  color: var(--text-muted);
+  font-weight: 500;
+  display: inline-flex;
+  align-items: center;
+  gap: 5px;
+}
+
+.modern-activity-list .agent-activity-thought-body,
+.modern-thought-body {
+  margin-left: 14px !important;
+  margin-top: 3px !important;
+  margin-bottom: 6px !important;
+  padding: 4px 10px 4px 14px !important;
+  border: none !important;
+  background: transparent !important;
+  border-left: 2px solid color-mix(in srgb, var(--text-muted) 35%, transparent) !important;
+  border-radius: 0 !important;
+  color: var(--text-muted) !important;
+  font-size: 0.90rem !important;
+  line-height: 1.55;
+  max-height: 380px;
+  overflow-y: auto;
+}
+
+.modern-thought-body .chat-formatted-body {
+  font-size: 0.90rem;
+  line-height: 1.55;
+  color: var(--text-muted);
+  gap: 6px;
+}
+
+.modern-thought-body .chat-paragraph {
+  font-size: 0.90rem;
+  line-height: 1.55;
+  color: var(--text-muted);
+  margin-bottom: 6px;
+}
+
+.modern-thought-body .chat-heading {
+  font-size: 0.96rem;
+  font-weight: 600;
+  color: var(--text-main);
+  margin-top: 10px;
+  margin-bottom: 4px;
+}
+
+.modern-thought-body .chat-heading-1 {
+  font-size: 1.05rem;
+}
+
+.modern-thought-body .chat-heading-2 {
+  font-size: 0.98rem;
+}
+
+.modern-thought-body .chat-heading-3 {
+  font-size: 0.92rem;
+}
+
+.modern-thought-body .chat-list-item {
+  font-size: 0.90rem;
+  line-height: 1.5;
+  margin: 2px 0 2px 4px;
+  color: var(--text-muted);
+}
+
+.modern-thought-body blockquote {
+  border-left: 2px solid var(--accent);
+  padding: 4px 10px;
+  margin: 6px 0;
+  background: color-mix(in srgb, var(--accent) 8%, transparent);
+  border-radius: var(--radius-xs, 4px);
+  color: var(--text-soft);
+  font-size: 0.88rem;
+}
+
+.modern-timeline-output {
+  margin: 3px 0 6px 14px;
+  padding: 8px 12px;
+  background: color-mix(in srgb, var(--bg-surface-raised, #000) 80%, transparent);
+  border-radius: var(--radius-xs, 4px);
+  border: 1px solid var(--border);
+  font-family: var(--font-mono, monospace);
+  font-size: 0.84rem;
+  max-height: 250px;
+  overflow-y: auto;
+}
+
+.modern-directory-listing {
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+  padding: 2px 0;
+  font-family: var(--font-mono, monospace);
+  font-size: 0.82rem;
+}
+
+.modern-directory-item {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  padding: 3px 6px;
+  border-radius: var(--radius-xs, 4px);
+  color: var(--text-soft);
+  transition: background 0.12s ease, color 0.12s ease;
+  user-select: text;
+}
+
+.modern-directory-item:hover {
+  background: color-mix(in srgb, var(--accent, #38bdf8) 8%, transparent);
+  color: var(--text-main, #fff);
+}
+
+.modern-directory-item:hover .modern-dir-mention-btn {
+  opacity: 1;
+}
+
+.modern-directory-item-icon {
+  width: 15px;
+  height: 15px;
+  flex-shrink: 0;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.modern-directory-item-icon img {
+  width: 15px;
+  height: 15px;
+  object-fit: contain;
+}
+
+.modern-directory-item-name {
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.modern-directory-item.is-directory .modern-directory-item-name {
+  color: var(--text-main, #eee);
+  font-weight: 500;
+}
+
+.modern-directory-item-size {
+  flex-shrink: 0;
+  font-size: 0.74rem;
+  color: var(--text-muted);
+  font-variant-numeric: tabular-nums;
+  margin-left: auto;
+}
+
+.modern-dir-mention-btn {
+  opacity: 0;
+  transition: opacity 0.12s ease;
+  font-size: 0.72rem;
+  padding: 0 4px;
+  height: 18px;
+  margin-left: 4px;
+}
+
+.modern-directory-empty {
+  color: var(--text-muted);
+  font-style: italic;
+  padding: 4px 6px;
+}
+
+.modern-activity-list .agent-activity-group-subitems,
+.modern-group-subitems {
+  background: transparent !important;
+  border: none !important;
+  border-top: none !important;
+  border-left: 1px solid color-mix(in srgb, var(--border) 60%, transparent) !important;
+  padding: 2px 0 2px 8px !important;
+  margin-left: 14px !important;
+  margin-top: 2px !important;
+  margin-bottom: 4px !important;
+}
+
+/* ==========================================================================
+   Modern Ask-User Completed Activity Card
+   Rendered in the agent activity timeline after questions are answered
+   ========================================================================== */
+.modern-ask-user-card {
+  margin: 8px 0;
+  padding: 14px 16px;
+  border-radius: var(--radius-lg, 12px);
+  background: var(--surface-subtle, rgba(255, 255, 255, 0.025));
+  border: 1px solid var(--border-subtle, rgba(255, 255, 255, 0.08));
+  display: flex;
+  flex-direction: column;
+  gap: 12px;
+  box-sizing: border-box;
+  width: 100%;
+  text-align: left;
+}
+
+.modern-ask-user-header {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  color: var(--text-muted, #94a3b8);
+  font-size: 0.82rem;
+  font-weight: 500;
+  letter-spacing: -0.01em;
+  user-select: none;
+}
+
+.modern-ask-user-header-icon {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  color: var(--text-muted, #94a3b8);
+  flex-shrink: 0;
+}
+
+.modern-ask-user-header-text {
+  line-height: 1;
+  color: var(--text-muted, #94a3b8);
+}
+
+.modern-ask-user-items {
+  display: flex;
+  flex-direction: column;
+  gap: 0;
+}
+
+.modern-ask-user-item {
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}
+
+.modern-ask-user-item + .modern-ask-user-item {
+  margin-top: 14px;
+  padding-top: 14px;
+  border-top: 1px solid var(--border-subtle, rgba(255, 255, 255, 0.08));
+}
+
+.modern-ask-user-question {
+  color: var(--text-main, #f4f4f5);
+  font-size: 0.86rem;
+  font-weight: 500;
+  line-height: 1.45;
+  word-break: break-word;
+}
+
+.modern-ask-user-answer {
+  color: var(--text-soft, #a1a1aa);
+  font-size: 0.82rem;
+  line-height: 1.48;
+  word-break: break-word;
+}
+
+/* Light theme overrides */
+[data-theme='light'] .modern-ask-user-card,
+body.light-theme .modern-ask-user-card {
+  background: var(--surface-subtle, rgba(0, 0, 0, 0.02));
+  border-color: var(--border-subtle, rgba(0, 0, 0, 0.08));
+}
+
+[data-theme='light'] .modern-ask-user-item + .modern-ask-user-item,
+body.light-theme .modern-ask-user-item + .modern-ask-user-item {
+  border-top-color: var(--border-subtle, rgba(0, 0, 0, 0.08));
+}
+
+[data-theme='light'] .modern-ask-user-question,
+body.light-theme .modern-ask-user-question {
+  color: var(--text-main, #0f172a);
+}
+
+[data-theme='light'] .modern-ask-user-answer,
+body.light-theme .modern-ask-user-answer {
+  color: var(--text-soft, #475569);
+}
+
+[data-theme='light'] .modern-ask-user-header,
+body.light-theme .modern-ask-user-header,
+[data-theme='light'] .modern-ask-user-header-icon,
+body.light-theme .modern-ask-user-header-icon,
+[data-theme='light'] .modern-ask-user-header-text,
+body.light-theme .modern-ask-user-header-text {
+  color: var(--text-muted, #64748b);
+}
+
+
+