Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Refine pinned conversation layout and color styling (#1363)

Eve Bouffard5d4520342c44
diff --git a/plugins/web-ui/src/sessions.ts b/plugins/web-ui/src/sessions.ts
index 25d782e79..dc5102434 100644
--- a/plugins/web-ui/src/sessions.ts
+++ b/plugins/web-ui/src/sessions.ts
@@ -339,12 +339,16 @@ export function renderList(): void {
${
pinned.length
? html`
- <div class="recents-group pinned-head">${icon(Pin, 11)}<span>Pinned</span></div>
- ${repeat(
- pinned,
- (session) => session.threadRef,
- (session) => sessionRow(session),
- )}
+ <div class="recents-group pinned-head">
+ <span class="pinned-head-glyph">${icon(Pin, 11)}</span><span>Pinned</span>
+ </div>
+ <div class="pinned-children">
+ ${repeat(
+ pinned,
+ (session) => session.threadRef,
+ (session) => sessionRow(session),
+ )}
+ </div>
`
: nothing
}
@@ -715,11 +719,9 @@ function isActiveRow(s: CoreSession): boolean {
function chatPageRow(s: CoreSession): TemplateResult {
const readOnly = !isContinuable(s, appState.me?.user ?? "");
+ const color = displaySessionColor(s.color);
return html`
- <div
- class="list-row chat-row ${s.color ? "colored" : ""}"
- style=${s.color ? `--session-color:${s.color}` : nothing}
- >
+ <div class="list-row chat-row ${color ? "colored" : ""}" style=${color ? `--session-color:${color}` : nothing}>
<a
class="chat-row-open"
href=${deepLinkPath(UI_BASE, "chats", s.id)}
@@ -871,6 +873,7 @@ function sessionRow(s: CoreSession, projectChild = false): TemplateResult {
const surface = surfaceOf(s);
const context = projectChild ? null : rowContext(s);
const working = sessionWorking(s);
+ const color = displaySessionColor(s.color);
let titleContent: string | TemplateResult = groupDmTitle(s);
if (refreshingTitle) {
titleContent = html`<span class="sheen-label title-sheen thinking-sheen" data-sheen=${title}>${title}</span>`;
@@ -893,8 +896,8 @@ function sessionRow(s: CoreSession, projectChild = false): TemplateResult {
return html`
<div
data-session-id=${saved ? s.id : nothing}
- class="session-row ${active ? "active" : ""} ${saved && selection.ids.has(s.id) ? "selected" : ""} ${menuOpen ? "menu-open" : ""} ${readOnly ? "read-only" : ""} ${refreshingTitle ? "title-refreshing" : ""} ${working ? "working" : ""} ${s.awaitingInput ? "awaiting-input" : ""} ${projectChild ? "project-child" : ""} ${s.color ? "colored" : ""}"
- style=${s.color ? `--session-color:${s.color}` : nothing}
+ class="session-row ${active ? "active" : ""} ${saved && selection.ids.has(s.id) ? "selected" : ""} ${menuOpen ? "menu-open" : ""} ${readOnly ? "read-only" : ""} ${refreshingTitle ? "title-refreshing" : ""} ${working ? "working" : ""} ${s.awaitingInput ? "awaiting-input" : ""} ${projectChild ? "project-child" : ""} ${color ? "colored" : ""}"
+ style=${color ? `--session-color:${color}` : nothing}
>
<a
class="session"
@@ -1102,10 +1105,24 @@ function sessionMenuPopover(s: CoreSession): TemplateResult {
`;
}
-const SESSION_COLORS = ["#ef4444", "#f59e0b", "#22c55e", "#3b82f6", "#a855f7", "#ec4899"] as const;
+const SESSION_COLORS = ["#f43f5e", "#f59e0b", "#10b981", "#3b82f6", "#8b5cf6", "#ec4899"] as const;
+const LEGACY_SESSION_COLORS = new Map([
+ ["#ef4444", SESSION_COLORS[0]],
+ ["#f59e0b", SESSION_COLORS[1]],
+ ["#22c55e", SESSION_COLORS[2]],
+ ["#3b82f6", SESSION_COLORS[3]],
+ ["#a855f7", SESSION_COLORS[4]],
+ ["#ec4899", SESSION_COLORS[5]],
+]);
+
+function displaySessionColor(color: string | null | undefined): string | null {
+ if (!color) return null;
+ const normalized = color.toLowerCase();
+ return LEGACY_SESSION_COLORS.get(normalized) ?? normalized;
+}
function sessionColorRow(s: CoreSession): TemplateResult {
- const current = s.color?.toLowerCase() ?? null;
+ const current = displaySessionColor(s.color);
const isPreset = SESSION_COLORS.includes(current as (typeof SESSION_COLORS)[number]);
return html`
<div class="session-menu-colors" role="group" aria-label="Row color">
@@ -1125,7 +1142,7 @@ function sessionColorRow(s: CoreSession): TemplateResult {
<input
type="color"
aria-label="Custom row color"
- value=${current ?? "#6366f1"}
+ value=${current ?? SESSION_COLORS[3]}
@click=${(e: Event) => e.stopPropagation()}
@input=${(e: InputEvent) => previewColor(s, (e.currentTarget as HTMLInputElement).value)}
@change=${(e: Event) => setColor(s, (e.currentTarget as HTMLInputElement).value)}
diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.css
index 6d34f2487..fab190846 100644
--- a/plugins/web-ui/src/shell.css
+++ b/plugins/web-ui/src/shell.css
@@ -328,6 +328,8 @@ a.chat-row-open {
}
.sidebar .list {
flex: 1;
+ box-sizing: border-box;
+ padding-right: 8px;
overflow-y: auto;
scrollbar-gutter: stable;
display: flex;
@@ -674,27 +676,72 @@ a.chat-row-open {
display: flex;
align-items: center;
gap: 5px;
+ min-height: 30px;
+ margin: 3px 0 5px 4px;
+ padding: 4px 3px 4px 2px;
+ color: var(--foreground);
+ font-size: 12.5px;
}
-.recents-group.pinned-head svg {
+.pinned-head-glyph {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ flex: 0 0 14px;
+ color: var(--muted-foreground);
+}
+.pinned-head-glyph svg {
flex: 0 0 auto;
- opacity: 0.8;
+}
+.pinned-children {
+ display: flex;
+ flex-direction: column;
+ gap: 1px;
+ min-width: 0;
+ margin-left: 13px;
+}
+.pinned-children .session {
+ padding-left: 6px;
}
+.session-row.colored {
+ --session-action-hover: color-mix(in srgb, var(--session-color) 24%, var(--secondary));
+ --session-action-foreground: color-mix(in srgb, var(--session-color) 68%, var(--foreground));
+}
.session-row.colored .session {
- background: color-mix(in srgb, var(--session-color) 14%, transparent);
+ background: linear-gradient(
+ 110deg,
+ color-mix(in srgb, var(--session-color) 22%, transparent),
+ color-mix(in srgb, var(--session-color) 10%, transparent)
+ );
}
.session-row.colored .session:hover,
.session-row.colored.menu-open .session {
- background: color-mix(in srgb, var(--session-color) 24%, transparent);
+ background: linear-gradient(
+ 110deg,
+ color-mix(in srgb, var(--session-color) 30%, transparent),
+ color-mix(in srgb, var(--session-color) 16%, transparent)
+ );
}
.session-row.colored.active .session {
- background: color-mix(in srgb, var(--session-color) 30%, var(--secondary));
+ background: linear-gradient(
+ 110deg,
+ color-mix(in srgb, var(--session-color) 34%, var(--secondary)),
+ color-mix(in srgb, var(--session-color) 20%, var(--secondary))
+ );
}
.list-row.chat-row.colored {
- background: color-mix(in srgb, var(--session-color) 12%, transparent);
+ background: linear-gradient(
+ 110deg,
+ color-mix(in srgb, var(--session-color) 20%, transparent),
+ color-mix(in srgb, var(--session-color) 8%, transparent)
+ );
}
.list-row.chat-row.colored:hover {
- background: color-mix(in srgb, var(--session-color) 20%, transparent);
+ background: linear-gradient(
+ 110deg,
+ color-mix(in srgb, var(--session-color) 28%, transparent),
+ color-mix(in srgb, var(--session-color) 14%, transparent)
+ );
}
.session-menu-colors {
@@ -724,7 +771,7 @@ a.chat-row-open {
position: relative;
display: inline-flex;
overflow: hidden;
- background: conic-gradient(#ef4444, #f59e0b, #22c55e, #3b82f6, #a855f7, #ec4899, #ef4444);
+ background: conic-gradient(#f43f5e, #f59e0b, #10b981, #3b82f6, #8b5cf6, #ec4899, #f43f5e);
}
.color-swatch.custom input[type="color"] {
position: absolute;
@@ -839,6 +886,15 @@ a.chat-row-open {
background: var(--secondary);
color: var(--foreground);
}
+.session-row.colored .session-menu-btn {
+ color: var(--session-action-foreground);
+}
+.session-row.colored .session-menu-btn:hover,
+.session-row.colored .session-menu-btn:focus-visible,
+.session-row.colored.menu-open .session-menu-btn {
+ background: var(--session-action-hover);
+ color: var(--session-action-foreground);
+}
.session-menu-popover {
position: absolute;
top: calc(100% + 4px);
diff --git a/plugins/web-ui/test/css-vars.test.ts b/plugins/web-ui/test/css-vars.test.ts
index 5941c858e..9c9ab435d 100644
--- a/plugins/web-ui/test/css-vars.test.ts
+++ b/plugins/web-ui/test/css-vars.test.ts
@@ -24,6 +24,47 @@ test("every no-fallback var() in shell.css names a property something defines",
assert.deepEqual([...dead], [], "var() references that nothing defines (add the property or a fallback)");
});
+test("colored session actions keep their row hue at rest and on hover", () => {
+ const variables = shellCss.match(/\.session-row\.colored \{[^}]+\}/)?.[0] ?? "";
+ assert.match(variables, /--session-action-hover:\s*color-mix\([^;]+var\(--session-color\)/);
+ assert.match(variables, /--session-action-foreground:\s*color-mix\([^;]+var\(--session-color\)/);
+ assert.match(shellCss, /\.session-row\.colored \.session-menu-btn \{\s*color: var\(--session-action-foreground\);/);
+ assert.match(
+ shellCss,
+ /\.session-row\.colored \.session-menu-btn:hover,[\s\S]*?\.session-row\.colored\.menu-open \.session-menu-btn \{\s*background: var\(--session-action-hover\);\s*color: var\(--session-action-foreground\);/,
+ );
+});
+
+test("conversation colors use the refined spectrum palette on every list surface", () => {
+ assert.match(tsSource, /const SESSION_COLORS = \["#f43f5e", "#f59e0b", "#10b981", "#3b82f6", "#8b5cf6", "#ec4899"\]/);
+ assert.equal(tsSource.match(/const color = displaySessionColor\(s\.color\);/g)?.length, 2);
+ assert.match(tsSource, /const current = displaySessionColor\(s\.color\);/);
+ assert.doesNotMatch(tsSource, /#d2664d|#b98a52|#7d884f|#5f8b83|#527d99|#8b5d52/);
+ assert.match(shellCss, /conic-gradient\(#f43f5e, #f59e0b, #10b981, #3b82f6, #8b5cf6, #ec4899, #f43f5e\)/);
+ assert.match(shellCss, /\.session-row\.colored \.session \{[\s\S]*?linear-gradient\(/);
+ assert.doesNotMatch(shellCss, /\.session-row\.colored \.session::before/);
+});
+
+test("pinned conversations use the same header and child alignment as project conversations", () => {
+ assert.match(tsSource, /class="pinned-head-glyph"/);
+ assert.match(tsSource, /class="pinned-children"/);
+ const header = shellCss.match(/\.recents-group\.pinned-head \{[^}]+\}/)?.[0] ?? "";
+ assert.match(header, /min-height:\s*30px;/);
+ assert.match(header, /margin:\s*3px 0 5px 4px;/);
+ assert.match(header, /padding:\s*4px 3px 4px 2px;/);
+ assert.match(header, /font-size:\s*12\.5px;/);
+ assert.match(shellCss, /\.pinned-head-glyph \{[\s\S]*?flex: 0 0 14px;/);
+ assert.match(shellCss, /\.pinned-children \{[\s\S]*?margin-left: 13px;/);
+ assert.match(shellCss, /\.pinned-children \.session \{\s*padding-left: 6px;/);
+});
+
+test("sidebar conversations keep space between their backgrounds and the scrollbar", () => {
+ const list = shellCss.match(/\.sidebar \.list \{[^}]+\}/)?.[0] ?? "";
+ assert.match(list, /box-sizing:\s*border-box;/);
+ assert.match(list, /padding-right:\s*8px;/);
+ assert.match(list, /scrollbar-gutter:\s*stable;/);
+});
+
test("every drop zone the canvas renders has a positioning rule in shell.css", () => {
const splitTs = readFileSync(new URL("../src/split.ts", import.meta.url), "utf8");
const edges = [...splitTs.matchAll(/zoneTpl\("([a-z]+)"/g)].map((m) => m[1]);