Skip to content

armgit / qm

Public Imported from GitHub
0

Multiplayer agent harness for work.

Show all conversations by default with quieter sidebar rows (#2275)

Regan Bell7d10a97a4b31
diff --git a/plugins/web-ui/src/sessions.ts b/plugins/web-ui/src/sessions.ts
index d98c8b7fa..07246d60c 100644
--- a/plugins/web-ui/src/sessions.ts
+++ b/plugins/web-ui/src/sessions.ts
@@ -111,7 +111,7 @@ export const sessionsState = {
openMenuId: null as string | null,
renamingId: null as string | null,
openingKey: null as string | null,
- webOnly: true,
+ webOnly: false,
collapsedProjectScopes: new Set<string>(),
};
@@ -160,9 +160,9 @@ function visibleRowOrder(): string[] {
const WEB_ONLY_KEY = "web-ui:web-only";
sessionsState.webOnly = ((): boolean => {
try {
- return localStorage.getItem(WEB_ONLY_KEY) !== "0";
+ return localStorage.getItem(WEB_ONLY_KEY) === "1";
} catch {
- return true;
+ return false;
}
})();
@@ -1066,10 +1066,7 @@ function sessionRow(s: CoreSession, projectChild = false): TemplateResult {
}}
>
<div class="title" aria-live="polite">
- ${statusMarks(s)}${surfaceGlyph(s)}${readOnly ? html`<span class="ro-lock" ${tip("Read-only")}>${icon(Lock, 12)}</span>` : nothing}<span
- class="tl"
- dir="auto"
- >${titleContent}</span
+ ${statusMarks(s)}${surfaceGlyph(s)}<span class="tl" dir="auto">${titleContent}</span
>${context ? html`<span class="row-context" ${tip(context)}>${context}</span>` : nothing}${unreadDot(s)}
</div>
</a>
diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.css
index 8a0606c28..d568e437d 100644
--- a/plugins/web-ui/src/shell.css
+++ b/plugins/web-ui/src/shell.css
@@ -780,7 +780,7 @@ a.chat-row-open {
--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:is(.colored, .active, .menu-open, .selected, .read-only, :hover) .session {
+.session-row:is(.colored, .active, .menu-open, .selected, :hover) .session {
width: calc(100% + 4px);
margin-left: -4px;
padding-left: 15px;
@@ -788,9 +788,9 @@ a.chat-row-open {
.session-row.colored .session {
background: color-mix(in srgb, var(--session-color) 16%, transparent);
}
-.recent-project-children .session-row:is(.colored, .active, .menu-open, .selected, .read-only, :hover) .session,
-.archived-children .session-row:is(.colored, .active, .menu-open, .selected, .read-only, :hover) .session,
-.pinned-children .session-row:is(.colored, .active, .menu-open, .selected, .read-only, :hover) .session {
+.recent-project-children .session-row:is(.colored, .active, .menu-open, .selected, :hover) .session,
+.archived-children .session-row:is(.colored, .active, .menu-open, .selected, :hover) .session,
+.pinned-children .session-row:is(.colored, .active, .menu-open, .selected, :hover) .session {
padding-left: 10px;
}
.session-row.colored .session:hover,
@@ -859,10 +859,6 @@ a.chat-row-open {
opacity: 0.65;
vertical-align: middle;
}
-.session .ro-lock {
- margin-right: 6px;
- vertical-align: middle;
-}
.badge {
font-size: 10px;
padding: 1px 6px;
@@ -887,14 +883,6 @@ a.chat-row-open {
flex-shrink: 0;
opacity: 0.65;
}
-.session-row.read-only .session {
- background: color-mix(in srgb, var(--foreground) 4%, transparent);
-}
-.session-row.read-only:hover .session,
-.session-row.read-only.active .session,
-.session-row.read-only.menu-open .session {
- background: color-mix(in srgb, var(--foreground) 8%, transparent);
-}
.session-row.read-only .session .title {
color: var(--muted-foreground);
}
diff --git a/plugins/web-ui/test/sidebar-surface-default.test.ts b/plugins/web-ui/test/sidebar-surface-default.test.ts
new file mode 100644
index 000000000..1528070c5
--- /dev/null
+++ b/plugins/web-ui/test/sidebar-surface-default.test.ts
@@ -0,0 +1,74 @@
+import assert from "node:assert/strict";
+import test from "node:test";
+import { browserEnv } from "./browser-env.ts";
+
+for (const stored of [null, "1", "0", "unavailable"] as const) {
+ test(`sidebar surface preference: ${stored ?? "fresh browser"}`, async () => {
+ const sessions = [
+ {
+ id: "web",
+ threadRef: "web:tester:one",
+ scopeId: "personal:tester",
+ title: "Web chat",
+ canContinue: true,
+ createdAt: 3,
+ },
+ {
+ id: "slack",
+ threadRef: "ch:C_TEAM:1700000000.000100",
+ scopeId: "channel:C_TEAM",
+ title: "Team chat",
+ createdAt: 2,
+ },
+ { id: "child", threadRef: "web:tester:child", scopeId: "personal:tester", parentSessionId: "web", createdAt: 1 },
+ {
+ id: "archived",
+ threadRef: "ch:C_TEAM:1699999999.000100",
+ scopeId: "channel:C_TEAM",
+ archived: true,
+ createdAt: 0,
+ },
+ ];
+ const env = await browserEnv({
+ fetch: async (input) => {
+ if (String(input) === "/api/sessions") return Response.json({ sessions });
+ if (String(input) === "/api/contexts") return Response.json({ contexts: [] });
+ throw new Error(`Unexpected request: ${input}`);
+ },
+ });
+ try {
+ if (stored === "unavailable") {
+ const getItem = localStorage.getItem.bind(localStorage);
+ env.dom.window.Storage.prototype.getItem = (key: string) => {
+ if (key === "web-ui:web-only") throw new Error("Storage unavailable");
+ return getItem(key);
+ };
+ } else if (stored !== null) localStorage.setItem("web-ui:web-only", stored);
+ const shell = await env.vite.ssrLoadModule("/src/shell.ts");
+ const sidebar = await env.vite.ssrLoadModule("/src/sessions.ts");
+ shell.appState.me = { user: "tester", org: "test", permissions: [] };
+ shell.mountShell();
+ await sidebar.refreshSessions();
+ const rowIds = () =>
+ [...document.querySelectorAll<HTMLElement>("#sidebar-body .session-row")].map((row) => row.dataset.sessionId);
+ const slackRow = () => document.querySelector('[data-session-id="slack"]');
+ assert.deepEqual(rowIds(), stored === "1" ? ["web"] : ["web", "slack"]);
+ if (stored !== "1") {
+ assert.ok(slackRow()?.querySelector(".slack-logo"));
+ assert.match(slackRow()?.querySelector(".session")?.getAttribute("aria-label") ?? "", /slack/);
+ }
+ assert.equal(document.querySelector('[data-view="inbox"]'), null);
+ assert.equal(document.querySelector('[data-view="calendar"]'), null);
+ sidebar.setWebOnly(true);
+ assert.deepEqual(rowIds(), ["web"]);
+ sidebar.setWebOnly(false);
+ assert.deepEqual(rowIds(), ["web", "slack"]);
+ assert.ok(slackRow()?.querySelector(".slack-logo"));
+ assert.equal(slackRow()?.querySelector(".ro-lock"), null);
+ assert.match(slackRow()?.querySelector(".session")?.getAttribute("aria-label") ?? "", /read-only/);
+ if (stored !== "unavailable") assert.equal(localStorage.getItem("web-ui:web-only"), "0");
+ } finally {
+ await env.close();
+ }
+ });
+}