release: git-arboretum 3.2.0 (refonte visuelle Emerald, thème clair/sombre, site & doc alignés)

Site (packages/site) : adopte le design system Emerald (polices Inter +
JetBrains Mono variables, tokens sémantiques, thème clair/sombre + bascule)
et met les mockups à jour sur l'app réelle.

- style.css : tokens Emerald (@theme sombre + override html[data-theme=light]) ;
  lib/theme.ts + ThemeToggle.vue + anti-FOUC index.html ; sweep des couleurs
  brutes vers les tokens dans toutes les sections.
- Mockups fidèles à l'IDE multi-projet : HeroMockup (rail ActivityBar au lieu
  de la sidebar large + v obsolète retirée), ShowcaseSection (supervision au
  lieu du dashboard worktree-first, onglets mobiles réels), WorkspaceShowcase
  (diff-add/del, bouton commit accent-solid) ; framing « worktree-first »
  résiduel levé (i18n).
- og-cover.png rafraîchi (carte Emerald).

Docs : README.md + README.fr.md (retrait « Status: MVP », ajout du langage
Emerald + thème clair/sombre/système, VSIX 0.2.0 -> 0.3.0, section Screenshots),
vscode README (VSIX 0.3.0), brand README (thème clair), CHANGELOG daemon 3.2.0.
Captures IDE sombre + clair (brand/screenshot-ide-*.png).

README.fr.md

@@ -10,12 +10,28 @@
   <a href="README.md">English</a> · <strong>Français</strong>
 </p>
 
-**Statut : MVP.** Le dashboard worktree-first, la découverte et la reprise de sessions, le cycle de vie des worktrees multi-repo, le démarrage de sessions sur votre branche principale ou n'importe quel worktree, les états de session en temps réel, le terminal web, la supervision mobile (PWA installable, Web Push quand une session vous attend, répondre à une demande sans ouvrir de terminal) et les groupes de travail (piloter plusieurs repos liés depuis une seule session Claude) sont implémentés et testés.
+La découverte et la reprise de sessions, le cycle de vie des worktrees multi-repo, le démarrage de sessions sur votre branche principale ou n'importe quel worktree, les états de session en temps réel, le terminal web, la supervision mobile (PWA installable, Web Push quand une session vous attend, répondre à une demande sans ouvrir de terminal) et les groupes de travail (piloter plusieurs repos liés depuis une seule session Claude) sont tous implémentés et testés.
 
 La dernière étape transforme Arboretum en véritable **IDE IA multi-projet** : un espace de travail unique (route `/ide`, la vue par défaut sur desktop) qui réunit **tous** vos projets ouverts à la fois, fini l'IDE par projet. Un arbre unique à gauche (projet, puis checkout principal et worktrees, puis session Claude), un éditeur Monaco à onglets au centre (plusieurs fichiers de projets différents côte à côte, diffs inline), les terminaux Claude en dock bas, et des panneaux Git / Sessions / Groupes via une barre d'activité. Il est fourni à la fois en **app de bureau native** (Linux, Windows, macOS) et en interface web, adossé à un watcher de système de fichiers en temps réel, au staging sélectif / discard / amend / fetch / pull, à l'archivage automatique des sessions, à la synchronisation des réglages en temps réel, et à des services git distants chiffrés (GitHub / GitLab / Gitea) avec clone HTTPS.
 
 ---
 
+## Captures d'écran
+
+<p align="center">
+  <img src="brand/screenshot-ide-dark.png" alt="Arboretum, l'IDE IA multi-projet (thème sombre)" width="900">
+</p>
+
+<p align="center">
+  <em>Un espace de travail pour tous les projets : arbre unifié, éditeur Monaco à onglets avec diffs inline, terminaux Claude en dock. Thèmes sombre et clair.</em>
+</p>
+
+<p align="center">
+  <img src="brand/screenshot-ide-light.png" alt="Arboretum, l'IDE IA multi-projet (thème clair)" width="900">
+</p>
+
+---
+
 ## Le problème
 
 Travailler avec des agents de code IA a changé notre usage de git : une feature = un worktree = une session Claude Code, plusieurs en parallèle. Mais l'outillage n'a pas suivi :
@@ -28,7 +44,7 @@ Travailler avec des agents de code IA a changé notre usage de git : une feature
 
 Un unique daemon Node.js que vous lancez sur votre machine de dev (en app de bureau native, ou via `npx @johanleroy/git-arboretum`), servant une interface utilisable depuis votre ordinateur, téléphone ou tablette :
 
-- **Dashboard worktree-first, multi-repo** : chaque worktree de chaque repo enregistré, avec son état git (branche, ahead/behind, fichiers modifiés) *et* l'état de sa session Claude Code (busy / en attente d'entrée / idle / reprenable).
+- **Dashboard worktree multi-repo** : chaque worktree de chaque repo enregistré, avec son état git (branche, ahead/behind, fichiers modifiés) *et* l'état de sa session Claude Code (busy / en attente d'entrée / idle / reprenable).
 - **Cycle de vie complet des worktrees** : créer (avec des hooks post-création par repo : `npm ci`, copie de `.env`…), adopter des worktrees créés à la main, supprimer avec garde-fous, élaguer les orphelins.
 - **Découverte & reprise de sessions** : les sessions lancées dans votre propre terminal apparaissent automatiquement ; reprenez les sessions mortes, observez ou forkez les vivantes. Ne corrompt jamais une session vivante. Masquez les anciennes qui encombrent la liste (un clic efface tout l'historique externe ; elles restent reprenables).
 - **Terminal web** : terminal xterm.js complet vers chaque session managée, qui survit aux déconnexions du navigateur ; vraiment plein écran, avec l'invite ancrée en bas et tout l'historique défilable au-dessus.
@@ -129,6 +145,7 @@ Au-delà de la supervision, Arboretum est un véritable **IDE multi-projet** (ro
 - **Dock de terminaux.** Les terminaux de session Claude vivent dans un dock bas, un onglet par session ; ouvrez-en plusieurs à la fois (à travers les projets), répondez à une demande en attente directement là. Les terminaux survivent aux changements d'onglet et aux déconnexions du navigateur.
 - **Panneau Git.** Indexez ou désindexez des fichiers individuels, jetez des changements, écrivez un message et **committez** (tout ou seulement l'indexé), **amendez** le dernier commit (refusé une fois poussé), puis **fetch**, **pull** (fast-forward ou rebase) et **push**. Les compteurs indexés / non indexés / conflits détaillés et le dernier commit restent à jour via un **watcher de système de fichiers en temps réel** : la vue s'actualise dès qu'une session Claude touche un fichier.
 - **Deep links & mobile.** `/workspace/:repoId/:wt` ouvre toujours un worktree précis directement dans l'IDE (utilisé par l'extension VS Code). Sur mobile, l'IDE dégrade en panneau unique, et le dashboard des worktrees et les vues de session restent la PWA de supervision installable.
+- **Clair ou sombre, au choix.** Un langage visuel épuré et cohérent (le design system « Emerald » : Inter + JetBrains Mono, un accent emerald) avec une bascule de thème **clair / sombre / système** mémorisée d'une session à l'autre. L'éditeur Monaco, les terminaux et les diffs suivent tous le thème actif.
 
 Comme toute action git dans Arboretum, ces opérations s'exécutent **en tant que vous** (le daemon tourne sous votre compte), cohérent avec le modèle de sécurité : un terminal web, c'est de l'exécution de code à distance par conception.
 
@@ -146,10 +163,10 @@ Elle est distribuée en **VSIX privé**. Buildez-la et packagez-la depuis le mon
 
 ```bash
 npm run build:vscode
-cd packages/vscode && npx @vscode/vsce package --no-dependencies   # → git-arboretum-0.2.0.vsix
+cd packages/vscode && npx @vscode/vsce package --no-dependencies   # → git-arboretum-0.3.0.vsix
 ```
 
-Puis installez-la via **Extensions : Installer à partir d'un VSIX…** (ou `code --install-extension git-arboretum-0.2.0.vsix`), lancez **Arboretum: Sign In** et collez un token. Détails complets dans [`packages/vscode/README.md`](packages/vscode/README.md).
+Puis installez-la via **Extensions : Installer à partir d'un VSIX…** (ou `code --install-extension git-arboretum-0.3.0.vsix`), lancez **Arboretum: Sign In** et collez un token. Détails complets dans [`packages/vscode/README.md`](packages/vscode/README.md).
 
 ## Accès distant depuis votre téléphone
 

README.md

@@ -10,12 +10,28 @@
   <strong>English</strong> · <a href="README.fr.md">Français</a>
 </p>
 
-**Status: MVP.** The worktree-first dashboard, session discovery & resume, multi-repo worktree lifecycle, sessions on your main branch or any worktree, live session states, the web terminal, mobile supervision (installable PWA, Web Push when a session needs you, answer a prompt without opening a terminal), and work groups (drive several related repos from a single Claude session) are implemented and tested.
+Session discovery & resume, multi-repo worktree lifecycle, sessions on your main branch or any worktree, live session states, the web terminal, mobile supervision (installable PWA, Web Push when a session needs you, answer a prompt without opening a terminal), and work groups (drive several related repos from a single Claude session) are all implemented and tested.
 
 The latest milestone turns Arboretum into a real **multi-project AI IDE**: a single workspace (route `/ide`, the default view on desktop) that holds **all** your open projects at once, no more one IDE window per project. A single left tree (project, then main checkout and worktrees, then Claude session), a tabbed Monaco editor at the center (several files from different projects side by side, inline diffs), Claude terminals in a bottom dock, and Git / Sessions / Groups panels via an activity bar. It ships both as a **native desktop app** (Linux, Windows, macOS) and the same web UI, backed by a real-time file-system watcher, selective staging / discard / amend / fetch / pull, automatic session archival, real-time settings sync, and encrypted remote git services (GitHub / GitLab / Gitea) with HTTPS clone.
 
 ---
 
+## Screenshots
+
+<p align="center">
+  <img src="brand/screenshot-ide-dark.png" alt="Arboretum, the multi-project AI IDE (dark theme)" width="900">
+</p>
+
+<p align="center">
+  <em>One workspace for every project: a unified tree, a tabbed Monaco editor with inline diffs, and docked Claude terminals. Dark and light themes.</em>
+</p>
+
+<p align="center">
+  <img src="brand/screenshot-ide-light.png" alt="Arboretum, the multi-project AI IDE (light theme)" width="900">
+</p>
+
+---
+
 ## The problem
 
 Working with AI coding agents changed how we use git: one feature = one worktree = one Claude Code session, several of them in parallel. But the tooling didn't follow:
@@ -28,7 +44,7 @@ Working with AI coding agents changed how we use git: one feature = one worktree
 
 A single Node.js daemon you run on your dev machine (as a native desktop app, or via `npx @johanleroy/git-arboretum`), serving a UI usable from your desktop, phone or tablet:
 
-- **Worktree-first, multi-repo dashboard**: every worktree of every registered repo, with its git state (branch, ahead/behind, dirty files) *and* the state of its Claude Code session (busy / waiting for input / idle / resumable).
+- **Multi-repo worktree dashboard**: every worktree of every registered repo, with its git state (branch, ahead/behind, dirty files) *and* the state of its Claude Code session (busy / waiting for input / idle / resumable).
 - **Full worktree lifecycle**: create (with per-repo post-create hooks: `npm ci`, copy `.env`…), adopt worktrees created by hand, delete with guardrails, prune orphans.
 - **Session discovery & resume**: sessions you launched in your own terminal show up automatically; resume dead ones, observe or fork live ones. Never corrupts a live session. Hide the old ones that clutter the list (one click clears the whole external history; they stay resumable).
 - **Web terminal**: full xterm.js terminal to every managed session, surviving browser disconnects; truly fullscreen, with the prompt pinned to the bottom and full scrollback above.
@@ -129,6 +145,7 @@ Beyond supervising, Arboretum is a full **multi-project IDE** (route `/ide`, the
 - **Terminal dock.** Claude session terminals live in a bottom dock with one tab per session; open several at once (across projects), answer a waiting prompt right there. Terminals survive tab switches and browser disconnects.
 - **Git panel.** Stage or unstage individual files, discard changes, write a message and **commit** (everything or just what's staged), **amend** the last commit (refused once pushed), then **fetch**, **pull** (fast-forward or rebase) and **push**. Detailed staged / unstaged / conflict counts and the last commit stay current via a **real-time file-system watcher**, so the view updates the moment a Claude session touches a file.
 - **Deep links & mobile.** `/workspace/:repoId/:wt` still opens a specific worktree straight in the IDE (used by the VS Code extension). On mobile the IDE degrades to a single panel, and the worktree dashboard and session views remain the installable supervision PWA.
+- **Light or dark, your call.** A clean, consistent visual language (the "Emerald" design system: Inter + JetBrains Mono, an emerald accent) with a **light / dark / system** theme toggle remembered across sessions. The Monaco editor, the terminals and the diffs all follow the active theme.
 
 Like every git action in Arboretum, these run **as you** (the daemon runs under your account), consistent with the security model: a web terminal is remote code execution by design.
 
@@ -146,10 +163,10 @@ It is distributed as a **private VSIX**. Build and package it from the monorepo:
 
 ```bash
 npm run build:vscode
-cd packages/vscode && npx @vscode/vsce package --no-dependencies   # → git-arboretum-0.2.0.vsix
+cd packages/vscode && npx @vscode/vsce package --no-dependencies   # → git-arboretum-0.3.0.vsix
 ```
 
-Then install it via **Extensions: Install from VSIX…** (or `code --install-extension git-arboretum-0.2.0.vsix`), run **Arboretum: Sign In** and paste a token. Full details in [`packages/vscode/README.md`](packages/vscode/README.md).
+Then install it via **Extensions: Install from VSIX…** (or `code --install-extension git-arboretum-0.3.0.vsix`), run **Arboretum: Sign In** and paste a token. Full details in [`packages/vscode/README.md`](packages/vscode/README.md).
 
 ## Remote access from your phone
 

brand/README.md

@@ -7,7 +7,7 @@ branches, cyan session nodes, a `>_` prompt at the base) on a dark background.
 | --- | --- |
 | `arboretum-logo-source.png` | Master artwork (opaque dark background). Keep; everything else derives from it. |
 | `arboretum-logo.png` | Full logo, **transparent**. Best on dark surfaces (the wordmark is light). |
-| `arboretum-logo-on-dark.png` | Full logo on the app background `#09090b`. Safe on any theme, used in the README. |
+| `arboretum-logo-on-dark.png` | Full logo on a dark backdrop (`#09090b`, the app's dark theme; the UI now also ships a light theme on `#fafafa`). Safe on any theme, used in the README. |
 | `arboretum-mark.png` | Square, **transparent**, tree only (no wordmark). Ideal **Gitea repo avatar**, reads on both light and dark. |
 
 The transparent versions are extracted by luminance (alpha ∝ brightness), the clean

package-lock.json

@@ -7,6 +7,7 @@
     "": {
       "name": "arboretum-monorepo",
       "version": "0.0.0",
+      "license": "MIT",
       "workspaces": [
         "packages/shared",
         "packages/server",
@@ -979,11 +980,19 @@
         "ws": "^8.16.0"
       }
     },
-    "node_modules/@fontsource/jetbrains-mono": {
-      "version": "5.2.8",
-      "resolved": "https://registry.npmjs.org/@fontsource/jetbrains-mono/-/jetbrains-mono-5.2.8.tgz",
-      "integrity": "sha512-6w8/SG4kqvIMu7xd7wt6x3idn1Qux3p9N62s6G3rfldOUYHpWcc2FKrqf+Vo44jRvqWj2oAtTHrZXEP23oSKwQ==",
-      "dev": true,
+    "node_modules/@fontsource-variable/inter": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource-variable/inter/-/inter-5.3.0.tgz",
+      "integrity": "sha512-OupL48va4JNofb97w6NYeF9S7W/kHNKM0Er8Dem5nqi4jeOLrVJDoE8tZEpnMJmtkvNbB1EIPPwHcdkF6b1oUA==",
+      "license": "OFL-1.1",
+      "funding": {
+        "url": "https://github.com/sponsors/ayuhito"
+      }
+    },
+    "node_modules/@fontsource-variable/jetbrains-mono": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/@fontsource-variable/jetbrains-mono/-/jetbrains-mono-5.3.0.tgz",
+      "integrity": "sha512-F32xpS2NsGYoQi2ADSkKTgpJj7ozajsGgDJ8woTnqjmIB+dxDIqImjl4pXZVEExu8UFZ2ndhmX18EBS/hdz3Lw==",
       "license": "OFL-1.1",
       "funding": {
         "url": "https://github.com/sponsors/ayuhito"
@@ -7924,7 +7933,7 @@
     },
     "packages/server": {
       "name": "@johanleroy/git-arboretum",
-      "version": "3.0.0",
+      "version": "3.2.0",
       "license": "MIT",
       "dependencies": {
         "@fastify/cookie": "^11.0.0",
@@ -7958,13 +7967,14 @@
     },
     "packages/site": {
       "name": "@arboretum/site",
-      "version": "0.2.0",
+      "version": "0.3.0",
       "dependencies": {
         "vue": "^3.5.38",
         "vue-i18n": "^11.4.5"
       },
       "devDependencies": {
-        "@fontsource/jetbrains-mono": "^5.1.0",
+        "@fontsource-variable/inter": "^5.0.0",
+        "@fontsource-variable/jetbrains-mono": "^5.0.0",
         "@tailwindcss/vite": "^4.3.0",
         "@vitejs/plugin-vue": "^6.0.7",
         "tailwindcss": "^4.3.0",
@@ -8504,6 +8514,8 @@
       "version": "0.1.0",
       "dependencies": {
         "@arboretum/shared": "*",
+        "@fontsource-variable/inter": "^5.0.0",
+        "@fontsource-variable/jetbrains-mono": "^5.0.0",
         "@lucide/vue": "^1.21.0",
         "@xterm/addon-fit": "^0.11.0",
         "@xterm/addon-webgl": "^0.19.0",

packages/desktop/electron-builder.yml

@@ -28,6 +28,14 @@ linux:
   target: [AppImage, deb]
   category: Development
   artifactName: ${productName}-${version}-${arch}.${ext}
+  # Entrée .desktop (forme plate, mergée telle quelle par electron-builder 25). StartupWMClass DOIT
+  # correspondre à l'app_id runtime (posé par app.setName('Arboretum') dans src/main/main.ts) pour
+  # que GNOME/Wayland associe la fenêtre au lanceur et affiche le logo. Redondant avec le défaut
+  # (productName) mais explicite et robuste à un futur changement de productName.
+  desktop:
+    StartupWMClass: Arboretum
+  # Note : le .deb installe l'icône et rafraîchit le cache (postinst electron-builder). L'AppImage,
+  # lui, n'installe aucun .desktop sans intégration (appimaged) : sur Debian, préférer le .deb.
 
 deb:
   # git est requis pour les operations de worktree ; claude n'est pas dans les depots (documente).

packages/desktop/package-lock.json

@@ -1,12 +1,13 @@
 {
   "name": "@arboretum/desktop",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@arboretum/desktop",
-      "version": "0.1.0",
+      "version": "0.1.1",
+      "license": "MIT",
       "devDependencies": {
         "@types/node": "^22.10.0",
         "electron": "^33.0.0",

packages/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arboretum/desktop",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Arboretum desktop app: Electron shell that runs the daemon and shows its web UI",
   "homepage": "https://git-arboretum.com",
   "license": "MIT",

packages/desktop/src/main/main.ts

@@ -7,6 +7,13 @@ import { createTray } from './tray';
 import { initUpdater } from './updater';
 import { resolveIconPath } from './paths';
 
+// WM_CLASS / app_id déterministe, posé AVANT app.whenReady(). Sous Wayland (défaut Debian/GNOME)
+// l'option `icon:` de BrowserWindow est ignorée : l'icône de fenêtre/dock vient du fichier .desktop
+// apparié à la fenêtre via son app_id. electron-builder écrit déjà StartupWMClass=Arboretum dans le
+// .desktop ; encore faut-il que l'app_id runtime vaille aussi « Arboretum » (sinon Electron le
+// dérive du name package.json et rien ne correspond → icône générique). D'où ce setName explicite.
+app.setName('Arboretum');
+
 const PARTITION = 'persist:arboretum';
 const PORT = 7317;
 

packages/server/CHANGELOG.md

@@ -0,0 +1,25 @@
+# Changelog
+
+Notable changes to `@johanleroy/git-arboretum` (the Arboretum daemon). The VS Code
+extension keeps its own changelog in `packages/vscode/CHANGELOG.md`.
+
+## 3.2.0
+
+Visual overhaul: the web UI adopts the "Emerald" design system and gains a full theme system. No protocol or API change (fully additive, backward compatible).
+
+- **Light and dark themes.** A `light` / `dark` / `system` toggle (in the activity bar and in Settings), remembered across sessions and applied before the first paint (no flash of the wrong theme). The Monaco editor, the xterm terminals (now with a full 16-color ANSI palette) and the diffs all re-theme live.
+- **Emerald design language.** Self-hosted Inter + JetBrains Mono, an emerald accent, consistent rounded corners, mono status pills and dots, refined focus and text selection, thin scrollbars, and a terminal signature motif.
+- **Marketing site aligned.** git-arboretum.com now mirrors the app: the same tokens, fonts and theme toggle, with up-to-date IDE mockups.
+
+## 3.1.0
+
+- The IDE becomes the single shell of the web UI; the legacy worktree-first dashboard is retired as the default surface (still reachable at `/dashboard`).
+- Desktop app metadata fixes (window logo on Debian / Wayland).
+
+## 3.0.0
+
+- **Multi-project IDE** milestone: one workspace (route `/ide`, the default on desktop) holding every open project at once, a unified project / worktree / session tree, a tabbed Monaco editor with inline diffs, docked session terminals, and Git / Sessions / Groups panels. Ships as a **native Electron desktop app** (Linux, Windows, macOS) alongside the same web UI.
+
+## 2.0.0
+
+- "Real worktree IDE" foundations: a pure git engine, a real-time file-system watcher, the file API, selective staging / discard / amend / fetch / pull, automatic session archival, real-time settings sync, and encrypted remote git services (GitHub / GitLab / Gitea) with HTTPS clone.

packages/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@johanleroy/git-arboretum",
-  "version": "3.0.0",
+  "version": "3.2.0",
   "description": "Self-hosted web dashboard for git worktrees and the Claude Code sessions running on them",
   "license": "MIT",
   "type": "module",

packages/site/index.html

@@ -5,6 +5,25 @@
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="color-scheme" content="dark" />
     <meta name="theme-color" content="#09090b" />
+    <!-- Anti-FOUC : applique la préférence de thème (arb-theme) avant le premier paint.
+         Doit rester inline/synchrone. Synchronisé avec src/lib/theme.ts. -->
+    <script>
+      (function () {
+        try {
+          var mode = localStorage.getItem('arb-theme') || 'dark';
+          var dark = mode === 'dark' || (mode === 'system' && matchMedia('(prefers-color-scheme: dark)').matches);
+          var theme = dark ? 'dark' : 'light';
+          var bg = dark ? '#09090b' : '#fafafa';
+          var el = document.documentElement;
+          el.dataset.theme = theme;
+          el.style.backgroundColor = bg;
+          var cs = document.querySelector('meta[name=color-scheme]');
+          if (cs) cs.setAttribute('content', theme);
+          var tc = document.querySelector('meta[name=theme-color]');
+          if (tc) tc.setAttribute('content', bg);
+        } catch (e) {}
+      })();
+    </script>
 
     <title>Arboretum · Mission control for your AI coding agents</title>
     <meta

packages/site/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@arboretum/site",
   "private": true,
-  "version": "0.2.0",
+  "version": "0.3.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
@@ -13,7 +13,8 @@
     "vue-i18n": "^11.4.5"
   },
   "devDependencies": {
-    "@fontsource/jetbrains-mono": "^5.1.0",
+    "@fontsource-variable/inter": "^5.0.0",
+    "@fontsource-variable/jetbrains-mono": "^5.0.0",
     "@tailwindcss/vite": "^4.3.0",
     "@vitejs/plugin-vue": "^6.0.7",
     "tailwindcss": "^4.3.0",

packages/site/src/App.vue

@@ -27,13 +27,14 @@ watch(
   { immediate: true },
 );
 
-// Grain de fond + halo emerald (décoratifs) : portés tels quels du design.
+// Grain de fond + halo accent (décoratifs), tokenisés pour suivre le thème clair/sombre.
 const grainStyle = {
   position: 'fixed',
   inset: '0',
   zIndex: 0,
+  opacity: '0.025',
   pointerEvents: 'none',
-  backgroundImage: 'radial-gradient(rgba(255,255,255,.025) 1px,transparent 1.4px)',
+  backgroundImage: 'radial-gradient(var(--color-fg) 1px,transparent 1.4px)',
   backgroundSize: '34px 34px',
   WebkitMaskImage: 'radial-gradient(ellipse 120% 70% at 50% -4%,#000,transparent 70%)',
   maskImage: 'radial-gradient(ellipse 120% 70% at 50% -4%,#000,transparent 70%)',
@@ -47,8 +48,9 @@ const glowStyle = {
   width: '1100px',
   height: '680px',
   zIndex: 0,
+  opacity: '0.12',
   pointerEvents: 'none',
-  background: 'radial-gradient(50% 50% at 50% 50%,rgba(16,185,129,.12),transparent 64%)',
+  background: 'radial-gradient(50% 50% at 50% 50%,var(--color-accent),transparent 64%)',
   filter: 'blur(18px)',
 } as const;
 </script>

packages/site/src/components/AppFooter.vue

@@ -9,7 +9,7 @@ const { t } = useI18n();
 </script>
 
 <template>
-  <footer class="relative z-[1] border-t border-[#1c1c1f]">
+  <footer class="relative z-[1] border-t border-border-soft">
     <div class="mx-auto flex max-w-[1200px] flex-wrap items-center justify-between gap-5 px-6 py-[34px]">
       <div class="flex items-center gap-[11px]">
         <img
@@ -20,28 +20,28 @@ const { t } = useI18n();
           class="h-[22px] w-[22px] object-contain"
           style="filter: grayscale(1) brightness(1.5); opacity: 0.4"
         />
-        <span class="font-mono text-sm text-zinc-300">git-arboretum.com</span>
-        <span class="ml-1 text-[13px] text-zinc-600">· {{ t('footTag') }}</span>
+        <span class="font-mono text-sm text-fg-muted">git-arboretum.com</span>
+        <span class="ml-1 text-[13px] text-fg-subtle">· {{ t('footTag') }}</span>
       </div>
       <div class="flex items-center gap-[22px] text-sm">
-        <a :href="REPO" target="_blank" rel="noopener" class="inline-flex items-center gap-1.5 text-zinc-400 no-underline transition-colors hover:text-emerald-400">
+        <a :href="REPO" target="_blank" rel="noopener" class="inline-flex items-center gap-1.5 text-fg-muted no-underline transition-colors hover:text-accent">
           <IconGitea :size="15" />
           Gitea
         </a>
-        <a :href="LICENSE" target="_blank" rel="noopener" class="text-zinc-400 no-underline transition-colors hover:text-emerald-400">
+        <a :href="LICENSE" target="_blank" rel="noopener" class="text-fg-muted no-underline transition-colors hover:text-accent">
           {{ t('license') }}
         </a>
         <a
           :href="COFFEE"
           target="_blank"
           rel="noopener"
-          class="inline-flex items-center gap-1.5 text-zinc-400 no-underline transition-colors hover:text-amber-400 focus-visible:rounded-md focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-amber-400/70"
+          class="inline-flex items-center gap-1.5 text-fg-muted no-underline transition-colors hover:text-warn focus-visible:rounded-md focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-warn/70"
         >
           <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M10 2v2" /><path d="M14 2v2" /><path d="M5 8h13a1 1 0 0 1 1 1v2a4 4 0 0 1-4 4H8a4 4 0 0 1-4-4V9a1 1 0 0 1 1-1Z" /><path d="M6 15a4 4 0 0 0 4 4h2a4 4 0 0 0 4-4" /><path d="M19 9h1.5a2.5 2.5 0 0 1 0 5H18" /></svg>
           {{ t('coffee') }}
         </a>
         <div class="flex items-center gap-2">
-          <code class="font-mono text-[12.5px] text-zinc-600">{{ INSTALL_COMMAND }}</code>
+          <code class="font-mono text-[12.5px] text-fg-subtle">{{ INSTALL_COMMAND }}</code>
           <CopyButton variant="icon" :text="INSTALL_COMMAND" :label="t('copyCommand')" />
         </div>
       </div>

packages/site/src/components/AppHeader.vue

@@ -2,6 +2,7 @@
 import { useI18n } from 'vue-i18n';
 import { REPO } from '../lib/links';
 import LangToggle from './LangToggle.vue';
+import ThemeToggle from './ThemeToggle.vue';
 import IconGitea from './icons/IconGitea.vue';
 
 const { t } = useI18n();
@@ -18,10 +19,10 @@ const navLinks = [
 
 <template>
   <header
-    class="sticky top-0 z-50 border-b border-[#1c1c1f] bg-[rgba(9,9,11,0.72)] backdrop-blur-[14px]"
+    class="sticky top-0 z-50 border-b border-border-soft bg-surface-0/72 backdrop-blur-[14px]"
   >
     <div class="mx-auto flex h-16 max-w-[1200px] items-center justify-between gap-6 px-6">
-      <a href="#top" class="flex items-center gap-2.5 text-zinc-100 no-underline">
+      <a href="#top" class="flex items-center gap-2.5 text-fg no-underline">
         <img
           src="/assets/arboretum-mark.png"
           alt="Arboretum"
@@ -37,20 +38,21 @@ const navLinks = [
           v-for="link in navLinks"
           :key="link.href"
           :href="link.href"
-          class="text-[14.5px] text-zinc-400 no-underline transition-colors hover:text-zinc-100"
+          class="text-[14.5px] text-fg-muted no-underline transition-colors hover:text-fg"
         >
           {{ t(link.key) }}
         </a>
       </nav>
 
       <div class="flex items-center gap-3.5">
+        <ThemeToggle />
         <LangToggle />
         <a
           :href="REPO"
           target="_blank"
           rel="noopener"
           aria-label="Gitea"
-          class="inline-flex items-center gap-[7px] rounded-lg border border-zinc-800 px-[13px] py-[7px] text-[13.5px] font-medium text-zinc-300 no-underline transition-colors hover:border-emerald-500/50 hover:text-emerald-400 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-emerald-500/70"
+          class="inline-flex items-center gap-[7px] rounded-lg border border-border px-[13px] py-[7px] text-[13.5px] font-medium text-fg-muted no-underline transition-colors hover:border-accent hover:text-accent"
         >
           <IconGitea :size="16" />
           Gitea

packages/site/src/components/CopyButton.vue

@@ -28,9 +28,9 @@ const { copied, copy } = useCopy();
     type="button"
     :aria-label="label || t('copy')"
     :class="[
-      'inline-flex flex-none items-center gap-[7px] border-l border-zinc-800 bg-zinc-900 font-mono text-[13px] font-semibold transition-colors hover:bg-zinc-800 hover:text-emerald-400 focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-emerald-500/70',
+      'inline-flex flex-none items-center gap-[7px] border-l border-border bg-surface-1 font-mono text-[13px] font-semibold transition-colors hover:bg-surface-2 hover:text-accent focus-visible:outline-2 focus-visible:-outline-offset-2 focus-visible:outline-accent/70',
       barClass,
-      copied ? 'text-emerald-400' : 'text-zinc-300',
+      copied ? 'text-accent' : 'text-fg-muted',
     ]"
     @click="copy(text)"
   >
@@ -44,10 +44,10 @@ const { copied, copy } = useCopy();
     :aria-label="label || t('copy')"
     :title="copied ? t('copied') : label || t('copy')"
     :class="[
-      'inline-flex flex-none items-center justify-center rounded-md border p-1.5 transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-emerald-500/70',
+      'inline-flex flex-none items-center justify-center rounded-md border p-1.5 transition-colors focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-accent/70',
       copied
-        ? 'border-emerald-500/40 bg-zinc-800 text-emerald-400'
-        : 'border-zinc-800 bg-zinc-900/80 text-zinc-400 hover:border-emerald-500/40 hover:bg-zinc-800 hover:text-emerald-400',
+        ? 'border-accent/40 bg-surface-2 text-accent'
+        : 'border-border bg-surface-1/80 text-fg-muted hover:border-accent/40 hover:bg-surface-2 hover:text-accent',
     ]"
     @click="copy(text)"
   >

packages/site/src/components/DownloadSection.vue

@@ -16,30 +16,30 @@ const bullets = ['dlNoNode', 'dlBundled', 'dlAutoUpdate'] as const;
 <template>
   <section id="download" class="mx-auto max-w-[1200px] scroll-mt-[84px] px-6 pb-[100px]">
     <div v-reveal class="mb-[40px] max-w-[720px]">
-      <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-emerald-400">{{ t('dlKicker') }}</div>
-      <h2 class="m-0 mb-4 text-[clamp(26px,3vw,38px)] font-semibold leading-[1.15] tracking-[-0.025em] text-zinc-50">
+      <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-accent">{{ t('dlKicker') }}</div>
+      <h2 class="m-0 mb-4 text-[clamp(26px,3vw,38px)] font-semibold leading-[1.15] tracking-[-0.025em] text-fg">
         {{ t('dlTitle') }}
       </h2>
-      <p class="m-0 text-[16.5px] leading-[1.6] text-zinc-400">{{ t('dlBody') }}</p>
+      <p class="m-0 text-[16.5px] leading-[1.6] text-fg-muted">{{ t('dlBody') }}</p>
     </div>
 
     <div v-reveal class="grid gap-4 md:grid-cols-3">
       <div
         v-for="p in platforms"
         :key="p.key"
-        class="flex flex-col gap-1 rounded-[14px] border border-zinc-800 bg-[#09090b] p-5 shadow-card"
+        class="flex flex-col gap-1 rounded-[14px] border border-border bg-surface-0 p-5 shadow-card"
       >
-        <div class="flex items-center gap-2 text-zinc-100">
-          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-emerald-400" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" /><polyline points="7 10 12 15 17 10" /><line x1="12" x2="12" y1="15" y2="3" /></svg>
+        <div class="flex items-center gap-2 text-fg">
+          <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-accent" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" /><polyline points="7 10 12 15 17 10" /><line x1="12" x2="12" y1="15" y2="3" /></svg>
           <span class="text-[15px] font-semibold">{{ t(p.key) }}</span>
         </div>
-        <span class="pl-[26px] font-mono text-[12.5px] text-zinc-500">{{ t(p.hint) }}</span>
+        <span class="pl-[26px] font-mono text-[12.5px] text-fg-subtle">{{ t(p.hint) }}</span>
       </div>
     </div>
 
     <ul v-reveal class="mt-6 flex flex-wrap gap-x-6 gap-y-2">
-      <li v-for="b in bullets" :key="b" class="flex items-center gap-2 text-[14px] text-zinc-300">
-        <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" class="text-emerald-400" aria-hidden="true"><path d="M20 6 9 17l-5-5" /></svg>
+      <li v-for="b in bullets" :key="b" class="flex items-center gap-2 text-[14px] text-fg-muted">
+        <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" class="text-accent" aria-hidden="true"><path d="M20 6 9 17l-5-5" /></svg>
         {{ t(b) }}
       </li>
     </ul>
@@ -49,7 +49,7 @@ const bullets = ['dlNoNode', 'dlBundled', 'dlAutoUpdate'] as const;
         :href="RELEASES"
         target="_blank"
         rel="noopener"
-        class="inline-flex items-center gap-2 rounded-lg bg-emerald-500 px-4 py-2.5 text-[14.5px] font-semibold text-emerald-950 no-underline transition-colors hover:bg-emerald-400 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-emerald-500/70"
+        class="inline-flex items-center gap-2 rounded-lg bg-accent-solid px-4 py-2.5 text-[14.5px] font-semibold text-white no-underline transition-colors hover:bg-accent-hover focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-accent/70"
       >
         {{ t('dlGet') }}
       </a>
@@ -57,12 +57,12 @@ const bullets = ['dlNoNode', 'dlBundled', 'dlAutoUpdate'] as const;
         :href="DESKTOP_SRC"
         target="_blank"
         rel="noopener"
-        class="inline-flex items-center gap-2 rounded-lg border border-zinc-800 px-4 py-2.5 text-[14.5px] font-medium text-zinc-300 no-underline transition-colors hover:border-emerald-500/50 hover:text-emerald-400 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-emerald-500/70"
+        class="inline-flex items-center gap-2 rounded-lg border border-border px-4 py-2.5 text-[14.5px] font-medium text-fg-muted no-underline transition-colors hover:border-accent/50 hover:text-accent focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-accent/70"
       >
         {{ t('dlSource') }}
       </a>
     </div>
 
-    <p v-reveal class="mt-4 max-w-[720px] text-[13.5px] leading-[1.55] text-zinc-500">{{ t('dlNote') }}</p>
+    <p v-reveal class="mt-4 max-w-[720px] text-[13.5px] leading-[1.55] text-fg-subtle">{{ t('dlNote') }}</p>
   </section>
 </template>

packages/site/src/components/FaqSection.vue

@@ -25,26 +25,26 @@ function panelStyle(i: number) {
 <template>
   <section id="faq" class="mx-auto max-w-[780px] scroll-mt-[84px] px-6 pb-[100px]">
     <div v-reveal class="mb-[38px] text-center">
-      <div class="mb-3.5 font-mono text-xs uppercase tracking-[0.14em] text-emerald-400">{{ t('navFaq') }}</div>
-      <h2 class="m-0 text-[clamp(28px,3.4vw,40px)] font-semibold tracking-[-0.025em] text-zinc-50">{{ t('faqTitle') }}</h2>
+      <div class="mb-3.5 font-mono text-xs uppercase tracking-[0.14em] text-accent">{{ t('navFaq') }}</div>
+      <h2 class="m-0 text-[clamp(28px,3.4vw,40px)] font-semibold tracking-[-0.025em] text-fg">{{ t('faqTitle') }}</h2>
     </div>
 
     <div v-reveal>
-      <div v-for="(f, i) in items" :key="i" class="border-t" :class="open === i ? 'border-emerald-400/40' : 'border-zinc-800'">
+      <div v-for="(f, i) in items" :key="i" class="border-t" :class="open === i ? 'border-accent/40' : 'border-border'">
         <button
           type="button"
           :aria-expanded="open === i"
           :aria-controls="`faq-panel-${i}`"
-          class="flex w-full cursor-pointer items-center justify-between gap-4 border-none bg-transparent px-1 py-5 text-left text-[clamp(16px,2vw,18px)] font-medium text-zinc-50 focus-visible:rounded-md focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-emerald-500/70"
+          class="flex w-full cursor-pointer items-center justify-between gap-4 border-none bg-transparent px-1 py-5 text-left text-[clamp(16px,2vw,18px)] font-medium text-fg focus-visible:rounded-md focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-accent"
           @click="toggle(i)"
         >
           <span>{{ f.q }}</span>
-          <span class="flex flex-none text-emerald-400 transition-transform duration-300" :class="open === i ? 'rotate-180' : ''">
-            <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#34d399" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 9 6 6 6-6" /></svg>
+          <span class="flex flex-none text-accent transition-transform duration-300" :class="open === i ? 'rotate-180' : ''">
+            <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 9 6 6 6-6" /></svg>
           </span>
         </button>
         <div :id="`faq-panel-${i}`" :style="panelStyle(i)" :inert="open !== i" :aria-hidden="open !== i">
-          <p class="m-0 max-w-[640px] px-1 pb-5 text-[15.5px] leading-[1.6] text-zinc-400">{{ f.a }}</p>
+          <p class="m-0 max-w-[640px] px-1 pb-5 text-[15.5px] leading-[1.6] text-fg-muted">{{ f.a }}</p>
         </div>
       </div>
     </div>

packages/site/src/components/FeatureCard.vue

@@ -4,14 +4,14 @@ defineProps<{ title: string }>();
 
 <template>
   <div
-    class="rounded-xl border border-zinc-800 bg-zinc-900/50 p-6 transition-[transform,border-color] duration-[180ms] ease-in-out hover:-translate-y-[3px] hover:border-emerald-400/40"
+    class="rounded-xl border border-border bg-surface-1/50 p-6 transition-[transform,border-color] duration-[180ms] ease-in-out hover:-translate-y-[3px] hover:border-accent/40"
   >
     <div
-      class="mb-4 inline-flex h-[42px] w-[42px] items-center justify-center rounded-[10px] bg-emerald-500/10 text-emerald-400"
+      class="mb-4 inline-flex h-[42px] w-[42px] items-center justify-center rounded-[10px] bg-accent/10 text-accent"
     >
       <slot name="icon" />
     </div>
-    <h3 class="m-0 mb-[7px] text-lg font-semibold text-zinc-50">{{ title }}</h3>
-    <p class="m-0 text-[14.5px] leading-[1.55] text-zinc-400"><slot /></p>
+    <h3 class="m-0 mb-[7px] text-lg font-semibold text-fg">{{ title }}</h3>
+    <p class="m-0 text-[14.5px] leading-[1.55] text-fg-muted"><slot /></p>
   </div>
 </template>

packages/site/src/components/FeaturesSection.vue

@@ -7,8 +7,8 @@ const { t } = useI18n();
 <template>
   <section id="features" class="mx-auto max-w-[1200px] scroll-mt-[84px] px-6 pb-[100px]">
     <div v-reveal class="mb-[46px] text-center">
-      <div class="mb-3.5 font-mono text-xs uppercase tracking-[0.14em] text-emerald-400">{{ t('featKicker') }}</div>
-      <h2 class="m-0 text-[clamp(28px,3.4vw,40px)] font-semibold tracking-[-0.025em] text-zinc-50">
+      <div class="mb-3.5 font-mono text-xs uppercase tracking-[0.14em] text-accent">{{ t('featKicker') }}</div>
+      <h2 class="m-0 text-[clamp(28px,3.4vw,40px)] font-semibold tracking-[-0.025em] text-fg">
         {{ t('featTitle') }}
       </h2>
     </div>
@@ -32,9 +32,9 @@ const { t } = useI18n();
         <template #icon>
           <svg width="21" height="21" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M22 12h-4l-3 9L9 3l-3 9H2" /></svg>
         </template>
-        <span class="text-sky-300">{{ t('busy') }}</span> ·
-        <span class="text-amber-300">{{ t('waiting') }}</span> ·
-        <span class="text-emerald-400">{{ t('idle') }}</span> · {{ t('feat3Desc') }}
+        <span class="text-info">{{ t('busy') }}</span> ·
+        <span class="text-warn">{{ t('waiting') }}</span> ·
+        <span class="text-accent">{{ t('idle') }}</span> · {{ t('feat3Desc') }}
       </FeatureCard>
 
       <FeatureCard :title="t('feat4Title')">

packages/site/src/components/FinalCta.vue

@@ -12,8 +12,8 @@ const { t } = useI18n();
   <section class="mx-auto max-w-[1200px] px-6 pb-[100px]">
     <div
       v-reveal
-      class="rounded-[20px] border border-zinc-800 px-6 py-[clamp(36px,5vw,64px)] text-center"
-      style="background: radial-gradient(120% 140% at 50% 0%, rgba(16, 185, 129, 0.1), transparent 60%), #0c0c0e"
+      class="rounded-[20px] border border-border px-6 py-[clamp(36px,5vw,64px)] text-center"
+      style="background: radial-gradient(120% 140% at 50% 0%, color-mix(in srgb, var(--color-accent) 10%, transparent), transparent 60%), var(--color-surface-0)"
     >
       <img
         src="/assets/arboretum-mark.png"
@@ -22,16 +22,16 @@ const { t } = useI18n();
         height="52"
         class="mx-auto mb-5 block h-[52px] w-[52px] object-contain"
       />
-      <h2 class="m-0 mb-3.5 text-[clamp(30px,4vw,46px)] font-bold leading-[1.08] tracking-[-0.03em] text-zinc-50">
+      <h2 class="m-0 mb-3.5 text-[clamp(30px,4vw,46px)] font-bold leading-[1.08] tracking-[-0.03em] text-fg">
         {{ t('ctaTitle') }}
       </h2>
-      <p class="mx-auto mb-7 max-w-[480px] text-[17px] text-zinc-400">{{ t('ctaBody') }}</p>
+      <p class="mx-auto mb-7 max-w-[480px] text-[17px] text-fg-muted">{{ t('ctaBody') }}</p>
 
       <div
-        class="mx-auto flex max-w-[460px] items-stretch overflow-hidden rounded-[10px] border border-zinc-800 bg-zinc-950"
+        class="mx-auto flex max-w-[460px] items-stretch overflow-hidden rounded-[10px] border border-border bg-surface-0"
       >
         <div class="flex min-w-0 flex-1 items-center gap-2.5 overflow-x-auto whitespace-nowrap px-4 font-mono text-sm">
-          <span class="text-emerald-400">$</span><span class="text-zinc-200">{{ INSTALL_COMMAND }}</span>
+          <span class="text-accent">$</span><span class="text-fg">{{ INSTALL_COMMAND }}</span>
         </div>
         <CopyButton variant="bar" :text="INSTALL_COMMAND" :label="t('copyCommand')" bar-class="px-4" />
       </div>
@@ -41,7 +41,7 @@ const { t } = useI18n();
           :href="REPO"
           target="_blank"
           rel="noopener"
-          class="inline-flex items-center gap-2 text-[14.5px] text-zinc-400 no-underline transition-colors hover:text-emerald-400"
+          class="inline-flex items-center gap-2 text-[14.5px] text-fg-muted no-underline transition-colors hover:text-accent"
         >
           <IconGitea :size="16" />
           {{ t('ctaSource') }}

packages/site/src/components/HeroMockup.vue

@@ -4,35 +4,47 @@ import { useI18n } from 'vue-i18n';
 import { useHeroTimeline, type SessionState } from '../composables/useHeroTimeline';
 import { DLG_OPTS } from '../i18n/content';
 import type { AppLocale } from '../i18n';
-import IconGitea from './icons/IconGitea.vue';
 
 const { t, locale } = useI18n();
 const { anim } = useHeroTimeline('hero-stage');
 
-// Couleurs des lignes de terminal par type (porté de renderVals.C).
+// Couleurs des lignes de terminal par type, tokenisées (suivent le thème clair/sombre).
 const LINE_COLORS: Record<string, string> = {
-  cmd: '#52525b',
-  tool: '#a1a1aa',
-  edit: '#34d399',
-  add: '#34d399',
-  del: '#f87171',
-  ok: '#34d399',
-  warn: '#fcd34d',
-  run: '#7dd3fc',
+  cmd: 'var(--color-fg-subtle)',
+  tool: 'var(--color-fg-muted)',
+  edit: 'var(--color-accent)',
+  add: 'var(--color-accent)',
+  del: 'var(--color-danger)',
+  ok: 'var(--color-accent)',
+  warn: 'var(--color-warn)',
+  run: 'var(--color-info)',
 };
 
-// Couleurs alignées sur SessionStateBadge de l'app (zinc/emerald/amber/sky de Tailwind).
-const PILL: Record<SessionState, { bg: string; fg: string; dot: string; pulse: string }> = {
-  idle: { bg: '#022c22', fg: '#34d399', dot: '#34d399', pulse: '' },
-  busy: { bg: '#082f49', fg: '#7dd3fc', dot: '#7dd3fc', pulse: 'pulseSky 2s ease-in-out infinite' },
-  waiting: { bg: '#451a03', fg: '#fcd34d', dot: '#fcd34d', pulse: 'pulseAmber 2.2s ease-in-out infinite' },
+// Pastille d'état, alignée sur SessionStateBadge + lib/status-tokens de l'app
+// (waiting -> warn, busy -> info, idle -> accent), via color-mix pour le fond teinté.
+const PILL: Record<SessionState, { bg: string; fg: string; pulse: string }> = {
+  idle: {
+    bg: 'color-mix(in oklab, var(--color-accent) 15%, transparent)',
+    fg: 'var(--color-accent)',
+    pulse: '',
+  },
+  busy: {
+    bg: 'color-mix(in oklab, var(--color-info) 15%, transparent)',
+    fg: 'var(--color-info)',
+    pulse: 'pulseSky 2s ease-in-out infinite',
+  },
+  waiting: {
+    bg: 'color-mix(in oklab, var(--color-warn) 15%, transparent)',
+    fg: 'var(--color-warn)',
+    pulse: 'pulseAmber 2.2s ease-in-out infinite',
+  },
 };
 
 const pill = computed(() => PILL[anim.value.sess]);
 const sessText = computed(() => t(anim.value.sess));
 
 const termLines = computed(() =>
-  anim.value.lines.map((l) => ({ text: l.text, color: LINE_COLORS[l.k] ?? '#d4d4d8' })),
+  anim.value.lines.map((l) => ({ text: l.text, color: LINE_COLORS[l.k] ?? 'var(--color-fg-muted)' })),
 );
 
 // Options du dialogue de permission : reproduit DialogPrompt (boutons numérotés + Deny).
@@ -48,137 +60,108 @@ const dlgOptions = computed(() =>
 
 <template>
   <div id="hero-stage" class="relative min-w-[300px] flex-[1_1_480px]">
-    <div
-      class="relative overflow-hidden rounded-[14px] border border-zinc-800 bg-zinc-950 shadow-hero"
-    >
+    <div class="relative overflow-hidden rounded-[14px] border border-border bg-surface-0 shadow-hero">
       <!-- barre de fenêtre -->
-      <div class="flex items-center gap-2 border-b border-[#1c1c1f] bg-[#0c0c0e] px-[14px] py-[11px]">
-        <span class="h-2.5 w-2.5 rounded-full bg-zinc-700"></span>
-        <span class="h-2.5 w-2.5 rounded-full bg-zinc-700"></span>
-        <span class="h-2.5 w-2.5 rounded-full bg-zinc-700"></span>
-        <span class="ml-2 font-mono text-[11.5px] text-zinc-600">arboretum · localhost:7317</span>
+      <div class="flex items-center gap-2 border-b border-border-soft bg-surface-1 px-[14px] py-[11px]">
+        <span class="h-2.5 w-2.5 rounded-full bg-danger"></span>
+        <span class="h-2.5 w-2.5 rounded-full bg-warn"></span>
+        <span class="h-2.5 w-2.5 rounded-full bg-accent"></span>
+        <span class="ml-2 font-mono text-[11.5px] text-fg-subtle">arboretum · localhost:7317</span>
       </div>
 
       <div class="flex min-h-[440px]">
-        <!-- sidebar (fidèle à AppSidebar : Worktrees / Sessions / Groups, puis Réglages / Aide / Gitea / Café) -->
-        <div
-          class="flex w-[190px] flex-none flex-col border-r border-[#1c1c1f] bg-zinc-900/40 px-2 py-3"
-        >
-          <div class="flex items-center gap-2 px-2 pb-3">
-            <img
-              src="/assets/arboretum-mark.png"
-              alt=""
-              width="22"
-              height="22"
-              class="h-[22px] w-[22px] object-contain"
-            />
-            <span class="text-[14px] font-semibold text-zinc-100">Arboretum</span>
+        <!-- rail ActivityBar (fidèle à ActivityBar.vue : icônes explorer / git / sessions / groups) -->
+        <div class="flex w-12 flex-none flex-col items-center gap-1 border-r border-border bg-surface-1 py-2">
+          <!-- explorer (actif) -->
+          <div class="relative flex h-9 w-9 items-center justify-center rounded-[9px] bg-surface-2 text-accent">
+            <span class="absolute top-1/2 left-0 h-5 w-0.5 -translate-y-1/2 rounded-full bg-accent"></span>
+            <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="18" x="3" y="3" rx="2" /><path d="M3 9h18" /><path d="M9 21V9" /></svg>
           </div>
-
-          <div
-            class="mb-2 flex items-center gap-2 rounded-lg border border-zinc-800 bg-zinc-950/40 px-2.5 py-1.5"
-          >
-            <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="#52525b" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="11" cy="11" r="8" /><path d="m21 21-4.3-4.3" /></svg>
-            <span class="flex-1 text-[12px] text-zinc-500">{{ t('mSearch') }}</span>
-            <span class="rounded border border-zinc-700 px-[5px] py-px font-mono text-[10px] text-zinc-500">⌘K</span>
+          <!-- git -->
+          <div class="flex h-9 w-9 items-center justify-center rounded-[9px] text-fg-subtle">
+            <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="6" x2="6" y1="3" y2="15" /><circle cx="18" cy="6" r="3" /><circle cx="6" cy="18" r="3" /><path d="M18 9a9 9 0 0 1-9 9" /></svg>
           </div>
-
-          <!-- nav primaire (fidèle à AppSidebar : IDE actif, puis Worktrees / Sessions / Groups) -->
-          <div class="flex flex-col gap-1">
-            <div class="flex items-center gap-2.5 rounded-lg bg-zinc-800 px-2.5 py-1.5 text-zinc-100">
-              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="18" x="3" y="3" rx="2" /><path d="M3 9h18" /><path d="M9 21V9" /></svg>
-              <span class="flex-1 text-[12.5px] font-medium">{{ t('mIde') }}</span>
-            </div>
-            <div class="flex items-center gap-2.5 rounded-lg px-2.5 py-1.5 text-zinc-400">
-              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="6" x2="6" y1="3" y2="15" /><circle cx="18" cy="6" r="3" /><circle cx="6" cy="18" r="3" /><path d="M18 9a9 9 0 0 1-9 9" /></svg>
-              <span class="flex-1 text-[12.5px] font-medium">{{ t('mWorktrees') }}</span>
-            </div>
-            <div class="flex items-center gap-2.5 rounded-lg px-2.5 py-1.5 text-zinc-400">
-              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m7 11 2-2-2-2" /><path d="M11 13h4" /><rect width="18" height="18" x="3" y="3" rx="2" ry="2" /></svg>
-              <span class="flex-1 text-[12.5px] font-medium">{{ t('mSessions') }}</span>
-              <span
-                v-show="anim.att > 0"
-                class="rounded-full bg-amber-500/20 px-1.5 text-[11px] font-semibold text-amber-300"
-                >{{ anim.att }}</span
-              >
-            </div>
-            <div class="flex items-center gap-2.5 rounded-lg px-2.5 py-1.5 text-zinc-400">
-              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.97 12.92A2 2 0 0 0 2 14.63v3.24a2 2 0 0 0 .97 1.71l3 1.8a2 2 0 0 0 2.06 0L12 19v-5.5l-5-3-4.03 2.42Z" /><path d="M7 16.5 12 13.5" /><path d="M12 13.5V19l3.97 2.38a2 2 0 0 0 2.06 0l3-1.8a2 2 0 0 0 .97-1.71v-3.24a2 2 0 0 0-.97-1.71L17 10.5l-5 3Z" /><path d="m17 16.5 4.74-2.85" /><path d="M7.97 4.42A2 2 0 0 0 7 6.13v4.37l5 3 5-3V6.13a2 2 0 0 0-.97-1.71l-3-1.8a2 2 0 0 0-2.06 0z" /></svg>
-              <span class="flex-1 text-[12.5px] font-medium">{{ t('mGroups') }}</span>
-            </div>
+          <!-- sessions (+ badge attention) -->
+          <div class="relative flex h-9 w-9 items-center justify-center rounded-[9px] text-fg-subtle">
+            <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m7 11 2-2-2-2" /><path d="M11 13h4" /><rect width="18" height="18" x="3" y="3" rx="2" ry="2" /></svg>
+            <span v-show="anim.att > 0" class="absolute top-1 right-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-warn px-1 text-[9px] font-semibold text-zinc-950">{{ anim.att }}</span>
+          </div>
+          <!-- groups -->
+          <div class="flex h-9 w-9 items-center justify-center rounded-[9px] text-fg-subtle">
+            <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.97 12.92A2 2 0 0 0 2 14.63v3.24a2 2 0 0 0 .97 1.71l3 1.8a2 2 0 0 0 2.06 0L12 19v-5.5l-5-3-4.03 2.42Z" /><path d="M7 16.5 12 13.5" /><path d="M12 13.5V19l3.97 2.38a2 2 0 0 0 2.06 0l3-1.8a2 2 0 0 0 .97-1.71v-3.24a2 2 0 0 0-.97-1.71L17 10.5l-5 3Z" /><path d="m17 16.5 4.74-2.85" /><path d="M7.97 4.42A2 2 0 0 0 7 6.13v4.37l5 3 5-3V6.13a2 2 0 0 0-.97-1.71l-3-1.8a2 2 0 0 0-2.06 0z" /></svg>
           </div>
 
           <div class="flex-1"></div>
 
-          <!-- nav secondaire -->
-          <div class="flex flex-col gap-1">
-            <div class="flex items-center gap-2.5 rounded-lg px-2.5 py-1.5 text-zinc-400">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0l-.15-.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.1a2 2 0 0 1 1 1.72v.51a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.39a2 2 0 0 0-.73-2.73l-.15-.08a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z" /><circle cx="12" cy="12" r="3" /></svg>
-              <span class="flex-1 text-[12.5px] font-medium">{{ t('mSettings') }}</span>
-            </div>
-            <div class="flex items-center gap-2.5 rounded-lg px-2.5 py-1.5 text-zinc-400">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="10" /><path d="m4.93 4.93 4.24 4.24" /><path d="m14.83 9.17 4.24-4.24" /><path d="m14.83 14.83 4.24 4.24" /><path d="m9.17 14.83-4.24 4.24" /><circle cx="12" cy="12" r="4" /></svg>
-              <span class="flex-1 text-[12.5px] font-medium">{{ t('mHelp') }}</span>
-            </div>
-            <div class="flex items-center gap-2.5 rounded-lg px-2.5 py-1.5 text-zinc-400">
-              <IconGitea :size="16" />
-              <span class="flex-1 text-[12.5px] font-medium">{{ t('mGitea') }}</span>
-            </div>
-            <div class="flex items-center gap-2.5 rounded-lg px-2.5 py-1.5 text-zinc-400">
-              <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M10 2v2" /><path d="M14 2v2" /><path d="M16 8a1 1 0 0 1 1 1v8a4 4 0 0 1-4 4H7a4 4 0 0 1-4-4V9a1 1 0 0 1 1-1h14a4 4 0 1 1 0 8h-1" /><path d="M6 2v2" /></svg>
-              <span class="flex-1 text-[12.5px] font-medium">{{ t('coffee') }}</span>
-            </div>
+          <!-- bas : thème / réglages / aide -->
+          <div class="flex h-9 w-9 items-center justify-center rounded-[9px] text-fg-subtle">
+            <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79Z" /></svg>
           </div>
+          <div class="flex h-9 w-9 items-center justify-center rounded-[9px] text-fg-subtle">
+            <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="12" cy="12" r="3" /><path d="M12.22 2h-.44a2 2 0 0 0-2 2v.18a2 2 0 0 1-1 1.73l-.43.25a2 2 0 0 1-2 0l-.15-.08a2 2 0 0 0-2.73.73l-.22.38a2 2 0 0 0 .73 2.73l.15.1a2 2 0 0 1 1 1.72v.51a2 2 0 0 1-1 1.74l-.15.09a2 2 0 0 0-.73 2.73l.22.38a2 2 0 0 0 2.73.73l.15-.08a2 2 0 0 1 2 0l.43.25a2 2 0 0 1 1 1.73V20a2 2 0 0 0 2 2h.44a2 2 0 0 0 2-2v-.18a2 2 0 0 1 1-1.73l.43-.25a2 2 0 0 1 2 0l.15.08a2 2 0 0 0 2.73-.73l.22-.39a2 2 0 0 0-.73-2.73l-.15-.08a2 2 0 0 1-1-1.74v-.5a2 2 0 0 1 1-1.74l.15-.09a2 2 0 0 0 .73-2.73l-.22-.38a2 2 0 0 0-2.73-.73l-.15.08a2 2 0 0 1-2 0l-.43-.25a2 2 0 0 1-1-1.73V4a2 2 0 0 0-2-2z" /></svg>
+          </div>
+        </div>
 
-          <!-- pied : langue · notifications · déconnexion + version (fidèle à AppShellFooter) -->
-          <div class="mt-2 flex items-center gap-2 border-t border-[#1c1c1f] px-1 pt-2.5">
-            <span class="rounded border border-zinc-700 px-1.5 py-px font-mono text-[10px] text-zinc-400">{{ locale.toUpperCase() }}</span>
-            <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="#34d399" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M10.268 21a2 2 0 0 0 3.464 0" /><path d="M3.262 15.326A1 1 0 0 0 4 17h16a1 1 0 0 0 .74-1.673C19.41 13.956 18 12.499 18 8A6 6 0 0 0 6 8c0 4.499-1.411 5.956-2.738 7.326" /></svg>
-            <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="#71717a" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M9 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h4" /><polyline points="16 17 21 12 16 7" /><line x1="21" x2="9" y1="12" y2="12" /></svg>
-            <span class="ml-auto font-mono text-[10px] text-zinc-600">v2.0.0</span>
+        <!-- panneau Projects (fidèle à ProjectTree : arbre projet -> worktree -> session) -->
+        <div class="flex w-[176px] flex-none flex-col border-r border-border bg-surface-1 py-2">
+          <div class="label-mono px-3 pb-2">{{ t('mProjects') }}</div>
+          <div class="flex flex-col gap-px px-1 text-[12px]">
+            <div class="flex items-center gap-1.5 rounded px-2 py-1 text-fg-muted">
+              <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m6 9 6 6 6-6" /></svg>
+              <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M4 3h16a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2Z" /><circle cx="12" cy="10" r="2" /><path d="M12 12v4" /></svg>
+              <span class="truncate">api</span>
+            </div>
+            <div class="flex items-center gap-1.5 rounded bg-surface-2 px-2 py-1 pl-5 text-fg">
+              <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="6" x2="6" y1="3" y2="15" /><circle cx="18" cy="6" r="3" /><circle cx="6" cy="18" r="3" /><path d="M18 9a9 9 0 0 1-9 9" /></svg>
+              <span class="truncate font-mono text-accent">feat/auth</span>
+            </div>
+            <div class="flex items-center gap-1.5 rounded px-2 py-0.5 pl-9 text-[11px] text-fg-muted">
+              <span class="h-1.5 w-1.5 flex-none rounded-full" :style="{ background: pill.fg, animation: pill.pulse }"></span>
+              <span class="truncate font-mono">claude</span>
+            </div>
+            <div class="flex items-center gap-1.5 rounded px-2 py-1 text-fg-muted">
+              <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m9 18 6-6-6-6" /></svg>
+              <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M4 3h16a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2Z" /><circle cx="12" cy="10" r="2" /><path d="M12 12v4" /></svg>
+              <span class="truncate">web</span>
+            </div>
+            <div class="flex items-center gap-1.5 rounded px-2 py-1 text-fg-muted">
+              <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m9 18 6-6-6-6" /></svg>
+              <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M4 3h16a2 2 0 0 1 2 2v14a2 2 0 0 1-2 2H4a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2Z" /><circle cx="12" cy="10" r="2" /><path d="M12 12v4" /></svg>
+              <span class="truncate">docs</span>
+            </div>
           </div>
         </div>
 
         <!-- main -->
-        <div class="flex min-w-0 flex-1 flex-col gap-[11px] p-[13px]">
+        <div class="flex min-w-0 flex-1 flex-col gap-[11px] bg-surface-0 p-[13px]">
           <!-- terminal pane -->
-          <div
-            class="flex min-h-0 flex-1 flex-col overflow-hidden rounded-[10px] border border-zinc-800 bg-zinc-950"
-          >
-            <div class="flex items-center justify-between border-b border-[#1c1c1f] px-[11px] py-2">
-              <span class="font-mono text-[11.5px] text-zinc-300">api · feat/auth</span>
+          <div class="flex min-h-0 flex-1 flex-col overflow-hidden rounded-[10px] border border-border bg-surface-0">
+            <div class="flex items-center justify-between border-b border-border-soft px-[11px] py-2">
+              <span class="font-mono text-[11.5px] text-fg-muted">api · feat/auth</span>
               <span
-                class="inline-flex items-center gap-1.5 rounded px-2 py-[3px] font-mono text-[11px]"
+                class="inline-flex items-center gap-1.5 rounded-full px-2 py-[3px] font-mono text-[11px]"
                 :style="{ background: pill.bg, color: pill.fg }"
               >
-                <span
-                  class="h-1.5 w-1.5 flex-none rounded-full"
-                  :style="{ background: pill.dot, animation: pill.pulse }"
-                ></span>
+                <span class="h-1.5 w-1.5 flex-none rounded-full" :style="{ background: pill.fg, animation: pill.pulse }"></span>
                 {{ sessText }}
               </span>
             </div>
-            <div
-              class="flex min-h-[150px] flex-1 flex-col justify-end overflow-hidden p-[11px] font-mono text-xs leading-[1.7] text-zinc-300"
-            >
+            <div class="flex min-h-[150px] flex-1 flex-col justify-end overflow-hidden p-[11px] font-mono text-xs leading-[1.7] text-fg-muted">
               <div v-for="(ln, i) in termLines" :key="i" :style="{ color: ln.color, whiteSpace: 'pre' }">
                 {{ ln.text }}
               </div>
               <div v-if="anim.cur">
-                <span class="text-emerald-400">$</span>
-                <span class="ml-1 inline-block h-[13px] w-[7px] animate-blink align-middle bg-zinc-200"></span>
+                <span class="text-accent">$</span>
+                <span class="ml-1 inline-block h-[13px] w-[7px] animate-blink bg-fg align-middle"></span>
               </div>
             </div>
           </div>
 
-          <!-- dialogue de permission (fidèle à DialogPrompt : badge type + question + options + Deny) -->
-          <div
-            v-if="anim.dlg"
-            class="animate-dlg-in rounded-lg border border-amber-900/60 bg-amber-950/30 p-[11px]"
-          >
+          <!-- dialogue de permission (fidèle à DialogPrompt) -->
+          <div v-if="anim.dlg" class="animate-dlg-in rounded-lg border border-warn/40 bg-warn/10 p-[11px]">
             <div class="mb-2 flex items-center gap-2">
-              <span class="inline-flex items-center rounded bg-amber-900 px-1.5 py-0.5 text-[11px] font-medium text-amber-200">{{ t('mPermission') }}</span>
-              <span class="text-[12.5px] text-amber-100">{{ t('dlgQ') }}</span>
+              <span class="inline-flex items-center rounded-full bg-warn/15 px-1.5 py-0.5 font-mono text-[11px] text-warn">{{ t('mPermission') }}</span>
+              <span class="text-[12.5px] text-fg">{{ t('dlgQ') }}</span>
             </div>
             <div class="flex flex-wrap gap-[6px]">
               <span
@@ -186,15 +169,15 @@ const dlgOptions = computed(() =>
                 :key="i"
                 class="inline-flex items-center gap-1.5 rounded-lg border px-2.5 py-1.5 text-xs font-medium transition-colors"
                 :class="op.answered
-                  ? 'border-emerald-500/70 bg-emerald-950/50 text-emerald-300'
+                  ? 'border-accent/70 bg-accent/15 text-accent'
                   : op.highlighted
-                    ? 'border-amber-400 bg-amber-950/50 text-amber-200'
-                    : 'border-zinc-700 bg-zinc-800 text-zinc-200'"
+                    ? 'border-warn bg-warn/15 text-warn'
+                    : 'border-border bg-surface-2 text-fg'"
               >
-                <span class="font-mono" :class="op.answered ? 'text-emerald-400' : 'text-amber-400'">{{ op.num }}</span>
+                <span class="font-mono" :class="op.answered ? 'text-accent' : 'text-warn'">{{ op.num }}</span>
                 {{ op.text }}
               </span>
-              <span class="inline-flex items-center rounded-lg border border-red-900 bg-red-950 px-2.5 py-1.5 text-xs font-medium text-red-300">{{ t('mDeny') }}</span>
+              <span class="inline-flex items-center rounded-lg border border-danger/40 bg-danger/10 px-2.5 py-1.5 text-xs font-medium text-danger">{{ t('mDeny') }}</span>
             </div>
           </div>
         </div>
@@ -204,18 +187,18 @@ const dlgOptions = computed(() =>
     <!-- toast push -->
     <div
       v-if="anim.toast"
-      class="animate-toast-in absolute bottom-[14px] right-[14px] flex w-[248px] items-start gap-2.5 rounded-[11px] border border-[rgba(120,53,15,0.5)] bg-[#0c0c0e] p-3 shadow-toast"
+      class="animate-toast-in absolute right-[14px] bottom-[14px] flex w-[248px] items-start gap-2.5 rounded-[11px] border border-border bg-surface-1 p-3 shadow-toast"
     >
-      <span class="inline-flex h-[30px] w-[30px] flex-none items-center justify-center rounded-lg bg-emerald-500/15">
+      <span class="inline-flex h-[30px] w-[30px] flex-none items-center justify-center rounded-lg bg-accent/15">
         <img src="/assets/arboretum-mark.png" alt="" width="18" height="18" class="h-[18px] w-[18px] object-contain" />
       </span>
       <div class="min-w-0 flex-1">
         <div class="flex items-center justify-between">
-          <span class="font-mono text-[11px] text-emerald-400">Arboretum</span>
-          <span class="text-[10px] text-zinc-600">now</span>
+          <span class="font-mono text-[11px] text-accent">Arboretum</span>
+          <span class="text-[10px] text-fg-subtle">now</span>
         </div>
-        <div class="mt-[3px] text-[13px] font-semibold text-zinc-100">{{ t('toastTitle') }}</div>
-        <div class="mt-px text-[11.5px] leading-[1.4] text-zinc-400">{{ t('toastBody') }}</div>
+        <div class="mt-[3px] text-[13px] font-semibold text-fg">{{ t('toastTitle') }}</div>
+        <div class="mt-px text-[11.5px] leading-[1.4] text-fg-muted">{{ t('toastBody') }}</div>
       </div>
     </div>
   </div>

packages/site/src/components/HeroSection.vue

@@ -21,27 +21,27 @@ const { t } = useI18n();
           class="block h-[46px] w-[46px] object-contain"
         />
         <span
-          class="inline-flex items-center gap-2 rounded-full border border-emerald-500/30 bg-emerald-500/[0.07] px-[11px] py-[5px] font-mono text-[11.5px] uppercase tracking-[0.1em] text-emerald-400"
+          class="inline-flex items-center gap-2 rounded-full border border-accent/30 bg-accent/[0.07] px-[11px] py-[5px] font-mono text-[11.5px] uppercase tracking-[0.1em] text-accent"
         >
-          <span class="h-1.5 w-1.5 rounded-full bg-emerald-400 shadow-[0_0_8px_#34d399]"></span>
+          <span class="h-1.5 w-1.5 rounded-full bg-accent shadow-[0_0_8px_var(--color-accent)]"></span>
           {{ t('heroBadge') }}
         </span>
       </div>
 
-      <h1 class="m-0 text-[clamp(40px,5.6vw,64px)] font-bold leading-[1.04] tracking-[-0.035em] text-zinc-50">
+      <h1 class="m-0 text-[clamp(40px,5.6vw,64px)] font-bold leading-[1.04] tracking-[-0.035em] text-fg">
         {{ t('heroTitle') }}
       </h1>
-      <p class="mt-[22px] max-w-[520px] text-[clamp(17px,1.7vw,20px)] leading-[1.55] text-zinc-400">
+      <p class="mt-[22px] max-w-[520px] text-[clamp(17px,1.7vw,20px)] leading-[1.55] text-fg-muted">
         {{ t('heroSub') }}
       </p>
 
       <div
-        class="mt-[30px] flex max-w-[480px] items-stretch overflow-hidden rounded-[10px] border border-zinc-800 bg-zinc-950/60"
+        class="mt-[30px] flex max-w-[480px] items-stretch overflow-hidden rounded-[10px] border border-border bg-surface-0/60"
       >
         <div
           class="flex min-w-0 flex-1 items-center gap-2.5 overflow-x-auto whitespace-nowrap px-[15px] font-mono text-sm"
         >
-          <span class="text-emerald-400">$</span><span class="text-zinc-200">{{ INSTALL_COMMAND }}</span>
+          <span class="text-accent">$</span><span class="text-fg">{{ INSTALL_COMMAND }}</span>
         </div>
         <CopyButton variant="bar" :text="INSTALL_COMMAND" :label="t('copyCommand')" />
       </div>
@@ -49,7 +49,7 @@ const { t } = useI18n();
       <div class="mt-6 flex flex-wrap gap-[13px]">
         <a
           href="#how"
-          class="inline-flex items-center gap-[9px] rounded-[9px] bg-emerald-600 px-6 py-[13px] text-[15.5px] font-semibold text-white no-underline transition-[background,transform] duration-150 ease-in-out hover:-translate-y-px hover:bg-emerald-500 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-emerald-500/70"
+          class="inline-flex items-center gap-[9px] rounded-[9px] bg-accent-solid px-6 py-[13px] text-[15.5px] font-semibold text-white no-underline transition-[background,transform] duration-150 ease-in-out hover:-translate-y-px hover:bg-accent-hover focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-accent/70"
         >
           {{ t('getStarted') }}
           <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M5 12h14" /><path d="m12 5 7 7-7 7" /></svg>
@@ -58,7 +58,7 @@ const { t } = useI18n();
           :href="REPO"
           target="_blank"
           rel="noopener"
-          class="inline-flex items-center gap-[9px] rounded-[9px] border border-zinc-800 px-[22px] py-[13px] text-[15.5px] font-medium text-zinc-100 no-underline transition-colors hover:border-emerald-500/45 hover:text-emerald-400 focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-emerald-500/70"
+          class="inline-flex items-center gap-[9px] rounded-[9px] border border-border px-[22px] py-[13px] text-[15.5px] font-medium text-fg no-underline transition-colors hover:border-accent/45 hover:text-accent focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-accent/70"
         >
           <IconGitea :size="17" />
           {{ t('gitea') }}

packages/site/src/components/HowItWorksSection.vue

@@ -11,41 +11,41 @@ const LOCAL_URL = 'http://localhost:7317';
 <template>
   <section id="how" class="mx-auto max-w-[1200px] scroll-mt-[84px] px-6 pb-[100px]">
     <div v-reveal class="mb-[46px] text-center">
-      <div class="mb-3.5 font-mono text-xs uppercase tracking-[0.14em] text-emerald-400">{{ t('howKicker') }}</div>
-      <h2 class="m-0 text-[clamp(28px,3.4vw,40px)] font-semibold tracking-[-0.025em] text-zinc-50">{{ t('howTitle') }}</h2>
+      <div class="mb-3.5 font-mono text-xs uppercase tracking-[0.14em] text-accent">{{ t('howKicker') }}</div>
+      <h2 class="m-0 text-[clamp(28px,3.4vw,40px)] font-semibold tracking-[-0.025em] text-fg">{{ t('howTitle') }}</h2>
     </div>
 
     <div v-reveal class="grid grid-cols-[repeat(auto-fit,minmax(280px,1fr))] gap-4">
-      <div class="rounded-xl border border-zinc-800 bg-zinc-900/50 p-[26px]">
-        <div class="mb-[18px] font-mono text-[13px] text-emerald-400">01</div>
-        <h3 class="m-0 mb-2.5 text-lg font-semibold text-zinc-50">{{ t('step1Title') }}</h3>
-        <p class="m-0 mb-4 text-[14.5px] leading-[1.55] text-zinc-400">{{ t('step1Desc') }}</p>
-        <div class="flex items-center gap-2 rounded-lg border border-zinc-800 bg-zinc-950 p-[11px]">
-          <code class="min-w-0 flex-1 overflow-x-auto whitespace-nowrap font-mono text-[12.5px] text-zinc-200">
-            <span class="text-emerald-400">$ </span>{{ INSTALL_COMMAND }}
+      <div class="rounded-xl border border-border bg-surface-1/50 p-[26px]">
+        <div class="mb-[18px] font-mono text-[13px] text-accent">01</div>
+        <h3 class="m-0 mb-2.5 text-lg font-semibold text-fg">{{ t('step1Title') }}</h3>
+        <p class="m-0 mb-4 text-[14.5px] leading-[1.55] text-fg-muted">{{ t('step1Desc') }}</p>
+        <div class="flex items-center gap-2 rounded-lg border border-border bg-surface-0 p-[11px]">
+          <code class="min-w-0 flex-1 overflow-x-auto whitespace-nowrap font-mono text-[12.5px] text-fg">
+            <span class="text-accent">$ </span>{{ INSTALL_COMMAND }}
           </code>
           <CopyButton variant="icon" :text="INSTALL_COMMAND" :label="t('copyCommand')" />
         </div>
       </div>
-      <div class="rounded-xl border border-zinc-800 bg-zinc-900/50 p-[26px]">
-        <div class="mb-[18px] font-mono text-[13px] text-emerald-400">02</div>
-        <h3 class="m-0 mb-2.5 text-lg font-semibold text-zinc-50">{{ t('step2Title') }}</h3>
-        <p class="m-0 mb-4 text-[14.5px] leading-[1.55] text-zinc-400">{{ t('step2Desc') }}</p>
-        <div class="flex items-center gap-2 rounded-lg border border-zinc-800 bg-zinc-950 p-[11px]">
-          <code class="min-w-0 flex-1 overflow-x-auto whitespace-nowrap font-mono text-[12.5px] text-sky-300">
+      <div class="rounded-xl border border-border bg-surface-1/50 p-[26px]">
+        <div class="mb-[18px] font-mono text-[13px] text-accent">02</div>
+        <h3 class="m-0 mb-2.5 text-lg font-semibold text-fg">{{ t('step2Title') }}</h3>
+        <p class="m-0 mb-4 text-[14.5px] leading-[1.55] text-fg-muted">{{ t('step2Desc') }}</p>
+        <div class="flex items-center gap-2 rounded-lg border border-border bg-surface-0 p-[11px]">
+          <code class="min-w-0 flex-1 overflow-x-auto whitespace-nowrap font-mono text-[12.5px] text-info">
             → {{ LOCAL_URL }}
           </code>
           <CopyButton variant="icon" :text="LOCAL_URL" :label="t('copyUrl')" />
         </div>
       </div>
-      <div class="rounded-xl border border-zinc-800 bg-zinc-900/50 p-[26px]">
-        <div class="mb-[18px] font-mono text-[13px] text-emerald-400">03</div>
-        <h3 class="m-0 mb-2.5 text-lg font-semibold text-zinc-50">{{ t('step3Title') }}</h3>
-        <p class="m-0 mb-4 text-[14.5px] leading-[1.55] text-zinc-400">{{ t('step3Desc') }}</p>
+      <div class="rounded-xl border border-border bg-surface-1/50 p-[26px]">
+        <div class="mb-[18px] font-mono text-[13px] text-accent">03</div>
+        <h3 class="m-0 mb-2.5 text-lg font-semibold text-fg">{{ t('step3Title') }}</h3>
+        <p class="m-0 mb-4 text-[14.5px] leading-[1.55] text-fg-muted">{{ t('step3Desc') }}</p>
         <div class="flex flex-wrap gap-1.5">
-          <span class="rounded-md bg-emerald-500/10 px-[9px] py-1 font-mono text-[11px] text-emerald-400">{{ t('idle') }}</span>
-          <span class="rounded-md bg-[rgba(8,47,73,0.7)] px-[9px] py-1 font-mono text-[11px] text-sky-300">{{ t('busy') }}</span>
-          <span class="rounded-md bg-[rgba(69,26,3,0.6)] px-[9px] py-1 font-mono text-[11px] text-amber-300">{{ t('waiting') }}</span>
+          <span class="rounded-md bg-accent/10 px-[9px] py-1 font-mono text-[11px] text-accent">{{ t('idle') }}</span>
+          <span class="rounded-md bg-info/15 px-[9px] py-1 font-mono text-[11px] text-info">{{ t('busy') }}</span>
+          <span class="rounded-md bg-warn/15 px-[9px] py-1 font-mono text-[11px] text-warn">{{ t('waiting') }}</span>
         </div>
       </div>
     </div>

packages/site/src/components/LangToggle.vue

@@ -13,13 +13,13 @@ function set(l: AppLocale): void {
   <div
     role="group"
     aria-label="Language"
-    class="flex items-center overflow-hidden rounded-lg border border-zinc-800 bg-zinc-950/40"
+    class="flex items-center overflow-hidden rounded-lg border border-border bg-surface-0/40"
   >
     <button
       type="button"
       :aria-pressed="locale === 'en'"
-      class="cursor-pointer border-none px-[11px] py-1.5 font-mono text-xs font-semibold focus-visible:outline-2 focus-visible:outline-offset-1 focus-visible:outline-emerald-500/70"
-      :class="locale === 'en' ? 'bg-zinc-800 text-emerald-400' : 'bg-transparent text-zinc-500'"
+      class="cursor-pointer border-none px-[11px] py-1.5 font-mono text-xs font-semibold focus-visible:outline-2 focus-visible:outline-offset-1 focus-visible:outline-accent/70"
+      :class="locale === 'en' ? 'bg-surface-2 text-accent' : 'bg-transparent text-fg-subtle'"
       @click="set('en')"
     >
       EN
@@ -27,8 +27,8 @@ function set(l: AppLocale): void {
     <button
       type="button"
       :aria-pressed="locale === 'fr'"
-      class="cursor-pointer border-none px-[11px] py-1.5 font-mono text-xs font-semibold focus-visible:outline-2 focus-visible:outline-offset-1 focus-visible:outline-emerald-500/70"
-      :class="locale === 'fr' ? 'bg-zinc-800 text-emerald-400' : 'bg-transparent text-zinc-500'"
+      class="cursor-pointer border-none px-[11px] py-1.5 font-mono text-xs font-semibold focus-visible:outline-2 focus-visible:outline-offset-1 focus-visible:outline-accent/70"
+      :class="locale === 'fr' ? 'bg-surface-2 text-accent' : 'bg-transparent text-fg-subtle'"
       @click="set('fr')"
     >
       FR

packages/site/src/components/ProblemSection.vue

@@ -5,10 +5,10 @@ const { t } = useI18n();
 
 <template>
   <section v-reveal class="mx-auto max-w-[920px] px-6 pb-[92px] pt-12 text-center">
-    <div class="mb-4 font-mono text-xs uppercase tracking-[0.14em] text-emerald-400">{{ t('probKicker') }}</div>
-    <h2 class="m-0 text-[clamp(28px,3.6vw,42px)] font-semibold leading-[1.18] tracking-[-0.025em] text-zinc-50">
+    <div class="mb-4 font-mono text-xs uppercase tracking-[0.14em] text-accent">{{ t('probKicker') }}</div>
+    <h2 class="m-0 text-[clamp(28px,3.6vw,42px)] font-semibold leading-[1.18] tracking-[-0.025em] text-fg">
       {{ t('probTitle') }}
     </h2>
-    <p class="mx-auto mt-[22px] max-w-[640px] text-[clamp(17px,1.6vw,19px)] text-zinc-400">{{ t('probBody') }}</p>
+    <p class="mx-auto mt-[22px] max-w-[640px] text-[clamp(17px,1.6vw,19px)] text-fg-muted">{{ t('probBody') }}</p>
   </section>
 </template>

packages/site/src/components/RemoteGitSection.vue

@@ -15,12 +15,12 @@ const connections = [
   <section id="remotegit" class="mx-auto max-w-[1200px] scroll-mt-[84px] px-6 pb-[100px]">
     <div v-reveal class="flex flex-wrap items-center gap-12">
       <div class="min-w-[280px] flex-[1_1_360px]">
-        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-emerald-400">{{ t('rgKicker') }}</div>
-        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,34px)] font-semibold leading-[1.15] tracking-[-0.025em] text-zinc-50">
+        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-accent">{{ t('rgKicker') }}</div>
+        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,34px)] font-semibold leading-[1.15] tracking-[-0.025em] text-fg">
           {{ t('rgTitle') }}
         </h2>
-        <p class="m-0 text-[16.5px] leading-[1.6] text-zinc-400">{{ t('rgBody') }}</p>
-        <div class="mt-4 inline-flex items-center gap-2 rounded-lg border border-emerald-500/30 bg-emerald-500/[0.08] px-3 py-1.5 text-[13px] font-medium text-emerald-300">
+        <p class="m-0 text-[16.5px] leading-[1.6] text-fg-muted">{{ t('rgBody') }}</p>
+        <div class="mt-4 inline-flex items-center gap-2 rounded-lg border border-accent/30 bg-accent/[0.08] px-3 py-1.5 text-[13px] font-medium text-accent">
           <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="11" x="3" y="11" rx="2" /><path d="M7 11V7a5 5 0 0 1 10 0v4" /></svg>
           {{ t('rgEncrypted') }}
         </div>
@@ -28,8 +28,8 @@ const connections = [
 
       <div class="flex min-w-[280px] flex-[1_1_440px] flex-col gap-3">
         <!-- carte connexions (fidèle à GitConnectionsSection) -->
-        <div class="flex flex-col gap-2 rounded-xl border border-zinc-800 bg-zinc-900/50 p-3 shadow-card">
-          <h3 class="flex items-center gap-2 text-sm font-semibold text-zinc-100">
+        <div class="flex flex-col gap-2 rounded-xl border border-border bg-surface-1/50 p-3 shadow-card">
+          <h3 class="flex items-center gap-2 text-sm font-semibold text-fg">
             <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M9 2v6" /><path d="M15 2v6" /><path d="M12 17v5" /><path d="M5 8h14" /><path d="M6 11V8h12v3a6 6 0 0 1-12 0Z" /></svg>
             {{ t('rgConnections') }}
           </h3>
@@ -38,19 +38,19 @@ const connections = [
             <li
               v-for="c in connections"
               :key="c.label"
-              class="flex flex-wrap items-center gap-2 rounded-lg border border-zinc-800 bg-zinc-900/40 px-2.5 py-2"
+              class="flex flex-wrap items-center gap-2 rounded-lg border border-border bg-surface-1/40 px-2.5 py-2"
             >
               <!-- icône service (Gitea / GitHub / GitLab) -->
-              <span class="inline-flex h-6 w-6 flex-none items-center justify-center rounded-md bg-zinc-800 text-zinc-300">
+              <span class="inline-flex h-6 w-6 flex-none items-center justify-center rounded-md bg-surface-2 text-fg-muted">
                 <svg v-if="c.service === 'github'" width="14" height="14" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><path d="M12 1.3a10.7 10.7 0 0 0-3.38 20.86c.53.1.73-.23.73-.51l-.01-1.79c-2.98.65-3.61-1.44-3.61-1.44-.49-1.24-1.19-1.57-1.19-1.57-.97-.66.07-.65.07-.65 1.08.08 1.64 1.11 1.64 1.11.96 1.64 2.51 1.16 3.12.89.1-.69.37-1.16.68-1.43-2.38-.27-4.88-1.19-4.88-5.3 0-1.17.42-2.13 1.1-2.88-.11-.27-.48-1.36.1-2.84 0 0 .9-.29 2.96 1.1a10.3 10.3 0 0 1 5.38 0c2.05-1.39 2.95-1.1 2.95-1.1.59 1.48.22 2.57.11 2.84.69.75 1.1 1.71 1.1 2.88 0 4.12-2.51 5.02-4.9 5.29.39.33.73.98.73 1.97l-.01 2.92c0 .29.2.62.74.51A10.7 10.7 0 0 0 12 1.3" /></svg>
                 <svg v-else-if="c.service === 'gitlab'" width="15" height="15" viewBox="0 0 24 24" fill="currentColor" aria-hidden="true"><path d="m12 21.42 3.68-11.33H8.32L12 21.42Z" /><path d="M12 21.42 8.32 10.09H3.16L12 21.42Z" /><path d="M3.16 10.09 2.04 13.53a.76.76 0 0 0 .28.85L12 21.42 3.16 10.09Z" /><path d="M3.16 10.09h5.16L6.1 3.26a.38.38 0 0 0-.72 0l-2.22 6.83Z" /><path d="M12 21.42l3.68-11.33h5.16L12 21.42Z" /><path d="m20.84 10.09 1.12 3.44a.76.76 0 0 1-.28.85L12 21.42l8.84-11.33Z" /><path d="M20.84 10.09h-5.16l2.22-6.83a.38.38 0 0 1 .72 0l2.22 6.83Z" /></svg>
                 <svg v-else width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M4 10h12v4a4 4 0 0 1-4 4H8a4 4 0 0 1-4-4z" /><path d="M16 11h2.5a2.5 2.5 0 0 1 0 5H16" /><path d="M7 3c-.5.8.5 1.6 0 2.5" /><path d="M11 3c-.5.8.5 1.6 0 2.5" /></svg>
               </span>
-              <span class="inline-flex items-center rounded bg-sky-950 px-1.5 py-0.5 text-[11px] font-medium text-sky-300">{{ c.service }}</span>
-              <span class="font-medium text-zinc-200">{{ c.label }}</span>
-              <span class="text-xs text-zinc-500">{{ c.username }}</span>
-              <span class="font-mono text-xs text-zinc-600">••••{{ c.last4 }}</span>
-              <span class="ml-auto inline-flex items-center gap-1 rounded bg-emerald-950 px-1.5 py-0.5 text-[11px] font-medium text-emerald-400">
+              <span class="inline-flex items-center rounded bg-info/15 px-1.5 py-0.5 text-[11px] font-medium text-info">{{ c.service }}</span>
+              <span class="font-medium text-fg">{{ c.label }}</span>
+              <span class="text-xs text-fg-subtle">{{ c.username }}</span>
+              <span class="font-mono text-xs text-fg-subtle">••••{{ c.last4 }}</span>
+              <span class="ml-auto inline-flex items-center gap-1 rounded bg-accent/15 px-1.5 py-0.5 text-[11px] font-medium text-accent">
                 <svg width="11" height="11" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.6" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 6 9 17l-5-5" /></svg>
                 {{ t('rgTested') }}
               </span>
@@ -58,7 +58,7 @@ const connections = [
           </ul>
 
           <div>
-            <span class="inline-flex items-center gap-1.5 rounded-lg border border-zinc-700 bg-zinc-800 px-2.5 py-1.5 text-xs font-medium text-zinc-200">
+            <span class="inline-flex items-center gap-1.5 rounded-lg border border-border-strong bg-surface-2 px-2.5 py-1.5 text-xs font-medium text-fg">
               <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M5 12h14" /><path d="M12 5v14" /></svg>
               {{ t('rgAddConnection') }}
             </span>
@@ -66,16 +66,16 @@ const connections = [
         </div>
 
         <!-- progression de clone (fidèle à CloneRepoModal) -->
-        <div class="flex flex-col gap-2 rounded-xl border border-zinc-800 bg-zinc-900/50 p-3 shadow-card">
+        <div class="flex flex-col gap-2 rounded-xl border border-border bg-surface-1/50 p-3 shadow-card">
           <div class="flex items-center gap-2">
-            <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="#34d399" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" /><polyline points="7 10 12 15 17 10" /><line x1="12" x2="12" y1="15" y2="3" /></svg>
-            <span class="font-mono text-[13px] text-zinc-200">github.com/jleroy/api</span>
-            <span class="ml-auto font-mono text-xs text-zinc-500">62%</span>
+            <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4" /><polyline points="7 10 12 15 17 10" /><line x1="12" x2="12" y1="15" y2="3" /></svg>
+            <span class="font-mono text-[13px] text-fg">github.com/jleroy/api</span>
+            <span class="ml-auto font-mono text-xs text-fg-subtle">62%</span>
           </div>
-          <div class="h-2 w-full overflow-hidden rounded bg-zinc-800">
-            <div class="h-full rounded bg-emerald-500" style="width: 62%"></div>
+          <div class="h-2 w-full overflow-hidden rounded bg-surface-2">
+            <div class="h-full rounded bg-accent" style="width: 62%"></div>
           </div>
-          <span class="font-mono text-xs text-zinc-500">{{ t('rgCloneReceiving') }}… 62%</span>
+          <span class="font-mono text-xs text-fg-subtle">{{ t('rgCloneReceiving') }}… 62%</span>
         </div>
       </div>
     </div>

packages/site/src/components/SecuritySection.vue

@@ -7,44 +7,44 @@ const { t } = useI18n();
   <section id="security" class="mx-auto max-w-[1200px] scroll-mt-[84px] px-6 pb-[100px]">
     <div
       v-reveal
-      class="rounded-[18px] border border-emerald-500/[0.18] p-[clamp(28px,4vw,48px)]"
-      style="background: linear-gradient(180deg, rgba(16, 185, 129, 0.05), rgba(16, 185, 129, 0))"
+      class="rounded-[18px] border border-accent/[0.18] p-[clamp(28px,4vw,48px)]"
+      style="background: linear-gradient(180deg, color-mix(in srgb, var(--color-accent) 5%, transparent), transparent)"
     >
       <div class="mb-[30px] flex flex-wrap items-end justify-between gap-3.5">
         <div>
-          <div class="mb-3 font-mono text-xs uppercase tracking-[0.14em] text-emerald-400">{{ t('secKicker') }}</div>
-          <h2 class="m-0 text-[clamp(26px,3.2vw,38px)] font-semibold leading-[1.12] tracking-[-0.025em] text-zinc-50">
+          <div class="mb-3 font-mono text-xs uppercase tracking-[0.14em] text-accent">{{ t('secKicker') }}</div>
+          <h2 class="m-0 text-[clamp(26px,3.2vw,38px)] font-semibold leading-[1.12] tracking-[-0.025em] text-fg">
             {{ t('secTitle') }}
           </h2>
         </div>
-        <p class="m-0 max-w-[380px] text-[15.5px] leading-[1.55] text-zinc-400">{{ t('secIntro') }}</p>
+        <p class="m-0 max-w-[380px] text-[15.5px] leading-[1.55] text-fg-muted">{{ t('secIntro') }}</p>
       </div>
 
       <div class="grid grid-cols-[repeat(auto-fit,minmax(200px,1fr))] gap-3.5">
-        <div class="flex flex-col gap-2.5 rounded-[11px] border border-zinc-800 bg-[#0c0c0e] p-[18px]">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#34d399" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="11" x="3" y="11" rx="2" /><path d="M7 11V7a5 5 0 0 1 10 0v4" /></svg>
-          <div class="text-[15px] font-semibold text-zinc-50">{{ t('sec1Title') }}</div>
-          <div class="text-[13.5px] leading-[1.5] text-zinc-400">{{ t('sec1Desc') }}</div>
+        <div class="flex flex-col gap-2.5 rounded-[11px] border border-border bg-surface-0 p-[18px]">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="11" x="3" y="11" rx="2" /><path d="M7 11V7a5 5 0 0 1 10 0v4" /></svg>
+          <div class="text-[15px] font-semibold text-fg">{{ t('sec1Title') }}</div>
+          <div class="text-[13.5px] leading-[1.5] text-fg-muted">{{ t('sec1Desc') }}</div>
         </div>
-        <div class="flex flex-col gap-2.5 rounded-[11px] border border-zinc-800 bg-[#0c0c0e] p-[18px]">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#34d399" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m15.5 7.5 2.3 2.3a1 1 0 0 0 1.4 0l2.1-2.1a1 1 0 0 0 0-1.4L19 4" /><path d="m21 2-9.6 9.6" /><circle cx="7.5" cy="15.5" r="5.5" /></svg>
-          <div class="text-[15px] font-semibold text-zinc-50">{{ t('sec2Title') }}</div>
-          <div class="text-[13.5px] leading-[1.5] text-zinc-400">{{ t('sec2Desc') }}</div>
+        <div class="flex flex-col gap-2.5 rounded-[11px] border border-border bg-surface-0 p-[18px]">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m15.5 7.5 2.3 2.3a1 1 0 0 0 1.4 0l2.1-2.1a1 1 0 0 0 0-1.4L19 4" /><path d="m21 2-9.6 9.6" /><circle cx="7.5" cy="15.5" r="5.5" /></svg>
+          <div class="text-[15px] font-semibold text-fg">{{ t('sec2Title') }}</div>
+          <div class="text-[13.5px] leading-[1.5] text-fg-muted">{{ t('sec2Desc') }}</div>
         </div>
-        <div class="flex flex-col gap-2.5 rounded-[11px] border border-zinc-800 bg-[#0c0c0e] p-[18px]">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#34d399" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z" /><path d="m9 12 2 2 4-4" /></svg>
-          <div class="text-[15px] font-semibold text-zinc-50">{{ t('sec3Title') }}</div>
-          <div class="text-[13.5px] leading-[1.5] text-zinc-400">{{ t('sec3Desc') }}</div>
+        <div class="flex flex-col gap-2.5 rounded-[11px] border border-border bg-surface-0 p-[18px]">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 13c0 5-3.5 7.5-7.66 8.95a1 1 0 0 1-.67-.01C7.5 20.5 4 18 4 13V6a1 1 0 0 1 1-1c2 0 4.5-1.2 6.24-2.72a1.17 1.17 0 0 1 1.52 0C14.51 3.81 17 5 19 5a1 1 0 0 1 1 1z" /><path d="m9 12 2 2 4-4" /></svg>
+          <div class="text-[15px] font-semibold text-fg">{{ t('sec3Title') }}</div>
+          <div class="text-[13.5px] leading-[1.5] text-fg-muted">{{ t('sec3Desc') }}</div>
         </div>
-        <div class="flex flex-col gap-2.5 rounded-[11px] border border-zinc-800 bg-[#0c0c0e] p-[18px]">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#34d399" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M5 12.55a11 11 0 0 1 14.08 0" /><path d="M1.42 9a16 16 0 0 1 21.16 0" /><path d="M8.53 16.11a6 6 0 0 1 6.95 0" /><path d="M12 20h.01" /></svg>
-          <div class="text-[15px] font-semibold text-zinc-50">{{ t('sec4Title') }}</div>
-          <div class="text-[13.5px] leading-[1.5] text-zinc-400">{{ t('sec4Desc') }}</div>
+        <div class="flex flex-col gap-2.5 rounded-[11px] border border-border bg-surface-0 p-[18px]">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M5 12.55a11 11 0 0 1 14.08 0" /><path d="M1.42 9a16 16 0 0 1 21.16 0" /><path d="M8.53 16.11a6 6 0 0 1 6.95 0" /><path d="M12 20h.01" /></svg>
+          <div class="text-[15px] font-semibold text-fg">{{ t('sec4Title') }}</div>
+          <div class="text-[13.5px] leading-[1.5] text-fg-muted">{{ t('sec4Desc') }}</div>
         </div>
-        <div class="flex flex-col gap-2.5 rounded-[11px] border border-zinc-800 bg-[#0c0c0e] p-[18px]">
-          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="#34d399" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="11" x="3" y="11" rx="2" /><path d="M7 11V7a5 5 0 0 1 10 0v4" /><path d="M12 16v-2" /></svg>
-          <div class="text-[15px] font-semibold text-zinc-50">{{ t('sec5Title') }}</div>
-          <div class="text-[13.5px] leading-[1.5] text-zinc-400">{{ t('sec5Desc') }}</div>
+        <div class="flex flex-col gap-2.5 rounded-[11px] border border-border bg-surface-0 p-[18px]">
+          <svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="11" x="3" y="11" rx="2" /><path d="M7 11V7a5 5 0 0 1 10 0v4" /><path d="M12 16v-2" /></svg>
+          <div class="text-[15px] font-semibold text-fg">{{ t('sec5Title') }}</div>
+          <div class="text-[13.5px] leading-[1.5] text-fg-muted">{{ t('sec5Desc') }}</div>
         </div>
       </div>
     </div>

packages/site/src/components/ShowcaseSection.vue

@@ -12,246 +12,250 @@ const dlgOpts = computed(() => DLG_OPTS[locale.value as AppLocale]);
 
 <template>
   <section id="showcase" class="mx-auto flex max-w-[1200px] scroll-mt-[84px] flex-col gap-[92px] px-6">
-    <!-- a) dashboard worktree-first : rail « À traiter » + section de repo (fidèle à AttentionSection + RepoSection) -->
+    <!-- a) supervision : rail « À traiter » + section de repo (AttentionList + worktrees / git) -->
     <div v-reveal class="flex flex-wrap items-center gap-12">
       <div class="min-w-[280px] flex-[1_1_360px]">
-        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-emerald-400">{{ t('scAKicker') }}</div>
-        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,34px)] font-semibold leading-[1.15] tracking-[-0.025em] text-zinc-50">
+        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-accent">{{ t('scAKicker') }}</div>
+        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,34px)] font-semibold leading-[1.15] tracking-[-0.025em] text-fg">
           {{ t('scATitle') }}
         </h2>
-        <p class="m-0 text-[16.5px] leading-[1.6] text-zinc-400">{{ t('scABody') }}</p>
+        <p class="m-0 text-[16.5px] leading-[1.6] text-fg-muted">{{ t('scABody') }}</p>
       </div>
       <div class="flex min-w-[280px] flex-[1_1_440px] flex-col gap-3">
         <!-- rail « À traiter » -->
-        <div class="flex flex-col gap-2 rounded-xl border border-amber-900/50 bg-amber-950/20 p-3 shadow-card">
+        <div class="flex flex-col gap-2 rounded-xl border border-warn/40 bg-warn/10 p-3 shadow-card">
           <div class="flex items-center gap-2">
-            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="#fbbf24" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z" /><path d="M12 9v4" /><path d="M12 17h.01" /></svg>
-            <h3 class="text-sm font-semibold text-amber-200">{{ t('mAttn') }}</h3>
-            <span class="rounded-full bg-amber-500/20 px-1.5 text-[11px] font-semibold text-amber-300">1</span>
+            <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="var(--color-warn)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z" /><path d="M12 9v4" /><path d="M12 17h.01" /></svg>
+            <h3 class="text-sm font-semibold text-warn">{{ t('mAttn') }}</h3>
+            <span class="rounded-full bg-warn/20 px-1.5 text-[11px] font-semibold text-warn">1</span>
           </div>
-          <span class="truncate font-mono text-xs text-amber-300/80">~/code/arboretum/api</span>
+          <span class="truncate font-mono text-xs text-warn/80">~/code/arboretum/api</span>
           <!-- DialogPrompt -->
-          <div class="rounded-lg border border-amber-900/60 bg-amber-950/30 p-2.5">
+          <div class="rounded-lg border border-warn/40 bg-warn/10 p-2.5">
             <div class="flex items-center gap-2">
-              <span class="inline-flex items-center rounded bg-amber-900 px-1.5 py-0.5 text-[11px] font-medium text-amber-200">{{ t('mPermission') }}</span>
-              <span class="text-[12.5px] text-amber-100">{{ t('dlgQ') }}</span>
+              <span class="inline-flex items-center rounded-full bg-warn/15 px-1.5 py-0.5 font-mono text-[11px] text-warn">{{ t('mPermission') }}</span>
+              <span class="text-[12.5px] text-fg">{{ t('dlgQ') }}</span>
             </div>
             <div class="mt-2 flex flex-wrap gap-1.5">
               <span
                 v-for="(op, i) in dlgOpts"
                 :key="i"
-                class="inline-flex items-center gap-1.5 rounded-lg border border-zinc-700 bg-zinc-800 px-2.5 py-1.5 text-xs font-medium text-zinc-200"
+                class="inline-flex items-center gap-1.5 rounded-lg border border-border bg-surface-2 px-2.5 py-1.5 text-xs font-medium text-fg"
               >
-                <span class="font-mono text-amber-400">{{ i + 1 }}</span> {{ op }}
+                <span class="font-mono text-warn">{{ i + 1 }}</span> {{ op }}
               </span>
-              <span class="inline-flex items-center rounded-lg border border-red-900 bg-red-950 px-2.5 py-1.5 text-xs font-medium text-red-300">{{ t('mDeny') }}</span>
+              <span class="inline-flex items-center rounded-lg border border-danger/40 bg-danger/10 px-2.5 py-1.5 text-xs font-medium text-danger">{{ t('mDeny') }}</span>
             </div>
           </div>
         </div>
 
         <!-- section de repo : worktrees + état de session -->
-        <div class="flex flex-col gap-2 rounded-xl border border-zinc-800 bg-zinc-900/50 p-3 shadow-card">
+        <div class="flex flex-col gap-2 rounded-xl border border-border bg-surface-1/50 p-3 shadow-card">
           <header class="flex flex-wrap items-center gap-2">
-            <h3 class="font-semibold text-zinc-100">arboretum</h3>
-            <span class="truncate font-mono text-xs text-zinc-500">~/code/arboretum</span>
-            <span class="ml-auto inline-flex items-center gap-1.5 rounded-lg border border-zinc-700 bg-zinc-800 px-2 py-1 text-xs font-medium text-zinc-200">
+            <h3 class="font-semibold text-fg">arboretum</h3>
+            <span class="truncate font-mono text-xs text-fg-subtle">~/code/arboretum</span>
+            <span class="ml-auto inline-flex items-center gap-1.5 rounded-lg border border-border bg-surface-2 px-2 py-1 text-xs font-medium text-fg">
               <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M5 12h14" /><path d="M12 5v14" /></svg>
               {{ t('mStart') }}
             </span>
           </header>
 
           <!-- worktree : branche principale, session au repos -->
-          <div class="rounded border border-zinc-800 bg-zinc-900/40 p-2">
+          <div class="rounded border border-border bg-surface-1/40 p-2">
             <div class="flex items-center gap-2">
-              <span class="font-mono text-sm text-zinc-200">main</span>
-              <span class="inline-flex items-center rounded bg-zinc-800 px-1.5 py-0.5 text-[11px] font-medium text-zinc-400">{{ t('mMain') }}</span>
-              <span class="ml-auto text-xs text-zinc-600">{{ t('mClean') }}</span>
+              <span class="font-mono text-sm text-fg">main</span>
+              <span class="inline-flex items-center rounded bg-surface-2 px-1.5 py-0.5 text-[11px] font-medium text-fg-muted">{{ t('mMain') }}</span>
+              <span class="ml-auto text-xs text-fg-subtle">{{ t('mClean') }}</span>
             </div>
-            <p class="truncate font-mono text-xs text-zinc-500">~/code/arboretum</p>
+            <p class="truncate font-mono text-xs text-fg-subtle">~/code/arboretum</p>
             <div class="mt-1 flex items-center gap-2">
-              <span class="inline-flex items-center gap-1 rounded bg-zinc-800/60 px-1.5 py-0.5">
-                <span class="inline-flex items-center gap-1 rounded bg-emerald-950 px-1.5 py-0.5 text-[11px] font-medium text-emerald-400">
-                  <span class="h-1.5 w-1.5 rounded-full bg-emerald-400"></span>{{ t('idle') }}
+              <span class="inline-flex items-center gap-1 rounded bg-surface-2/60 px-1.5 py-0.5">
+                <span class="inline-flex items-center gap-1 rounded-full bg-accent/15 px-1.5 py-0.5 text-[11px] font-medium text-accent">
+                  <span class="h-1.5 w-1.5 rounded-full bg-accent"></span>{{ t('idle') }}
                 </span>
-                <span class="font-mono text-[11px] text-zinc-400">claude</span>
+                <span class="font-mono text-[11px] text-fg-muted">claude</span>
               </span>
             </div>
           </div>
 
           <!-- worktree : branche de feature, session occupée -->
-          <div class="rounded border border-zinc-800 bg-zinc-900/40 p-2">
+          <div class="rounded border border-border bg-surface-1/40 p-2">
             <div class="flex items-center gap-2">
-              <span class="font-mono text-sm text-zinc-200">feat/auth</span>
-              <span class="ml-auto flex items-center gap-2 text-xs text-zinc-500">
+              <span class="font-mono text-sm text-fg">feat/auth</span>
+              <span class="ml-auto flex items-center gap-2 text-xs text-fg-subtle">
                 <span>↑2</span>
-                <span class="text-amber-400">● {{ t('mDirty') }}</span>
+                <span class="text-warn">● {{ t('mDirty') }}</span>
               </span>
             </div>
-            <p class="truncate font-mono text-xs text-zinc-500">~/code/arboretum/.wt/feat-auth</p>
+            <p class="truncate font-mono text-xs text-fg-subtle">~/code/arboretum/.wt/feat-auth</p>
             <div class="mt-1 flex items-center gap-2">
-              <span class="inline-flex items-center gap-1 rounded bg-zinc-800/60 px-1.5 py-0.5">
-                <span class="inline-flex items-center gap-1 rounded bg-sky-950 px-1.5 py-0.5 text-[11px] font-medium text-sky-300">
-                  <span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-sky-300"></span>{{ t('busy') }}
+              <span class="inline-flex items-center gap-1 rounded bg-surface-2/60 px-1.5 py-0.5">
+                <span class="inline-flex items-center gap-1 rounded-full bg-info/15 px-1.5 py-0.5 text-[11px] font-medium text-info">
+                  <span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-info"></span>{{ t('busy') }}
                 </span>
-                <span class="font-mono text-[11px] text-zinc-400">claude</span>
+                <span class="font-mono text-[11px] text-fg-muted">claude</span>
               </span>
             </div>
-            <!-- actions git de la carte : commit / push (fidèle au WorktreeCard) -->
+            <!-- actions git de la carte : commit / push -->
             <div class="mt-1 flex items-center gap-1.5">
-              <span class="inline-flex items-center rounded border border-zinc-700 bg-zinc-800 px-1.5 py-0.5 text-[11px] font-medium text-zinc-300">{{ t('mCommit') }}</span>
-              <span class="inline-flex items-center rounded border border-zinc-700 bg-zinc-800 px-1.5 py-0.5 text-[11px] font-medium text-zinc-300">{{ t('mPush') }} ↑2</span>
+              <span class="inline-flex items-center rounded border border-border bg-surface-2 px-1.5 py-0.5 text-[11px] font-medium text-fg-muted">{{ t('mCommit') }}</span>
+              <span class="inline-flex items-center rounded border border-border bg-surface-2 px-1.5 py-0.5 text-[11px] font-medium text-fg-muted">{{ t('mPush') }} ↑2</span>
             </div>
           </div>
         </div>
       </div>
     </div>
 
-    <!-- b) grille multi-terminaux (fidèle à TerminalCell : badge d'état + titre repo · branche + commande) -->
+    <!-- b) grille multi-terminaux (badge d'état + titre repo · branche + commande) -->
     <div v-reveal class="flex flex-wrap-reverse items-center gap-12">
       <div class="min-w-[280px] flex-[1_1_440px]">
-        <div class="grid grid-cols-2 gap-2.5 overflow-hidden rounded-xl border border-zinc-800 bg-[#0c0c0e] p-3 shadow-card">
-          <div class="overflow-hidden rounded-lg border border-zinc-800 bg-[#09090b]">
-            <div class="flex items-center gap-2 border-b border-zinc-800 px-2 py-1.5">
-              <span class="inline-flex items-center gap-1 rounded bg-sky-950 px-1.5 py-0.5 text-[10px] font-medium text-sky-300"><span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-sky-300"></span>{{ t('busy') }}</span>
-              <span class="truncate font-mono text-[11px] text-zinc-300">api · feat/auth</span>
-              <span class="ml-auto shrink-0 font-mono text-[11px] text-zinc-500">claude</span>
+        <div class="grid grid-cols-2 gap-2.5 overflow-hidden rounded-xl border border-border bg-surface-1 p-3 shadow-card">
+          <div class="overflow-hidden rounded-lg border border-border bg-surface-0">
+            <div class="flex items-center gap-2 border-b border-border px-2 py-1.5">
+              <span class="inline-flex items-center gap-1 rounded-full bg-info/15 px-1.5 py-0.5 text-[10px] font-medium text-info"><span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-info"></span>{{ t('busy') }}</span>
+              <span class="truncate font-mono text-[11px] text-fg-muted">api · feat/auth</span>
+              <span class="ml-auto shrink-0 font-mono text-[11px] text-fg-subtle">claude</span>
             </div>
-            <div class="p-[11px] font-mono text-[11px] leading-[1.75] text-zinc-300">
-              <div class="text-emerald-400">● Edit session.ts</div>
-              <div class="text-emerald-400">+ const token = sign(...)</div>
-              <div class="text-red-400">- legacy cookie auth</div>
-              <div class="text-zinc-500">refactoring guards…</div>
+            <div class="p-[11px] font-mono text-[11px] leading-[1.75] text-fg-muted">
+              <div class="text-accent">● Edit session.ts</div>
+              <div class="text-accent">+ const token = sign(...)</div>
+              <div class="text-danger">- legacy cookie auth</div>
+              <div class="text-fg-subtle">refactoring guards…</div>
             </div>
           </div>
-          <div class="overflow-hidden rounded-lg border border-zinc-800 bg-[#09090b]">
-            <div class="flex items-center gap-2 border-b border-zinc-800 px-2 py-1.5">
-              <span class="inline-flex items-center gap-1 rounded bg-emerald-950 px-1.5 py-0.5 text-[10px] font-medium text-emerald-400"><span class="h-1.5 w-1.5 rounded-full bg-emerald-400"></span>{{ t('idle') }}</span>
-              <span class="truncate font-mono text-[11px] text-zinc-300">web · fix/cart</span>
-              <span class="ml-auto shrink-0 font-mono text-[11px] text-zinc-500">claude</span>
+          <div class="overflow-hidden rounded-lg border border-border bg-surface-0">
+            <div class="flex items-center gap-2 border-b border-border px-2 py-1.5">
+              <span class="inline-flex items-center gap-1 rounded-full bg-accent/15 px-1.5 py-0.5 text-[10px] font-medium text-accent"><span class="h-1.5 w-1.5 rounded-full bg-accent"></span>{{ t('idle') }}</span>
+              <span class="truncate font-mono text-[11px] text-fg-muted">web · fix/cart</span>
+              <span class="ml-auto shrink-0 font-mono text-[11px] text-fg-subtle">claude</span>
             </div>
-            <div class="p-[11px] font-mono text-[11px] leading-[1.75] text-zinc-300">
-              <div class="text-emerald-400">✓ all tests passing</div>
-              <div class="text-zinc-500">24 passed, 0 failed</div>
+            <div class="p-[11px] font-mono text-[11px] leading-[1.75] text-fg-muted">
+              <div class="text-accent">✓ all tests passing</div>
+              <div class="text-fg-subtle">24 passed, 0 failed</div>
               <div>
-                <span class="text-emerald-400">$</span>
-                <span class="ml-1 inline-block h-[11px] w-1.5 animate-blink align-middle bg-zinc-200"></span>
+                <span class="text-accent">$</span>
+                <span class="ml-1 inline-block h-[11px] w-1.5 animate-blink bg-fg align-middle"></span>
               </div>
             </div>
           </div>
-          <div class="overflow-hidden rounded-lg border border-zinc-800 bg-[#09090b]">
-            <div class="flex items-center gap-2 border-b border-zinc-800 px-2 py-1.5">
-              <span class="inline-flex items-center gap-1 rounded bg-sky-950 px-1.5 py-0.5 text-[10px] font-medium text-sky-300"><span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-sky-300"></span>{{ t('busy') }}</span>
-              <span class="truncate font-mono text-[11px] text-zinc-300">db · refactor</span>
-              <span class="ml-auto shrink-0 font-mono text-[11px] text-zinc-500">claude</span>
+          <div class="overflow-hidden rounded-lg border border-border bg-surface-0">
+            <div class="flex items-center gap-2 border-b border-border px-2 py-1.5">
+              <span class="inline-flex items-center gap-1 rounded-full bg-info/15 px-1.5 py-0.5 text-[10px] font-medium text-info"><span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-info"></span>{{ t('busy') }}</span>
+              <span class="truncate font-mono text-[11px] text-fg-muted">db · refactor</span>
+              <span class="ml-auto shrink-0 font-mono text-[11px] text-fg-subtle">claude</span>
             </div>
-            <div class="p-[11px] font-mono text-[11px] leading-[1.75] text-zinc-300">
-              <div class="text-emerald-400">● Write migration</div>
-              <div class="text-zinc-500">0003_add_index.sql</div>
-              <div class="text-zinc-500">applying to schema…</div>
+            <div class="p-[11px] font-mono text-[11px] leading-[1.75] text-fg-muted">
+              <div class="text-accent">● Write migration</div>
+              <div class="text-fg-subtle">0003_add_index.sql</div>
+              <div class="text-fg-subtle">applying to schema…</div>
             </div>
           </div>
-          <div class="overflow-hidden rounded-lg border border-zinc-800 bg-[#09090b]">
-            <div class="flex items-center gap-2 border-b border-zinc-800 px-2 py-1.5">
-              <span class="inline-flex items-center gap-1 rounded bg-amber-950 px-1.5 py-0.5 text-[10px] font-medium text-amber-300"><span class="h-1.5 w-1.5 animate-pulse-amber rounded-full bg-amber-300"></span>{{ t('waiting') }}</span>
-              <span class="truncate font-mono text-[11px] text-zinc-300">docs · api</span>
-              <span class="ml-auto shrink-0 font-mono text-[11px] text-zinc-500">claude</span>
+          <div class="overflow-hidden rounded-lg border border-border bg-surface-0">
+            <div class="flex items-center gap-2 border-b border-border px-2 py-1.5">
+              <span class="inline-flex items-center gap-1 rounded-full bg-warn/15 px-1.5 py-0.5 text-[10px] font-medium text-warn"><span class="h-1.5 w-1.5 animate-pulse-amber rounded-full bg-warn"></span>{{ t('waiting') }}</span>
+              <span class="truncate font-mono text-[11px] text-fg-muted">docs · api</span>
+              <span class="ml-auto shrink-0 font-mono text-[11px] text-fg-subtle">claude</span>
             </div>
-            <div class="p-[11px] font-mono text-[11px] leading-[1.75] text-zinc-300">
-              <div class="text-emerald-400">● Read README.md</div>
-              <div class="text-amber-300">Permission required</div>
-              <div class="text-zinc-500">waiting for input…</div>
+            <div class="p-[11px] font-mono text-[11px] leading-[1.75] text-fg-muted">
+              <div class="text-accent">● Read README.md</div>
+              <div class="text-warn">Permission required</div>
+              <div class="text-fg-subtle">waiting for input…</div>
             </div>
           </div>
         </div>
       </div>
       <div class="min-w-[280px] flex-[1_1_360px]">
-        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-emerald-400">{{ t('scBKicker') }}</div>
-        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,34px)] font-semibold leading-[1.15] tracking-[-0.025em] text-zinc-50">
+        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-accent">{{ t('scBKicker') }}</div>
+        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,34px)] font-semibold leading-[1.15] tracking-[-0.025em] text-fg">
           {{ t('scBTitle') }}
         </h2>
-        <p class="m-0 text-[16.5px] leading-[1.6] text-zinc-400">{{ t('scBBody') }}</p>
+        <p class="m-0 text-[16.5px] leading-[1.6] text-fg-muted">{{ t('scBBody') }}</p>
       </div>
     </div>
 
-    <!-- c) mobile : push + réponse au dialogue (fidèle à DialogPrompt) + barre d'onglets -->
+    <!-- c) mobile : push + réponse au dialogue + barre d'onglets -->
     <div v-reveal class="flex flex-wrap items-center gap-12">
       <div class="min-w-[280px] flex-[1_1_380px]">
-        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-emerald-400">{{ t('scCKicker') }}</div>
-        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,34px)] font-semibold leading-[1.15] tracking-[-0.025em] text-zinc-50">
+        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-accent">{{ t('scCKicker') }}</div>
+        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,34px)] font-semibold leading-[1.15] tracking-[-0.025em] text-fg">
           {{ t('scCTitle') }}
         </h2>
-        <p class="m-0 text-[16.5px] leading-[1.6] text-zinc-400">{{ t('scCBody') }}</p>
+        <p class="m-0 text-[16.5px] leading-[1.6] text-fg-muted">{{ t('scCBody') }}</p>
       </div>
       <div class="flex min-w-[280px] flex-[1_1_320px] justify-center">
-        <div class="relative w-[300px] overflow-hidden rounded-[40px] border-[9px] border-zinc-900 bg-zinc-950 shadow-phone">
+        <div class="relative w-[300px] overflow-hidden rounded-[40px] border-[9px] border-surface-1 bg-surface-0 shadow-phone">
           <div class="flex h-[30px] items-center justify-center">
-            <div class="h-1.5 w-[90px] rounded-full bg-zinc-800"></div>
+            <div class="h-1.5 w-[90px] rounded-full bg-surface-2"></div>
           </div>
           <div class="px-3 pb-[64px]">
             <!-- toast push -->
-            <div class="flex items-start gap-[11px] rounded-[15px] border border-[rgba(120,53,15,0.5)] bg-[#0c0c0e] p-[13px] shadow-toast-sm">
-              <span class="inline-flex h-[30px] w-[30px] flex-none items-center justify-center rounded-lg bg-emerald-500/[0.14]">
+            <div class="flex items-start gap-[11px] rounded-[15px] border border-border bg-surface-1 p-[13px] shadow-toast-sm">
+              <span class="inline-flex h-[30px] w-[30px] flex-none items-center justify-center rounded-lg bg-accent/15">
                 <img src="/assets/arboretum-mark.png" alt="" width="18" height="18" class="h-[18px] w-[18px] object-contain" />
               </span>
               <div class="min-w-0 flex-1">
                 <div class="flex items-center justify-between">
-                  <span class="font-mono text-[11px] text-emerald-400">Arboretum</span>
-                  <span class="text-[10px] text-zinc-600">now</span>
+                  <span class="font-mono text-[11px] text-accent">Arboretum</span>
+                  <span class="text-[10px] text-fg-subtle">now</span>
                 </div>
-                <div class="mt-[3px] text-[13.5px] font-semibold text-zinc-50">{{ t('toastTitle') }}</div>
-                <div class="text-xs leading-[1.45] text-zinc-400">{{ t('toastBody') }}</div>
+                <div class="mt-[3px] text-[13.5px] font-semibold text-fg">{{ t('toastTitle') }}</div>
+                <div class="text-xs leading-[1.45] text-fg-muted">{{ t('toastBody') }}</div>
               </div>
             </div>
 
             <!-- carte « À traiter » + DialogPrompt -->
-            <div class="mt-[14px] flex flex-col gap-2 rounded-[15px] border border-amber-900/50 bg-amber-950/20 p-2.5">
+            <div class="mt-[14px] flex flex-col gap-2 rounded-[15px] border border-warn/40 bg-warn/10 p-2.5">
               <div class="flex items-center gap-2">
-                <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="#fbbf24" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z" /><path d="M12 9v4" /><path d="M12 17h.01" /></svg>
-                <span class="text-[13px] font-semibold text-amber-200">{{ t('mAttn') }}</span>
-                <span class="rounded-full bg-amber-500/20 px-1.5 text-[11px] font-semibold text-amber-300">1</span>
+                <svg width="15" height="15" viewBox="0 0 24 24" fill="none" stroke="var(--color-warn)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z" /><path d="M12 9v4" /><path d="M12 17h.01" /></svg>
+                <span class="text-[13px] font-semibold text-warn">{{ t('mAttn') }}</span>
+                <span class="rounded-full bg-warn/20 px-1.5 text-[11px] font-semibold text-warn">1</span>
               </div>
-              <span class="font-mono text-[11px] text-amber-300/80">api · feat/auth</span>
-              <div class="rounded-lg border border-amber-900/60 bg-amber-950/30 p-2.5">
-                <span class="inline-flex items-center rounded bg-amber-900 px-1.5 py-0.5 text-[11px] font-medium text-amber-200">{{ t('mPermission') }}</span>
-                <div class="mt-1.5 text-[13px] leading-[1.4] text-amber-100">{{ t('dlgQ') }}</div>
+              <span class="font-mono text-[11px] text-warn/80">api · feat/auth</span>
+              <div class="rounded-lg border border-warn/40 bg-warn/10 p-2.5">
+                <span class="inline-flex items-center rounded-full bg-warn/15 px-1.5 py-0.5 font-mono text-[11px] text-warn">{{ t('mPermission') }}</span>
+                <div class="mt-1.5 text-[13px] leading-[1.4] text-fg">{{ t('dlgQ') }}</div>
                 <div class="mt-2 flex flex-col gap-1.5">
                   <span
                     v-for="(op, i) in dlgOpts"
                     :key="i"
-                    class="flex items-center gap-2 rounded-lg border border-zinc-700 bg-zinc-800 px-2.5 py-2 text-[13px] font-medium text-zinc-200"
+                    class="flex items-center gap-2 rounded-lg border border-border bg-surface-2 px-2.5 py-2 text-[13px] font-medium text-fg"
                   >
-                    <span class="font-mono text-amber-400">{{ i + 1 }}</span> {{ op }}
+                    <span class="font-mono text-warn">{{ i + 1 }}</span> {{ op }}
                   </span>
-                  <span class="rounded-lg border border-red-900 bg-red-950 px-2.5 py-2 text-center text-[13px] font-medium text-red-300">{{ t('mDeny') }}</span>
+                  <span class="rounded-lg border border-danger/40 bg-danger/10 px-2.5 py-2 text-center text-[13px] font-medium text-danger">{{ t('mDeny') }}</span>
                 </div>
               </div>
             </div>
           </div>
 
-          <!-- barre d'onglets mobile (fidèle à MobileTabBar) -->
-          <div class="absolute inset-x-0 bottom-0 flex border-t border-zinc-800 bg-zinc-950/95 backdrop-blur">
-            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-zinc-500">
-              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="18" x="3" y="3" rx="2" /><path d="M3 9h18" /><path d="M9 21V9" /></svg>
-              <span class="text-[10px]">{{ t('mIde') }}</span>
+          <!-- barre d'onglets mobile (fidèle a IdeShell : explorer / editor / terminal / git / sessions / groups) -->
+          <div class="absolute inset-x-0 bottom-0 flex border-t border-border bg-surface-0/95 backdrop-blur">
+            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-fg-subtle">
+              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><rect width="18" height="18" x="3" y="3" rx="2" /><path d="M3 9h18" /><path d="M9 21V9" /></svg>
+              <span class="text-[9px]">{{ t('mExplorer') }}</span>
             </div>
-            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-zinc-500">
-              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="6" x2="6" y1="3" y2="15" /><circle cx="18" cy="6" r="3" /><circle cx="6" cy="18" r="3" /><path d="M18 9a9 9 0 0 1-9 9" /></svg>
-              <span class="text-[10px]">{{ t('mWorktrees') }}</span>
+            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-fg-subtle">
+              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M15 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V7Z" /><path d="M14 2v5h5" /><path d="m10 13-2 2 2 2" /><path d="m14 17 2-2-2-2" /></svg>
+              <span class="text-[9px]">{{ t('mEditor') }}</span>
             </div>
-            <div class="relative flex flex-1 flex-col items-center gap-0.5 py-2 text-emerald-400">
+            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-fg-subtle">
+              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m7 11 2-2-2-2" /><path d="M11 13h4" /><rect width="18" height="18" x="3" y="3" rx="2" /></svg>
+              <span class="text-[9px]">{{ t('mTerminal') }}</span>
+            </div>
+            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-fg-subtle">
+              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><circle cx="18" cy="18" r="3" /><circle cx="6" cy="6" r="3" /><path d="M13 6h3a2 2 0 0 1 2 2v7" /><path d="M11 18H8a2 2 0 0 1-2-2V9" /></svg>
+              <span class="text-[9px]">{{ t('mGit') }}</span>
+            </div>
+            <div class="relative flex flex-1 flex-col items-center gap-0.5 py-2 text-accent">
               <span class="relative">
-                <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m7 11 2-2-2-2" /><path d="M11 13h4" /><rect width="18" height="18" x="3" y="3" rx="2" ry="2" /></svg>
-                <span class="absolute -right-1.5 -top-1.5 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-amber-500 px-1 text-[9px] font-semibold text-amber-950">1</span>
+                <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M22 12h-4l-3 9L9 3l-3 9H2" /></svg>
+                <span class="absolute -top-1.5 -right-1.5 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-warn px-1 text-[9px] font-semibold text-zinc-950">1</span>
               </span>
-              <span class="text-[10px]">{{ t('mSessions') }}</span>
+              <span class="text-[9px]">{{ t('mSessions') }}</span>
             </div>
-            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-zinc-500">
-              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.97 12.92A2 2 0 0 0 2 14.63v3.24a2 2 0 0 0 .97 1.71l3 1.8a2 2 0 0 0 2.06 0L12 19v-5.5l-5-3-4.03 2.42Z" /><path d="M7 16.5 12 13.5" /><path d="M12 13.5V19l3.97 2.38a2 2 0 0 0 2.06 0l3-1.8a2 2 0 0 0 .97-1.71v-3.24a2 2 0 0 0-.97-1.71L17 10.5l-5 3Z" /><path d="m17 16.5 4.74-2.85" /><path d="M7.97 4.42A2 2 0 0 0 7 6.13v4.37l5 3 5-3V6.13a2 2 0 0 0-.97-1.71l-3-1.8a2 2 0 0 0-2.06 0z" /></svg>
-              <span class="text-[10px]">{{ t('mGroups') }}</span>
-            </div>
-            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-zinc-500">
-              <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="4" x2="20" y1="12" y2="12" /><line x1="4" x2="20" y1="6" y2="6" /><line x1="4" x2="20" y1="18" y2="18" /></svg>
-              <span class="text-[10px]">{{ t('mMore') }}</span>
+            <div class="flex flex-1 flex-col items-center gap-0.5 py-2 text-fg-subtle">
+              <svg width="17" height="17" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.97 12.92A2 2 0 0 0 2 14.63v3.24a2 2 0 0 0 .97 1.71l3 1.8a2 2 0 0 0 2.06 0L12 19v-5.5l-5-3-4.03 2.42Z" /><path d="M7 16.5 12 13.5" /><path d="M12 13.5V19l3.97 2.38a2 2 0 0 0 2.06 0l3-1.8a2 2 0 0 0 .97-1.71v-3.24a2 2 0 0 0-.97-1.71L17 10.5l-5 3Z" /><path d="m17 16.5 4.74-2.85" /><path d="M7.97 4.42A2 2 0 0 0 7 6.13v4.37l5 3 5-3V6.13a2 2 0 0 0-.97-1.71l-3-1.8a2 2 0 0 0-2.06 0z" /></svg>
+              <span class="text-[9px]">{{ t('mGroups') }}</span>
             </div>
           </div>
         </div>

packages/site/src/components/ThemeToggle.vue

@@ -0,0 +1,64 @@
+<script setup lang="ts">
+// Bascule de thème du site (dark -> light -> system), alignée sur l'app.
+import { useI18n } from 'vue-i18n';
+import { themeMode, cycleTheme } from '../lib/theme';
+
+const { t } = useI18n();
+</script>
+
+<template>
+  <button
+    type="button"
+    class="inline-flex h-9 w-9 items-center justify-center rounded-lg border border-border text-fg-muted transition-colors hover:border-accent hover:text-accent"
+    :title="t('themeToggle')"
+    :aria-label="t('themeToggle')"
+    @click="cycleTheme()"
+  >
+    <!-- soleil (clair) -->
+    <svg
+      v-if="themeMode === 'light'"
+      viewBox="0 0 24 24"
+      width="17"
+      height="17"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="1.8"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    >
+      <circle cx="12" cy="12" r="4" />
+      <path
+        d="M12 2v2M12 20v2M4.93 4.93l1.41 1.41M17.66 17.66l1.41 1.41M2 12h2M20 12h2M4.93 19.07l1.41-1.41M17.66 6.34l1.41-1.41"
+      />
+    </svg>
+    <!-- écran (système) -->
+    <svg
+      v-else-if="themeMode === 'system'"
+      viewBox="0 0 24 24"
+      width="17"
+      height="17"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="1.8"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    >
+      <rect x="2" y="3" width="20" height="14" rx="2" />
+      <path d="M8 21h8M12 17v4" />
+    </svg>
+    <!-- lune (sombre) -->
+    <svg
+      v-else
+      viewBox="0 0 24 24"
+      width="17"
+      height="17"
+      fill="none"
+      stroke="currentColor"
+      stroke-width="1.8"
+      stroke-linecap="round"
+      stroke-linejoin="round"
+    >
+      <path d="M21 12.79A9 9 0 1 1 11.21 3 7 7 0 0 0 21 12.79Z" />
+    </svg>
+  </button>
+</template>

packages/site/src/components/WorkGroupsSection.vue

@@ -7,45 +7,45 @@ const { t } = useI18n();
   <section class="mx-auto max-w-[1200px] scroll-mt-[84px] px-6 py-[92px]">
     <div
       v-reveal
-      class="flex flex-wrap items-center gap-12 rounded-[18px] border border-zinc-800 p-[clamp(28px,4vw,52px)]"
-      style="background: linear-gradient(180deg, rgba(24, 24, 27, 0.55), rgba(12, 12, 14, 0.55))"
+      class="flex flex-wrap items-center gap-12 rounded-[18px] border border-border p-[clamp(28px,4vw,52px)]"
+      style="background: linear-gradient(180deg, color-mix(in srgb, var(--color-surface-1) 55%, transparent), color-mix(in srgb, var(--color-surface-0) 55%, transparent))"
     >
       <div class="min-w-[280px] flex-[1_1_360px]">
-        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-emerald-400">{{ t('grpKicker') }}</div>
-        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,36px)] font-semibold leading-[1.15] tracking-[-0.025em] text-zinc-50">
+        <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-accent">{{ t('grpKicker') }}</div>
+        <h2 class="m-0 mb-4 text-[clamp(26px,3vw,36px)] font-semibold leading-[1.15] tracking-[-0.025em] text-fg">
           {{ t('grpTitle') }}
         </h2>
-        <p class="m-0 text-[16.5px] leading-[1.6] text-zinc-400">{{ t('grpBody') }}</p>
+        <p class="m-0 text-[16.5px] leading-[1.6] text-fg-muted">{{ t('grpBody') }}</p>
       </div>
       <div class="flex min-w-[280px] flex-[1_1_360px] justify-center">
         <div class="flex w-full max-w-[380px] items-center">
           <div class="flex flex-none flex-col items-center gap-2">
             <div
-              class="inline-flex h-[62px] w-[62px] items-center justify-center rounded-[15px] border border-emerald-500/35 bg-emerald-500/[0.12] text-emerald-400"
+              class="inline-flex h-[62px] w-[62px] items-center justify-center rounded-[15px] border border-accent/35 bg-accent/[0.12] text-accent"
             >
               <svg width="26" height="26" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.7" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M2.97 12.92A2 2 0 0 0 2 14.63v3.24a2 2 0 0 0 .97 1.71l3 1.8a2 2 0 0 0 2.06 0L12 19v-5.5l-5-3-4.03 2.42Z" /><path d="M7 16.5 12 13.5" /><path d="M12 13.5V19l3.97 2.38a2 2 0 0 0 2.06 0l3-1.8a2 2 0 0 0 .97-1.71v-3.24a2 2 0 0 0-.97-1.71L17 10.5l-5 3Z" /><path d="m17 16.5 4.74-2.85" /><path d="M7.97 4.42A2 2 0 0 0 7 6.13v4.37l5 3 5-3V6.13a2 2 0 0 0-.97-1.71l-3-1.8a2 2 0 0 0-2.06 0z" /></svg>
             </div>
-            <span class="font-mono text-[11px] text-zinc-300">{{ t('grpHub') }}</span>
+            <span class="font-mono text-[11px] text-fg-muted">{{ t('grpHub') }}</span>
           </div>
           <div class="relative h-[96px] flex-1">
             <svg width="100%" height="100%" viewBox="0 0 100 96" preserveAspectRatio="none" class="absolute inset-0" aria-hidden="true">
-              <path d="M0 48 H40 V14 H100" fill="none" stroke="rgba(16,185,129,.45)" stroke-width="1.4" />
-              <path d="M0 48 H40 V48 H100" fill="none" stroke="rgba(16,185,129,.45)" stroke-width="1.4" />
-              <path d="M0 48 H40 V82 H100" fill="none" stroke="rgba(16,185,129,.45)" stroke-width="1.4" />
+              <path d="M0 48 H40 V14 H100" fill="none" stroke="var(--color-accent)" stroke-width="1.4" />
+              <path d="M0 48 H40 V48 H100" fill="none" stroke="var(--color-accent)" stroke-width="1.4" />
+              <path d="M0 48 H40 V82 H100" fill="none" stroke="var(--color-accent)" stroke-width="1.4" />
             </svg>
           </div>
           <div class="flex flex-none flex-col gap-2.5">
-            <div class="flex items-center gap-2 rounded-lg border border-zinc-800 bg-[#0c0c0e] px-3 py-2">
-              <span class="h-1.5 w-1.5 rounded-full bg-sky-300"></span>
-              <span class="font-mono text-[11px] text-zinc-300">api</span>
+            <div class="flex items-center gap-2 rounded-lg border border-border bg-surface-0 px-3 py-2">
+              <span class="h-1.5 w-1.5 rounded-full bg-info"></span>
+              <span class="font-mono text-[11px] text-fg-muted">api</span>
             </div>
-            <div class="flex items-center gap-2 rounded-lg border border-zinc-800 bg-[#0c0c0e] px-3 py-2">
-              <span class="h-1.5 w-1.5 rounded-full bg-sky-300"></span>
-              <span class="font-mono text-[11px] text-zinc-300">web</span>
+            <div class="flex items-center gap-2 rounded-lg border border-border bg-surface-0 px-3 py-2">
+              <span class="h-1.5 w-1.5 rounded-full bg-info"></span>
+              <span class="font-mono text-[11px] text-fg-muted">web</span>
             </div>
-            <div class="flex items-center gap-2 rounded-lg border border-zinc-800 bg-[#0c0c0e] px-3 py-2">
-              <span class="h-1.5 w-1.5 rounded-full bg-sky-300"></span>
-              <span class="font-mono text-[11px] text-zinc-300">sdk</span>
+            <div class="flex items-center gap-2 rounded-lg border border-border bg-surface-0 px-3 py-2">
+              <span class="h-1.5 w-1.5 rounded-full bg-info"></span>
+              <span class="font-mono text-[11px] text-fg-muted">sdk</span>
             </div>
           </div>
         </div>

packages/site/src/components/WorkspaceShowcase.vue

@@ -3,7 +3,7 @@ import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 
-// Lignes du diff (fidele a DiffViewer : add -> emerald-950/40, del -> rose-950/40).
+// Lignes du diff (fidèle a DiffViewer : fond teinté add/del, texte neutre).
 type DiffLine = { o: string; n: string; type: 'ctx' | 'add' | 'del' | 'hunk'; text: string };
 const diffLines: DiffLine[] = [
   { o: '', n: '', type: 'hunk', text: '@@ -12,7 +12,9 @@ export function session(' },
@@ -16,9 +16,9 @@ const diffLines: DiffLine[] = [
 ];
 
 function rowClass(type: DiffLine['type']): string {
-  if (type === 'add') return 'bg-emerald-950/40 text-emerald-200';
-  if (type === 'del') return 'bg-rose-950/40 text-rose-200';
-  return 'text-zinc-300';
+  if (type === 'add') return 'diff-add';
+  if (type === 'del') return 'diff-del';
+  return 'diff-ctx';
 }
 function marker(type: DiffLine['type']): string {
   return type === 'add' ? '+' : type === 'del' ? '-' : ' ';
@@ -28,30 +28,31 @@ function marker(type: DiffLine['type']): string {
 <template>
   <section id="workspace" class="mx-auto max-w-[1200px] scroll-mt-[84px] px-6 pb-[100px]">
     <div v-reveal class="mb-[40px] max-w-[760px]">
-      <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-emerald-400">{{ t('wsKicker') }}</div>
-      <h2 class="m-0 mb-4 text-[clamp(26px,3vw,38px)] font-semibold leading-[1.15] tracking-[-0.025em] text-zinc-50">
+      <div class="mb-3 font-mono text-xs uppercase tracking-[0.12em] text-accent">{{ t('wsKicker') }}</div>
+      <h2 class="m-0 mb-4 text-[clamp(26px,3vw,38px)] font-semibold leading-[1.15] tracking-[-0.025em] text-fg">
         {{ t('wsTitle') }}
       </h2>
-      <p class="m-0 text-[16.5px] leading-[1.6] text-zinc-400">{{ t('wsBody') }}</p>
+      <p class="m-0 text-[16.5px] leading-[1.6] text-fg-muted">{{ t('wsBody') }}</p>
     </div>
 
     <!-- maquette IDE multi-projet : barre d'activite, arbre unifie, onglets d'editeur, dock bas -->
-    <div v-reveal class="overflow-hidden rounded-[14px] border border-zinc-800 bg-[#09090b] shadow-card">
+    <div v-reveal class="overflow-hidden rounded-[14px] border border-border bg-surface-0 shadow-card">
       <!-- barre superieure -->
-      <header class="flex items-center gap-3 border-b border-zinc-800 px-3 py-2">
-        <span class="flex items-center gap-2 text-sm font-medium text-zinc-200">
+      <header class="flex items-center gap-3 border-b border-border px-3 py-2">
+        <span class="flex items-center gap-2 text-sm font-medium text-fg">
           <img src="/assets/arboretum-mark.png" alt="" width="16" height="16" class="h-4 w-4 object-contain" />
           Arboretum
         </span>
-        <span class="ml-auto flex items-center gap-1.5 text-[11px] text-zinc-500">
-          <span class="h-1.5 w-1.5 rounded-full bg-amber-400"></span>{{ t('waiting') }}
+        <span class="ml-auto flex items-center gap-1.5 text-[11px] text-fg-subtle">
+          <span class="h-1.5 w-1.5 rounded-full bg-warn"></span>{{ t('waiting') }}
         </span>
       </header>
 
       <div class="flex">
         <!-- barre d'activite -->
-        <nav class="flex w-11 flex-none flex-col items-center gap-1 border-r border-zinc-800 bg-zinc-900/50 py-2 text-zinc-500">
-          <span class="flex h-9 w-9 items-center justify-center rounded-lg bg-zinc-700 text-zinc-100" :title="t('wsFiles')">
+        <nav class="flex w-11 flex-none flex-col items-center gap-1 border-r border-border bg-surface-1 py-2 text-fg-subtle">
+          <span class="relative flex h-9 w-9 items-center justify-center rounded-lg bg-surface-2 text-accent" :title="t('wsFiles')">
+            <span class="absolute top-1/2 left-0 h-5 w-0.5 -translate-y-1/2 rounded-full bg-accent"></span>
             <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 10a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-2.5a1 1 0 0 1-.8-.4l-.9-1.2A1 1 0 0 0 14 3h-3a1 1 0 0 0-1 1v5a1 1 0 0 0 1 1Z" /><path d="M3 5a2 2 0 0 0 2 2h3" /><path d="M3 3v13a2 2 0 0 0 2 2h3" /></svg>
           </span>
           <span class="flex h-9 w-9 items-center justify-center rounded-lg" :title="t('wsChanges')">
@@ -63,39 +64,39 @@ function marker(type: DiffLine['type']): string {
         </nav>
 
         <!-- arbre unifie : plusieurs projets a la fois -->
-        <aside class="hidden w-[248px] flex-none flex-col border-r border-zinc-800 md:flex">
-          <div class="px-3 py-2 text-[11px] font-semibold uppercase tracking-wide text-zinc-500">Projects</div>
+        <aside class="hidden w-[248px] flex-none flex-col border-r border-border md:flex">
+          <div class="label-mono px-3 py-2">Projects</div>
           <div class="px-1 pb-2 font-mono text-xs">
             <!-- projet api (ouvert) -->
-            <div class="flex items-center gap-1 rounded py-0.5 pl-1.5 pr-2 text-zinc-200">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-zinc-500" aria-hidden="true"><path d="m6 9 6 6 6-6" /></svg>
+            <div class="flex items-center gap-1 rounded py-0.5 pr-2 pl-1.5 text-fg">
+              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-fg-subtle" aria-hidden="true"><path d="m6 9 6 6 6-6" /></svg>
               <span class="font-medium">api</span>
             </div>
             <!-- worktree feat/auth (actif) -->
-            <div class="flex items-center gap-1 rounded bg-zinc-800/70 py-0.5 pl-[18px] pr-2 text-zinc-100">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-zinc-500" aria-hidden="true"><path d="m6 9 6 6 6-6" /></svg>
-              <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-zinc-500" aria-hidden="true"><line x1="6" x2="6" y1="3" y2="15" /><circle cx="18" cy="6" r="3" /><circle cx="6" cy="18" r="3" /><path d="M18 9a9 9 0 0 1-9 9" /></svg>
-              <span class="truncate">feat/auth</span>
+            <div class="flex items-center gap-1 rounded bg-surface-2 py-0.5 pr-2 pl-[18px] text-fg">
+              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-fg-subtle" aria-hidden="true"><path d="m6 9 6 6 6-6" /></svg>
+              <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="var(--color-accent)" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0" aria-hidden="true"><line x1="6" x2="6" y1="3" y2="15" /><circle cx="18" cy="6" r="3" /><circle cx="6" cy="18" r="3" /><path d="M18 9a9 9 0 0 1-9 9" /></svg>
+              <span class="truncate text-accent">feat/auth</span>
             </div>
             <!-- session claude corrélée -->
-            <div class="flex items-center gap-1.5 rounded py-0.5 pl-[38px] pr-2 text-zinc-300">
-              <span class="inline-flex items-center gap-1 rounded bg-sky-950 px-1.5 py-[1px] text-[10px] text-sky-300"><span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-sky-300"></span>{{ t('busy') }}</span>
+            <div class="flex items-center gap-1.5 rounded py-0.5 pr-2 pl-[38px] text-fg-muted">
+              <span class="inline-flex items-center gap-1 rounded-full bg-info/15 px-1.5 py-[1px] text-[10px] text-info"><span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-info"></span>{{ t('busy') }}</span>
               <span class="truncate">claude</span>
             </div>
             <!-- fichiers du worktree -->
-            <div class="flex items-center justify-between gap-1 rounded bg-zinc-800 py-0.5 pl-[30px] pr-2 text-zinc-100">
-              <span class="truncate">session.ts</span><span class="font-bold text-amber-400">M</span>
+            <div class="flex items-center justify-between gap-1 rounded bg-surface-2 py-0.5 pr-2 pl-[30px] text-fg">
+              <span class="truncate">session.ts</span><span class="font-bold text-warn">M</span>
             </div>
-            <div class="flex items-center justify-between gap-1 rounded py-0.5 pl-[30px] pr-2 text-zinc-300">
-              <span class="truncate">token.ts</span><span class="font-bold text-emerald-400">A</span>
+            <div class="flex items-center justify-between gap-1 rounded py-0.5 pr-2 pl-[30px] text-fg-muted">
+              <span class="truncate">token.ts</span><span class="font-bold text-accent">A</span>
             </div>
             <!-- projet web (replie) -->
-            <div class="flex items-center gap-1 rounded py-0.5 pl-1.5 pr-2 text-zinc-300">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-zinc-500" aria-hidden="true"><path d="m9 18 6-6-6-6" /></svg>
+            <div class="flex items-center gap-1 rounded py-0.5 pr-2 pl-1.5 text-fg-muted">
+              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-fg-subtle" aria-hidden="true"><path d="m9 18 6-6-6-6" /></svg>
               <span class="font-medium">web</span>
             </div>
-            <div class="flex items-center gap-1 rounded py-0.5 pl-1.5 pr-2 text-zinc-300">
-              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-zinc-500" aria-hidden="true"><path d="m9 18 6-6-6-6" /></svg>
+            <div class="flex items-center gap-1 rounded py-0.5 pr-2 pl-1.5 text-fg-muted">
+              <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="shrink-0 text-fg-subtle" aria-hidden="true"><path d="m9 18 6-6-6-6" /></svg>
               <span class="font-medium">docs</span>
             </div>
           </div>
@@ -104,21 +105,21 @@ function marker(type: DiffLine['type']): string {
         <!-- centre : onglets d'editeur + diff + dock terminaux -->
         <main class="flex min-w-0 flex-1 flex-col">
           <!-- onglets d'editeur (plusieurs fichiers, potentiellement de projets differents) -->
-          <div class="flex items-stretch overflow-x-auto border-b border-zinc-800 text-xs">
-            <span class="flex items-center gap-1.5 border-r border-zinc-800 bg-[#09090b] px-3 py-1.5 text-zinc-100">
-              session.ts <span class="h-1.5 w-1.5 rounded-full bg-amber-400"></span>
+          <div class="flex items-stretch overflow-x-auto border-b border-border text-xs">
+            <span class="flex items-center gap-1.5 border-r border-border bg-surface-0 px-3 py-1.5 text-fg">
+              session.ts <span class="h-1.5 w-1.5 rounded-full bg-warn"></span>
             </span>
-            <span class="flex items-center gap-1.5 border-r border-zinc-800 px-3 py-1.5 text-zinc-400">token.ts</span>
-            <span class="flex items-center gap-1.5 border-r border-zinc-800 px-3 py-1.5 text-zinc-500">app.vue</span>
+            <span class="flex items-center gap-1.5 border-r border-border px-3 py-1.5 text-fg-muted">token.ts</span>
+            <span class="flex items-center gap-1.5 border-r border-border px-3 py-1.5 text-fg-subtle">app.vue</span>
           </div>
           <!-- barre : bascule Editor/Diff + chemin -->
-          <div class="flex items-center gap-2 border-b border-zinc-800 px-2 py-1">
-            <div class="inline-flex rounded-lg border border-zinc-800 bg-zinc-950/40 p-0.5">
-              <span class="rounded-md px-2.5 py-1 text-xs font-medium text-zinc-400">{{ t('wsEditor') }}</span>
-              <span class="rounded-md bg-zinc-800 px-2.5 py-1 text-xs font-medium text-zinc-100">{{ t('wsDiff') }}</span>
+          <div class="flex items-center gap-2 border-b border-border px-2 py-1">
+            <div class="inline-flex rounded-lg border border-border bg-surface-0/40 p-0.5">
+              <span class="rounded-[9px] px-2.5 py-1 text-xs font-medium text-fg-muted">{{ t('wsEditor') }}</span>
+              <span class="rounded-[9px] bg-surface-2 px-2.5 py-1 text-xs font-medium text-fg">{{ t('wsDiff') }}</span>
             </div>
-            <span class="truncate font-mono text-[11px] text-zinc-500">api · src/core/session.ts</span>
-            <span class="ml-auto inline-flex items-center gap-1.5 rounded-md bg-emerald-500 px-2.5 py-1 text-xs font-semibold text-emerald-950">
+            <span class="truncate font-mono text-[11px] text-fg-subtle">api · src/core/session.ts</span>
+            <span class="ml-auto inline-flex items-center gap-1.5 rounded-[9px] bg-accent-solid px-2.5 py-1 text-xs font-semibold text-white">
               <svg width="13" height="13" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.4" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="M20 6 9 17l-5-5" /></svg>
               {{ t('wsCommitBtn') }}
             </span>
@@ -127,46 +128,46 @@ function marker(type: DiffLine['type']): string {
           <div class="overflow-x-auto">
             <table class="w-full border-collapse font-mono text-xs leading-5">
               <tbody>
-                <tr v-for="(l, i) in diffLines" :key="i" :class="l.type === 'hunk' ? 'bg-zinc-900/60 text-sky-300/80' : rowClass(l.type)">
-                  <td class="w-10 select-none px-2 text-right text-zinc-600">{{ l.o }}</td>
-                  <td class="w-10 select-none px-2 text-right text-zinc-600">{{ l.n }}</td>
-                  <td class="whitespace-pre px-2">{{ l.type === 'hunk' ? l.text : marker(l.type) + l.text }}</td>
+                <tr v-for="(l, i) in diffLines" :key="i" :class="l.type === 'hunk' ? 'bg-surface-1/60 text-info/80' : rowClass(l.type)">
+                  <td class="w-10 px-2 text-right text-fg-subtle select-none">{{ l.o }}</td>
+                  <td class="w-10 px-2 text-right text-fg-subtle select-none">{{ l.n }}</td>
+                  <td class="px-2 whitespace-pre">{{ l.type === 'hunk' ? l.text : marker(l.type) + l.text }}</td>
                 </tr>
               </tbody>
             </table>
           </div>
 
           <!-- dock terminaux en bas (onglets par session) -->
-          <div class="border-t border-zinc-800">
-            <div class="flex items-stretch border-b border-zinc-800 text-[11px]">
-              <span class="flex items-center gap-1 px-2 py-1.5 font-semibold uppercase tracking-wide text-zinc-500">
+          <div class="border-t border-border">
+            <div class="flex items-stretch border-b border-border text-[11px]">
+              <span class="label-mono flex items-center gap-1 px-2 py-1.5">
                 <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><path d="m7 11 2-2-2-2" /><path d="M11 13h4" /><rect width="18" height="18" x="3" y="3" rx="2" /></svg>
                 {{ t('wsTerminal') }}
               </span>
-              <span class="flex items-center gap-1.5 border-l border-zinc-800 bg-[#09090b] px-2.5 py-1.5 font-mono text-zinc-100">
-                <span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-sky-300"></span>api · feat/auth
+              <span class="flex items-center gap-1.5 border-l border-border bg-surface-0 px-2.5 py-1.5 font-mono text-fg">
+                <span class="h-1.5 w-1.5 animate-pulse-sky rounded-full bg-info"></span>api · feat/auth
               </span>
-              <span class="flex items-center gap-1.5 border-l border-zinc-800 px-2.5 py-1.5 font-mono text-zinc-400">web · main</span>
+              <span class="flex items-center gap-1.5 border-l border-border px-2.5 py-1.5 font-mono text-fg-muted">web · main</span>
             </div>
-            <div class="min-h-[112px] p-[11px] font-mono text-[11px] leading-[1.7] text-zinc-300">
-              <div class="text-emerald-400">● Edit session.ts</div>
-              <div class="text-emerald-400">+ const token = sign(...)</div>
-              <div class="text-zinc-500">running tests…</div>
-              <div class="text-emerald-400">✓ 24 passed</div>
-              <div><span class="text-emerald-400">$</span><span class="ml-1 inline-block h-[11px] w-1.5 animate-blink align-middle bg-zinc-200"></span></div>
+            <div class="min-h-[112px] p-[11px] font-mono text-[11px] leading-[1.7] text-fg-muted">
+              <div class="text-accent">● Edit session.ts</div>
+              <div class="text-accent">+ const token = sign(...)</div>
+              <div class="text-fg-subtle">running tests…</div>
+              <div class="text-accent">✓ 24 passed</div>
+              <div><span class="text-accent">$</span><span class="ml-1 inline-block h-[11px] w-1.5 animate-blink bg-fg align-middle"></span></div>
             </div>
           </div>
         </main>
       </div>
 
       <!-- barre de statut -->
-      <footer class="flex items-center gap-3 border-t border-zinc-800 px-3 py-1 text-[11px] text-zinc-500">
-        <span class="flex items-center gap-1 font-mono text-zinc-400">
+      <footer class="flex items-center gap-3 border-t border-border px-3 py-1 text-[11px] text-fg-subtle">
+        <span class="flex items-center gap-1 font-mono text-fg-muted">
           <svg width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" aria-hidden="true"><line x1="6" x2="6" y1="3" y2="15" /><circle cx="18" cy="6" r="3" /><circle cx="6" cy="18" r="3" /><path d="M18 9a9 9 0 0 1-9 9" /></svg>
           feat/auth
         </span>
-        <span class="text-emerald-400">↑2</span>
-        <span class="text-amber-400">○3</span>
+        <span class="text-accent">↑2</span>
+        <span class="text-warn">○3</span>
         <span class="ml-auto">api · {{ t('busy') }}</span>
       </footer>
     </div>

packages/site/src/i18n/content.ts

@@ -11,7 +11,7 @@ export const FAQS: Record<AppLocale, FaqItem[]> = {
   en: [
     {
       q: 'How is this different from running Claude Code in a terminal?',
-      a: 'It runs the very same interactive claude CLI. Arboretum just wraps it in a managed terminal you reach from a browser. What you gain on top: a worktree-first dashboard across all your repos, live busy / waiting / available states, a multi-terminal grid, push notifications, and the ability to answer a prompt from your phone. It supervises your sessions; it does not change how Claude Code works.',
+      a: 'It runs the very same interactive claude CLI. Arboretum just wraps it in a managed terminal you reach from a browser. What you gain on top: a multi-project IDE across all your repos and worktrees, live busy / waiting / available states, a multi-terminal grid, push notifications, and the ability to answer a prompt from your phone. It supervises your sessions; it does not change how Claude Code works.',
     },
     {
       q: 'Does it need the cloud?',
@@ -45,7 +45,7 @@ export const FAQS: Record<AppLocale, FaqItem[]> = {
   fr: [
     {
       q: 'En quoi est-ce différent de lancer Claude Code dans un terminal ?',
-      a: "C'est exactement le même CLI claude interactif. Arboretum l'enveloppe simplement dans un terminal managé accessible depuis un navigateur. Ce que vous gagnez en plus : un dashboard worktree-first sur tous vos repos, les états occupée / en attente / disponible en direct, une grille multi-terminaux, des notifications push, et la possibilité de répondre à une question depuis votre téléphone. Il supervise vos sessions ; il ne change rien au fonctionnement de Claude Code.",
+      a: "C'est exactement le même CLI claude interactif. Arboretum l'enveloppe simplement dans un terminal managé accessible depuis un navigateur. Ce que vous gagnez en plus : un IDE multi-projet sur tous vos repos et worktrees, les états occupée / en attente / disponible en direct, une grille multi-terminaux, des notifications push, et la possibilité de répondre à une question depuis votre téléphone. Il supervise vos sessions ; il ne change rien au fonctionnement de Claude Code.",
     },
     {
       q: 'A-t-il besoin du cloud ?',

packages/site/src/i18n/en.ts

@@ -6,6 +6,7 @@ export default {
   navHow: 'How it works',
   navSecurity: 'Security',
   navFaq: 'FAQ',
+  themeToggle: 'Toggle theme',
   gitea: 'View on Gitea',
   heroBadge: 'Mission control for AI coding agents',
   heroTitle: 'Mission control for your AI coding agents',
@@ -38,7 +39,7 @@ export default {
   feat9Desc: 'Drive worktrees and attach sessions in native terminals, right inside your editor.',
   feat10Title: 'New project in one click',
   feat10Desc: 'Create a project folder anywhere (optional git init) and start a Claude session in it, from any device.',
-  scAKicker: 'Worktree-first dashboard',
+  scAKicker: 'Session supervision',
   scATitle: 'See what needs you, before anything stalls',
   scABody:
     'A live list of every worktree and its session state. The Needs attention rail floats the agents waiting on a decision to the top, so nothing sits blocked while you are heads-down elsewhere. Commit, push or promote a branch to main straight from the card, and hide the noisy history left by past terminal sessions so the list stays actionable.',
@@ -82,7 +83,12 @@ export default {
   license: 'MIT License',
   coffee: 'Buy me a coffee',
   mIde: 'IDE',
+  mProjects: 'Projects',
   mWorktrees: 'Worktrees',
+  mExplorer: 'Explorer',
+  mEditor: 'Editor',
+  mTerminal: 'Terminal',
+  mGit: 'Git',
   mSessions: 'Sessions',
   mGroups: 'Groups',
   mSettings: 'Settings',

packages/site/src/i18n/fr.ts

@@ -6,6 +6,7 @@ export default {
   navHow: 'Comment ça marche',
   navSecurity: 'Sécurité',
   navFaq: 'FAQ',
+  themeToggle: 'Changer de thème',
   gitea: 'Voir sur Gitea',
   heroBadge: 'Poste de commandement pour agents de code IA',
   heroTitle: 'Le poste de commandement de vos agents de code IA',
@@ -38,7 +39,7 @@ export default {
   feat9Desc: 'Pilotez vos worktrees et attachez vos sessions dans des terminaux natifs, directement dans votre éditeur.',
   feat10Title: 'Nouveau projet en un clic',
   feat10Desc: "Créez un dossier de projet où vous voulez (git init optionnel) et lancez-y une session Claude, depuis n'importe quel appareil.",
-  scAKicker: 'Dashboard worktree-first',
+  scAKicker: 'Supervision des sessions',
   scATitle: 'Voyez ce qui vous attend, avant que ça ne bloque',
   scABody:
     "Une liste en direct de chaque worktree et de l'état de sa session. Le bandeau À traiter fait remonter les agents en attente d'une décision, pour que rien ne reste bloqué pendant que vous êtes concentré ailleurs. Commitez, poussez ou passez une branche en principal directement depuis la carte, et masquez l'historique encombrant laissé par vos anciennes sessions terminal pour garder la liste actionnable.",
@@ -82,7 +83,12 @@ export default {
   license: 'Licence MIT',
   coffee: 'Paye-moi un café',
   mIde: 'IDE',
+  mProjects: 'Projets',
   mWorktrees: 'Worktrees',
+  mExplorer: 'Explorateur',
+  mEditor: 'Éditeur',
+  mTerminal: 'Terminal',
+  mGit: 'Git',
   mSessions: 'Sessions',
   mGroups: 'Groupes',
   mSettings: 'Réglages',

packages/site/src/lib/theme.ts

@@ -0,0 +1,73 @@
+// Thème clair / sombre du site vitrine (aligné sur l'app : lib/theme.ts de packages/web).
+// Singleton module Vue : `themeMode` (persisté en localStorage, clé `arb-theme`), `resolvedTheme`
+// (résout `system` via prefers-color-scheme), application au <html> (dataset.theme + metas).
+import { computed, ref, watch, type ComputedRef } from 'vue';
+
+export type ThemeMode = 'dark' | 'light' | 'system';
+export type ResolvedTheme = 'dark' | 'light';
+
+const STORAGE_KEY = 'arb-theme';
+// Doit rester synchronisé avec --color-surface-0 (style.css) : fond du <html> + metas.
+const BG: Record<ResolvedTheme, string> = { dark: '#09090b', light: '#fafafa' };
+
+function initialMode(): ThemeMode {
+  try {
+    const saved = localStorage.getItem(STORAGE_KEY);
+    if (saved === 'dark' || saved === 'light' || saved === 'system') return saved;
+  } catch {
+    /* localStorage indisponible */
+  }
+  return 'dark';
+}
+
+export const themeMode = ref<ThemeMode>(initialMode());
+
+const mql =
+  typeof window !== 'undefined' && typeof window.matchMedia === 'function'
+    ? window.matchMedia('(prefers-color-scheme: dark)')
+    : null;
+const systemDark = ref(mql?.matches ?? true);
+mql?.addEventListener('change', (e) => {
+  systemDark.value = e.matches;
+});
+
+export const resolvedTheme: ComputedRef<ResolvedTheme> = computed(() => {
+  if (themeMode.value === 'system') return systemDark.value ? 'dark' : 'light';
+  return themeMode.value;
+});
+
+function applyTheme(resolved: ResolvedTheme): void {
+  if (typeof document === 'undefined') return;
+  const root = document.documentElement;
+  root.dataset.theme = resolved;
+  root.style.backgroundColor = BG[resolved];
+  const setMeta = (name: string, content: string): void => {
+    document.querySelector(`meta[name="${name}"]`)?.setAttribute('content', content);
+  };
+  setMeta('color-scheme', resolved);
+  setMeta('theme-color', BG[resolved]);
+}
+
+watch(
+  resolvedTheme,
+  (r) => {
+    applyTheme(r);
+    try {
+      localStorage.setItem(STORAGE_KEY, themeMode.value);
+    } catch {
+      /* quota / mode privé */
+    }
+  },
+  { immediate: true },
+);
+
+export function setThemeMode(mode: ThemeMode): void {
+  themeMode.value = mode;
+}
+
+/** Cycle dark -> light -> system (pour un bouton unique). */
+export function cycleTheme(): void {
+  const order: ThemeMode[] = ['dark', 'light', 'system'];
+  const next = order[(order.indexOf(themeMode.value) + 1) % order.length];
+  if (next) themeMode.value = next;
+}

packages/site/src/main.ts

@@ -1,11 +1,11 @@
 import { createApp } from 'vue';
-// Polices self-host (subset latin) : bundlées par Vite, aucune requête Google Fonts.
-import '@fontsource/jetbrains-mono/latin-400.css';
-import '@fontsource/jetbrains-mono/latin-500.css';
-import '@fontsource/jetbrains-mono/latin-600.css';
-import '@fontsource/jetbrains-mono/latin-700.css';
+// Polices auto-hébergées (fontes variables), bundlées par Vite, aucune requête Google Fonts.
+import '@fontsource-variable/inter';
+import '@fontsource-variable/jetbrains-mono';
 import App from './App.vue';
 import { i18n } from './i18n';
+// Effet de bord : active le watcher d'application du thème clair/sombre.
+import './lib/theme';
 import { reveal } from './composables/useScrollReveal';
 import './style.css';
 

packages/site/src/style.css

@@ -1,15 +1,41 @@
 @import 'tailwindcss';
 
-/* La palette du design correspond à zinc/emerald/amber/sky/red de Tailwind.
-   On ajoute seulement les tokens hors échelle : ombres, police mono, animations. */
+/* ============================================================
+   Tokens de design « Emerald » : alignés sur packages/web/src/style.css.
+   Défauts SOMBRES dans @theme ; thème CLAIR via html[data-theme="light"]
+   (les utilitaires référencent les vars, l'override cascade sans duplication).
+   ============================================================ */
 @theme {
-  --font-mono: 'JetBrains Mono', ui-monospace, monospace;
+  /* Surfaces / bordures / texte / accent / tons sémantiques (défauts sombres). */
+  --color-surface-0: #09090b;
+  --color-surface-1: #18181b;
+  --color-surface-2: #27272a;
+  --color-surface-3: #3f3f46;
+  --color-border: #27272a;
+  --color-border-strong: #3f3f46;
+  --color-border-soft: #1c1c1f;
+  --color-fg: #f4f4f5;
+  --color-fg-muted: #a1a1aa;
+  --color-fg-subtle: #52525b;
+  --color-accent: #34d399;
+  --color-accent-solid: #059669;
+  --color-accent-hover: #10b981;
+  --color-coffee: #f59e0b;
+  --color-info: #7dd3fc;
+  --color-warn: #fcd34d;
+  --color-danger: #f87171;
 
+  /* Polices auto-hébergées (fontes variables). */
+  --font-sans: 'Inter Variable', ui-sans-serif, system-ui, -apple-system, 'Segoe UI', sans-serif;
+  --font-mono: 'JetBrains Mono Variable', ui-monospace, 'Fira Code', Menlo, Consolas, monospace;
+
+  /* Ombres (site) + shadow-pop Emerald. */
   --shadow-hero: 0 30px 80px -30px rgb(0 0 0 / 0.85);
   --shadow-card: 0 24px 60px -30px rgb(0 0 0 / 0.8);
   --shadow-phone: 0 30px 70px -28px rgb(0 0 0 / 0.9);
   --shadow-toast: 0 12px 32px -12px rgb(0 0 0 / 0.7);
   --shadow-toast-sm: 0 10px 24px -12px rgb(0 0 0 / 0.6);
+  --shadow-pop: 0 24px 48px -20px rgb(0 0 0 / 0.65);
 
   --animate-blink: blink 1.05s steps(1) infinite;
   --animate-pulse-sky: pulseSky 2s ease-in-out infinite;
@@ -18,26 +44,46 @@
   --animate-dlg-in: dlgIn 0.35s ease both;
 }
 
-/* JetBrains Mono (Open Font License) : @font-face fournis par @fontsource,
-   importés dans main.ts et bundlés par Vite (self-host, pas de CDN Google). */
+html[data-theme='light'] {
+  --color-surface-0: #fafafa;
+  --color-surface-1: #ffffff;
+  --color-surface-2: #f4f4f5;
+  --color-surface-3: #e4e4e7;
+  --color-border: #e4e4e7;
+  --color-border-strong: #d4d4d8;
+  --color-border-soft: #ececee;
+  --color-fg: #18181b;
+  --color-fg-muted: #52525b;
+  --color-fg-subtle: #a1a1aa;
+  --color-accent: #059669;
+  --color-accent-solid: #059669;
+  --color-accent-hover: #047857;
+  --color-coffee: #d97706;
+  --color-info: #0284c7;
+  --color-warn: #d97706;
+  --color-danger: #dc2626;
+  /* Ombres plus douces en clair. */
+  --shadow-hero: 0 30px 80px -30px rgb(24 24 27 / 0.18);
+  --shadow-card: 0 24px 60px -30px rgb(24 24 27 / 0.16);
+  --shadow-phone: 0 30px 70px -28px rgb(24 24 27 / 0.2);
+  --shadow-toast: 0 12px 32px -12px rgb(24 24 27 / 0.14);
+  --shadow-toast-sm: 0 10px 24px -12px rgb(24 24 27 / 0.12);
+  --shadow-pop: 0 18px 38px -22px rgb(24 24 27 / 0.22);
+}
 
 html {
   scroll-behavior: smooth;
 }
 body {
   margin: 0;
-  background-color: #09090b;
-  color: #f4f4f5;
-  font-family: ui-sans-serif, system-ui, -apple-system, 'Segoe UI', sans-serif;
+  background-color: var(--color-surface-0);
+  color: var(--color-fg);
+  font-family: var(--font-sans);
   font-size: 16px;
   line-height: 1.6;
   -webkit-font-smoothing: antialiased;
   overflow-x: hidden;
 }
-::selection {
-  background: rgba(16, 185, 129, 0.3);
-  color: #fff;
-}
 
 @keyframes blink {
   0%,
@@ -89,14 +135,39 @@ body {
 }
 
 @layer base {
-  /* Tailwind v4 ne met plus cursor:pointer sur les boutons → on le rétablit. */
+  /* Tailwind v4 ne met plus cursor:pointer sur les boutons : on le rétablit. */
   button:not(:disabled),
   [role='button']:not([aria-disabled='true']) {
     cursor: pointer;
   }
+  :focus-visible {
+    outline: 2px solid var(--color-accent);
+    outline-offset: 2px;
+  }
+  ::selection {
+    background: var(--color-accent);
+    color: var(--color-surface-0);
+  }
+  * {
+    scrollbar-width: thin;
+    scrollbar-color: var(--color-surface-3) transparent;
+  }
+  ::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+  }
+  ::-webkit-scrollbar-thumb {
+    background: var(--color-surface-3);
+    border-radius: 9999px;
+    border: 2px solid transparent;
+    background-clip: content-box;
+  }
+  ::-webkit-scrollbar-thumb:hover {
+    background: var(--color-border-strong);
+  }
 }
 
-/* Révélation au scroll (directive v-reveal) */
+/* Révélation au scroll (directive v-reveal). */
 .reveal {
   opacity: 0;
   transform: translateY(22px);
@@ -118,3 +189,89 @@ body {
     transform: none;
   }
 }
+
+@layer components {
+  /* Pastille (pill mono) + point pulsé. */
+  .badge {
+    @apply inline-flex items-center gap-1.5 rounded-full px-2.5 py-0.5 font-mono text-[11px];
+  }
+  .chip {
+    @apply inline-flex items-center rounded-full border border-border bg-surface-0 px-[9px] py-1 font-mono text-[11px] text-fg-muted;
+  }
+  .status {
+    @apply inline-flex items-center gap-1.5 font-mono text-[11px] tracking-[0.05em] text-fg-muted uppercase;
+  }
+  .status-dot {
+    @apply inline-block h-[7px] w-[7px] rounded-full;
+  }
+  .eyebrow {
+    @apply font-mono text-[13px] text-accent;
+  }
+  .label-mono {
+    @apply font-mono text-[11px] tracking-[0.08em] text-fg-subtle uppercase;
+  }
+  /* Caret clignotant des mockups terminaux (réutilise le keyframe `blink` du site). */
+  .caret {
+    @apply ml-0.5 inline-block h-[15px] w-2 bg-accent align-[-2px];
+    animation: blink 1.05s steps(1) infinite;
+  }
+  .card {
+    @apply rounded-[14px] border border-border bg-surface-1/50 p-3;
+  }
+  .card-hover {
+    @apply transition-[transform,border-color,box-shadow] hover:-translate-y-1 hover:border-accent hover:shadow-pop;
+  }
+  .card-inset {
+    @apply rounded-[10px] border border-border bg-surface-0/40 p-2;
+  }
+  /* Boutons Emerald (pour réutilisation dans les mockups). */
+  .btn {
+    @apply inline-flex items-center justify-center gap-[9px] rounded-[11px] border border-border bg-surface-2 px-3 py-1.5 text-sm font-semibold text-fg transition-[background-color,border-color,color,transform] hover:border-accent hover:text-accent;
+  }
+  .btn-primary {
+    @apply inline-flex items-center justify-center gap-[9px] rounded-[11px] border border-accent-solid bg-accent-solid px-3 py-1.5 text-sm font-semibold text-white transition-[background-color,border-color,color,transform] hover:-translate-y-px hover:bg-accent-hover;
+  }
+  .btn-ghost {
+    @apply inline-flex items-center justify-center gap-[9px] rounded-[11px] px-3 py-1.5 text-sm font-semibold text-fg-muted transition-[background-color,color] hover:bg-surface-2/60 hover:text-fg;
+  }
+  /* Calques décoratifs (halo accent + grain). */
+  .halo {
+    position: absolute;
+    top: -40px;
+    left: 50%;
+    width: 1100px;
+    max-width: 140%;
+    height: 560px;
+    transform: translateX(-50%);
+    background: radial-gradient(50% 60% at 50% 0%, var(--color-accent) 0%, transparent 70%);
+    opacity: 0.12;
+    filter: blur(18px);
+    pointer-events: none;
+    z-index: 0;
+  }
+  .grain {
+    position: absolute;
+    inset: 0;
+    background-image: radial-gradient(var(--color-fg) 1px, transparent 1px);
+    background-size: 34px 34px;
+    opacity: 0.025;
+    pointer-events: none;
+    z-index: 0;
+    -webkit-mask-image: linear-gradient(to bottom, #000, transparent 70%);
+    mask-image: linear-gradient(to bottom, #000, transparent 70%);
+  }
+  /* Lignes de diff : fond teinté sémantique, texte neutre lisible (clair + sombre). */
+  .diff-add {
+    @apply bg-accent/12 text-fg;
+  }
+  .diff-del {
+    @apply bg-danger/12 text-fg;
+  }
+  .diff-ctx {
+    @apply text-fg-muted;
+  }
+}
+
+html[data-theme='light'] .halo {
+  opacity: 0.06;
+}

packages/vscode/README.md

@@ -53,13 +53,13 @@ The extension is bundled with esbuild (`@arboretum/shared` is inlined → the VS
 npm install
 npm run build:vscode                       # builds @arboretum/shared then bundles the extension
 cd packages/vscode && npx @vscode/vsce package --no-dependencies
-# → git-arboretum-0.2.0.vsix
+# → git-arboretum-0.3.0.vsix
 ```
 
 Install it with **Extensions: Install from VSIX…** in the Command Palette, or:
 
 ```bash
-code --install-extension git-arboretum-0.2.0.vsix   # also: codium / cursor
+code --install-extension git-arboretum-0.3.0.vsix   # also: codium / cursor
 ```
 
 ### Other distribution channels (optional)

packages/web/index.html

@@ -5,6 +5,27 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="color-scheme" content="dark" />
     <meta name="theme-color" content="#09090b" />
+    <!-- Anti-FOUC : applique la préférence de thème (arb.theme) avant le premier paint,
+         sinon un utilisateur en thème clair verrait un flash sombre au rechargement.
+         Doit rester inline/synchrone (pas de module async). Synchronisé avec lib/theme.ts. -->
+    <script>
+      (function () {
+        try {
+          var raw = localStorage.getItem('arb.theme');
+          var mode = raw ? JSON.parse(raw) : 'dark';
+          var dark = mode === 'dark' || (mode === 'system' && matchMedia('(prefers-color-scheme: dark)').matches);
+          var theme = dark ? 'dark' : 'light';
+          var bg = dark ? '#09090b' : '#fafafa';
+          var el = document.documentElement;
+          el.dataset.theme = theme;
+          el.style.backgroundColor = bg;
+          var cs = document.querySelector('meta[name=color-scheme]');
+          if (cs) cs.setAttribute('content', theme);
+          var tc = document.querySelector('meta[name=theme-color]');
+          if (tc) tc.setAttribute('content', bg);
+        } catch (e) {}
+      })();
+    </script>
     <link rel="manifest" href="/manifest.webmanifest" />
     <link rel="icon" type="image/svg+xml" href="/icon.svg" />
     <link rel="icon" type="image/x-icon" href="/favicon.ico" />

packages/web/package.json

@@ -10,6 +10,8 @@
   },
   "dependencies": {
     "@arboretum/shared": "*",
+    "@fontsource-variable/inter": "^5.0.0",
+    "@fontsource-variable/jetbrains-mono": "^5.0.0",
     "@lucide/vue": "^1.21.0",
     "@xterm/addon-fit": "^0.11.0",
     "@xterm/addon-webgl": "^0.19.0",

packages/web/src/App.vue

@@ -1,11 +1,8 @@
 <template>
   <div class="flex h-dvh flex-col">
     <WsBanner v-if="wsReconnecting" />
-    <!-- 'ide' et 'bare' : plein écran sans coquille (la vue gère son propre layout). -->
-    <AppShell v-if="layout !== 'bare' && layout !== 'ide'" :fullbleed="layout === 'fullbleed'">
-      <RouterView />
-    </AppShell>
-    <RouterView v-else class="min-h-0 flex-1" />
+    <!-- Coquille unique : la vue (IDE ou login) gère elle-même son plein écran. -->
+    <RouterView class="min-h-0 flex-1" />
     <ToastContainer />
     <CommandPalette />
   </div>
@@ -13,19 +10,15 @@
 
 <script setup lang="ts">
 import { computed } from 'vue';
-import { useRoute } from 'vue-router';
 import { wsClient } from './lib/ws-client';
 import { useRealtimeBootstrap } from './composables/useRealtimeBootstrap';
 import WsBanner from './components/layout/WsBanner.vue';
-import AppShell from './components/layout/AppShell.vue';
 import ToastContainer from './components/ToastContainer.vue';
 import CommandPalette from './components/CommandPalette.vue';
 
-const route = useRoute();
-const layout = computed(() => route.meta.layout ?? 'shell');
 const wsReconnecting = computed(() => wsClient.status.value === 'reconnecting');
 
 // Propriétaire unique du chargement initial + temps réel : hissé ici (App.vue toujours monté)
-// pour couvrir TOUS les layouts, y compris la vue IDE plein écran sans AppShell.
+// pour couvrir l'IDE plein écran comme le login.
 useRealtimeBootstrap();
 </script>

packages/web/src/components/AttentionSection.vue

@@ -1,37 +0,0 @@
-<template>
-  <section v-if="waiting.length" class="flex flex-col gap-2 rounded-xl border border-amber-900/50 bg-amber-950/20 p-3">
-    <div class="flex items-center gap-2">
-      <AlertTriangle :size="16" class="text-amber-400" />
-      <h2 class="text-sm font-semibold text-amber-200">{{ t('attention.title') }}</h2>
-      <BaseBadge tone="amber">{{ t('attention.count', waiting.length) }}</BaseBadge>
-    </div>
-    <div v-for="s in waiting" :key="s.id" class="flex flex-col gap-1">
-      <RouterLink
-        :to="{ name: 'session', params: { id: s.id } }"
-        class="truncate font-mono text-xs text-amber-300/80 transition-colors hover:text-amber-200"
-        :title="s.cwd"
-      >
-        {{ s.cwd }}
-      </RouterLink>
-      <DialogPrompt :session="s" />
-    </div>
-  </section>
-</template>
-
-<script setup lang="ts">
-// Vue « À traiter » : regroupe en tête les sessions bloquées sur un dialogue (cœur de la
-// supervision mobile). Réutilise DialogPrompt pour répondre sans ouvrir le terminal.
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { AlertTriangle } from '@lucide/vue';
-import { useSessionsStore } from '../stores/sessions';
-import DialogPrompt from './DialogPrompt.vue';
-import BaseBadge from './ui/BaseBadge.vue';
-
-const { t } = useI18n();
-const sessions = useSessionsStore();
-
-const waiting = computed(() =>
-  sessions.sessions.filter((s) => s.live && s.activity === 'waiting' && s.dialog),
-);
-</script>

packages/web/src/components/CloneRepoModal.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" @click.self="emit('close')">
-    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-zinc-800 bg-zinc-900 p-4">
+    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-border bg-surface-1 p-4">
       <header class="flex items-center gap-2">
-        <h2 class="font-semibold text-zinc-100">{{ t('clone.title') }}</h2>
+        <h2 class="font-semibold text-fg">{{ t('clone.title') }}</h2>
         <button class="btn ml-auto text-xs" @click="emit('close')">{{ t('common.cancel') }}</button>
       </header>
 
       <!-- aucune connexion → renvoyer vers les réglages -->
-      <p v-if="conn.connections.length === 0" class="text-sm text-zinc-400">
+      <p v-if="conn.connections.length === 0" class="text-sm text-fg-muted">
         {{ t('clone.noCredential') }}
-        <RouterLink :to="{ name: 'settings' }" class="text-emerald-400 hover:underline" @click="emit('close')">{{ t('clone.goSettings') }}</RouterLink>
+        <button type="button" class="text-accent hover:underline" @click="openSettings">{{ t('clone.goSettings') }}</button>
       </p>
 
       <template v-else-if="!operationId">
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('clone.credential') }}
           <select v-model="credentialId" class="input" @change="loadRepos(1)">
             <option v-for="c in conn.connections" :key="c.id" :value="c.id">{{ c.label }} ({{ c.service }})</option>
@@ -21,39 +21,39 @@
         </label>
 
         <div class="flex items-end gap-2">
-          <label class="flex flex-1 flex-col gap-1 text-xs text-zinc-400">
+          <label class="flex flex-1 flex-col gap-1 text-xs text-fg-muted">
             {{ t('clone.search') }}
             <input v-model.trim="search" class="input" :placeholder="t('clone.searchPlaceholder')" @keyup.enter="loadRepos(1)" />
           </label>
           <BaseButton size="sm" :icon="RefreshCw" :loading="loadingRepos" @click="loadRepos(1)">{{ t('common.refresh') }}</BaseButton>
         </div>
 
-        <p v-if="reposError" class="text-xs text-amber-400">{{ reposError }}</p>
+        <p v-if="reposError" class="text-xs text-warn">{{ reposError }}</p>
         <ul class="flex max-h-52 flex-col gap-0.5 overflow-y-auto">
           <li v-for="r in repos" :key="r.fullName">
             <button
               type="button"
-              class="flex w-full items-center gap-2 rounded px-2 py-1 text-left text-sm hover:bg-zinc-800"
-              :class="selected?.fullName === r.fullName ? 'bg-zinc-800 text-zinc-100' : 'text-zinc-300'"
+              class="flex w-full items-center gap-2 rounded px-2 py-1 text-left text-sm hover:bg-surface-2"
+              :class="selected?.fullName === r.fullName ? 'bg-surface-2 text-fg' : 'text-fg-muted'"
               @click="select(r)"
             >
               <span class="min-w-0 flex-1 truncate font-mono">{{ r.fullName }}</span>
-              <BaseBadge v-if="r.private" tone="zinc">{{ t('clone.private') }}</BaseBadge>
+              <BaseBadge v-if="r.private" tone="neutral">{{ t('clone.private') }}</BaseBadge>
             </button>
           </li>
-          <li v-if="!loadingRepos && repos.length === 0" class="px-2 py-1 text-xs text-zinc-600">{{ t('clone.noRepos') }}</li>
+          <li v-if="!loadingRepos && repos.length === 0" class="px-2 py-1 text-xs text-fg-subtle">{{ t('clone.noRepos') }}</li>
         </ul>
         <div v-if="nextPage" class="flex justify-center">
           <BaseButton size="sm" variant="ghost" :loading="loadingRepos" @click="loadRepos(nextPage)">{{ t('clone.more') }}</BaseButton>
         </div>
 
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('clone.dest') }}
           <input v-model.trim="dest" class="input font-mono" :placeholder="t('clone.destPlaceholder')" />
-          <span class="text-xs text-zinc-600">{{ t('clone.destHint') }}</span>
+          <span class="text-xs text-fg-subtle">{{ t('clone.destHint') }}</span>
         </label>
 
-        <p v-if="error" class="text-xs text-amber-400">{{ error }}</p>
+        <p v-if="error" class="text-xs text-warn">{{ error }}</p>
         <div>
           <BaseButton variant="primary" :icon="Download" :loading="starting" :disabled="!canClone" @click="onClone">{{ t('clone.clone') }}</BaseButton>
         </div>
@@ -61,11 +61,11 @@
 
       <!-- progression -->
       <template v-else>
-        <p class="text-sm text-zinc-300">{{ progressLabel }}</p>
-        <div class="h-2 w-full overflow-hidden rounded bg-zinc-800">
-          <div class="h-full bg-emerald-500 transition-all" :style="{ width: `${op?.progress ?? 0}%` }" />
+        <p class="text-sm text-fg-muted">{{ progressLabel }}</p>
+        <div class="h-2 w-full overflow-hidden rounded bg-surface-2">
+          <div class="h-full bg-accent transition-all" :style="{ width: `${op?.progress ?? 0}%` }" />
         </div>
-        <p v-if="op?.state === 'error'" class="text-xs text-rose-400">{{ op.error }}</p>
+        <p v-if="op?.state === 'error'" class="text-xs text-danger">{{ op.error }}</p>
         <div v-if="op?.state === 'error'" class="flex gap-2">
           <BaseButton size="sm" variant="ghost" @click="operationId = null">{{ t('clone.back') }}</BaseButton>
         </div>
@@ -75,8 +75,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, onMounted, ref, watch } from 'vue';
-import { useRouter } from 'vue-router';
+import { computed, defineAsyncComponent, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Download, RefreshCw } from '@lucide/vue';
 import type { RemoteRepoSummary } from '@arboretum/shared';
@@ -84,16 +83,24 @@ import { useGitConnectionsStore } from '../stores/git-connections';
 import { useCloneStore } from '../stores/clone';
 import { useSettingsStore } from '../stores/settings';
 import { useToastsStore } from '../stores/toasts';
+import { useModalsStore } from '../stores/modals';
 import BaseButton from './ui/BaseButton.vue';
 import BaseBadge from './ui/BaseBadge.vue';
 
 const emit = defineEmits<{ close: [] }>();
 const { t } = useI18n();
-const router = useRouter();
 const conn = useGitConnectionsStore();
 const cloneStore = useCloneStore();
 const settings = useSettingsStore();
 const toasts = useToastsStore();
+const modals = useModalsStore();
+
+// Ouvre l'overlay Réglages (connexions git) au lieu de naviguer vers /settings.
+const SettingsOverlay = defineAsyncComponent(() => import('./ide/overlays/SettingsOverlay.vue'));
+function openSettings(): void {
+  emit('close');
+  modals.open(SettingsOverlay);
+}
 
 const credentialId = ref('');
 const search = ref('');
@@ -162,12 +169,12 @@ async function onClone(): Promise<void> {
   }
 }
 
-// À la fin du clone : toast + redirection vers le tableau de bord (le repo y apparaît).
+// À la fin du clone : toast + fermeture. Le dépôt cloné apparaît dans l'arbre via l'event WS
+// (repo_update), plus besoin de naviguer.
 watch(op, (o) => {
   if (o?.state === 'done') {
     toasts.success(t('clone.done'));
     emit('close');
-    void router.push({ name: 'dashboard' });
   }
 });
 </script>

packages/web/src/components/CommandPalette.vue

@@ -2,14 +2,14 @@
   <Teleport to="body">
     <div v-if="open" class="fixed inset-0 z-[60] flex items-start justify-center p-4 pt-[10vh]" role="dialog" aria-modal="true">
       <div class="absolute inset-0 bg-black/60" @click="close" />
-      <div class="relative flex max-h-[70vh] w-full max-w-lg flex-col overflow-hidden rounded-xl border border-zinc-700 bg-zinc-900 shadow-pop">
-        <div class="flex items-center gap-2 border-b border-zinc-800 px-3">
-          <Search :size="16" class="text-zinc-500" />
+      <div class="relative flex max-h-[70vh] w-full max-w-lg flex-col overflow-hidden rounded-xl border border-border-strong bg-surface-1 shadow-pop">
+        <div class="flex items-center gap-2 border-b border-border px-3">
+          <Search :size="16" class="text-fg-subtle" />
           <input
             ref="inputEl"
             v-model="query"
             type="text"
-            class="w-full bg-transparent py-3 text-sm text-zinc-100 outline-none placeholder:text-zinc-600"
+            class="w-full bg-transparent py-3 text-sm text-fg outline-none placeholder:text-fg-subtle"
             :placeholder="t('palette.placeholder')"
             :aria-activedescendant="activeId ? `cmd-${activeId}` : undefined"
             role="combobox"
@@ -30,21 +30,21 @@
             role="option"
             :aria-selected="i === activeIndex"
             class="flex cursor-pointer items-center gap-2 rounded-lg px-2.5 py-2"
-            :class="i === activeIndex ? 'bg-zinc-800' : 'hover:bg-zinc-800/50'"
+            :class="i === activeIndex ? 'bg-surface-2' : 'hover:bg-surface-2/50'"
             @mousemove="activeIndex = i"
             @click="run(item)"
           >
-            <component :is="item.icon" :size="15" class="shrink-0 text-zinc-500" />
+            <component :is="item.icon" :size="15" class="shrink-0 text-fg-subtle" />
             <span class="min-w-0 flex-1">
-              <span class="block truncate text-sm text-zinc-100">{{ item.label }}</span>
-              <span v-if="item.sublabel" class="block truncate font-mono text-[11px] text-zinc-500">{{ item.sublabel }}</span>
+              <span class="block truncate text-sm text-fg">{{ item.label }}</span>
+              <span v-if="item.sublabel" class="block truncate font-mono text-[11px] text-fg-subtle">{{ item.sublabel }}</span>
             </span>
-            <span class="shrink-0 text-[10px] uppercase tracking-wide text-zinc-600">{{ t(`palette.types.${item.type}`) }}</span>
+            <span class="shrink-0 text-[10px] uppercase tracking-wide text-fg-subtle">{{ t(`palette.types.${item.type}`) }}</span>
           </li>
         </ul>
-        <p v-else class="px-3 py-6 text-center text-sm text-zinc-500">{{ t('palette.empty') }}</p>
+        <p v-else class="px-3 py-6 text-center text-sm text-fg-subtle">{{ t('palette.empty') }}</p>
 
-        <div class="border-t border-zinc-800 px-3 py-1.5 text-[11px] text-zinc-600">{{ t('palette.hint') }}</div>
+        <div class="border-t border-border px-3 py-1.5 text-[11px] text-fg-subtle">{{ t('palette.hint') }}</div>
       </div>
     </div>
   </Teleport>
@@ -52,13 +52,17 @@
 
 <script setup lang="ts">
 import { computed, nextTick, onMounted, onUnmounted, ref, watch, type Component } from 'vue';
-import { useRouter, type RouteLocationRaw } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { Search, GitBranch, TerminalSquare, Boxes, Plus, FolderPlus } from '@lucide/vue';
+import type { WorktreeSummary } from '@arboretum/shared';
 import { useSessionsStore } from '../stores/sessions';
 import { useWorktreesStore } from '../stores/worktrees';
 import { useGroupsStore } from '../stores/groups';
+import { useIdeStore } from '../stores/ide';
+import { useModalsStore } from '../stores/modals';
 import { useCommandPalette } from '../composables/useCommandPalette';
+import NewSessionModal from './ide/modals/NewSessionModal.vue';
+import GroupCreateModal from './ide/modals/GroupCreateModal.vue';
 
 interface PaletteItem {
   id: string;
@@ -67,16 +71,27 @@ interface PaletteItem {
   sublabel?: string;
   icon: Component;
   keywords: string;
-  to?: RouteLocationRaw;
-  run?: () => void;
+  run: () => void;
 }
 
 const { t } = useI18n();
-const router = useRouter();
 const { open, close, toggle } = useCommandPalette();
 const sessions = useSessionsStore();
 const worktrees = useWorktreesStore();
 const groups = useGroupsStore();
+const ide = useIdeStore();
+const modals = useModalsStore();
+
+// Toutes les actions restent DANS l'IDE (aucune navigation vers l'ancien monde).
+function revealRepo(id: string): void {
+  ide.setActivity('explorer');
+  if (!ide.expandedRepoIds.includes(id)) ide.toggleRepo(id);
+}
+function revealWorktree(w: WorktreeSummary): void {
+  ide.revealWorktree(w.repoId, w.path);
+  const live = sessions.sessions.find((s) => s.live && s.cwd === w.path);
+  if (live) ide.openTerminal(live.id);
+}
 
 const query = ref('');
 const activeIndex = ref(0);
@@ -87,24 +102,21 @@ const basename = (p: string): string => p.split('/').filter(Boolean).pop() ?? p;
 const items = computed<PaletteItem[]>(() => {
   const out: PaletteItem[] = [];
   for (const r of worktrees.repos) {
-    out.push({ id: `repo-${r.id}`, type: 'repo', label: r.label, sublabel: r.path, icon: GitBranch as Component, keywords: `${r.label} ${r.path}`.toLowerCase(), to: { name: 'dashboard' } });
+    out.push({ id: `repo-${r.id}`, type: 'repo', label: r.label, sublabel: r.path, icon: GitBranch as Component, keywords: `${r.label} ${r.path}`.toLowerCase(), run: () => revealRepo(r.id) });
   }
   for (const w of worktrees.worktrees) {
-    const target: RouteLocationRaw = w.sessions[0]
-      ? { name: 'session', params: { id: w.sessions[0].id } }
-      : { name: 'dashboard' };
-    out.push({ id: `wt-${w.path}`, type: 'worktree', label: w.branch ?? basename(w.path), sublabel: w.path, icon: GitBranch as Component, keywords: `${w.branch ?? ''} ${w.path}`.toLowerCase(), to: target });
+    out.push({ id: `wt-${w.path}`, type: 'worktree', label: w.branch ?? basename(w.path), sublabel: w.path, icon: GitBranch as Component, keywords: `${w.branch ?? ''} ${w.path}`.toLowerCase(), run: () => revealWorktree(w) });
   }
   for (const s of sessions.sessions) {
-    out.push({ id: `ses-${s.id}`, type: 'session', label: s.title ?? basename(s.cwd), sublabel: s.cwd, icon: TerminalSquare as Component, keywords: `${s.title ?? ''} ${s.cwd} ${s.command}`.toLowerCase(), to: { name: 'session', params: { id: s.id } } });
+    out.push({ id: `ses-${s.id}`, type: 'session', label: s.title ?? basename(s.cwd), sublabel: s.cwd, icon: TerminalSquare as Component, keywords: `${s.title ?? ''} ${s.cwd} ${s.command}`.toLowerCase(), run: () => ide.openTerminal(s.id) });
   }
   for (const g of groups.groups) {
-    out.push({ id: `grp-${g.id}`, type: 'group', label: g.label, ...(g.description ? { sublabel: g.description } : {}), icon: Boxes as Component, keywords: `${g.label} ${g.description ?? ''}`.toLowerCase(), to: { name: 'group', params: { id: g.id } } });
+    out.push({ id: `grp-${g.id}`, type: 'group', label: g.label, ...(g.description ? { sublabel: g.description } : {}), icon: Boxes as Component, keywords: `${g.label} ${g.description ?? ''}`.toLowerCase(), run: () => ide.setActivity('groups') });
   }
-  // actions globales
-  out.push({ id: 'act-newSession', type: 'action', label: t('palette.actions.newSession'), icon: Plus as Component, keywords: t('palette.actions.newSession').toLowerCase(), to: { name: 'sessions' } });
-  out.push({ id: 'act-addRepo', type: 'action', label: t('palette.actions.addRepo'), icon: FolderPlus as Component, keywords: t('palette.actions.addRepo').toLowerCase(), to: { name: 'dashboard' } });
-  out.push({ id: 'act-newGroup', type: 'action', label: t('palette.actions.newGroup'), icon: Boxes as Component, keywords: t('palette.actions.newGroup').toLowerCase(), to: { name: 'groups' } });
+  // actions globales : ouvrent des modals / panneaux DANS l'IDE.
+  out.push({ id: 'act-newSession', type: 'action', label: t('palette.actions.newSession'), icon: Plus as Component, keywords: t('palette.actions.newSession').toLowerCase(), run: () => void modals.open(NewSessionModal) });
+  out.push({ id: 'act-addRepo', type: 'action', label: t('palette.actions.addRepo'), icon: FolderPlus as Component, keywords: t('palette.actions.addRepo').toLowerCase(), run: () => ide.setActivity('explorer') });
+  out.push({ id: 'act-newGroup', type: 'action', label: t('palette.actions.newGroup'), icon: Boxes as Component, keywords: t('palette.actions.newGroup').toLowerCase(), run: () => void modals.open(GroupCreateModal) });
   return out;
 });
 
@@ -144,8 +156,7 @@ function move(delta: number): void {
 function run(item: PaletteItem | undefined): void {
   if (!item) return;
   close();
-  if (item.run) item.run();
-  else if (item.to) void router.push(item.to);
+  item.run();
 }
 
 watch(open, async (v) => {

packages/web/src/components/DialogPrompt.vue

@@ -1,8 +1,8 @@
 <template>
-  <div v-if="dialog" class="rounded-lg border border-amber-900/60 bg-amber-950/30 p-3">
+  <div v-if="dialog" class="rounded-lg border border-warn/40 bg-warn/15 p-3">
     <div class="flex items-center gap-2">
-      <span class="badge bg-amber-900 text-amber-200">{{ t(`sessions.dialog.kind.${dialog.kind}`) }}</span>
-      <span class="text-sm text-amber-100">{{ dialog.waitingFor ?? t('sessions.dialog.waiting') }}</span>
+      <span class="badge bg-warn/15 text-warn">{{ t(`sessions.dialog.kind.${dialog.kind}`) }}</span>
+      <span class="text-sm text-warn">{{ dialog.waitingFor ?? t('sessions.dialog.waiting') }}</span>
     </div>
     <!-- Options empilées verticalement et pleine largeur : un libellé long (ex. AskUserQuestion) wrappe
          proprement au lieu d'être tronqué/collé au suivant comme avec un flex-wrap horizontal. -->
@@ -11,11 +11,11 @@
         v-for="opt in dialog.options"
         :key="opt.n"
         class="btn w-full items-start justify-start whitespace-normal break-words text-left text-xs"
-        :class="opt.selected ? 'border-amber-400 text-amber-200' : ''"
+        :class="opt.selected ? 'border-warn text-warn' : ''"
         :disabled="busy"
         @click="respond('select', opt.n)"
       >
-        <span class="font-mono text-amber-400">{{ opt.n }}</span>
+        <span class="font-mono text-warn">{{ opt.n }}</span>
         <span class="min-w-0 flex-1">{{ opt.label }}</span>
       </button>
       <button class="btn-danger w-full justify-start text-left text-xs" :disabled="busy" @click="respond('deny')">

packages/web/src/components/DirectoryPicker.vue

@@ -1,32 +1,32 @@
 <template>
-  <section class="flex flex-col gap-2 rounded-lg border border-zinc-800 bg-zinc-950/40 p-2">
+  <section class="flex flex-col gap-2 rounded-lg border border-border bg-surface-0/40 p-2">
     <header class="flex items-center gap-2">
       <button type="button" class="btn text-xs" :disabled="loading || parent === null" @click="load(parent ?? undefined)">
         ↑ {{ t('fs.up') }}
       </button>
-      <span class="min-w-0 flex-1 truncate font-mono text-xs text-zinc-400" :title="current">{{ current }}</span>
+      <span class="min-w-0 flex-1 truncate font-mono text-xs text-fg-muted" :title="current">{{ current }}</span>
       <button type="button" class="btn text-xs" @click="emit('close')">{{ t('common.cancel') }}</button>
     </header>
 
-    <p v-if="error" class="text-sm text-red-400">{{ error }}</p>
+    <p v-if="error" class="text-sm text-danger">{{ error }}</p>
 
     <ul class="flex max-h-60 flex-col gap-0.5 overflow-y-auto">
-      <li v-if="loading" class="px-2 py-1 text-xs text-zinc-500">{{ t('fs.loading') }}</li>
-      <li v-else-if="entries.length === 0" class="px-2 py-1 text-xs text-zinc-500">{{ t('fs.empty') }}</li>
+      <li v-if="loading" class="px-2 py-1 text-xs text-fg-subtle">{{ t('fs.loading') }}</li>
+      <li v-else-if="entries.length === 0" class="px-2 py-1 text-xs text-fg-subtle">{{ t('fs.empty') }}</li>
       <li v-for="e in entries" :key="e.path">
         <button
           type="button"
-          class="flex w-full items-center gap-2 rounded px-2 py-1 text-left text-sm text-zinc-200 hover:bg-zinc-800"
+          class="flex w-full items-center gap-2 rounded px-2 py-1 text-left text-sm text-fg hover:bg-surface-2"
           @click="load(e.path)"
         >
           <span class="flex-1 truncate font-mono">{{ e.name }}</span>
-          <span v-if="e.isRepo" class="badge bg-emerald-950 text-emerald-400">{{ t('fs.repoBadge') }}</span>
+          <span v-if="e.isRepo" class="badge bg-accent/15 text-accent">{{ t('fs.repoBadge') }}</span>
         </button>
       </li>
     </ul>
 
     <footer class="flex items-center gap-2">
-      <label class="flex items-center gap-1 text-xs text-zinc-400">
+      <label class="flex items-center gap-1 text-xs text-fg-muted">
         <input v-model="showHidden" type="checkbox" @change="load(current || undefined)" /> {{ t('fs.showHidden') }}
       </label>
       <button type="button" class="btn-primary ml-auto text-xs" :disabled="loading || current === ''" @click="emit('select', current)">

packages/web/src/components/GroupSessionModal.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" @click.self="emit('close')">
-    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-zinc-800 bg-zinc-900 p-4">
+    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-border bg-surface-1 p-4">
       <header class="flex items-center gap-2">
-        <h2 class="font-semibold text-zinc-100">{{ t('crossRepo.title') }}</h2>
+        <h2 class="font-semibold text-fg">{{ t('crossRepo.title') }}</h2>
         <button class="btn ml-auto text-xs" @click="emit('close')">{{ t('crossRepo.close') }}</button>
       </header>
-      <p class="text-xs text-zinc-500">{{ t('crossRepo.intro') }}</p>
+      <p class="text-xs text-fg-subtle">{{ t('crossRepo.intro') }}</p>
 
       <form class="flex flex-col gap-3" @submit.prevent="onSubmit">
         <!-- mode : couvrir une nouvelle branche par repo, ou les checkouts principaux -->
-        <div class="flex flex-col gap-1 text-xs text-zinc-400">
+        <div class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('crossRepo.modeLabel') }}
           <div class="flex flex-wrap gap-3">
             <label class="flex items-center gap-1.5">
@@ -23,12 +23,12 @@
 
         <!-- mode feature : branche commune créée (ou réutilisée si déjà présente) dans chaque repo -->
         <template v-if="mode === 'feature'">
-          <label class="flex flex-col gap-1 text-xs text-zinc-400">
+          <label class="flex flex-col gap-1 text-xs text-fg-muted">
             {{ t('crossRepo.branchLabel') }}
             <input v-model="branch" class="input font-mono" :placeholder="t('crossRepo.branchPlaceholder')" :required="mode === 'feature'" />
-            <span class="text-[11px] text-zinc-500">{{ t('crossRepo.branchHint') }}</span>
+            <span class="text-[11px] text-fg-subtle">{{ t('crossRepo.branchHint') }}</span>
           </label>
-          <label class="flex flex-col gap-1 text-xs text-zinc-400">
+          <label class="flex flex-col gap-1 text-xs text-fg-muted">
             {{ t('crossRepo.baseRefLabel') }}
             <input v-model="baseRef" class="input font-mono" list="group-base-branches" :placeholder="t('crossRepo.baseRefPlaceholder')" />
             <datalist id="group-base-branches">
@@ -37,7 +37,7 @@
           </label>
         </template>
 
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('crossRepo.commandLabel') }}
           <select v-model="command" class="input">
             <option value="claude">claude</option>
@@ -45,15 +45,15 @@
           </select>
         </label>
 
-        <div class="flex flex-col gap-1 text-xs text-zinc-400">
+        <div class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('crossRepo.reposLabel') }}
           <div class="flex flex-col gap-1">
             <div
               v-for="repo in repos"
               :key="repo.id"
-              class="flex items-center gap-2 rounded border border-zinc-800 bg-zinc-950/40 px-2 py-1"
+              class="flex items-center gap-2 rounded border border-border bg-surface-0/40 px-2 py-1"
             >
-              <span class="flex-1 text-zinc-300">{{ repo.label }}</span>
+              <span class="flex-1 text-fg-muted">{{ repo.label }}</span>
               <span v-if="repoStatus(repo.id)" class="text-[11px]" :class="repoStatusClass(repo.id)">
                 {{ repoStatus(repo.id) }}
               </span>
@@ -61,10 +61,10 @@
           </div>
         </div>
 
-        <p v-if="outcome" class="text-xs" :class="outcome.session ? 'text-emerald-400' : 'text-red-400'">
+        <p v-if="outcome" class="text-xs" :class="outcome.session ? 'text-accent' : 'text-danger'">
           {{ outcome.session ? t('crossRepo.done') : t('crossRepo.sessionFailed') }}
         </p>
-        <p v-if="errorMsg" class="text-xs text-red-400">{{ errorMsg }}</p>
+        <p v-if="errorMsg" class="text-xs text-danger">{{ errorMsg }}</p>
 
         <div class="flex items-center gap-2">
           <button type="submit" class="btn-primary" :disabled="running || (mode === 'feature' && branch.trim() === '') || repos.length === 0">
@@ -78,18 +78,18 @@
 
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import type { RepoBranchesResponse, RepoSummary } from '@arboretum/shared';
 import { useGroupsStore, type CrossRepoResult, type GroupFeatureOutcome } from '../stores/groups';
 import { useWorktreesStore } from '../stores/worktrees';
 import { useToastsStore } from '../stores/toasts';
+import { useIdeStore } from '../stores/ide';
 
 const props = defineProps<{ groupId: string; repos: RepoSummary[] }>();
 const emit = defineEmits<{ close: [] }>();
 
 const { t } = useI18n();
-const router = useRouter();
+const ide = useIdeStore();
 const groups = useGroupsStore();
 const worktrees = useWorktreesStore();
 const toasts = useToastsStore();
@@ -135,8 +135,8 @@ function repoStatus(repoId: string): string {
 }
 function repoStatusClass(repoId: string): string {
   const wt = wtResults.value[repoId];
-  if (wt) return wt.status === 'ok' ? 'text-emerald-400' : 'text-red-400';
-  return skippedById.value[repoId] ? 'text-amber-400' : '';
+  if (wt) return wt.status === 'ok' ? 'text-accent' : 'text-danger';
+  return skippedById.value[repoId] ? 'text-warn' : '';
 }
 
 async function onSubmit(): Promise<void> {
@@ -160,13 +160,14 @@ async function onSubmit(): Promise<void> {
         wtResults.value = { ...wtResults.value, [result.repoId]: result };
       },
     );
-    // Session lancée → on redirige vers son terminal plein écran (comme une session individuelle).
+    // Session lancée → on l'ouvre dans le dock IDE (plus de navigation vers /sessions/:id).
     // En cas d'échec serveur (session null), on garde le modal ouvert avec le statut d'erreur.
     if (outcome.value.session) {
       const failed = outcome.value.skipped.length + outcome.value.worktreeResults.filter((r) => r.status !== 'ok').length;
       if (failed > 0) toasts.info(t('toast.groupSessionPartial', { n: failed }));
       else toasts.success(t('toast.groupSessionLaunched'));
-      await router.push({ name: 'session', params: { id: outcome.value.session.id } });
+      ide.openTerminal(outcome.value.session.id);
+      emit('close');
     }
   } catch (err) {
     errorMsg.value = err instanceof Error ? err.message : String(err);

packages/web/src/components/LanguageSwitcher.vue

@@ -2,7 +2,7 @@
   <select
     :value="locale"
     :aria-label="t('common.language')"
-    class="rounded-md border border-zinc-700 bg-zinc-900 px-1.5 py-1 text-xs text-zinc-300 outline-none focus:border-zinc-400"
+    class="rounded-md border border-border-strong bg-surface-1 px-1.5 py-1 text-xs text-fg-muted outline-none focus:border-accent"
     @change="onChange"
   >
     <option value="en">EN</option>

packages/web/src/components/ListToolbar.vue

@@ -1,87 +0,0 @@
-<template>
-  <div class="flex flex-col gap-2">
-    <div class="flex flex-col gap-2 sm:flex-row sm:items-center">
-      <!-- recherche -->
-      <div class="relative flex-1">
-        <Search :size="15" class="pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 text-zinc-500" />
-        <input
-          v-model="searchModel"
-          type="search"
-          class="input pl-8"
-          :placeholder="t(searchPlaceholderKey ?? 'controls.searchPlaceholder')"
-        />
-      </div>
-
-      <!-- tri : clé + direction -->
-      <div class="flex items-center gap-1.5">
-        <label class="sr-only" :for="sortId">{{ t('controls.sortBy') }}</label>
-        <select :id="sortId" class="input w-auto" :value="controls.sortKey.value" @change="onSortChange">
-          <option v-for="def in controls.sortDefs" :key="def.key" :value="def.key">{{ t(def.labelKey) }}</option>
-        </select>
-        <BaseButton
-          variant="ghost"
-          size="sm"
-          icon-only
-          :icon="controls.sortDir.value === 'asc' ? ArrowUp : ArrowDown"
-          :aria-label="t(controls.sortDir.value === 'asc' ? 'sort.asc' : 'sort.desc')"
-          @click="controls.setSort(controls.sortKey.value)"
-        />
-      </div>
-    </div>
-
-    <!-- chips de filtre + compteur (le compteur s'affiche même sans filtres) -->
-    <div class="flex flex-wrap items-center gap-1.5">
-      <template v-for="def in controls.filterDefs.value" :key="def.key">
-        <button
-          v-for="opt in def.options"
-          :key="def.key + ':' + opt.value"
-          type="button"
-          class="rounded-full border px-2 py-0.5 text-xs transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/50"
-          :class="isActive(def.key, opt.value)
-            ? 'border-sky-700 bg-sky-950/40 text-sky-300'
-            : 'border-zinc-700 text-zinc-400 hover:border-zinc-600 hover:text-zinc-200'"
-          @click="controls.toggleFilter(def.key, opt.value)"
-        >
-          {{ opt.labelKey ? t(opt.labelKey) : opt.label }}
-        </button>
-      </template>
-
-      <BaseButton
-        v-if="controls.activeFilterCount.value > 0 || controls.search.value"
-        variant="ghost"
-        size="sm"
-        :icon="X"
-        @click="controls.clearAll()"
-      >
-        {{ t('controls.clearAll') }}
-      </BaseButton>
-
-      <span class="ml-auto text-xs text-zinc-500">{{ t('controls.results', controls.total.value) }}</span>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts" generic="T">
-import { computed, useId } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { Search, ArrowUp, ArrowDown, X } from '@lucide/vue';
-import BaseButton from './ui/BaseButton.vue';
-import type { ListToolbarControls } from '../composables/useListControls';
-
-const props = defineProps<{ controls: ListToolbarControls<T>; searchPlaceholderKey?: string }>();
-const { t } = useI18n();
-const sortId = useId();
-
-const searchModel = computed({
-  get: () => props.controls.search.value,
-  set: (v: string) => props.controls.setSearch(v),
-});
-
-function onSortChange(e: Event): void {
-  props.controls.setSort((e.target as HTMLSelectElement).value);
-}
-
-function isActive(key: string, value: string): boolean {
-  return props.controls.filters.value[key]?.has(value) ?? false;
-}
-</script>

packages/web/src/components/NewProjectModal.vue

@@ -1,19 +1,19 @@
 <template>
   <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" @click.self="emit('close')">
-    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-zinc-800 bg-zinc-900 p-4">
+    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-border bg-surface-1 p-4">
       <header class="flex items-center gap-2">
-        <h2 class="font-semibold text-zinc-100">{{ t('project.title') }}</h2>
+        <h2 class="font-semibold text-fg">{{ t('project.title') }}</h2>
         <button class="btn ml-auto text-xs" @click="emit('close')">{{ t('common.cancel') }}</button>
       </header>
-      <p class="text-xs text-zinc-500">{{ t('project.intro') }}</p>
+      <p class="text-xs text-fg-subtle">{{ t('project.intro') }}</p>
 
       <form class="flex flex-col gap-3" @submit.prevent="onSubmit">
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('project.nameLabel') }}
           <input v-model="name" class="input font-mono" :placeholder="t('project.namePlaceholder')" required :disabled="creating" />
         </label>
 
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('project.rootLabel') }}
           <input v-model="root" class="input font-mono" :placeholder="t('project.rootPlaceholder')" required :disabled="creating" />
         </label>
@@ -22,11 +22,11 @@
         </div>
         <DirectoryPicker v-if="showPicker" mode="dir" :initial-path="root" @select="onPickRoot" @close="showPicker = false" />
 
-        <label class="flex items-center gap-2 text-xs text-zinc-300">
+        <label class="flex items-center gap-2 text-xs text-fg-muted">
           <input v-model="gitInit" type="checkbox" :disabled="creating" /> {{ t('project.gitInit') }}
         </label>
 
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('project.commandLabel') }}
           <select v-model="command" class="input" :disabled="creating">
             <option value="claude">claude</option>
@@ -34,8 +34,8 @@
           </select>
         </label>
 
-        <p class="font-mono text-[11px] text-zinc-500">{{ previewPath }}</p>
-        <p v-if="errorMsg" class="text-xs text-red-400">{{ errorMsg }}</p>
+        <p class="font-mono text-[11px] text-fg-subtle">{{ previewPath }}</p>
+        <p v-if="errorMsg" class="text-xs text-danger">{{ errorMsg }}</p>
 
         <div class="flex items-center gap-2">
           <button type="submit" class="btn-primary" :disabled="creating || name.trim() === '' || root.trim() === ''">
@@ -49,17 +49,17 @@
 
 <script setup lang="ts">
 import { computed, onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useSessionsStore } from '../stores/sessions';
 import { useSettingsStore } from '../stores/settings';
 import { useToastsStore } from '../stores/toasts';
+import { useIdeStore } from '../stores/ide';
 import DirectoryPicker from './DirectoryPicker.vue';
 
 const emit = defineEmits<{ close: [] }>();
 
 const { t } = useI18n();
-const router = useRouter();
+const ide = useIdeStore();
 const sessions = useSessionsStore();
 const settings = useSettingsStore();
 const toasts = useToastsStore();
@@ -109,7 +109,8 @@ async function onSubmit(): Promise<void> {
     });
     toasts.success(t('toast.projectCreated'));
     emit('close');
-    await router.push({ name: 'session', params: { id: res.session.id } });
+    // Ouvre la session dans le dock IDE (plus de navigation vers l'ancienne vue /sessions/:id).
+    ide.openTerminal(res.session.id);
   } catch (err) {
     errorMsg.value = err instanceof Error ? err.message : String(err);
   } finally {

packages/web/src/components/Pagination.vue

@@ -1,47 +0,0 @@
-<template>
-  <div v-if="pageCount > 1 || pageSize !== defaultSize" class="flex flex-wrap items-center justify-between gap-2 text-xs text-zinc-500">
-    <div class="flex items-center gap-2">
-      <label class="flex items-center gap-1.5">
-        {{ t('pagination.perPage') }}
-        <select class="input w-auto py-1" :value="pageSize" @change="onSize">
-          <option v-for="opt in pageSizeOptions" :key="opt" :value="opt">{{ opt === 0 ? t('pagination.all') : opt }}</option>
-        </select>
-      </label>
-    </div>
-    <div v-if="pageCount > 1" class="flex items-center gap-2">
-      <BaseButton variant="ghost" size="sm" :icon="ChevronLeft" :disabled="page <= 1" @click="emit('update:page', page - 1)">
-        {{ t('pagination.prev') }}
-      </BaseButton>
-      <span>{{ t('pagination.pageOf', { page, pageCount }) }}</span>
-      <BaseButton variant="ghost" size="sm" :disabled="page >= pageCount" @click="emit('update:page', page + 1)">
-        {{ t('pagination.next') }}
-        <ChevronRight :size="15" />
-      </BaseButton>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n';
-import { ChevronLeft, ChevronRight } from '@lucide/vue';
-import BaseButton from './ui/BaseButton.vue';
-
-const { t } = useI18n();
-
-withDefaults(
-  defineProps<{
-    page: number;
-    pageCount: number;
-    pageSize: number;
-    pageSizeOptions?: number[];
-    defaultSize?: number;
-  }>(),
-  { pageSizeOptions: () => [25, 50, 100, 0], defaultSize: 25 },
-);
-
-const emit = defineEmits<{ 'update:page': [number]; 'update:pageSize': [number] }>();
-
-function onSize(e: Event): void {
-  emit('update:pageSize', Number((e.target as HTMLSelectElement).value));
-}
-</script>

packages/web/src/components/RepoSection.vue

@@ -1,200 +0,0 @@
-<template>
-  <section class="card flex flex-col gap-2">
-    <header class="flex flex-wrap items-center gap-2">
-      <h2 class="font-semibold text-zinc-100">{{ repo.label }}</h2>
-      <BaseBadge v-if="!repo.valid" tone="red">{{ t('repos.invalid') }}</BaseBadge>
-      <span class="truncate font-mono text-xs text-zinc-500" :title="repo.path">{{ repo.path }}</span>
-      <div class="ml-auto flex items-center gap-2">
-        <BaseButton size="sm" :icon="Plus" @click="creating = !creating">{{ t('worktrees.startWork') }}</BaseButton>
-        <BaseButton size="sm" :icon="Scissors" :loading="busy" @click="onPrune">{{ t('worktrees.prune') }}</BaseButton>
-        <BaseButton
-          size="sm"
-          icon-only
-          :icon="repo.hidden ? Eye : EyeOff"
-          :aria-label="repo.hidden ? t('repos.show') : t('repos.hide')"
-          @click="onToggleHidden"
-        />
-        <BaseButton variant="danger" size="sm" icon-only :icon="Trash2" :aria-label="t('repos.remove')" @click="onRemove" />
-      </div>
-    </header>
-
-    <form v-if="creating" class="card-inset flex flex-col gap-2" @submit.prevent="onCreate">
-      <!-- mode : créer un worktree dédié, ou bosser directement sur le checkout principal -->
-      <div class="flex flex-wrap items-center gap-3 text-xs text-zinc-400">
-        {{ t('worktrees.modeLabel') }}
-        <label class="flex items-center gap-1.5"><input v-model="mode" type="radio" value="worktree" /> {{ t('worktrees.modeWorktree') }}</label>
-        <label class="flex items-center gap-1.5"><input v-model="mode" type="radio" value="main" /> {{ t('worktrees.modeMain') }}</label>
-      </div>
-
-      <div class="flex flex-wrap items-end gap-2">
-        <!-- mode worktree : branche (créée si absente, réutilisée si présente) + branche de base + session -->
-        <template v-if="mode === 'worktree'">
-          <label class="flex flex-1 flex-col gap-1 text-xs text-zinc-400">
-            {{ t('worktrees.branch') }}
-            <input v-model="branch" class="input font-mono" placeholder="feature/…" required />
-          </label>
-          <label class="flex flex-col gap-1 text-xs text-zinc-400">
-            {{ t('worktrees.baseRefLabel') }}
-            <input v-model="baseRef" class="input font-mono" :list="datalistId" :placeholder="t('worktrees.baseRefPlaceholder')" />
-            <datalist :id="datalistId">
-              <option v-for="b in baseBranchOptions" :key="b" :value="b" />
-            </datalist>
-          </label>
-          <label class="flex flex-col gap-1 text-xs text-zinc-400">
-            {{ t('worktrees.start') }}
-            <select v-model="startSession" class="input">
-              <option :value="null">{{ t('worktrees.startNone') }}</option>
-              <option value="claude">claude</option>
-              <option value="bash">bash</option>
-            </select>
-          </label>
-        </template>
-
-        <!-- mode branche principale : option git (branche actuelle ou nouvelle branche) + commande -->
-        <template v-else>
-          <label class="flex flex-col gap-1 text-xs text-zinc-400">
-            {{ t('worktrees.branchModeLabel') }}
-            <select v-model="mainBranchMode" class="input">
-              <option value="current">{{ t('worktrees.currentBranch') }}</option>
-              <option value="new">{{ t('worktrees.newBranchOpt') }}</option>
-            </select>
-          </label>
-          <label v-if="mainBranchMode === 'new'" class="flex flex-1 flex-col gap-1 text-xs text-zinc-400">
-            {{ t('worktrees.branch') }}
-            <input v-model="branch" class="input font-mono" placeholder="feature/…" />
-          </label>
-          <label class="flex flex-col gap-1 text-xs text-zinc-400">
-            {{ t('worktrees.commandLabel') }}
-            <select v-model="mainCommand" class="input">
-              <option value="claude">claude</option>
-              <option value="bash">bash</option>
-            </select>
-          </label>
-        </template>
-
-        <BaseButton type="submit" variant="primary" size="sm" :loading="busy" :disabled="!canSubmit">
-          {{ mode === 'worktree' ? t('worktrees.create') : t('worktrees.start') }}
-        </BaseButton>
-      </div>
-    </form>
-    <p v-if="error" class="text-sm text-red-400">{{ error }}</p>
-
-    <div class="flex flex-col gap-1.5">
-      <WorktreeCard v-for="w in worktrees" :key="w.path" :worktree="w" />
-      <p v-if="worktrees.length === 0" class="px-1 text-xs text-zinc-600">{{ t('worktrees.noSession') }}</p>
-    </div>
-  </section>
-</template>
-
-<script setup lang="ts">
-import { computed, ref, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { Eye, EyeOff, Plus, Scissors, Trash2 } from '@lucide/vue';
-import type { RepoBranchesResponse, RepoSummary } from '@arboretum/shared';
-import { useWorktreesStore } from '../stores/worktrees';
-import { useWorktreeView } from '../composables/useWorktreeView';
-import { useToastsStore } from '../stores/toasts';
-import WorktreeCard from './WorktreeCard.vue';
-import BaseButton from './ui/BaseButton.vue';
-import BaseBadge from './ui/BaseBadge.vue';
-
-const props = defineProps<{ repo: RepoSummary }>();
-const { t } = useI18n();
-const store = useWorktreesStore();
-const view = useWorktreeView();
-const toasts = useToastsStore();
-
-// applique le tri/filtre/recherche partagé (toolbar du dashboard) aux worktrees de ce repo.
-const worktrees = computed(() => view.apply(store.worktreesForRepo(props.repo.id)));
-const creating = ref(false);
-const mode = ref<'worktree' | 'main'>('worktree');
-const branch = ref('');
-const baseRef = ref('');
-const startSession = ref<'claude' | 'bash' | null>(null);
-const mainBranchMode = ref<'current' | 'new'>('current');
-const mainCommand = ref<'claude' | 'bash'>('claude');
-const busy = ref(false);
-const error = ref<string | null>(null);
-
-// Sélecteur de branche de base (chargé paresseusement à l'ouverture du formulaire).
-const branches = ref<RepoBranchesResponse | null>(null);
-const datalistId = computed(() => `wt-base-branches-${props.repo.id}`);
-const baseBranchOptions = computed<string[]>(() => {
-  const b = branches.value;
-  if (!b) return [];
-  return Array.from(new Set([...(b.default ? [b.default] : []), ...b.local, ...b.remote]));
-});
-watch(creating, async (open) => {
-  if (!open || branches.value) return;
-  try {
-    branches.value = await store.fetchBranches(props.repo.id);
-  } catch {
-    /* le sélecteur de base est facultatif */
-  }
-});
-
-// worktree : branche obligatoire ; branche principale + nouvelle branche : branche obligatoire ; sinon OK.
-const canSubmit = computed(() =>
-  mode.value === 'worktree' ? branch.value.trim() !== '' : mainBranchMode.value === 'current' || branch.value.trim() !== '',
-);
-
-async function onCreate(): Promise<void> {
-  busy.value = true;
-  error.value = null;
-  try {
-    if (mode.value === 'worktree') {
-      await store.createWorktree(props.repo.id, {
-        branch: branch.value.trim(),
-        mode: 'auto', // détecte créer / checkout / suivi remote
-        ...(baseRef.value.trim() ? { baseRef: baseRef.value.trim() } : {}),
-        startSession: startSession.value,
-      });
-      toasts.success(t('toast.worktreeCreated'));
-    } else {
-      // bosser sur la branche principale : session dans le checkout principal, avec création de branche optionnelle.
-      await store.startMainSession(props.repo.id, {
-        command: mainCommand.value,
-        ...(mainBranchMode.value === 'new' ? { branch: branch.value.trim(), newBranch: true } : {}),
-      });
-      toasts.success(t('toast.sessionCreated'));
-    }
-    branch.value = '';
-    baseRef.value = '';
-    creating.value = false;
-  } catch (err) {
-    error.value = err instanceof Error ? err.message : String(err);
-  } finally {
-    busy.value = false;
-  }
-}
-
-async function onPrune(): Promise<void> {
-  busy.value = true;
-  error.value = null;
-  try {
-    await store.prune(props.repo.id);
-    toasts.success(t('toast.pruned'));
-  } catch (err) {
-    toasts.error(err);
-  } finally {
-    busy.value = false;
-  }
-}
-
-async function onRemove(): Promise<void> {
-  try {
-    await store.removeRepo(props.repo.id);
-    toasts.success(t('toast.repoRemoved'));
-  } catch (err) {
-    toasts.error(err);
-  }
-}
-
-async function onToggleHidden(): Promise<void> {
-  try {
-    await store.setHidden(props.repo.id, !props.repo.hidden);
-  } catch (err) {
-    toasts.error(err);
-  }
-}
-</script>

packages/web/src/components/SessionContextBar.vue

@@ -1,82 +0,0 @@
-<template>
-  <!-- Barre de contexte sous l'en-tête : groupe + repos couverts (avec branche). Masquée s'il n'y a
-       rien d'utile à montrer (session simple dans un dossier non reconnu → le cwd du header suffit). -->
-  <div v-if="shouldShow" class="flex flex-wrap items-center gap-x-3 gap-y-1 border-b border-zinc-800 bg-zinc-900/40 px-3 py-1.5 text-xs">
-    <RouterLink
-      v-if="group"
-      :to="{ name: 'group', params: { id: group.id } }"
-      class="flex items-center gap-1.5 rounded px-1.5 py-0.5 text-zinc-200 transition-colors hover:bg-zinc-800"
-      :title="t('terminal.group')"
-    >
-      <span class="h-2.5 w-2.5 shrink-0 rounded-full" :style="{ backgroundColor: group.color ?? '#52525b' }" />
-      <span class="font-medium">{{ group.label }}</span>
-      <span class="text-zinc-500">→</span>
-    </RouterLink>
-
-    <span v-if="group" class="text-zinc-600">{{ t('terminal.covers') }}</span>
-
-    <span
-      v-for="e in entries"
-      :key="e.dir"
-      class="flex items-center gap-1.5 rounded bg-zinc-950/60 px-1.5 py-0.5"
-      :title="e.dir"
-    >
-      <span class="font-mono text-zinc-300">{{ e.label }}</span>
-      <span v-if="e.branch" class="badge bg-zinc-800 font-mono text-zinc-400">{{ e.branch }}</span>
-    </span>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import type { SessionSummary } from '@arboretum/shared';
-import { useGroupsStore } from '../stores/groups';
-import { useWorktreesStore } from '../stores/worktrees';
-
-const props = defineProps<{ session: SessionSummary }>();
-const { t } = useI18n();
-const groups = useGroupsStore();
-const worktrees = useWorktreesStore();
-
-const group = computed(() => (props.session.groupId ? (groups.byId(props.session.groupId) ?? null) : null));
-
-function basename(dir: string): string {
-  return dir.split('/').filter(Boolean).pop() ?? dir;
-}
-
-interface CoverEntry {
-  dir: string;
-  label: string;
-  branch: string | null;
-  resolved: boolean;
-}
-
-// Résout un répertoire couvert vers repo + branche : worktree exact d'abord (branche connue),
-// sinon checkout principal d'un repo, sinon dernier segment du chemin (non résolu).
-function resolve(dir: string): CoverEntry {
-  const wt = worktrees.worktrees.find((w) => w.path === dir);
-  if (wt) {
-    const repo = worktrees.repos.find((r) => r.id === wt.repoId);
-    return { dir, label: repo?.label ?? basename(dir), branch: wt.branch, resolved: true };
-  }
-  const repo = worktrees.repos.find((r) => r.path === dir);
-  if (repo) return { dir, label: repo.label, branch: null, resolved: true };
-  return { dir, label: basename(dir), branch: null, resolved: false };
-}
-
-const entries = computed<CoverEntry[]>(() => {
-  const dirs = [props.session.cwd, ...(props.session.addedDirs ?? [])];
-  const seen = new Set<string>();
-  const out: CoverEntry[] = [];
-  for (const d of dirs) {
-    if (seen.has(d)) continue;
-    seen.add(d);
-    out.push(resolve(d));
-  }
-  return out;
-});
-
-// Afficher si on est dans un groupe, ou si au moins un répertoire correspond à un repo connu.
-const shouldShow = computed(() => group.value !== null || entries.value.some((e) => e.resolved));
-</script>

packages/web/src/components/SessionStateBadge.vue

@@ -1,10 +1,10 @@
 <template>
-  <span v-if="!session.live && session.resumable" class="badge bg-amber-950 text-amber-400">
+  <span v-if="!session.live && session.resumable" class="badge bg-warn/15 text-warn">
     {{ t('sessions.resumable') }}
   </span>
-  <span v-else-if="!session.live" class="badge bg-zinc-800 text-zinc-500">{{ t('sessions.statusLabel.exited') }}</span>
+  <span v-else-if="!session.live" class="badge bg-surface-2 text-fg-subtle">{{ t('sessions.statusLabel.exited') }}</span>
   <span v-else class="badge gap-1" :class="badgeClass">
-    <span class="inline-block h-1.5 w-1.5 rounded-full" :class="dotClass" />
+    <span class="inline-block h-2 w-2 rounded-full" :class="dotClass" />
     {{ label }}
   </span>
 </template>

packages/web/src/components/TerminalCell.vue

@@ -1,70 +0,0 @@
-<template>
-  <!-- focus-within → anneau visuel : montre quelle cellule reçoit la frappe clavier -->
-  <div class="flex min-h-0 flex-col overflow-hidden rounded-lg border border-zinc-800 bg-surface-0 focus-within:ring-2 focus-within:ring-sky-600">
-    <header class="flex items-center gap-2 border-b border-zinc-800 px-2 py-1">
-      <SessionStateBadge :session="session" />
-      <span class="truncate font-mono text-xs text-zinc-300" :title="session.cwd">{{ title }}</span>
-      <span
-        v-if="spannedCount > 1"
-        class="shrink-0 rounded-full border border-sky-800/60 bg-sky-950/40 px-1.5 py-0.5 text-[10px] text-sky-300"
-        :title="spannedDirs.join('\n')"
-      >
-        {{ t('groups.spanBadge', spannedCount) }}
-      </span>
-      <span class="ml-auto shrink-0 font-mono text-[11px] text-zinc-500">{{ session.command }}</span>
-      <button
-        class="shrink-0 rounded p-0.5 text-zinc-500 transition-colors hover:text-zinc-200"
-        :aria-label="t('terminal.openFullscreen')"
-        :title="t('terminal.openFullscreen')"
-        @click="emit('open-fullscreen')"
-      >
-        <Expand class="h-3.5 w-3.5" />
-      </button>
-      <button
-        class="shrink-0 rounded p-0.5 text-zinc-500 transition-colors hover:text-zinc-200"
-        :aria-label="maximized ? t('terminal.restore') : t('terminal.maximize')"
-        :title="maximized ? t('terminal.restore') : t('terminal.maximize')"
-        @click="emit('toggle-maximize')"
-      >
-        <component :is="maximized ? Minimize2 : Maximize2" class="h-3.5 w-3.5" />
-      </button>
-    </header>
-    <DialogPrompt v-if="isWaiting" :session="session" class="px-2 pt-2" />
-    <div class="min-h-0 flex-1">
-      <TerminalView :session-id="session.id" mode="interactive" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { Expand, Maximize2, Minimize2 } from '@lucide/vue';
-import type { SessionSummary } from '@arboretum/shared';
-import { useWorktreesStore } from '../stores/worktrees';
-import SessionStateBadge from './SessionStateBadge.vue';
-import DialogPrompt from './DialogPrompt.vue';
-import TerminalView from './TerminalView.vue';
-
-const props = defineProps<{ session: SessionSummary; maximized?: boolean }>();
-const emit = defineEmits<{ 'toggle-maximize': []; 'open-fullscreen': [] }>();
-const worktrees = useWorktreesStore();
-const { t } = useI18n();
-
-// session de groupe (P6) : couvre plusieurs répertoires via --add-dir → badge « groupe · N dépôts ».
-const spannedDirs = computed(() => [props.session.cwd, ...(props.session.addedDirs ?? [])]);
-const spannedCount = computed(() => spannedDirs.value.length);
-
-// libellé : « repo · branche » si le worktree est connu, sinon le dernier segment du cwd.
-const title = computed(() => {
-  const wt = worktrees.worktrees.find((w) => w.path === props.session.cwd);
-  if (wt) {
-    const repo = worktrees.repos.find((r) => r.id === wt.repoId);
-    const branch = wt.branch ?? wt.head.slice(0, 7);
-    return repo ? `${repo.label} · ${branch}` : branch;
-  }
-  return props.session.cwd.split('/').filter(Boolean).pop() ?? props.session.cwd;
-});
-
-const isWaiting = computed(() => props.session.live && props.session.activity === 'waiting' && !!props.session.dialog);
-</script>

packages/web/src/components/TerminalGrid.vue

@@ -1,64 +0,0 @@
-<template>
-  <div class="flex flex-col gap-2">
-    <p v-if="sessions.length === 0" class="text-sm text-zinc-500">{{ t('groups.gridEmpty') }}</p>
-    <template v-else>
-      <p v-if="!activeMax && sessions.length > MAX_CELLS" class="text-xs text-amber-400">
-        {{ t('groups.gridCapped', { shown: MAX_CELLS, total: sessions.length }) }}
-      </p>
-      <!-- une seule socket WS multiplexe tous les terminaux ; cap dur pour préserver GPU/canaux.
-           Sur mobile la grille retombe à une colonne (empilement). Hauteur relative au viewport
-           (dvh) : terminaux grands sur PC, exploitables sur mobile ; xterm re-fit via ResizeObserver.
-           Plancher min-h-80 pour les fenêtres courtes. -->
-      <!-- une cellule maximisée → plein cadre ; sinon la grille responsive -->
-      <div v-if="activeMax" class="grid grid-cols-1">
-        <TerminalCell
-          :session="activeMax"
-          maximized
-          class="h-[calc(100dvh-8rem)] min-h-80"
-          @toggle-maximize="toggleMax(activeMax.id)"
-          @open-fullscreen="openFullscreen(activeMax.id)"
-        />
-      </div>
-      <div v-else class="grid grid-cols-1 gap-3 lg:grid-cols-2 2xl:grid-cols-3">
-        <TerminalCell
-          v-for="s in shown"
-          :key="s.id"
-          :session="s"
-          class="h-[68dvh] min-h-80 lg:h-[calc((100dvh-9rem)/2)]"
-          @toggle-maximize="toggleMax(s.id)"
-          @open-fullscreen="openFullscreen(s.id)"
-        />
-      </div>
-    </template>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import type { SessionSummary } from '@arboretum/shared';
-import TerminalCell from './TerminalCell.vue';
-
-const props = defineProps<{ sessions: SessionSummary[] }>();
-const { t } = useI18n();
-const router = useRouter();
-
-const MAX_CELLS = 6;
-const shown = computed(() => props.sessions.slice(0, MAX_CELLS));
-
-// ouvrir le terminal choisi en plein écran (page dédiée /sessions/:id), comme depuis la liste des sessions.
-function openFullscreen(id: string): void {
-  void router.push({ name: 'session', params: { id } });
-}
-
-// Maximisation d'une cellule au choix (état purement présentation, local à la grille). Si la session
-// maximisée disparaît (terminée), on retombe automatiquement sur la grille.
-const maximizedId = ref<string | null>(null);
-function toggleMax(id: string): void {
-  maximizedId.value = maximizedId.value === id ? null : id;
-}
-const activeMax = computed<SessionSummary | null>(() =>
-  maximizedId.value ? (shown.value.find((s) => s.id === maximizedId.value) ?? null) : null,
-);
-</script>

packages/web/src/components/TerminalView.vue

@@ -3,13 +3,13 @@
     <div ref="container" class="h-full w-full" />
     <div
       v-if="!controlling && !ended"
-      class="pointer-events-none absolute top-2 right-4 rounded bg-zinc-800/90 px-2 py-0.5 text-xs text-amber-300"
+      class="pointer-events-none absolute top-2 right-4 rounded-md bg-surface-2/90 px-2 py-0.5 text-xs text-warn"
     >
       {{ t('terminal.observer') }}
     </div>
     <div
       v-if="ended"
-      class="absolute inset-x-0 top-0 bg-red-950/90 px-4 py-2 text-center text-sm text-red-200"
+      class="absolute inset-x-0 top-0 border-b border-danger/40 bg-danger/15 px-4 py-2 text-center text-sm text-danger"
     >
       {{ t('terminal.sessionEnded') }}
     </div>
@@ -19,13 +19,14 @@
 <script setup lang="ts">
 // Terminal xterm branché sur le client WS multiplexé : stdin, resize (seulement
 // si controlling), flow control et resync entièrement délégués au ws-client.
-import { onBeforeUnmount, onMounted, ref, useTemplateRef } from 'vue';
+import { onBeforeUnmount, onMounted, ref, useTemplateRef, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Terminal } from '@xterm/xterm';
 import { FitAddon } from '@xterm/addon-fit';
 import '@xterm/xterm/css/xterm.css';
 import { wsClient, type Attachment } from '../lib/ws-client';
-import { TERMINAL_THEME, TERMINAL_FONT_FAMILY } from '../lib/terminal-theme';
+import { terminalTheme, TERMINAL_FONT_FAMILY } from '../lib/terminal-theme';
+import { resolvedTheme } from '../lib/theme';
 
 const props = withDefaults(defineProps<{ sessionId: string; mode?: 'interactive' | 'observer' }>(), {
   mode: 'interactive',
@@ -41,17 +42,27 @@ let attachment: Attachment | null = null;
 let resizeObserver: ResizeObserver | null = null;
 let intersectionObserver: IntersectionObserver | null = null;
 let onVisible: (() => void) | null = null;
+let stopThemeWatch: (() => void) | null = null;
 let disposed = false;
 
 onMounted(async () => {
   if (!container.value) return;
 
+  // Charge la fonte mono AVANT d'ouvrir xterm : sinon les cellules sont mesurées avec la fonte
+  // système puis désalignées quand 'JetBrains Mono Variable' arrive (refit ci-dessous en filet).
+  try {
+    await document.fonts?.load('13px "JetBrains Mono Variable"');
+  } catch {
+    /* Font Loading API indisponible : refit corrigera après chargement */
+  }
+  if (disposed || !container.value) return;
+
   term = new Terminal({
     cursorBlink: true,
     fontSize: 13,
     fontFamily: TERMINAL_FONT_FAMILY,
     scrollback: 20_000, // absorbe le replay élargi (REPLAY_TAIL_BYTES = 1 Mo) → on remonte plus loin
-    theme: TERMINAL_THEME,
+    theme: terminalTheme(resolvedTheme.value),
   });
   const fit = new FitAddon();
   term.loadAddon(fit);
@@ -91,6 +102,15 @@ onMounted(async () => {
     activeTerm.refresh(0, activeTerm.rows - 1);
   };
 
+  // Filet : re-mesure quand la fonte web est prête (au cas où le load ci-dessus n'a pas suffi).
+  void document.fonts?.ready.then(() => {
+    if (!disposed) refit();
+  });
+  // Repeint xterm lors d'une bascule de thème clair/sombre (sans recréer le terminal).
+  stopThemeWatch = watch(resolvedTheme, (r) => {
+    if (term) term.options.theme = terminalTheme(r);
+  });
+
   try {
     attachment = await wsClient.attach({
       sessionId: props.sessionId,
@@ -152,6 +172,7 @@ onMounted(async () => {
 
 onBeforeUnmount(() => {
   disposed = true;
+  stopThemeWatch?.();
   resizeObserver?.disconnect();
   intersectionObserver?.disconnect();
   if (onVisible) document.removeEventListener('visibilitychange', onVisible);

packages/web/src/components/ToastContainer.vue

@@ -12,7 +12,7 @@
         <component :is="icon(toast.kind)" :size="16" class="mt-0.5 shrink-0" />
         <span class="min-w-0 flex-1 break-words text-sm">{{ toast.message }}</span>
         <button
-          class="shrink-0 rounded p-0.5 opacity-70 transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-zinc-400/50"
+          class="shrink-0 rounded p-0.5 opacity-70 transition-opacity hover:opacity-100 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-border-strong/50"
           :aria-label="t('toast.dismiss')"
           @click="store.dismiss(toast.id)"
         >
@@ -32,9 +32,9 @@ const { t } = useI18n();
 const store = useToastsStore();
 
 function toneClass(kind: ToastKind): string {
-  if (kind === 'success') return 'border-emerald-800 bg-emerald-950 text-emerald-200';
-  if (kind === 'error') return 'border-red-800 bg-red-950 text-red-200';
-  return 'border-zinc-700 bg-zinc-900 text-zinc-200';
+  if (kind === 'success') return 'border-accent/40 bg-accent/15 text-accent';
+  if (kind === 'error') return 'border-danger/40 bg-danger/15 text-danger';
+  return 'border-border-strong bg-surface-1 text-fg';
 }
 function icon(kind: ToastKind) {
   return kind === 'success' ? CheckCircle2 : kind === 'error' ? AlertTriangle : Info;

packages/web/src/components/WorktreeCard.vue

@@ -1,287 +0,0 @@
-<template>
-  <div class="rounded border border-zinc-800 bg-zinc-900/40 p-2">
-    <div class="flex items-center gap-2">
-      <span class="font-mono text-sm text-zinc-200">{{ branchLabel }}</span>
-      <span v-if="worktree.isMain" class="badge bg-zinc-800 text-zinc-400">{{ t('worktrees.main') }}</span>
-      <span v-if="worktree.locked" class="badge bg-zinc-800 text-zinc-500">{{ t('worktrees.locked') }}</span>
-      <span v-if="worktree.prunable" class="badge bg-zinc-800 text-zinc-500">{{ t('worktrees.prunable') }}</span>
-      <span class="ml-auto flex items-center gap-2 text-xs text-zinc-500">
-        <span v-if="worktree.git.ahead">↑{{ worktree.git.ahead }}</span>
-        <span v-if="worktree.git.behind">↓{{ worktree.git.behind }}</span>
-        <span v-if="worktree.git.dirtyCount" class="text-amber-400">● {{ t('worktrees.dirty', { n: worktree.git.dirtyCount }) }}</span>
-        <span v-else class="text-zinc-600">{{ t('worktrees.clean') }}</span>
-      </span>
-    </div>
-    <p class="truncate font-mono text-xs text-zinc-500" :title="worktree.path">{{ worktree.path }}</p>
-
-    <div class="mt-1 flex flex-wrap items-center gap-2">
-      <RouterLink class="btn text-xs" :to="{ name: 'workspace', params: { repoId: worktree.repoId, wt: encodeWtKey(worktree.path) } }">
-        {{ t('workspace.open') }}
-      </RouterLink>
-      <RouterLink
-        v-for="s in visibleSessions"
-        :key="s.id"
-        :to="{ name: 'session', params: { id: s.id } }"
-        class="flex items-center gap-1 rounded bg-zinc-800/60 px-1.5 py-0.5 transition-colors hover:bg-zinc-800"
-      >
-        <SessionStateBadge :session="liveSession(s)" />
-        <span class="font-mono text-[11px] text-zinc-400">{{ s.command }}</span>
-      </RouterLink>
-      <!-- sessions externes (lancées hors Arboretum) masquées par défaut : chip de révélation -->
-      <button
-        v-if="!store.showExternalSessions && externalCount > 0"
-        type="button"
-        class="rounded bg-zinc-800/40 px-1.5 py-0.5 text-[11px] text-zinc-500 transition-colors hover:text-zinc-300"
-        @click="store.showExternalSessions = true"
-      >
-        +{{ externalCount }} {{ t('worktrees.externalSessions') }}
-      </button>
-      <span v-if="visibleSessions.length === 0 && externalCount === 0" class="text-xs text-zinc-600">{{ t('worktrees.noSession') }}</span>
-
-      <!-- lancement d'une session sur ce worktree ; carte principale = bosser sur la branche principale -->
-      <button v-if="hasLiveSession && !showLauncher" class="btn text-xs" @click="showLauncher = true">+ {{ t('worktrees.start') }}</button>
-      <form v-if="!hasLiveSession || showLauncher" class="flex flex-wrap items-center gap-1" @submit.prevent="onStart">
-        <template v-if="worktree.isMain">
-          <select v-model="branchMode" class="input text-xs" :aria-label="t('worktrees.branchModeLabel')">
-            <option value="current">{{ t('worktrees.currentBranch') }}</option>
-            <option value="new">{{ t('worktrees.newBranchOpt') }}</option>
-          </select>
-          <input v-if="branchMode === 'new'" v-model="newBranchName" class="input w-32 font-mono text-xs" placeholder="feature/…" />
-        </template>
-        <select v-model="startCommand" class="input text-xs" :aria-label="t('worktrees.commandLabel')">
-          <option value="claude">claude</option>
-          <option value="bash">bash</option>
-        </select>
-        <button
-          type="submit"
-          class="btn-primary text-xs"
-          :disabled="starting || (worktree.isMain && branchMode === 'new' && newBranchName.trim() === '')"
-        >
-          {{ starting ? t('worktrees.starting') : t('worktrees.start') }}
-        </button>
-      </form>
-      <span v-if="startError" class="text-xs text-amber-400">{{ startError }}</span>
-
-      <div v-if="!worktree.isMain" class="ml-auto flex items-center gap-2">
-        <template v-if="confirming">
-          <span v-if="error" class="text-xs text-amber-400">{{ error }}</span>
-          <button class="btn-danger text-xs" :disabled="busy" @click="onDelete">
-            {{ forceNeeded ? t('worktrees.forceDelete') : t('worktrees.confirmDelete') }}
-          </button>
-          <button class="btn text-xs" @click="reset">{{ t('common.cancel') }}</button>
-        </template>
-        <button v-else class="btn-danger text-xs" @click="confirming = true">{{ t('worktrees.delete') }}</button>
-      </div>
-    </div>
-
-    <!-- actions git : commit / push / promotion en principal (sans ouvrir le terminal) -->
-    <div v-if="canPush || worktree.git.dirtyCount || canPromote" class="mt-1 flex flex-wrap items-center gap-2">
-      <form v-if="committingOpen" class="flex flex-wrap items-center gap-1" @submit.prevent="onCommit">
-        <input v-model="commitMessage" class="input w-44 text-xs" :placeholder="t('worktrees.commitPlaceholder')" />
-        <button type="submit" class="btn-primary text-xs" :disabled="!!gitBusy || commitMessage.trim() === ''">
-          {{ gitBusy === 'commit' ? t('worktrees.committing') : t('worktrees.commit') }}
-        </button>
-        <button type="button" class="btn text-xs" @click="committingOpen = false">{{ t('common.cancel') }}</button>
-      </form>
-      <button v-else-if="worktree.git.dirtyCount" class="btn text-xs" :disabled="!!gitBusy" @click="committingOpen = true">
-        {{ t('worktrees.commit') }}
-      </button>
-
-      <button v-if="canPush" class="btn text-xs" :disabled="!!gitBusy" @click="onPush">
-        {{ gitBusy === 'push' ? t('worktrees.pushing') : t('worktrees.push') }}<span v-if="worktree.git.ahead"> ↑{{ worktree.git.ahead }}</span>
-      </button>
-
-      <button v-if="canPromote && !promoteConfirming" class="btn text-xs" :disabled="!!gitBusy" @click="promoteConfirming = true">
-        {{ t('worktrees.promote') }}
-      </button>
-
-      <span v-if="gitError" class="text-xs text-amber-400">{{ gitError }}</span>
-    </div>
-
-    <!-- confirmation explicite de la promotion (action destructive : ce worktree sera supprimé) -->
-    <div v-if="promoteConfirming" class="mt-1 rounded border border-amber-700/40 bg-amber-950/20 p-2 text-xs text-amber-200">
-      {{ promoteConfirmText }}
-      <div class="mt-1 flex items-center gap-2">
-        <button class="btn-primary text-xs" :disabled="!!gitBusy" @click="onPromote">
-          {{ gitBusy === 'promote' ? t('worktrees.promoting') : forcePromoteNeeded ? t('worktrees.forcePromote') : t('worktrees.promote') }}
-        </button>
-        <button class="btn text-xs" @click="cancelPromote">{{ t('common.cancel') }}</button>
-      </div>
-    </div>
-
-    <!-- réponse rapide aux dialogues des sessions corrélées en attente (sans ouvrir le terminal) -->
-    <DialogPrompt v-for="ws in waitingSessions" :key="`dlg-${ws.id}`" :session="ws" class="mt-2" />
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import type { SessionSummary, WorktreeSummary } from '@arboretum/shared';
-import { useWorktreesStore } from '../stores/worktrees';
-import { useSessionsStore } from '../stores/sessions';
-import { ApiError } from '../lib/api';
-import { encodeWtKey } from '../lib/wt-key';
-import SessionStateBadge from './SessionStateBadge.vue';
-import DialogPrompt from './DialogPrompt.vue';
-
-const props = defineProps<{ worktree: WorktreeSummary }>();
-const { t } = useI18n();
-const store = useWorktreesStore();
-const sessions = useSessionsStore();
-
-// L'état embarqué dans le worktree est un instantané ; on privilégie la version live du store
-// des sessions (mise à jour en continu) pour que busy/waiting/idle reste temps réel.
-function liveSession(s: SessionSummary): SessionSummary {
-  return sessions.sessions.find((x) => x.id === s.id) ?? s;
-}
-
-// sessions « liées à l'app » (managées) affichées par défaut ; les externes (découvertes hors
-// Arboretum) ne le sont que si l'interrupteur global est activé → évite les listes à rallonge.
-const visibleSessions = computed(() =>
-  store.showExternalSessions
-    ? props.worktree.sessions
-    : props.worktree.sessions.filter((s) => liveSession(s).source === 'managed'),
-);
-const externalCount = computed(
-  () => props.worktree.sessions.filter((s) => liveSession(s).source !== 'managed').length,
-);
-
-// sessions corrélées actuellement bloquées sur un dialogue → réponse rapide inline.
-const waitingSessions = computed(() =>
-  props.worktree.sessions.map(liveSession).filter((s) => s.live && s.activity === 'waiting' && s.dialog),
-);
-
-const confirming = ref(false);
-const forceNeeded = ref(false);
-const error = ref<string | null>(null);
-const busy = ref(false);
-
-// --- lancement de session sur ce worktree ---
-const hasLiveSession = computed(() => props.worktree.sessions.some((s) => liveSession(s).live));
-const showLauncher = ref(false);
-const startCommand = ref<'claude' | 'bash'>('claude');
-const branchMode = ref<'current' | 'new'>('current'); // carte principale uniquement
-const newBranchName = ref('');
-const starting = ref(false);
-const startError = ref<string | null>(null);
-
-async function onStart(): Promise<void> {
-  if (starting.value) return;
-  starting.value = true;
-  startError.value = null;
-  try {
-    if (props.worktree.isMain && branchMode.value === 'new') {
-      // bosser sur la branche principale en créant d'abord une branche dans le checkout principal.
-      await store.startMainSession(props.worktree.repoId, { command: startCommand.value, branch: newBranchName.value.trim(), newBranch: true });
-    } else {
-      // worktree existant (ou branche principale actuelle) : session directe dans son cwd.
-      await sessions.createSession(props.worktree.path, startCommand.value);
-    }
-    // resynchronise les worktrees du repo pour que la nouvelle session apparaisse sur la carte.
-    await store.refreshRepoWorktrees(props.worktree.repoId);
-    showLauncher.value = false;
-    newBranchName.value = '';
-    branchMode.value = 'current';
-  } catch (err) {
-    startError.value = err instanceof Error ? err.message : String(err);
-  } finally {
-    starting.value = false;
-  }
-}
-
-const branchLabel = computed(() =>
-  props.worktree.branch ?? (props.worktree.detached ? `${t('worktrees.detached')} ${props.worktree.head.slice(0, 7)}` : '·'),
-);
-
-// --- actions git : commit / push / promotion en principal ---
-const gitBusy = ref<null | 'commit' | 'push' | 'promote'>(null);
-const gitError = ref<string | null>(null);
-const committingOpen = ref(false);
-const commitMessage = ref('');
-const promoteConfirming = ref(false);
-const forcePromoteNeeded = ref(false);
-
-const canPush = computed(() => !!props.worktree.branch && !props.worktree.detached);
-const canPromote = computed(() => !props.worktree.isMain && !!props.worktree.branch && !props.worktree.detached);
-const promoteConfirmText = computed(() => t('worktrees.promoteConfirm', { branch: props.worktree.branch ?? '' }));
-
-function gitMsg(err: unknown): string {
-  return err instanceof Error ? err.message : String(err);
-}
-function cancelPromote(): void {
-  promoteConfirming.value = false;
-  forcePromoteNeeded.value = false;
-}
-
-async function onCommit(): Promise<void> {
-  if (gitBusy.value || commitMessage.value.trim() === '') return;
-  gitBusy.value = 'commit';
-  gitError.value = null;
-  try {
-    await store.commitWorktree(props.worktree.repoId, props.worktree.path, commitMessage.value.trim());
-    committingOpen.value = false;
-    commitMessage.value = '';
-  } catch (err) {
-    gitError.value = gitMsg(err);
-  } finally {
-    gitBusy.value = null;
-  }
-}
-
-async function onPush(): Promise<void> {
-  if (gitBusy.value) return;
-  gitBusy.value = 'push';
-  gitError.value = null;
-  try {
-    await store.pushWorktree(props.worktree.repoId, props.worktree.path);
-  } catch (err) {
-    gitError.value = gitMsg(err);
-  } finally {
-    gitBusy.value = null;
-  }
-}
-
-async function onPromote(): Promise<void> {
-  if (gitBusy.value) return;
-  gitBusy.value = 'promote';
-  gitError.value = null;
-  try {
-    await store.promoteWorktree(props.worktree.repoId, props.worktree.path, forcePromoteNeeded.value);
-    // succès : la branche est passée en principal et ce worktree est supprimé → la carte se démonte.
-  } catch (err) {
-    if (err instanceof ApiError && err.status === 409) {
-      forcePromoteNeeded.value = true; // arbre modifié → proposer la promotion forcée
-      gitError.value = err.message;
-    } else {
-      gitError.value = gitMsg(err);
-    }
-  } finally {
-    gitBusy.value = null;
-  }
-}
-
-function reset(): void {
-  confirming.value = false;
-  forceNeeded.value = false;
-  error.value = null;
-}
-
-async function onDelete(): Promise<void> {
-  busy.value = true;
-  error.value = null;
-  try {
-    await store.deleteWorktree(props.worktree.repoId, props.worktree.path, forceNeeded.value);
-    // succès : l'événement worktree_removed (ou le retrait local) démonte la carte
-  } catch (err) {
-    if (err instanceof ApiError && err.status === 409) {
-      forceNeeded.value = true; // dirty ou session vivante → proposer la suppression forcée
-      error.value = err.message;
-    } else {
-      error.value = err instanceof Error ? err.message : String(err);
-    }
-  } finally {
-    busy.value = false;
-  }
-}
-</script>

packages/web/src/components/ide/ActivityBar.vue

@@ -4,46 +4,73 @@
       v-for="item in items"
       :key="item.view"
       type="button"
-      class="relative flex h-10 w-10 items-center justify-center rounded-lg transition-colors"
-      :class="isActive(item.view) ? 'bg-surface-3 text-fg' : 'text-fg-subtle hover:bg-surface-2 hover:text-fg'"
+      class="relative flex h-10 w-10 items-center justify-center rounded-[9px] transition-colors"
+      :class="isActive(item.view) ? 'bg-surface-2 text-accent' : 'text-fg-subtle hover:bg-surface-2 hover:text-fg'"
       :title="item.label"
       :aria-label="item.label"
       @click="ide.toggleActivity(item.view)"
     >
+      <span
+        v-if="isActive(item.view)"
+        class="absolute top-1/2 left-0 h-5 w-0.5 -translate-y-1/2 rounded-full bg-accent"
+        aria-hidden="true"
+      />
       <component :is="item.icon" :size="20" :stroke-width="1.75" />
+      <!-- Exception assumee : texte quasi-noir fixe (text-zinc-950), lisible sur bg-warn en clair ET sombre. -->
       <span
         v-if="item.badge"
-        class="absolute top-1 right-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-amber-500 px-1 text-[9px] font-semibold text-amber-950"
+        class="absolute top-1 right-1 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-warn px-1 text-[9px] font-semibold text-zinc-950"
       >
         {{ item.badge }}
       </span>
     </button>
 
     <div class="mt-auto flex flex-col items-center gap-1">
-      <RouterLink
+      <button
         v-for="l in links"
-        :key="l.name"
-        :to="{ name: l.name }"
+        :key="l.key"
+        type="button"
         :title="l.label"
         :aria-label="l.label"
-        class="flex h-10 w-10 items-center justify-center rounded-lg text-fg-subtle transition-colors hover:bg-surface-2 hover:text-fg"
+        class="flex h-10 w-10 items-center justify-center rounded-[9px] text-fg-subtle transition-colors hover:bg-surface-2 hover:text-fg"
+        @click="l.onSelect"
       >
         <component :is="l.icon" :size="20" :stroke-width="1.75" />
-      </RouterLink>
+      </button>
     </div>
   </nav>
 </template>
 
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, defineAsyncComponent } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { Boxes, FolderTree, GitCompare, LifeBuoy, Settings, SquareTerminal } from '@lucide/vue';
+import {
+  Boxes,
+  FolderTree,
+  GitCompare,
+  LifeBuoy,
+  LogOut,
+  Monitor,
+  Moon,
+  Settings,
+  SquareTerminal,
+  Sun,
+} from '@lucide/vue';
 import { useIdeStore, type ActivityView } from '../../stores/ide';
+import { useModalsStore } from '../../stores/modals';
 import { useNav } from '../../composables/useNav';
+import { useSession } from '../../composables/useSession';
+import { themeMode, cycleTheme } from '../../lib/theme';
 
 const { t } = useI18n();
 const ide = useIdeStore();
+const modals = useModalsStore();
 const { waitingCount } = useNav();
+const { logout } = useSession();
+
+// Overlays chargés en lazy : SettingsView/HelpView (lourds) restent hors du chunk principal de l'IDE.
+const SettingsOverlay = defineAsyncComponent(() => import('./overlays/SettingsOverlay.vue'));
+const HelpOverlay = defineAsyncComponent(() => import('./overlays/HelpOverlay.vue'));
 
 const isActive = (v: ActivityView): boolean => ide.activeActivity === v && ide.leftVisible;
 
@@ -54,8 +81,18 @@ const items = computed(() => [
   { view: 'groups' as ActivityView, icon: Boxes, label: t('ide.activity.groups'), badge: 0 },
 ]);
 
+// Icône du toggle selon le mode courant (dark → lune, light → soleil, system → écran).
+const themeIcon = computed(() => (themeMode.value === 'light' ? Sun : themeMode.value === 'system' ? Monitor : Moon));
+
 const links = computed(() => [
-  { name: 'settings', icon: Settings, label: t('nav.settings') },
-  { name: 'help', icon: LifeBuoy, label: t('nav.help') },
+  {
+    key: 'theme',
+    icon: themeIcon.value,
+    label: `${t('theme.label')} : ${t(`theme.${themeMode.value}`)}`,
+    onSelect: () => cycleTheme(),
+  },
+  { key: 'settings', icon: Settings, label: t('nav.settings'), onSelect: () => void modals.open(SettingsOverlay) },
+  { key: 'help', icon: LifeBuoy, label: t('nav.help'), onSelect: () => void modals.open(HelpOverlay) },
+  { key: 'logout', icon: LogOut, label: t('common.logout'), onSelect: () => void logout() },
 ]);
 </script>

packages/web/src/components/ide/AttentionList.vue

@@ -0,0 +1,41 @@
+<template>
+  <div v-if="waiting.length" class="flex flex-col gap-2 border-b border-border px-2 py-2">
+    <div class="flex items-center gap-1.5 px-1 text-[11px] font-semibold text-warn">
+      <AlertTriangle :size="13" />
+      {{ t('attention.title') }}
+      <span class="ml-auto rounded-full bg-warn/20 px-1.5 text-[10px] text-warn">{{ waiting.length }}</span>
+    </div>
+    <div v-for="s in waiting" :key="s.id" class="flex flex-col gap-1">
+      <button
+        type="button"
+        class="truncate text-left font-mono text-[11px] text-warn/80 transition-colors hover:text-warn"
+        :title="s.cwd"
+        @click="ide.openTerminal(s.id)"
+      >
+        {{ sessionLabel(s, worktrees) }}
+      </button>
+      <DialogPrompt :session="s" />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Supervision « À traiter » intégrée à l'IDE : sessions bloquées sur un dialogue Claude, avec
+// DialogPrompt inline (réponse sans terminal). Le clic ouvre le terminal dans le dock (pas de
+// navigation, contrairement à l'ancien AttentionSection qui liait vers /sessions/:id).
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { AlertTriangle } from '@lucide/vue';
+import { useSessionsStore } from '../../stores/sessions';
+import { useWorktreesStore } from '../../stores/worktrees';
+import { useIdeStore } from '../../stores/ide';
+import { sessionLabel } from '../../lib/session-label';
+import DialogPrompt from '../DialogPrompt.vue';
+
+const { t } = useI18n();
+const sessions = useSessionsStore();
+const worktrees = useWorktreesStore();
+const ide = useIdeStore();
+
+const waiting = computed(() => sessions.sessions.filter((s) => s.live && s.activity === 'waiting' && s.dialog));
+</script>

packages/web/src/components/ide/ContextMenu.vue

@@ -0,0 +1,53 @@
+<template>
+  <Teleport to="body">
+    <div v-if="isOpen" class="fixed inset-0 z-[60]" @pointerdown="close" @contextmenu.prevent="close">
+      <div
+        class="absolute min-w-44 rounded-lg border border-border bg-surface-1 py-1 shadow-pop"
+        :style="menuStyle"
+        @pointerdown.stop
+      >
+        <button
+          v-for="(item, i) in items"
+          :key="i"
+          type="button"
+          class="flex w-full items-center gap-2 px-3 py-1.5 text-left text-sm transition-colors disabled:opacity-40"
+          :class="item.danger ? 'text-danger hover:bg-danger/10' : 'text-fg-muted hover:bg-surface-2 hover:text-fg'"
+          :disabled="item.disabled"
+          @click="select(item)"
+        >
+          <component :is="item.icon" v-if="item.icon" :size="15" :stroke-width="1.75" />
+          {{ item.label }}
+        </button>
+      </div>
+    </div>
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+// Menu contextuel unique, positionné au curseur, monté une fois par IdeShell. Ferme au
+// pointerdown hors menu (overlay plein écran transparent) et sur Escape. Recalage simple pour ne
+// pas déborder du bas / de la droite de la fenêtre.
+import { computed, onBeforeUnmount, onMounted } from 'vue';
+import { useContextMenu, type ContextMenuItem } from '../../composables/useContextMenu';
+
+const { isOpen, posX, posY, items, close } = useContextMenu();
+
+const menuStyle = computed(() => {
+  const menuW = 208; // min-w-44 (176px) + marge
+  const menuH = items.value.length * 34 + 8;
+  const x = Math.max(8, Math.min(posX.value, window.innerWidth - menuW - 8));
+  const y = Math.max(8, Math.min(posY.value, window.innerHeight - menuH - 8));
+  return { left: `${x}px`, top: `${y}px` };
+});
+
+function select(item: ContextMenuItem): void {
+  if (item.disabled) return;
+  close();
+  item.onSelect();
+}
+function onKey(e: KeyboardEvent): void {
+  if (e.key === 'Escape' && isOpen.value) close();
+}
+onMounted(() => window.addEventListener('keydown', onKey));
+onBeforeUnmount(() => window.removeEventListener('keydown', onKey));
+</script>

packages/web/src/components/ide/EditorArea.vue

@@ -23,7 +23,7 @@
       <!-- bannière de conflit (le fichier a changé sur le disque depuis le chargement) -->
       <div
         v-if="conflict && activeTab.view === 'editor'"
-        class="flex flex-wrap items-center gap-2 border-b border-amber-700/40 bg-amber-950/30 px-3 py-1.5 text-xs text-amber-200"
+        class="flex flex-wrap items-center gap-2 border-b border-warn/40 bg-warn/10 px-3 py-1.5 text-xs text-warn"
       >
         <TriangleAlert :size="14" /> {{ t('editor.conflict') }}
         <div class="ml-auto flex items-center gap-2">
@@ -31,7 +31,7 @@
           <BaseButton size="sm" variant="danger" :loading="saving" @click="overwrite">{{ t('editor.overwrite') }}</BaseButton>
         </div>
       </div>
-      <p v-if="loadError && activeTab.view === 'editor'" class="px-3 py-1 text-xs text-rose-400">{{ loadError }}</p>
+      <p v-if="loadError && activeTab.view === 'editor'" class="px-3 py-1 text-xs text-danger">{{ loadError }}</p>
 
       <div class="relative min-h-0 flex-1">
         <div v-show="activeTab.view === 'editor'" ref="host" class="h-full min-h-0" />
@@ -64,6 +64,7 @@ import { useIdeStore, type EditorTab } from '../../stores/ide';
 import { gitApi } from '../../lib/git-api';
 import { ApiError } from '../../lib/api';
 import { loadMonaco } from '../../composables/useMonaco';
+import { resolvedTheme } from '../../lib/theme';
 import EditorTabs from './EditorTabs.vue';
 import DiffViewer from '../workspace/DiffViewer.vue';
 import SegmentedControl from '../ui/SegmentedControl.vue';
@@ -109,14 +110,19 @@ onMounted(async () => {
   if (disposed || !host.value) return;
   editor.value = monaco.editor.create(host.value, {
     value: '',
-    theme: 'arboretum-dark',
+    theme: resolvedTheme.value === 'light' ? 'arboretum-light' : 'arboretum-dark',
     automaticLayout: true,
     minimap: { enabled: false },
     wordWrap: 'on',
     fontSize: 13,
+    fontFamily: "'JetBrains Mono Variable', ui-monospace, 'Fira Code', Menlo, Consolas, monospace",
     scrollBeyondLastLine: false,
     tabSize: 2,
   });
+  // Re-mesure après chargement de la fonte web (sinon curseur/colonnes décalés).
+  void document.fonts?.ready.then(() => {
+    if (!disposed) monaco?.editor.remeasureFonts();
+  });
   editor.value.onDidChangeModelContent(() => {
     if (!shownTabId) return;
     const entry = entries.get(shownTabId);
@@ -227,6 +233,11 @@ watch(
   },
 );
 
+// bascule de thème -> réapplique le thème Monaco (setTheme est global et idempotent).
+watch(resolvedTheme, (r) => {
+  monaco?.editor.setTheme(r === 'light' ? 'arboretum-light' : 'arboretum-dark');
+});
+
 // onglets fermés -> dispose leurs modèles et view states (évite les fuites mémoire).
 watch(
   () => ide.editorTabs.map((tb) => tb.id),

packages/web/src/components/ide/EditorTabs.vue

@@ -40,9 +40,9 @@ const pendingCloseId = ref<string | null>(null);
 const basename = (path: string): string => path.split('/').pop() ?? path;
 
 function closeButtonClass(id: string): string {
-  if (pendingCloseId.value === id) return 'text-amber-400 opacity-100';
+  if (pendingCloseId.value === id) return 'text-warn opacity-100';
   // dirty : point visible en permanence ; propre : croix visible au survol de l'onglet.
-  return ide.isDirty(id) ? 'text-amber-400 opacity-100 group-hover:text-fg' : 'opacity-0 group-hover:opacity-100';
+  return ide.isDirty(id) ? 'text-warn opacity-100 group-hover:text-fg' : 'opacity-0 group-hover:opacity-100';
 }
 
 function requestClose(id: string): void {

packages/web/src/components/ide/GroupsPanel.vue

@@ -1,32 +1,143 @@
 <template>
   <div class="flex h-full min-h-0 flex-col">
-    <div class="flex items-center gap-1 px-3 py-2 text-[11px] font-semibold tracking-wide text-fg-subtle uppercase">
+    <div class="label-mono flex items-center gap-1 px-3 py-2">
       {{ t('ide.activity.groups') }}
-      <RouterLink :to="{ name: 'groups' }" class="ml-auto rounded p-0.5 hover:bg-surface-2 hover:text-fg" :title="t('nav.groups')">
-        <ExternalLink :size="12" />
-      </RouterLink>
+      <button type="button" class="ml-auto rounded p-0.5 hover:bg-surface-2 hover:text-fg" :title="t('ide.menu.newGroup')" @click="openNewGroup">
+        <Plus :size="14" />
+      </button>
     </div>
+
     <div class="min-h-0 flex-1 overflow-auto px-1 pb-2">
       <p v-if="groups.groups.length === 0" class="px-2 py-1 text-xs text-fg-subtle">{{ t('groups.empty') }}</p>
-      <RouterLink
-        v-for="g in groups.groups"
-        :key="g.id"
-        :to="{ name: 'group', params: { id: g.id } }"
-        class="flex items-center gap-2 rounded px-2 py-1 text-xs text-fg-muted hover:bg-surface-2/60"
-      >
-        <Boxes :size="13" class="shrink-0 text-fg-subtle" />
-        <span class="truncate">{{ g.label }}</span>
-        <span class="ml-auto shrink-0 text-[10px] text-fg-subtle">{{ t('groups.repoCount', groups.reposInGroup(g.id).length) }}</span>
-      </RouterLink>
+
+      <div v-for="g in groups.groups" :key="g.id">
+        <div
+          class="group flex items-center rounded text-xs text-fg-muted hover:bg-surface-2/60"
+          @contextmenu.prevent="openGroupMenu($event, g)"
+        >
+          <button type="button" class="flex min-w-0 flex-1 items-center gap-1.5 px-2 py-1 text-left" @click="toggleExpand(g.id)">
+            <component :is="isExpanded(g.id) ? ChevronDown : ChevronRight" :size="14" class="shrink-0 text-fg-subtle" />
+            <Boxes
+              :size="13"
+              class="shrink-0"
+              :class="g.color ? '' : 'text-fg-subtle'"
+              :style="g.color ? { color: g.color } : undefined"
+            />
+            <span class="truncate">{{ g.label }}</span>
+            <span class="ml-auto shrink-0 pl-1 text-[10px] text-fg-subtle">{{ t('groups.repoCount', groups.reposInGroup(g.id).length) }}</span>
+          </button>
+          <button
+            type="button"
+            class="shrink-0 rounded p-0.5 opacity-0 hover:bg-surface-3 hover:text-fg group-hover:opacity-100"
+            :title="t('common.settings')"
+            @click.stop="openGroupMenu($event, g)"
+          >
+            <MoreVertical :size="13" />
+          </button>
+        </div>
+
+        <div v-if="isExpanded(g.id)" class="pl-6">
+          <button
+            v-for="s in liveSessionsFor(g.id)"
+            :key="s.id"
+            type="button"
+            class="flex w-full items-center gap-1.5 rounded px-2 py-0.5 text-left text-[11px]"
+            :class="ide.activeDockSessionId === s.id ? 'bg-surface-2 text-fg' : 'text-fg-muted hover:bg-surface-2/60'"
+            @click="ide.openTerminal(s.id)"
+          >
+            <SessionStateBadge :session="s" />
+            <span class="truncate font-mono">{{ sessionLabel(s, worktrees) }}</span>
+          </button>
+          <button
+            type="button"
+            class="mt-0.5 flex w-full items-center gap-1.5 rounded px-2 py-0.5 text-left text-[11px] text-accent hover:bg-surface-2/60 disabled:opacity-40"
+            :disabled="groups.reposInGroup(g.id).length === 0"
+            @click="launch(g)"
+          >
+            <Combine :size="12" /> {{ t('groups.newFeature') }}
+          </button>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+// Panneau Groupes de l'IDE : création, composition, lancement d'une session de groupe et ouverture
+// des sessions du groupe dans le dock. Tout via le store groups / modals ; aucune navigation.
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { Boxes, ExternalLink } from '@lucide/vue';
+import { Boxes, ChevronDown, ChevronRight, Combine, MoreVertical, Pencil, Plus, Trash2 } from '@lucide/vue';
+import type { GroupSummary } from '@arboretum/shared';
 import { useGroupsStore } from '../../stores/groups';
+import { useWorktreesStore } from '../../stores/worktrees';
+import { useSessionsStore } from '../../stores/sessions';
+import { useIdeStore } from '../../stores/ide';
+import { useModalsStore } from '../../stores/modals';
+import { useToastsStore } from '../../stores/toasts';
+import { useContextMenu, type ContextMenuItem } from '../../composables/useContextMenu';
+import { sessionLabel } from '../../lib/session-label';
+import SessionStateBadge from '../SessionStateBadge.vue';
+import GroupSessionModal from '../GroupSessionModal.vue';
+import GroupCreateModal from './modals/GroupCreateModal.vue';
+import GroupEditModal from './modals/GroupEditModal.vue';
+import ConfirmModal from './modals/ConfirmModal.vue';
 
 const { t } = useI18n();
 const groups = useGroupsStore();
+const worktrees = useWorktreesStore();
+const sessions = useSessionsStore();
+const ide = useIdeStore();
+const modals = useModalsStore();
+const toasts = useToastsStore();
+const ctx = useContextMenu();
+
+const expanded = ref<string[]>([]);
+const isExpanded = (id: string): boolean => expanded.value.includes(id);
+function toggleExpand(id: string): void {
+  expanded.value = isExpanded(id) ? expanded.value.filter((x) => x !== id) : [...expanded.value, id];
+}
+
+// sessions vivantes du groupe, en version live (store sessions).
+function liveSessionsFor(id: string) {
+  return groups
+    .sessionsInGroup(id)
+    .map((s) => sessions.sessions.find((x) => x.id === s.id) ?? s)
+    .filter((s) => s.live);
+}
+
+function openNewGroup(): void {
+  modals.open(GroupCreateModal);
+}
+
+function launch(g: GroupSummary): void {
+  modals.open(GroupSessionModal, { groupId: g.id, repos: groups.reposInGroup(g.id) });
+}
+
+function openGroupMenu(e: MouseEvent, g: GroupSummary): void {
+  const items: ContextMenuItem[] = [
+    {
+      label: t('ide.menu.launchGroup'),
+      icon: Combine,
+      disabled: groups.reposInGroup(g.id).length === 0,
+      onSelect: () => launch(g),
+    },
+    { label: t('ide.menu.editGroup'), icon: Pencil, onSelect: () => void modals.open(GroupEditModal, { groupId: g.id }) },
+    { label: t('ide.menu.deleteGroup'), icon: Trash2, danger: true, onSelect: () => confirmDelete(g) },
+  ];
+  ctx.open(e.clientX, e.clientY, items);
+}
+
+function confirmDelete(g: GroupSummary): void {
+  modals.open(ConfirmModal, {
+    title: t('ide.menu.deleteGroup'),
+    message: g.label,
+    danger: true,
+    confirmLabel: t('groups.confirmDelete'),
+    onConfirm: async () => {
+      await groups.deleteGroup(g.id);
+      toasts.success(t('toast.groupDeleted'));
+    },
+  });
+}
 </script>

packages/web/src/components/ide/IdeShell.vue

@@ -1,16 +1,18 @@
 <template>
   <div class="flex h-dvh min-h-0 flex-col bg-surface-0 text-fg">
     <div v-if="isMobile" class="flex min-h-0 flex-1 flex-col">
-      <header class="flex items-center gap-2 border-b border-border px-2 py-1.5">
-        <RouterLink :to="{ name: 'dashboard' }" class="rounded p-1 text-fg-muted hover:bg-surface-2 hover:text-fg" :title="t('nav.worktrees')">
-          <Home :size="18" />
-        </RouterLink>
-        <span class="truncate text-sm font-medium">{{ mobileTitle }}</span>
+      <header class="flex items-center gap-2 border-b border-border px-3 py-2">
+        <span class="min-w-0 flex-1 truncate text-sm font-medium">{{ mobileTitle }}</span>
+        <button type="button" class="rounded p-1 text-fg-muted hover:bg-surface-2 hover:text-fg" :title="t('common.settings')" @click="openMobileMenu">
+          <MoreVertical :size="18" />
+        </button>
       </header>
       <div class="min-h-0 flex-1 overflow-hidden">
         <ProjectTree v-if="ide.mobilePanel === 'explorer'" />
         <GitPanel v-else-if="ide.mobilePanel === 'git'" />
         <TerminalDock v-else-if="ide.mobilePanel === 'terminal'" />
+        <SessionsPanel v-else-if="ide.mobilePanel === 'sessions'" />
+        <GroupsPanel v-else-if="ide.mobilePanel === 'groups'" />
         <EditorArea v-else />
       </div>
       <nav class="flex shrink-0 border-t border-border">
@@ -52,6 +54,10 @@
 
       <StatusBar />
     </div>
+
+    <!-- Hôtes uniques (Teleport vers body) : pile de modals et menu contextuel de l'IDE. -->
+    <ModalHost />
+    <ContextMenu />
   </div>
 </template>
 
@@ -59,14 +65,17 @@
 // Coquille de la vue IDE (layout 'ide', plein écran). Assemble barre d'activité, panneau gauche,
 // zone centrale (éditeur), dock terminaux et barre de statut. Propriétaire de la réconciliation
 // des ressources ouvertes contre les données live (worktrees / sessions).
-import { computed, onBeforeUnmount, onMounted, ref, watch } from 'vue';
+import { computed, defineAsyncComponent, onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { FileCode, FolderTree, GitCompare, Home, SquareTerminal } from '@lucide/vue';
+import { Boxes, FileCode, FolderTree, GitCompare, LifeBuoy, List, LogOut, MoreVertical, Settings, SquareTerminal } from '@lucide/vue';
 import { decodeWtKey } from '@arboretum/shared';
 import { useIdeStore, wtKey } from '../../stores/ide';
 import { useWorktreesStore } from '../../stores/worktrees';
 import { useSessionsStore } from '../../stores/sessions';
+import { useModalsStore } from '../../stores/modals';
+import { useContextMenu } from '../../composables/useContextMenu';
+import { useSession } from '../../composables/useSession';
 import ActivityBar from './ActivityBar.vue';
 import PrimarySidebar from './PrimarySidebar.vue';
 import PanelSplitter from './PanelSplitter.vue';
@@ -75,13 +84,31 @@ import EditorArea from './EditorArea.vue';
 import TerminalDock from './TerminalDock.vue';
 import ProjectTree from './ProjectTree.vue';
 import GitPanel from './GitPanel.vue';
+import SessionsPanel from './SessionsPanel.vue';
+import GroupsPanel from './GroupsPanel.vue';
+import ModalHost from './ModalHost.vue';
+import ContextMenu from './ContextMenu.vue';
 
 const { t } = useI18n();
 const ide = useIdeStore();
 const worktrees = useWorktreesStore();
 const sessions = useSessionsStore();
+const modals = useModalsStore();
+const ctx = useContextMenu();
+const { logout } = useSession();
 const route = useRoute();
 
+// Overlays lazy (partagés avec l'ActivityBar desktop) : accès compte depuis le menu mobile.
+const SettingsOverlay = defineAsyncComponent(() => import('./overlays/SettingsOverlay.vue'));
+const HelpOverlay = defineAsyncComponent(() => import('./overlays/HelpOverlay.vue'));
+function openMobileMenu(e: MouseEvent): void {
+  ctx.open(e.clientX, e.clientY, [
+    { label: t('nav.settings'), icon: Settings, onSelect: () => void modals.open(SettingsOverlay) },
+    { label: t('nav.help'), icon: LifeBuoy, onSelect: () => void modals.open(HelpOverlay) },
+    { label: t('common.logout'), icon: LogOut, onSelect: () => void logout() },
+  ]);
+}
+
 // --- responsive : panneau unique sous le breakpoint md (768px) ---
 const isMobile = ref(false);
 let mql: MediaQueryList | null = null;
@@ -100,28 +127,40 @@ const mobilePanels = computed(() => [
   { key: 'editor', icon: FileCode, label: t('workspace.editor') },
   { key: 'terminal', icon: SquareTerminal, label: t('ide.terminals') },
   { key: 'git', icon: GitCompare, label: t('ide.activity.git') },
+  { key: 'sessions', icon: List, label: t('ide.activity.sessions') },
+  { key: 'groups', icon: Boxes, label: t('ide.activity.groups') },
 ]);
 const mobileTitle = computed(() => mobilePanels.value.find((p) => p.key === ide.mobilePanel)?.label ?? '');
 const setMobilePanel = (key: string): void => {
   ide.mobilePanel = key;
 };
 
-// Deep-link : /workspace/:repoId/:wt (ex. lien de l'extension VS Code) cible un worktree précis.
-// On le rend actif, on déplie son sous-arbre, et on ouvre éventuellement ?file=<relPath>.
-function applyDeepLink(): void {
-  if (route.name !== 'workspace') return;
-  const repoId = String(route.params.repoId ?? '');
-  const wt = decodeWtKey(String(route.params.wt ?? ''));
-  if (!repoId || !wt) return;
-  ide.setActivity('explorer');
-  ide.setActiveWorktree(repoId, wt);
-  if (!ide.expandedRepoIds.includes(repoId)) ide.toggleRepo(repoId);
-  if (!ide.expandedWtPaths.includes(wt)) ide.toggleWt(wt);
-  const file = route.query.file ? String(route.query.file) : null;
-  if (file) ide.openFile(repoId, wt, file);
+// Deep-link / redirections rétro-compat. /workspace/:repoId/:wt (ex. extension VS Code) cible un
+// worktree. Sur /ide, on consomme une query one-shot (terminal / panel / overlay) posée par les
+// redirections des anciennes routes, puis on l'efface pour garder l'URL propre.
+function applyRoute(): void {
+  if (route.name === 'workspace') {
+    const repoId = String(route.params.repoId ?? '');
+    const wt = decodeWtKey(String(route.params.wt ?? ''));
+    if (!repoId || !wt) return;
+    ide.setActivity('explorer');
+    ide.setActiveWorktree(repoId, wt);
+    if (!ide.expandedRepoIds.includes(repoId)) ide.toggleRepo(repoId);
+    if (!ide.expandedWtPaths.includes(wt)) ide.toggleWt(wt);
+    const file = route.query.file ? String(route.query.file) : null;
+    if (file) ide.openFile(repoId, wt, file);
+    return;
+  }
+  // Intention portée par le meta de la route (rétro-compat des anciens chemins) : ouvrir un
+  // terminal, activer un panneau, ou ouvrir un overlay. URL bookmarkable, aucun strip.
+  const m = route.meta;
+  if (m.terminal && route.params.id) ide.openTerminal(String(route.params.id));
+  if (m.panel === 'sessions' || m.panel === 'groups') ide.setActivity(m.panel);
+  if (m.overlay === 'settings') modals.open(SettingsOverlay);
+  else if (m.overlay === 'help') modals.open(HelpOverlay);
 }
-onMounted(applyDeepLink);
-watch(() => route.fullPath, applyDeepLink);
+onMounted(applyRoute);
+watch(() => route.fullPath, applyRoute);
 
 function prune(): void {
   const live = new Set(sessions.sessions.filter((s) => s.live).map((s) => s.id));

packages/web/src/components/ide/ModalHost.vue

@@ -0,0 +1,28 @@
+<template>
+  <Teleport to="body">
+    <component
+      :is="entry.component"
+      v-for="entry in modals.stack"
+      :key="entry.id"
+      v-bind="entry.props"
+      @close="modals.close(entry.id)"
+    />
+  </Teleport>
+</template>
+
+<script setup lang="ts">
+// Hôte de la pile de modals : rend chaque entrée via <component :is>. Les modals fournissent
+// eux-mêmes leur backdrop plein écran (fixed inset-0 z-50), donc l'hôte ne dessine rien. Escape
+// ferme le sommet de la pile. Monté une seule fois par IdeShell (via Teleport, l'emplacement dans
+// le template importe peu, mais l'hôte doit rester monté tant que l'IDE vit).
+import { onBeforeUnmount, onMounted } from 'vue';
+import { useModalsStore } from '../../stores/modals';
+
+const modals = useModalsStore();
+
+function onKey(e: KeyboardEvent): void {
+  if (e.key === 'Escape' && modals.stack.length > 0) modals.close();
+}
+onMounted(() => window.addEventListener('keydown', onKey));
+onBeforeUnmount(() => window.removeEventListener('keydown', onKey));
+</script>

packages/web/src/components/ide/ProjectTree.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="flex h-full min-h-0 flex-col">
-    <div class="flex items-center gap-1 px-3 py-2 text-[11px] font-semibold tracking-wide text-fg-subtle uppercase">
+    <div class="label-mono flex items-center gap-1 px-3 py-2">
       {{ t('ide.projects') }}
       <button
         type="button"
@@ -11,7 +11,7 @@
       >
         <ScanSearch :size="14" />
       </button>
-      <button type="button" class="rounded p-0.5 hover:bg-surface-2 hover:text-fg" :title="t('ide.addProject')" @click="showPicker = true">
+      <button type="button" class="rounded p-0.5 hover:bg-surface-2 hover:text-fg" :title="t('ide.addProject')" @click="openAddMenu">
         <Plus :size="14" />
       </button>
     </div>
@@ -28,19 +28,32 @@
 <script setup lang="ts">
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { Plus, ScanSearch } from '@lucide/vue';
+import { CloudDownload, FolderPlus, Plus, ScanSearch } from '@lucide/vue';
 import { useWorktreesStore } from '../../stores/worktrees';
 import { useToastsStore } from '../../stores/toasts';
+import { useModalsStore } from '../../stores/modals';
+import { useContextMenu } from '../../composables/useContextMenu';
 import ProjectTreeNode from './ProjectTreeNode.vue';
 import DirectoryPicker from '../DirectoryPicker.vue';
+import CloneRepoModal from '../CloneRepoModal.vue';
 
 const { t } = useI18n();
 const worktrees = useWorktreesStore();
 const toasts = useToastsStore();
+const modals = useModalsStore();
+const ctx = useContextMenu();
 
 const showPicker = ref(false);
 const scanning = ref(false);
 
+// « + » : ajouter un dépôt local (DirectoryPicker) ou cloner un dépôt distant (CloneRepoModal).
+function openAddMenu(e: MouseEvent): void {
+  ctx.open(e.clientX, e.clientY, [
+    { label: t('ide.menu.addLocal'), icon: FolderPlus, onSelect: () => { showPicker.value = true; } },
+    { label: t('ide.menu.cloneRemote'), icon: CloudDownload, onSelect: () => void modals.open(CloneRepoModal) },
+  ]);
+}
+
 const repos = computed(() =>
   [...worktrees.repos].filter((r) => !r.hidden).sort((a, b) => a.label.localeCompare(b.label)),
 );

packages/web/src/components/ide/ProjectTreeNode.vue

@@ -1,33 +1,51 @@
 <template>
   <div>
     <!-- ligne repo (niveau projet) -->
-    <button
-      type="button"
-      class="flex w-full items-center gap-1 rounded px-2 py-1 text-left text-xs text-fg hover:bg-surface-2/60"
-      @click="ide.toggleRepo(repo.id)"
+    <div
+      class="group flex items-center rounded text-xs text-fg hover:bg-surface-2/60"
+      @contextmenu.prevent="openRepoMenu($event)"
     >
-      <component :is="repoExpanded ? ChevronDown : ChevronRight" :size="14" class="shrink-0 text-fg-subtle" />
-      <FolderGit2 :size="13" class="shrink-0 text-fg-subtle" />
-      <span class="truncate font-medium">{{ repo.label }}</span>
-      <span v-if="worktreeList.length" class="ml-auto shrink-0 text-[10px] text-fg-subtle">{{ worktreeList.length }}</span>
-    </button>
+      <button type="button" class="flex min-w-0 flex-1 items-center gap-1 px-2 py-1 text-left" @click="ide.toggleRepo(repo.id)">
+        <component :is="repoExpanded ? ChevronDown : ChevronRight" :size="14" class="shrink-0 text-fg-subtle" />
+        <FolderGit2 :size="13" class="shrink-0 text-fg-subtle" />
+        <span class="truncate font-medium">{{ repo.label }}</span>
+        <span v-if="worktreeList.length" class="ml-auto shrink-0 pl-1 text-[10px] text-fg-subtle">{{ worktreeList.length }}</span>
+      </button>
+      <button
+        type="button"
+        class="shrink-0 rounded p-0.5 opacity-0 hover:bg-surface-3 hover:text-fg group-hover:opacity-100"
+        :title="t('common.settings')"
+        @click.stop="openRepoMenu($event)"
+      >
+        <MoreVertical :size="13" />
+      </button>
+    </div>
 
     <div v-if="repoExpanded" class="pl-3">
       <p v-if="worktreeList.length === 0" class="px-3 py-0.5 text-[11px] text-fg-subtle">{{ t('ide.noWorktrees') }}</p>
 
       <div v-for="wt in worktreeList" :key="wt.path">
         <!-- ligne worktree -->
-        <button
-          type="button"
-          class="flex w-full items-center gap-1 rounded px-2 py-1 text-left text-xs hover:bg-surface-2/60"
-          :class="isActiveWt(wt) ? 'bg-surface-2 text-fg' : 'text-fg-muted'"
-          @click="onWtClick(wt)"
+        <div
+          class="group flex items-center rounded text-xs"
+          :class="isActiveWt(wt) ? 'bg-surface-2 text-fg' : 'text-fg-muted hover:bg-surface-2/60'"
+          @contextmenu.prevent="openWtMenu($event, wt)"
         >
-          <component :is="isWtExpanded(wt) ? ChevronDown : ChevronRight" :size="14" class="shrink-0 text-fg-subtle" />
-          <component :is="wt.isMain ? Home : GitBranch" :size="12" class="shrink-0 text-fg-subtle" />
-          <span class="truncate font-mono">{{ wt.branch ?? wt.head.slice(0, 7) }}</span>
-          <span v-if="isDirty(wt)" class="ml-auto shrink-0 text-amber-400" :title="t('worktrees.dirty', { n: wt.git.dirtyCount })">●</span>
-        </button>
+          <button type="button" class="flex min-w-0 flex-1 items-center gap-1 px-2 py-1 text-left" @click="onWtClick(wt)">
+            <component :is="isWtExpanded(wt) ? ChevronDown : ChevronRight" :size="14" class="shrink-0 text-fg-subtle" />
+            <component :is="wt.isMain ? Home : GitBranch" :size="12" class="shrink-0 text-fg-subtle" />
+            <span class="truncate font-mono">{{ wt.branch ?? wt.head.slice(0, 7) }}</span>
+            <span v-if="isDirty(wt)" class="ml-auto shrink-0 pl-1 text-warn" :title="t('worktrees.dirty', { n: wt.git.dirtyCount })">●</span>
+          </button>
+          <button
+            type="button"
+            class="shrink-0 rounded p-0.5 opacity-0 hover:bg-surface-3 hover:text-fg group-hover:opacity-100"
+            :title="t('common.settings')"
+            @click.stop="openWtMenu($event, wt)"
+          >
+            <MoreVertical :size="13" />
+          </button>
+        </div>
 
         <!-- sessions live corrélées au worktree (par cwd) -->
         <button
@@ -60,19 +78,44 @@
 <script setup lang="ts">
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { ChevronDown, ChevronRight, FolderGit2, GitBranch, Home } from '@lucide/vue';
+import {
+  ChevronDown,
+  ChevronRight,
+  FolderGit2,
+  GitBranch,
+  Home,
+  MoreVertical,
+  SquareTerminal,
+  GitCompare,
+  Upload,
+  ArrowUp,
+  Trash2,
+  Scissors,
+  Eye,
+  EyeOff,
+} from '@lucide/vue';
 import type { RepoSummary, SessionSummary, WorktreeSummary } from '@arboretum/shared';
+import { ApiError } from '../../lib/api';
 import { useIdeStore } from '../../stores/ide';
 import { useWorktreesStore } from '../../stores/worktrees';
 import { useSessionsStore } from '../../stores/sessions';
+import { useToastsStore } from '../../stores/toasts';
+import { useModalsStore } from '../../stores/modals';
+import { useContextMenu, type ContextMenuItem } from '../../composables/useContextMenu';
 import FileTree from '../workspace/FileTree.vue';
 import SessionStateBadge from '../SessionStateBadge.vue';
+import ConfirmModal from './modals/ConfirmModal.vue';
+import WorktreeCreateModal from './modals/WorktreeCreateModal.vue';
+import NewSessionModal from './modals/NewSessionModal.vue';
 
 const props = defineProps<{ repo: RepoSummary }>();
 const { t } = useI18n();
 const ide = useIdeStore();
 const worktrees = useWorktreesStore();
 const sessions = useSessionsStore();
+const toasts = useToastsStore();
+const modals = useModalsStore();
+const ctx = useContextMenu();
 
 const repoExpanded = computed(() => ide.expandedRepoIds.includes(props.repo.id));
 const worktreeList = computed(() => worktrees.worktreesForRepo(props.repo.id));
@@ -97,4 +140,139 @@ function onWtClick(wt: WorktreeSummary): void {
   ide.setActiveWorktree(wt.repoId, wt.path);
   ide.toggleWt(wt.path);
 }
+
+// --- menu contextuel repo ---
+function openRepoMenu(e: MouseEvent): void {
+  const items: ContextMenuItem[] = [
+    { label: t('ide.menu.newWorktree'), icon: GitBranch, onSelect: () => void modals.open(WorktreeCreateModal, { repo: props.repo, initialMode: 'worktree' }) },
+    { label: t('ide.menu.workOnMain'), icon: Home, onSelect: () => void modals.open(WorktreeCreateModal, { repo: props.repo, initialMode: 'main' }) },
+    { label: t('ide.menu.prune'), icon: Scissors, onSelect: () => void onPrune() },
+    {
+      label: props.repo.hidden ? t('ide.menu.showRepo') : t('ide.menu.hideRepo'),
+      icon: props.repo.hidden ? Eye : EyeOff,
+      onSelect: () => void onToggleHidden(),
+    },
+    { label: t('ide.menu.removeRepo'), icon: Trash2, danger: true, onSelect: () => confirmRemoveRepo() },
+  ];
+  ctx.open(e.clientX, e.clientY, items);
+}
+
+async function onPrune(): Promise<void> {
+  try {
+    await worktrees.prune(props.repo.id);
+    toasts.success(t('toast.pruned'));
+  } catch (err) {
+    toasts.error(err);
+  }
+}
+
+async function onToggleHidden(): Promise<void> {
+  try {
+    await worktrees.setHidden(props.repo.id, !props.repo.hidden);
+  } catch (err) {
+    toasts.error(err);
+  }
+}
+
+function confirmRemoveRepo(): void {
+  modals.open(ConfirmModal, {
+    title: t('ide.menu.removeRepo'),
+    message: props.repo.path,
+    danger: true,
+    confirmLabel: t('repos.remove'),
+    onConfirm: async () => {
+      await worktrees.removeRepo(props.repo.id);
+      toasts.success(t('toast.repoRemoved'));
+    },
+  });
+}
+
+// --- menu contextuel worktree ---
+function openWtMenu(e: MouseEvent, wt: WorktreeSummary): void {
+  const items: ContextMenuItem[] = [
+    { label: t('ide.menu.openTerminal'), icon: SquareTerminal, onSelect: () => void modals.open(NewSessionModal, { cwd: wt.path }) },
+    { label: t('ide.menu.commit'), icon: GitCompare, onSelect: () => openGitPanel(wt) },
+    { label: t('ide.menu.push'), icon: Upload, onSelect: () => void onPush(wt) },
+  ];
+  if (!wt.isMain) {
+    items.push({ label: t('ide.menu.promote'), icon: ArrowUp, onSelect: () => confirmPromote(wt) });
+    items.push({ label: t('ide.menu.deleteWorktree'), icon: Trash2, danger: true, onSelect: () => confirmDelete(wt) });
+  }
+  ctx.open(e.clientX, e.clientY, items);
+}
+
+function openGitPanel(wt: WorktreeSummary): void {
+  ide.setActiveWorktree(wt.repoId, wt.path);
+  ide.setActivity('git');
+}
+
+async function onPush(wt: WorktreeSummary): Promise<void> {
+  try {
+    await worktrees.pushWorktree(wt.repoId, wt.path);
+    toasts.success(t('toast.pushed'));
+  } catch (err) {
+    toasts.error(err);
+  }
+}
+
+// promotion : « passer en principal » ; escalade force sur 409 (arbre modifié).
+function confirmPromote(wt: WorktreeSummary): void {
+  modals.open(ConfirmModal, {
+    title: t('ide.menu.promote'),
+    message: t('worktrees.promoteConfirm', { branch: wt.branch ?? '' }),
+    confirmLabel: t('worktrees.promote'),
+    onConfirm: async () => {
+      try {
+        await worktrees.promoteWorktree(wt.repoId, wt.path, false);
+        toasts.success(t('ide.menu.promote'));
+      } catch (err) {
+        if (err instanceof ApiError && err.status === 409) {
+          modals.open(ConfirmModal, {
+            title: t('worktrees.forcePromote'),
+            message: err.message,
+            danger: true,
+            confirmLabel: t('worktrees.forcePromote'),
+            onConfirm: async () => {
+              await worktrees.promoteWorktree(wt.repoId, wt.path, true);
+              toasts.success(t('ide.menu.promote'));
+            },
+          });
+          return;
+        }
+        throw err;
+      }
+    },
+  });
+}
+
+// suppression : escalade force sur 409 (arbre modifié ou session vivante).
+function confirmDelete(wt: WorktreeSummary): void {
+  modals.open(ConfirmModal, {
+    title: t('ide.menu.deleteWorktree'),
+    message: wt.path,
+    danger: true,
+    confirmLabel: t('worktrees.confirmDelete'),
+    onConfirm: async () => {
+      try {
+        await worktrees.deleteWorktree(wt.repoId, wt.path, false);
+        toasts.success(t('toast.worktreeDeleted'));
+      } catch (err) {
+        if (err instanceof ApiError && err.status === 409) {
+          modals.open(ConfirmModal, {
+            title: t('worktrees.forceDelete'),
+            message: err.message,
+            danger: true,
+            confirmLabel: t('worktrees.forceDelete'),
+            onConfirm: async () => {
+              await worktrees.deleteWorktree(wt.repoId, wt.path, true);
+              toasts.success(t('toast.worktreeDeleted'));
+            },
+          });
+          return;
+        }
+        throw err;
+      }
+    },
+  });
+}
 </script>

packages/web/src/components/ide/SessionsPanel.vue

@@ -1,53 +1,154 @@
 <template>
   <div class="flex h-full min-h-0 flex-col">
-    <div class="flex items-center gap-1 px-3 py-2 text-[11px] font-semibold tracking-wide text-fg-subtle uppercase">
+    <div class="label-mono flex items-center gap-1 px-3 py-2">
       {{ t('ide.activity.sessions') }}
-      <RouterLink :to="{ name: 'sessions' }" class="ml-auto rounded p-0.5 hover:bg-surface-2 hover:text-fg" :title="t('nav.sessions')">
-        <ExternalLink :size="12" />
-      </RouterLink>
-    </div>
-    <div class="min-h-0 flex-1 overflow-auto px-1 pb-2">
-      <p v-if="liveSessions.length === 0" class="px-2 py-1 text-xs text-fg-subtle">{{ t('sessions.empty') }}</p>
-      <button
-        v-for="s in liveSessions"
-        :key="s.id"
-        type="button"
-        class="flex w-full items-center gap-1.5 rounded px-2 py-1 text-left text-xs hover:bg-surface-2/60"
-        :class="ide.activeDockSessionId === s.id ? 'bg-surface-2 text-fg' : 'text-fg-muted'"
-        @click="ide.openTerminal(s.id)"
-      >
-        <SessionStateBadge :session="s" />
-        <span class="truncate font-mono">{{ titleFor(s) }}</span>
-        <span class="ml-auto shrink-0 font-mono text-[10px] text-fg-subtle">{{ s.command }}</span>
+      <button type="button" class="ml-auto rounded p-0.5 hover:bg-surface-2 hover:text-fg" :title="t('sessions.newSession')" @click="openAddMenu">
+        <Plus :size="14" />
       </button>
+      <button type="button" class="rounded p-0.5 hover:bg-surface-2 hover:text-fg" :title="t('common.settings')" @click="openMoreMenu">
+        <MoreHorizontal :size="14" />
+      </button>
+    </div>
+
+    <div class="min-h-0 flex-1 overflow-auto">
+      <AttentionList />
+      <div class="px-1 pt-1 pb-2">
+        <p v-if="rows.length === 0" class="px-2 py-1 text-xs text-fg-subtle">{{ t('sessions.empty') }}</p>
+        <div
+          v-for="s in rows"
+          :key="s.id"
+          class="group flex w-full items-center gap-1.5 rounded px-2 py-1 text-xs"
+          :class="ide.activeDockSessionId === s.id ? 'bg-surface-2 text-fg' : 'text-fg-muted hover:bg-surface-2/60'"
+          @contextmenu.prevent="openRowMenu($event, s)"
+        >
+          <button type="button" class="flex min-w-0 flex-1 items-center gap-1.5 text-left" @click="onRowClick($event, s)">
+            <SessionStateBadge :session="s" />
+            <span class="truncate font-mono" :class="s.live ? '' : 'text-fg-subtle'">{{ sessionLabel(s, worktrees) }}</span>
+            <BaseBadge v-if="s.source === 'discovered'" tone="info" class="shrink-0">{{ t('sessions.sourceDiscovered') }}</BaseBadge>
+            <BaseBadge v-if="s.archived" tone="warn" class="shrink-0">{{ t('sessions.archivedBadge') }}</BaseBadge>
+          </button>
+          <button
+            type="button"
+            class="shrink-0 rounded p-0.5 opacity-0 hover:bg-surface-3 hover:text-fg group-hover:opacity-100"
+            :title="t('common.settings')"
+            @click.stop="openRowMenu($event, s)"
+          >
+            <MoreVertical :size="13" />
+          </button>
+        </div>
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
+// Panneau Sessions de l'IDE : liste live + morte, supervision « À traiter » en tête, et cycle de
+// vie complet via menu contextuel (open/observe/kill/resume/fork/hide/archive). Toute action passe
+// par useSessionActions ou le store sessions ; ouvrir un terminal = ide.openTerminal (aucune
+// navigation hors IDE).
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { ExternalLink } from '@lucide/vue';
+import {
+  Plus,
+  MoreHorizontal,
+  MoreVertical,
+  SquareTerminal,
+  Eye,
+  EyeOff,
+  Trash2,
+  GitFork,
+  Play,
+  Archive,
+  ArchiveRestore,
+  RefreshCw,
+  FolderPlus,
+} from '@lucide/vue';
 import type { SessionSummary } from '@arboretum/shared';
 import { useIdeStore } from '../../stores/ide';
 import { useSessionsStore } from '../../stores/sessions';
 import { useWorktreesStore } from '../../stores/worktrees';
+import { useModalsStore } from '../../stores/modals';
+import { useContextMenu, type ContextMenuItem } from '../../composables/useContextMenu';
+import { useSessionActions } from '../../composables/useSessionActions';
+import { sessionLabel } from '../../lib/session-label';
 import SessionStateBadge from '../SessionStateBadge.vue';
+import BaseBadge from '../ui/BaseBadge.vue';
+import AttentionList from './AttentionList.vue';
+import ConfirmModal from './modals/ConfirmModal.vue';
+import NewSessionModal from './modals/NewSessionModal.vue';
+import NewProjectModal from '../NewProjectModal.vue';
 
 const { t } = useI18n();
 const ide = useIdeStore();
-const sessions = useSessionsStore();
+const store = useSessionsStore();
 const worktrees = useWorktreesStore();
+const modals = useModalsStore();
+const ctx = useContextMenu();
+const actions = useSessionActions();
 
-const liveSessions = computed(() => sessions.sessions.filter((s) => s.live));
+const rows = computed(() => store.sessions);
+const hasDiscovered = computed(() => store.sessions.some((s) => s.source === 'discovered' && !s.hidden));
 
-function titleFor(s: SessionSummary): string {
-  const wt = worktrees.worktrees.find((w) => w.path === s.cwd);
-  if (wt) {
-    const repo = worktrees.repos.find((r) => r.id === wt.repoId);
-    const branch = wt.branch ?? wt.head.slice(0, 7);
-    return repo ? `${repo.label} · ${branch}` : branch;
+function onRowClick(e: MouseEvent, s: SessionSummary): void {
+  if (s.live || s.attachable) ide.openTerminal(s.id);
+  else openRowMenu(e, s);
+}
+
+function confirmKill(s: SessionSummary): void {
+  modals.open(ConfirmModal, {
+    title: t('sessions.kill'),
+    message: sessionLabel(s, worktrees),
+    danger: true,
+    confirmLabel: t('sessions.confirmKill'),
+    onConfirm: () => actions.kill(s.id),
+  });
+}
+
+function menuFor(s: SessionSummary): ContextMenuItem[] {
+  const items: ContextMenuItem[] = [];
+  if (s.attachable) {
+    items.push({ label: t('sessions.open'), icon: SquareTerminal, onSelect: () => ide.openTerminal(s.id) });
+    items.push({ label: t('sessions.kill'), icon: Trash2, danger: true, onSelect: () => confirmKill(s) });
+  } else if (s.live) {
+    items.push({ label: t('sessions.observe'), icon: Eye, onSelect: () => ide.openTerminal(s.id) });
+    items.push({ label: t('sessions.fork'), icon: GitFork, onSelect: () => void actions.fork(s.id) });
+  } else if (s.resumable) {
+    items.push({ label: t('sessions.resume'), icon: Play, onSelect: () => void actions.resume(s.id) });
+    items.push({ label: t('sessions.fork'), icon: GitFork, onSelect: () => void actions.fork(s.id) });
   }
-  return s.cwd.split('/').filter(Boolean).pop() ?? s.cwd;
+  if (s.hidden) items.push({ label: t('sessions.unhide'), icon: Eye, onSelect: () => void actions.unhide(s.id) });
+  else if (s.source === 'discovered') items.push({ label: t('sessions.hide'), icon: EyeOff, onSelect: () => void actions.hide(s.id) });
+  if (s.archived) items.push({ label: t('sessions.unarchive'), icon: ArchiveRestore, onSelect: () => void actions.unarchive(s.id) });
+  else if (s.source === 'managed' && !s.live) items.push({ label: t('sessions.archive'), icon: Archive, onSelect: () => void actions.archive(s.id) });
+  return items;
+}
+
+function openRowMenu(e: MouseEvent, s: SessionSummary): void {
+  const items = menuFor(s);
+  if (items.length) ctx.open(e.clientX, e.clientY, items);
+}
+
+function openAddMenu(e: MouseEvent): void {
+  ctx.open(e.clientX, e.clientY, [
+    { label: t('sessions.newSession'), icon: SquareTerminal, onSelect: () => void modals.open(NewSessionModal) },
+    { label: t('project.new'), icon: FolderPlus, onSelect: () => void modals.open(NewProjectModal) },
+  ]);
+}
+
+function openMoreMenu(e: MouseEvent): void {
+  ctx.open(e.clientX, e.clientY, [
+    {
+      label: t(store.showHidden ? 'sessions.hideHidden' : 'sessions.showHidden'),
+      icon: store.showHidden ? EyeOff : Eye,
+      onSelect: () => void store.setShowHidden(!store.showHidden),
+    },
+    {
+      label: t(store.showArchived ? 'sessions.hideArchived' : 'sessions.showArchived'),
+      icon: store.showArchived ? ArchiveRestore : Archive,
+      onSelect: () => void store.setShowArchived(!store.showArchived),
+    },
+    { label: t('sessions.hideDiscovered'), icon: EyeOff, disabled: !hasDiscovered.value, onSelect: () => void actions.hideDiscovered() },
+    { label: t('common.refresh'), icon: RefreshCw, onSelect: () => void store.fetchSessions() },
+  ]);
 }
 </script>

packages/web/src/components/ide/StatusBar.vue

@@ -42,10 +42,10 @@ const activeWt = computed(() => {
 const wsStatus = computed(() => wsClient.status.value);
 const wsDot = computed(() =>
   wsStatus.value === 'open'
-    ? 'bg-emerald-500'
+    ? 'bg-accent'
     : wsStatus.value === 'reconnecting' || wsStatus.value === 'connecting'
-      ? 'bg-amber-500'
-      : 'bg-zinc-600',
+      ? 'bg-warn'
+      : 'bg-fg-subtle',
 );
 const dockCount = computed(() => ide.dockSessionIds.length);
 </script>

packages/web/src/components/ide/TerminalDockTabs.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="flex h-[var(--ide-tab-h)] shrink-0 items-stretch overflow-x-auto border-b border-border bg-surface-1">
-    <div class="flex shrink-0 items-center gap-1 px-2 text-[11px] font-semibold tracking-wide text-fg-subtle uppercase">
-      <SquareTerminal :size="12" /> {{ t('ide.terminals') }}
+    <div class="flex shrink-0 items-center gap-1.5 px-2 label-mono">
+      <span class="flex items-center gap-1" aria-hidden="true">
+        <span class="h-2 w-2 rounded-full bg-danger" />
+        <span class="h-2 w-2 rounded-full bg-warn" />
+        <span class="h-2 w-2 rounded-full bg-accent" />
+      </span>
+      {{ t('ide.terminals') }}
     </div>
 
     <div
@@ -38,7 +43,7 @@
 
 <script setup lang="ts">
 import { useI18n } from 'vue-i18n';
-import { ChevronDown, SquareTerminal, X } from '@lucide/vue';
+import { ChevronDown, X } from '@lucide/vue';
 import type { SessionSummary } from '@arboretum/shared';
 import { useIdeStore } from '../../stores/ide';
 import { useSessionsStore } from '../../stores/sessions';

packages/web/src/components/ide/modals/ConfirmModal.vue

@@ -0,0 +1,54 @@
+<template>
+  <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" @click.self="emit('close')">
+    <div class="flex w-full max-w-sm flex-col gap-3 rounded-lg border border-border bg-surface-1 p-4">
+      <h2 class="font-semibold text-fg">{{ title }}</h2>
+      <p v-if="message" class="whitespace-pre-line text-sm text-fg-muted">{{ message }}</p>
+      <p v-if="errorMsg" class="text-xs text-danger">{{ errorMsg }}</p>
+      <div class="flex items-center justify-end gap-2">
+        <button type="button" class="btn text-xs" :disabled="busy" @click="emit('close')">
+          {{ cancelLabel ?? t('common.cancel') }}
+        </button>
+        <button type="button" :class="danger ? 'btn-danger' : 'btn-primary'" :disabled="busy" @click="onConfirmClick">
+          {{ busy ? t('common.working') : (confirmLabel ?? t('common.confirm')) }}
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Dialogue de confirmation générique et réutilisable. Le déclencheur passe une callback `onConfirm`
+// (souvent une mutation de store) : en cas de succès le modal se ferme, en cas d'échec le message
+// d'erreur s'affiche et le modal reste ouvert. L'escalade `force` sur 409 est gérée par l'appelant
+// (sa callback peut ouvrir un second ConfirmModal).
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const props = defineProps<{
+  title: string;
+  message?: string;
+  danger?: boolean;
+  confirmLabel?: string;
+  cancelLabel?: string;
+  onConfirm: () => void | Promise<void>;
+}>();
+const emit = defineEmits<{ close: [] }>();
+
+const { t } = useI18n();
+const busy = ref(false);
+const errorMsg = ref<string | null>(null);
+
+async function onConfirmClick(): Promise<void> {
+  if (busy.value) return;
+  busy.value = true;
+  errorMsg.value = null;
+  try {
+    await props.onConfirm();
+    emit('close');
+  } catch (err) {
+    errorMsg.value = err instanceof Error ? err.message : String(err);
+  } finally {
+    busy.value = false;
+  }
+}
+</script>

packages/web/src/components/ide/modals/GroupCreateModal.vue

@@ -0,0 +1,87 @@
+<template>
+  <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" @click.self="emit('close')">
+    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-border bg-surface-1 p-4">
+      <header class="flex items-center gap-2">
+        <h2 class="font-semibold text-fg">{{ t('groups.new') }}</h2>
+        <button class="btn ml-auto text-xs" @click="emit('close')">{{ t('common.cancel') }}</button>
+      </header>
+
+      <form class="flex flex-col gap-3" @submit.prevent="onSubmit">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
+          {{ t('groups.nameLabel') }}
+          <input v-model="label" class="input" :placeholder="t('groups.namePlaceholder')" required :disabled="busy" />
+        </label>
+
+        <div class="flex flex-col gap-1.5 text-xs text-fg-muted">
+          {{ t('groups.colorLabel') }}
+          <ColorSwatchPicker v-model="color" :none-label="t('groups.colorNone')" />
+        </div>
+
+        <div class="flex flex-col gap-1 text-xs text-fg-muted">
+          {{ t('groups.reposLabel') }}
+          <p v-if="worktrees.repos.length === 0" class="text-fg-subtle">{{ t('groups.noReposRegistered') }}</p>
+          <div v-else class="flex flex-wrap gap-2">
+            <label
+              v-for="repo in worktrees.repos"
+              :key="repo.id"
+              class="flex items-center gap-1.5 rounded-lg border border-border bg-surface-2/40 px-2 py-1"
+            >
+              <input v-model="selectedRepoIds" type="checkbox" :value="repo.id" :disabled="busy" />
+              <span class="text-fg">{{ repo.label }}</span>
+            </label>
+          </div>
+        </div>
+
+        <p v-if="errorMsg" class="text-xs text-danger">{{ errorMsg }}</p>
+        <div>
+          <button type="submit" class="btn-primary" :disabled="busy || label.trim() === ''">
+            {{ busy ? t('common.working') : t('groups.new') }}
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Création d'un groupe depuis l'IDE : nom + sélection des dépôts enregistrés. Reprend le formulaire
+// de l'ancien GroupsListView.
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useGroupsStore } from '../../../stores/groups';
+import { useWorktreesStore } from '../../../stores/worktrees';
+import { useToastsStore } from '../../../stores/toasts';
+import ColorSwatchPicker from '../../ui/ColorSwatchPicker.vue';
+
+const emit = defineEmits<{ close: [] }>();
+
+const { t } = useI18n();
+const groups = useGroupsStore();
+const worktrees = useWorktreesStore();
+const toasts = useToastsStore();
+
+const label = ref('');
+const color = ref<string | null>(null);
+const selectedRepoIds = ref<string[]>([]);
+const busy = ref(false);
+const errorMsg = ref<string | null>(null);
+
+async function onSubmit(): Promise<void> {
+  if (busy.value || label.value.trim() === '') return;
+  busy.value = true;
+  errorMsg.value = null;
+  try {
+    await groups.createGroup({
+      label: label.value.trim(),
+      repoIds: [...selectedRepoIds.value],
+      ...(color.value ? { color: color.value } : {}),
+    });
+    toasts.success(t('toast.groupCreated'));
+    emit('close');
+  } catch (err) {
+    errorMsg.value = err instanceof Error ? err.message : String(err);
+  } finally {
+    busy.value = false;
+  }
+}
+</script>

packages/web/src/components/ide/modals/GroupEditModal.vue

@@ -0,0 +1,85 @@
+<template>
+  <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" @click.self="emit('close')">
+    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-border bg-surface-1 p-4">
+      <header class="flex items-center gap-2">
+        <h2 class="truncate font-semibold text-fg">{{ t('groups.edit') }} · {{ group?.label ?? '' }}</h2>
+        <button class="btn ml-auto text-xs" @click="emit('close')">{{ t('common.close') }}</button>
+      </header>
+
+      <div class="flex flex-col gap-1.5 text-xs text-fg-muted">
+        {{ t('groups.colorLabel') }}
+        <ColorSwatchPicker :model-value="group?.color ?? null" :none-label="t('groups.colorNone')" @update:model-value="setColor" />
+      </div>
+
+      <div class="flex flex-col gap-1 text-xs text-fg-muted">
+        {{ t('groups.reposLabel') }}
+        <p v-if="worktrees.repos.length === 0" class="text-fg-subtle">{{ t('groups.noReposRegistered') }}</p>
+        <div v-else class="flex flex-wrap gap-2">
+          <label
+            v-for="repo in worktrees.repos"
+            :key="repo.id"
+            class="flex items-center gap-1.5 rounded-lg border border-border bg-surface-2/40 px-2 py-1"
+          >
+            <input type="checkbox" :checked="repoIds.includes(repo.id)" :disabled="busy" @change="toggle(repo.id)" />
+            <span class="text-fg">{{ repo.label }}</span>
+          </label>
+        </div>
+      </div>
+      <p v-if="errorMsg" class="text-xs text-danger">{{ errorMsg }}</p>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Édition de la composition d'un groupe (ajout/retrait de dépôts) depuis l'IDE. Reprend la logique
+// de GroupView.toggleRepo. Le groupe à jour arrive aussi par WS ; on lit `group` depuis le store.
+import { computed, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useGroupsStore } from '../../../stores/groups';
+import { useWorktreesStore } from '../../../stores/worktrees';
+import { useToastsStore } from '../../../stores/toasts';
+import ColorSwatchPicker from '../../ui/ColorSwatchPicker.vue';
+
+const props = defineProps<{ groupId: string }>();
+const emit = defineEmits<{ close: [] }>();
+
+const { t } = useI18n();
+const groupsStore = useGroupsStore();
+const worktrees = useWorktreesStore();
+const toasts = useToastsStore();
+
+const busy = ref(false);
+const errorMsg = ref<string | null>(null);
+// Lecture live depuis le store (mise à jour par WS après add/remove).
+const group = computed(() => groupsStore.byId(props.groupId));
+const repoIds = computed<string[]>(() => group.value?.repoIds ?? []);
+
+async function setColor(c: string | null): Promise<void> {
+  if (busy.value) return;
+  busy.value = true;
+  errorMsg.value = null;
+  try {
+    await groupsStore.updateGroup(props.groupId, { color: c });
+    toasts.success(t('toast.groupUpdated'));
+  } catch (err) {
+    errorMsg.value = err instanceof Error ? err.message : String(err);
+  } finally {
+    busy.value = false;
+  }
+}
+
+async function toggle(repoId: string): Promise<void> {
+  if (busy.value) return;
+  busy.value = true;
+  errorMsg.value = null;
+  try {
+    if (repoIds.value.includes(repoId)) await groupsStore.removeRepoFromGroup(props.groupId, repoId);
+    else await groupsStore.addRepoToGroup(props.groupId, repoId);
+    toasts.success(t('toast.groupUpdated'));
+  } catch (err) {
+    errorMsg.value = err instanceof Error ? err.message : String(err);
+  } finally {
+    busy.value = false;
+  }
+}
+</script>

packages/web/src/components/ide/modals/NewSessionModal.vue

@@ -0,0 +1,82 @@
+<template>
+  <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" @click.self="emit('close')">
+    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-border bg-surface-1 p-4">
+      <header class="flex items-center gap-2">
+        <h2 class="font-semibold text-fg">{{ t('sessions.newSession') }}</h2>
+        <button class="btn ml-auto text-xs" @click="emit('close')">{{ t('common.cancel') }}</button>
+      </header>
+
+      <form class="flex flex-col gap-3" @submit.prevent="onSubmit">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
+          {{ t('sessions.cwdLabel') }}
+          <input v-model="cwd" class="input font-mono" :placeholder="t('sessions.cwdPlaceholder')" required :disabled="creating" />
+        </label>
+        <div>
+          <button type="button" class="btn text-xs" :disabled="creating" @click="showPicker = !showPicker">{{ t('fs.browse') }}</button>
+        </div>
+        <DirectoryPicker v-if="showPicker" mode="dir" :initial-path="cwd" @select="onPick" @close="showPicker = false" />
+
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
+          {{ t('sessions.commandLabel') }}
+          <select v-model="command" class="input" :disabled="creating">
+            <option value="claude">claude</option>
+            <option value="bash">bash</option>
+          </select>
+        </label>
+
+        <p v-if="errorMsg" class="text-xs text-danger">{{ errorMsg }}</p>
+        <div>
+          <button type="submit" class="btn-primary" :disabled="creating || cwd.trim() === ''">
+            {{ creating ? t('common.working') : t('sessions.newSession') }}
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Formulaire « nouvelle session » dans l'IDE : cwd (+ DirectoryPicker) et commande. Au succès,
+// ouvre la session dans le dock via ide.openTerminal (aucune navigation).
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useSessionsStore } from '../../../stores/sessions';
+import { useIdeStore } from '../../../stores/ide';
+import { useToastsStore } from '../../../stores/toasts';
+import DirectoryPicker from '../../DirectoryPicker.vue';
+
+const props = defineProps<{ cwd?: string }>();
+const emit = defineEmits<{ close: [] }>();
+
+const { t } = useI18n();
+const sessions = useSessionsStore();
+const ide = useIdeStore();
+const toasts = useToastsStore();
+
+const cwd = ref(props.cwd ?? '');
+const command = ref<'claude' | 'bash'>('claude');
+const showPicker = ref(false);
+const creating = ref(false);
+const errorMsg = ref<string | null>(null);
+
+function onPick(path: string): void {
+  cwd.value = path;
+  showPicker.value = false;
+}
+
+async function onSubmit(): Promise<void> {
+  if (creating.value || cwd.value.trim() === '') return;
+  creating.value = true;
+  errorMsg.value = null;
+  try {
+    const s = await sessions.createSession(cwd.value.trim(), command.value);
+    toasts.success(t('toast.sessionCreated'));
+    emit('close');
+    ide.openTerminal(s.id);
+  } catch (err) {
+    errorMsg.value = err instanceof Error ? err.message : String(err);
+  } finally {
+    creating.value = false;
+  }
+}
+</script>

packages/web/src/components/ide/modals/WorktreeCreateModal.vue

@@ -0,0 +1,149 @@
+<template>
+  <div class="fixed inset-0 z-50 flex items-center justify-center bg-black/60 p-4" @click.self="emit('close')">
+    <div class="flex max-h-[90vh] w-full max-w-lg flex-col gap-3 overflow-y-auto rounded-lg border border-border bg-surface-1 p-4">
+      <header class="flex items-center gap-2">
+        <h2 class="truncate font-semibold text-fg">{{ t('worktrees.startWork') }} · {{ repo.label }}</h2>
+        <button class="btn ml-auto text-xs" @click="emit('close')">{{ t('common.cancel') }}</button>
+      </header>
+
+      <div class="flex flex-wrap items-center gap-3 text-xs text-fg-muted">
+        {{ t('worktrees.modeLabel') }}
+        <label class="flex items-center gap-1.5"><input v-model="mode" type="radio" value="worktree" :disabled="busy" /> {{ t('worktrees.modeWorktree') }}</label>
+        <label class="flex items-center gap-1.5"><input v-model="mode" type="radio" value="main" :disabled="busy" /> {{ t('worktrees.modeMain') }}</label>
+      </div>
+
+      <form class="flex flex-col gap-3" @submit.prevent="onSubmit">
+        <template v-if="mode === 'worktree'">
+          <label class="flex flex-col gap-1 text-xs text-fg-muted">
+            {{ t('worktrees.branch') }}
+            <input v-model="branch" class="input font-mono" placeholder="feature/…" required :disabled="busy" />
+          </label>
+          <label class="flex flex-col gap-1 text-xs text-fg-muted">
+            {{ t('worktrees.baseRefLabel') }}
+            <input v-model="baseRef" class="input font-mono" :list="datalistId" :placeholder="t('worktrees.baseRefPlaceholder')" :disabled="busy" />
+            <datalist :id="datalistId">
+              <option v-for="b in baseBranchOptions" :key="b" :value="b" />
+            </datalist>
+          </label>
+          <label class="flex flex-col gap-1 text-xs text-fg-muted">
+            {{ t('worktrees.start') }}
+            <select v-model="startSession" class="input" :disabled="busy">
+              <option :value="null">{{ t('worktrees.startNone') }}</option>
+              <option value="claude">claude</option>
+              <option value="bash">bash</option>
+            </select>
+          </label>
+        </template>
+
+        <template v-else>
+          <label class="flex flex-col gap-1 text-xs text-fg-muted">
+            {{ t('worktrees.branchModeLabel') }}
+            <select v-model="mainBranchMode" class="input" :disabled="busy">
+              <option value="current">{{ t('worktrees.currentBranch') }}</option>
+              <option value="new">{{ t('worktrees.newBranchOpt') }}</option>
+            </select>
+          </label>
+          <label v-if="mainBranchMode === 'new'" class="flex flex-col gap-1 text-xs text-fg-muted">
+            {{ t('worktrees.branch') }}
+            <input v-model="branch" class="input font-mono" placeholder="feature/…" :disabled="busy" />
+          </label>
+          <label class="flex flex-col gap-1 text-xs text-fg-muted">
+            {{ t('worktrees.commandLabel') }}
+            <select v-model="mainCommand" class="input" :disabled="busy">
+              <option value="claude">claude</option>
+              <option value="bash">bash</option>
+            </select>
+          </label>
+        </template>
+
+        <p v-if="error" class="text-xs text-danger">{{ error }}</p>
+        <div>
+          <button type="submit" class="btn-primary" :disabled="busy || !canSubmit">
+            {{ busy ? t('common.working') : mode === 'worktree' ? t('worktrees.create') : t('worktrees.start') }}
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Création de worktree (ou « travailler sur la branche principale ») depuis l'IDE. Reprend la
+// logique de l'ancien RepoSection.onCreate. Au succès : ouvre la session résultante dans le dock
+// et révèle le worktree dans l'arbre. Aucune navigation.
+import { computed, onMounted, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import type { RepoBranchesResponse, RepoSummary } from '@arboretum/shared';
+import { useWorktreesStore } from '../../../stores/worktrees';
+import { useIdeStore } from '../../../stores/ide';
+import { useToastsStore } from '../../../stores/toasts';
+
+const props = defineProps<{ repo: RepoSummary; initialMode?: 'worktree' | 'main' }>();
+const emit = defineEmits<{ close: [] }>();
+
+const { t } = useI18n();
+const store = useWorktreesStore();
+const ide = useIdeStore();
+const toasts = useToastsStore();
+
+const mode = ref<'worktree' | 'main'>(props.initialMode ?? 'worktree');
+const branch = ref('');
+const baseRef = ref('');
+const startSession = ref<'claude' | 'bash' | null>(null);
+const mainBranchMode = ref<'current' | 'new'>('current');
+const mainCommand = ref<'claude' | 'bash'>('claude');
+const busy = ref(false);
+const error = ref<string | null>(null);
+
+// Sélecteur de branche de base (chargé à l'ouverture ; facultatif).
+const branches = ref<RepoBranchesResponse | null>(null);
+const datalistId = computed(() => `wt-base-${props.repo.id}`);
+const baseBranchOptions = computed<string[]>(() => {
+  const b = branches.value;
+  if (!b) return [];
+  return Array.from(new Set([...(b.default ? [b.default] : []), ...b.local, ...b.remote]));
+});
+onMounted(async () => {
+  try {
+    branches.value = await store.fetchBranches(props.repo.id);
+  } catch {
+    /* le sélecteur de base est facultatif */
+  }
+});
+
+const canSubmit = computed(() =>
+  mode.value === 'worktree' ? branch.value.trim() !== '' : mainBranchMode.value === 'current' || branch.value.trim() !== '',
+);
+
+async function onSubmit(): Promise<void> {
+  if (busy.value || !canSubmit.value) return;
+  busy.value = true;
+  error.value = null;
+  try {
+    if (mode.value === 'worktree') {
+      const res = await store.createWorktree(props.repo.id, {
+        branch: branch.value.trim(),
+        mode: 'auto', // détecte créer / checkout / suivi remote
+        ...(baseRef.value.trim() ? { baseRef: baseRef.value.trim() } : {}),
+        startSession: startSession.value,
+      });
+      toasts.success(t('toast.worktreeCreated'));
+      ide.revealWorktree(res.worktree.repoId, res.worktree.path);
+      if (res.session) ide.openTerminal(res.session.id);
+      emit('close');
+    } else {
+      const s = await store.startMainSession(props.repo.id, {
+        command: mainCommand.value,
+        ...(mainBranchMode.value === 'new' ? { branch: branch.value.trim(), newBranch: true } : {}),
+      });
+      toasts.success(t('toast.sessionCreated'));
+      ide.openTerminal(s.id);
+      emit('close');
+    }
+  } catch (err) {
+    error.value = err instanceof Error ? err.message : String(err);
+  } finally {
+    busy.value = false;
+  }
+}
+</script>

packages/web/src/components/ide/overlays/HelpOverlay.vue

@@ -0,0 +1,26 @@
+<template>
+  <div class="fixed inset-0 z-50 flex items-start justify-center overflow-y-auto bg-black/60 p-4 sm:p-8" @click.self="emit('close')">
+    <div class="relative w-full max-w-3xl rounded-lg border border-border bg-surface-0 p-4 shadow-pop">
+      <button
+        type="button"
+        class="absolute top-3 right-3 z-10 rounded p-1 text-fg-subtle hover:bg-surface-2 hover:text-fg"
+        :aria-label="t('common.close')"
+        @click="emit('close')"
+      >
+        <X :size="18" />
+      </button>
+      <HelpView />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Overlay Aide : rend la vue HelpView PAR-DESSUS l'IDE (Teleport via ModalHost), sans démonter
+// IdeShell.
+import { useI18n } from 'vue-i18n';
+import { X } from '@lucide/vue';
+import HelpView from '../../../views/HelpView.vue';
+
+const emit = defineEmits<{ close: [] }>();
+const { t } = useI18n();
+</script>

packages/web/src/components/ide/overlays/SettingsOverlay.vue

@@ -0,0 +1,26 @@
+<template>
+  <div class="fixed inset-0 z-50 flex items-start justify-center overflow-y-auto bg-black/60 p-4 sm:p-8" @click.self="emit('close')">
+    <div class="relative w-full max-w-3xl rounded-lg border border-border bg-surface-0 p-4 shadow-pop">
+      <button
+        type="button"
+        class="absolute top-3 right-3 z-10 rounded p-1 text-fg-subtle hover:bg-surface-2 hover:text-fg"
+        :aria-label="t('common.close')"
+        @click="emit('close')"
+      >
+        <X :size="18" />
+      </button>
+      <SettingsView />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+// Overlay Réglages : rend la vue SettingsView complète PAR-DESSUS l'IDE (Teleport via ModalHost),
+// sans jamais démonter IdeShell (donc les terminaux du dock restent attachés).
+import { useI18n } from 'vue-i18n';
+import { X } from '@lucide/vue';
+import SettingsView from '../../../views/SettingsView.vue';
+
+const emit = defineEmits<{ close: [] }>();
+const { t } = useI18n();
+</script>

packages/web/src/components/layout/AppShell.vue

@@ -1,28 +0,0 @@
-<template>
-  <div class="flex min-h-0 w-full flex-1 overflow-hidden">
-    <AppSidebar />
-    <div class="flex min-h-0 min-w-0 flex-1 flex-col">
-      <!-- fullbleed (terminal) : pas de tabbar mobile ni de padding bas → terminal réellement plein écran
-           (la navigation reste accessible via le lien « ← retour » du header de la vue). -->
-      <main v-if="fullbleed" class="flex min-h-0 flex-1 flex-col">
-        <slot />
-      </main>
-      <main v-else class="flex-1 overflow-y-auto pb-14 md:pb-0">
-        <div class="mx-auto flex w-full max-w-3xl flex-col gap-4 px-4 py-4 md:py-6">
-          <slot />
-        </div>
-      </main>
-      <MobileTabBar v-if="!fullbleed" />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-// Coquille des vues authentifiées (sidebar + contenu). Le chargement initial et les abonnements
-// temps réel sont désormais possédés par useRealtimeBootstrap (monté dans App.vue), pour couvrir
-// aussi la vue IDE plein écran qui n'utilise pas cette coquille.
-import AppSidebar from './AppSidebar.vue';
-import MobileTabBar from './MobileTabBar.vue';
-
-defineProps<{ fullbleed?: boolean }>();
-</script>

packages/web/src/components/layout/AppShellFooter.vue

@@ -1,57 +0,0 @@
-<template>
-  <div class="flex flex-col gap-2">
-    <p v-if="pushErrorText" class="text-xs text-amber-400">{{ pushErrorText }}</p>
-    <div class="flex items-center gap-2">
-      <LanguageSwitcher />
-      <BaseButton
-        v-if="push.supported"
-        variant="ghost"
-        size="sm"
-        icon-only
-        :icon="push.enabled ? Bell : BellOff"
-        :class="push.enabled ? 'text-emerald-300' : ''"
-        :disabled="push.busy"
-        :title="pushErrorText || undefined"
-        :aria-label="push.enabled ? t('push.disable') : t('push.enable')"
-        @click="push.toggle()"
-      />
-      <BaseButton
-        variant="ghost"
-        size="sm"
-        icon-only
-        :icon="LogOut"
-        class="ml-auto"
-        :aria-label="t('common.logout')"
-        @click="logout"
-      />
-    </div>
-    <span v-if="auth.serverVersion" class="text-[11px] text-zinc-600">v{{ auth.serverVersion }}</span>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { computed, onMounted } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { Bell, BellOff, LogOut } from '@lucide/vue';
-import { useAuthStore } from '../../stores/auth';
-import { usePushStore } from '../../stores/push';
-import { useSession } from '../../composables/useSession';
-import BaseButton from '../ui/BaseButton.vue';
-import LanguageSwitcher from '../LanguageSwitcher.vue';
-
-const { t } = useI18n();
-const auth = useAuthStore();
-const push = usePushStore();
-const { logout } = useSession();
-
-// 'denied'/'unsupported' sont des clés i18n ; tout autre message d'erreur est affiché tel quel.
-const pushErrorText = computed(() => {
-  const e = push.error;
-  if (!e) return '';
-  return e === 'denied' || e === 'unsupported' ? t(`push.${e}`) : e;
-});
-
-onMounted(() => {
-  void push.refresh();
-});
-</script>

packages/web/src/components/layout/AppSidebar.vue

@@ -1,58 +0,0 @@
-<template>
-  <aside class="hidden w-56 shrink-0 flex-col border-r border-zinc-800/80 bg-zinc-900/40 md:flex">
-    <RouterLink :to="{ name: 'dashboard' }" class="flex items-center gap-2 px-4 py-3.5">
-      <img src="/icon.svg" class="h-7 w-7" alt="" />
-      <span class="text-base font-semibold text-zinc-100">{{ t('common.appName') }}</span>
-    </RouterLink>
-    <button
-      type="button"
-      class="mx-2 mb-2 flex items-center gap-2 rounded-lg border border-zinc-800 bg-zinc-950/40 px-2.5 py-1.5 text-sm text-zinc-500 transition-colors hover:border-zinc-700 hover:text-zinc-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/50"
-      @click="palette.show()"
-    >
-      <Search :size="15" />
-      <span class="flex-1 text-left">{{ t('common.search') }}</span>
-      <kbd class="rounded border border-zinc-700 px-1 text-[10px] text-zinc-500">⌘K</kbd>
-    </button>
-    <nav class="flex flex-1 flex-col gap-1 px-2">
-      <NavItem
-        v-for="item in primary"
-        :key="item.key"
-        :to="item.to"
-        :icon="item.icon"
-        :label="item.label"
-        :badge="item.badge"
-        :active="isActive(item.match)"
-        orientation="row"
-      />
-    </nav>
-    <nav class="flex flex-col gap-1 px-2 pb-1">
-      <NavItem
-        v-for="item in secondary"
-        :key="item.key"
-        :to="item.to"
-        :href="item.href"
-        :icon="item.icon"
-        :label="item.label"
-        :badge="item.badge"
-        :active="isActive(item.match)"
-        orientation="row"
-      />
-    </nav>
-    <div class="border-t border-zinc-800/80 p-3">
-      <AppShellFooter />
-    </div>
-  </aside>
-</template>
-
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n';
-import { Search } from '@lucide/vue';
-import { useNav } from '../../composables/useNav';
-import { useCommandPalette } from '../../composables/useCommandPalette';
-import NavItem from './NavItem.vue';
-import AppShellFooter from './AppShellFooter.vue';
-
-const { t } = useI18n();
-const { primary, secondary, isActive } = useNav();
-const palette = useCommandPalette();
-</script>

packages/web/src/components/layout/MobileTabBar.vue

@@ -1,43 +0,0 @@
-<template>
-  <nav
-    class="fixed inset-x-0 bottom-0 z-40 flex border-t border-zinc-800 bg-zinc-950/95 backdrop-blur md:hidden"
-    style="padding-bottom: env(safe-area-inset-bottom)"
-  >
-    <NavItem
-      v-for="item in primary"
-      :key="item.key"
-      :to="item.to"
-      :icon="item.icon"
-      :label="item.label"
-      :badge="item.badge"
-      :active="isActive(item.match)"
-      orientation="col"
-      class="flex-1"
-    />
-    <button
-      type="button"
-      class="flex flex-1 flex-col items-center gap-0.5 py-2 text-zinc-500 transition-colors hover:text-zinc-300 focus-visible:outline-none"
-      :class="moreActive ? 'text-emerald-400' : ''"
-      @click="showMore = true"
-    >
-      <Menu :size="20" :stroke-width="1.75" />
-      <span class="text-[10px]">{{ t('nav.more') }}</span>
-    </button>
-    <MoreSheet v-if="showMore" @close="showMore = false" />
-  </nav>
-</template>
-
-<script setup lang="ts">
-import { computed, ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { Menu } from '@lucide/vue';
-import { useNav } from '../../composables/useNav';
-import NavItem from './NavItem.vue';
-import MoreSheet from './MoreSheet.vue';
-
-const { t } = useI18n();
-const { primary, secondary, isActive } = useNav();
-const showMore = ref(false);
-// « More » est actif quand la route courante appartient aux items secondaires (Réglages/Aide).
-const moreActive = computed(() => secondary.value.some((i) => isActive(i.match)));
-</script>

packages/web/src/components/layout/MoreSheet.vue

@@ -1,59 +0,0 @@
-<template>
-  <Teleport to="body">
-    <div class="fixed inset-0 z-50 md:hidden" role="dialog" aria-modal="true">
-      <div class="absolute inset-0 bg-black/60" @click="emit('close')" />
-      <div
-        class="absolute inset-x-0 bottom-0 rounded-t-2xl border-t border-zinc-800 bg-zinc-900 p-4 shadow-pop"
-        style="padding-bottom: calc(1rem + env(safe-area-inset-bottom))"
-      >
-        <div class="mx-auto mb-3 h-1 w-10 rounded-full bg-zinc-700" />
-        <!-- accès recherche/palette : sur mobile la sidebar (et ⌘K) est indisponible → seul point d'entrée -->
-        <button
-          type="button"
-          class="mb-3 flex w-full items-center gap-2 rounded-lg border border-zinc-800 bg-zinc-950/40 px-3 py-2 text-sm text-zinc-400 transition-colors hover:border-zinc-700 hover:text-zinc-200 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/50"
-          @click="openSearch"
-        >
-          <Search :size="16" />
-          <span>{{ t('common.search') }}</span>
-        </button>
-        <nav class="mb-3 flex flex-col gap-1">
-          <NavItem
-            v-for="item in secondary"
-            :key="item.key"
-            :to="item.to"
-            :href="item.href"
-            :icon="item.icon"
-            :label="item.label"
-            :active="isActive(item.match)"
-            orientation="row"
-            @click="emit('close')"
-          />
-        </nav>
-        <div class="border-t border-zinc-800/80 pt-3">
-          <AppShellFooter />
-        </div>
-        <BaseButton class="mt-3 w-full" @click="emit('close')">{{ t('common.close') }}</BaseButton>
-      </div>
-    </div>
-  </Teleport>
-</template>
-
-<script setup lang="ts">
-import { useI18n } from 'vue-i18n';
-import { Search } from '@lucide/vue';
-import { useNav } from '../../composables/useNav';
-import { useCommandPalette } from '../../composables/useCommandPalette';
-import NavItem from './NavItem.vue';
-import AppShellFooter from './AppShellFooter.vue';
-import BaseButton from '../ui/BaseButton.vue';
-
-const { t } = useI18n();
-const { secondary, isActive } = useNav();
-const palette = useCommandPalette();
-const emit = defineEmits<{ close: [] }>();
-
-function openSearch(): void {
-  emit('close');
-  palette.show();
-}
-</script>

packages/web/src/components/layout/NavItem.vue

@@ -1,58 +0,0 @@
-<template>
-  <!-- RouterLink pour une route interne ; <a target=_blank> pour un lien externe (ex. Gitea). -->
-  <component
-    :is="href ? 'a' : RouterLink"
-    :to="href ? undefined : to"
-    :href="href"
-    :target="href ? '_blank' : undefined"
-    :rel="href ? 'noopener noreferrer' : undefined"
-    :aria-current="!href && active ? 'page' : undefined"
-    :class="orientation === 'col' ? colClass : rowClass"
-  >
-    <span class="relative">
-      <component :is="icon" :size="orientation === 'col' ? 20 : 18" :stroke-width="1.75" />
-      <span
-        v-if="badge"
-        class="absolute -right-1.5 -top-1.5 flex h-3.5 min-w-3.5 items-center justify-center rounded-full bg-amber-500 px-1 text-[9px] font-semibold text-amber-950"
-      >
-        {{ badge }}
-      </span>
-    </span>
-    <span :class="orientation === 'col' ? 'text-[10px]' : 'flex-1'">{{ label }}</span>
-    <span
-      v-if="badge && orientation === 'row'"
-      class="rounded-full bg-amber-500/20 px-1.5 text-[11px] font-semibold text-amber-300"
-    >
-      {{ badge }}
-    </span>
-  </component>
-</template>
-
-<script setup lang="ts">
-import { computed, type Component } from 'vue';
-import { RouterLink, type RouteLocationRaw } from 'vue-router';
-
-const props = withDefaults(
-  defineProps<{
-    // `| undefined` requis par exactOptionalPropertyTypes : les items de nav passent `to`/`href`
-    // potentiellement undefined (l'un ou l'autre selon route interne vs lien externe).
-    to?: RouteLocationRaw | undefined;
-    href?: string | undefined;
-    icon: Component;
-    label: string;
-    badge?: number;
-    active?: boolean;
-    orientation?: 'row' | 'col';
-  }>(),
-  { orientation: 'row' },
-);
-
-const rowClass = computed(() => [
-  'flex items-center gap-2.5 rounded-lg px-3 py-2 text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/70',
-  props.active ? 'bg-zinc-800 text-zinc-100' : 'text-zinc-400 hover:bg-zinc-800/50 hover:text-zinc-200',
-]);
-const colClass = computed(() => [
-  'flex flex-1 flex-col items-center gap-0.5 py-2 transition-colors focus-visible:outline-none',
-  props.active ? 'text-emerald-400' : 'text-zinc-500 hover:text-zinc-300',
-]);
-</script>

packages/web/src/components/layout/PageHeader.vue

@@ -2,9 +2,9 @@
   <header class="flex flex-wrap items-center gap-x-3 gap-y-2">
     <div class="flex min-w-0 items-center gap-2">
       <slot name="title">
-        <h1 class="truncate text-lg font-semibold text-zinc-100">{{ title }}</h1>
+        <h1 class="truncate text-lg font-semibold text-fg">{{ title }}</h1>
       </slot>
-      <span v-if="subtitle" class="truncate font-mono text-xs text-zinc-500" :title="subtitle">{{ subtitle }}</span>
+      <span v-if="subtitle" class="truncate font-mono text-xs text-fg-subtle" :title="subtitle">{{ subtitle }}</span>
     </div>
     <div v-if="$slots.default" class="ml-auto flex flex-wrap items-center gap-2">
       <slot />

packages/web/src/components/layout/WsBanner.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="border-b border-amber-900/50 bg-amber-950/80 px-4 py-1.5 text-center text-xs text-amber-300">
+  <div class="border-b border-warn/40 bg-warn/15 px-4 py-1.5 text-center text-xs text-warn">
     {{ t('ws.reconnecting') }}
   </div>
 </template>

packages/web/src/components/settings/GitConnectionsSection.vue

@@ -1,18 +1,18 @@
 <template>
   <section class="card flex flex-col gap-3">
-    <h2 class="flex items-center gap-2 text-sm font-semibold text-zinc-100">
+    <h2 class="flex items-center gap-2 text-sm font-semibold text-fg">
       <Plug :size="16" /> {{ t('gitconn.title') }}
     </h2>
-    <p class="text-xs text-zinc-500">{{ t('gitconn.hint') }}</p>
+    <p class="text-xs text-fg-subtle">{{ t('gitconn.hint') }}</p>
 
     <!-- liste des connexions -->
     <ul v-if="store.connections.length" class="flex flex-col gap-1">
       <li v-for="c in store.connections" :key="c.id" class="card-inset flex flex-wrap items-center gap-2">
-        <BaseBadge tone="sky">{{ c.service }}</BaseBadge>
-        <span class="font-medium text-zinc-200">{{ c.label }}</span>
-        <span class="text-xs text-zinc-500">{{ c.authType }}<template v-if="c.username"> · {{ c.username }}</template></span>
-        <span v-if="c.hasSecret" class="font-mono text-xs text-zinc-600">••••{{ c.secretLast4 }}</span>
-        <BaseBadge v-if="c.testResult" :tone="c.testResult === 'ok' ? 'emerald' : 'red'">{{ c.testResult }}</BaseBadge>
+        <BaseBadge tone="info">{{ c.service }}</BaseBadge>
+        <span class="font-medium text-fg">{{ c.label }}</span>
+        <span class="text-xs text-fg-subtle">{{ c.authType }}<template v-if="c.username"> · {{ c.username }}</template></span>
+        <span v-if="c.hasSecret" class="font-mono text-xs text-fg-subtle">••••{{ c.secretLast4 }}</span>
+        <BaseBadge v-if="c.testResult" :tone="c.testResult === 'ok' ? 'accent' : 'danger'">{{ c.testResult }}</BaseBadge>
         <span class="ml-auto flex items-center gap-1">
           <BaseButton size="sm" variant="ghost" :loading="testingId === c.id" @click="onTest(c.id)">{{ t('gitconn.test') }}</BaseButton>
           <BaseButton v-if="confirmId === c.id" size="sm" variant="danger" @click="onDelete(c.id)">{{ t('common.confirm') }}</BaseButton>
@@ -20,12 +20,12 @@
         </span>
       </li>
     </ul>
-    <p v-else class="text-xs text-zinc-600">{{ t('gitconn.empty') }}</p>
+    <p v-else class="text-xs text-fg-subtle">{{ t('gitconn.empty') }}</p>
 
     <!-- formulaire d'ajout -->
     <form v-if="adding" class="card-inset flex flex-col gap-2" @submit.prevent="onCreate">
       <div class="flex flex-wrap gap-2">
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('gitconn.service') }}
           <select v-model="form.service" class="input">
             <option value="gitea">Gitea</option>
@@ -33,33 +33,33 @@
             <option value="github">GitHub</option>
           </select>
         </label>
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('gitconn.authType') }}
           <select v-model="form.authType" class="input">
             <option value="pat">{{ t('gitconn.pat') }}</option>
             <option value="app_password">{{ t('gitconn.appPassword') }}</option>
           </select>
         </label>
-        <label class="flex flex-1 flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-1 flex-col gap-1 text-xs text-fg-muted">
           {{ t('gitconn.label') }}
           <input v-model.trim="form.label" class="input" :placeholder="t('gitconn.labelPlaceholder')" required />
         </label>
       </div>
-      <label v-if="form.service === 'gitea' || form.service === 'gitlab'" class="flex flex-col gap-1 text-xs text-zinc-400">
+      <label v-if="form.service === 'gitea' || form.service === 'gitlab'" class="flex flex-col gap-1 text-xs text-fg-muted">
         {{ t('gitconn.baseUrl') }}<template v-if="form.service === 'gitea'"> *</template>
         <input v-model.trim="form.baseUrl" class="input font-mono" placeholder="https://git.example.com" :required="form.service === 'gitea'" />
       </label>
       <div class="flex flex-wrap gap-2">
-        <label class="flex flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-col gap-1 text-xs text-fg-muted">
           {{ t('gitconn.username') }}
           <input v-model.trim="form.username" class="input" :placeholder="t('gitconn.usernamePlaceholder')" />
         </label>
-        <label class="flex flex-1 flex-col gap-1 text-xs text-zinc-400">
+        <label class="flex flex-1 flex-col gap-1 text-xs text-fg-muted">
           {{ form.authType === 'pat' ? t('gitconn.token') : t('gitconn.password') }}
           <input v-model="form.secret" type="password" class="input font-mono" autocomplete="off" required />
         </label>
       </div>
-      <p v-if="error" class="text-xs text-amber-400">{{ error }}</p>
+      <p v-if="error" class="text-xs text-warn">{{ error }}</p>
       <div class="flex items-center gap-2">
         <BaseButton type="submit" variant="primary" size="sm" :loading="creating" :disabled="!canCreate">{{ t('gitconn.add') }}</BaseButton>
         <BaseButton type="button" size="sm" variant="ghost" @click="adding = false">{{ t('common.cancel') }}</BaseButton>

packages/web/src/components/settings/ServerRow.vue

@@ -1,10 +1,10 @@
 <template>
   <!-- Ligne de config serveur en lecture seule : label + valeur (+ flag CLI) + copier. -->
   <div class="flex flex-wrap items-center gap-x-3 gap-y-0.5 py-2">
-    <dt class="w-40 shrink-0 text-sm text-zinc-400">{{ label }}</dt>
+    <dt class="w-40 shrink-0 text-sm text-fg-muted">{{ label }}</dt>
     <dd class="flex min-w-0 flex-1 items-center gap-2">
-      <span :class="['min-w-0 flex-1 break-all text-sm text-zinc-200', mono ? 'font-mono text-xs' : '']">{{ value }}</span>
-      <span v-if="flag" class="hidden shrink-0 font-mono text-[11px] text-zinc-600 sm:inline" :title="t('settings.flagHint', { flag })">{{ flag }}</span>
+      <span :class="['min-w-0 flex-1 break-all text-sm text-fg', mono ? 'font-mono text-xs' : '']">{{ value }}</span>
+      <span v-if="flag" class="hidden shrink-0 font-mono text-[11px] text-fg-subtle sm:inline" :title="t('settings.flagHint', { flag })">{{ flag }}</span>
       <BaseButton size="sm" variant="ghost" icon-only :icon="copied ? Check : Copy" :aria-label="t('settings.copy')" @click="copy" />
     </dd>
   </div>

packages/web/src/components/ui/BaseBadge.vue

@@ -1,6 +1,6 @@
 <template>
   <span class="badge" :class="toneClass">
-    <span v-if="dot" class="inline-block h-1.5 w-1.5 rounded-full" :class="dotClass" />
+    <span v-if="dot" class="inline-block h-2 w-2 rounded-full" :class="dotClass" />
     <slot />
   </span>
 </template>
@@ -12,7 +12,7 @@ import { computed } from 'vue';
 import { TONE_BADGE, TONE_DOT, type Tone } from '../../lib/status-tokens';
 
 const props = withDefaults(defineProps<{ tone?: Tone; dot?: boolean; pulse?: boolean }>(), {
-  tone: 'zinc',
+  tone: 'neutral',
 });
 
 const toneClass = computed(() => TONE_BADGE[props.tone]);

packages/web/src/components/ui/BaseButton.vue

@@ -22,7 +22,7 @@ defineOptions({ inheritAttrs: false });
 
 const props = withDefaults(
   defineProps<{
-    variant?: 'primary' | 'secondary' | 'ghost' | 'danger';
+    variant?: 'primary' | 'secondary' | 'ghost' | 'danger' | 'coffee';
     size?: 'sm' | 'md';
     loading?: boolean;
     disabled?: boolean;
@@ -43,18 +43,21 @@ const tag = computed(() => (asLink.value ? RouterLink : 'button'));
 const iconSize = computed(() => (props.size === 'sm' ? 15 : 16));
 
 const BASE =
-  'inline-flex items-center justify-center gap-1.5 rounded-lg font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-surface-0 disabled:cursor-not-allowed disabled:opacity-50';
+  'inline-flex items-center justify-center gap-[9px] rounded-[11px] font-semibold transition-[background-color,border-color,color,transform] focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 focus-visible:ring-offset-surface-0 disabled:cursor-not-allowed disabled:opacity-50';
 
 const VARIANTS: Record<NonNullable<typeof props.variant>, string> = {
-  primary: 'bg-accent text-white hover:bg-accent-hover focus-visible:ring-accent-hover/70',
-  secondary: 'border border-border-strong bg-surface-2 text-fg hover:bg-surface-3 focus-visible:ring-accent-hover/70',
-  ghost: 'text-zinc-300 hover:bg-surface-2/60 focus-visible:ring-accent-hover/70',
-  danger: 'border border-red-900 bg-red-950 text-red-300 hover:bg-red-900 focus-visible:ring-red-500/70',
+  primary:
+    'border border-accent-solid bg-accent-solid text-white hover:-translate-y-px hover:bg-accent-hover focus-visible:ring-accent/70',
+  secondary:
+    'border border-border-strong bg-surface-2 text-fg hover:border-accent hover:text-accent focus-visible:ring-accent/70',
+  ghost: 'text-fg-muted hover:bg-surface-2/60 hover:text-fg focus-visible:ring-accent/70',
+  danger: 'border border-danger/40 bg-danger/10 text-danger hover:bg-danger/20 focus-visible:ring-danger/70',
+  coffee: 'border border-coffee bg-transparent text-coffee hover:bg-coffee/10 focus-visible:ring-coffee/60',
 };
 
 const SIZES = {
-  sm: { text: 'h-8 px-2.5 text-xs', icon: 'h-8 w-8' },
-  md: { text: 'h-9 px-3 text-sm', icon: 'h-9 w-9' },
+  sm: { text: 'h-8 px-2.5 text-xs', icon: 'h-8 w-8 rounded-[9px]' },
+  md: { text: 'h-9 px-3 text-sm', icon: 'h-9 w-9 rounded-[9px]' },
 };
 
 const classes = computed(() => {

packages/web/src/components/ui/ColorSwatchPicker.vue

@@ -0,0 +1,34 @@
+<template>
+  <div class="flex flex-wrap items-center gap-1.5">
+    <button
+      type="button"
+      class="flex h-6 w-6 items-center justify-center rounded-full border border-border transition-transform hover:scale-110"
+      :class="modelValue === null ? 'ring-2 ring-fg/70 ring-offset-2 ring-offset-surface-1' : ''"
+      :title="noneLabel"
+      :aria-label="noneLabel"
+      @click="emit('update:modelValue', null)"
+    >
+      <Ban :size="13" class="text-fg-subtle" />
+    </button>
+    <button
+      v-for="c in presets"
+      :key="c"
+      type="button"
+      class="h-6 w-6 rounded-full transition-transform hover:scale-110"
+      :class="modelValue === c ? 'ring-2 ring-fg/70 ring-offset-2 ring-offset-surface-1' : ''"
+      :style="{ background: c }"
+      :aria-label="c"
+      @click="emit('update:modelValue', c)"
+    />
+  </div>
+</template>
+
+<script setup lang="ts">
+// Sélecteur de couleur d'accent (presets + « aucune »), utilisé par les modals de groupe.
+import { Ban } from '@lucide/vue';
+import { GROUP_COLOR_PRESETS } from '../../lib/group-colors';
+
+defineProps<{ modelValue: string | null; noneLabel: string }>();
+const emit = defineEmits<{ 'update:modelValue': [string | null] }>();
+const presets = GROUP_COLOR_PRESETS;
+</script>

packages/web/src/components/ui/EmptyState.vue

@@ -1,16 +1,26 @@
 <template>
-  <div class="flex flex-col items-center gap-2 rounded-xl border border-dashed border-zinc-800 px-6 py-10 text-center">
-    <component :is="icon" v-if="icon" :size="32" class="text-zinc-600" :stroke-width="1.5" />
-    <p class="text-sm font-medium text-zinc-300">{{ title }}</p>
-    <p v-if="hint" class="max-w-sm text-xs text-zinc-500">{{ hint }}</p>
-    <div v-if="$slots.action" class="mt-1">
-      <slot name="action" />
+  <div
+    class="relative flex flex-col items-center gap-3 overflow-hidden rounded-[14px] border border-dashed border-border px-6 py-10 text-center"
+  >
+    <span class="halo" aria-hidden="true" />
+    <div class="relative z-10 flex flex-col items-center gap-3">
+      <div
+        v-if="icon"
+        class="flex h-11 w-11 items-center justify-center rounded-[10px] bg-accent/10 text-accent"
+      >
+        <component :is="icon" :size="22" :stroke-width="1.75" />
+      </div>
+      <p class="text-sm font-semibold text-fg">{{ title }}</p>
+      <p v-if="hint" class="max-w-sm text-xs text-fg-muted">{{ hint }}</p>
+      <div v-if="$slots.action" class="mt-1">
+        <slot name="action" />
+      </div>
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-// État vide soigné (icône + titre + indice + CTA) : remplace les <p text-zinc-500> plats.
+// État vide soigné (monogramme accent + titre + indice + CTA), avec un halo décoratif discret.
 import type { Component } from 'vue';
 
 defineProps<{ icon?: Component; title: string; hint?: string }>();

packages/web/src/components/ui/SegmentedControl.vue

@@ -1,11 +1,11 @@
 <template>
-  <div class="inline-flex rounded-lg border border-zinc-800 bg-zinc-950/40 p-0.5">
+  <div class="inline-flex rounded-lg border border-border bg-surface-0/40 p-0.5">
     <button
       v-for="opt in options"
       :key="opt.value"
       type="button"
-      class="inline-flex items-center gap-1.5 rounded-md px-2.5 py-1 text-xs font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-emerald-500/70"
-      :class="opt.value === modelValue ? 'bg-zinc-800 text-zinc-100' : 'text-zinc-400 hover:text-zinc-200'"
+      class="inline-flex items-center gap-1.5 rounded-[9px] px-2.5 py-1 text-xs font-medium transition-colors focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-accent/60"
+      :class="opt.value === modelValue ? 'bg-surface-2 text-fg' : 'text-fg-muted hover:text-fg'"
       :aria-pressed="opt.value === modelValue"
       @click="emit('update:modelValue', opt.value)"
     >

packages/web/src/components/ui/SkeletonRow.vue

@@ -3,7 +3,7 @@
     <div
       v-for="i in count"
       :key="i"
-      class="animate-pulse rounded-xl border border-zinc-800 bg-zinc-900/40 motion-reduce:animate-none"
+      class="animate-pulse rounded-[12px] border border-border bg-surface-1/40 motion-reduce:animate-none"
       :style="{ height: `${height}px` }"
     />
   </div>

packages/web/src/components/workspace/CommitPanel.vue

@@ -1,53 +1,53 @@
 <template>
-  <div class="flex h-full flex-col border-t border-zinc-800">
+  <div class="flex h-full flex-col border-t border-border">
     <!-- en-tête + actions distantes -->
-    <div class="flex items-center gap-1 px-2 py-1 text-[11px] font-semibold uppercase tracking-wide text-zinc-500">
+    <div class="flex items-center gap-1 px-2 py-1 label-mono">
       <GitCompare :size="13" /> {{ t('workspace.changes') }}
-      <span v-if="git.ahead" class="text-emerald-500">↑{{ git.ahead }}</span>
-      <span v-if="git.behind" class="text-amber-500">↓{{ git.behind }}</span>
+      <span v-if="git.ahead" class="text-accent">↑{{ git.ahead }}</span>
+      <span v-if="git.behind" class="text-warn">↓{{ git.behind }}</span>
       <span class="ml-auto flex items-center gap-1">
-        <button type="button" class="rounded p-0.5 hover:bg-zinc-800 hover:text-zinc-300 disabled:opacity-40" :title="t('commit.fetch')" :disabled="!!busy" @click="onFetch"><Download :size="13" /></button>
-        <button type="button" class="rounded p-0.5 hover:bg-zinc-800 hover:text-zinc-300 disabled:opacity-40" :title="t('commit.pull')" :disabled="!!busy" @click="onPull('ff-only')"><ArrowDownToLine :size="13" /></button>
+        <button type="button" class="rounded p-0.5 hover:bg-surface-2 hover:text-fg disabled:opacity-40" :title="t('commit.fetch')" :disabled="!!busy" @click="onFetch"><Download :size="13" /></button>
+        <button type="button" class="rounded p-0.5 hover:bg-surface-2 hover:text-fg disabled:opacity-40" :title="t('commit.pull')" :disabled="!!busy" @click="onPull('ff-only')"><ArrowDownToLine :size="13" /></button>
       </span>
     </div>
 
     <div class="min-h-0 flex-1 overflow-auto">
       <!-- fichiers indexés (staged) -->
       <div v-if="staged.length" class="px-1">
-        <div class="flex items-center px-1 py-0.5 text-[11px] text-zinc-500">
+        <div class="flex items-center px-1 py-0.5 text-[11px] text-fg-subtle">
           {{ t('commit.staged') }} ({{ staged.length }})
-          <button type="button" class="ml-auto rounded px-1 hover:bg-zinc-800 hover:text-zinc-300 disabled:opacity-40" :disabled="!!busy" @click="onUnstageAll">{{ t('commit.unstageAll') }}</button>
+          <button type="button" class="ml-auto rounded px-1 hover:bg-surface-2 hover:text-fg disabled:opacity-40" :disabled="!!busy" @click="onUnstageAll">{{ t('commit.unstageAll') }}</button>
         </div>
         <FileRow v-for="c in staged" :key="`s-${c.path}`" :c="c" :active="active === c.path" staged @select="select(c, true)">
-          <button type="button" class="rounded p-0.5 hover:bg-zinc-700" :title="t('commit.unstage')" :disabled="!!busy" @click.stop="onUnstage(c)"><Minus :size="13" /></button>
+          <button type="button" class="rounded p-0.5 hover:bg-surface-3" :title="t('commit.unstage')" :disabled="!!busy" @click.stop="onUnstage(c)"><Minus :size="13" /></button>
         </FileRow>
       </div>
 
       <!-- changements non indexés / non suivis -->
       <div class="px-1">
-        <div class="flex items-center px-1 py-0.5 text-[11px] text-zinc-500">
+        <div class="flex items-center px-1 py-0.5 text-[11px] text-fg-subtle">
           {{ t('commit.changes') }} ({{ unstaged.length }})
-          <button v-if="unstaged.length" type="button" class="ml-auto rounded px-1 hover:bg-zinc-800 hover:text-zinc-300 disabled:opacity-40" :disabled="!!busy" @click="onStageAll">{{ t('commit.stageAll') }}</button>
+          <button v-if="unstaged.length" type="button" class="ml-auto rounded px-1 hover:bg-surface-2 hover:text-fg disabled:opacity-40" :disabled="!!busy" @click="onStageAll">{{ t('commit.stageAll') }}</button>
         </div>
-        <p v-if="unstaged.length === 0 && staged.length === 0" class="px-2 py-1 text-xs text-zinc-600">{{ t('workspace.noChanges') }}</p>
+        <p v-if="unstaged.length === 0 && staged.length === 0" class="px-2 py-1 text-xs text-fg-subtle">{{ t('workspace.noChanges') }}</p>
         <FileRow v-for="c in unstaged" :key="`u-${c.path}`" :c="c" :active="active === c.path" @select="select(c, false)">
-          <button v-if="discardArmed === c.path" type="button" class="rounded p-0.5 text-rose-300 hover:bg-rose-900/40" :title="t('commit.confirmDiscard')" :disabled="!!busy" @click.stop="onDiscard(c)"><Check :size="13" /></button>
-          <button v-else type="button" class="rounded p-0.5 hover:bg-zinc-700" :title="t('commit.discard')" :disabled="!!busy" @click.stop="discardArmed = c.path"><Undo2 :size="13" /></button>
-          <button type="button" class="rounded p-0.5 hover:bg-zinc-700" :title="t('commit.stage')" :disabled="!!busy" @click.stop="onStage(c)"><Plus :size="13" /></button>
+          <button v-if="discardArmed === c.path" type="button" class="rounded p-0.5 text-danger hover:bg-danger/40" :title="t('commit.confirmDiscard')" :disabled="!!busy" @click.stop="onDiscard(c)"><Check :size="13" /></button>
+          <button v-else type="button" class="rounded p-0.5 hover:bg-surface-3" :title="t('commit.discard')" :disabled="!!busy" @click.stop="discardArmed = c.path"><Undo2 :size="13" /></button>
+          <button type="button" class="rounded p-0.5 hover:bg-surface-3" :title="t('commit.stage')" :disabled="!!busy" @click.stop="onStage(c)"><Plus :size="13" /></button>
         </FileRow>
       </div>
-      <p v-if="truncated" class="px-2 py-1 text-[11px] text-amber-500">{{ t('workspace.changesTruncated') }}</p>
+      <p v-if="truncated" class="px-2 py-1 text-[11px] text-warn">{{ t('workspace.changesTruncated') }}</p>
     </div>
 
     <!-- zone de commit -->
-    <div class="flex flex-col gap-1 border-t border-zinc-800 p-2">
+    <div class="flex flex-col gap-1 border-t border-border p-2">
       <textarea
         v-model="message"
         rows="2"
         class="input resize-none text-xs"
         :placeholder="amend ? t('commit.amendPlaceholder') : t('commit.messagePlaceholder')"
       />
-      <label class="flex items-center gap-1 text-[11px] text-zinc-400">
+      <label class="flex items-center gap-1 text-[11px] text-fg-muted">
         <input v-model="amend" type="checkbox" /> {{ t('commit.amend') }}
       </label>
       <div class="flex items-center gap-2">
@@ -59,7 +59,7 @@
         </BaseButton>
         <BaseButton v-if="canRebase" size="sm" variant="ghost" :loading="busy === 'rebase'" @click="onPull('rebase')">{{ t('commit.pullRebase') }}</BaseButton>
       </div>
-      <p v-if="error" class="text-[11px] text-amber-400">{{ error }}</p>
+      <p v-if="error" class="text-[11px] text-warn">{{ error }}</p>
     </div>
   </div>
 </template>