mirror of
https://github.com/QwenLM/qwen-code.git
synced 2026-08-04 13:51:13 +00:00
49497f5076
* feat(web-shell): color-code each split pane by workspace On a narrow split (split-screen / mobile), it was hard to tell which workspace each pane belonged to: a pane's header showed only its session name, and the sole workspace signal — the composer chip at the bottom — collapsed to a bare folder icon that looked identical for every workspace, so the workspace was discoverable only by hovering each one. Surface the workspace where you actually scan — the pane header — and give each workspace a stable accent color so panes read apart at a glance and same-workspace panes read as a group: - Add a colored workspace tag (dot + basename) at the start of each pane header on a multi-workspace daemon, and colorize the header divider with the same accent. The dot never shrinks, so panes stay distinguishable even when the name and session title ellipsize. - Derive a stable per-workspace color from the workspace's position in the daemon's advertised workspaces[], reusing the sidebar session-group palette so the two surfaces speak the same color language. Extracted into a shared workspaceAccent.module.css. - Tint the composer workspace chip with the same accent (folder + faint background) so it stays distinguishable even in its icon-only compact state, instead of a generic folder. Single-workspace daemons are unchanged: no tag, and the header divider falls back to the neutral border. * refactor(web-shell): address review on split-pane workspace accent - Rename workspaceAccent.module.css -> WorkspaceAccent.module.css to match the PascalCase convention used by every other component .module.css; update both import sites. - Hoist the four raw-hex accent colors (red/orange/yellow/green) into shared --accent-* theme tokens in App.module.css, and point the workspace accent module, the sidebar group dots, and the overview badges at them. The palette now has a single source of truth and can't drift between the four surfaces (values are unchanged, so rendering is identical). - Add a compile-time exhaustiveness guard so adding a DaemonSessionGroupPresetColor without extending WORKSPACE_ACCENT_COLORS (and its CSS class) fails the build instead of silently dropping that accent. - Give the pane-header workspace tag role="img" so its "Workspace: <name>" aria-label is reliably announced; aria-label on a bare span (generic role) is not. * refactor(web-shell): address follow-up review on workspace accent - Hoist the four --accent-* tokens out of both theme blocks into the theme-independent .app scope, so they are declared once (the values do not vary by theme) — a genuine single declaration rather than two kept in sync. - Add a dev-only runtime check that every accent color has a matching class in WorkspaceAccent.module.css, closing the gap the compile-time guard cannot cover: CSS modules are typed Record<string, string>, so a renamed/removed class would otherwise silently drop that color's accent. - Rename the "same workspace same color" test to describe what it actually asserts (a stable color per cwd, and distinct colors across workspaces). * refactor(web-shell): address second follow-up review on workspace accent - WorkspaceIndicator tests: assert on imported CSS-module class names instead of string literals, so a CSS-module naming change can't silently make the substring checks vacuous; add an expanded-mode (non-compact) accent test so a refactor that gated the accent on `compact` would be caught. - workspaceColor.ts: run the CSS-class contract check unconditionally — throw in dev, but console.error in production — so a missing class in a prod build is at least diagnosable instead of a silent accent drop. - WorkspaceAccent.module.css: correct the docstring to state exactly which tokens come from where — red/orange/yellow/green from --accent-* in App.module.css, blue/purple deliberately reusing the --agent-* brand tokens. --------- Co-authored-by: wenshao <wenshao@example.com>
85 lines
2.6 KiB
TypeScript
85 lines
2.6 KiB
TypeScript
/**
|
|
* @license
|
|
* Copyright 2026 Qwen Team
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
import type { DaemonSessionGroupPresetColor } from '@qwen-code/sdk/daemon';
|
|
import styles from './ChatEditor.module.css';
|
|
import accentStyles from './WorkspaceAccent.module.css';
|
|
import {
|
|
Tooltip,
|
|
TooltipContent,
|
|
TooltipProvider,
|
|
TooltipTrigger,
|
|
} from './ui/tooltip';
|
|
|
|
function WorkspaceFolderIcon() {
|
|
return (
|
|
<svg viewBox="0 0 24 24" fill="none" aria-hidden="true">
|
|
<path
|
|
d="M3 6.5A1.5 1.5 0 0 1 4.5 5h4l2 2h7A1.5 1.5 0 0 1 19 8.5v8A1.5 1.5 0 0 1 17.5 18h-13A1.5 1.5 0 0 1 3 16.5Z"
|
|
stroke="currentColor"
|
|
strokeWidth="1.8"
|
|
strokeLinejoin="round"
|
|
/>
|
|
</svg>
|
|
);
|
|
}
|
|
|
|
/**
|
|
* A compact, non-interactive chip naming the workspace a split-view pane's
|
|
* session belongs to. Mirrors {@link GitBranchIndicator}; both sit in the
|
|
* composer toolbar. Shown only on a multi-workspace daemon (the pane composer
|
|
* opts into the `workspace` toolbar action) so it's clear which workspace a
|
|
* message goes to. The full cwd stays in a hover tooltip — matching the git
|
|
* branch chip — so it's still discoverable once the name ellipsizes or
|
|
* collapses to an icon on a narrow (split-screen / mobile) composer.
|
|
*
|
|
* A stable per-workspace `color` (same palette as the pane header and the
|
|
* sidebar session-group dots) tints the folder icon and the chip background, so
|
|
* the chip stays distinguishable from other panes' chips even in the icon-only
|
|
* compact state — where every workspace would otherwise show the same folder.
|
|
*/
|
|
export function WorkspaceIndicator({
|
|
name,
|
|
title,
|
|
ariaLabel,
|
|
color,
|
|
compact = false,
|
|
}: {
|
|
name: string;
|
|
title: string;
|
|
ariaLabel: string;
|
|
color?: DaemonSessionGroupPresetColor;
|
|
compact?: boolean;
|
|
}) {
|
|
const className = [
|
|
styles.workspaceChip,
|
|
compact ? styles.workspaceChipCompact : '',
|
|
color ? accentStyles[color] : '',
|
|
color ? styles.workspaceChipAccented : '',
|
|
]
|
|
.filter(Boolean)
|
|
.join(' ');
|
|
return (
|
|
<TooltipProvider delayDuration={300}>
|
|
<Tooltip>
|
|
<TooltipTrigger asChild>
|
|
<output
|
|
className={className}
|
|
aria-label={ariaLabel}
|
|
data-web-shell-workspace
|
|
data-web-shell-workspace-title={title}
|
|
>
|
|
<span className={styles.workspaceChipIcon}>
|
|
<WorkspaceFolderIcon />
|
|
</span>
|
|
<span className={styles.workspaceChipText}>{name}</span>
|
|
</output>
|
|
</TooltipTrigger>
|
|
<TooltipContent side="top">{title}</TooltipContent>
|
|
</Tooltip>
|
|
</TooltipProvider>
|
|
);
|
|
}
|