Multiplayer agent harness for work.
Disable composer submission while a turn is stopping (#1321)
Joshua France8cacadeb08db
diff --git a/plugins/web-ui/src/composer.ts b/plugins/web-ui/src/composer.tsindex d33d6370c..885b2906c 100644--- a/plugins/web-ui/src/composer.ts+++ b/plugins/web-ui/src/composer.ts@@ -739,7 +739,6 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {${icon(ArrowUp, 16)}</button>`;}- const canQueue = Boolean(composerState.draft.trim() || composerState.attachments.length);return html`<buttonclass="stop-btn"@@ -756,7 +755,7 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {type="submit"${tip("Queue for after this turn")}aria-label="Queue for after this turn"- ?disabled=${!canQueue}+ ?disabled=${!composerCanSend()}>${icon(ArrowUp, 16)}</button>@@ -1811,6 +1810,7 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {return (Boolean(composerState.draft.trim() || composerState.attachments.length) &&!composerState.processingFiles &&+ !ctx.chat.isStopping() &&getRuntimeConfig(scopeKey()) !== null &&ctx.chat.state.resolvingApprovals.size === 0 &&!ctx.chat.hasUnresolvedApproval()@@ -1820,10 +1820,7 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {function syncComposerControls(agent: Agent): void {if (!ctx.chat.state.host || agent !== ctx.chat.state.agent) return;const send = ctx.chat.state.host.querySelector<HTMLButtonElement>(".send-btn");- if (send)- send.disabled = agent.state.isStreaming- ? !composerState.draft.trim() && !composerState.attachments.length- : !composerCanSend();+ if (send) send.disabled = !composerCanSend();}function clearComposerDom(agent: Agent): void {@@ -2082,15 +2079,10 @@ export function createComposerSurface(ctx: ConvCtx): ComposerSurface {}async function sendPrompt(agent: Agent): Promise<void> {- if (!currentModelOption()) return;- if (composerState.processingFiles) return;- if (!getRuntimeConfig(scopeKey())) return;+ if (!composerCanSend()) return;if (composerState.pasteView) closePasteView(agent);- if (ctx.chat.state.resolvingApprovals.size > 0) return;- if (ctx.chat.hasUnresolvedApproval()) return;if (agent.state.isStreaming) return queueDraft(agent);const text = composerState.draft.trim();- if (!text && composerState.attachments.length === 0) return;if (ctx.chat.state.threadRef) {bumpSessionActivity(ctx.chat.state.threadRef);ctx.chat.state.pendingSend = ctx.chat.state.threadRef;diff --git a/plugins/web-ui/src/shell.css b/plugins/web-ui/src/shell.cssindex 4ad9b9226..c2bf0e257 100644--- a/plugins/web-ui/src/shell.css+++ b/plugins/web-ui/src/shell.css@@ -4195,7 +4195,8 @@ qm-markdown .tok-in {outline: 2px solid color-mix(in srgb, var(--foreground) 35%, transparent);outline-offset: 3px;}-.send-btn:disabled {+.send-btn:disabled,+.stop-btn:disabled {opacity: 0.35;cursor: not-allowed;}diff --git a/plugins/web-ui/test/composer-stopping.test.ts b/plugins/web-ui/test/composer-stopping.test.tsnew file mode 100644index 000000000..cde327a48--- /dev/null+++ b/plugins/web-ui/test/composer-stopping.test.ts@@ -0,0 +1,205 @@+import assert from "node:assert/strict";+import test from "node:test";+import { readFileSync } from "node:fs";+import type { Agent } from "@earendil-works/pi-agent-core";+import { JSDOM } from "jsdom";+import { createServer } from "vite";+import type { ComposerSurface, ConvCtx } from "../src/conv-types.ts";++test("stopping blocks send and queue through render, input, keyboard, and form without blocking drafting", async (t) => {+ const dom = new JSDOM('<!doctype html><div id="app"></div><div id="composer"></div>', {+ url: "http://localhost/",+ pretendToBeVisual: true,+ });+ Object.defineProperty(dom.window, "matchMedia", {+ value: () => ({ matches: false, addEventListener() {}, removeEventListener() {} }),+ });+ const requests: string[] = [];+ const globals = {+ window: dom.window,+ document: dom.window.document,+ location: dom.window.location,+ history: dom.window.history,+ localStorage: dom.window.localStorage,+ navigator: dom.window.navigator,+ HTMLElement: dom.window.HTMLElement,+ HTMLInputElement: dom.window.HTMLInputElement,+ HTMLTextAreaElement: dom.window.HTMLTextAreaElement,+ Element: dom.window.Element,+ Node: dom.window.Node,+ Event: dom.window.Event,+ customElements: dom.window.customElements,+ getComputedStyle: dom.window.getComputedStyle.bind(dom.window),+ requestAnimationFrame: dom.window.requestAnimationFrame.bind(dom.window),+ cancelAnimationFrame: dom.window.cancelAnimationFrame.bind(dom.window),+ fetch: async (input: RequestInfo | URL) => {+ requests.push(String(input));+ return Response.json({ runId: "queued-test", sessions: [] });+ },+ };+ const descriptors = new Map<string, PropertyDescriptor | undefined>();+ for (const [key, value] of Object.entries(globals)) {+ descriptors.set(key, Object.getOwnPropertyDescriptor(globalThis, key));+ Object.defineProperty(globalThis, key, { configurable: true, writable: true, value });+ }+ const vite = await createServer({ server: { middlewareMode: true, hmr: false }, appType: "custom" });+ let composer: ComposerSurface | undefined;+ try {+ const { appState } = await vite.ssrLoadModule("/src/shell-state.ts");+ const { createComposerSurface } = await vite.ssrLoadModule("/src/composer.ts");+ const { seedRuntimeConfig } = await vite.ssrLoadModule("/src/runtime-config-store.ts");+ const { render } = await vite.ssrLoadModule("lit");+ appState.me = { user: "tester", org: "test" };+ const model = {+ id: "alpha",+ name: "Alpha",+ label: "Alpha",+ buttonLabel: "Alpha",+ provider: "openai",+ api: "openai-responses",+ reasoning: true,+ input: ["text"],+ cost: { input: 0, output: 0, cacheRead: 0, cacheWrite: 0 },+ contextWindow: 100_000,+ maxTokens: 4096,+ };+ seedRuntimeConfig("personal:tester", {+ scopeId: "personal:tester",+ approvedHarnesses: ["pi"],+ modelsByHarness: { pi: ["alpha"] },+ modelCatalog: { alpha: model },+ orgDefault: { harnessId: "pi", modelId: "alpha", revision: 1 },+ effective: { harnessId: "pi", modelId: "alpha" },+ scopeOverride: null,+ upgradeAvailable: false,+ });+ const host = document.querySelector<HTMLElement>("#composer")!;+ let stopping = false;+ let prompts = 0;+ let stops = 0;+ const agentState = { isStreaming: true, model, messages: [] };+ const agent = {+ state: agentState,+ prompt: async () => {+ prompts++;+ },+ } as unknown as Agent;+ const draw = (): void => render(composer!.composerForm(agent), host);+ const ctx = {+ pane: false,+ chat: {+ state: {+ agent,+ host,+ threadRef: "web:tester:stopping",+ sessionId: "test-session",+ scopeId: null,+ resolvingApprovals: new Set<string>(),+ },+ activePendingApprovals: () => [],+ hasUnresolvedApproval: () => false,+ isStopping: () => stopping,+ drawActiveChat: draw,+ stopLiveRun: async () => {+ stops++;+ stopping = true;+ draw();+ },+ notePendingSessionOnSend() {},+ scrollToBottom() {},+ },+ } as unknown as ConvCtx;+ composer = createComposerSurface(ctx);+ ctx.composer = composer!;+ const button = (selector: string): HTMLButtonElement => host.querySelector<HTMLButtonElement>(selector)!;+ const type = (value: string): void => {+ const input = host.querySelector<HTMLTextAreaElement>("textarea")!;+ input.value = value;+ input.dispatchEvent(new dom.window.Event("input", { bubbles: true }));+ };+ composer!.state.draft = "Keep this draft";+ draw();+ assert.equal(button(".send-btn").disabled, false);+ button(".stop-btn").click();+ assert.equal(stops, 1);+ assert.equal(button(".stop-btn").disabled, true);+ button(".stop-btn").click();+ assert.equal(stops, 1, "stop cannot be clicked twice");+ await t.test("queue stays disabled after rendering and input", () => {+ assert.equal(button(".send-btn").disabled, true);+ type("Edited while stopping");+ assert.equal(composer!.state.draft, "Edited while stopping");+ assert.equal(host.querySelector<HTMLTextAreaElement>("textarea")!.disabled, false);+ assert.equal(button(".send-btn").disabled, true);+ });+ for (const streaming of [true, false]) {+ agentState.isStreaming = streaming;+ composer!.state.draft = "Keep this draft";+ draw();+ await t.test(`${streaming ? "queue" : "send"} remains blocked for input and every submit path`, async () => {+ type("Edited while stopping");+ const disabled = button(".send-btn").disabled;+ for (const modifiers of [{}, { ctrlKey: true }, { metaKey: true }]) {+ host+ .querySelector("textarea")!+ .dispatchEvent(+ new dom.window.KeyboardEvent("keydown", { key: "Enter", bubbles: true, cancelable: true, ...modifiers }),+ );+ }+ host.querySelector("form")!.dispatchEvent(new dom.window.Event("submit", { bubbles: true, cancelable: true }));+ await new Promise((resolve) => setTimeout(resolve, 20));+ const actual = { disabled, draft: composer!.state.draft, prompts, requests: requests.length };+ console.log("stopping probe", streaming, actual);+ assert.deepEqual(actual, { disabled: true, draft: "Edited while stopping", prompts: 0, requests: 0 });+ });+ }+ composer!.state.draft = "";+ const attachment = {+ id: "test-file",+ type: "document" as const,+ fileName: "draft.txt",+ mimeType: "text/plain",+ size: 1,+ content: "eA==",+ };+ composer!.state.attachments = [attachment];+ draw();+ assert.equal(button(".send-btn").disabled, true, "attachment-only send remains blocked");+ host.querySelector("form")!.dispatchEvent(new dom.window.Event("submit", { cancelable: true }));+ assert.deepEqual(composer!.state.attachments, [attachment], "stopping preserves attachments");+ assert.equal(requests.length, 0);+ composer!.state.attachments = [];+ stopping = false;+ composer!.state.draft = "Resume sending";+ draw();+ assert.equal(button(".send-btn").disabled, false, "sending recovers after stop completes");+ host.querySelector("form")!.dispatchEvent(new dom.window.Event("submit", { cancelable: true }));+ await new Promise((resolve) => setTimeout(resolve, 20));+ assert.equal(prompts, 1, "normal submission still works");+ agentState.isStreaming = true;+ composer!.state.draft = "Queue normally";+ draw();+ assert.equal(button(".send-btn").disabled, false);+ host.querySelector("form")!.dispatchEvent(new dom.window.Event("submit", { cancelable: true }));+ await new Promise((resolve) => setTimeout(resolve, 20));+ assert.deepEqual(requests, ["/api/turn"], "normal queue submission still works");+ composer!.state.draft = "Preparing attachment";+ composer!.state.processingFiles = true;+ draw();+ assert.equal(button(".send-btn").disabled, true, "queue shares file-processing guard");+ } finally {+ composer?.dispose();+ await vite.close();+ dom.window.close();+ for (const [key, descriptor] of descriptors) {+ if (descriptor) Object.defineProperty(globalThis, key, descriptor);+ else delete (globalThis as Record<string, unknown>)[key];+ }+ }+});++// Match the same visual affordance as disabled Send, including the cursor.+test("disabled Stop shares Send's muted styling", () => {+ const css = readFileSync(new URL("../src/shell.css", import.meta.url), "utf8");+ assert.match(css, /\.send-btn:disabled,\s*\.stop-btn:disabled\s*\{[^}]*opacity: 0\.35;[^}]*cursor: not-allowed;/);+});diff --git a/plugins/web-ui/test/runtime-config-views.test.ts b/plugins/web-ui/test/runtime-config-views.test.tsindex 59b73212f..977edf218 100644--- a/plugins/web-ui/test/runtime-config-views.test.ts+++ b/plugins/web-ui/test/runtime-config-views.test.ts@@ -84,6 +84,7 @@ test("runtime defaults are shared while pane choices and editor drafts remain lostate: { scopeId, threadRef: `thread-${i}`, sessionId: `session-${i}`, agent, resolvingApprovals: new Set() },activePendingApprovals: () => [],hasUnresolvedApproval: () => false,+ isStopping: () => false,drawActiveChat: () => render(composer.composerForm(agent), host),},} as unknown as ConvCtx;