Multiplayer agent harness for work.
Fix single-view session URLs and pane controls (#1312)
Regan Bell3b926137bdd8
diff --git a/docs/screenshots/session-view-controls/multiview.png b/docs/screenshots/session-view-controls/multiview.pngnew file mode 100644index 000000000..8a5e5ec3fBinary files /dev/null and b/docs/screenshots/session-view-controls/multiview.png differdiff --git a/docs/screenshots/session-view-controls/single-view.png b/docs/screenshots/session-view-controls/single-view.pngnew file mode 100644index 000000000..fa75d7d59Binary files /dev/null and b/docs/screenshots/session-view-controls/single-view.png differdiff --git a/plugins/web-ui/src/shell.ts b/plugins/web-ui/src/shell.tsindex e2a3e6750..f7a250dea 100644--- a/plugins/web-ui/src/shell.ts+++ b/plugins/web-ui/src/shell.ts@@ -57,6 +57,7 @@ import {mountRestoredCanvas,restoredCanvasNeedsSessionList,splitState,+ singlePaneSessionId,} from "./split";import { activityOf } from "./session-list";import { replaceChildrenPreservingFocus } from "./pane-focus";@@ -146,7 +147,7 @@ export function syncUrlFromState(sessionOverride?: string | null): void {const chatState = mainConversation().state;const fromState =sessionOverride !== undefined ? sessionOverride : (chatState.sessionId ?? chatState.rememberedSessionId);- const sessionId = splitState.active ? null : fromState;+ const sessionId = splitState.active ? singlePaneSessionId() : fromState;const next = deepLinkPath(UI_BASE, appState.currentView, sessionId, contextsState.selected);if (`${location.pathname}${location.search}` !== next) history.replaceState(null, "", next);}diff --git a/plugins/web-ui/src/split.ts b/plugins/web-ui/src/split.tsindex 65779e5bc..00089f66b 100644--- a/plugins/web-ui/src/split.ts+++ b/plugins/web-ui/src/split.ts@@ -240,6 +240,7 @@ function buildDock(): DockviewApi {guarded.add(group);group.model.onWillDrop(holdTileCap);}+ if (appState.currentView === "chats") syncUrlFromState();if (paneDrag) refreshPaneDrag();persistSoon();});@@ -819,6 +820,13 @@ function refreshHeaders(): void {for (const a of groupActions) a.draw();for (const c of paneContents.values()) c.syncTitle();syncDocumentTitle();+ if (appState.currentView === "chats") syncUrlFromState();+}++export function singlePaneSessionId(): string | null {+ if (!dockApi || dockApi.panels.length !== 1) return null;+ const params = panelParams(dockApi.panels[0]!);+ return paneKindEntry(params) ? null : (params.sessionId ?? null);}function paneSession(panel: IDockviewPanel): CoreSession | undefined {@@ -1328,6 +1336,7 @@ class GroupActions implements IHeaderActionsRenderer {this.draw();if (p) openPaneTool(p, tool);};+ if (single) this.menuOpen = false;const menu = this.menuOpen? html`<div@@ -1393,53 +1402,56 @@ class GroupActions implements IHeaderActionsRenderer {];render(html`${- single- ? html`<span class="split-single-tools">- ${PANE_TOOLS.map((t) => {- const count = scope ? scopeToolCount(t.tool, scope, () => this.draw()) : null;- return html`<button- class="session-tool"- type="button"- aria-label=${t.label}- ${tip(t.label)}- @click=${() => runTool(t.tool)}- >- ${icon(t.glyph, 15)}${count ? html`<span class="session-tool-count">${count}</span>` : nothing}- </button>`;- })}- </span>`- : nothing- }- <span class="split-tools">- <button- class="icon-btn subtle split-tools-btn ${this.menuOpen ? "active" : ""}"- type="button"- ${tip("Tools")}- aria-label="Tools"- aria-haspopup="menu"- aria-expanded=${this.menuOpen ? "true" : "false"}- @click=${() => {- this.menuOpen = !this.menuOpen;- this.draw();- }}- >- ${icon(MoreHorizontal, 15)}- </button>- ${menu}- </span>- ${sessionId ? sessionActions(sessionId, false, panel!.id) : nothing}- ${buttons.map(- (b) =>- html`<button- class="icon-btn subtle${b.cls ?? ""}"- type="button"- ${tip(b.label)}- aria-label=${b.label}- @click=${b.run}- >- ${b.glyph}- </button>`,- )}`,+ single+ ? html`<span class="split-single-tools">+ ${PANE_TOOLS.map((t) => {+ const count = scope ? scopeToolCount(t.tool, scope, () => this.draw()) : null;+ return html`<button+ class="session-tool"+ type="button"+ aria-label=${t.label}+ ${tip(t.label)}+ @click=${() => runTool(t.tool)}+ >+ ${icon(t.glyph, 15)}${count ? html`<span class="session-tool-count">${count}</span>` : nothing}+ </button>`;+ })}+ </span>`+ : html`<span class="split-tools">+ <button+ class="icon-btn subtle split-tools-btn ${this.menuOpen ? "active" : ""}"+ type="button"+ ${tip("Tools")}+ aria-label="Tools"+ aria-haspopup="menu"+ aria-expanded=${this.menuOpen ? "true" : "false"}+ @click=${() => {+ this.menuOpen = !this.menuOpen;+ this.draw();+ }}+ >+ ${icon(MoreHorizontal, 15)}+ </button>+ ${menu}+ </span>`+ }+ ${sessionId ? sessionActions(sessionId, false, panel!.id) : nothing}+ ${+ single+ ? nothing+ : buttons.map(+ (b) =>+ html`<button+ class="icon-btn subtle${b.cls ?? ""}"+ type="button"+ ${tip(b.label)}+ aria-label=${b.label}+ @click=${b.run}+ >+ ${b.glyph}+ </button>`,+ )+ }`,this.element,);}diff --git a/plugins/web-ui/test/deep-link-boot-fixture.ts b/plugins/web-ui/test/deep-link-boot-fixture.tsindex a796d8c52..eda1553cb 100644--- a/plugins/web-ui/test/deep-link-boot-fixture.ts+++ b/plugins/web-ui/test/deep-link-boot-fixture.ts@@ -187,6 +187,7 @@ export async function harness(opts: HarnessOptions): Promise<Harness> {const shell = await vite.ssrLoadModule("/src/shell.ts");const sessions = await vite.ssrLoadModule("/src/sessions.ts");const conversations = await vite.ssrLoadModule("/src/conversations.ts");+ const split = await vite.ssrLoadModule("/src/split.ts");return {requests,setConnections: (items, status = 200) => {@@ -207,6 +208,8 @@ export async function harness(opts: HarnessOptions): Promise<Harness> {conversations.mainConversation(),mainText: () => dom.window.document.querySelector(".main")?.textContent ?? "",close: async () => {+ split.exitSplitIfActive();+ for (const conversation of conversations.allConversations()) conversations.disposeConversation(conversation);releaseSessions();releaseTranscript();releaseApprovals();diff --git a/plugins/web-ui/test/new-chat-placement.test.ts b/plugins/web-ui/test/new-chat-placement.test.tsindex 8906aa3ec..557e79073 100644--- a/plugins/web-ui/test/new-chat-placement.test.ts+++ b/plugins/web-ui/test/new-chat-placement.test.ts@@ -13,8 +13,8 @@ interface Canvas {splitTile: (index: number) => void;seededChat: (threadRef?: string) => Conversation | null;drag: () => void;- closeTile: (index: number) => void;- split: () => void;+ closeTile: (index: number) => Promise<void>;+ split: () => Promise<void>;switchAway: () => void;}@@ -142,15 +142,22 @@ async function withCanvas(tiles: () => document.querySelectorAll(".dv-groupview").length,newChat: () => sessions.startNewChat() !== null,seededChat: (threadRef) => sessions.startNewChat(null, null, threadRef),- split: () =>- document.querySelector<HTMLButtonElement>('[aria-label="Split this pane with a new session"]')!.click(),+ split: async () => {+ split.beginSessionDrag({ id: "second", threadRef: "web:tester:second" });+ const target = document.querySelector(".split-zone.zone-right");+ assert.ok(target, "single views enter multiview through drag-and-drop");+ target.dispatchEvent(new dom.window.Event("drop", { bubbles: true, cancelable: true }));+ await new Promise((resolve) => setTimeout(resolve, 0));+ },drag: () => split.beginSessionDrag({ id: "second", threadRef: "web:tester:second" }),- closeTile: (index) =>+ closeTile: async (index) => {document.querySelectorAll(".dv-groupview").item(index)!.querySelector<HTMLButtonElement>('[aria-label="Close pane"]')!- .click(),+ .click();+ await new Promise((resolve) => setTimeout(resolve, 0));+ },switchAway: () => {appState.currentView = "crons";appState.mainEl.replaceChildren();@@ -168,13 +175,13 @@ async function withCanvas(}test("New chat stops splitting after three tiles and adds tabs to the selected pane", async () => {- await withCanvas((canvas) => {+ await withCanvas(async (canvas) => {assert.deepEqual([canvas.panes(), canvas.tiles()], [1, 1]);assert.equal(canvas.newChat(), true);assert.deepEqual([canvas.panes(), canvas.tiles()], [1, 1], "one session: New chat replaces it");- canvas.split();+ await canvas.split();assert.deepEqual([canvas.panes(), canvas.tiles()], [2, 2]);assert.equal(canvas.newChat(), true);@@ -197,14 +204,14 @@ test("New chat stops splitting after three tiles and adds tabs to the selected p});test("a seeded New chat hands back the conversation in the pane it just placed", async () => {- await withCanvas((canvas) => {+ await withCanvas(async (canvas) => {const first = canvas.seededChat();assert.ok(first, "the canvas must return a live conversation to seed");assert.ok(first.state.threadRef, "…already mounted on its own new thread");assert.ok(first.state.agent, "…with an agent a caller can prompt");assert.deepEqual([canvas.panes(), canvas.tiles()], [1, 1], "one session: it replaces that pane");- canvas.split();+ await canvas.split();const second = canvas.seededChat();assert.ok(second);assert.notEqual(second.state.threadRef, first.state.threadRef, "each one is its own conversation");@@ -213,8 +220,8 @@ test("a seeded New chat hands back the conversation in the pane it just placed",});test("seeded chats return from another view without losing the grid or supplied thread", async () => {- await withCanvas((canvas) => {- canvas.split();+ await withCanvas(async (canvas) => {+ await canvas.split();canvas.switchAway();const thread = "web:tester:app-edit:example";const conv = canvas.seededChat(thread);@@ -225,8 +232,8 @@ test("seeded chats return from another view without losing the grid or supplied});test("new chat replaces the focused conversation at capacity without dropping the grid", async () => {- await withCanvas((canvas) => {- canvas.split();+ await withCanvas(async (canvas) => {+ await canvas.split();for (let i = 2; i < 12; i++) assert.equal(canvas.newChat(), true);assert.deepEqual([canvas.panes(), canvas.tiles()], [12, 3]);assert.ok(canvas.seededChat()?.state.agent);@@ -243,7 +250,7 @@ test("a restored tab-only arrangement gains a tab, not a tile", async () => {});test("a drafted first pane survives splitting and closing its neighbor", async () => {- await withCanvas((canvas) => {+ await withCanvas(async (canvas) => {const first = canvas.seededChat()!;first.composer.state.draft = "Keep this unsent draft";const host = first.state.host;@@ -251,39 +258,44 @@ test("a drafted first pane survives splitting and closing its neighbor", async (const thread = first.state.threadRef;canvas.drag();assert.equal(document.querySelectorAll(".split-zone.zone-right").length, 1);- canvas.split();+ await canvas.split();assert.deepEqual([canvas.panes(), canvas.tiles()], [2, 2]);assert.equal(first.state.host, host);assert.equal(first.state.agent, agent);assert.equal(first.state.threadRef, thread);assert.equal(first.composer.state.draft, "Keep this unsent draft");- canvas.closeTile(1);+ await canvas.closeTile(1);assert.deepEqual([canvas.panes(), canvas.tiles()], [1, 1]);assert.ok(host?.isConnected);assert.equal(first.state.agent, agent);assert.equal(first.composer.state.draft, "Keep this unsent draft");- canvas.closeTile(0);- assert.deepEqual([canvas.panes(), canvas.tiles()], [1, 1], "closing the last pane leaves a new chat");+ assert.equal(+ document.querySelector('.split-pane-actions [aria-label="Close pane"]'),+ null,+ "single view has no group close control",+ );+ assert.ok(canvas.newChat());+ assert.deepEqual([canvas.panes(), canvas.tiles()], [1, 1], "New chat replaces the last pane");});});test("a saved one-pane layout restores as a splittable canvas", async () => {- await withCanvas((canvas) => {+ await withCanvas(async (canvas) => {assert.deepEqual([canvas.panes(), canvas.tiles()], [1, 1]);- canvas.split();+ await canvas.split();assert.deepEqual([canvas.panes(), canvas.tiles()], [2, 2]);}, "single");});test("splitting does not dispose a first turn waiting for its session ID", async () => {- await withCanvas((canvas) => {+ await withCanvas(async (canvas) => {const first = canvas.seededChat()!;first.state.pendingSend = "pending-test-send";const agent = first.state.agent!;canvas.drag();assert.ok(document.querySelector(".zone-right"));- canvas.split();- canvas.closeTile(1);+ await canvas.split();+ await canvas.closeTile(1);assert.deepEqual([canvas.panes(), canvas.tiles()], [1, 1]);assert.equal(first.state.agent, agent);assert.equal(first.state.pendingSend, "pending-test-send");diff --git a/plugins/web-ui/test/single-view-navigation.test.ts b/plugins/web-ui/test/single-view-navigation.test.tsnew file mode 100644index 000000000..efa6be185--- /dev/null+++ b/plugins/web-ui/test/single-view-navigation.test.ts@@ -0,0 +1,165 @@+import assert from "node:assert/strict";+import { readFileSync } from "node:fs";+import test from "node:test";+import { runInNewContext } from "node:vm";+import ts from "typescript";+import { deepLinkPath } from "../src/deep-link.ts";++const split = readFileSync(new URL("../src/split.ts", import.meta.url), "utf8");+const shell = readFileSync(new URL("../src/shell.ts", import.meta.url), "utf8");+const functionSource = (source: string, name: string): string => {+ const match = source.match(new RegExp(`(?:export )?function ${name}\\([^]*?\\n\\}`));+ assert.ok(match);+ return match[0].replace("export ", "");+};+const compile = (source: string): string =>+ ts.transpileModule(source, {+ compilerOptions: { target: ts.ScriptTarget.ES2022, module: ts.ModuleKind.None },+ }).outputText;++test("single-pane navigation follows the pane identity without depending on the session list", () => {+ const dockApi = { panels: [] as { params: { sessionId?: string; appId?: string } }[] };+ const splitState = { active: true };+ const appState = { currentView: "chats" };+ let url = "/";+ const sync = runInNewContext(+ compile(+ `${functionSource(split, "singlePaneSessionId")}\n${functionSource(shell, "syncUrlFromState")}\nsyncUrlFromState;`,+ ),+ {+ dockApi,+ splitState,+ appState,+ mainConversation: () => ({ state: { sessionId: "stale-main-session" } }),+ panelParams: (panel: { params: object }) => panel.params,+ paneKindEntry: (params: { appId?: string }) => params.appId,+ contextsState: { selected: null },+ UI_BASE: "",+ deepLinkPath,+ location: {+ get pathname() {+ return url;+ },+ search: "",+ },+ history: {+ replaceState: (_state: unknown, _title: string, next: string) => {+ url = next;+ },+ },+ },+ ) as (override?: string | null) => void;+ dockApi.panels = [{ params: { sessionId: "first" } }];+ sync();+ assert.equal(url, "/s/first");+ dockApi.panels = [{ params: { sessionId: "second" } }];+ sync("stale-override");+ assert.equal(url, "/s/second");+ dockApi.panels.push({ params: { sessionId: "third" } });+ sync();+ assert.equal(url, "/");+ dockApi.panels.shift();+ sync();+ assert.equal(url, "/s/third");+ dockApi.panels = [{ params: {} }];+ sync();+ assert.equal(url, "/");+ dockApi.panels[0]!.params.sessionId = "created";+ sync();+ assert.equal(url, "/s/created");+ dockApi.panels = [{ params: { appId: "app", sessionId: "unrelated" } }];+ sync();+ assert.equal(url, "/");+ appState.currentView = "files";+ sync();+ assert.equal(url, "/files");+ appState.currentView = "chats";+ splitState.active = false;+ sync("phone-session");+ assert.equal(url, "/s/phone-session");+});++test("background canvas updates preserve non-chat detail routes", () => {+ const layout = split.match(/api\.onDidLayoutChange\(\(\) => \{([^]*?)\n {2}\}\);/)?.[1];+ assert.ok(layout);+ for (const source of [functionSource(split, "refreshHeaders"), `function refreshHeaders() {${layout}\n}`]) {+ const appState = { currentView: "crons" };+ let syncs = 0;+ const refresh = runInNewContext(compile(`${source}\nrefreshHeaders;`), {+ appState,+ syncUrlFromState: () => {+ syncs++;+ },+ headerSignature: "",+ computeHeaderSignature: () => "",+ syncDocumentTitle: () => {},+ paneTabs: [],+ groupActions: [],+ paneContents: new Map(),+ host: { classList: { contains: () => true, toggle: () => {} } },+ api: { panels: [{}], groups: [] },+ paneDrag: null,+ persistSoon: () => {},+ }) as () => void;+ for (const view of ["crons", "webhooks", "inbox", "skills", "contexts"]) {+ appState.currentView = view;+ refresh();+ assert.equal(syncs, 0, `${view} detail URL must stay intact`);+ }+ appState.currentView = "chats";+ refresh();+ assert.equal(syncs, 1);+ }+});++test("single and multiview headers render mutually exclusive tools and pane controls", () => {+ const source = split.slice(split.indexOf("class GroupActions"), split.indexOf("function notePaneSession"));+ let output = "";+ const dockApi = { panels: [{}], groups: [{ id: "group", activePanel: null, panels: [] }] };+ const flatten = (value: unknown): string => {+ if (Array.isArray(value)) return value.map(flatten).join("");+ if (typeof value === "function") return "";+ return String(value ?? "");+ };+ const html = (strings: TemplateStringsArray, ...values: unknown[]): string =>+ strings.reduce((result, part, i) => result + part + flatten(values[i]), "");+ const actions = runInNewContext(compile(`${source}\nnew GroupActions();`), {+ document: { createElement: () => ({}), addEventListener: () => {} },+ groupActions: new Set(),+ dockApi,+ html,+ nothing: "",+ render: (value: string) => {+ output = value;+ },+ paneScopeId: () => null,+ paneKindEntry: () => null,+ PANE_TOOLS: ["Crons", "Files", "Apps", "Skills", "Memory", "Your keychain"].map((label) => ({+ label,+ tool: label,+ glyph: label,+ })),+ icon: () => "",+ tip: () => "",+ ref: () => "",+ Plus: "",+ Maximize2: "",+ X: "",+ MoreHorizontal: "",+ Shrink: "",+ Expand: "",+ }) as { init: (props: unknown) => void; draw: () => void; menuOpen: boolean };+ actions.init({ group: { id: "group" }, api: { isMaximized: () => false } });+ assert.equal((output.match(/class="session-tool"/g) ?? []).length, 6);+ assert.doesNotMatch(output, /split-tools-btn|Split this pane|Open full screen|Close pane/);+ dockApi.panels.push({});+ actions.draw();+ assert.doesNotMatch(output, /class="session-tool"/);+ for (const label of ["Tools", "Split this pane with a new session", "Open full screen", "Close pane"])+ assert.ok(output.includes(`aria-label="${label}"`) || output.includes(`aria-label=${label}`));+ actions.menuOpen = true;+ dockApi.panels.pop();+ actions.draw();+ assert.equal(actions.menuOpen, false);+ assert.doesNotMatch(output, /split-tools-btn|role="menu"|Close pane/);+});