@co0ontty/wand 1.6.2 → 1.9.0

package/dist/web-ui/content/styles.css

@@ -1101,6 +1101,499 @@
       color: #d35244;
     }
 
+    .session-action-btn.merge-btn:hover {
+      background: rgba(47, 128, 237, 0.1);
+      color: #2f80ed;
+    }
+
+    .session-kind-badge.worktree-merge {
+      background: rgba(47, 128, 237, 0.12);
+      color: #2f80ed;
+    }
+
+    .session-kind-badge.worktree-merge.failed {
+      background: rgba(231, 76, 60, 0.12);
+      color: #d35244;
+    }
+
+    .session-kind-badge.worktree-merge.merged {
+      background: rgba(39, 174, 96, 0.12);
+      color: #219653;
+    }
+
+    .session-kind-badge.worktree-merge.merging,
+    .session-kind-badge.worktree-merge.checking {
+      background: rgba(242, 153, 74, 0.12);
+      color: #c17c2b;
+    }
+
+    .worktree-merge-content {
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+    }
+
+    .worktree-merge-row {
+      display: flex;
+      justify-content: space-between;
+      gap: 16px;
+      padding: 10px 12px;
+      border: 1px solid var(--border-subtle);
+      border-radius: 12px;
+      background: rgba(255, 255, 255, 0.5);
+      font-size: 0.875rem;
+    }
+
+    .worktree-merge-row span {
+      color: var(--text-secondary);
+    }
+
+    .worktree-merge-row strong {
+      color: var(--text-primary);
+      word-break: break-all;
+      text-align: right;
+    }
+
+    .worktree-merge-actions {
+      display: flex;
+      justify-content: flex-end;
+      gap: 10px;
+      margin-top: 16px;
+    }
+
+    .worktree-merge-modal {
+      max-width: 620px;
+    }
+
+    .modal-subtitle {
+      margin-top: 4px;
+      font-size: 0.8125rem;
+      color: var(--text-muted);
+    }
+
+    .session-action-btn[disabled] {
+      opacity: 0.45;
+      cursor: not-allowed;
+    }
+
+    .session-action-btn[disabled]:hover {
+      background: transparent;
+      color: var(--text-muted);
+    }
+
+    .worktree-merge-actions .btn[disabled] {
+      opacity: 0.5;
+      cursor: not-allowed;
+    }
+
+    .worktree-merge-actions .btn[disabled]:hover {
+      transform: none;
+    }
+
+    .worktree-merge-actions .btn[disabled]:active {
+      transform: none;
+    }
+
+    .worktree-merge-actions .btn {
+      min-width: 120px;
+    }
+
+    .worktree-merge-modal .modal-body {
+      min-height: 260px;
+    }
+
+    .worktree-merge-modal .error-message {
+      margin-top: 12px;
+    }
+
+    .worktree-merge-content .field-hint {
+      margin-top: 0;
+    }
+
+    .worktree-merge-row + .field-hint {
+      margin-top: 2px;
+    }
+
+    .worktree-merge-content .field-hint + .field-hint {
+      margin-top: 4px;
+    }
+
+    .worktree-merge-modal .modal-subtitle {
+      max-width: 420px;
+    }
+
+    .worktree-merge-modal strong {
+      font-weight: 600;
+    }
+
+    .worktree-merge-modal .modal-header {
+      align-items: flex-start;
+    }
+
+    .worktree-merge-content p {
+      margin: 0;
+    }
+
+    .worktree-merge-content .field-hint strong {
+      color: var(--text-primary);
+    }
+
+    .worktree-merge-row strong:empty::after {
+      content: "-";
+      color: var(--text-muted);
+    }
+
+    .worktree-merge-content .field-hint code {
+      font-family: inherit;
+    }
+
+    .worktree-merge-actions .btn-secondary {
+      background: transparent;
+    }
+
+    .worktree-merge-actions .btn-secondary:hover {
+      background: rgba(0, 0, 0, 0.04);
+    }
+
+    .worktree-merge-actions .btn-secondary:active {
+      background: rgba(0, 0, 0, 0.07);
+    }
+
+    .worktree-merge-content .field-hint:last-child {
+      margin-bottom: 0;
+    }
+
+    .worktree-merge-row:first-child {
+      margin-top: 2px;
+    }
+
+    .worktree-merge-row:last-child {
+      margin-bottom: 0;
+    }
+
+    .worktree-merge-content .field-hint.muted {
+      color: var(--text-muted);
+    }
+
+    .worktree-merge-content .field-hint.error {
+      color: #d35244;
+    }
+
+    .worktree-merge-content .field-hint.success {
+      color: #219653;
+    }
+
+    .worktree-merge-content .field-hint.warning {
+      color: #c17c2b;
+    }
+
+    .worktree-merge-content .field-hint.info {
+      color: var(--text-secondary);
+    }
+
+    .worktree-merge-content .field-hint + .worktree-merge-row {
+      margin-top: 2px;
+    }
+
+    .worktree-merge-content .worktree-merge-row + .worktree-merge-row {
+      margin-top: 0;
+    }
+
+    .worktree-merge-content .worktree-merge-row strong small {
+      color: var(--text-muted);
+    }
+
+    .worktree-merge-content .worktree-merge-row strong code {
+      font-family: inherit;
+    }
+
+    .worktree-merge-content .worktree-merge-row span code {
+      font-family: inherit;
+    }
+
+    .worktree-merge-content .worktree-merge-row code {
+      background: transparent;
+      padding: 0;
+    }
+
+    .worktree-merge-content .worktree-merge-row em {
+      font-style: normal;
+      color: var(--text-muted);
+    }
+
+    .worktree-merge-content .worktree-merge-row small {
+      color: var(--text-muted);
+    }
+
+    .worktree-merge-content .worktree-merge-row .muted {
+      color: var(--text-muted);
+    }
+
+    .worktree-merge-content .worktree-merge-row .warning {
+      color: #c17c2b;
+    }
+
+    .worktree-merge-content .worktree-merge-row .success {
+      color: #219653;
+    }
+
+    .worktree-merge-content .worktree-merge-row .error {
+      color: #d35244;
+    }
+
+    .worktree-merge-content .worktree-merge-row .info {
+      color: var(--text-secondary);
+    }
+
+    .worktree-merge-content .worktree-merge-row .nowrap {
+      white-space: nowrap;
+    }
+
+    .worktree-merge-content .worktree-merge-row .break-all {
+      word-break: break-all;
+    }
+
+    .worktree-merge-content .worktree-merge-row .text-right {
+      text-align: right;
+    }
+
+    .worktree-merge-content .worktree-merge-row .text-left {
+      text-align: left;
+    }
+
+    .worktree-merge-content .worktree-merge-row .font-normal {
+      font-weight: 400;
+    }
+
+    .worktree-merge-content .worktree-merge-row .font-semibold {
+      font-weight: 600;
+    }
+
+    .worktree-merge-content .worktree-merge-row .font-bold {
+      font-weight: 700;
+    }
+
+    .worktree-merge-content .worktree-merge-row .opacity-70 {
+      opacity: 0.7;
+    }
+
+    .worktree-merge-content .worktree-merge-row .opacity-50 {
+      opacity: 0.5;
+    }
+
+    .worktree-merge-content .worktree-merge-row .opacity-40 {
+      opacity: 0.4;
+    }
+
+    .worktree-merge-content .worktree-merge-row .truncate {
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    .worktree-merge-content .worktree-merge-row .monospace {
+      font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace;
+    }
+
+    .worktree-merge-content .worktree-merge-row .tiny {
+      font-size: 0.75rem;
+    }
+
+    .worktree-merge-content .worktree-merge-row .small {
+      font-size: 0.8125rem;
+    }
+
+    .worktree-merge-content .worktree-merge-row .normal {
+      font-size: 0.875rem;
+    }
+
+    .worktree-merge-content .worktree-merge-row .large {
+      font-size: 0.9375rem;
+    }
+
+    .worktree-merge-content .worktree-merge-row .xlarge {
+      font-size: 1rem;
+    }
+
+    .worktree-merge-content .worktree-merge-row .caps {
+      text-transform: uppercase;
+    }
+
+    .worktree-merge-content .worktree-merge-row .lowercase {
+      text-transform: lowercase;
+    }
+
+    .worktree-merge-content .worktree-merge-row .capitalize {
+      text-transform: capitalize;
+    }
+
+    .worktree-merge-content .worktree-merge-row .letter-tight {
+      letter-spacing: -0.01em;
+    }
+
+    .worktree-merge-content .worktree-merge-row .letter-normal {
+      letter-spacing: 0;
+    }
+
+    .worktree-merge-content .worktree-merge-row .letter-wide {
+      letter-spacing: 0.02em;
+    }
+
+    .worktree-merge-content .worktree-merge-row .line-tight {
+      line-height: 1.3;
+    }
+
+    .worktree-merge-content .worktree-merge-row .line-normal {
+      line-height: 1.5;
+    }
+
+    .worktree-merge-content .worktree-merge-row .line-loose {
+      line-height: 1.7;
+    }
+
+    .worktree-merge-content .worktree-merge-row .block {
+      display: block;
+    }
+
+    .worktree-merge-content .worktree-merge-row .inline {
+      display: inline;
+    }
+
+    .worktree-merge-content .worktree-merge-row .inline-block {
+      display: inline-block;
+    }
+
+    .worktree-merge-content .worktree-merge-row .flex {
+      display: flex;
+    }
+
+    .worktree-merge-content .worktree-merge-row .grid {
+      display: grid;
+    }
+
+    .worktree-merge-content .worktree-merge-row .gap-sm {
+      gap: 6px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .gap-md {
+      gap: 10px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .gap-lg {
+      gap: 16px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .items-center {
+      align-items: center;
+    }
+
+    .worktree-merge-content .worktree-merge-row .items-start {
+      align-items: flex-start;
+    }
+
+    .worktree-merge-content .worktree-merge-row .items-end {
+      align-items: flex-end;
+    }
+
+    .worktree-merge-content .worktree-merge-row .justify-between {
+      justify-content: space-between;
+    }
+
+    .worktree-merge-content .worktree-merge-row .justify-end {
+      justify-content: flex-end;
+    }
+
+    .worktree-merge-content .worktree-merge-row .justify-start {
+      justify-content: flex-start;
+    }
+
+    .worktree-merge-content .worktree-merge-row .flex-1 {
+      flex: 1 1 auto;
+    }
+
+    .worktree-merge-content .worktree-merge-row .shrink-0 {
+      flex-shrink: 0;
+    }
+
+    .worktree-merge-content .worktree-merge-row .grow-0 {
+      flex-grow: 0;
+    }
+
+    .worktree-merge-content .worktree-merge-row .grow-1 {
+      flex-grow: 1;
+    }
+
+    .worktree-merge-content .worktree-merge-row .min-w-0 {
+      min-width: 0;
+    }
+
+    .worktree-merge-content .worktree-merge-row .w-full {
+      width: 100%;
+    }
+
+    .worktree-merge-content .worktree-merge-row .rounded {
+      border-radius: 8px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .rounded-lg {
+      border-radius: 12px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .rounded-full {
+      border-radius: 999px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .bg-subtle {
+      background: rgba(0, 0, 0, 0.03);
+    }
+
+    .worktree-merge-content .worktree-merge-row .border-subtle {
+      border: 1px solid var(--border-subtle);
+    }
+
+    .worktree-merge-content .worktree-merge-row .px-sm {
+      padding-left: 6px;
+      padding-right: 6px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .px-md {
+      padding-left: 10px;
+      padding-right: 10px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .py-sm {
+      padding-top: 4px;
+      padding-bottom: 4px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .py-md {
+      padding-top: 8px;
+      padding-bottom: 8px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .mt-sm {
+      margin-top: 4px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .mt-md {
+      margin-top: 8px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .mt-lg {
+      margin-top: 12px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .mb-sm {
+      margin-bottom: 4px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .mb-md {
+      margin-bottom: 8px;
+    }
+
+    .worktree-merge-content .worktree-merge-row .mb-lg {
+      margin-bottom: 12px;
+    }
+
     /* PC: hover to show action buttons */
     @media (hover: hover) {
       .session-item .session-actions {
@@ -1505,6 +1998,8 @@
       overflow: hidden;
       background: transparent;
       position: relative;
+      padding: 8px 6px 6px;
+      gap: 0;
     }
 
     .main-content.file-panel-open {
@@ -1512,6 +2007,170 @@
       transition: margin-right 0.25s cubic-bezier(0.4, 0, 0.2, 1);
     }
 
+    .main-content-header {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 12px;
+      min-height: 44px;
+      padding: 6px 10px 8px;
+      border: 1px solid rgba(140, 110, 85, 0.14);
+      border-bottom: none;
+      border-radius: 16px 16px 0 0;
+      background: rgba(255, 252, 248, 0.94);
+      backdrop-filter: blur(14px);
+      box-shadow:
+        0 8px 20px rgba(89, 58, 32, 0.06),
+        inset 0 -1px 0 rgba(255, 255, 255, 0.5);
+      flex-shrink: 0;
+      position: relative;
+      z-index: 2;
+    }
+
+
+    .main-content-header-left,
+    .main-content-header-center,
+    .main-content-header-right {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      min-width: 0;
+    }
+
+    .main-content-header-left,
+    .main-content-header-right {
+      flex: 1;
+    }
+
+    .main-content-header-center {
+      justify-content: center;
+      flex: 0 1 auto;
+    }
+
+    .main-content-header-right {
+      justify-content: flex-end;
+      flex-wrap: wrap;
+    }
+
+    .main-content-body {
+      flex: 1;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+      position: relative;
+      overflow: hidden;
+      border-radius: 0 0 14px 14px;
+      margin-top: -1px;
+    }
+
+    .main-content-body::before {
+      content: "";
+      position: absolute;
+      top: 0;
+      left: 14px;
+      right: 14px;
+      height: 8px;
+      background: linear-gradient(180deg, rgba(255, 255, 255, 0.09) 0%, rgba(255, 255, 255, 0) 100%);
+      pointer-events: none;
+      z-index: 1;
+    }
+
+    .main-content-body > .terminal-container,
+    .main-content-body > .chat-container,
+    .main-content-body > .blank-chat {
+      border-top-color: transparent;
+    }
+
+    .main-header-controls {
+      display: inline-flex;
+      align-items: center;
+      gap: 6px;
+      min-width: 0;
+      flex-wrap: wrap;
+    }
+
+    .main-header-btn,
+    .main-header-label {
+      height: 32px;
+      border-radius: 10px;
+      flex-shrink: 0;
+    }
+
+    .main-header-btn {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      gap: 6px;
+      padding: 0 10px;
+      border: 1px solid rgba(125, 91, 57, 0.12);
+      background: rgba(255, 255, 255, 0.7);
+      color: var(--text-secondary);
+      font-size: 0.75rem;
+      font-weight: 500;
+      font-family: var(--font-sans);
+      cursor: pointer;
+      transition: all var(--transition-fast);
+      white-space: nowrap;
+    }
+
+    .main-header-btn:hover {
+      background: rgba(255, 255, 255, 0.95);
+      border-color: rgba(197, 101, 61, 0.22);
+      color: var(--text-primary);
+    }
+
+    .main-header-btn:active {
+      transform: translateY(1px);
+    }
+
+    .main-header-label {
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      padding: 0 10px;
+      background: rgba(240, 229, 215, 0.55);
+      border: 1px solid rgba(125, 91, 57, 0.08);
+      color: var(--text-muted);
+      font-size: 0.6875rem;
+      font-weight: 600;
+      white-space: nowrap;
+    }
+
+    .menu-toggle-btn {
+      padding: 0 12px;
+      min-width: 40px;
+    }
+
+    .menu-toggle-btn.active {
+      background: var(--accent-muted);
+      border-color: rgba(197, 101, 61, 0.22);
+      color: var(--accent);
+    }
+
+    .jump-latest-btn {
+      opacity: 0;
+      transform: translateY(4px);
+      pointer-events: none;
+    }
+
+    .jump-latest-btn.visible {
+      opacity: 1;
+      transform: translateY(0);
+      pointer-events: auto;
+    }
+
+    .main-header-new-session {
+      background: rgba(197, 101, 61, 0.12);
+      border-color: rgba(197, 101, 61, 0.18);
+      color: var(--accent);
+      font-weight: 600;
+    }
+
+    .main-header-new-session:hover {
+      background: rgba(197, 101, 61, 0.18);
+      border-color: rgba(197, 101, 61, 0.28);
+    }
+
     .terminal-info { font-size: 0.625rem; color: var(--text-muted); font-weight: 500; }
 
     /* Current task indicator in terminal header */
@@ -1562,8 +2221,8 @@
       padding: 10px;
       overflow: hidden;
       min-height: 0;
-      margin: 0 6px 6px;
-      border-radius: var(--radius-md);
+      margin: 0;
+      border-radius: 16px;
       border: 1px solid rgba(140, 110, 85, 0.35);
       box-shadow:
         inset 0 1px 0 rgba(255, 255, 255, 0.06),
@@ -1573,6 +2232,13 @@
       transition: border-color var(--transition-normal), box-shadow var(--transition-normal);
     }
 
+    .terminal-container.hidden,
+    .chat-container.hidden,
+    .blank-chat.hidden,
+    .input-panel.hidden {
+      display: none !important;
+    }
+
     .terminal-container.active {
       display: flex;
       align-items: stretch;
@@ -1798,96 +2464,123 @@
       text-align: center;
       padding: 0 2px;
     }
-    .terminal-scale-overlay {
-      position: absolute;
-      top: 8px;
-      right: 8px;
-      display: inline-flex;
-      align-items: center;
-      gap: 1px;
-      padding: 2px;
-      border-radius: 7px;
-      border: 1px solid rgba(255, 255, 255, 0.06);
-      background: rgba(24, 20, 17, 0.38);
-      backdrop-filter: blur(8px);
-      box-shadow: 0 6px 18px rgba(0, 0, 0, 0.18);
-      opacity: 0.72;
-      transition: opacity 0.18s ease, background 0.18s ease, border-color 0.18s ease;
-      z-index: 12;
-      pointer-events: auto;
+    .terminal-jump-bottom {
+      background: rgba(24, 20, 17, 0.82);
+      color: rgba(255, 247, 239, 0.92);
+      border-color: rgba(255, 255, 255, 0.12);
+      box-shadow: 0 8px 18px rgba(0, 0, 0, 0.16);
+      transition: opacity 0.18s ease, transform 0.18s ease, background 0.18s ease, border-color 0.18s ease;
     }
-    .terminal-container:hover .terminal-scale-overlay,
-    .terminal-scale-overlay:focus-within {
-      opacity: 1;
-      background: rgba(24, 20, 17, 0.56);
+    .terminal-jump-bottom:hover {
+      background: rgba(38, 30, 24, 0.9);
+      border-color: rgba(214, 123, 82, 0.28);
+    }
+    .terminal-jump-bottom:active {
+      transform: translateY(1px);
+    }
+
+    .terminal-scale-btn {
+      min-width: 32px;
+      padding: 0 8px;
+    }
+
+    .terminal-scale-label {
+      min-width: 46px;
+    }
+
+    #terminal-header-controls .main-header-btn,
+    #terminal-header-controls .main-header-label {
+      background: rgba(36, 28, 22, 0.88);
+      color: rgba(245, 234, 220, 0.9);
       border-color: rgba(255, 255, 255, 0.1);
     }
-    .terminal-scale-overlay-btn {
-      min-width: 22px;
-      height: 22px;
-      padding: 0 3px;
-      color: rgba(245, 234, 220, 0.88);
-      background: transparent;
-      border: none;
-      border-radius: 5px;
-      transition: background 0.18s ease, color 0.18s ease;
+
+    #terminal-header-controls .main-header-btn:hover {
+      background: rgba(46, 35, 28, 0.94);
+      border-color: rgba(214, 123, 82, 0.28);
     }
-    .terminal-scale-overlay-btn:hover {
-      background: rgba(214, 123, 82, 0.18);
-      color: rgba(255, 247, 239, 0.96);
+
+    #terminal-header-controls .terminal-scale-label {
+      color: rgba(245, 234, 220, 0.72);
     }
-    .terminal-scale-overlay-label {
-      font-size: 0.625rem;
-      color: rgba(245, 234, 220, 0.66);
-      min-width: 34px;
-      text-align: center;
-      padding: 0 3px;
+
+    #terminal-header-controls .jump-latest-btn:not(.visible) {
+      display: none;
     }
 
-    .terminal-scale-overlay-divider {
-      width: 1px;
-      height: 14px;
-      background: rgba(245, 234, 220, 0.2);
-      margin: 0 2px;
+    #chat-header-controls .jump-latest-btn:not(.visible) {
+      display: none;
     }
 
-    .terminal-jump-bottom {
-      position: absolute;
-      right: 14px;
-      bottom: 18px;
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-      gap: 6px;
+    #chat-header-controls .chat-follow-toggle {
+      min-width: 60px;
+    }
+
+    #chat-header-controls .chat-follow-toggle:hover {
+      background: rgba(255, 255, 255, 0.92);
+    }
+
+    #chat-header-controls .chat-follow-toggle.active:hover {
+      background: rgba(197, 101, 61, 0.18);
+    }
+
+    #chat-header-controls .chat-jump-bottom {
+      background: rgba(255, 250, 242, 0.92);
+      color: var(--text-primary);
+      border-color: rgba(125, 91, 57, 0.16);
+      box-shadow: 0 8px 18px rgba(89, 58, 32, 0.12);
+      transition: opacity 0.18s ease, transform 0.18s ease, background 0.18s ease, border-color 0.18s ease;
+    }
+
+    #chat-header-controls .chat-jump-bottom:hover {
+      background: rgba(255, 255, 255, 0.98);
+      border-color: rgba(197, 101, 61, 0.24);
+    }
+
+    #chat-header-controls .chat-jump-bottom:active {
+      transform: translateY(1px);
+    }
+
+    .terminal-scale-overlay,
+    .terminal-scale-overlay-btn,
+    .terminal-scale-overlay-label,
+    .terminal-scale-overlay-divider,
+    .chat-overlay-controls {
+      display: none !important;
+    }
+
+    .terminal-jump-bottom,
+    .chat-jump-bottom {
+      position: static;
+      right: auto;
+      bottom: auto;
       min-width: 78px;
       height: 32px;
       padding: 0 12px;
-      border: 1px solid rgba(255, 255, 255, 0.1);
       border-radius: 999px;
-      background: rgba(24, 20, 17, 0.72);
-      color: rgba(255, 247, 239, 0.92);
-      box-shadow: 0 10px 24px rgba(0, 0, 0, 0.28);
-      backdrop-filter: blur(10px);
       cursor: pointer;
-      z-index: 13;
-      opacity: 0;
-      transform: translateY(8px);
-      pointer-events: none;
-      transition: opacity 0.18s ease, transform 0.18s ease, background 0.18s ease, border-color 0.18s ease;
+      z-index: auto;
     }
+
+    .chat-jump-bottom.visible,
     .terminal-jump-bottom.visible {
       opacity: 1;
       transform: translateY(0);
       pointer-events: auto;
     }
-    .terminal-jump-bottom:hover {
-      background: rgba(38, 30, 24, 0.84);
-      border-color: rgba(214, 123, 82, 0.28);
+
+    .chat-jump-bottom {
+      opacity: 0;
+      transform: translateY(4px);
+      pointer-events: none;
     }
-    .terminal-jump-bottom:active {
-      transform: translateY(1px);
+
+    .chat-jump-bottom.visible {
+      opacity: 1;
     }
 
+    .chat-container.active { display: flex; }
+
     /* Terminal interactive mode indicator */
     .terminal-container.interactive {
       border-color: rgba(79, 122, 88, 0.5);
@@ -2158,6 +2851,7 @@
 
     /* ===== 聊天容器 ===== */
     .chat-container {
+      position: relative;
       flex: 1;
       display: none;
       flex-direction: column;
@@ -2165,9 +2859,32 @@
       overflow: hidden;
       padding: 0 20px 16px;
       background: linear-gradient(180deg, rgba(255, 252, 248, 0.5) 0%, transparent 100%);
+      border-radius: 16px;
+    }
+
+    .chat-follow-toggle {
+      min-width: 52px;
+      padding: 0 10px;
+      font-size: 0.6875rem;
+      color: var(--text-secondary);
+      background: transparent;
+      border-color: transparent;
+    }
+
+    .chat-follow-toggle.active {
+      background: var(--accent-muted);
+      color: var(--accent);
+      border-color: rgba(197, 101, 61, 0.2);
+    }
+
+    .chat-follow-toggle:hover {
+      background: rgba(255, 255, 255, 0.7);
+    }
+
+    .chat-follow-toggle.active:hover {
+      background: rgba(197, 101, 61, 0.18);
     }
 
-    .chat-container.active { display: flex; }
 
     /* ===== 聊天消息列表 ===== */
     .chat-messages {
@@ -3509,6 +4226,7 @@
       z-index: 26;
       overscroll-behavior: contain;
       touch-action: pan-y;
+      border-radius: 14px;
     }
 
     .input-composer {
@@ -4786,6 +5504,22 @@
     .mode-card.active .mode-card-label {
       color: var(--accent);
     }
+    .mode-card.disabled {
+      opacity: 0.45;
+      cursor: not-allowed;
+      pointer-events: none;
+    }
+    .mode-card.disabled:hover {
+      border-color: rgba(125, 91, 57, 0.2);
+      background: rgba(255, 255, 255, 0.6);
+    }
+    .mode-card.disabled .mode-card-label,
+    .mode-card.disabled .mode-card-desc {
+      color: var(--text-muted);
+    }
+    .mode-card.active.disabled {
+      box-shadow: none;
+    }
     .password-input[data-error="true"],
     .password-input[aria-invalid="true"] {
       border-color: var(--danger);
@@ -4893,6 +5627,29 @@
     .modal-body { padding: 22px; overflow-y: auto; flex: 1 1 auto; min-height: 0; }
     .modal-body .field { margin-bottom: 14px; }
     .modal-body .field:last-of-type { margin-bottom: 16px; }
+    .session-kind-hint-row {
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      gap: 12px;
+    }
+    .session-kind-hint-row #session-kind-description {
+      flex: 1 1 auto;
+    }
+    .session-inline-toggle {
+      display: inline-flex;
+      align-items: center;
+      gap: 8px;
+      white-space: nowrap;
+      color: var(--text-secondary);
+      cursor: pointer;
+      user-select: none;
+    }
+    .session-inline-toggle-label {
+      font-size: 0.75rem;
+      font-weight: 600;
+      color: var(--text-secondary);
+    }
     .field-hint {
       margin-top: 6px;
       font-size: 0.75rem;
@@ -5206,17 +5963,134 @@
         overflow: hidden;
       }
 
-      /* 移动端浮动按钮 */
-      .floating-sidebar-toggle {
-        width: 30px;
-        height: 30px;
-        top: max(8px, env(safe-area-inset-top, 8px));
-        left: 8px;
-        border-radius: 6px;
+      .sidebar { top: 0; }
+
+      .main-content {
+        padding: 6px;
+        gap: 0;
       }
-      .floating-sidebar-toggle .hamburger-icon { width: 13px; height: 9px; }
 
-      .sidebar { top: 0; }
+      .main-content-header {
+        min-height: 40px;
+        padding: 6px 8px 7px;
+        gap: 8px;
+      }
+
+      .main-content-header::before,
+      .main-content-header::after {
+        width: 14px;
+        height: 14px;
+      }
+
+      .main-content-header::before {
+        box-shadow: 5px 5px 0 0 rgba(255, 252, 248, 0.94);
+      }
+
+      .main-content-header::after {
+        box-shadow: -5px 5px 0 0 rgba(255, 252, 248, 0.94);
+      }
+
+      .main-content-body::before {
+        left: 10px;
+        right: 10px;
+        height: 6px;
+      }
+
+      .main-content-header-left,
+      .main-content-header-center,
+      .main-content-header-right {
+        gap: 6px;
+      }
+
+      .main-content-header-right {
+        flex-wrap: nowrap;
+        overflow-x: auto;
+        scrollbar-width: none;
+      }
+
+      .main-content-header-right::-webkit-scrollbar {
+        display: none;
+      }
+
+      .main-header-controls {
+        gap: 4px;
+        flex-wrap: nowrap;
+      }
+
+      .main-header-btn,
+      .main-header-label,
+      .topbar-btn {
+        height: 28px;
+        min-height: 28px;
+        font-size: 0.6875rem;
+        border-radius: 8px;
+      }
+
+      .menu-toggle-btn {
+        min-width: 34px;
+        padding: 0 10px;
+      }
+
+      .menu-toggle-btn .hamburger-icon {
+        width: 13px;
+        height: 9px;
+      }
+
+      .main-header-label {
+        padding: 0 8px;
+      }
+
+      .main-header-new-session {
+        padding: 0 10px;
+      }
+
+      .main-content-header-left,
+      .main-content-header-center,
+      .main-content-header-right {
+        gap: 6px;
+      }
+
+      .main-content-header-right {
+        flex-wrap: nowrap;
+        overflow-x: auto;
+        scrollbar-width: none;
+      }
+
+      .main-content-header-right::-webkit-scrollbar {
+        display: none;
+      }
+
+      .main-header-controls {
+        gap: 4px;
+        flex-wrap: nowrap;
+      }
+
+      .main-header-btn,
+      .main-header-label,
+      .topbar-btn {
+        height: 28px;
+        min-height: 28px;
+        font-size: 0.6875rem;
+        border-radius: 8px;
+      }
+
+      .menu-toggle-btn {
+        min-width: 34px;
+        padding: 0 10px;
+      }
+
+      .menu-toggle-btn .hamburger-icon {
+        width: 13px;
+        height: 9px;
+      }
+
+      .main-header-label {
+        padding: 0 8px;
+      }
+
+      .main-header-new-session {
+        padding: 0 10px;
+      }
 
       /* 移动端终端顶栏 - 紧凑 */
       .terminal-header { padding: 5px 8px; min-height: 32px; }
@@ -5239,22 +6113,15 @@
       .view-toggle { height: 28px; padding: 2px; gap: 1px; }
       .view-toggle-btn { height: 24px; min-height: 24px; padding: 0 6px; font-size: 0.625rem; gap: 2px; border-radius: 4px; }
 
-      /* 移动端终端内缩放浮层 */
-      .terminal-scale-overlay {
-        top: 6px;
-        right: 6px;
-        padding: 2px;
-        gap: 1px;
-      }
-      .terminal-scale-overlay-btn {
-        min-width: 20px;
-        height: 20px;
+      #terminal-header-controls .terminal-scale-btn {
+        min-width: 28px;
+        padding: 0 6px;
         font-size: 0.75rem;
       }
-      .terminal-scale-overlay-label {
-        min-width: 28px;
-        font-size: 0.5625rem;
-        padding: 0 2px;
+
+      #terminal-header-controls .terminal-scale-label {
+        min-width: 38px;
+        font-size: 0.625rem;
       }
 
       /* 移动端简化交互模式按钮 */
@@ -5672,7 +6539,7 @@
       /* 继承 max-width: 640px 的样式，此处仅做微调 */
 
       .terminal-container {
-        margin: 0 6px 6px;
+        margin: 0;
         padding: 6px;
       }
 
@@ -5685,13 +6552,56 @@
     /* iPhone SE 等小屏幕 (<= 390px) */
     @media (max-width: 390px) {
       /* 继承 max-width: 640px 的样式，此处仅做小屏微调 */
-      .floating-sidebar-toggle {
-        width: 26px;
-        height: 26px;
-        top: max(6px, env(safe-area-inset-top, 6px));
-        left: 6px;
+      .main-content {
+        padding: 4px 4px 4px;
+        gap: 0;
+      }
+
+      .main-content-header {
+        min-height: 36px;
+        padding: 5px 6px 6px;
+        gap: 6px;
+      }
+
+      .main-content-header::before,
+      .main-content-header::after {
+        width: 12px;
+        height: 12px;
+      }
+
+      .main-content-header::before {
+        box-shadow: 4px 4px 0 0 rgba(255, 252, 248, 0.94);
+      }
+
+      .main-content-header::after {
+        box-shadow: -4px 4px 0 0 rgba(255, 252, 248, 0.94);
+      }
+
+      .main-content-body::before {
+        left: 8px;
+        right: 8px;
+        height: 5px;
+      }
+
+      .main-content-header-left,
+      .main-content-header-center,
+      .main-content-header-right {
+        gap: 4px;
+      }
+
+      .main-header-btn,
+      .main-header-label,
+      .topbar-btn {
+        font-size: 0.625rem;
+        padding: 0 8px;
+      }
+
+      .menu-toggle-btn {
+        min-width: 30px;
+        padding: 0 8px;
       }
-      .floating-sidebar-toggle .hamburger-icon { width: 11px; height: 8px; }
+
+      .menu-toggle-btn .hamburger-icon { width: 11px; height: 8px; }
 
       .terminal-header { padding: 4px 6px; min-height: 28px; }
       .terminal-title-text { font-size: 0.6875rem; }
@@ -5883,6 +6793,12 @@
       border-color: rgba(215, 122, 82, 0.22);
     }
 
+    .session-kind-badge.worktree {
+      color: #2f6f54;
+      background: rgba(79, 122, 88, 0.12);
+      border-color: rgba(79, 122, 88, 0.22);
+    }
+
     .session-kind-display {
       display: inline-flex;
       align-items: center;
@@ -6310,41 +7226,160 @@
     /* ── Settings modal ── */
 
     .settings-modal {
-      max-width: 520px;
-      max-height: 80vh;
+      max-width: 860px;
+      max-height: 82vh;
     }
 
-    .settings-tabs {
+    .settings-layout {
+      display: grid;
+      grid-template-columns: 180px minmax(0, 1fr);
+      gap: 18px;
+      min-height: 0;
+    }
+
+    .settings-nav {
       display: flex;
-      gap: 2px;
-      border-bottom: 1px solid var(--border-subtle);
-      margin-bottom: 16px;
-      padding-bottom: 0;
+      flex-direction: column;
+      gap: 8px;
+      padding-right: 8px;
+      border-right: 1px solid var(--border-subtle);
+    }
+
+    .settings-content {
+      min-width: 0;
+      overflow-y: auto;
+      padding-right: 4px;
     }
 
     .settings-tab {
-      padding: 8px 14px;
-      font-size: 0.8125rem;
-      font-weight: 500;
+      padding: 10px 12px;
+      font-size: 0.84rem;
+      font-weight: 600;
       color: var(--text-secondary);
-      background: none;
-      border: none;
-      border-bottom: 2px solid transparent;
-      border-radius: var(--radius-sm) var(--radius-sm) 0 0;
+      background: transparent;
+      border: 1px solid transparent;
+      border-radius: 12px;
       cursor: pointer;
-      transition: color 0.15s, border-color 0.15s, background 0.15s;
+      transition: color 0.15s, border-color 0.15s, background 0.15s, transform 0.15s;
       white-space: nowrap;
+      text-align: left;
     }
 
     .settings-tab:hover {
       color: var(--text-primary);
       background: rgba(197, 101, 61, 0.06);
+      border-color: rgba(197, 101, 61, 0.12);
+      transform: translateX(1px);
     }
 
     .settings-tab.active {
       color: var(--accent);
-      border-bottom-color: var(--accent);
-      background: var(--accent-muted);
+      border-color: rgba(197, 101, 61, 0.18);
+      background: linear-gradient(180deg, rgba(197, 101, 61, 0.12), rgba(197, 101, 61, 0.06));
+      box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.35);
+    }
+
+    .settings-card-header {
+      display: flex;
+      justify-content: space-between;
+      align-items: flex-start;
+      gap: 12px;
+      margin-bottom: 12px;
+    }
+
+    .settings-card-accent {
+      border: 1px solid rgba(197, 101, 61, 0.12);
+      box-shadow: 0 10px 24px rgba(89, 58, 32, 0.04);
+    }
+
+    .settings-toggle-list {
+      display: flex;
+      flex-direction: column;
+      gap: 10px;
+    }
+
+    .settings-toggle-item {
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      gap: 16px;
+      padding: 12px 14px;
+      border-radius: 12px;
+      background: rgba(255, 255, 255, 0.72);
+      border: 1px solid rgba(140, 110, 85, 0.08);
+      cursor: pointer;
+    }
+
+    .settings-toggle-title {
+      display: block;
+      font-size: 0.84rem;
+      font-weight: 600;
+      color: var(--text-primary);
+      margin-bottom: 4px;
+    }
+
+    .settings-toggle-desc {
+      display: block;
+      font-size: 0.78rem;
+      color: var(--text-secondary);
+      line-height: 1.45;
+    }
+
+    .settings-inline-hint {
+      margin-top: -4px;
+    }
+
+    .settings-tab.active + .settings-tab {
+      margin-top: 0;
+    }
+
+    .settings-tabs {
+      display: none;
+    }
+
+    .settings-panel {
+      display: none;
+    }
+
+    .settings-panel.active {
+      display: block;
+    }
+
+    @media (max-width: 840px) {
+      .settings-layout {
+        grid-template-columns: 1fr;
+      }
+
+      .settings-nav {
+        flex-direction: row;
+        overflow-x: auto;
+        padding-right: 0;
+        padding-bottom: 10px;
+        border-right: none;
+        border-bottom: 1px solid var(--border-subtle);
+      }
+
+      .settings-tab {
+        flex: 0 0 auto;
+      }
+    }
+
+    @media (max-width: 640px) {
+      .settings-modal {
+        max-width: min(96vw, 680px);
+      }
+
+      .settings-toggle-item {
+        align-items: flex-start;
+      }
+    }
+
+    .settings-panel {
+      display: none;
+    }
+
+    .settings-panel.active {
+      display: block;
     }
 
     .settings-panel {
@@ -7666,9 +8701,9 @@
       line-height: inherit !important;
     }
 
-    /* 确保按钮在 DOM 视图之上 */
+    /* 统一 header 中的跳转按钮沿用显隐动画 */
     .terminal-jump-bottom {
-      z-index: 20;
+      z-index: auto;
     }
 
     /* ── 结构化会话状态条 ── */