repositories / pi-ext

pi-ext

bugabingas pi extensions

owned by bugabinga

Hide ui startup chatter from stream

27aad9c7d0d13e221f4d7a62d3f603c805974096

Oliver Krylow <o.krylow@isp-insoft.de> ·

unsigned

Browse filesCompare with HEAD

Changed files (8)

extensions/ui/__tests__/rendering.test.ts

Modified
1 1 import { describe, expect, it } from "vitest";
2 +import { renderAppJs } from "../web/app.js";
2 3 import {
3 4 renderCodeBlockComponentJs,
4 5 renderPlainCodeBlock,
31 32 expect(renderDiffViewJs()).toContain("import('pierre')");
35 + it("keeps internal runtime chatter out of the main stream", () => {
36 + const js = renderAppJs();
37 + expect(js).toContain("isStreamEvent(event)");
38 + expect(js).toContain("event.type === 'message'");
39 + expect(js).toContain("event.type === 'ui_request'");
40 + expect(js).not.toContain("JSON.stringify(event)");
41 + });

extensions/ui/__tests__/runtime.test.ts

Modified
5 5 import { Writable } from "node:stream";
6 6 import { afterEach, describe, expect, it } from "vitest";
7 7 import { openBrowser, openerCandidates } from "../open";
8 -import { createUiRuntime, type UiRuntime } from "../runtime";
8 +import { createUiRuntime, normalizeRpcEvent, type UiRuntime } from "../runtime";
10 10 describe("ui browser opener", () => {
11 11 it("uses platform openers", () => {
64 +describe("ui rpc event normalization", () => {
65 + it("drops unknown rpc startup chatter", () => {
66 + expect(
67 + normalizeRpcEvent({ type: "startup_log", message: "builtin-tools" }),
68 + ).toBeUndefined();
69 + });
70 +});
64 72 describe("ui runtime", () => {
65 73 it("starts, reports status, redraws QR, and stops", async () => {
66 74 const runtime = await createUiRuntime({

extensions/ui/__tests__/server.test.ts

Modified
63 63 expect(authorized.status).toBe(200);
64 64 expect(authorized.headers.get("set-cookie")).toContain("pi_ui_token=tok");
65 65 expect(authorized.headers.get("set-cookie")).toContain("SameSite=Strict");
66 - expect(await authorized.text()).toContain("Pi UI shell");
66 + const body = await authorized.text();
67 + expect(body).toContain("<title>Pi UI</title>");
68 + expect(body).toContain('id="ui-composer"');
67 69 } finally {
68 70 await server.close("test");

extensions/ui/runtime.ts

Modified
97 97 options.onChange?.();
99 99 onEvent(event) {
100 - publish(normalizeRpcEvent(event));
100 + const normalized = normalizeRpcEvent(event);
101 + if (normalized) publish(normalized);
375 376 return "rpc-starting";
378 -function normalizeRpcEvent(
379 +export function normalizeRpcEvent(
379 380 event: unknown,
380 -): Parameters<EventStore["append"]>[0] {
381 +): Parameters<EventStore["append"]>[0] | undefined {
381 382 if (isExtensionUiRequest(event)) return extensionUiEventFromRequest(event);
382 383 if (isRpcMessageUpdate(event)) {
383 384 return {
398 399 name: event.toolName,
401 - return { type: "log", level: "info", message: JSON.stringify(event) };
402 + return undefined;
404 405 function isRpcMessageUpdate(

extensions/ui/scripts/phase1-smoke.mjs

Modified
67 67 const page = await browser.newPage();
68 68 await page.goto(url);
69 69 await page.waitForSelector("#ui-shell");
70 - const text = await page.locator("#ui-stream").innerText();
71 - if (!text.includes("Pi UI shell"))
72 - throw new Error("Browser shell text missing");
73 - return text;
70 + await page.waitForSelector("#ui-composer");
71 + return await page.locator("#ui-status").innerText();
74 72 } finally {
75 73 await browser.close();

extensions/ui/scripts/zellij-smoke.mjs

Modified
180 180 const page = await browser.newPage();
181 181 await page.goto(url);
182 182 await page.waitForSelector("#ui-shell");
183 - const text = await page.locator("#ui-stream").innerText();
184 - if (!text.includes("Pi UI shell"))
185 - throw new Error("Browser shell text missing");
186 - return text;
183 + await page.waitForSelector("#ui-composer");
184 + return await page.locator("#ui-status").innerText();
187 185 } finally {
188 186 await browser.close();

extensions/ui/web/app.html.ts

Modified
11 11 <body>
12 12 <div id="ui-shell">
13 13 <header id="ui-status">starting</header>
14 -<main id="ui-stream" aria-live="polite"><h1>Pi UI shell</h1></main>
14 +<main id="ui-stream" aria-live="polite"></main>
15 15 <details id="ui-digest">digest empty</details>
16 16 <form id="ui-composer">
17 17 <div id="ui-input-wrap">

extensions/ui/web/app.js.ts

Modified
88 88 const synthetic = event.id > 9_000_000_000_000_000;
89 89 if (!synthetic && event.id <= lastEventId) continue;
90 90 if (!synthetic) lastEventId = event.id;
91 + applyInternalEvent(event);
92 + if (!isStreamEvent(event)) continue;
91 93 const row = document.createElement('article');
92 94 row.className = 'ui-event ui-event-' + (event.role || event.type);
93 95 row.dataset.eventId = String(event.id);
94 - const eventText = event.text || event.message || event.state || JSON.stringify(event);
96 + const eventText = event.text || event.message || event.state || '';
95 97 applyLongOutput(row, String(event.id), String(eventText));
96 98 const fence = String.fromCharCode(96).repeat(3);
97 99 if (typeof eventText === 'string' && eventText.startsWith(fence)) {
113 115 stream.scrollTop = stream.scrollHeight;
118 +function applyInternalEvent(event) {
119 + if (event.type === 'state') status.textContent = event.state;
120 + if (event.type === 'log' && event.level === 'error') status.textContent = event.message;
123 +function isStreamEvent(event) {
124 + return event.type === 'message'
125 + || event.type === 'tool'
126 + || event.type === 'error'
127 + || event.type === 'ui_request'
128 + || event.type === 'ui_notify'
129 + || String(event.type || '').startsWith('widget_');
116 132 input.addEventListener('input', renderCommandMenu);
117 133 input.addEventListener('keydown', event => {
118 134 const action = composerKeyAction({