v1
", title: "Doc", agent: "e2e" }); await page.goto(server.url); - const input = page.locator(".composer input"); + const card = page.locator(".card:not(#sessionThread)"); + const input = card.locator(".composer input"); await input.fill("ship it"); await input.press("Enter"); // renders in the thread (via SSE) and is persisted server-side - await expect(page.locator(".cmt .txt")).toHaveText("ship it"); - await expect(page.locator(".cmt .who")).toHaveText("you"); + await expect(card.locator(".cmt .txt")).toHaveText("ship it"); + await expect(card.locator(".cmt .who")).toHaveText("you"); await expect .poll(async () => { const res = await fetch(`${server.url}/api/comments?snippet=${snippet.id}`); @@ -46,6 +47,45 @@ test("comment typed in the composer round-trips to the API", async ({ page, serv .toContain("ship it"); }); +test("session thread shows snippet-less comments and messages the agent", async ({ + page, + server, +}) => { + const snippet = await publish(server.url, { html: "x
", title: "Doc", agent: "e2e" }); + + await page.goto(server.url); + const thread = page.locator("#sessionThread"); + await expect(thread).toBeVisible(); + + // an agent comment with no snippet attached (sideshow comment without --snippet) + await fetch(`${server.url}/api/comments`, { + method: "POST", + headers: { "content-type": "application/json" }, + body: JSON.stringify({ session: snippet.sessionId, text: "agent note", author: "e2e" }), + }); + await expect(thread.locator(".cmt .txt")).toHaveText("agent note"); + + // the user can reply without picking a snippet; it lands as a user comment + const input = thread.locator(".composer input"); + await input.fill("user note"); + await input.press("Enter"); + await expect(thread.locator(".cmt .txt")).toHaveText(["agent note", "user note"]); + await expect + .poll(async () => { + const res = await fetch( + `${server.url}/api/comments?session=${snippet.sessionId}&author=user`, + ); + const data = (await res.json()) as { comments: { snippetId: string | null; text: string }[] }; + return data.comments.filter((c) => !c.snippetId).map((c) => c.text); + }) + .toContain("user note"); + + // snippets published later still appear above the session thread + await publish(server.url, { html: "y
", title: "Later", session: snippet.sessionId }); + await expect(page.locator("#stream > .card").last()).toHaveId("sessionThread"); + await expect(page.locator("#stream > .card")).toHaveCount(3); +}); + test("version select appears live after an update", async ({ page, server }) => { const snippet = await publish(server.url, { html: "v1
", title: "Doc", agent: "e2e" }); diff --git a/guide/AGENT_SETUP.md b/guide/AGENT_SETUP.md index b2973ec..a0b5fa1 100644 --- a/guide/AGENT_SETUP.md +++ b/guide/AGENT_SETUP.md @@ -21,11 +21,20 @@ snippet instead of posting a new one: curl -s -X PUT http://localhost:4242/api/snippets/v1
", title: "Doc" })) + ).json()) as any; + assert.equal(s.userFeedback, undefined); + + // the user comments while the agent works on something else + await app.request("/api/comments", json({ snippet: s.id, text: "wrong color", author: "user" })); + await app.request("/api/comments", json({ session: s.sessionId, text: "also add a key" })); + + // the agent's next write carries the feedback + const updated = (await ( + await app.request(`/api/snippets/${s.id}`, { ...json({ html: "v2
" }), method: "PUT" }) + ).json()) as any; + assert.deepEqual( + updated.userFeedback.map((f: any) => f.text), + ["wrong color", "also add a key"], + ); + assert.equal(updated.userFeedback[0].snippetTitle, "Doc"); + + // delivered once — the next write is clean + const again = (await ( + await app.request(`/api/snippets/${s.id}`, { ...json({ html: "v3
" }), method: "PUT" }) + ).json()) as any; + assert.equal(again.userFeedback, undefined); + + // agent replies piggyback too; the user's own comments never do + await app.request("/api/comments", json({ snippet: s.id, text: "more", author: "user" })); + const userPost = (await ( + await app.request("/api/comments", json({ snippet: s.id, text: "and more", author: "user" })) + ).json()) as any; + assert.equal(userPost.userFeedback, undefined); + const reply = (await ( + await app.request("/api/comments", json({ snippet: s.id, text: "on it", author: "claude" })) + ).json()) as any; + assert.deepEqual( + reply.userFeedback.map((f: any) => f.text), + ["more", "and more"], + ); +}); + +test("a consumed wait is not re-delivered as piggyback", async () => { + const app = makeApp(); + const s = (await (await app.request("/api/snippets", json({ html: "x
" }))).json()) as any; + await app.request( + "/api/comments", + json({ snippet: s.id, text: "seen via wait", author: "user" }), + ); + + // the agent receives it through the long-poll... + const waited = (await ( + await app.request(`/api/comments?session=${s.sessionId}&author=user`) + ).json()) as any; + assert.equal(waited.comments.length, 1); + + // ...so the next write carries nothing + const updated = (await ( + await app.request(`/api/snippets/${s.id}`, { ...json({ html: "v2
" }), method: "PUT" }) + ).json()) as any; + assert.equal(updated.userFeedback, undefined); + + // the viewer's unfiltered reads do NOT consume the cursor + await app.request("/api/comments", json({ snippet: s.id, text: "fresh", author: "user" })); + await app.request(`/api/comments?session=${s.sessionId}`); // viewer-style read + const next = (await ( + await app.request(`/api/snippets/${s.id}`, { ...json({ html: "v3
" }), method: "PUT" }) + ).json()) as any; + assert.deepEqual( + next.userFeedback.map((f: any) => f.text), + ["fresh"], + ); +}); + +test("mcp publish result carries userFeedback", async () => { + const app = makeApp(); + const published = (await ( + await app.request( + "/mcp", + mcpCall(1, "tools/call", { + name: "publish_snippet", + arguments: { title: "One", html: "1
", agent: "mcp-agent" }, + }), + ) + ).json()) as any; + const first = JSON.parse(published.result.content[0].text); + await app.request("/api/comments", json({ snippet: first.id, text: "neat", author: "user" })); + + const second = (await ( + await app.request( + "/mcp", + mcpCall(2, "tools/call", { + name: "publish_snippet", + arguments: { title: "Two", html: "2
", session: first.sessionId }, + }), + ) + ).json()) as any; + const payload = JSON.parse(second.result.content[0].text); + assert.deepEqual( + payload.userFeedback.map((f: any) => f.text), + ["neat"], + ); +}); + test("rejects empty and oversized html", async () => { const app = makeApp(); assert.equal((await app.request("/api/snippets", json({ html: "" }))).status, 400); diff --git a/test/jsonFileStore.test.ts b/test/jsonFileStore.test.ts index ccc74df..5c24e62 100644 --- a/test/jsonFileStore.test.ts +++ b/test/jsonFileStore.test.ts @@ -23,8 +23,11 @@ test("JsonFileStore: data survives a reload from disk", async () => { text: "hi", }); + await store.markAgentSeen(session.id, 1); + const reloaded = new JsonFileStore(path); assert.equal((await reloaded.getSession(session.id))?.title, "Persisted"); + assert.equal((await reloaded.getSession(session.id))?.agentSeq, 1); const got = await reloaded.getSnippet(snippet?.id ?? ""); assert.equal(got?.version, 2); assert.equal(got?.history.length, 1); diff --git a/test/storeContract.ts b/test/storeContract.ts index 16550ab..a22cd4c 100644 --- a/test/storeContract.ts +++ b/test/storeContract.ts @@ -67,6 +67,23 @@ export function runStoreContract(name: string, makeStore: () => Store | Promise< ); }); + contract("tracks the delivered-to-agent comment cursor", async (store) => { + const session = await store.createSession({ agent: "pi" }); + assert.equal(session.agentSeq, 0); + + await store.markAgentSeen(session.id, 5); + assert.equal((await store.getSession(session.id))?.agentSeq, 5); + + // never moves backwards + await store.markAgentSeen(session.id, 3); + assert.equal((await store.getSession(session.id))?.agentSeq, 5); + await store.markAgentSeen(session.id, 9); + assert.equal((await store.getSession(session.id))?.agentSeq, 9); + + // unknown session is a no-op, not an error + await store.markAgentSeen("missing", 1); + }); + contract("removeSession returns false for unknown ids", async (store) => { assert.equal(await store.removeSession("missing"), false); const session = await store.createSession({ agent: "pi" }); diff --git a/viewer/index.html b/viewer/index.html index 6831895..f67ee3b 100644 --- a/viewer/index.html +++ b/viewer/index.html @@ -596,8 +596,46 @@