diff --git a/.opencode/screenshots/terminal-final.png b/.opencode/screenshots/terminal-final.png
deleted file mode 100644
index ab8d0cbb..00000000
Binary files a/.opencode/screenshots/terminal-final.png and /dev/null differ
diff --git a/.opencode/screenshots/terminal-parallel-start.png b/.opencode/screenshots/terminal-parallel-start.png
deleted file mode 100644
index 84c137ba..00000000
Binary files a/.opencode/screenshots/terminal-parallel-start.png and /dev/null differ
diff --git a/.opencode/screenshots/terminal-reset.png b/.opencode/screenshots/terminal-reset.png
deleted file mode 100644
index 447a9da0..00000000
Binary files a/.opencode/screenshots/terminal-reset.png and /dev/null differ
diff --git a/.opencode/screenshots/terminal-startup.png b/.opencode/screenshots/terminal-startup.png
deleted file mode 100644
index 39296cd3..00000000
Binary files a/.opencode/screenshots/terminal-startup.png and /dev/null differ
diff --git a/packages/ui/src/lib/i18n/messages/de.settings.ts b/packages/ui/src/lib/i18n/messages/de.settings.ts
index 75ea6a05..ef0d6e87 100644
--- a/packages/ui/src/lib/i18n/messages/de.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/de.settings.ts
@@ -40,7 +40,7 @@ export const settingsDict = {
   'settings.view.actions.applyAndRestartOpenCode': 'Anwenden & Neu starten',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': '1 ausstehende Konfigurationsänderung anwenden und OpenCode neu starten.',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': '{count} ausstehende Konfigurationsänderungen anwenden und OpenCode neu starten.',
-  'settings.view.pendingRestart.applying': 'Änderungen werden angewendet und OpenCode neu gestartet…',
+  'settings.view.pendingRestart.applying': 'Neustart…',
   'settings.view.pendingRestart.applied': 'OpenCode wurde mit ausstehenden Konfigurationsänderungen neu gestartet.',
   'settings.view.pendingRestart.applyFailed': 'Konfigurationsänderungen konnten nicht angewendet werden.',
   'settings.view.pendingRestart.manualRestartRequired': 'Auf Datenträger gespeichert. Starten Sie Ihren verbundenen OpenCode-Server neu, um die Änderungen anzuwenden.',
diff --git a/packages/ui/src/lib/i18n/messages/en.settings.ts b/packages/ui/src/lib/i18n/messages/en.settings.ts
index 17db09b0..5d9b629c 100644
--- a/packages/ui/src/lib/i18n/messages/en.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/en.settings.ts
@@ -43,7 +43,7 @@ export const settingsDict = {
   'settings.view.actions.applyAndRestartOpenCode': 'Apply & Restart',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': 'Apply 1 pending configuration change and restart OpenCode.',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': 'Apply {count} pending configuration changes and restart OpenCode.',
-  'settings.view.pendingRestart.applying': 'Applying changes and restarting OpenCode…',
+  'settings.view.pendingRestart.applying': 'Restarting...',
   'settings.view.pendingRestart.applied': 'OpenCode restarted with pending configuration changes.',
   'settings.view.pendingRestart.applyFailed': 'Failed to apply configuration changes.',
   'settings.view.pendingRestart.manualRestartRequired': 'Saved on disk. Restart your connected OpenCode server to apply the changes.',
diff --git a/packages/ui/src/lib/i18n/messages/es.settings.ts b/packages/ui/src/lib/i18n/messages/es.settings.ts
index caeb125d..bc0e9cb6 100644
--- a/packages/ui/src/lib/i18n/messages/es.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/es.settings.ts
@@ -44,7 +44,7 @@ export const settingsDict = {
   "settings.view.actions.applyAndRestartOpenCode": "Aplicar y reiniciar",
   "settings.view.actions.applyAndRestartOpenCodeTooltipSingle": "Aplicar 1 cambio de configuración pendiente y reiniciar OpenCode.",
   "settings.view.actions.applyAndRestartOpenCodeTooltipPlural": "Aplicar {count} cambios de configuración pendientes y reiniciar OpenCode.",
-  "settings.view.pendingRestart.applying": "Aplicando cambios y reiniciando OpenCode…",
+  "settings.view.pendingRestart.applying": "Reiniciando…",
   "settings.view.pendingRestart.applied": "OpenCode se reinició con los cambios de configuración pendientes.",
   "settings.view.pendingRestart.applyFailed": "No se pudieron aplicar los cambios de configuración.",
   "settings.view.pendingRestart.manualRestartRequired": "Guardado en disco. Reinicia el servidor OpenCode conectado para aplicar los cambios.",
diff --git a/packages/ui/src/lib/i18n/messages/fr.settings.ts b/packages/ui/src/lib/i18n/messages/fr.settings.ts
index 001170a8..fd6049ca 100644
--- a/packages/ui/src/lib/i18n/messages/fr.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/fr.settings.ts
@@ -44,7 +44,7 @@ export const settingsDict = {
   'settings.view.actions.applyAndRestartOpenCode': 'Appliquer et redémarrer',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': 'Appliquer 1 modification de configuration en attente et redémarrer OpenCode.',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': 'Appliquer {count} modifications de configuration en attente et redémarrer OpenCode.',
-  'settings.view.pendingRestart.applying': 'Application des modifications et redémarrage d\'OpenCode…',
+  'settings.view.pendingRestart.applying': 'Redémarrage…',
   'settings.view.pendingRestart.applied': 'OpenCode a redémarré avec les modifications de configuration en attente.',
   'settings.view.pendingRestart.applyFailed': 'Échec de l\'application des modifications de configuration.',
   'settings.view.pendingRestart.manualRestartRequired': 'Enregistré sur le disque. Redémarrez le serveur OpenCode connecté pour appliquer les modifications.',
diff --git a/packages/ui/src/lib/i18n/messages/ja.settings.ts b/packages/ui/src/lib/i18n/messages/ja.settings.ts
index bd5cba0c..13273aab 100644
--- a/packages/ui/src/lib/i18n/messages/ja.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ja.settings.ts
@@ -44,7 +44,7 @@ export const settingsDict = {
   'settings.view.actions.applyAndRestartOpenCode': '適用して再起動',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': '保留中の設定変更 1 件を適用して OpenCode を再起動します。',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': '保留中の設定変更 {count} 件を適用して OpenCode を再起動します。',
-  'settings.view.pendingRestart.applying': '変更を適用して OpenCode を再起動しています…',
+  'settings.view.pendingRestart.applying': '再起動しています…',
   'settings.view.pendingRestart.applied': '保留中の設定変更を適用して OpenCode を再起動しました。',
   'settings.view.pendingRestart.applyFailed': '設定変更の適用に失敗しました。',
   'settings.view.pendingRestart.manualRestartRequired': 'ディスクに保存しました。接続中の OpenCode サーバーを再起動して変更を適用してください。',
diff --git a/packages/ui/src/lib/i18n/messages/ko.settings.ts b/packages/ui/src/lib/i18n/messages/ko.settings.ts
index efc9e33a..f637fc5d 100644
--- a/packages/ui/src/lib/i18n/messages/ko.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/ko.settings.ts
@@ -44,7 +44,7 @@ export const settingsDict = {
   'settings.view.actions.applyAndRestartOpenCode': '적용하고 다시 시작',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': '보류 중인 구성 변경 1개를 적용하고 OpenCode를 다시 시작합니다.',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': '보류 중인 구성 변경 {count}개를 적용하고 OpenCode를 다시 시작합니다.',
-  'settings.view.pendingRestart.applying': '변경 사항을 적용하고 OpenCode를 다시 시작하는 중…',
+  'settings.view.pendingRestart.applying': '다시 시작하는 중…',
   'settings.view.pendingRestart.applied': '보류 중인 구성 변경으로 OpenCode를 다시 시작했습니다.',
   'settings.view.pendingRestart.applyFailed': '구성 변경을 적용하지 못했습니다.',
   'settings.view.pendingRestart.manualRestartRequired': '디스크에 저장되었습니다. 연결된 OpenCode 서버를 다시 시작하여 변경 사항을 적용하세요.',
diff --git a/packages/ui/src/lib/i18n/messages/pl.settings.ts b/packages/ui/src/lib/i18n/messages/pl.settings.ts
index cc2a269e..5b94cd50 100644
--- a/packages/ui/src/lib/i18n/messages/pl.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/pl.settings.ts
@@ -1994,7 +1994,7 @@ export const settingsDict = {
   'settings.view.actions.applyAndRestartOpenCode': 'Zastosuj i uruchom ponownie',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': 'Zastosuj 1 oczekującą zmianę konfiguracji i uruchom ponownie OpenCode.',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': 'Zastosuj {count} oczekujących zmian konfiguracji i uruchom ponownie OpenCode.',
-  'settings.view.pendingRestart.applying': 'Stosowanie zmian i ponowne uruchamianie OpenCode…',
+  'settings.view.pendingRestart.applying': 'Ponowne uruchamianie…',
   'settings.view.pendingRestart.applied': 'OpenCode został uruchomiony ponownie z oczekującymi zmianami konfiguracji.',
   'settings.view.pendingRestart.applyFailed': 'Nie udało się zastosować zmian konfiguracji.',
   'settings.view.pendingRestart.manualRestartRequired': 'Zapisano na dysku. Uruchom ponownie podłączony serwer OpenCode, aby zastosować zmiany.',
diff --git a/packages/ui/src/lib/i18n/messages/pt-BR.settings.ts b/packages/ui/src/lib/i18n/messages/pt-BR.settings.ts
index ac02cc94..1380335b 100644
--- a/packages/ui/src/lib/i18n/messages/pt-BR.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/pt-BR.settings.ts
@@ -44,7 +44,7 @@ export const settingsDict = {
   "settings.view.actions.applyAndRestartOpenCode": "Aplicar e reiniciar",
   "settings.view.actions.applyAndRestartOpenCodeTooltipSingle": "Aplicar 1 alteração de configuração pendente e reiniciar o OpenCode.",
   "settings.view.actions.applyAndRestartOpenCodeTooltipPlural": "Aplicar {count} alterações de configuração pendentes e reiniciar o OpenCode.",
-  "settings.view.pendingRestart.applying": "Aplicando alterações e reiniciando o OpenCode…",
+  "settings.view.pendingRestart.applying": "Reiniciando…",
   "settings.view.pendingRestart.applied": "OpenCode reiniciado com as alterações de configuração pendentes.",
   "settings.view.pendingRestart.applyFailed": "Falha ao aplicar as alterações de configuração.",
   "settings.view.pendingRestart.manualRestartRequired": "Salvo no disco. Reinicie o servidor OpenCode conectado para aplicar as alterações.",
diff --git a/packages/ui/src/lib/i18n/messages/uk.settings.ts b/packages/ui/src/lib/i18n/messages/uk.settings.ts
index 72cee1e0..2fd58376 100644
--- a/packages/ui/src/lib/i18n/messages/uk.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/uk.settings.ts
@@ -44,7 +44,7 @@ export const settingsDict = {
   "settings.view.actions.applyAndRestartOpenCode": "Застосувати та перезапустити",
   "settings.view.actions.applyAndRestartOpenCodeTooltipSingle": "Застосувати 1 очікувану зміну конфігурації та перезапустити OpenCode.",
   "settings.view.actions.applyAndRestartOpenCodeTooltipPlural": "Застосувати {count} очікуваних змін конфігурації та перезапустити OpenCode.",
-  "settings.view.pendingRestart.applying": "Застосування змін і перезапуск OpenCode…",
+  "settings.view.pendingRestart.applying": "Перезапуск…",
   "settings.view.pendingRestart.applied": "OpenCode перезапущено з очікуваними змінами конфігурації.",
   "settings.view.pendingRestart.applyFailed": "Не вдалося застосувати зміни конфігурації.",
   "settings.view.pendingRestart.manualRestartRequired": "Збережено на диску. Перезапустіть підключений сервер OpenCode, щоб застосувати зміни.",
diff --git a/packages/ui/src/lib/i18n/messages/zh-CN.settings.ts b/packages/ui/src/lib/i18n/messages/zh-CN.settings.ts
index 4709b5af..2703eab8 100644
--- a/packages/ui/src/lib/i18n/messages/zh-CN.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-CN.settings.ts
@@ -44,7 +44,7 @@ export const settingsDict = {
   'settings.view.actions.applyAndRestartOpenCode': '应用并重启',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': '应用 1 项待处理的配置更改并重启 OpenCode。',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': '应用 {count} 项待处理的配置更改并重启 OpenCode。',
-  'settings.view.pendingRestart.applying': '正在应用更改并重启 OpenCode…',
+  'settings.view.pendingRestart.applying': '正在重启…',
   'settings.view.pendingRestart.applied': '已使用待处理的配置更改重启 OpenCode。',
   'settings.view.pendingRestart.applyFailed': '应用配置更改失败。',
   'settings.view.pendingRestart.manualRestartRequired': '已保存到磁盘。请重启已连接的 OpenCode 服务器以应用更改。',
diff --git a/packages/ui/src/lib/i18n/messages/zh-TW.settings.ts b/packages/ui/src/lib/i18n/messages/zh-TW.settings.ts
index d2ea2659..58dfb2b4 100644
--- a/packages/ui/src/lib/i18n/messages/zh-TW.settings.ts
+++ b/packages/ui/src/lib/i18n/messages/zh-TW.settings.ts
@@ -42,7 +42,7 @@
   'settings.view.actions.applyAndRestartOpenCode': '套用並重新啟動',
   'settings.view.actions.applyAndRestartOpenCodeTooltipSingle': '套用 1 項待處理的設定變更並重新啟動 OpenCode。',
   'settings.view.actions.applyAndRestartOpenCodeTooltipPlural': '套用 {count} 項待處理的設定變更並重新啟動 OpenCode。',
-  'settings.view.pendingRestart.applying': '正在套用變更並重新啟動 OpenCode…',
+  'settings.view.pendingRestart.applying': '正在重新啟動…',
   'settings.view.pendingRestart.applied': '已使用待處理的設定變更重新啟動 OpenCode。',
   'settings.view.pendingRestart.applyFailed': '套用設定變更失敗。',
   'settings.view.pendingRestart.manualRestartRequired': '已儲存到磁碟。請重新啟動已連線的 OpenCode 伺服器以套用變更。',
diff --git a/packages/ui/src/styles/design-system.css b/packages/ui/src/styles/design-system.css
index ad71ebc7..9acb85e6 100644
--- a/packages/ui/src/styles/design-system.css
+++ b/packages/ui/src/styles/design-system.css
@@ -294,6 +294,16 @@
   --color-sidebar-border: var(--sidebar-border);
   --color-sidebar-ring: var(--sidebar-ring);
 
+  /* Surface layer tokens (Theme.colors.surface.*) */
+  --color-surface-background: var(--surface-background);
+  --color-surface-foreground: var(--surface-foreground);
+  --color-surface-muted: var(--surface-muted);
+  --color-surface-muted-foreground: var(--surface-muted-foreground);
+  --color-surface-elevated: var(--surface-elevated);
+  --color-surface-elevated-foreground: var(--surface-elevated-foreground);
+  --color-surface-overlay: var(--surface-overlay);
+  --color-surface-subtle: var(--surface-subtle);
+
   /* Interactive state tokens (Theme.colors.interactive.*) */
   --color-interactive-hover: var(--interactive-hover);
   --color-interactive-active: var(--interactive-active);