diff --git a/.gitignore b/.gitignore
index 4dbcbb952..792146a21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ Thumbs.db
 # Scratch / agent working dirs (never committed)
 /tmp/
 /.codex/
+.alma-snapshots
diff --git a/desktop/frontend/src/App.tsx b/desktop/frontend/src/App.tsx
index 88eebe68a..98e0ef49e 100644
--- a/desktop/frontend/src/App.tsx
+++ b/desktop/frontend/src/App.tsx
@@ -525,7 +525,6 @@ export default function App() {
     [activeTabId],
   );
   const topicbarEditing = Boolean(activeTab?.topicId && activeTab.topicId === renamingTopicId);
-  const topicbarProjectPrefix = activeTab ? tabWorkspaceTitle(activeTab) : "";
   const visibleTabId = activeTabId;
   const visibleTabs = useMemo(() => {
     const byId = new Map(tabMetas.map((tab) => [tab.id, tab]));
@@ -1515,9 +1514,6 @@ export default function App() {
               <div className="topicbar__title-row">
                 {topicbarEditing ? (
                   <div className="topicbar__title-edit">
-                    {topicbarProjectPrefix && (
-                      <span className="topicbar__title-prefix">{topicbarProjectPrefix} /</span>
-                    )}
                     <input
                       autoFocus
                       className="topicbar__title-input"
@@ -1537,7 +1533,7 @@ export default function App() {
                     />
                   </div>
                 ) : (
-                  <h1>{topicTitle(activeTab)}</h1>
+                  <h1>{activeTab?.topicTitle || "Untitled"}</h1>
                 )}
                 <Tooltip label={t("topicBar.renameSession")}>
                   <button
@@ -1663,9 +1659,6 @@ export default function App() {
 	              disabled={state.meta?.ready === false || state.messageAction != null || state.approval != null || state.ask != null}
 	              decisionPending={state.messageAction != null || state.approval != null || state.ask != null}
               ready={state.meta?.ready === true}
-              turnStartAt={state.turnStartAt}
-              turnTokens={state.turnTokens}
-              retry={state.retry}
               workspaceRefreshSignal={projectRevision}
             />
             <StatusBar
@@ -1677,6 +1670,7 @@ export default function App() {
               mode={mode}
               cost={state.sessionCost}
               currency={state.sessionCurrency}
+              turnTokens={state.turnTokens}
             />
           </footer>
           </>
diff --git a/desktop/frontend/src/components/Composer.tsx b/desktop/frontend/src/components/Composer.tsx
index 67649050a..6811ac74c 100644
--- a/desktop/frontend/src/components/Composer.tsx
+++ b/desktop/frontend/src/components/Composer.tsx
@@ -4,7 +4,7 @@ import { AlertTriangle, ArrowUp, Check, ChevronDown, Eye, FileText, Folder, Fold
 import { asArray } from "../lib/array";
 import { DedupIndex, sha256 } from "../lib/attachDedup";
 import { app, onFilesDropped } from "../lib/bridge";
-import { SPINNER_WORDS, useI18n } from "../lib/i18n";
+import { useI18n } from "../lib/i18n";
 import { clearLayoutSize, loadOptionalLayoutSize, saveLayoutSize } from "../lib/layoutPreferences";
 import type { CommandInfo, ComposerInsertRequest, DirEntry, EffortInfo, HistoryMessage, Mode, SessionMeta, SessionReference, SlashArgItem, SlashArgsResult, WorkspaceView } from "../lib/types";
 import {
@@ -95,18 +95,6 @@ function loadComposerHeight(): number | null {
   return loadOptionalLayoutSize("composerHeight", clampComposerHeight);
 }
 
-function fmtTokens(n: number): string {
-  if (n >= 1000) return (n / 1000).toFixed(1).replace(/\.0$/, "") + "k";
-  return String(n);
-}
-
-function fmtElapsed(ms: number): string {
-  const s = Math.floor(ms / 1000);
-  if (s < 60) return `${s}s`;
-  return `${Math.floor(s / 60)}m ${s % 60}s`;
-}
-
-// --- past:chats hover preview helpers (PR-C2) ---
 // Pure formatting helpers used by the past:chats list tooltip. They never read
 // from disk, never call PreviewSession — they only shape the data that already
 // lives in the SessionMeta snapshot we fetched on entry.
@@ -134,16 +122,6 @@ function pastChatTitle(session: SessionMeta): string {
   return session.title || session.topicTitle || session.preview || "Untitled";
 }
 
-function useTick(on: boolean): number {
-  const [, setN] = useState(0);
-  useEffect(() => {
-    if (!on) return;
-    const id = window.setInterval(() => setN((n) => n + 1), 1000);
-    return () => window.clearInterval(id);
-  }, [on]);
-  return Date.now();
-}
-
 function isImeKeyEvent(
   e: KeyboardEvent<HTMLTextAreaElement>,
   composing: boolean,
@@ -265,9 +243,6 @@ export function Composer({
   disabled,
   decisionPending = false,
   ready,
-  turnStartAt,
-  turnTokens,
-  retry,
   workspaceRefreshSignal,
 }: {
   running: boolean;
@@ -294,13 +269,9 @@ export function Composer({
   // is nil before then), the available set changes when the workspace switches,
   // and a completed turn may have installed skills or MCP prompts.
   ready?: boolean;
-  turnStartAt?: number;
-  turnTokens?: number;
-  retry?: { attempt: number; max: number };
   workspaceRefreshSignal?: number;
 }) {
-  const { t, locale } = useI18n();
-  const now = useTick(running);
+  const { t } = useI18n();
   const [text, setText] = useState("");
   const [attachments, setAttachments] = useState<Attachment[]>([]);
   const [workspaceRefs, setWorkspaceRefs] = useState<WorkspaceReference[]>([]);
@@ -1267,17 +1238,6 @@ export function Composer({
     { id: "plan", label: "plan", icon: <List size={13} /> },
     { id: "yolo", label: "yolo", icon: <AlertTriangle size={13} /> },
   ];
-  const runActivity = retry
-    ? t("status.retrying", { attempt: retry.attempt, max: retry.max })
-    : running && turnStartAt
-      ? (() => {
-          const elapsedMs = Math.max(0, now - turnStartAt);
-          const words = SPINNER_WORDS[locale];
-          const word = words[Math.floor(elapsedMs / 3000) % words.length];
-          const tok = turnTokens && turnTokens > 0 ? ` · ↓ ${fmtTokens(turnTokens)} ${t("status.tokens")}` : "";
-          return `${word}… ${fmtElapsed(elapsedMs)}${tok}`;
-        })()
-      : null;
   const hasWorkspace = Boolean(cwd);
   const hasEffort = Boolean(effort?.supported);
   const composerMetaClass = [
@@ -1502,35 +1462,6 @@ export function Composer({
           />
         )
       )}
-      <div className="composer-toolbar">
-        <div className="composer-modebar" role="toolbar" aria-label={t("composer.modeTitle")}>
-          {modeOptions.map((option) => (
-            <button
-              key={option.id}
-              type="button"
-              className={`composer-modebar__item composer-modebar__item--${option.id}${mode === option.id ? " composer-modebar__item--active" : ""}`}
-              onClick={() => onSetMode(option.id)}
-              aria-pressed={mode === option.id}
-              disabled={disabled || running}
-            >
-              {option.icon}
-              <span>{option.label}</span>
-            </button>
-          ))}
-        </div>
-        {runActivity && (
-          <div className="composer-runstatus" role="status" aria-live="polite">
-            <span className="composer-runstatus__dot" />
-            <span className="composer-runstatus__text">{runActivity}</span>
-            <Tooltip label={t("composer.stop")}>
-              <button className="composer-runstatus__stop" type="button" onClick={handleCancel} disabled={decisionPending}>
-                <Square size={10} fill="currentColor" />
-                <span>{t("composer.stopShort")}</span>
-              </button>
-            </Tooltip>
-          </div>
-        )}
-      </div>
       {(attachments.length > 0 || workspaceRefs.length > 0 || sessionRefs.length > 0) && (
         <div className="composer-context" aria-label={t("composer.contextItems")}>
           {attachments.map((a) => (
@@ -1654,7 +1585,6 @@ export function Composer({
           onDragOver={onDragOver}
           onDragLeave={onDragLeave}
         >
-          <span className="composer__caret">{text.trimStart().startsWith("!") ? "$" : "›"}</span>
           <textarea
             ref={taRef}
             className="composer__input"
@@ -1678,17 +1608,6 @@ export function Composer({
             rows={1}
             disabled={disabled}
           />
-          {!running && (
-            <Tooltip label={t("composer.send")}>
-              <button
-                className="composer__btn composer__btn--send"
-                onClick={submit}
-                disabled={submitting || pendingPaste > 0 || (!text.trim() && attachments.length === 0 && workspaceRefs.length === 0) || disabled}
-              >
-                <ArrowUp size={16} />
-              </button>
-            </Tooltip>
-          )}
         </div>
         <div className={composerMetaClass}>
           {cwd && (
@@ -1706,6 +1625,25 @@ export function Composer({
               </button>
             </div>
           )}
+          <div className="composer-modebar" role="toolbar" aria-label={t("composer.modeTitle")}>
+            {modeOptions.map((option) => {
+              const isActive = mode === option.id;
+              const btn = (
+                <button
+                  key={option.id}
+                  type="button"
+                  className={`composer-modebar__item composer-modebar__item--${option.id}${isActive ? " composer-modebar__item--active" : ""}`}
+                  onClick={() => onSetMode(option.id)}
+                  aria-pressed={isActive}
+                  disabled={disabled || running}
+                >
+                  {option.icon}
+                  {isActive && <span>{option.label}</span>}
+                </button>
+              );
+              return isActive ? btn : <Tooltip key={option.id} label={option.label}>{btn}</Tooltip>;
+            })}
+          </div>
           <div className="composer-meta__params">
             <div className="composer-meta__control composer-meta__control--model">
               <ModelSwitcher label={modelLabel} tabId={tabId} onPick={onSwitchModel} />
@@ -1716,6 +1654,25 @@ export function Composer({
               </div>
             )}
           </div>
+          <div className="composer-meta__stop-wrap">
+            {running ? (
+              <Tooltip label={t("composer.stop")}>
+                <button className="composer-meta__action-btn composer-meta__action-btn--stop" type="button" onClick={handleCancel} disabled={decisionPending}>
+                  <Square size={14} fill="currentColor" />
+                </button>
+              </Tooltip>
+            ) : (
+              <Tooltip label={t("composer.send")}>
+                <button
+                  className="composer-meta__action-btn composer-meta__action-btn--send"
+                  onClick={submit}
+                  disabled={submitting || pendingPaste > 0 || (!text.trim() && attachments.length === 0 && workspaceRefs.length === 0) || disabled}
+                >
+                  <ArrowUp size={16} />
+                </button>
+              </Tooltip>
+            )}
+          </div>
         </div>
       </div>
     </div>
diff --git a/desktop/frontend/src/components/Message.tsx b/desktop/frontend/src/components/Message.tsx
index 9c9c02e57..a679ae61d 100644
--- a/desktop/frontend/src/components/Message.tsx
+++ b/desktop/frontend/src/components/Message.tsx
@@ -252,7 +252,6 @@ export const AssistantMessage = memo(function AssistantMessage({
           tone="violet"
           icon={<ProcessBrainIcon size={12} />}
           kind="reasoning"
-          name={t("msg.thinking")}
           meta={
             <>
               <ProcessStatusIcon state={item.streaming ? "running" : "done"} label={item.streaming ? t("msg.thinkingRunning") : t("msg.thinkingDone")} />
diff --git a/desktop/frontend/src/components/ProcessCard.tsx b/desktop/frontend/src/components/ProcessCard.tsx
index 274f3e5f2..cde9e4175 100644
--- a/desktop/frontend/src/components/ProcessCard.tsx
+++ b/desktop/frontend/src/components/ProcessCard.tsx
@@ -1,4 +1,5 @@
 import { Children, type ReactNode, type SVGProps, useState } from "react";
+import { BrainCircuit } from "lucide-react";
 
 type IconProps = SVGProps<SVGSVGElement> & { size?: number };
 export type ProcessTone = "default" | "success" | "warning" | "danger" | "accent" | "violet";
@@ -47,19 +48,14 @@ export function ProcessXIcon(props: IconProps) {
   );
 }
 
-export function ProcessBrainIcon(props: IconProps) {
-  return (
-    <ProcessIcon {...props}>
-      <path d="M9 4a3 3 0 0 0-3 3v0a3 3 0 0 0-2 5 3 3 0 0 0 2 5 3 3 0 0 0 3 3h0a3 3 0 0 0 3-3V4" />
-      <path d="M15 4a3 3 0 0 1 3 3 3 3 0 0 1 2 5 3 3 0 0 1-2 5 3 3 0 0 1-3 3" />
-    </ProcessIcon>
-  );
+export function ProcessBrainIcon({ size = 14, ...rest }: IconProps) {
+  return <BrainCircuit size={size} strokeWidth={1.8} {...rest} />;
 }
 
 export function ProcessToolIcon(props: IconProps) {
   return (
     <ProcessIcon {...props}>
-      <path d="M14 7a4 4 0 1 0 4 4l3 3-3 3-3-3a4 4 0 0 1-4-4l-3-3-3 3 3 3a4 4 0 0 0 6 0" />
+      <path d="M14.7 6.3a1 1 0 0 0 0 1.4l1.6 1.6a1 1 0 0 0 1.4 0l3.77-3.77a6 6 0 0 1-7.94 7.94l-6.91 6.91a2.12 2.12 0 0 1-3-3l6.91-6.91a6 6 0 0 1 7.94-7.94l-3.76 3.76z" />
     </ProcessIcon>
   );
 }
diff --git a/desktop/frontend/src/components/SettingsPanel.tsx b/desktop/frontend/src/components/SettingsPanel.tsx
index 429759194..b2103ca20 100644
--- a/desktop/frontend/src/components/SettingsPanel.tsx
+++ b/desktop/frontend/src/components/SettingsPanel.tsx
@@ -1,5 +1,5 @@
 import { useEffect, useMemo, useRef, useState, type ReactNode } from "react";
-import { Check, ChevronDown } from "lucide-react";
+import { Check, ChevronDown, X } from "lucide-react";
 import { asArray } from "../lib/array";
 import { app } from "../lib/bridge";
 import { normalizeLangPref, useI18n, useT, type DictKey, type LangPref } from "../lib/i18n";
@@ -100,7 +100,7 @@ export function SettingsPanel({ onClose, onChanged, initialTab }: { onClose: ()
         <header className="settings-modal__head">
           <div className="settings-modal__title">{t("settings.title")}</div>
           <Tooltip label={t("common.close")}>
-            <button className="chip" aria-label={t("common.close")} onClick={onClose}>✕</button>
+            <button className="chip" aria-label={t("common.close")} onClick={onClose}><X size={14} /></button>
           </Tooltip>
         </header>
 
@@ -2154,7 +2154,7 @@ function RuleList({
             {r}
             <Tooltip label={t("common.delete")}>
               <button className="set-rule__x" disabled={busy} onClick={() => void onRemove(r)}>
-                ✕
+                <X size={11} />
               </button>
             </Tooltip>
           </span>
diff --git a/desktop/frontend/src/components/StatusBar.tsx b/desktop/frontend/src/components/StatusBar.tsx
index 79448a4ef..c8afeaf24 100644
--- a/desktop/frontend/src/components/StatusBar.tsx
+++ b/desktop/frontend/src/components/StatusBar.tsx
@@ -1,8 +1,13 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 import { Tooltip } from "./Tooltip";
-import { useI18n } from "../lib/i18n";
+import { useI18n, SPINNER_WORDS } from "../lib/i18n";
 import type { BalanceInfo, ContextInfo, JobView, Mode, WireUsage } from "../lib/types";
 
+function fmtTokens(n: number): string {
+  if (n >= 1000) return (n / 1000).toFixed(1).replace(/\.0$/, "") + "k";
+  return String(n);
+}
+
 // JobsChip is the status-bar background-jobs indicator: a count that opens an
 // upward popover listing the running jobs (id · label · status), mirroring the
 // ModelSwitcher's click-to-open pattern. With no jobs it still reserves a stable
@@ -89,6 +94,7 @@ export function StatusBar({
   mode,
   cost,
   currency,
+  turnTokens,
 }: {
   context: ContextInfo;
   usage?: WireUsage;
@@ -98,8 +104,19 @@ export function StatusBar({
   mode: Mode;
   cost?: number;
   currency?: string;
+  turnTokens?: number;
 }) {
-  const { t } = useI18n();
+  const { t, locale } = useI18n();
+  const [, setTick] = useState(0);
+  useEffect(() => {
+    if (!running) return;
+    const id = window.setInterval(() => setTick((n) => n + 1), 1000);
+    return () => window.clearInterval(id);
+  }, [running]);
+  const spinnerRunning = running;
+  const spinnerWord = spinnerRunning
+    ? SPINNER_WORDS[locale][Math.floor(Date.now() / 3000) % SPINNER_WORDS[locale].length]
+    : "";
   const pct = context.window ? Math.min(100, Math.round((context.used / context.window) * 100)) : null;
   const compactPct = context.compactRatio ? Math.round(context.compactRatio * 100) : null;
   const nowPct = nowRate(usage);
@@ -132,7 +149,15 @@ export function StatusBar({
         </span>
       </Tooltip>
       <span className="statusbar__spacer" />
-      {mode === "plan" && <span className="statusbar__plan">{t("status.plan")}</span>}
+      <div className="statusbar__trailing">
+        {spinnerRunning && (
+          <span className="statusbar__spinner">{spinnerWord}…</span>
+        )}
+        {(turnTokens ?? 0) > 0 && (
+          <span className="statusbar__tokens">↓ {fmtTokens(turnTokens ?? 0)} {t("status.tokens")}</span>
+        )}
+        {mode === "plan" && <span className="statusbar__plan">{t("status.plan")}</span>}
+      </div>
     </div>
   );
 }
diff --git a/desktop/frontend/src/components/Transcript.tsx b/desktop/frontend/src/components/Transcript.tsx
index 92b3a2511..ad35b057f 100644
--- a/desktop/frontend/src/components/Transcript.tsx
+++ b/desktop/frontend/src/components/Transcript.tsx
@@ -403,18 +403,15 @@ export function Transcript({
   // don't rebuild it. The hot zone uses LiveAssistantMessage (reads live from
   // LiveStreamContext) so streaming updates are captured immediately.
   return (
-    <div
-      className={`transcript${empty ? " transcript--empty" : ""}`}
-      ref={scrollRef}
-      onScroll={onScroll}
-    >
-      {empty && <Welcome onPrompt={onPrompt} />}
-
-      {!empty && showQuestionNav && (
-        <QuestionJumpBar questions={questions} onJump={handleJumpToQuestion} />
-      )}
+    <div className="transcript-wrap">
+      <div
+        className={`transcript${empty ? " transcript--empty" : ""}`}
+        ref={scrollRef}
+        onScroll={onScroll}
+      >
+        {empty && <Welcome onPrompt={onPrompt} />}
 
-      <LiveStreamContext.Provider value={live}>
+        <LiveStreamContext.Provider value={live}>
         {turnGroups.length > HOT_TURNS && (
           <WarmZone
             turnGroups={turnGroups}
@@ -443,6 +440,11 @@ export function Transcript({
         )}
         {hotZoneNodes}
       </LiveStreamContext.Provider>
+      </div>
+
+      {!empty && showQuestionNav && (
+        <QuestionJumpBar questions={questions} onJump={handleJumpToQuestion} />
+      )}
     </div>
   );
 }
diff --git a/desktop/frontend/src/styles.css b/desktop/frontend/src/styles.css
index 026f0140b..b552c14fb 100644
--- a/desktop/frontend/src/styles.css
+++ b/desktop/frontend/src/styles.css
@@ -512,6 +512,7 @@ a[href] {
 }
 .sidebar__new {
   display: flex;
+  flex-shrink: 0;
   align-items: center;
   gap: 9px;
   height: 36px;
@@ -2224,7 +2225,7 @@ a[href] {
   opacity: 0.72;
   transition: background 0.12s, box-shadow 0.12s, opacity 0.12s;
 }
-.composer-resize-handle:hover::before,
+.composer-card:hover .composer-resize-handle::before,
 .composer-resize-handle:focus-visible::before,
 .composer-card--resizing .composer-resize-handle::before {
   background: var(--accent);
@@ -2404,7 +2405,6 @@ a[href] {
   display: inline-flex;
   align-items: center;
   justify-content: center;
-  align-self: flex-end;
   width: 32px;
   height: 32px;
   border: none;
@@ -4212,6 +4212,46 @@ a[href] {
   font-size: 12px;
   font-weight: 580;
 }
+.workspace-branch-indicator {
+  display: flex;
+  align-items: center;
+  gap: 5px;
+  padding: 6px 10px;
+  border-bottom: 1px solid var(--border);
+  color: var(--fg-muted);
+  font-size: 12px;
+}
+
+.workspace-branch-indicator > svg {
+  flex-shrink: 0;
+  opacity: 0.6;
+}
+
+.workspace-branch-indicator > .workspace-branch-name {
+  display: flex;
+  align-items: center;
+  gap: 3px;
+  border: none;
+  background: transparent;
+  color: var(--fg);
+  cursor: pointer;
+  font-family: inherit;
+  font-size: 12px;
+  padding: 1px 4px;
+  border-radius: 3px;
+}
+
+.workspace-branch-indicator > .workspace-branch-name:hover {
+  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
+}
+
+.workspace-branch-indicator > .workspace-branch-name span {
+  max-width: 160px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
 .workspace-search {
   flex: 0 0 auto;
   display: flex;
@@ -4370,99 +4410,6 @@ a[href] {
   color: var(--accent);
   border-color: color-mix(in srgb, var(--accent) 32%, var(--border-soft));
 }
-.workspace-git-history {
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-}
-.workspace-git-history__list {
-  display: flex;
-  flex-direction: column;
-  gap: 8px;
-}
-.workspace-git-history__item {
-  border: 1px solid var(--border-soft);
-  border-radius: 8px;
-  background: var(--bg-soft);
-  overflow: hidden;
-}
-.workspace-git-history__head {
-  --wails-draggable: no-drag;
-  display: flex;
-  flex-direction: column;
-  width: 100%;
-  padding: 10px 12px;
-  border: none;
-  background: transparent;
-  color: var(--fg);
-  font: inherit;
-  font-size: 13px;
-  text-align: left;
-}
-.workspace-git-history__head-top {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  width: 100%;
-}
-.workspace-git-history__head-bottom {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding-left: 22px;
-  margin-top: 4px;
-}
-.workspace-git-history__head:hover {
-  background: var(--sidebar-hover);
-}
-.workspace-git-history__message {
-  flex: 1;
-  font-weight: 560;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-.workspace-git-history__author {
-  color: var(--fg-dim);
-  font-size: 12px;
-}
-.workspace-git-history__date {
-  color: var(--fg-faint);
-  font-size: 11.5px;
-}
-.workspace-git-history__hash {
-  font-family: var(--mono);
-  margin-left: 6px;
-  opacity: 0.8;
-}
-.workspace-git-history__detail {
-  padding: 12px;
-  border-top: 1px solid var(--border-soft);
-  background: var(--bg);
-}
-.workspace-git-history__files {
-  display: flex;
-  flex-direction: column;
-  gap: 6px;
-}
-.workspace-git-history__file {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  font-family: var(--mono);
-  font-size: 12px;
-  color: var(--fg-dim);
-  background: transparent;
-  border: none;
-  padding: 4px 6px;
-  border-radius: 4px;
-  cursor: pointer;
-  text-align: left;
-}
-.workspace-git-history__file:hover {
-  background: var(--sidebar-hover);
-  color: var(--fg);
-}
 .workspace-tree__chev {
   width: 13px;
   height: 13px;
@@ -5906,27 +5853,10 @@ a[href] {
   overflow: visible;
 }
 .cap-skill-card__more {
-  display: inline-flex;
-  align-items: center;
   margin: 7px 0 0 33px;
-  padding: 0;
-  border: 0;
-  background: transparent;
   color: var(--accent);
-  cursor: pointer;
-  font: inherit;
   font-size: 11px;
   font-weight: 650;
-  line-height: 1.3;
-  text-align: left;
-}
-.cap-skill-card__more:focus-visible {
-  outline: 2px solid color-mix(in srgb, var(--accent) 52%, transparent);
-  outline-offset: 3px;
-  border-radius: 5px;
-}
-.cap-skill-card__more:hover {
-  color: var(--accent-strong);
 }
 .cap-dot {
   flex-shrink: 0;
@@ -6132,7 +6062,7 @@ a[href] {
 .history-content {
   min-height: 0;
   display: grid;
-  grid-template-columns: minmax(0, 0.38fr) minmax(0, 0.62fr);
+  grid-template-columns: minmax(340px, 0.38fr) minmax(0, 0.62fr);
   overflow: hidden;
 }
 .history-list {
@@ -6359,10 +6289,7 @@ a[href] {
     max-width: 100%;
   }
   .history-content {
-    grid-template-columns: minmax(0, 1fr);
-  }
-  .history-list {
-    max-height: 40vh;
+    grid-template-columns: 1fr;
   }
   .history-preview {
     min-height: 260px;
@@ -6648,27 +6575,6 @@ a[href] {
   min-width: auto;
 }
 
-.step-limit-control {
-  display: flex;
-  align-items: center;
-  justify-content: flex-end;
-  gap: 8px;
-  width: 100%;
-  max-width: 640px;
-  min-width: 0;
-}
-
-.step-limit-control .set-seg {
-  min-width: 0;
-  overflow-x: auto;
-}
-
-.step-limit-control__custom {
-  width: 82px;
-  flex: 0 0 82px;
-  text-align: center;
-}
-
 .settings-page .settings-model-current {
   margin-top: 14px;
 }
@@ -6865,11 +6771,6 @@ a[href] {
     flex-wrap: wrap;
   }
 
-  .step-limit-control {
-    justify-content: flex-start;
-    flex-wrap: wrap;
-  }
-
   .settings-subtabs {
     display: flex;
     width: 100%;
@@ -6937,7 +6838,7 @@ a[href] {
   border: 1px solid var(--border-soft);
   border-radius: 999px;
   background: var(--bg-elev-2);
-  color: var(--fg-muted);
+  color: var(--fg-dim);
   font-family: var(--mono);
   font-size: var(--text-2xs);
   line-height: 1;
@@ -7577,7 +7478,7 @@ a[href] {
   min-height: 64px;
 }
 .provider-readonly-field--stacked span {
-  color: var(--fg-muted);
+  color: var(--fg-faint);
   font-size: var(--font-control-small);
   font-weight: 500;
   line-height: 1.35;
@@ -7595,7 +7496,7 @@ a[href] {
   gap: 8px 10px;
 }
 .provider-model-fetch-row span {
-  color: var(--fg-muted);
+  color: var(--fg-faint);
   font-size: var(--font-control-small);
   line-height: 1.4;
 }
@@ -8763,7 +8664,7 @@ a[href] {
   gap: 4px;
   padding: 4px 10px;
   font-size: 11px;
-  color: var(--fg-muted);
+  color: var(--fg-dim);
   background: transparent;
   border: none;
   border-bottom: 2px solid transparent;
@@ -9507,6 +9408,7 @@ a[href] {
 
 .project-tree__search {
   display: flex;
+  flex-shrink: 0;
   align-items: center;
   gap: 8px;
   height: 34px;
@@ -9535,6 +9437,8 @@ a[href] {
 
 .project-tree__header {
   display: flex;
+  position: relative;
+  flex-shrink: 0;
   align-items: center;
   justify-content: space-between;
   gap: 6px;
@@ -9563,6 +9467,94 @@ a[href] {
   justify-content: center;
 }
 
+.project-tree__header-actions {
+  display: flex;
+  position: relative;
+  align-items: center;
+  gap: 3px;
+}
+
+.project-tree__header-action-btn {
+  --wails-draggable: no-drag;
+  width: 24px;
+  height: 24px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  border: 1px solid var(--border-soft);
+  border-radius: 7px;
+  background: transparent;
+  color: var(--fg-faint);
+  padding: 0;
+  opacity: 0.78;
+  cursor: pointer;
+}
+
+.project-tree__header-action-btn:hover {
+  background: var(--button-bg);
+  border-color: color-mix(in srgb, var(--accent) 28%, var(--border-soft));
+  color: var(--fg);
+  opacity: 1;
+}
+
+.project-tree__header-action-btn--active {
+  color: var(--accent);
+  opacity: 1;
+}
+
+.project-tree__header-action-btn--active:hover {
+  color: var(--fg);
+}
+
+.project-tree__time-filter {
+  display: inline-flex;
+  position: relative;
+}
+
+.project-tree__time-filter-menu {
+  position: absolute;
+  top: calc(100% + 4px);
+  left: 0;
+  z-index: var(--z-topicbar-menu);
+  min-width: 108px;
+  padding: 5px;
+  border: 1px solid var(--border);
+  border-radius: 8px;
+  background: var(--bg-elev);
+  box-shadow: 0 4px 16px rgba(0, 0, 0, 0.18);
+  display: flex;
+  flex-direction: column;
+  gap: 1px;
+}
+
+.project-tree__time-filter-opt {
+  --wails-draggable: no-drag;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  height: 30px;
+  padding: 0 10px;
+  border: none;
+  border-radius: 6px;
+  background: transparent;
+  color: var(--fg-dim);
+  font: inherit;
+  font-size: 13px;
+  text-align: left;
+  cursor: pointer;
+  white-space: nowrap;
+}
+
+.project-tree__time-filter-opt:hover {
+  background: var(--sidebar-hover);
+  color: var(--fg);
+}
+
+.project-tree__time-filter-opt--on {
+  color: var(--fg);
+  font-weight: 550;
+}
+
 .project-tree__add-project,
 .project-tree__new-topic {
   --wails-draggable: no-drag;
@@ -9764,8 +9756,7 @@ a[href] {
   padding-top: 0;
   padding-bottom: 0;
   padding-left: 0 !important;
-  margin-left: 22px;
-  margin-right: var(--project-tree-action-column);
+  margin-left: 11px;
   padding-right: 8px;
   border-radius: 6px;
   color: var(--fg-dim);
@@ -9775,21 +9766,9 @@ a[href] {
 
 .project-tree__topic--active {
   background: color-mix(in srgb, var(--project-accent, var(--accent)) 10%, var(--sidebar-hover));
-  border-radius: 0;
   color: var(--fg);
 }
 
-.project-tree__topic--active::before {
-  content: "";
-  position: absolute;
-  left: 0;
-  top: 0;
-  bottom: 0;
-  width: 4px;
-  background: color-mix(in srgb, var(--project-accent, var(--accent)) 88%, #ff9d22);
-  pointer-events: none;
-}
-
 .project-tree__topic--menu-open {
   background: color-mix(in srgb, var(--accent) 6%, var(--sidebar-hover));
   color: var(--fg);
@@ -9834,6 +9813,36 @@ a[href] {
   white-space: nowrap;
 }
 
+/* Topic status indicator dot: running (green pulse) or unread (white dot) */
+.project-tree__topic-indicator {
+  flex: 0 0 auto;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  margin-left: 6px;
+  line-height: 1;
+}
+.project-tree__topic-indicator--running {
+  background: #22c55e;
+  animation: project-tree-pulse 1.2s ease-in-out infinite;
+}
+.project-tree__topic-indicator--unread {
+  background: var(--fg-dim);
+}
+@keyframes project-tree-pulse {
+  0%, 100% { opacity: 1; transform: scale(1); }
+  50% { opacity: 0.6; transform: scale(1.15); }
+}
+
+.project-tree__topic-time {
+  flex: 0 0 auto;
+  font-size: 11px;
+  color: var(--fg-faint);
+  white-space: nowrap;
+  margin-left: 6px;
+  line-height: 1;
+}
+
 .project-tree__topic-main:focus-visible {
   outline: 2px solid var(--accent-soft);
   outline-offset: -2px;
@@ -10600,277 +10609,6 @@ a[href] {
   animation: none !important;
 }
 
-/* ── Branch indicator (changed-files view) ──────────────────────────── */
-.workspace-branch-indicator {
-  display: flex;
-  align-items: center;
-  gap: 5px;
-  padding: 6px 10px;
-  border-bottom: 1px solid var(--border);
-  color: var(--fg-muted);
-  font-size: 12px;
-}
-
-.workspace-branch-indicator > svg {
-  flex-shrink: 0;
-  opacity: 0.6;
-}
-
-.workspace-branch-indicator > .workspace-branch-name {
-  display: flex;
-  align-items: center;
-  gap: 3px;
-  border: none;
-  background: transparent;
-  color: var(--fg);
-  cursor: pointer;
-  font-family: inherit;
-  font-size: 12px;
-  padding: 1px 4px;
-  border-radius: 3px;
-}
-
-.workspace-branch-indicator > .workspace-branch-name:hover {
-  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
-}
-
-.workspace-branch-indicator > .workspace-branch-name span {
-  max-width: 160px;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.workspace-branch-refresh {
-  margin-left: auto;
-  border: none;
-  background: transparent;
-  color: var(--fg-muted);
-  cursor: pointer;
-  padding: 2px;
-  border-radius: 3px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-}
-
-.workspace-branch-refresh:hover {
-  color: var(--fg);
-  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
-}
-
-.workspace-branch-refresh:disabled {
-  opacity: 0.4;
-  cursor: default;
-}
-
-.workspace-branch-refresh .spinning {
-  animation: spin 0.6s linear infinite;
-}
-
-@keyframes spin {
-  to { transform: rotate(360deg); }
-}
-
-.workspace-branch-menu {
-  min-width: 140px;
-  max-width: 260px;
-  max-height: 300px;
-  background: var(--bg-elev);
-  border: 1px solid var(--border);
-  border-radius: 6px;
-  box-shadow: 0 6px 20px rgba(0, 0, 0, 0.2);
-  overflow: hidden;
-}
-
-.workspace-branch-menu__inner {
-  display: flex;
-  flex-direction: column;
-  overflow-y: auto;
-  background: var(--bg-elev);
-}
-
-.workspace-branch-menu__loading {
-  padding: 10px 12px;
-  color: var(--fg-muted);
-  font-size: 12px;
-  text-align: center;
-}
-
-.workspace-branch-menu__item {
-  display: flex;
-  align-items: center;
-  gap: 6px;
-  width: 100%;
-  padding: 6px 12px;
-  border: none;
-  background: transparent;
-  color: var(--fg);
-  cursor: pointer;
-  font-family: inherit;
-  font-size: 12px;
-  text-align: left;
-}
-
-.workspace-branch-menu__item:hover {
-  background: var(--bg-hover, rgba(128, 128, 128, 0.08));
-}
-
-.workspace-branch-menu__item--active {
-  font-weight: 600;
-}
-
-.workspace-branch-menu__item svg {
-  flex-shrink: 0;
-  opacity: 0.7;
-}
-
-.workspace-branch-menu__item span {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.workspace-branch-menu__item:disabled {
-  opacity: 0.4;
-  cursor: default;
-}
-
-/* ── Command palette (⌘K) ─────────────────────────────────────────── */
-.drawer-backdrop:has(.palette) {
-  justify-content: center;
-  align-items: flex-start;
-  padding-top: 12vh;
-}
-
-.palette {
-  position: relative;
-  width: min(520px, 90vw);
-  max-height: 60vh;
-  background: var(--bg-elev);
-  border: 1px solid var(--border);
-  border-radius: 10px;
-  box-shadow: 0 12px 48px rgba(0, 0, 0, 0.36);
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  animation: palette-in 0.1s ease;
-}
-
-@keyframes palette-in {
-  from { opacity: 0; transform: translateY(-12px) scale(0.97); }
-  to   { opacity: 1; transform: translateY(0) scale(1); }
-}
-
-.palette__inputrow {
-  display: flex;
-  align-items: center;
-  gap: 8px;
-  padding: 10px 14px;
-  border-bottom: 1px solid var(--border);
-}
-
-.palette__input {
-  flex: 1;
-  border: none;
-  outline: none;
-  background: transparent;
-  color: var(--fg);
-  font-size: 14px;
-  line-height: 1.4;
-}
-
-.palette__input::placeholder {
-  color: var(--fg-muted);
-}
-
-.palette__esc {
-  font-size: 11px;
-  padding: 2px 6px;
-  border-radius: 4px;
-  border: 1px solid var(--border);
-  color: var(--fg-muted);
-  background: var(--bg-base);
-  font-family: inherit;
-  line-height: 1.3;
-}
-
-.palette__list {
-  flex: 1;
-  overflow-y: auto;
-  padding: 6px 0;
-}
-
-.palette__empty {
-  padding: 24px 14px;
-  color: var(--fg-muted);
-  text-align: center;
-  font-size: 13px;
-}
-
-.palette__group-title {
-  padding: 8px 14px 4px;
-  font-size: 11px;
-  font-weight: 600;
-  text-transform: uppercase;
-  letter-spacing: 0.04em;
-  color: var(--fg-muted);
-}
-
-.palette__item {
-  display: flex;
-  flex-direction: column;
-  gap: 2px;
-  width: 100%;
-  padding: 8px 14px;
-  border: none;
-  background: transparent;
-  color: var(--fg);
-  cursor: pointer;
-  text-align: left;
-  font-family: inherit;
-  font-size: 13px;
-  line-height: 1.3;
-}
-
-.palette__item--on {
-  background: var(--accent-bg, rgba(77, 151, 255, 0.12));
-}
-
-.palette__item:focus-visible {
-  outline: 2px solid var(--accent);
-  outline-offset: -2px;
-}
-
-.palette__title {
-  font-weight: 500;
-}
-
-.palette__hint {
-  font-size: 11px;
-  color: var(--fg-muted);
-}
-
-.palette__foot {
-  display: flex;
-  gap: 12px;
-  padding: 7px 14px;
-  border-top: 1px solid var(--border);
-  font-size: 11px;
-  color: var(--fg-muted);
-}
-
-.palette__foot kbd {
-  padding: 1px 4px;
-  border-radius: 3px;
-  border: 1px solid var(--border);
-  background: var(--bg-base);
-  font-family: inherit;
-  font-size: 10px;
-  line-height: 1.3;
-  margin-right: 2px;
-}
-
 /* Respect the OS reduced-motion preference: squash all animations and force
    instant scrolling so the UI feels immediate rather than web-like. */
 @media (prefers-reduced-motion: reduce) {