@cueloop/client 0.1.0-alpha.33 → 0.1.0-alpha.35

package/package.json

@@ -1,46 +1,47 @@
 {
   "name": "@cueloop/client",
-  "version": "0.1.0-alpha.33",
+  "version": "0.1.0-alpha.35",
+  "description": "The cueloop review UI: projection renderer, keyboard grammar, review rail",
+  "homepage": "https://github.com/mmurakaru/cueloop#readme",
+  "bugs": {
+    "url": "https://github.com/mmurakaru/cueloop/issues"
+  },
   "license": "Apache-2.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/mmurakaru/cueloop.git",
+    "directory": "packages/client"
+  },
+  "files": [
+    "src",
+    "README.md"
+  ],
   "type": "module",
   "exports": {
     ".": "./src/index.ts"
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
-    "@cueloop/daemon": "0.1.0-alpha.33",
-    "@cueloop/extension-api": "0.1.0-alpha.33",
-    "@cueloop/integration-obsidian": "0.1.0-alpha.33",
-    "@cueloop/schema": "0.1.0-alpha.33",
+    "@cueloop/daemon": "0.1.0-alpha.35",
+    "@cueloop/extension-api": "0.1.0-alpha.35",
+    "@cueloop/integration-obsidian": "0.1.0-alpha.35",
+    "@cueloop/schema": "0.1.0-alpha.35",
     "@opentui/core": "^0.5.2",
     "@opentui/keymap": "0.5.2",
     "@opentui/react": "^0.5.2",
     "@opentui/ssh": "0.5.2",
     "@pierre/diffs": "^1.3.5",
+    "diff": "^8",
     "react": "^19.2.0"
   },
   "devDependencies": {
     "@types/react": "^19.2.0",
-    "ssh2": "^1.17.0",
-    "@types/ssh2": "^1.15.5"
+    "@types/ssh2": "^1.15.5",
+    "ssh2": "^1.17.0"
   },
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "src",
-    "README.md"
-  ],
   "engines": {
     "bun": ">=1.3.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/mmurakaru/cueloop.git",
-    "directory": "packages/client"
-  },
-  "homepage": "https://github.com/mmurakaru/cueloop#readme",
-  "bugs": {
-    "url": "https://github.com/mmurakaru/cueloop/issues"
-  },
-  "description": "The cueloop review UI: projection renderer, keyboard grammar, review rail"
-}
+  }
+}

package/src/App.autoclose.test.tsx

@@ -40,10 +40,13 @@ afterEach(() => {
 });
 
 async function renderApp(onExit?: (code: number) => void) {
-  const setup = await testRender(<App home={home} sessionId={session.id} onExit={onExit} clock={clock} />, {
-    width: 120,
-    height: 30,
-  });
+  const setup = await testRender(
+    <App home={home} sessionId={session.id} onExit={onExit} clock={clock} />,
+    {
+      width: 120,
+      height: 30,
+    },
+  );
   await waitForText(setup, "cueloop");
   return setup;
 }

package/src/App.diff.test.tsx

@@ -44,7 +44,10 @@ afterEach(() => {
 });
 
 async function renderApp() {
-  const setup = await testRender(<App home={home} sessionId={session.id} />, { width: 120, height: 30 });
+  const setup = await testRender(<App home={home} sessionId={session.id} />, {
+    width: 120,
+    height: 30,
+  });
   await waitForText(setup, "cueloop");
   return setup;
 }
@@ -96,14 +99,137 @@ describe("diff review", () => {
     expect(resolved.verdict!.feedback).toContain("Map needs an eviction story.");
   });
 
-  test("plan verbs are guarded in diff sessions", async () => {
-    // Arrange
+  test("curation needs full file contents; a legacy diff answers", async () => {
+    // Arrange - the session carries no artifact.files
     const setup = await renderApp();
 
     // Act
     await press(setup, "x");
 
     // Assert
-    await waitForText(setup, "plan-only verb");
+    await waitForText(setup, "hunk curation needs full file contents");
+  });
+
+  test("rejecting the only change empties the curated working copy", async () => {
+    // Arrange - a diff session that carries full file contents
+    const withFiles = server.core.sessionCreate({
+      workspace: { repoRoot: "/repo", branch: "main" },
+      artifact: {
+        type: "diff",
+        content: PATCH,
+        meta: { title: "working tree" },
+        files: [
+          {
+            path: "src/store.ts",
+            oldContents: "export class Store {\n  private items = [];\n}\n",
+            newContents: "export class Store {\n  private items = new Map();\n}\n",
+            status: "modified",
+          },
+        ],
+      },
+    });
+    const setup = await testRender(<App home={home} sessionId={withFiles.id} />, {
+      width: 120,
+      height: 30,
+    });
+    await waitForText(setup, "cueloop");
+
+    // Act - move to the added line and reject its change
+    // rows: file(0), hunk(1), ctx(2), del(3), add(4)
+    for (let i = 0; i < 4; i++) await press(setup, "j");
+    await press(setup, "x");
+
+    // Assert - the single change is gone, so the curated working copy is empty
+    await waitForText(setup, "change rejected");
+    const stored = server.core.sessionGet(withFiles.id);
+    expect(stored.workingCopy).toBe("");
+  });
+
+  test("a rejected change lists in the rail and undo (u) restores it", async () => {
+    // Arrange - a diff session that carries full file contents
+    const withFiles = server.core.sessionCreate({
+      workspace: { repoRoot: "/repo", branch: "main" },
+      artifact: {
+        type: "diff",
+        content: PATCH,
+        meta: { title: "working tree" },
+        files: [
+          {
+            path: "src/store.ts",
+            oldContents: "export class Store {\n  private items = [];\n}\n",
+            newContents: "export class Store {\n  private items = new Map();\n}\n",
+            status: "modified",
+          },
+        ],
+      },
+    });
+    const setup = await testRender(<App home={home} sessionId={withFiles.id} />, {
+      width: 120,
+      height: 30,
+    });
+    await waitForText(setup, "cueloop");
+
+    // Act - reject the change under the added line
+    // rows: file(0), hunk(1), ctx(2), del(3), add(4)
+    for (let i = 0; i < 4; i++) await press(setup, "j");
+    await press(setup, "x");
+
+    // Assert - the rail shows a removal card titled REJECT · me for the change
+    await waitForText(setup, "REJECT · me");
+    expect(server.core.sessionGet(withFiles.id).workingCopy).toBe("");
+
+    // Act - undo restores it (no selection, so the last item)
+    await press(setup, "u");
+
+    // Assert - the change returns to the curated diff (working copy cleared)
+    await waitForText(setup, "removal restored");
+    expect(server.core.sessionGet(withFiles.id).workingCopy).toBeUndefined();
+  });
+
+  test("a selected removal card shows an undo button that restores it on click", async () => {
+    // Arrange - a diff session that carries full file contents
+    const withFiles = server.core.sessionCreate({
+      workspace: { repoRoot: "/repo", branch: "main" },
+      artifact: {
+        type: "diff",
+        content: PATCH,
+        meta: { title: "working tree" },
+        files: [
+          {
+            path: "src/store.ts",
+            oldContents: "export class Store {\n  private items = [];\n}\n",
+            newContents: "export class Store {\n  private items = new Map();\n}\n",
+            status: "modified",
+          },
+        ],
+      },
+    });
+    const setup = await testRender(<App home={home} sessionId={withFiles.id} />, {
+      width: 120,
+      height: 30,
+    });
+    await waitForText(setup, "cueloop");
+
+    // Act - reject the change; the removal card lands unselected (no undo button)
+    for (let i = 0; i < 4; i++) await press(setup, "j");
+    await press(setup, "x");
+    await waitForText(setup, "REJECT · me");
+    expect(setup.captureCharFrame()).not.toContain("undo");
+
+    // Act - click the card to select it; the undo button appears
+    const clickText = async (needle: string): Promise<void> => {
+      const lines = setup.captureCharFrame().split("\n");
+      const row = lines.findIndex((line) => line.includes(needle));
+      await setup.mockMouse.click(lines[row]!.indexOf(needle) + 1, row);
+    };
+    await clickText("REJECT · me");
+    await waitForText(setup, "undo");
+
+    // Act - click the undo button
+    await clickText("undo");
+
+    // Assert - the change returns to the curated diff (working copy cleared)
+    await waitForText(setup, "removal restored");
+    expect(server.core.sessionGet(withFiles.id).workingCopy).toBeUndefined();
   });
 });

package/src/App.export.test.tsx

@@ -1,7 +1,15 @@
 /** Tier-2 wiring for the notes-vault export: with [integrations.obsidian] set to export on resolve, submitting a review writes the note into the vault and surfaces the path in the status line. */
 
 import { afterEach, beforeEach, describe, expect, test } from "bun:test";
-import { existsSync, mkdirSync, mkdtempSync, readFileSync, readdirSync, rmSync, writeFileSync } from "node:fs";
+import {
+  existsSync,
+  mkdirSync,
+  mkdtempSync,
+  readFileSync,
+  readdirSync,
+  rmSync,
+  writeFileSync,
+} from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import React from "react";
@@ -27,13 +35,20 @@ beforeEach(() => {
   vault = join(home, "vault");
   mkdirSync(vault);
   const configPath = join(home, "config.toml");
-  writeFileSync(configPath, `[integrations.obsidian]\nvault = ${JSON.stringify(vault)}\nexportOn = "resolve"\n`);
+  writeFileSync(
+    configPath,
+    `[integrations.obsidian]\nvault = ${JSON.stringify(vault)}\nexportOn = "resolve"\n`,
+  );
   restoreUserConfig = isolateUserConfig(home, "config.toml");
   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(() => {
@@ -45,7 +60,10 @@ afterEach(() => {
 describe("obsidian export on resolve", () => {
   test("submitting a review writes the plan into the vault and shows the path", async () => {
     // Arrange
-    const setup = await testRender(<App home={home} sessionId={session.id} />, { width: 120, height: 32 });
+    const setup = await testRender(<App home={home} sessionId={session.id} />, {
+      width: 120,
+      height: 32,
+    });
     await waitForText(setup, "cueloop");
 
     // Act

package/src/App.plan-review.test.tsx

@@ -9,8 +9,16 @@ import { testRender } from "@opentui/react/test-utils";
 import { DaemonServer } from "@cueloop/daemon";
 import type { ReviewSession } from "@cueloop/schema";
 import { App } from "./App";
-import { DARK as T } from "./theme";
-import { isolateUserConfig, press, settle, typeText as type, waitForState, waitForText, waitForTextGone } from "./test-support";
+import { DARK } from "./theme";
+import {
+  isolateUserConfig,
+  press,
+  settle,
+  typeText as type,
+  waitForState,
+  waitForText,
+  waitForTextGone,
+} from "./test-support";
 
 const PLAN = `# Migration Plan
 
@@ -36,7 +44,11 @@ beforeEach(() => {
   server.start();
   session = server.core.sessionCreate({
     workspace: { repoRoot: "/repo", branch: "main" },
-    artifact: { type: "plan", content: PLAN, meta: { title: "Migration Plan", planPath: "plan.md", agent: "agent/worker-3" } },
+    artifact: {
+      type: "plan",
+      content: PLAN,
+      meta: { title: "Migration Plan", planPath: "plan.md", agent: "agent/worker-3" },
+    },
   });
 });
 afterEach(() => {
@@ -66,12 +78,28 @@ function backgroundsOf(setup: Setup, needle: string): string[] {
     for (const span of line.spans) {
       if (!span.text.includes(needle)) continue;
       const [red, green, blue] = span.bg.toInts();
-      backgrounds.push("#" + [red, green, blue].map((part) => part.toString(16).padStart(2, "0")).join(""));
+      backgrounds.push(
+        "#" + [red, green, blue].map((part) => part.toString(16).padStart(2, "0")).join(""),
+      );
     }
   }
   return backgrounds;
 }
 
+/** Whether any border character (box-drawing) is painted in the given foreground hex. */
+function hasBorderColor(setup: Setup, hex: string): boolean {
+  for (const line of setup.captureSpans().lines) {
+    for (const span of line.spans) {
+      if (!/[╭╮╰╯│─┌┐└┘]/.test(span.text)) continue;
+      const [red, green, blue] = span.fg.toInts();
+      const rendered =
+        "#" + [red, green, blue].map((part) => part.toString(16).padStart(2, "0")).join("");
+      if (rendered === hex) return true;
+    }
+  }
+  return false;
+}
+
 /** Move the cursor to "The daemon persists sessions to disk atomically." */
 async function toContextParagraph(setup: Setup): Promise<void> {
   await press(setup, "j");
@@ -85,14 +113,20 @@ describe("share button", () => {
 
     // Assert
     // both word-buttons ride the same header row, so Share sits next to Edit
-    const headerLine = setup.captureCharFrame().split("\n").find((line) => line.includes("submitted by"));
+    const headerLine = setup
+      .captureCharFrame()
+      .split("\n")
+      .find((line) => line.includes("submitted by"));
     expect(headerLine).toContain("Edit");
     expect(headerLine).toContain("Share");
   });
 
   test("a read-only viewer (a plan shared over ssh) never sees the Share button", async () => {
     // Arrange / Act
-    const viewer = await testRender(<App home={home} sessionId={session.id} readOnly />, { width: 120, height: 32 });
+    const viewer = await testRender(<App home={home} sessionId={session.id} readOnly />, {
+      width: 120,
+      height: 32,
+    });
     await waitForText(viewer, "cueloop");
 
     // Assert
@@ -108,7 +142,10 @@ describe("share button", () => {
     await waitForText(setup, "submitted by");
 
     // Assert - the owner toolbar is gone once the review is resolved
-    const headerLine = setup.captureCharFrame().split("\n").find((line) => line.includes("submitted by"));
+    const headerLine = setup
+      .captureCharFrame()
+      .split("\n")
+      .find((line) => line.includes("submitted by"));
     expect(headerLine).not.toContain("Edit");
     expect(headerLine).not.toContain("Share");
   });
@@ -125,7 +162,10 @@ describe("edit affordance", () => {
 
   test("a read-only viewer (a plan shared over ssh) never sees the Edit button", async () => {
     // Arrange / Act
-    const viewer = await testRender(<App home={home} sessionId={session.id} readOnly />, { width: 120, height: 32 });
+    const viewer = await testRender(<App home={home} sessionId={session.id} readOnly />, {
+      width: 120,
+      height: 32,
+    });
     await waitForText(viewer, "cueloop");
 
     // Assert
@@ -138,7 +178,9 @@ describe("attribution", () => {
     // Arrange - a pulled collaborator note carries an author fingerprint
     const { makeAnchor, parseBlocks } = await import("@cueloop/schema");
     const blocks = parseBlocks(PLAN);
-    const contextBlockIndex = blocks.findIndex((block) => block.text.startsWith("The daemon persists"));
+    const contextBlockIndex = blocks.findIndex((block) =>
+      block.text.startsWith("The daemon persists"),
+    );
     server.core.sessionAnnotate(session.id, {
       id: "collab-1",
       kind: "comment",
@@ -222,9 +264,9 @@ describe("inline compose keeps the anchor painted", () => {
     // compose open: the anchor is painted selection-style. The box can render
     // a frame before the anchor repaint settles, so wait on the color itself.
     await waitForText(setup, "Save");
-    expect(setup.captureCharFrame()).toContain("Cancel esc");
-    await waitForState(setup, () => backgroundsOf(setup, "The daemon").includes(T.accent));
-    expect(backgroundsOf(setup, "The daemon")).toContain(T.accent);
+    expect(setup.captureCharFrame()).toContain("Cancel");
+    await waitForState(setup, () => backgroundsOf(setup, "The daemon").includes(DARK.accent));
+    expect(backgroundsOf(setup, "The daemon")).toContain(DARK.accent);
 
     // Act
     // cancel un-paints (a bare ESC settles after the parser's escape window)
@@ -232,7 +274,7 @@ describe("inline compose keeps the anchor painted", () => {
 
     // Assert
     await waitForTextGone(setup, 'comment on "');
-    expect(backgroundsOf(setup, "The daemon")).not.toContain(T.accent);
+    expect(backgroundsOf(setup, "The daemon")).not.toContain(DARK.accent);
 
     // Act
     // save converts the paint to the kind-colored annotation highlight
@@ -246,7 +288,9 @@ describe("inline compose keeps the anchor painted", () => {
     // the whole cursor block is the anchor here; check the highlight landed
     const stored = server.core.sessionGet(session.id);
     expect(stored.annotations.length).toBe(1);
-    expect(backgroundsOf(setup, stored.annotations[0]!.anchor.quote.slice(0, 20))).toContain(T.markCommentBackground);
+    expect(backgroundsOf(setup, stored.annotations[0]!.anchor.quote.slice(0, 20))).toContain(
+      DARK.markCommentBackground,
+    );
     // renderApp plus this many frame-waits grazes the 5s default on a loaded CI
     // runner, and the whole-suite publish lane has timed even 15s out; give the
     // heaviest frame-wait chain generous headroom so runner load cannot flake it.
@@ -267,7 +311,10 @@ describe("compose newline convention", () => {
     return setup;
   }
 
-  async function pressReturnWith(setup: Setup, modifiers: { shift?: boolean; meta?: boolean }): Promise<void> {
+  async function pressReturnWith(
+    setup: Setup,
+    modifiers: { shift?: boolean; meta?: boolean },
+  ): Promise<void> {
     setup.mockInput.pressKey("RETURN", modifiers);
     await settle(setup);
   }
@@ -345,7 +392,7 @@ describe("the document selects, the rail edits", () => {
     await press(setup, "c");
     await type(setup, "Needs a citation.");
     await press(setup, "enter");
-    await waitForText(setup, "COMMENT · pending");
+    await waitForText(setup, "COMMENT · me");
 
     // Act
     // the saved card is selected; e turns its body into an input in place
@@ -356,7 +403,8 @@ describe("the document selects, the rail edits", () => {
     // Assert
     await waitForState(
       setup,
-      () => server.core.sessionGet(session.id).annotations[0]!.body === "Needs a citation. And a link.",
+      () =>
+        server.core.sessionGet(session.id).annotations[0]!.body === "Needs a citation. And a link.",
     );
   });
 
@@ -364,7 +412,9 @@ describe("the document selects, the rail edits", () => {
     // Arrange - a pulled collaborator note carries an author fingerprint
     const { makeAnchor, parseBlocks } = await import("@cueloop/schema");
     const blocks = parseBlocks(PLAN);
-    const contextBlockIndex = blocks.findIndex((block) => block.text.startsWith("The daemon persists"));
+    const contextBlockIndex = blocks.findIndex((block) =>
+      block.text.startsWith("The daemon persists"),
+    );
     server.core.sessionAnnotate(session.id, {
       id: "collab-1",
       kind: "comment",
@@ -390,17 +440,39 @@ describe("the document selects, the rail edits", () => {
     await press(setup, "c");
     await type(setup, "Delete me.");
     await press(setup, "enter");
-    await waitForText(setup, "COMMENT · pending");
+    await waitForText(setup, "COMMENT · me");
     expect(server.core.sessionGet(session.id).annotations.length).toBe(1);
-    expect(backgroundsOf(setup, "persists sessions")).toContain(T.markCommentBackground);
+    expect(backgroundsOf(setup, "persists sessions")).toContain(DARK.markCommentBackground);
 
     // Act
     await press(setup, "x");
 
     // Assert
-    await waitForTextGone(setup, "COMMENT · pending");
+    await waitForTextGone(setup, "COMMENT · me");
     expect(server.core.sessionGet(session.id).annotations.length).toBe(0);
-    expect(backgroundsOf(setup, "persists sessions")).not.toContain(T.markCommentBackground);
+    expect(backgroundsOf(setup, "persists sessions")).not.toContain(DARK.markCommentBackground);
+  });
+});
+
+describe("plan cut removals", () => {
+  test("a cut block becomes a rail removal card and u restores it", async () => {
+    // Arrange
+    const setup = await renderApp();
+    await toContextParagraph(setup);
+
+    // Act - no card is selected, so x cuts the block under the cursor
+    await press(setup, "x");
+
+    // Assert - the rail shows a removal card titled CUT · me for the cut block
+    await waitForText(setup, "CUT · me");
+    await waitForState(setup, () => server.core.sessionGet(session.id).workingCopy !== undefined);
+
+    // Act - undo restores it (no selection, so the last removal)
+    await press(setup, "u");
+
+    // Assert - the block returns and the working copy is pristine again
+    await waitForText(setup, "removal restored");
+    await waitForState(setup, () => server.core.sessionGet(session.id).workingCopy === undefined);
   });
 });
 
@@ -409,7 +481,9 @@ describe("addressed annotations leave the open list", () => {
     // Arrange: two annotations through the daemon, then a revision addressing one
     const { makeAnchor, parseBlocks } = await import("@cueloop/schema");
     const blocks = parseBlocks(PLAN);
-    const contextBlockIndex = blocks.findIndex((block) => block.text.startsWith("The daemon persists"));
+    const contextBlockIndex = blocks.findIndex((block) =>
+      block.text.startsWith("The daemon persists"),
+    );
     server.core.sessionAnnotate(session.id, {
       id: "a_settled",
       kind: "comment",
@@ -433,7 +507,7 @@ describe("addressed annotations leave the open list", () => {
     expect(frame).toContain("✓ 1 addressed by revision");
     expect(frame).not.toContain("settled note");
     expect(frame).toContain("still open note"); // the open card survives; the addressed one does not
-    expect(backgroundsOf(setup, "The daemon")).not.toContain(T.markCommentBackground); // no highlight paint
+    expect(backgroundsOf(setup, "The daemon")).not.toContain(DARK.markCommentBackground); // no highlight paint
   });
 });
 
@@ -483,12 +557,13 @@ describe("edit-exit reconciliation", () => {
       await press(setup, "c");
       await type(setup, "Anchor me to the doomed passage.");
       await press(setup, "enter");
-      await waitForText(setup, "· pending");
+      await waitForText(setup, "COMMENT · me");
 
       // Act
-      // deselect the card so e reaches the editor hand-off, then edit
+      // deselect the card so e reaches the editor hand-off, then edit; deselection
+      // shows as the card's accent border fading to a dim border (transparent fill)
       await press(setup, "escape");
-      await waitForTextGone(setup, "▸ COMMENT");
+      await waitForState(setup, () => !hasBorderColor(setup, DARK.accent));
       await press(setup, "e");
 
       // Assert
@@ -502,3 +577,28 @@ describe("edit-exit reconciliation", () => {
     }
   });
 });
+
+describe("marker-actions popover", () => {
+  test("v shows the toolbar, a opens quick-actions, enter inserts the preset comment", async () => {
+    // Arrange
+    const setup = await renderApp();
+    await toContextParagraph(setup);
+
+    // Act - marking a span reveals the inline toolbar
+    await press(setup, "v");
+    await waitForText(setup, "actions");
+
+    // open the quick-actions list; step to the second default and pick it. The
+    // list renders as a floating overlay the virtual terminal cannot composite,
+    // so drive the grammar directly rather than waiting on its painted text.
+    await press(setup, "a");
+    await press(setup, "j");
+    await press(setup, "enter");
+
+    // Assert - a comment annotation was created with the second default's body
+    await waitForState(setup, () => server.core.sessionGet(session.id).annotations.length === 1);
+    const stored = server.core.sessionGet(session.id);
+    expect(stored.annotations[0]!.kind).toBe("comment");
+    expect(stored.annotations[0]!.body).toBe("Restate simplified");
+  });
+});

package/src/App.readonly.test.tsx

@@ -9,7 +9,8 @@ import { testRender } from "@opentui/react/test-utils";
 import { DaemonServer } from "@cueloop/daemon";
 import { makeAnchor, parseBlocks, type ReviewSession } from "@cueloop/schema";
 import { App } from "./App";
-import { isolateUserConfig, press, waitForText } from "./test-support";
+import { DARK } from "./theme";
+import { isolateUserConfig, press, waitForState, waitForText } from "./test-support";
 
 const PLAN = `# Migration Plan
 
@@ -35,7 +36,11 @@ beforeEach(() => {
   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(() => {
@@ -56,7 +61,11 @@ async function renderObserver() {
 /** Session state that any mutating verb would change. */
 function snapshot() {
   const stored = server.core.sessionGet(session.id);
-  return { annotations: stored.annotations.length, workingCopy: stored.workingCopy, status: stored.status };
+  return {
+    annotations: stored.annotations.length,
+    workingCopy: stored.workingCopy,
+    status: stored.status,
+  };
 }
 
 describe("observer rendering", () => {
@@ -74,7 +83,6 @@ describe("observer rendering", () => {
 describe("observer verbs are blocked", () => {
   for (const [key, verb] of [
     ["c", "comment"],
-    ["s", "suggest"],
     ["x", "cut"],
     ["e", "edit"],
     ["enter", "submit"],
@@ -88,13 +96,12 @@ describe("observer verbs are blocked", () => {
       const frame = await waitForText(setup, "observer - read-only");
       // no overlay opened: compose/submit bars never appear
       expect(frame).not.toContain('comment on "');
-      expect(frame).not.toContain('suggest replacement for "');
       expect(frame).not.toContain("verdict ←/→");
       expect(snapshot()).toEqual(before);
     });
   }
 
-  test("span mode c/s is blocked too", async () => {
+  test("span mode c is blocked too", async () => {
     // Arrange
     const setup = await renderObserver();
 
@@ -143,7 +150,23 @@ describe("observer navigation still works", () => {
     await press(setup, "n");
     await setup.renderOnce();
 
-    // Assert
-    await waitForText(setup, "▸ COMMENT");
+    // Assert - focus shows as the card's bright kind-colored border (transparent
+    // fill); a selected card is the only accent-colored border in the frame
+    await waitForText(setup, "COMMENT · me");
+    await waitForState(setup, () => hasBorderColor(setup, DARK.accent));
   });
 });
+
+/** Whether any border character (box-drawing) is painted in the given foreground hex. */
+function hasBorderColor(setup: Awaited<ReturnType<typeof renderObserver>>, hex: string): boolean {
+  for (const line of setup.captureSpans().lines) {
+    for (const span of line.spans) {
+      if (!/[╭╮╰╯│─┌┐└┘]/.test(span.text)) continue;
+      const [red, green, blue] = span.fg.toInts();
+      const rendered =
+        "#" + [red, green, blue].map((part) => part.toString(16).padStart(2, "0")).join("");
+      if (rendered === hex) return true;
+    }
+  }
+  return false;
+}