@cueloop/client 0.1.0-alpha.7 → 0.1.0-alpha.70

package/src/App.test.tsx

@@ -1,18 +1,26 @@
-/**
- * Virtual-terminal component tests (tier 2): the real App over a real
- * in-process daemon in a temp home. Char-frame assertions + mock keys -
- * the whole review loop drivable without a terminal.
- */
+/** Virtual-terminal component tests (tier 2): the real App over a real in-process daemon in a temp home. Char-frame assertions + mock keys - the whole review loop drivable without a terminal. */
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
 import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import React from "react";
-import { testRender } from "@opentui/react/test-utils";
 import { DaemonServer } from "@cueloop/daemon";
-import type { ReviewSession } from "@cueloop/schema";
+import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
+import {
+  clickText,
+  dragText,
+  frameRow,
+  isolateUserConfig,
+  locateText,
+  press,
+  pressKey,
+  renderReadyApp,
+  typeText as type,
+  waitForState,
+  waitForText,
+} from "./test-support";
 
 const PLAN = `# Migration Plan
 
@@ -27,139 +35,154 @@ The daemon persists sessions to disk atomically.
 `;
 
 let home: string;
+let restoreUserConfig: () => void;
 let server: DaemonServer;
-let session: ReviewSession;
+let session: Thread;
 
 beforeEach(() => {
   home = mkdtempSync(join(tmpdir(), "cueloop-app-"));
+  restoreUserConfig = isolateUserConfig(home);
   server = new DaemonServer({ home, idleExitMs: 0 });
   server.start();
   session = server.core.sessionCreate({
     workspace: { repoRoot: "/repo", branch: "main" },
-    artifact: { type: "plan", content: PLAN, meta: { title: "Migration Plan", planPath: "plan.md" } },
+    artifact: {
+      type: "plan",
+      content: PLAN,
+      meta: { title: "Migration Plan", planPath: "plan.md" },
+    },
   });
 });
 afterEach(() => {
+  restoreUserConfig();
   server.stop();
   rmSync(home, { recursive: true, force: true });
 });
 
 async function renderApp(sessionId?: string) {
-  const setup = await testRender(<App home={home} sessionId={sessionId ?? session.id} />, {
+  return renderReadyApp(<App home={home} sessionId={sessionId ?? session.id} />, {
     width: 120,
     height: 32,
   });
-  // let the async daemon connect + first fetch land
-  for (let i = 0; i < 40 && !setup.captureCharFrame().includes("cueloop"); i++) {
-    await Bun.sleep(25);
-    await setup.renderOnce();
-  }
-  await setup.renderOnce();
-  return setup;
-}
-
-type Setup = Awaited<ReturnType<typeof renderApp>>;
-
-/** Drive one key press: letters type as text; named keys use KeyCodes ids. */
-async function press(setup: Setup, k: string): Promise<void> {
-  if (k === "enter") setup.mockInput.pressKey("RETURN");
-  else if (k === "escape") setup.mockInput.pressKey("ESCAPE");
-  else if (k === "backspace") setup.mockInput.pressKey("BACKSPACE");
-  else if (k === "left") setup.mockInput.pressKey("ARROW_LEFT");
-  else if (k === "right") setup.mockInput.pressKey("ARROW_RIGHT");
-  else await type(setup, k);
-  await Bun.sleep(15);
-  await setup.renderOnce();
-}
-
-async function type(setup: Setup, text: string): Promise<void> {
-  await setup.mockInput.typeText(text);
-  await Bun.sleep(15);
-  await setup.renderOnce();
 }
 
 describe("plan rendering", () => {
-  test("renders the plan with headings, list markers, and the rail", async () => {
+  test("renders the plan with headings, list markers, and the footer", async () => {
+    // Arrange
     const setup = await renderApp();
+
+    // Assert
     const frame = setup.captureCharFrame();
+
     expect(frame).toContain("Migration Plan");
     expect(frame).toContain("Context");
     expect(frame).toContain("persists sessions to disk atomically");
-    expect(frame).toContain("- move the store");
-    expect(frame).toContain("REVIEW (0)");
-    expect(frame).toContain("Submit review (0)");
+    expect(frame).toContain("· move the store");
+    expect(frame).toContain("send message");
+  });
+
+  test("a direct open still populates the Threads sidebar with other pending reviews", async () => {
+    // Arrange - a second pending review exists alongside the one opened directly
+    server.core.sessionCreate({
+      workspace: { repoRoot: "/repo", branch: "main" },
+      artifact: { type: "plan", content: "# Other Plan\n", meta: { title: "Other Plan" } },
+    });
+    const setup = await renderApp();
+
+    // Act - open the collapsed Threads sidebar (the mirrored panel toggle by the gear)
+    await setup.mockMouse.click(4, 0);
+
+    // Assert - the sidebar lists the other pending review, so you can jump to it
+    await waitForText(setup, "Other Plan");
   });
 });
 
-describe("keyboard grammar", () => {
-  test("j/k moves the cursor glyph between blocks", async () => {
+describe("thread view grammar", () => {
+  test("↓ moves the caret between blocks and typing anchors to the block under it", async () => {
+    // Arrange
     const setup = await renderApp();
-    await press(setup, "j");
-    await press(setup, "j");
-    await setup.renderOnce();
-    const lines = setup.captureCharFrame().split("\n");
-    const cursorLine = lines.find((l) => l.includes("▎"))!;
-    expect(cursorLine).toContain("persists sessions");
+
+    // Act: two blocks down lands on the paragraph; a printable opens a draft there
+    await pressKey(setup, "ARROW_DOWN");
+    await pressKey(setup, "ARROW_DOWN");
+    await type(setup, "x");
+
+    // Assert: the draft card sits right under the paragraph's row
+    await waitForText(setup, "● x");
+    expect(frameRow(setup, "● x")).toBeGreaterThan(frameRow(setup, "persists sessions"));
+    expect(frameRow(setup, "● x")).toBeLessThan(frameRow(setup, "Steps"));
   });
 
-  test("comment flow: c types a body, ⏎ saves to the daemon", async () => {
+  test("comment flow: click a word, type a body, cmd+⏎ saves to the daemon", async () => {
+    // Arrange
     const setup = await renderApp();
-    await press(setup, "j");
-    await press(setup, "j");
-    await press(setup, "c");
-    await setup.renderOnce();
-    expect(setup.captureCharFrame()).toContain("COMMENT ON");
+
+    // Act
+    await clickText(setup, "daemon");
     await type(setup, "Define atomically.");
-    await press(setup, "enter");
-    await Bun.sleep(80);
-    await setup.renderOnce();
+    await pressKey(setup, "RETURN", { meta: true });
+
+    // Assert
+    await waitForState(setup, () => server.core.sessionGet(session.id).annotations.length === 1);
     const stored = server.core.sessionGet(session.id);
+
     expect(stored.annotations.length).toBe(1);
     expect(stored.annotations[0]!.body).toBe("Define atomically.");
-    expect(setup.captureCharFrame()).toContain("COMMENT");
+    expect(stored.annotations[0]!.anchor.quote).toBe("daemon");
   });
 
-  test("span mode: v + l selects words, c anchors the exact span", async () => {
+  test("a drag marks the exact span the comment anchors to", async () => {
+    // Arrange
     const setup = await renderApp();
-    await press(setup, "j");
-    await press(setup, "j");
-    await press(setup, "v");
-    await press(setup, "l"); // "The daemon"
-    await press(setup, "c");
+
+    // Act: from the start of "The" to the end of "daemon"
+    await dragText(setup, "The daemon", "daemon persists", "daemon".length);
     await type(setup, "Which daemon?");
-    await press(setup, "enter");
-    await Bun.sleep(80);
-    const stored = server.core.sessionGet(session.id);
-    expect(stored.annotations[0]!.anchor.quote).toBe("The daemon");
+    await pressKey(setup, "RETURN", { meta: true });
+
+    // Assert
+    await waitForState(setup, () => server.core.sessionGet(session.id).annotations.length === 1);
+    expect(server.core.sessionGet(session.id).annotations[0]!.anchor.quote).toBe("The daemon");
   });
 
-  test("x cuts a block into the working copy; x restores it", async () => {
+  test("option+x cuts the caret's block into the working copy; option+x restores it", async () => {
+    // Arrange
     const setup = await renderApp();
-    // move to "- move the store" (h1, h2, p, h2 = 4 steps in)
-    for (let i = 0; i < 4; i++) await press(setup, "j");
-    await press(setup, "x");
-    await Bun.sleep(80);
-    await setup.renderOnce();
-    expect(server.core.sessionGet(session.id).workingCopy).not.toContain("move the store");
-    expect(setup.captureCharFrame()).toContain("[cut]");
-    await press(setup, "x");
-    await Bun.sleep(80);
-    await setup.renderOnce();
-    expect(server.core.sessionGet(session.id).workingCopy).toBeUndefined();
+
+    await clickText(setup, "move the store");
+
+    // Act
+    await pressKey(setup, "x", { meta: true });
+
+    // Assert - the cut lands in the working copy
+    await waitForState(
+      setup,
+      () => !(server.core.sessionGet(session.id).workingCopy ?? "").includes("move the store"),
+    );
+
+    // Act
+    await pressKey(setup, "x", { meta: true });
+
+    // Assert
+    await waitForState(setup, () => server.core.sessionGet(session.id).workingCopy === undefined);
   });
 
-  test("e runs $EDITOR on the working copy and tracks the diff", async () => {
+  test("ctrl+e runs $EDITOR on the working copy and tracks the diff", async () => {
     const script = join(home, "fake-editor.sh");
+
     await Bun.write(script, `#!/bin/sh\nsed -i '' 's/atomically/very atomically/' "$1"\n`);
     Bun.spawnSync(["chmod", "+x", script]);
     process.env.CUELOOP_EDITOR = script;
     try {
+      // Arrange
       const setup = await renderApp();
-      await press(setup, "e");
-      await Bun.sleep(150);
-      await setup.renderOnce();
+
+      // Act
+      await pressKey(setup, "e", { ctrl: true });
+
+      // Assert
+      await waitForText(setup, "[edited]");
       expect(server.core.sessionGet(session.id).workingCopy).toContain("very atomically");
-      expect(setup.captureCharFrame()).toContain("[edited]");
     } finally {
       delete process.env.CUELOOP_EDITOR;
     }
@@ -167,52 +190,225 @@ describe("keyboard grammar", () => {
 });
 
 describe("submit", () => {
-  test("⏎ opens the verdict bar; verdict + summary resolve the session", async () => {
+  test("cmd+⏎ opens the rail confirm card; verdict + summary resolve the session", async () => {
+    // Arrange
     const setup = await renderApp();
-    await press(setup, "j");
-    await press(setup, "j");
-    await press(setup, "c");
+
+    await clickText(setup, "daemon");
     await type(setup, "Needs a phase list.");
-    await press(setup, "enter");
-    await Bun.sleep(80);
-    await press(setup, "enter"); // open submit
-    await setup.renderOnce();
-    expect(setup.captureCharFrame()).toContain("[Request changes]");
+    await pressKey(setup, "RETURN", { meta: true });
+    await waitForText(setup, "Needs a phase list");
+
+    // Act: with no composer open the same chord opens submit
+    await pressKey(setup, "RETURN", { meta: true });
+
+    // Assert
+    await waitForText(setup, "[Changes]");
+
+    // Act
     await type(setup, "Expand the steps.");
     await press(setup, "enter");
-    await Bun.sleep(120);
-    await setup.renderOnce();
+
+    // Assert
+    await waitForText(setup, "feedback sent");
     const stored = server.core.sessionGet(session.id);
+
     expect(stored.status).toBe("resolved");
     expect(stored.verdict!.kind).toBe("request_changes");
     expect(stored.verdict!.feedback).toContain("Needs a phase list.");
     // submit hands the reviewer back to the agent via the completion overlay
-    expect(setup.captureCharFrame()).toContain("✎ feedback sent");
+    expect(setup.captureCharFrame()).toContain("feedback sent");
   });
 
   test("approve via ←/→ verdict cycling", async () => {
+    // Arrange
     const setup = await renderApp();
+
+    // Act
+    await pressKey(setup, "RETURN", { meta: true });
+
+    // Assert
+    await waitForText(setup, "[Approve]"); // no pending items → approve default
+
+    // Act
     await press(setup, "enter");
-    await setup.renderOnce();
-    expect(setup.captureCharFrame()).toContain("[Approve]"); // no pending items → approve default
-    await press(setup, "enter");
-    await Bun.sleep(120);
+
+    // Assert
+    await waitForState(setup, () => server.core.sessionGet(session.id).verdict !== undefined);
     expect(server.core.sessionGet(session.id).verdict!.kind).toBe("approve");
   });
 });
 
-describe("inbox", () => {
-  test("inbox mode renders and opens a session", async () => {
-    const setup = await testRender(<App home={home} />, { width: 120, height: 32 });
-    for (let i = 0; i < 40 && !setup.captureCharFrame().includes("inbox"); i++) {
-      await Bun.sleep(25);
-      await setup.renderOnce();
-    }
-    expect(setup.captureCharFrame()).toContain("inbox (1 pending)");
-    expect(setup.captureCharFrame()).toContain("Migration Plan");
+describe("no-thread shell", () => {
+  test("opening with nothing selected lands in the shell with a Welcome tab and the Threads sidebar", async () => {
+    // Arrange
+    const setup = await renderReadyApp(<App home={home} />, { width: 120, height: 32 });
+
+    // the Welcome playground measures its width before it paints, so wait for its copy, not the header
+    await waitForText(setup, "Getting started");
+
+    // Assert - the same shell header, the disposable Welcome tab, and the pending thread
+    const frame = setup.captureCharFrame();
+
+    expect(frame).toContain("Getting started");
+    expect(frame).toContain("Migration Plan");
+    expect(frame).not.toContain("· resume"); // the bespoke inbox header is retired
+
+    // Act
+    await press(setup, "enter");
+
+    // Assert
+    await waitForText(setup, "send message");
+  });
+
+  test("picking a thread from the no-thread shell keeps the Threads sidebar open", async () => {
+    // Arrange - a second pending thread so the sidebar has a row that never shows
+    // in the opened thread's own view
+    server.core.sessionCreate({
+      workspace: { repoRoot: "/repo", branch: "main" },
+      artifact: { type: "plan", content: "# Other Plan\n", meta: { title: "Other Plan" } },
+    });
+    const setup = await renderReadyApp(<App home={home} />, { width: 120, height: 32 });
+
+    await waitForText(setup, "Getting started");
+    await waitForText(setup, "Other Plan"); // the sidebar opens by default here
+
+    // Act - open the thread under the cursor
+    await press(setup, "enter");
+    await waitForText(setup, "send message");
+
+    // Assert - the sidebar stayed open across the swap: both titles are on screen,
+    // and the non-opened one can only come from the still-open sidebar
+    const frame = setup.captureCharFrame();
+
+    expect(frame).toContain("Migration Plan");
+    expect(frame).toContain("Other Plan");
+  });
+
+  test("the row kebab menu pins a thread into a Pinned section", async () => {
+    // Arrange
+    const setup = await renderReadyApp(<App home={home} />, { width: 120, height: 32 });
+
+    await waitForText(setup, "Migration Plan");
+
+    // Act - hover the row to reveal its kebab, open the menu, and pick Pin
+    const row = locateText(setup, "Migration Plan");
+
+    await setup.mockMouse.moveTo(row.column, row.row);
+    await waitForText(setup, "⋮");
+    await clickText(setup, "⋮");
+    await waitForText(setup, "Pin");
+    await clickText(setup, "Pin");
+
+    // Assert - a Pinned section now holds the thread
+    await waitForText(setup, "Pinned");
+    expect(frameRow(setup, "Migration Plan")).toBeGreaterThan(frameRow(setup, "Pinned"));
+  });
+
+  test("a bare launch shows the Welcome surface with the right region collapsed", async () => {
+    // Arrange
+    const setup = await renderReadyApp(<App home={home} />, { width: 120, height: 32 });
+
+    await waitForText(setup, "Getting started");
+
+    // Assert - Welcome fills the thread pane (not a Changes tab); the right region stays collapsed
+    const frame = setup.captureCharFrame();
+
+    expect(frame).toContain("Getting started");
+    expect(frame).not.toContain("Changes"); // the Changes editor is closed on a bare launch
+    expect(frame).toContain("Migration Plan"); // the sidebar lists the pending thread
+  });
+
+  test("the menu opens from the shell gear and escape is not a trap", async () => {
+    // Arrange
+    const setup = await renderReadyApp(<App home={home} />, { width: 120, height: 32 });
+
+    await waitForText(setup, "Getting started");
+
+    // Act - open the settings dialog from the top-left gear (the Threads panel header, row 0)
+    await setup.mockMouse.click(1, 0);
+
+    // Assert - the settings dialog with its Keybinds leaf appears
+    await waitForText(setup, "Keybinds");
+    expect(setup.captureCharFrame()).toContain("Settings");
+
+    // Act - escape closes the menu (not a trap), and the thread nav still works
+    await press(setup, "escape");
+    await waitForState(setup, () => !setup.captureCharFrame().includes("Keybinds"));
     await press(setup, "enter");
-    await Bun.sleep(80);
-    await setup.renderOnce();
-    expect(setup.captureCharFrame()).toContain("Submit review (0)");
+
+    // Assert
+    await waitForText(setup, "send message");
+  });
+});
+
+describe("the thread view and the menu", () => {
+  test("the keybinds dialog lists the thread view grammar, keeps keys away from the text, and closes on escape", async () => {
+    // Arrange
+    const setup = await renderApp();
+
+    await waitForText(setup, "The daemon persists");
+
+    // Act - open the menu from the top-left settings gear, then the keybinds dialog
+    await setup.mockMouse.click(1, 0);
+    await waitForText(setup, "Keybinds");
+    const dropUp = setup.captureCharFrame().split("\n");
+    const keybindsRow = dropUp.findIndex((line) => line.includes("Keybinds"));
+
+    await setup.mockMouse.click(dropUp[keybindsRow]!.indexOf("Keybinds") + 1, keybindsRow);
+    await waitForText(setup, "mark text, across blocks");
+
+    // Assert - the thread grammar, not the plan sheet's
+    const dialog = setup.captureCharFrame();
+
+    expect(dialog).toContain("⌘⌥m");
+    expect(dialog).toContain("place the caret");
+    expect(dialog).not.toContain("grow/shrink");
+
+    // Act - a printable behind the dialog must not open a comment; escape closes it
+    await press(setup, "x");
+    expect(setup.captureCharFrame()).not.toContain("● x");
+    await press(setup, "escape");
+
+    // Assert
+    await waitForState(setup, () => !setup.captureCharFrame().includes("mark text, across blocks"));
+    expect(setup.captureCharFrame()).not.toContain("● x");
+  });
+
+  test("clicking the Settings nav group is inert and never corrupts the active category", async () => {
+    // Arrange - open the settings dialog from the gear
+    const setup = await renderApp();
+
+    await setup.mockMouse.click(1, 0);
+    await waitForText(setup, "Keybinds");
+
+    // the nav folder is the last "Settings" on screen (the first is the dialog title)
+    const lines = setup.captureCharFrame().split("\n");
+    let folderRow = -1;
+    let folderColumn = -1;
+
+    lines.forEach((line, row) => {
+      const column = line.indexOf("Settings");
+
+      if (column !== -1) {
+        folderColumn = column;
+        folderRow = row;
+      }
+    });
+
+    // Act - click the synthetic Settings group folder, then press a nav key. The
+    // key handler dereferences the active category, so a corrupt id would throw
+    // (the global key handler swallows the throw into console.error).
+    const keyHandlerErrors: string[] = [];
+    const originalConsoleError = console.error;
+
+    console.error = (...args: unknown[]) => keyHandlerErrors.push(args.map(String).join(" "));
+    await setup.mockMouse.click(folderColumn + 1, folderRow);
+    await pressKey(setup, "ARROW_DOWN");
+    console.error = originalConsoleError;
+
+    // Assert - no key-handler crash, and the dialog is still up
+    expect(keyHandlerErrors.filter((line) => line.includes("keypress handler"))).toEqual([]);
+    expect(setup.captureCharFrame()).toContain("Keybinds");
   });
 });

package/src/App.toast.test.tsx

@@ -0,0 +1,89 @@
+/** The share toast is non-modal: while it is up, escape still cancels an open overlay. */
+
+import { afterEach, beforeEach, describe, mock, test } from "bun:test";
+import { mkdtempSync, rmSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
+import React from "react";
+import { testRender } from "@opentui/react/test-utils";
+import { DaemonServer } from "@cueloop/daemon";
+import type { Thread } from "@cueloop/schema";
+import { App } from "./App";
+import type { ShareTransport } from "./thread-controller";
+import {
+  clickText,
+  isolateUserConfig,
+  press,
+  pressKey,
+  typeText,
+  waitForText,
+  waitForTextGone,
+} from "./test-support";
+
+const publishShare = mock(async () => ({ line: "ssh p_share01@cueloop.dev", copied: true }));
+const shareTransport: ShareTransport = {
+  publish: publishShare,
+  pull: mock(async () => {
+    throw new Error("Unexpected share pull");
+  }),
+  push: mock(async () => {}),
+  watch: () => () => {},
+  parseShareId: (line) => line.match(/^ssh (\S+)@/)?.[1],
+  collaboratorAnnotations: () => [],
+  mergeFromShare: () => ({ annotations: [] }),
+};
+
+const PLAN = `# Migration Plan\n\n## Context\n\nThe daemon persists sessions to disk atomically.\n`;
+
+let home: string;
+let restoreUserConfig: () => void;
+let server: DaemonServer;
+let session: Thread;
+
+beforeEach(() => {
+  home = mkdtempSync(join(tmpdir(), "cueloop-toast-"));
+  restoreUserConfig = isolateUserConfig(home);
+  server = new DaemonServer({ home, idleExitMs: 0 });
+  server.start();
+  session = server.core.sessionCreate({
+    workspace: { repoRoot: "/repo", branch: "main" },
+    artifact: {
+      type: "plan",
+      content: PLAN,
+      meta: { title: "Migration Plan", planPath: "plan.md" },
+    },
+  });
+});
+afterEach(() => {
+  restoreUserConfig();
+  server.stop();
+  rmSync(home, { recursive: true, force: true });
+});
+
+describe("share toast", () => {
+  test("escape cancels an open composer even while the toast is up", async () => {
+    // Arrange
+    const setup = await testRender(
+      <App home={home} sessionId={session.id} shareTransport={shareTransport} />,
+      {
+        width: 120,
+        height: 32,
+      },
+    );
+
+    await waitForText(setup, "cueloop");
+
+    // Act: share raises the toast, then open a composer under it by typing
+    await pressKey(setup, "s", { ctrl: true });
+    await waitForText(setup, "share link copied");
+    await clickText(setup, "daemon");
+    await typeText(setup, "x");
+    await waitForText(setup, "● x");
+
+    // Act: escape must reach the composer, not get eaten by the toast
+    await press(setup, "escape");
+
+    // Assert: the composer closed on the first escape
+    await waitForTextGone(setup, "● x");
+  });
+});