A modern terminal with a built-in multiplexer: close it and your sessions keep running. Run shells and tons of AI agents across your machines, then pick them up from desktop, browser, TUI and more. Written in Rust with no UI framework: interface drawn straight on the GPU. No Electron, GPUI or webview.
Rust agentagent-orchestrationaiai-agentsclaude-codecodexcoding-agentlinuxmacosmultiplayermultiplexerrustterminalterminal-emulatorterminal-multiplexertmuxtuiweztermwindows
gui: agent brand marks, toolbar status line, stable panel order
RoversXd4243a183b64
diff --git a/third_party/lobe-icons/README b/third_party/lobe-icons/READMEnew file mode 100644index 00000000..464784dd--- /dev/null+++ b/third_party/lobe-icons/README@@ -0,0 +1,44 @@+Lobe Icons+==========++This directory contains a vendored snapshot of eight brand mark SVGs from+the Lobe Icons project.++Repository: https://github.com/lobehub/lobe-icons+Commit: 4aaf4ee1fb2678a7f989ea570f0f6ce14a9abf75+Path: packages/static-svg/icons/++Only these files are used, one mark per coding agent the status panel can+detect; the upstream repository is ~75 MB of React packages and raster+exports that ThinkTerm has no use for, which is why this is a copied+snapshot rather than a submodule.++ claude-color.svg Claude Code colored+ copilot-color.svg Copilot CLI colored+ kimi-color.svg Kimi Code colored, dark theme only+ kimi.svg Kimi Code monochrome, light theme+ openai.svg Codex monochrome+ cursor.svg Cursor Agent monochrome+ opencode.svg OpenCode monochrome+ pi.svg Pi monochrome++The marks come in two forms, because the brands do. The monochrome ones+carry `fill="currentColor"`, which `SvgIcon::rasterize` turns white so the+shader can tint them with the surrounding UI color — so they invert with+the theme for free. OpenAI, Cursor, OpenCode and Pi publish no colored+mark at all; their logos are monochrome by design.++The colored ones carry their own fills and gradients and are painted+as-is through `BrandIcon`, which skips its usual fill injection for them+(injecting onto a path that already has a fill is a hard usvg parse+error, not a cosmetic bug). Kimi is the awkward case: its colored mark is+a white glyph with a blue dot, which reads on dark chrome and all but+disappears on light, so both forms are vendored and the resolver picks by+appearance.++To update a mark, copy the file again from the path above at a newer commit+and record that commit here.++Each logo is the trademark of its respective owner. They appear here to+identify which agent is running in a pane; that is nominative use and+implies no affiliation with or endorsement by those owners.diff --git a/third_party/lobe-icons/claude-color.svg b/third_party/lobe-icons/claude-color.svgnew file mode 100644index 00000000..62dc0db1--- /dev/null+++ b/third_party/lobe-icons/claude-color.svg@@ -0,0 +1 @@+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Claude</title><path d="M4.709 15.955l4.72-2.647.08-.23-.08-.128H9.2l-.79-.048-2.698-.073-2.339-.097-2.266-.122-.571-.121L0 11.784l.055-.352.48-.321.686.06 1.52.103 2.278.158 1.652.097 2.449.255h.389l.055-.157-.134-.098-.103-.097-2.358-1.596-2.552-1.688-1.336-.972-.724-.491-.364-.462-.158-1.008.656-.722.881.06.225.061.893.686 1.908 1.476 2.491 1.833.365.304.145-.103.019-.073-.164-.274-1.355-2.446-1.446-2.49-.644-1.032-.17-.619a2.97 2.97 0 01-.104-.729L6.283.134 6.696 0l.996.134.42.364.62 1.414 1.002 2.229 1.555 3.03.456.898.243.832.091.255h.158V9.01l.128-1.706.237-2.095.23-2.695.08-.76.376-.91.747-.492.584.28.48.685-.067.444-.286 1.851-.559 2.903-.364 1.942h.212l.243-.242.985-1.306 1.652-2.064.73-.82.85-.904.547-.431h1.033l.76 1.129-.34 1.166-1.064 1.347-.881 1.142-1.264 1.7-.79 1.36.073.11.188-.02 2.856-.606 1.543-.28 1.841-.315.833.388.091.395-.328.807-1.969.486-2.309.462-3.439.813-.042.03.049.061 1.549.146.662.036h1.622l3.02.225.79.522.474.638-.079.485-1.215.62-1.64-.389-3.829-.91-1.312-.329h-.182v.11l1.093 1.068 2.006 1.81 2.509 2.33.127.578-.322.455-.34-.049-2.205-1.657-.851-.747-1.926-1.62h-.128v.17l.444.649 2.345 3.521.122 1.08-.17.353-.608.213-.668-.122-1.374-1.925-1.415-2.167-1.143-1.943-.14.08-.674 7.254-.316.37-.729.28-.607-.461-.322-.747.322-1.476.389-1.924.315-1.53.286-1.9.17-.632-.012-.042-.14.018-1.434 1.967-2.18 2.945-1.726 1.845-.414.164-.717-.37.067-.662.401-.589 2.388-3.036 1.44-1.882.93-1.086-.006-.158h-.055L4.132 18.56l-1.13.146-.487-.456.061-.746.231-.243 1.908-1.312-.006.006z" fill="#D97757" fill-rule="nonzero"></path></svg>\ No newline at end of filediff --git a/third_party/lobe-icons/copilot-color.svg b/third_party/lobe-icons/copilot-color.svgnew file mode 100644index 00000000..5426933b--- /dev/null+++ b/third_party/lobe-icons/copilot-color.svg@@ -0,0 +1 @@+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Copilot</title><path d="M17.533 1.829A2.528 2.528 0 0015.11 0h-.737a2.531 2.531 0 00-2.484 2.087l-1.263 6.937.314-1.08a2.528 2.528 0 012.424-1.833h4.284l1.797.706 1.731-.706h-.505a2.528 2.528 0 01-2.423-1.829l-.715-2.453z" fill="url(#lobe-icons-copilot-0-_R_0_)" transform="translate(0 1)"></path><path d="M6.726 20.16A2.528 2.528 0 009.152 22h1.566c1.37 0 2.49-1.1 2.525-2.48l.17-6.69-.357 1.228a2.528 2.528 0 01-2.423 1.83h-4.32l-1.54-.842-1.667.843h.497c1.124 0 2.113.75 2.426 1.84l.697 2.432z" fill="url(#lobe-icons-copilot-1-_R_0_)" transform="translate(0 1)"></path><path d="M15 0H6.252c-2.5 0-4 3.331-5 6.662-1.184 3.947-2.734 9.225 1.75 9.225H6.78c1.13 0 2.12-.753 2.43-1.847.657-2.317 1.809-6.359 2.713-9.436.46-1.563.842-2.906 1.43-3.742A1.97 1.97 0 0115 0" fill="url(#lobe-icons-copilot-2-_R_0_)" transform="translate(0 1)"></path><path d="M15 0H6.252c-2.5 0-4 3.331-5 6.662-1.184 3.947-2.734 9.225 1.75 9.225H6.78c1.13 0 2.12-.753 2.43-1.847.657-2.317 1.809-6.359 2.713-9.436.46-1.563.842-2.906 1.43-3.742A1.97 1.97 0 0115 0" fill="url(#lobe-icons-copilot-3-_R_0_)" transform="translate(0 1)"></path><path d="M9 22h8.749c2.5 0 4-3.332 5-6.663 1.184-3.948 2.734-9.227-1.75-9.227H17.22c-1.129 0-2.12.754-2.43 1.848a1149.2 1149.2 0 01-2.713 9.437c-.46 1.564-.842 2.907-1.43 3.743A1.97 1.97 0 019 22" fill="url(#lobe-icons-copilot-4-_R_0_)" transform="translate(0 1)"></path><path d="M9 22h8.749c2.5 0 4-3.332 5-6.663 1.184-3.948 2.734-9.227-1.75-9.227H17.22c-1.129 0-2.12.754-2.43 1.848a1149.2 1149.2 0 01-2.713 9.437c-.46 1.564-.842 2.907-1.43 3.743A1.97 1.97 0 019 22" fill="url(#lobe-icons-copilot-5-_R_0_)" transform="translate(0 1)"></path><defs><radialGradient cx="85.44%" cy="100.653%" fx="85.44%" fy="100.653%" gradientTransform="scale(-.8553 -1) rotate(50.927 2.041 -1.946)" id="lobe-icons-copilot-0-_R_0_" r="105.116%"><stop offset="9.6%" stop-color="#00AEFF"></stop><stop offset="77.3%" stop-color="#2253CE"></stop><stop offset="100%" stop-color="#0736C4"></stop></radialGradient><radialGradient cx="18.143%" cy="32.928%" fx="18.143%" fy="32.928%" gradientTransform="scale(.8897 1) rotate(52.069 .193 .352)" id="lobe-icons-copilot-1-_R_0_" r="95.612%"><stop offset="0%" stop-color="#FFB657"></stop><stop offset="63.4%" stop-color="#FF5F3D"></stop><stop offset="92.3%" stop-color="#C02B3C"></stop></radialGradient><radialGradient cx="82.987%" cy="-9.792%" fx="82.987%" fy="-9.792%" gradientTransform="scale(-1 -.9441) rotate(-70.872 .142 1.17)" id="lobe-icons-copilot-4-_R_0_" r="140.622%"><stop offset="6.6%" stop-color="#8C48FF"></stop><stop offset="50%" stop-color="#F2598A"></stop><stop offset="89.6%" stop-color="#FFB152"></stop></radialGradient><linearGradient id="lobe-icons-copilot-2-_R_0_" x1="39.465%" x2="46.884%" y1="12.117%" y2="103.774%"><stop offset="15.6%" stop-color="#0D91E1"></stop><stop offset="48.7%" stop-color="#52B471"></stop><stop offset="65.2%" stop-color="#98BD42"></stop><stop offset="93.7%" stop-color="#FFC800"></stop></linearGradient><linearGradient id="lobe-icons-copilot-3-_R_0_" x1="45.949%" x2="50%" y1="0%" y2="100%"><stop offset="0%" stop-color="#3DCBFF"></stop><stop offset="24.7%" stop-color="#0588F7" stop-opacity="0"></stop></linearGradient><linearGradient id="lobe-icons-copilot-5-_R_0_" x1="83.507%" x2="83.453%" y1="-6.106%" y2="21.131%"><stop offset="5.8%" stop-color="#F8ADFA"></stop><stop offset="70.8%" stop-color="#A86EDD" stop-opacity="0"></stop></linearGradient></defs></svg>\ No newline at end of filediff --git a/third_party/lobe-icons/cursor.svg b/third_party/lobe-icons/cursor.svgnew file mode 100644index 00000000..a5b2ee3b--- /dev/null+++ b/third_party/lobe-icons/cursor.svg@@ -0,0 +1 @@+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Cursor</title><path d="M22.106 5.68L12.5.135a.998.998 0 00-.998 0L1.893 5.68a.84.84 0 00-.419.726v11.186c0 .3.16.577.42.727l9.607 5.547a.999.999 0 00.998 0l9.608-5.547a.84.84 0 00.42-.727V6.407a.84.84 0 00-.42-.726zm-.603 1.176L12.228 22.92c-.063.108-.228.064-.228-.061V12.34a.59.59 0 00-.295-.51l-9.11-5.26c-.107-.062-.063-.228.062-.228h18.55c.264 0 .428.286.296.514z"></path></svg>\ No newline at end of filediff --git a/third_party/lobe-icons/kimi-color.svg b/third_party/lobe-icons/kimi-color.svgnew file mode 100644index 00000000..83878fa2--- /dev/null+++ b/third_party/lobe-icons/kimi-color.svg@@ -0,0 +1 @@+<svg height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Kimi</title><path d="M21.846 0a1.923 1.923 0 110 3.846H20.15a.226.226 0 01-.227-.226V1.923C19.923.861 20.784 0 21.846 0z" fill="#1783FF"></path><path d="M11.065 11.199l7.257-7.2c.137-.136.06-.41-.116-.41H14.3a.164.164 0 00-.117.051l-7.82 7.756c-.122.12-.302.013-.302-.179V3.82c0-.127-.083-.23-.185-.23H3.186c-.103 0-.186.103-.186.23V19.77c0 .128.083.23.186.23h2.69c.103 0 .186-.102.186-.23v-3.25c0-.069.025-.135.069-.178l2.424-2.406a.158.158 0 01.205-.023l6.484 4.772a7.677 7.677 0 003.453 1.283c.108.012.2-.095.2-.23v-3.06c0-.117-.07-.212-.164-.227a5.028 5.028 0 01-2.027-.807l-5.613-4.064c-.117-.078-.132-.279-.028-.381z" fill="#fff"></path></svg>\ No newline at end of filediff --git a/third_party/lobe-icons/kimi.svg b/third_party/lobe-icons/kimi.svgnew file mode 100644index 00000000..1915850e--- /dev/null+++ b/third_party/lobe-icons/kimi.svg@@ -0,0 +1 @@+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Kimi</title><path d="M21.846 0a1.923 1.923 0 110 3.846H20.15a.226.226 0 01-.227-.226V1.923C19.923.861 20.784 0 21.846 0z"></path><path d="M11.065 11.199l7.257-7.2c.137-.136.06-.41-.116-.41H14.3a.164.164 0 00-.117.051l-7.82 7.756c-.122.12-.302.013-.302-.179V3.82c0-.127-.083-.23-.185-.23H3.186c-.103 0-.186.103-.186.23V19.77c0 .128.083.23.186.23h2.69c.103 0 .186-.102.186-.23v-3.25c0-.069.025-.135.069-.178l2.424-2.406a.158.158 0 01.205-.023l6.484 4.772a7.677 7.677 0 003.453 1.283c.108.012.2-.095.2-.23v-3.06c0-.117-.07-.212-.164-.227a5.028 5.028 0 01-2.027-.807l-5.613-4.064c-.117-.078-.132-.279-.028-.381z"></path></svg>\ No newline at end of filediff --git a/third_party/lobe-icons/openai.svg b/third_party/lobe-icons/openai.svgnew file mode 100644index 00000000..78caf4fa--- /dev/null+++ b/third_party/lobe-icons/openai.svg@@ -0,0 +1 @@+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>OpenAI</title><path d="M9.205 8.658v-2.26c0-.19.072-.333.238-.428l4.543-2.616c.619-.357 1.356-.523 2.117-.523 2.854 0 4.662 2.212 4.662 4.566 0 .167 0 .357-.024.547l-4.71-2.759a.797.797 0 00-.856 0l-5.97 3.473zm10.609 8.8V12.06c0-.333-.143-.57-.429-.737l-5.97-3.473 1.95-1.118a.433.433 0 01.476 0l4.543 2.617c1.309.76 2.189 2.378 2.189 3.948 0 1.808-1.07 3.473-2.76 4.163zM7.802 12.703l-1.95-1.142c-.167-.095-.239-.238-.239-.428V5.899c0-2.545 1.95-4.472 4.591-4.472 1 0 1.927.333 2.712.928L8.23 5.067c-.285.166-.428.404-.428.737v6.898zM12 15.128l-2.795-1.57v-3.33L12 8.658l2.795 1.57v3.33L12 15.128zm1.796 7.23c-1 0-1.927-.332-2.712-.927l4.686-2.712c.285-.166.428-.404.428-.737v-6.898l1.974 1.142c.167.095.238.238.238.428v5.233c0 2.545-1.974 4.472-4.614 4.472zm-5.637-5.303l-4.544-2.617c-1.308-.761-2.188-2.378-2.188-3.948A4.482 4.482 0 014.21 6.327v5.423c0 .333.143.571.428.738l5.947 3.449-1.95 1.118a.432.432 0 01-.476 0zm-.262 3.9c-2.688 0-4.662-2.021-4.662-4.519 0-.19.024-.38.047-.57l4.686 2.71c.286.167.571.167.856 0l5.97-3.448v2.26c0 .19-.07.333-.237.428l-4.543 2.616c-.619.357-1.356.523-2.117.523zm5.899 2.83a5.947 5.947 0 005.827-4.756C22.287 18.339 24 15.84 24 13.296c0-1.665-.713-3.282-1.998-4.448.119-.5.19-.999.19-1.498 0-3.401-2.759-5.947-5.946-5.947-.642 0-1.26.095-1.88.31A5.962 5.962 0 0010.205 0a5.947 5.947 0 00-5.827 4.757C1.713 5.447 0 7.945 0 10.49c0 1.666.713 3.283 1.998 4.448-.119.5-.19 1-.19 1.499 0 3.401 2.759 5.946 5.946 5.946.642 0 1.26-.095 1.88-.309a5.96 5.96 0 004.162 1.713z"></path></svg>\ No newline at end of filediff --git a/third_party/lobe-icons/opencode.svg b/third_party/lobe-icons/opencode.svgnew file mode 100644index 00000000..9c4cb89e--- /dev/null+++ b/third_party/lobe-icons/opencode.svg@@ -0,0 +1 @@+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>opencode</title><path d="M16 6H8v12h8V6zm4 16H4V2h16v20z"></path></svg>\ No newline at end of filediff --git a/third_party/lobe-icons/pi.svg b/third_party/lobe-icons/pi.svgnew file mode 100644index 00000000..5122fb5e--- /dev/null+++ b/third_party/lobe-icons/pi.svg@@ -0,0 +1 @@+<svg fill="currentColor" fill-rule="evenodd" height="1em" style="flex:none;line-height:1" viewBox="0 0 24 24" width="1em" xmlns="http://www.w3.org/2000/svg"><title>Pi</title><path clip-rule="evenodd" d="M1 1h16.5v11H12v5.5H6.5V23H1V1zm5.5 5.5V12H12V6.5H6.5z"></path><path d="M17.5 12H23v11h-5.5V12z"></path></svg>\ No newline at end of filediff --git a/wezterm-gui/i18n/en-US.ftl b/wezterm-gui/i18n/en-US.ftlindex 03a9d9f9..a303d2ba 100644--- a/wezterm-gui/i18n/en-US.ftl+++ b/wezterm-gui/i18n/en-US.ftl@@ -478,14 +478,24 @@ settings-agent-panel-description = Detect coding agents (Claude Code, Codex, …settings-agent-panel-enabled = Agent panel enabled.settings-agent-panel-disabled = Agent panel disabled.right-mode-agents = Agents-right-agents-empty = No agents detected-right-agents-empty-hint = Panes running Claude Code, Codex and other agents appear here.-right-agents-reload-rules = Reload detection rulesright-agents-rules-reloaded = Detection rules reloaded.+right-agents-rules-reload-errors = Rules reloaded; { $count ->+ [one] 1 file was rejected+ *[other] { $count } files were rejected+ } — see the log.right-agents-state-working = Workingright-agents-state-blocked = Needs inputright-agents-state-idle = Idleright-agents-state-unknown = Unknown+right-agents-none = No agents detected+right-agents-detection-off = Agent detection is off — open settings+right-agents-count-working = { $count } working+right-agents-count-blocked = { $count ->+ [one] 1 needs input+ *[other] { $count } need input+ }+right-agents-count-idle = { $count } idle+right-agents-count-unknown = { $count } unknownsettings-section-agents = Agentssettings-agents-integrations-heading = Integrationssettings-integration-screen-active = Found on PATH; status is detected from its terminal UI (screen rules).diff --git a/wezterm-gui/i18n/fr-FR.ftl b/wezterm-gui/i18n/fr-FR.ftlindex dfbc821e..fe8b25ce 100644--- a/wezterm-gui/i18n/fr-FR.ftl+++ b/wezterm-gui/i18n/fr-FR.ftl@@ -478,14 +478,21 @@ settings-agent-panel-description = Détecter les agents de codage (Claude Code,settings-agent-panel-enabled = Panneau des agents activé.settings-agent-panel-disabled = Panneau des agents désactivé.right-mode-agents = Agents-right-agents-empty = Aucun agent détecté-right-agents-empty-hint = Les panneaux exécutant Claude Code, Codex et d'autres agents apparaissent ici.-right-agents-reload-rules = Recharger les règles de détectionright-agents-rules-reloaded = Règles de détection rechargées.+right-agents-rules-reload-errors = Règles rechargées ; { $count ->+ [one] 1 fichier a été rejeté+ *[other] { $count } fichiers ont été rejetés+ } — voir le journal.right-agents-state-working = En coursright-agents-state-blocked = Attend une réponseright-agents-state-idle = Inactifright-agents-state-unknown = Inconnu+right-agents-none = Aucun agent détecté+right-agents-detection-off = Détection des agents désactivée — ouvrir les réglages+right-agents-count-working = { $count } en cours+right-agents-count-blocked = { $count } en attente+right-agents-count-idle = { $count } inactif(s)+right-agents-count-unknown = { $count } inconnu(s)settings-section-agents = Agentssettings-agents-integrations-heading = Intégrationssettings-integration-screen-active = Trouvé dans le PATH ; l'état est détecté depuis son interface terminal (règles d'écran).diff --git a/wezterm-gui/i18n/ja-JP.ftl b/wezterm-gui/i18n/ja-JP.ftlindex c3e9fde9..1b382413 100644--- a/wezterm-gui/i18n/ja-JP.ftl+++ b/wezterm-gui/i18n/ja-JP.ftl@@ -478,14 +478,18 @@ settings-agent-panel-description = ペインで動作するコーディングエsettings-agent-panel-enabled = エージェントパネルを有効にしました。settings-agent-panel-disabled = エージェントパネルを無効にしました。right-mode-agents = エージェント-right-agents-empty = エージェントが見つかりません-right-agents-empty-hint = Claude Code や Codex などを実行中のペインがここに表示されます。-right-agents-reload-rules = 検出ルールを再読み込みright-agents-rules-reloaded = 検出ルールを再読み込みしました。+right-agents-rules-reload-errors = ルールを再読み込みしましたが、{ $count } 件のファイルが拒否されました — ログをご確認ください。right-agents-state-working = 作業中right-agents-state-blocked = 入力待ちright-agents-state-idle = アイドルright-agents-state-unknown = 不明+right-agents-none = エージェントは検出されていません+right-agents-detection-off = エージェント検出はオフです — 設定を開く+right-agents-count-working = { $count } 件が作業中+right-agents-count-blocked = { $count } 件が入力待ち+right-agents-count-idle = { $count } 件が待機中+right-agents-count-unknown = { $count } 件が不明settings-section-agents = エージェントsettings-agents-integrations-heading = 連携settings-integration-screen-active = PATH 上で見つかりました。状態は端末画面(スクリーンルール)から識別します。diff --git a/wezterm-gui/i18n/zh-CN.ftl b/wezterm-gui/i18n/zh-CN.ftlindex 18d801d6..083fff9f 100644--- a/wezterm-gui/i18n/zh-CN.ftl+++ b/wezterm-gui/i18n/zh-CN.ftl@@ -478,14 +478,18 @@ settings-agent-panel-description = 检测 pane 中运行的编码 Agent(Claude Csettings-agent-panel-enabled = Agent 面板已开启。settings-agent-panel-disabled = Agent 面板已关闭。right-mode-agents = Agent-right-agents-empty = 未检测到 Agent-right-agents-empty-hint = 运行 Claude Code、Codex 等 Agent 的 pane 会显示在这里。-right-agents-reload-rules = 重载检测规则right-agents-rules-reloaded = 检测规则已重载。+right-agents-rules-reload-errors = 规则已重载,{ $count } 份文件被拒绝 — 详见日志。right-agents-state-working = 工作中right-agents-state-blocked = 等待输入right-agents-state-idle = 空闲right-agents-state-unknown = 未知+right-agents-none = 未检测到 Agent+right-agents-detection-off = Agent 检测已关闭 — 打开设置+right-agents-count-working = { $count } 个运行中+right-agents-count-blocked = { $count } 个等待输入+right-agents-count-idle = { $count } 个空闲+right-agents-count-unknown = { $count } 个状态未知settings-section-agents = Agentsettings-agents-integrations-heading = 集成settings-integration-screen-active = 已在 PATH 中找到;状态通过其终端界面识别(屏幕规则)。diff --git a/wezterm-gui/src/agent_status/mod.rs b/wezterm-gui/src/agent_status/mod.rsindex cb8eb6c2..2b34bd75 100644--- a/wezterm-gui/src/agent_status/mod.rs+++ b/wezterm-gui/src/agent_status/mod.rs@@ -14,7 +14,10 @@pub(crate) use thinkterm_proto::{AgentEvidence, AgentState};+use crate::termwindow::ui::icons::BrandIcon;+use crate::ui::icons::SvgIcon;use crate::workspace_threads::WorkspaceThreadWorkStatus;+use ::window::Appearance;use mux::pane::{Pane, PaneId};use mux::Mux;use std::collections::HashMap;@@ -27,6 +30,10 @@ use std::time::{Duration, Instant};#[derive(Clone, Debug, PartialEq, Eq)]pub enum AgentPanelAction {ReloadRules,+ /// The toolbar line says detection is off; clicking it opens the+ /// settings page that owns that switch, so the panel explains itself+ /// instead of just sitting empty.+ OpenSettings,/// Focus the pane running this agent (it lives in this window).Reveal(PaneId),/// The pane lives in another window: clicking deep-focuses its tab@@ -49,7 +56,6 @@ pub(crate) struct AgentPaneStatus {pub session_id: Option<String>,/// Pane title with any leading progress marker stripped.pub title: String,- pub workspace: String,/// Mux window hosting the pane, resolved once per snapshot.pub window_id: Option<mux::window::WindowId>,/// Human place name ("Project · Thread"), falling back to the raw@@ -183,7 +189,6 @@ pub(crate) fn list_agent_panes() -> Vec<AgentPaneStatus> {evidence: status.evidence,session_id: status.session_id,title,- workspace,window_id,place,since_unix: status.since_unix,@@ -196,6 +201,21 @@ pub(crate) fn list_agent_panes() -> Vec<AgentPaneStatus> {panes}+/// Display order for the Agents panel: stable, and independent of which+/// Space is frontmost. An earlier version floated the active workspace's+/// rows to the top, which meant every Space switch reshuffled the list —+/// and rows trading places read as state changes. Group by the visible+/// place name instead, then agent, then pane id as the final tiebreak.+pub(crate) fn sort_for_display(agents: &mut [AgentPaneStatus]) {+ agents.sort_by(|a, b| {+ a.place+ .to_lowercase()+ .cmp(&b.place.to_lowercase())+ .then_with(|| a.agent_id.cmp(&b.agent_id))+ .then_with(|| a.pane_id.cmp(&b.pane_id))+ });+}+pub(crate) fn display_name(agent_id: &str) -> String {match agent_id {"claude" => "Claude Code",@@ -220,6 +240,46 @@ pub(crate) fn display_name(agent_id: &str) -> String {.to_string()}+/// An agent's brand mark, in whichever form suits the current theme.+#[derive(Clone, Copy, Debug, PartialEq, Eq)]+pub(crate) enum AgentIcon {+ /// A monochrome mark, tinted by the caller — so it inverts with the+ /// theme like every other icon in the UI.+ Mono(SvgIcon),+ /// A mark with real brand colors, painted as-is.+ Color(BrandIcon),+}++/// The brand mark for an agent, or `None` when we have no logo for it.+///+/// `agent_id` is not a closed set — a native contract or a user manifest+/// can name any agent — so callers must have a fallback glyph rather than+/// assuming a mark exists. OMP and Soul are known ids with no upstream+/// logo and land in the same fallback.+///+/// Colored marks are only used where they read on both themes. Kimi's+/// colored mark is a white glyph with a blue dot: fine on dark chrome,+/// all but invisible on light, so it drops to its monochrome form there.+/// Cursor, OpenCode, Pi and OpenAI (Codex) publish no colored mark at all+/// — their logos are monochrome by design.+pub(crate) fn brand_icon(agent_id: &str, appearance: Appearance) -> Option<AgentIcon> {+ let dark = !matches!(+ appearance,+ Appearance::Light | Appearance::LightHighContrast+ );+ Some(match agent_id {+ "claude" => AgentIcon::Color(BrandIcon::AgentClaude),+ "copilot" => AgentIcon::Color(BrandIcon::AgentCopilot),+ "kimi" if dark => AgentIcon::Color(BrandIcon::AgentKimi),+ "kimi" => AgentIcon::Mono(SvgIcon::AgentKimi),+ "codex" => AgentIcon::Mono(SvgIcon::AgentCodex),+ "cursor" => AgentIcon::Mono(SvgIcon::AgentCursor),+ "opencode" => AgentIcon::Mono(SvgIcon::AgentOpenCode),+ "pi" => AgentIcon::Mono(SvgIcon::AgentPi),+ _ => return None,+ })+}+/// How each supported agent is covered, for the settings Integrations list.#[derive(Clone, Copy, Debug, PartialEq, Eq)]pub(crate) enum IntegrationKind {@@ -437,6 +497,89 @@ pub(crate) fn refresh_path_probe() {mod tests {use super::display_name;+ fn row(place: &str, agent: &str, pane_id: mux::pane::PaneId) -> super::AgentPaneStatus {+ super::AgentPaneStatus {+ pane_id,+ agent_id: agent.to_string(),+ state: super::AgentState::Idle,+ evidence: super::AgentEvidence::Screen,+ session_id: None,+ title: String::new(),+ window_id: None,+ place: place.to_string(),+ since_unix: 0,+ }+ }++ /// The panel order must not depend on which Space is frontmost:+ /// switching Spaces used to float that workspace's rows to the top,+ /// and the reshuffle read as agents changing state.+ #[test]+ fn display_order_is_stable_and_space_independent() {+ let mut agents = vec![+ row("Beta", "pi", 9),+ row("alpha", "claude", 4),+ row("Beta", "claude", 7),+ row("alpha", "claude", 2),+ ];+ super::sort_for_display(&mut agents);+ let order: Vec<_> = agents.iter().map(|a| a.pane_id).collect();+ assert_eq!(order, vec![2, 4, 7, 9]);++ // Same input in any order lands the same way.+ let mut shuffled = vec![+ row("alpha", "claude", 2),+ row("Beta", "claude", 7),+ row("Beta", "pi", 9),+ row("alpha", "claude", 4),+ ];+ super::sort_for_display(&mut shuffled);+ let again: Vec<_> = shuffled.iter().map(|a| a.pane_id).collect();+ assert_eq!(again, order);+ }++ /// Every agent we ship a logo for must resolve in both themes, and+ /// everything else must decline so the caller draws its fallback+ /// instead of drawing the wrong brand.+ #[test]+ fn brand_icon_covers_the_logos_we_vendor() {+ use super::{brand_icon, AgentIcon, Appearance};+ for appearance in [Appearance::Dark, Appearance::Light] {+ for id in ["claude", "codex", "copilot", "cursor", "kimi", "opencode", "pi"] {+ assert!(+ brand_icon(id, appearance).is_some(),+ "{id} should have a brand mark in {appearance:?}"+ );+ }+ for id in ["omp", "soul", "some-custom-agent", ""] {+ assert!(+ brand_icon(id, appearance).is_none(),+ "{id} should fall back in {appearance:?}"+ );+ }+ }++ // Kimi's colored mark is a white glyph: usable on dark chrome,+ // invisible on light, so light must get the monochrome form.+ assert!(matches!(+ brand_icon("kimi", Appearance::Dark),+ Some(AgentIcon::Color(_))+ ));+ assert!(matches!(+ brand_icon("kimi", Appearance::Light),+ Some(AgentIcon::Mono(_))+ ));+ // Claude and Copilot read on both, so they stay in color.+ for appearance in [Appearance::Dark, Appearance::Light] {+ for id in ["claude", "copilot"] {+ assert!(+ matches!(brand_icon(id, appearance), Some(AgentIcon::Color(_))),+ "{id} should stay colored in {appearance:?}"+ );+ }+ }+ }+#[test]fn display_name_falls_back_to_the_raw_id() {assert_eq!(display_name("claude"), "Claude Code");diff --git a/wezterm-gui/src/settings_window.rs b/wezterm-gui/src/settings_window.rsindex 7337e899..c8339dc6 100644--- a/wezterm-gui/src/settings_window.rs+++ b/wezterm-gui/src/settings_window.rs@@ -9,9 +9,9 @@ use crate::termwindow::render::corners::{use crate::termwindow::render::draw::draw_webgpu_layers;use crate::termwindow::webgpu::WebGpuState;use crate::ui::{- rect, scale_ui_f32, scale_ui_usize, ButtonSpec, ControlState, EditModifiers, InputCaret,- InteractionState, ResizablePaneState, ScrollState, ScrollbarSpec, SettingsIcon, SvgIcon,- TextInputSpec, TextInputState, UiContext, UiPalette, UiTokens, WidgetKind,+ rect, scale_ui_f32, scale_ui_usize, BrandIcon, ButtonSpec, ControlState, EditModifiers,+ InputCaret, InteractionState, ResizablePaneState, ScrollState, ScrollbarSpec, SettingsIcon,+ SvgIcon, TextInputSpec, TextInputState, UiContext, UiPalette, UiTokens, WidgetKind,};use crate::utilsprites::RenderMetrics;use anyhow::{Context, Error};@@ -4808,23 +4808,50 @@ impl SettingsWindow {row_width,)?;}+ // The brand mark leads the row; agents without a logo (and the+ // expand arrow) still line up because the text column starts+ // past a fixed icon slot either way.+ let brand_size = (self.metrics.cell_size.height as f32)+ .clamp(self.ui_px(14.0), self.ui_px(22.0));+ let brand_gap = self.ui_px(10.0);+ let text_x = row_x + brand_size + brand_gap;+ let text_width = row_width - (brand_size + brand_gap);+ let brand_y = row_y + (self.metrics.cell_size.height as f32 - brand_size) / 2.0;+ // effective_appearance, not the raw OS appearance: the theme+ // override decides which Kimi mark is legible here.+ match crate::agent_status::brand_icon(agent_id, self.effective_appearance()) {+ Some(crate::agent_status::AgentIcon::Color(brand)) => {+ self.draw_brand_icon(layers, brand, row_x, brand_y, brand_size)?+ }+ Some(crate::agent_status::AgentIcon::Mono(icon)) => {+ self.draw_svg_icon(layers, icon, row_x, brand_y, brand_size, palette.text)?+ }+ None => self.draw_svg_icon(+ layers,+ SvgIcon::Bot,+ row_x,+ brand_y,+ brand_size,+ palette.text,+ )?,+ }self.draw_text(layers,&ui_font,- row_x,+ text_x,row_y,&label,palette.text,- row_width,+ text_width,)?;self.draw_text(layers,&ui_font,- row_x,+ text_x,self.settings_row_description_y(row_y),&description,palette.secondary_text,- row_width,+ text_width,)?;self.ui_context.push(rect(@@ -8130,6 +8157,45 @@ impl SettingsWindow {Ok(())}+ /// A brand mark in its own colors. Same geometry as+ /// [`Self::draw_svg_icon`], but the sprite is sampled in full color+ /// instead of being treated as an alpha mask to tint.+ fn draw_brand_icon(+ &self,+ layers: &mut TripleLayerQuadAllocator<'_>,+ icon: BrandIcon,+ x: f32,+ y: f32,+ size: f32,+ ) -> anyhow::Result<()> {+ if size <= 0.0 {+ return Ok(());+ }++ let render_state = self.render_state.as_ref().unwrap();+ let sprite = render_state+ .glyph_cache+ .borrow_mut()+ .cached_brand_icon(icon, size.round() as usize)?+ .texture_coords();+ let mut quad = layers.allocate(2)?;+ let left_offset = self.dimensions.pixel_width as f32 / 2.0;+ let top_offset = self.dimensions.pixel_height as f32 / 2.0;+ quad.set_position(+ x - left_offset,+ y - top_offset,+ x + size - left_offset,+ y + size - top_offset,+ );+ quad.set_texture(sprite);+ let white = LinearRgba::with_components(1.0, 1.0, 1.0, 1.0);+ quad.set_fg_color(white);+ quad.set_alt_color_and_mix_value(white, 0.0);+ quad.set_hsv(None);+ quad.set_has_color(true);+ Ok(())+ }+fn draw_text(&self,layers: &mut TripleLayerQuadAllocator<'_>,diff --git a/wezterm-gui/src/termwindow/ui/agent_panel.rs b/wezterm-gui/src/termwindow/ui/agent_panel.rsindex 3c2b316c..f686574e 100644--- a/wezterm-gui/src/termwindow/ui/agent_panel.rs+++ b/wezterm-gui/src/termwindow/ui/agent_panel.rs@@ -4,13 +4,14 @@//! snapshots — the paint path never triggers detection or filesystem//! probes.-use crate::agent_status::{self, AgentPanelAction, AgentState};+use crate::agent_status::{self, AgentIcon, AgentPanelAction, AgentState};use crate::quad::TripleLayerQuadAllocator;use crate::termwindow::ui::icons::SvgIcon;use crate::termwindow::ui::right_sidebar::{right_sidebar_file_row_metrics, sidebar_row_element_visible, FILE_SCROLL_FADE_HEIGHT,+ SNIPPET_ROW_GAP,};-use crate::termwindow::ui::tokens::{SIDEBAR_INSET, SIDEBAR_ROW_RADIUS};+use crate::termwindow::ui::tokens::{SIDEBAR_ICON_GAP, SIDEBAR_INSET, SIDEBAR_ROW_RADIUS};use crate::termwindow::{TermWindow, TermWindowNotif, UIItem, UIItemType};use crate::ui::UiPalette;use crate::utilsprites::RenderMetrics;@@ -23,20 +24,80 @@ use wezterm_font::LoadedFont;use window::color::LinearRgba;use window::{MouseEvent, MouseEventKind as WMEK, MousePress, WindowOps};+/// An agent that is working, in the same blue the left sidebar uses for a+/// live thread (`SESSION_STATUS_OPEN_COLOR`).+const AGENT_WORKING_COLOR: LinearRgba = LinearRgba::with_components(0.12, 0.48, 1.0, 1.0);+/// An agent waiting on the user: amber, matching the sidebar's other+/// "needs a human" signal. Deliberately not the notification red, which is+/// reserved for something being wrong rather than something being asked.+const AGENT_BLOCKED_COLOR: LinearRgba = LinearRgba::with_components(0.86, 0.45, 0.12, 1.0);++/// What the toolbar line reports when the list is not empty.+#[derive(Clone, Copy, Default)]+pub(crate) struct AgentCounts {+ total: usize,+ working: usize,+ blocked: usize,+ idle: usize,+ unknown: usize,+}++impl AgentCounts {+ fn tally(agents: &[agent_status::AgentPaneStatus]) -> Self {+ let mut counts = Self {+ total: agents.len(),+ ..Default::default()+ };+ for agent in agents {+ match agent.state {+ AgentState::Working => counts.working += 1,+ AgentState::Blocked => counts.blocked += 1,+ AgentState::Idle => counts.idle += 1,+ AgentState::Unknown => counts.unknown += 1,+ }+ }+ counts+ }++ fn count_text(id: &'static str, count: usize) -> String {+ let mut args = fluent_bundle::FluentArgs::new();+ args.set("count", count);+ crate::i18n::tr_args(id, &args)+ }++ /// "2 working · 1 needs input", naming only what is actually happening;+ /// with nothing running or waiting it falls back to the idle and+ /// unknown counts — each labeled as what it is, so three Unknown panes+ /// never read as "3 idle".+ fn describe(self) -> String {+ let mut parts = Vec::new();+ if self.working > 0 {+ parts.push(Self::count_text("right-agents-count-working", self.working));+ }+ if self.blocked > 0 {+ parts.push(Self::count_text("right-agents-count-blocked", self.blocked));+ }+ if parts.is_empty() {+ if self.idle > 0 || self.unknown == 0 {+ parts.push(Self::count_text("right-agents-count-idle", self.idle));+ }+ if self.unknown > 0 {+ parts.push(Self::count_text("right-agents-count-unknown", self.unknown));+ }+ }+ parts.join(" \u{b7} ")+ }+}+impl TermWindow {/// Height of the strip above the list: the reload button, the optional/// status line, and the gap before the first row. The scroll mask covers/// exactly this, so the two must be derived from the same numbers.- fn agents_toolbar_height(&self, cell_height: usize, has_status: bool) -> usize {- let status_height = if has_status {- self.ui_px(6) + cell_height- } else {- 0- };- // This strip doubles as the top scroll mask, and it only has to- // swallow a single element's overflow -- the card behind them is- // clipped geometrically -- so the ordinary gap is already tall enough.- self.agents_toolbar_button_height(cell_height) + status_height + self.ui_px(8)+ /// The strip above the list: one row holding the status line and the+ /// reload button, plus the gap before the first row. It doubles as the+ /// top scroll mask, so this is also how far overflow may be erased.+ fn agents_toolbar_height(&self, cell_height: usize) -> usize {+ self.agents_toolbar_button_height(cell_height) + self.ui_px(8)}/// Two lines -- identity, then state and place -- with the same share of@@ -47,6 +108,9 @@ impl TermWindow {(cell_height * 2 + line_gap + padding, line_gap)}+ /// The reload control is a compact icon button in the top-right, the+ /// same shape the Files panel gives its refresh: a full-width pill for+ /// a control this rarely used dominated the panel.fn agents_toolbar_button_height(&self, cell_height: usize) -> usize {(cell_height + self.ui_px(12)).max(self.ui_px(28))}@@ -67,42 +131,71 @@ impl TermWindow {content_top: usize,content_width: usize,status: Option<&str>,+ counts: AgentCounts,) -> anyhow::Result<()> {let cell_height = ui_metrics.cell_size.height as usize;let button_height = self.agents_toolbar_button_height(cell_height);- self.paint_snippet_button(+ let button_size = button_height.min(content_width);+ self.paint_files_preview_header_icon_button(layers,- 2,- ui_font,- ui_metrics,chrome,foreground,muted_fg,- content_x,+ content_x + content_width.saturating_sub(button_size),content_top,- content_width,- button_height,- Some(SvgIcon::RotateCw),- &crate::i18n::tr("right-agents-reload-rules"),+ button_size,+ // The circular-arrow refresh glyph the Files panel also uses.+ // (The tempting `Redo` variant is a hooked arrow that reads as+ // half a glyph once there is no label beside it.)+ SvgIcon::RotateCcw,UIItemType::RightSidebarAgent(AgentPanelAction::ReloadRules),- true,)?;- if let Some(status) = status {++ // The line to the left of that button. A reload acknowledgement+ // takes it over while it lives, because it is the answer to the+ // click that just happened; otherwise it says what the panel is+ // currently showing -- which is also the only place that explains+ // an empty list.+ let detection_on = agent_status::enabled();+ let line = match status {+ Some(status) => status.to_string(),+ None if !detection_on => crate::i18n::tr("right-agents-detection-off"),+ None if counts.total == 0 => crate::i18n::tr("right-agents-none"),+ None => counts.describe(),+ };+ if status.is_some() {// The acknowledgement expires by TTL, but expiry alone paints// nothing; keep a lazy repaint scheduled while it is visible.self.update_next_frame_time(Some(std::time::Instant::now() + std::time::Duration::from_millis(500),));- self.paint_sidebar_text(- layers,- ui_font,- ui_metrics,- status,- content_x + self.ui_px(SIDEBAR_INSET),- content_top + button_height + self.ui_px(6),- content_width.saturating_sub(self.ui_px(SIDEBAR_INSET) * 2),- muted_fg,- )?;+ }+ let text_x = content_x + self.ui_px(SIDEBAR_INSET);+ let text_y = content_top + (button_height.saturating_sub(cell_height)) / 2;+ let text_width = content_x+ .saturating_add(content_width)+ .saturating_sub(button_size + self.ui_px(SIDEBAR_ICON_GAP))+ .saturating_sub(text_x);+ self.paint_sidebar_text(+ layers,+ ui_font,+ ui_metrics,+ &line,+ text_x,+ text_y,+ text_width,+ muted_fg,+ )?;+ // Only the "detection is off" line is actionable: it names the+ // switch that turns the panel back on, so it must lead there.+ if status.is_none() && !detection_on {+ self.ui_items.push(UIItem {+ x: text_x,+ y: content_top,+ width: text_width,+ height: button_height,+ item_type: UIItemType::RightSidebarAgent(AgentPanelAction::OpenSettings),+ });}Ok(())}@@ -126,52 +219,17 @@ impl TermWindow {// Read once: the status expires on a TTL, and asking twice could size// the toolbar for one layout and paint another.let status = agent_status::panel_status();- let toolbar_height = self.agents_toolbar_height(cell_height, status.is_some());+ let toolbar_height = self.agents_toolbar_height(cell_height);let list_top = content_top + toolbar_height;let inset = self.ui_px(SIDEBAR_INSET);let mut agents = agent_status::list_agent_panes();+ let counts = AgentCounts::tally(&agents);if agents.is_empty() {- let card_height = (cell_height * 2 + self.ui_px(24))- .min(content_bottom.saturating_sub(list_top + inset));- if card_height > 0 {- self.fill_rounded_rectangle_with_border(- layers,- 1,- euclid::rect(- content_x as f32,- list_top as f32,- content_width as f32,- card_height as f32,- ),- chrome.sidebar_button_bg,- chrome.control_border.mul_alpha(0.74),- self.ui_f32(SIDEBAR_ROW_RADIUS) + 6.0,- 1.0,- )- .context("agents empty state card")?;- let pad = inset * 2;- self.paint_sidebar_text(- layers,- ui_font,- ui_metrics,- &crate::i18n::tr("right-agents-empty"),- content_x + pad,- list_top + self.ui_px(10),- content_width.saturating_sub(pad * 2),- foreground,- )?;- self.paint_sidebar_text(- layers,- ui_font,- ui_metrics,- &crate::i18n::tr("right-agents-empty-hint"),- content_x + pad,- list_top + self.ui_px(12) + cell_height,- content_width.saturating_sub(pad * 2),- muted_fg,- )?;- }+ // Nothing but the toolbar: an empty-state card here is a large+ // bordered box explaining that a list is empty, which the+ // toolbar line already says in one row. The panel reads as+ // quiet rather than broken.return self.paint_agents_toolbar(layers,ui_font,@@ -183,19 +241,11 @@ impl TermWindow {content_top,content_width,status.as_deref(),+ counts,);}- // Rows for the current window's workspace first, then stable order.- let current_workspace = Mux::get().active_workspace();- agents.sort_by(|a, b| {- let a_here = a.workspace == current_workspace;- let b_here = b.workspace == current_workspace;- b_here- .cmp(&a_here)- .then_with(|| a.agent_id.cmp(&b.agent_id))- .then_with(|| a.pane_id.cmp(&b.pane_id))- });+ agent_status::sort_for_display(&mut agents);// Borrow the file tree's row chrome wholesale so the two lists read as// one control: same height, same icon size, same gaps, all derived from@@ -232,13 +282,22 @@ impl TermWindow {sidebar_row_element_visible(elem_y, elem_height, content_top, list_top, overflow_bottom)};let visible_height = viewport_bottom.saturating_sub(list_top);- let total_height = agents.len().saturating_mul(row_height);+ // Rows are spaced like snippet cards: the painted row is+ // `row_height`, and each one starts a gap further down. The last+ // row has no trailing gap, so it is not part of the scrollable+ // height either.+ let row_gap = self.ui_px(SNIPPET_ROW_GAP);+ let row_pitch = row_height + row_gap;+ let total_height = agents+ .len()+ .saturating_mul(row_pitch)+ .saturating_sub(row_gap);let max_scroll = total_height.saturating_sub(visible_height) as f32;self.right_sidebar_agents_scroll = self.right_sidebar_agents_scroll.clamp(0.0, max_scroll);let scroll = self.right_sidebar_agents_scroll;for (idx, agent) in agents.iter().enumerate() {- let row_top = list_top as f32 + (idx * row_height) as f32 - scroll;+ let row_top = list_top as f32 + (idx * row_pitch) as f32 - scroll;if row_top + row_height as f32 <= list_top as f32 {continue;}@@ -271,7 +330,9 @@ impl TermWindow {band.visible_height as f32,),chrome.sidebar_button_hover_bg,- self.ui_f32(SIDEBAR_ROW_RADIUS),+ // Same corner as a snippet card, so the two lists read+ // as one control set rather than two designs.+ self.ui_f32(SIDEBAR_ROW_RADIUS) + 10.0,).context("agent row hover")?;}@@ -291,14 +352,36 @@ impl TermWindow {let icon_x = content_x + inset;let icon_y = top + (row_height.saturating_sub(metrics.icon_size)) / 2;if visible(icon_y, metrics.icon_size) {- self.paint_sidebar_icon(- layers,- SvgIcon::Bot,- icon_x,- icon_y,- metrics.icon_size,- muted_fg,- )?;+ // The brand mark when we have one; agents with no logo+ // (and any id from a custom manifest) keep the generic bot.+ match agent_status::brand_icon(+ &agent.agent_id,+ crate::native_settings::effective_appearance(),+ ) {+ Some(AgentIcon::Color(brand)) => self.paint_sidebar_brand_icon(+ layers,+ brand,+ icon_x,+ icon_y,+ metrics.icon_size,+ )?,+ Some(AgentIcon::Mono(icon)) => self.paint_sidebar_icon(+ layers,+ icon,+ icon_x,+ icon_y,+ metrics.icon_size,+ muted_fg,+ )?,+ None => self.paint_sidebar_icon(+ layers,+ SvgIcon::Bot,+ icon_x,+ icon_y,+ metrics.icon_size,+ muted_fg,+ )?,+ }}// State chip: spinner while working, alert while blocked. `None`@@ -307,9 +390,17 @@ impl TermWindow {let state_size = metrics.icon_size;let state_x = content_x + content_width - inset - state_size;let state_y = top + (row_height.saturating_sub(state_size)) / 2;+ // The same three status colors the left sidebar gives a thread,+ // so "working" and "waiting on you" mean the same thing in both+ // places: blue for in progress, amber for needs input, and a+ // muted tick for idle, which must not compete for attention.let state_icon = match agent.state {- AgentState::Working => Some((SvgIcon::LoaderCircle, foreground, true)),- AgentState::Blocked => Some((SvgIcon::CircleAlert, foreground, false)),+ AgentState::Working => {+ Some((SvgIcon::LoaderCircle, AGENT_WORKING_COLOR, true))+ }+ AgentState::Blocked => {+ Some((SvgIcon::CircleAlert, AGENT_BLOCKED_COLOR, false))+ }AgentState::Idle => Some((SvgIcon::CircleCheck, muted_fg, false)),AgentState::Unknown => None,};@@ -422,6 +513,7 @@ impl TermWindow {content_top,content_width,status.as_deref(),+ counts,)?;if scrolled {let fade_height = self@@ -458,11 +550,16 @@ impl TermWindow {// The reload reads manifest files; keep that off the GUI// thread and report completion when it lands.std::thread::spawn(|| {- mux::agent_status::reload_rules();- promise::spawn::spawn_into_main_thread(async {- agent_status::set_panel_status(crate::i18n::tr(- "right-agents-rules-reloaded",- ));+ let rejected = mux::agent_status::reload_rules();+ promise::spawn::spawn_into_main_thread(async move {+ let ack = if rejected == 0 {+ crate::i18n::tr("right-agents-rules-reloaded")+ } else {+ let mut args = fluent_bundle::FluentArgs::new();+ args.set("count", rejected);+ crate::i18n::tr_args("right-agents-rules-reload-errors", &args)+ };+ agent_status::set_panel_status(ack);if let Some(front_end) = crate::frontend::try_front_end() {front_end.invalidate_all_windows();}@@ -470,6 +567,9 @@ impl TermWindow {.detach();});}+ AgentPanelAction::OpenSettings => {+ crate::settings_window::show();+ }AgentPanelAction::Reveal(pane_id) => {self.reveal_agent_pane(pane_id);}@@ -756,4 +856,60 @@ mod tests {}));}++ /// The toolbar line is the only thing explaining a quiet panel, so it+ /// must never come back blank, and must name what is actually+ /// happening rather than reciting every state.+ #[test]+ fn toolbar_line_reports_what_is_happening() {+ use super::AgentCounts;++ let all_idle = AgentCounts {+ total: 3,+ idle: 3,+ ..Default::default()+ };+ let line = all_idle.describe();+ assert!(line.contains('3'), "idle count should be named: {line}");++ let busy = AgentCounts {+ total: 4,+ working: 2,+ blocked: 1,+ idle: 1,+ ..Default::default()+ };+ let line = busy.describe();+ assert!(line.contains('2') && line.contains('1'), "{line}");+ assert!(+ line.contains('\u{b7}'),+ "working and waiting should be joined: {line}"+ );+ assert!(+ !line.contains('4'),+ "the idle fallback must not appear alongside live counts: {line}"+ );++ // Unknown panes must be reported as unknown — never rolled into+ // the idle count ("3 idle" over three Unknown rows was a lie).+ let unknown_only = AgentCounts {+ total: 2,+ unknown: 2,+ ..Default::default()+ };+ let line = unknown_only.describe();+ assert!(!line.is_empty());+ assert!(line.contains('2'), "{line}");+ let mixed = AgentCounts {+ total: 3,+ idle: 2,+ unknown: 1,+ ..Default::default()+ };+ let line = mixed.describe();+ assert!(+ line.contains('2') && line.contains('1') && line.contains('\u{b7}'),+ "idle and unknown must be reported separately: {line}"+ );+ }}diff --git a/wezterm-gui/src/termwindow/ui/context_menu.rs b/wezterm-gui/src/termwindow/ui/context_menu.rsindex 1ea34174..34a8df79 100644--- a/wezterm-gui/src/termwindow/ui/context_menu.rs+++ b/wezterm-gui/src/termwindow/ui/context_menu.rs@@ -1117,7 +1117,7 @@ fn menu_icon(icon: &ContextMenuIcon) -> Option<SvgIcon> {ContextMenuIcon::Paste => Some(SvgIcon::ClipboardPaste),ContextMenuIcon::Pin => Some(SvgIcon::Pin),ContextMenuIcon::Refresh => Some(SvgIcon::RotateCcw),- ContextMenuIcon::Redo => Some(SvgIcon::RotateCw),+ ContextMenuIcon::Redo => Some(SvgIcon::Redo),ContextMenuIcon::Save => Some(SvgIcon::Save),ContextMenuIcon::Search => Some(SvgIcon::Search),ContextMenuIcon::Server => Some(SvgIcon::Server),diff --git a/wezterm-gui/src/termwindow/ui/icons.rs b/wezterm-gui/src/termwindow/ui/icons.rsindex 55817dd6..665ed58b 100644--- a/wezterm-gui/src/termwindow/ui/icons.rs+++ b/wezterm-gui/src/termwindow/ui/icons.rs@@ -55,7 +55,7 @@ pub enum SvgIcon {PinOff,Plus,RotateCcw,- RotateCw,+ Redo,Save,Scissors,Search,@@ -78,6 +78,17 @@ pub enum SvgIcon {Trash2,Unlink2,X,+ // Coding-agent brand marks whose logo is monochrome by design, from+ // lobe-icons rather than lucide (see third_party/lobe-icons/README).+ // Being monochrome they take the caller's tint, so they invert with+ // the theme for free. Agents whose logo is genuinely colored live in+ // `BrandIcon` instead; Kimi is in both, because its colored mark is+ // white and vanishes on a light background.+ AgentCodex,+ AgentCursor,+ AgentKimi,+ AgentOpenCode,+ AgentPi,}impl SvgIcon {@@ -185,7 +196,7 @@ impl SvgIcon {Self::RotateCcw => {include_bytes!("../../../../third_party/lucide/icons/rotate-ccw.svg")}- Self::RotateCw => include_bytes!("../../../../third_party/lucide/icons/redo.svg"),+ Self::Redo => include_bytes!("../../../../third_party/lucide/icons/redo.svg"),Self::Save => include_bytes!("../../../../third_party/lucide/icons/save.svg"),Self::Scissors => include_bytes!("../../../../third_party/lucide/icons/scissors.svg"),Self::Search => include_bytes!("../../../../third_party/lucide/icons/search.svg"),@@ -229,6 +240,15 @@ impl SvgIcon {Self::Terminal => include_bytes!("../../../../third_party/lucide/icons/terminal.svg"),Self::Trash2 => include_bytes!("../../../../third_party/lucide/icons/trash-2.svg"),Self::X => include_bytes!("../../../../third_party/lucide/icons/x.svg"),+ Self::AgentCodex => include_bytes!("../../../../third_party/lobe-icons/openai.svg"),+ Self::AgentCursor => {+ include_bytes!("../../../../third_party/lobe-icons/cursor.svg")+ }+ Self::AgentKimi => include_bytes!("../../../../third_party/lobe-icons/kimi.svg"),+ Self::AgentOpenCode => {+ include_bytes!("../../../../third_party/lobe-icons/opencode.svg")+ }+ Self::AgentPi => include_bytes!("../../../../third_party/lobe-icons/pi.svg"),}}@@ -345,17 +365,25 @@ pub fn material_folder_icon_for_name(}}-/// Brand / product logos sourced from the `simple-icons` submodule-/// (`third_party/simple-icons/icons/<slug>.svg`).+/// Brand / product logos painted in full color.+///+/// Most come from the `simple-icons` submodule+/// (`third_party/simple-icons/icons/<slug>.svg`): a single fill-less+/// `<path>` that defaults to black, plus an official brand color which we+/// inject as the path fill. Because many brands are black/near-black+/// (GitHub, Anthropic, Apple, Rust, Debian) and would vanish on the dark+/// UI, a brand color darker than [`MIN_BRAND_LUMA`] is rendered white+/// instead.///-/// Unlike Lucide, simple-icons SVGs are a single fill-less `<path>` that-/// defaults to black, and each brand has an official color. We inject that-/// color as the path fill. Because many brands are black/near-black (GitHub,-/// Anthropic, Apple, Rust, Debian) and would vanish on the dark UI, a brand-/// color darker than [`MIN_BRAND_LUMA`] is rendered white instead.+/// The `Agent*` marks come from `third_party/lobe-icons` and are the+/// exception: their SVGs already carry their own fills and gradients, so+/// they are rasterized untouched — see [`BrandIcon::has_embedded_color`].#[allow(dead_code)]#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]pub enum BrandIcon {+ AgentClaude,+ AgentCopilot,+ AgentKimi,Alpine,Anthropic,Apple,@@ -382,6 +410,15 @@ const MIN_BRAND_LUMA: f32 = 40.0;impl BrandIcon {pub fn bytes(self) -> &'static [u8] {match self {+ Self::AgentClaude => {+ include_bytes!("../../../../third_party/lobe-icons/claude-color.svg")+ }+ Self::AgentCopilot => {+ include_bytes!("../../../../third_party/lobe-icons/copilot-color.svg")+ }+ Self::AgentKimi => {+ include_bytes!("../../../../third_party/lobe-icons/kimi-color.svg")+ }Self::Alpine => {include_bytes!("../../../../third_party/simple-icons/icons/alpinelinux.svg")}@@ -412,9 +449,26 @@ impl BrandIcon {}}+ /// Whether this mark's SVG already carries its own fills, so the+ /// single-path color injection below must be skipped. Injecting onto a+ /// path that already has a `fill` produces a duplicate XML attribute,+ /// which usvg rejects outright — the icon would not merely look wrong,+ /// it would fail to rasterize and take the frame down with it.+ fn has_embedded_color(self) -> bool {+ matches!(+ self,+ Self::AgentClaude | Self::AgentCopilot | Self::AgentKimi+ )+ }+/// Official brand color (sRGB) from `simple-icons/data/simple-icons.json`.+ /// Unused for [`Self::has_embedded_color`] marks, which keep their own;+ /// the entries below are their dominant color, for reference.pub fn brand_color(self) -> (u8, u8, u8) {match self {+ Self::AgentClaude => (0xD9, 0x77, 0x57),+ Self::AgentCopilot => (0x24, 0x96, 0xED),+ Self::AgentKimi => (0x17, 0x83, 0xFF),Self::Alpine => (0x0D, 0x59, 0x7F),Self::Anthropic => (0x19, 0x19, 0x19),Self::Apple => (0x00, 0x00, 0x00),@@ -448,6 +502,9 @@ impl BrandIcon {pub fn rasterize(self, size: usize) -> Result<Image> {let svg = std::str::from_utf8(self.bytes()).context("brand SVG asset is not UTF-8")?;+ if self.has_embedded_color() {+ return rasterize_svg_str(svg, size, 0.0);+ }let (r, g, b) = self.display_color();let fill = format!("#{r:02X}{g:02X}{b:02X}");// simple-icons paths carry no fill; inject the brand color on the@@ -546,7 +603,7 @@ mod tests {SvgIcon::Plus,SvgIcon::Unlink2,SvgIcon::RotateCcw,- SvgIcon::RotateCw,+ SvgIcon::Redo,SvgIcon::Search,SvgIcon::Settings,SvgIcon::SlidersHorizontal,@@ -562,6 +619,14 @@ mod tests {SvgIcon::Terminal,SvgIcon::Trash2,SvgIcon::X,+ // The agent marks come from a different upstream than the+ // rest, sized in `em` rather than pixels: keep them covered so+ // a re-vendored file that usvg cannot size fails here.+ SvgIcon::AgentCodex,+ SvgIcon::AgentCursor,+ SvgIcon::AgentKimi,+ SvgIcon::AgentOpenCode,+ SvgIcon::AgentPi,] {let data: Vec<u8> = icon.rasterize(24).unwrap().into();assert_eq!(data.len(), 24 * 24 * 4);@@ -572,6 +637,12 @@ mod tests {#[test]fn brand_icons_rasterize() {for icon in [+ // These three take the embedded-color path, where a stray+ // fill injection would be a hard usvg parse error rather than+ // a cosmetic bug — see BrandIcon::has_embedded_color.+ BrandIcon::AgentClaude,+ BrandIcon::AgentCopilot,+ BrandIcon::AgentKimi,BrandIcon::Alpine,BrandIcon::Anthropic,BrandIcon::Apple,diff --git a/wezterm-gui/src/termwindow/ui/right_sidebar.rs b/wezterm-gui/src/termwindow/ui/right_sidebar.rsindex c2f31406..9eabf4a4 100644--- a/wezterm-gui/src/termwindow/ui/right_sidebar.rs+++ b/wezterm-gui/src/termwindow/ui/right_sidebar.rs@@ -108,6 +108,7 @@ const REMOTE_EMPTY_ICON_GAP: usize = 18;const REMOTE_EMPTY_DETAIL_GAP: usize = 6;const REMOTE_EMPTY_BUTTON_GAP: usize = 22;const REMOTE_EMPTY_BUTTON_HEIGHT: usize = 44;+/// Toolbar control height.const SNIPPET_TOOLBAR_HEIGHT: usize = 58;const SNIPPET_SEARCH_HEIGHT: usize = 58;const SNIPPET_CARD_HEIGHT: usize = 116;@@ -117,7 +118,9 @@ const SNIPPET_BODY_FIELD_HEIGHT: usize = 190;const SNIPPET_SAVE_BUTTON_HEIGHT: usize = 54;const SNIPPET_ACTION_BUTTON_MIN_WIDTH: usize = 92;const SNIPPET_ACTION_BUTTON_HEIGHT: usize = 46;-const SNIPPET_ROW_GAP: usize = 16;+/// Gap between snippet cards. Shared with the Agents list so the two+/// panels space their rows identically rather than by coincidence.+pub(crate) const SNIPPET_ROW_GAP: usize = 16;const SNIPPET_LIST_TOP_GAP: usize = 18;const SNIPPET_LIST_BOTTOM_PADDING: usize = 40;const RIGHT_SIDEBAR_SCROLLBAR_VISIBLE_MS: u64 = 900;@@ -14340,7 +14343,7 @@ impl crate::TermWindow {}#[allow(clippy::too_many_arguments)]- fn paint_files_preview_header_icon_button(+ pub(crate) fn paint_files_preview_header_icon_button(&mut self,layers: &mut TripleLayerQuadAllocator,chrome: UiPalette,diff --git a/wezterm-gui/src/termwindow/ui/sidebar.rs b/wezterm-gui/src/termwindow/ui/sidebar.rsindex d9d95f6a..431bc265 100644--- a/wezterm-gui/src/termwindow/ui/sidebar.rs+++ b/wezterm-gui/src/termwindow/ui/sidebar.rs@@ -3516,7 +3516,7 @@ impl crate::TermWindow {/// Paint a full-color brand/OS logo (the brand color is baked into the/// sprite, so unlike [`Self::paint_sidebar_icon`] it is not tinted).- fn paint_sidebar_brand_icon(+ pub(crate) fn paint_sidebar_brand_icon(&self,layers: &mut TripleLayerQuadAllocator,icon: BrandIcon,diff --git a/wezterm-gui/src/ui/icons.rs b/wezterm-gui/src/ui/icons.rsindex 6c55eaee..6564eca1 100644--- a/wezterm-gui/src/ui/icons.rs+++ b/wezterm-gui/src/ui/icons.rs@@ -1,4 +1,4 @@-pub(crate) use crate::termwindow::ui::icons::SvgIcon;+pub(crate) use crate::termwindow::ui::icons::{BrandIcon, SvgIcon};#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]pub(crate) enum SettingsIcon {