From 581251e8821ba4b0cc88641e38ce256e60684321 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Wed, 18 Nov 2026 03:43:00 -0500 Subject: [PATCH] Keep a revealed feedback inspection's window after focus settles At 72x20 the narrow feedback drawer opened at offset 1 to reveal its toggle, then focus settlement spent the reveal without keeping that offset, so the next frame redrew at offset 0, unmounted the focused toggle and moved the linked entry down one row. focusSettled now keeps the admitted start in the presented inspection's own offset. Refs #1410 Co-Authored-By: Claude Opus 5.5 --- .../repl-bench/journeys/conversation.test.md | 1 + packages/cli/src/repl/application.ts | 6 ++ packages/cli/tests/repl-focus-regions.test.ts | 73 +++++++++++++++++++ 3 files changed, 80 insertions(+) diff --git a/examples/repl-bench/journeys/conversation.test.md b/examples/repl-bench/journeys/conversation.test.md index c9696c4ab..7e265b5af 100644 --- a/examples/repl-bench/journeys/conversation.test.md +++ b/examples/repl-bench/journeys/conversation.test.md @@ -87,6 +87,7 @@ + diff --git a/packages/cli/src/repl/application.ts b/packages/cli/src/repl/application.ts index c97e40b2b..37239fdcd 100644 --- a/packages/cli/src/repl/application.ts +++ b/packages/cli/src/repl/application.ts @@ -5372,6 +5372,12 @@ export function focusSettled( return Object.freeze({ ...state, restore: undefined, + inspection: + open === undefined && + presentedInspection(view) !== undefined && + state.inspection !== undefined + ? { ...state.inspection, offset: from } + : state.inspection, viewports: { ...viewports, configure: presentedConfiguring(view) === undefined ? viewports.configure : from, diff --git a/packages/cli/tests/repl-focus-regions.test.ts b/packages/cli/tests/repl-focus-regions.test.ts index 3e600b3a5..60a1d9112 100644 --- a/packages/cli/tests/repl-focus-regions.test.ts +++ b/packages/cli/tests/repl-focus-regions.test.ts @@ -635,6 +635,79 @@ describe("REPL focus regions: logical drawer reveal", () => { ).state; expect(state.route.at).toBe(model.checkpoints.at(-1)?.marker); }); + + it("a revealed feedback toggle and its linked entry stay in place after focus settles", function* () { + const model = yield* journalModel(["# Round result\n\nResult output."]); + const entry = model.entries[0]; + if (entry === undefined) { + throw new Error("the journal recorded no entry"); + } + expect(entry.terminal?.output).toBeDefined(); + const presenter = yield* usePresenter(NARROW); + let state = reduceRepl( + initialState("feedback"), + { kind: "select-pane", pane: "sidekick" }, + model, + IDLE, + ).state; + function* commit() { + const resolved = viewFor(state, model, IDLE, NARROW, focused(presenter)); + if (!resolved.ok) { + throw resolved.error; + } + const view = withWorkspace(resolved.value, { + ...workspaceOf(model), + feedback: [ + { + conversation: "owned", + response: "r1", + turn: 1, + source: 1, + text: "results", + key: "owned:r1:1", + label: "Round 1 result sent to Sidekick", + controls: ["REPL.EntryInput", "REPL.Submit"], + entries: [{ key: entry.key, round: entry.order }], + }, + ], + }); + const shown = yield* presenter.commit(view); + state = focusSettled(view, focused(presenter), shown.committed.admission); + return shown; + } + yield* commit(); + state = reduceRepl( + state, + { kind: "inspect-sidekick", target: "feedback", key: "owned:r1:1" }, + model, + IDLE, + ).state; + const toggle = "drawer:inspection:feedback"; + const link = `drawer:inspection:entry:${entry.key}`; + // The toggle is the sixth content row of a five-row window, so the frame + // answering the request can only show it by starting one row down. + const opened = yield* commit(); + const first = { + from: windowOf(opened.committed.admission, DRAWER_WINDOW).from, + focused: focused(presenter), + toggle: opened.boundsOf(toggle), + link: opened.boundsOf(link), + }; + expect(first.from).toBe(1); + expect(first.focused).toBe(toggle); + expect(first.toggle).toBeDefined(); + expect(first.link).toBeDefined(); + expect(presenter.grid.rows()[first.toggle?.y ?? -1]).toContain("Show recorded feedback"); + expect(state.inspection?.offset).toBe(1); + expect(state.restore).toBeUndefined(); + + const settled = yield* commit(); + expect(windowOf(settled.committed.admission, DRAWER_WINDOW).from).toBe(first.from); + expect(focused(presenter)).toBe(toggle); + expect(settled.boundsOf(toggle)).toEqual(first.toggle); + expect(settled.boundsOf(link)).toEqual(first.link); + expect(presenter.grid.rows()[first.toggle?.y ?? -1]).toContain("> Show recorded feedback"); + }); }); describe("REPL focus regions: background input ownership", () => {