From 92ff9dec0e9e154ac6b8525bc737d06f812f3b07 Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Sun, 15 Nov 2026 16:07:51 -0500 Subject: [PATCH 1/3] Inspect saved Sidekick exchanges and feedback --- .../fixtures/repl-ui-conversation.md | 41 ++ .../repl-bench/journeys/conversation.test.md | 82 +++ packages/cli/src/repl/application.ts | 633 ++++++++++++++++-- packages/cli/src/repl/components/actions.ts | 7 + packages/cli/src/repl/components/rows.ts | 20 + packages/cli/src/repl/program.ts | 80 ++- packages/cli/src/repl/screen-regions.ts | 14 +- packages/cli/src/repl/sidekick/model.ts | 58 +- packages/cli/src/repl/sidekick/owner.ts | 1 + .../cli/tests/repl-sidekick-journey.test.ts | 6 +- .../tests/repl-sidekick-presentation.test.ts | 13 +- .../cli/tests/repl-sidekick-recovery.test.ts | 55 ++ specs/repl-spec.md | 18 + 13 files changed, 934 insertions(+), 94 deletions(-) create mode 100644 examples/repl-bench/fixtures/repl-ui-conversation.md create mode 100644 examples/repl-bench/journeys/conversation.test.md diff --git a/examples/repl-bench/fixtures/repl-ui-conversation.md b/examples/repl-bench/fixtures/repl-ui-conversation.md new file mode 100644 index 000000000..e268a44be --- /dev/null +++ b/examples/repl-bench/fixtures/repl-ui-conversation.md @@ -0,0 +1,41 @@ + + + +```xmd +Conversation fixture ready. +``` + +{ready} + + + + +```xmd + +``` + +{read} + + + + +````xmd + +```xmd +Checkout output witness. +``` + +{entry} + +```` + +{submit} + + + + +```xmd +Checkout review complete. +``` + +{done} diff --git a/examples/repl-bench/journeys/conversation.test.md b/examples/repl-bench/journeys/conversation.test.md new file mode 100644 index 000000000..55b045e46 --- /dev/null +++ b/examples/repl-bench/journeys/conversation.test.md @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/cli/src/repl/application.ts b/packages/cli/src/repl/application.ts index 26430f3d9..108404866 100644 --- a/packages/cli/src/repl/application.ts +++ b/packages/cli/src/repl/application.ts @@ -117,6 +117,7 @@ import type { ReplHistoryNavigation } from "./navigation.ts"; import { blankBand, EMPTY_BAND } from "./history-rail.ts"; import type { ReplPreparedRail } from "./history-rail.ts"; import { entryReading, NO_READING } from "./source-reading.ts"; +import type { SidekickFeedback } from "./sidekick/model.ts"; import { inertCommandText } from "./command-output.ts"; import type { ReplCommandOutput } from "./command-output.ts"; import type { ReplReading } from "./source-reading.ts"; @@ -370,6 +371,8 @@ export interface ReplSidekickTurnRow { readonly usageLine?: string; readonly origin?: MessageOrigin; /** The mounted identity: this process's response, or the saved turn's own. */ + readonly answer?: number; + readonly controls?: readonly string[]; readonly key: string; /** The chat this turn belongs to, which is what activating it opens. */ readonly conversation: string; @@ -460,6 +463,7 @@ export interface ReplSidekickSubmit { } export interface ReplSidekickReading { + readonly feedback?: readonly SidekickFeedback[]; readonly usageTotal?: string; readonly inspectUsage?: boolean; /** @@ -1072,9 +1076,18 @@ interface ReplSidekickNotice { readonly decision?: "dismissed" | "retried"; } +interface ReplInspection { + readonly kind: "feedback" | "exchange" | "person" | "entry"; + readonly key: string; + readonly expanded?: boolean; + readonly turn?: number; + readonly offset?: number; +} + /** Everything typed and not yet committed anywhere. */ export interface ReplState { readonly showUsage?: boolean; + readonly inspection?: ReplInspection; readonly sidekickNotice?: ReplSidekickNotice; readonly todoOpen?: boolean; readonly todoOffset?: number; @@ -1447,6 +1460,7 @@ export interface ReplQueuedMessage { /** The entry one Sidekick message submitted, shown after that message as work. */ interface ReplAssociatedWork { + readonly settled?: boolean; readonly usageLine?: string; /** The chat row the work follows, by the key the reading gives that row. */ readonly message: string; @@ -1454,6 +1468,13 @@ interface ReplAssociatedWork { readonly entry: string; } +interface ReplRecordedFeedback extends SidekickFeedback { + readonly key: string; + readonly label: string; + readonly controls: readonly string[]; + readonly entries: readonly { readonly key: string; readonly round: number }[]; +} + /** Acknowledged work and live-only queue presentation. */ export interface ReplWorkspace { readonly todo?: { readonly document?: TodoDocument; readonly error?: string }; @@ -1470,6 +1491,7 @@ export interface ReplWorkspace { /** The live queue hold, without an execution handle. */ readonly queueHeld?: { readonly kind: "stopped" | "failure"; readonly reason: string }; readonly work: readonly ReplAssociatedWork[]; + readonly feedback?: readonly ReplRecordedFeedback[]; /** * How far the tray's own window is scrolled through those messages. * @@ -1505,11 +1527,51 @@ export function workspaceOf( }, follow?: boolean, ): ReplWorkspace { + const work = associatedWork(model, sidekick); + const feedback = recordedFeedback(model, sidekick, work); return Object.freeze({ ...(follow === undefined ? {} : { follow }), queued: Object.freeze((queue?.pending ?? []).map((one) => Object.freeze({ ...one }))), ...(queue?.held === undefined ? {} : { queueHeld: queue.held }), - work: associatedWork(model, sidekick), + work, + feedback, + }); +} + +function recordedFeedback( + model: ReplModel | undefined, + reading: ReplSidekickReading | undefined, + work: readonly ReplAssociatedWork[], +): readonly ReplRecordedFeedback[] { + if (model === undefined || reading?.feedback === undefined) { + return []; + } + const entries = new Map(model.entries.map((entry) => [entry.key, entry.order])); + const turns = new Map(reading.turns.map((turn) => [turn.key, turn])); + return reading.feedback.map((packet) => { + const id = `${packet.conversation}:${packet.response}`; + const controls = turns.get(`sidekick:${id}`)?.controls ?? []; + const linked = work.flatMap((item) => { + const round = entries.get(item.entry); + return item.message === `chat:${id}` && item.settled && round !== undefined + ? [{ key: item.entry, round }] + : []; + }); + const label = + linked.length > 0 + ? `${linked.map((entry) => `Round ${entry.round}`).join(", ")} result sent to Sidekick` + : controls.length === 1 + ? `${controls[0]} result sent to Sidekick` + : controls.length > 0 + ? "Control result sent to Sidekick" + : "Feedback sent to Sidekick"; + return Object.freeze({ + ...packet, + key: `${id}:${packet.turn}`, + label, + controls, + entries: Object.freeze(linked), + }); }); } @@ -1595,6 +1657,7 @@ function associatedWork( Object.freeze({ message, entry: admitted.key, + settled: submit.settled && submit.admitted, usageLine: admitted.terminal === undefined ? undefined @@ -2431,6 +2494,7 @@ export function reduceRepl( { ...state.route, surface: "entries", + view: state.inspection === undefined ? state.route.view : undefined, scopes: Object.freeze([...action.scopes]), // A drawer named a thing inside the scope that was open. Selecting a // different scope cannot keep it. @@ -2443,7 +2507,10 @@ export function reduceRepl( // looking at. A refused one changes nothing, the catalog included: the // row they pressed is still there to press again. return chosen.state.refusal === undefined - ? { ...chosen, state: Object.freeze({ ...chosen.state, catalog: false }) } + ? { + ...chosen, + state: Object.freeze({ ...chosen.state, catalog: false, inspection: undefined }), + } : chosen; } case "open-catalog": { @@ -2516,6 +2583,40 @@ export function reduceRepl( live, ); } + case "inspect-sidekick": { + const prior = state.inspection; + const closing = prior?.kind === action.target && prior.key === action.key; + return settled({ + ...state, + inspection: closing ? undefined : { kind: action.target, key: action.key }, + restore: + !closing && action.target === "feedback" + ? { kind: "reveal", key: "drawer:inspection:feedback" } + : undefined, + }); + } + case "inspect-saved-turn": { + const inspection = state.inspection; + return inspection?.kind === "exchange" + ? settled({ + ...state, + inspection: { ...inspection, turn: action.turn ?? undefined, offset: 0 }, + }) + : settled(state); + } + case "toggle-recorded-feedback": { + const inspection = state.inspection; + return inspection?.kind === "feedback" + ? settled({ + ...state, + inspection: { + ...inspection, + expanded: !inspection.expanded, + offset: inspection.expanded ? 0 : inspection.offset, + }, + }) + : settled(state); + } case "close-drawer": { if (state.route.drawers.length === 0 && state.catalog) { return settled({ ...state, catalog: false }); @@ -2539,7 +2640,9 @@ export function reduceRepl( refusal: undefined, }); } - return refuse(state, "no drawer is open."); + return state.inspection === undefined + ? refuse(state, "no drawer is open.") + : settled({ ...state, inspection: undefined }); } const closing = state.route.drawers[state.route.drawers.length - 1]; if (closing?.kind === "live-permission") { @@ -3271,6 +3374,14 @@ export function reduceRepl( case "scroll": { const open = state.route.drawers[state.route.drawers.length - 1]; if (open === undefined) { + const inspection = state.inspection; + const window = admission.windows.get(DRAWER_WINDOW); + if (inspection !== undefined && window !== undefined) { + return settled({ + ...state, + inspection: { ...inspection, offset: scrolled(window, action.delta) }, + }); + } return refuse(state, "no drawer is open to scroll."); } // The window the frame measured for the drawer that is open. One viewport @@ -3966,6 +4077,7 @@ type ReplChatComposed = readonly style: ReplRowStyle; /** The origin drawn over the first four cells of its first row, where marked. */ readonly mark?: ReplOriginMark; + readonly action?: { readonly [name: string]: Json }; } | { readonly kind: "control"; @@ -4284,9 +4396,18 @@ function chatSequence( } function materializeChatRow(one: ReplChatPreparedRow, focused: string | undefined): Described { - return one.kind === "control" - ? row(one.key, one.label, one.action, one.style, { here: focused }) - : chatRow(one.key, one.label, one.item, one.first); + if (one.kind === "control") { + return row(one.key, one.label, one.action, one.style, { here: focused }); + } + const { action, mark } = one.item; + if (one.first && action !== undefined && mark !== undefined) { + const label = mark.text + one.label.slice(CONTROL_ROOM.length + MARKER_ROOM.length); + return row(one.key, label, action, one.item.style, { + here: focused, + runs: markedRuns(mark, label, one.item.style.role), + }); + } + return chatRow(one.key, one.label, one.item, one.first); } function chatWindow(view: ReplView, context: ReplPresentationContext): readonly Described[] { @@ -4322,6 +4443,8 @@ function chatFacts(view: ReplView): readonly (string | number | boolean | null | reading?.setup?.phase, reading?.setup?.failure, staging !== undefined, + staging?.inspection?.kind, + staging?.inspection?.key, ]; for (const one of reading?.chat ?? []) { if (one.conversation !== reading?.reading) { @@ -4347,6 +4470,12 @@ function chatFacts(view: ReplView): readonly (string | number | boolean | null | ); } facts.push(undefined); + for (const packet of staging?.feedback ?? []) { + if (packet.conversation === reading?.reading) { + facts.push(packet.key, packet.label); + } + } + facts.push(undefined); for (const one of staging?.work ?? []) { const entry = staging?.model.entries.find((candidate) => candidate.key === one.entry); facts.push( @@ -4460,11 +4589,20 @@ function chatRow( first: boolean, ): Described { const mark = one.mark; - if (!first || mark === undefined || !label.startsWith(MARKER_ROOM)) { + const room = CONTROL_ROOM + MARKER_ROOM; + if (!first || mark === undefined || !label.startsWith(room)) { return line(key, label, one.style); } - const drawn = `${mark.text}${label.slice(MARKER_ROOM.length)}`; - return line(key, drawn, one.style, markedRuns(mark, drawn, one.style.role)); + const drawn = mark.text + label.slice(room.length); + return line( + key, + CONTROL_ROOM + drawn, + one.style, + tokenRuns([ + { text: CONTROL_ROOM, token: one.style.role }, + ...markedRuns(mark, drawn, one.style.role), + ]), + ); } /** @@ -4731,7 +4869,12 @@ function navigate( if (!resolved.ok) { return refuse(state, resolved.error.message); } - return settled({ ...state, route, refusal: undefined }); + return settled({ + ...state, + route, + inspection: route.sidekick === state.route.sidekick ? state.inspection : undefined, + refusal: undefined, + }); } /** How a value reads in one line of a list. */ @@ -6074,7 +6217,8 @@ function described(view: ReplView, context: ReplPresentationContext): DescribedS // surface headings and the catalog's own rows have no region in it. const workspace = staged(view); - const showEntry = (!narrow || routed === "entries") && !(narrow && showSidekick); + const workCovered = inlineInspectionOpen(view); + const showEntry = !workCovered && (!narrow || (routed === "entries" && !showSidekick)); // Which surface to be on belongs to neither surface. A narrow frame mounts one // outlet, so a control that lives inside the outlet can only take somebody @@ -6130,8 +6274,8 @@ function described(view: ReplView, context: ReplPresentationContext): DescribedS items.push( ...workspaceHeadings(view, context.selector, { transcript: !narrow || routed === "sessions", - work: !narrow || (routed === "entries" && !showSidekick), - entries: !narrow, + work: showEntry, + entries: !narrow && !workCovered, }), ); } @@ -6561,7 +6705,7 @@ function described(view: ReplView, context: ReplPresentationContext): DescribedS if (workspace !== undefined) { // With the selected work, which is the surface it is part of. A narrow // frame showing the Transcript or the Sidekick has no region to draw it in. - if (!narrow || (routed === "entries" && !showSidekick)) { + if (showEntry) { items.push(...workspaceDraft(view, context, claiming)); } } else { @@ -7068,6 +7212,8 @@ function createSessionPreparationStore(): ReplSessionPreparationStore { view.size.rows, compact, view.state.showUsage === true, + view.state.inspection?.kind, + view.state.inspection?.key, view.state.route.session, view.state.route.surface, view.state.filtering, @@ -7127,6 +7273,7 @@ function createSessionPreparationStore(): ReplSessionPreparationStore { turn.conversation, turn.agent, turn.turn, + turn.answer, turn.title, turn.state, turn.running, @@ -7138,6 +7285,9 @@ function createSessionPreparationStore(): ReplSessionPreparationStore { ); } if (compact) { + for (const item of view.workspace?.feedback ?? []) { + facts.push(item.key, item.source, item.label); + } for (const item of sidekick?.chat ?? []) { if (item.kind === "person") { facts.push(item.conversation, item.turn, item.origin?.kind); @@ -7151,7 +7301,14 @@ function createSessionPreparationStore(): ReplSessionPreparationStore { ) { return held.sequence; } - const rows = sessionRows(view.state, turns, width, sidekick, compact); + const rows = sessionRows( + view.state, + turns, + width, + sidekick, + compact, + view.workspace?.feedback ?? [], + ); const sequence = { rows, positions: new Map(rows.map((one, at) => [one.key, at])) }; held = { facts, sequence }; return sequence; @@ -7190,6 +7347,7 @@ function sessionRows( * it. */ compact = false, + feedback: readonly ReplRecordedFeedback[] = [], ): readonly ReplSessionRow[] { const items: ReplSessionRow[] = []; const filter = state.route.session; @@ -7445,6 +7603,18 @@ function sessionRows( turns.set(item.turn, originMark(item.origin)); } } + const received = new Set(); + const packets = new Map(); + for (const packet of feedback) { + received.add(`${packet.conversation}:${packet.turn}`); + const key = `${packet.conversation}:${packet.source}`; + const listed = packets.get(key); + if (listed === undefined) { + packets.set(key, [packet]); + } else { + listed.push(packet); + } + } let label: string | undefined; for (const turn of chat) { const whose = [turn.agent, turn.conversation, turn.sessionKey] @@ -7460,14 +7630,40 @@ function sessionRows( ); } label = whose; + const sent = packets.get(`${turn.conversation}:${turn.turn}`) ?? []; + const person = origins.get(turn.conversation)?.get(turn.turn ?? -1); items.push( ...compactSidekickTurn( turn, width, - origins.get(turn.conversation)?.get(turn.turn ?? -1) ?? PERSON_MARK, + person ?? PERSON_MARK, state.showUsage === true, + (sent.length === 0 && + (turn.text === "" || !received.has(`${turn.conversation}:${turn.turn}`))) || + person !== undefined || + turn.state !== "completed" || + turn.running, + state.inspection?.kind === "exchange" && state.inspection.key === turn.key, ), ); + for (const packet of sent) { + const label = fitControl( + [{ text: FEEDBACK_MARK.text }, { text: packet.label, elide: true }], + width, + ); + items.push( + sessionControl( + `sessions:feedback:${packet.key}`, + label, + inspectionAction("feedback", packet.key), + styleOf("action", { + selected: + state.inspection?.kind === "feedback" && state.inspection.key === packet.key, + }), + { runs: markedRuns(FEEDBACK_MARK, label, "action") }, + ), + ); + } } return items; } @@ -7826,6 +8022,30 @@ function showingSidekick(view: ReplView): boolean { : (view.state.route.right ?? "sidekick") === "sidekick"; } +function presentedInspection(view: ReplView): ReplInspection | undefined { + return staged(view) === undefined || + view.selection.drawers.length > 0 || + presentedCatalog(view) || + presentedAsking(view) !== undefined || + presentedConfiguring(view) !== undefined + ? undefined + : view.state.inspection; +} + +export function inlineInspectionOpen(view: ReplView): boolean { + return presentedInspection(view) !== undefined && profileFor(view.size) !== "narrow"; +} + +function inspectionRect(size: ReplTerminalSize): ReplBounds { + const x = workspaceTranscriptWidth(size); + const width = workspaceWorkWidth(size); + if (x !== undefined && width !== undefined) { + return { x, y: 1, width, height: size.rows - 3 }; + } + const height = Math.floor(size.rows * 0.6); + return { x: 1, y: size.rows - height - 2, width: size.columns - 2, height }; +} + /** * Whether a modal is holding focus, by either owner. * @@ -7839,7 +8059,8 @@ export function modalOpen(view: ReplView): boolean { view.selection.drawers.length > 0 || presentedCatalog(view) || presentedAsking(view) !== undefined || - presentedConfiguring(view) !== undefined + presentedConfiguring(view) !== undefined || + (profileFor(view.size) === "narrow" && presentedInspection(view) !== undefined) ); } @@ -7873,7 +8094,9 @@ function presentedRect(view: ReplView, context: ReplPresentationContext): ReplBo ? (context.drawer ?? drawerRect(view.size, workspace)) : presentedAsking(view) !== undefined || presentedConfiguring(view) !== undefined ? sidekickDrawerRect(view.size, workspace) - : undefined; + : presentedInspection(view) === undefined + ? undefined + : inspectionRect(view.size); if (rect === undefined || !workspace) { return rect; } @@ -7916,6 +8139,7 @@ function drawerFor( return undefined; } const { title, titleStyle, dismissing, entering, content } = held; + const inline = inlineInspectionOpen(view); const width = context.widths?.drawer ?? 0; // Which owner's drawer this is, for the scroll controls, the editable line // the window claims focus for, and `[close]`. One drawer is presented at a @@ -7991,10 +8215,10 @@ function drawerFor( }), ); } - if (offered("footer:history")) { + if (!inline && offered("footer:history")) { rows.push(history); } - if (drawable && offered("footer:exit")) { + if (!inline && drawable && offered("footer:exit")) { rows.push(exit); } rows.push( @@ -8077,12 +8301,206 @@ function drawerFor( component: DRAWER, input: { label: width < 1 ? title : title.padEnd(width, " ") }, children, - modal: true, + ...(inline ? {} : { modal: true }), }), }; return { drawer, rows: visibleRows }; } +function inspectionAction(target: ReplInspection["kind"], key: string) { + return { select: "inspect-sidekick", target, key }; +} + +function exchangeOf(reading: ReplSidekickReading | undefined, key: string) { + const turn = reading?.turns.find((candidate) => candidate.key === key); + return turn?.answer === undefined + ? [] + : (reading?.turns ?? []).filter( + (candidate) => + candidate.conversation === turn.conversation && + candidate.answer === turn.answer && + !candidate.running, + ); +} + +function inspectionLines(view: ReplView, inspection: ReplInspection) { + const sidekick = view.live.sidekick; + const turns = inspection.kind === "exchange" ? exchangeOf(sidekick, inspection.key) : []; + const pieces = + inspection.kind === "feedback" + ? inspection.expanded + ? [{ text: view.workspace?.feedback?.find((item) => item.key === inspection.key)?.text }] + : [] + : inspection.kind === "person" + ? [ + { + text: sidekick?.chat.find( + (item) => item.kind === "person" && item.key === inspection.key, + )?.text, + }, + ] + : inspection.kind === "entry" + ? [ + { + text: view.model.entries.find((entry) => entry.key === inspection.key)?.terminal + ?.output, + }, + ] + : turns + .filter((turn) => inspection.turn === undefined || turn.turn === inspection.turn) + .map((turn) => ({ text: turn.text })); + const lines = pieces.flatMap(({ text }) => + text === undefined || text === "" ? [] : inertCommandText(text).split("\n"), + ); + return lines.map((text, offset) => ({ + key: `drawer:inspection:detail:${offset}`, + text, + runs: tokenRuns([{ text, token: "field-value" }]), + })); +} + +function inspectionContent( + view: ReplView, + inspection: ReplInspection, + width: number, + details: readonly ReplFittedLine[] | undefined, +): DrawerContent | undefined { + const content: DrawerRow[] = []; + const say = (key: string, label: string, style = styleOf("metadata")) => { + content.push({ described: drawerLine(`drawer:inspection:${key}`, label, width, style) }); + }; + const choose = (key: string, label: string, action: { readonly [name: string]: Json }) => { + content.push({ + described: row( + `drawer:inspection:${key}`, + padControl(fitControl([{ text: label, elide: true }], width), width), + action, + styleOf("action"), + { claim: focusClaim(view), here: view.focused }, + ), + }); + }; + const link = (key: string, round: number) => { + choose(`entry:${key}`, `linked entry Round ${round} ›`, { select: "scope", scopes: [key] }); + }; + const sidekick = view.live.sidekick; + let title: string; + if (inspection.kind === "feedback") { + const feedback = view.workspace?.feedback?.find((item) => item.key === inspection.key); + if (feedback === undefined) { + return undefined; + } + title = "XMD · automatic feedback"; + say("result", feedback.label, styleOf("field-label")); + if (feedback.controls.length > 0) { + say("controls", feedback.controls.join(" · ")); + } + for (const entry of feedback.entries) { + link(entry.key, entry.round); + } + choose("feedback", inspection.expanded ? "Hide recorded feedback" : "Show recorded feedback", { + select: "toggle-recorded-feedback", + }); + } else if (inspection.kind === "person") { + const person = sidekick?.chat.find( + (item) => item.kind === "person" && item.key === inspection.key, + ); + if (person === undefined) { + return undefined; + } + title = person.origin?.kind === "acp" ? "Attached client · Message" : "You · Message"; + } else if (inspection.kind === "entry") { + const entry = view.model.entries.find((item) => item.key === inspection.key); + if (entry === undefined) { + return undefined; + } + title = `Round ${entry.order} · Result`; + say("status", workState(entry, view.model, view.live).word); + link(entry.key, entry.order); + } else { + const turns = exchangeOf(sidekick, inspection.key); + if (turns.length === 0) { + return undefined; + } + const selected = turns.findIndex((turn) => turn.turn === inspection.turn); + title = + selected < 0 + ? `Sidekick · ${turns.length} saved ${turns.length === 1 ? "turn" : "turns"}` + : `Sidekick · saved turn ${selected + 1} of ${turns.length}`; + say("saved", "SAVED TURNS", styleOf("field-label")); + if (selected >= 0) { + choose("exchange", "‹ whole exchange", { select: "inspect-saved-turn", turn: null }); + } + for (const [index, turn] of turns.entries()) { + if (turn.turn === null) { + continue; + } + const packet = view.workspace?.feedback?.find( + (item) => item.conversation === turn.conversation && item.turn === turn.turn, + ); + const origin = + packet === undefined + ? index === 0 + ? "prompted by your message" + : undefined + : `prompted by [X] ${packet.entries.length > 0 ? `Round ${packet.entries[0]!.round} result` : packet.controls.join(", ") || "control result"}`; + if (selected === index) { + if (origin !== undefined) { + say("origin", origin); + } + if (turn.controls !== undefined && turn.controls.length > 0) { + say("controls", turn.controls.join(" · ")); + } + for (const entry of packet?.entries ?? []) { + link(entry.key, entry.round); + } + } else { + const label = [ + `Turn ${index + 1}`, + origin, + turn.failed ? turn.state : undefined, + view.state.showUsage === true ? turn.usageLine : undefined, + ] + .filter((one) => one !== undefined) + .join(" · "); + choose(`turn:${turn.turn}`, label, { select: "inspect-saved-turn", turn: turn.turn }); + } + } + if ( + selected >= 0 && + view.state.showUsage === true && + turns[selected]?.usageLine !== undefined + ) { + say("usage", turns[selected]!.usageLine!); + } + if ( + turns.some((turn) => (selected < 0 || turn.turn === inspection.turn) && turn.text.length > 0) + ) { + say("output", "Output", styleOf("field-label")); + } + } + const shown = + details ?? inspectionLines(view, inspection).map((line) => ({ ...line, indent: 0 })); + for (const line of shown) { + content.push({ + described: drawerLine( + line.key, + " ".repeat(line.indent) + line.text, + width, + styleOf("field-value"), + line.runs, + ), + }); + } + return { + title, + titleStyle: styleOf("drawer-title"), + content, + entering: false, + dismissing: undefined, + }; +} + /** What one drawer reading holds, before any window decides what is shown. */ interface DrawerContent { readonly title: string; @@ -8150,7 +8568,13 @@ function drawerContent( return configureContent(view, settings, width, notices); } const asking = presentedAsking(view); - return asking === undefined ? undefined : askingContent(view, asking, width, preview); + if (asking !== undefined) { + return askingContent(view, asking, width, preview); + } + const inspection = presentedInspection(view); + return inspection === undefined + ? undefined + : inspectionContent(view, inspection, width, details); } // Every row of this drawer reaches its own right edge. A modal that wrote only // its own text would let what it is in front of show through from where that @@ -9366,6 +9790,10 @@ function detailLines(key: string, value: Json, style: ReplRowStyle) { export function retainedDetailsOf(view: ReplView) { const open = view.selection.drawers.at(-1); + const inspection = presentedInspection(view); + if (inspection !== undefined) { + return inspectionLines(view, inspection); + } if (open?.kind === "binding" || open?.kind === "entry-value") { return detailLines("drawer:value", open.binding.value, styleOf("field-value")); } @@ -11708,7 +12136,10 @@ function offsetOf(view: ReplView, window: string): number { if (window === ENTRIES_WINDOW) { return view.state.viewports.entries; } - return drawerOffsetOf(view.state, view.state.route.drawers[view.state.route.drawers.length - 1]); + return ( + presentedInspection(view)?.offset ?? + drawerOffsetOf(view.state, view.state.route.drawers[view.state.route.drawers.length - 1]) + ); } /** @@ -11782,6 +12213,7 @@ const ATTACHMENT_MARK: ReplOriginMark = Object.freeze({ text: "[C] ", role: "origin-attachment", }); +const FEEDBACK_MARK: ReplOriginMark = { text: "[X] ", role: "metadata" }; const WORK_MARK: ReplOriginMark = Object.freeze({ text: "[R] ", role: "origin-repl" }); /** The mark a message's own origin earns: a person here, or an attached client. */ @@ -11810,6 +12242,8 @@ interface ReplChatStaging { readonly model: ReplModel; readonly live: ReplLive; readonly work: readonly ReplAssociatedWork[]; + readonly feedback: readonly ReplRecordedFeedback[]; + readonly inspection?: ReplInspection; readonly notice?: ReplSidekickNotice; readonly showUsage: boolean; } @@ -11823,6 +12257,8 @@ function chatStagingOf(view: ReplView): ReplChatStaging | undefined { model: view.model, live: view.live, work: workspace.work, + feedback: workspace.feedback ?? [], + inspection: presentedInspection(view), notice: view.state.sidekickNotice, showUsage: view.state.showUsage === true, }; @@ -11876,9 +12312,13 @@ function workComposed(staging: ReplChatStaging, key: string): readonly ReplChatC Object.freeze({ kind: "text" as const, key: `sidekick:work:${entry.key}`, - text: `${MARKER_ROOM}Entry ${entry.order} · ${state.word}`, - style: state.style, + text: `${CONTROL_ROOM}${MARKER_ROOM}Entry ${entry.order} · ${state.word}`, + style: + staging.inspection?.kind === "entry" && staging.inspection.key === entry.key + ? { ...state.style, selected: true } + : state.style, mark: WORK_MARK, + action: inspectionAction("entry", entry.key), }), ); if (staging.showUsage && one.usageLine !== undefined) { @@ -11886,7 +12326,7 @@ function workComposed(staging: ReplChatStaging, key: string): readonly ReplChatC Object.freeze({ kind: "text" as const, key: `sidekick:work:${entry.key}:usage`, - text: `${MARKER_ROOM}${one.usageLine}`, + text: `${CONTROL_ROOM}${MARKER_ROOM}${one.usageLine}`, style: styleOf("metadata"), }), ); @@ -11901,7 +12341,7 @@ function workComposed(staging: ReplChatStaging, key: string): readonly ReplChatC key: `sidekick:work:${entry.key}:output`, text: output .split("\n") - .map((own) => `${MARKER_ROOM}${own}`) + .map((own) => `${CONTROL_ROOM}${MARKER_ROOM}${own}`) .join("\n"), style: styleOf("output"), }), @@ -11928,17 +12368,35 @@ function workspaceChatComposed( said: string, style: ReplRowStyle, mark: ReplOriginMark, + action?: { readonly [name: string]: Json }, ): ReplChatComposed => Object.freeze({ kind: "text" as const, key, text: said .split("\n") - .map((own) => `${MARKER_ROOM}${own}`) + .map((own) => `${CONTROL_ROOM}${MARKER_ROOM}${own}`) .join("\n"), style, mark, + action, }); + const feedback = new Map(); + for (const packet of staging.feedback) { + if (packet.conversation !== reading.reading) { + continue; + } + const key = `chat:${packet.conversation}:${packet.response}`; + const listed = feedback.get(key); + if (listed === undefined) { + feedback.set(key, [packet]); + } else { + listed.push(packet); + } + } + const savedTurns = new Map( + reading.turns.map((turn) => [`${turn.conversation}:${turn.turn}`, turn]), + ); const shownChat = reading.chat.filter((item) => item.conversation === reading.reading); if (shownChat.length === 0) { items.push(text("sidekick:empty", "No messages yet.", styleOf("metadata"), SIDEKICK_MARK)); @@ -11946,7 +12404,17 @@ function workspaceChatComposed( for (const item of shownChat) { const key = `sidekick:${item.key}`; if (item.kind === "person") { - items.push(text(key, item.text, styleOf("source"), originMark(item.origin))); + items.push( + text( + key, + item.text, + styleOf("source", { + selected: staging.inspection?.kind === "person" && staging.inspection.key === item.key, + }), + originMark(item.origin), + inspectionAction("person", item.key), + ), + ); } else if (item.kind === "preview") { // Said as the attempt it is. Nothing has been evaluated, no control has // run and no turn is acknowledged, so this is not a reply yet — and a @@ -12022,7 +12490,21 @@ function workspaceChatComposed( ); } } else if (item.hasOutput) { - items.push(text(key, trimLeadingBlankLines(item.text), styleOf("output"), SIDEKICK_MARK)); + const saved = savedTurns.get(`${item.conversation}:${item.turn}`); + items.push( + text( + key, + trimLeadingBlankLines(item.text), + styleOf("output", { + selected: + staging.inspection?.kind === "exchange" && staging.inspection.key === saved?.key, + }), + SIDEKICK_MARK, + item.request !== undefined && saved !== undefined + ? inspectionAction("exchange", saved.key) + : undefined, + ), + ); } if (staging.showUsage && item.usageLine !== undefined) { items.push({ @@ -12033,6 +12515,19 @@ function workspaceChatComposed( }); } items.push(...workComposed(staging, key)); + for (const packet of feedback.get(item.key) ?? []) { + items.push({ + kind: "control", + key: `sidekick:feedback:${packet.key}`, + label: `↳ [X] ${packet.label}`, + action: inspectionAction("feedback", packet.key), + style: styleOf("action", { + selected: + staging.inspection?.kind === "feedback" && staging.inspection.key === packet.key, + }), + }); + } + if (staging.showUsage && reading.inspectUsage) { for (const [index, detail] of (item.usageDetails ?? []).entries()) { items.push({ @@ -12366,6 +12861,8 @@ function compactSidekickTurn( width: number | undefined, mark: ReplOriginMark, showUsage: boolean, + showRequest: boolean, + selected: boolean, ): readonly ReplSessionRow[] { const rows: ReplSessionRow[] = []; const style = turn.running @@ -12379,41 +12876,55 @@ function compactSidekickTurn( [{ text: mark.text }, { text: headline(turn.title), elide: true }, ...status], width, ); - rows.push( - sessionControl( - `sessions:${turn.key}`, - label, - { - select: "sidekick-turn", - conversation: turn.conversation, - ...(turn.turn === null ? {} : { turn: turn.turn }), - }, - style, - { runs: markedRuns(mark, label, style.role) }, - ), - ); + if (showRequest) { + rows.push( + sessionControl( + `sessions:${turn.key}`, + label, + { + select: "sidekick-turn", + conversation: turn.conversation, + ...(turn.turn === null ? {} : { turn: turn.turn }), + }, + style, + { runs: markedRuns(mark, label, style.role) }, + ), + ); + } if (showUsage && turn.usageLine !== undefined) { rows.push(...usageSessionRows(`sessions:${turn.key}:usage`, turn.usageLine, width)); } if (turn.text.length > 0) { - const said = fitLine( - [ - { text: `${CONTROL_ROOM}${SIDEKICK_MARK.text}` }, - { text: headline(trimLeadingBlankLines(turn.text)), elide: true }, - ], - width, - ); - rows.push( - sessionLine( - `sessions:${turn.key}:text`, - said, - styleOf("output"), - tokenRuns([ - { text: CONTROL_ROOM, token: "output" }, - ...markedRuns(SIDEKICK_MARK, said.slice(CONTROL_ROOM.length), "output"), - ]), - ), - ); + const value = headline(trimLeadingBlankLines(turn.text)); + const parts: readonly ReplLabelPart[] = [ + { text: SIDEKICK_MARK.text }, + { text: value, elide: true }, + ]; + if (turn.answer !== undefined && !turn.running && !turn.failed) { + const label = fitControl(parts, width); + rows.push( + sessionControl( + `sessions:${turn.key}:text`, + label, + inspectionAction("exchange", turn.key), + styleOf("output", { selected }), + { runs: markedRuns(SIDEKICK_MARK, label, "output") }, + ), + ); + } else { + const label = fitLine([{ text: CONTROL_ROOM }, ...parts], width); + rows.push( + sessionLine( + `sessions:${turn.key}:text`, + label, + styleOf("output"), + tokenRuns([ + { text: CONTROL_ROOM, token: "output" }, + ...markedRuns(SIDEKICK_MARK, label.slice(CONTROL_ROOM.length), "output"), + ]), + ), + ); + } } if (turn.failure !== undefined) { rows.push( diff --git a/packages/cli/src/repl/components/actions.ts b/packages/cli/src/repl/components/actions.ts index 2126463b5..05ea3de0f 100644 --- a/packages/cli/src/repl/components/actions.ts +++ b/packages/cli/src/repl/components/actions.ts @@ -174,6 +174,13 @@ export type ReplAction = /** Select a structural scope by its key path, outermost first. */ | { readonly kind: "select-scope"; readonly scopes: readonly string[] } | { readonly kind: "open-drawer"; readonly drawer: ReplDrawerRef } + | { + readonly kind: "inspect-sidekick"; + readonly target: "feedback" | "exchange" | "person" | "entry"; + readonly key: string; + } + | { readonly kind: "inspect-saved-turn"; readonly turn: number | null } + | { readonly kind: "toggle-recorded-feedback" } /** Close the innermost open drawer. Never an answer to anything. */ | { readonly kind: "close-drawer" } /** Freeze the view at one history position. */ diff --git a/packages/cli/src/repl/components/rows.ts b/packages/cli/src/repl/components/rows.ts index 0a3b30b3f..a2b0d4174 100644 --- a/packages/cli/src/repl/components/rows.ts +++ b/packages/cli/src/repl/components/rows.ts @@ -327,6 +327,26 @@ function activation(input: ReplViewData): ReplAction | undefined { if (select === "continue") { return { kind: "continue" }; } + if (select === "inspect-sidekick") { + const target = named["target"]; + const key = named["key"]; + return (target === "feedback" || + target === "exchange" || + target === "person" || + target === "entry") && + typeof key === "string" + ? { kind: "inspect-sidekick", target, key } + : undefined; + } + if (select === "inspect-saved-turn") { + const turn = named["turn"]; + return turn === null || (typeof turn === "number" && turn > 0) + ? { kind: "inspect-saved-turn", turn } + : undefined; + } + if (select === "toggle-recorded-feedback") { + return { kind: "toggle-recorded-feedback" }; + } if (select === "close") { return { kind: "close-drawer" }; } diff --git a/packages/cli/src/repl/program.ts b/packages/cli/src/repl/program.ts index 27fbcdcde..72207f0d0 100644 --- a/packages/cli/src/repl/program.ts +++ b/packages/cli/src/repl/program.ts @@ -117,6 +117,7 @@ import { stagedWorkspace, workspaceHeaderLines, modalOpen, + inlineInspectionOpen, visibleSidekickNotice, readsGeometry, reduceRepl, @@ -2430,26 +2431,34 @@ function* drive( const region = shortcutRegion(digit); const at = yield* screen.size(); const profile = profileFor(at); - if ( - profile === "too-small" || - broken !== undefined || - modalOpen(yield* inputView(state, at)) - ) { + if (profile === "too-small" || broken !== undefined) { + return undefined; + } + const showing = yield* inputView(state, at); + if (modalOpen(showing)) { return undefined; } if (region === undefined) { return false; } const route = shortcutRoute(state.route, region, profile === "narrow"); + const revealWork = shortcutRevealsWork(showing, digit); const todoOpen = digit === "7" ? true : digit === "6" ? false : state.todoOpen; if ( starting || + revealWork || route !== state.route || todoOpen !== state.todoOpen || rendered?.size.columns !== at.columns || rendered.size.rows !== at.rows ) { - const candidate = { ...state, route, todoOpen, restore: undefined }; + const candidate = { + ...state, + route, + todoOpen, + inspection: revealWork ? undefined : state.inspection, + restore: undefined, + }; const view = yield* inputView(candidate, at); if (view.refusal !== undefined || modalOpen(view)) { return false; @@ -2491,15 +2500,22 @@ function* drive( const route = shortcutRoute(current, region, narrow); const todoOpen = digit === "7" ? true : digit === "6" ? false : state.todoOpen; const changeTab = (todoOpen === true) !== (state.todoOpen === true); - if (route === current && !changeTab) { + const revealWork = shortcutRevealsWork(view, digit); + if (route === current && !changeTab && !revealWork) { hints.set(digit, undefined); continue; } - const key = JSON.stringify([route.surface, route.view, route.right, todoOpen]); + const key = JSON.stringify([route.surface, route.view, route.right, todoOpen, revealWork]); let descriptions = routes.get(key); if (descriptions === undefined) { const destination = yield* inputView( - { ...state, route, todoOpen, restore: undefined }, + { + ...state, + route, + todoOpen, + inspection: revealWork ? undefined : state.inspection, + restore: undefined, + }, view.size, ); descriptions = []; @@ -2515,11 +2531,13 @@ function* drive( if (hasRegion(descriptions, region)) { hints.set( digit, - route !== current - ? focusRouteHint(route, narrow) - : todoOpen - ? "switches to the TODO tab" - : "switches to the Sidekick tab", + revealWork + ? "closes inspection" + : route !== current + ? focusRouteHint(route, narrow) + : todoOpen + ? "switches to the TODO tab" + : "switches to the Sidekick tab", ); } } @@ -2569,6 +2587,17 @@ function* drive( } } + if ( + event.kind === "key" && + event.key === "Escape" && + state.inspection !== undefined && + inlineInspectionOpen(yield* inputView(state, yield* screen.size())) + ) { + state = { ...state, inspection: undefined }; + yield* remount(); + return false; + } + const dispatched = yield* tree.dispatch(event); const action = dispatched.ok && dispatched.value.outcome === "action" @@ -3772,6 +3801,10 @@ function keyOfFocus(tree: ReplTree): string | undefined { return node === undefined ? undefined : tree.keyOf(node); } +function shortcutRevealsWork(view: ReplView, digit: string): boolean { + return (digit === "3" || digit === "4") && inlineInspectionOpen(view); +} + /** * Whether a wheel reduction moved a window and changed nothing else a frame * measures. @@ -3926,6 +3959,7 @@ function sidekickReadingOf( ), ), turns: sidekickTurnRows(read.value, owner.live), + feedback: read.value.feedback, usageTotal: usageSummary(read.value.turns, "Sidekick total"), inspectUsage: selected !== undefined, busy: owner.busy, @@ -4016,6 +4050,19 @@ export function sidekickTurnRows( live !== undefined && live.turn !== null ? { conversation: live.conversation, turn: live.turn, response: live.response } : undefined; + const answers = new Map( + known.answers.map((one) => [`${one.conversation}:${one.turn}`, one.message]), + ); + const controls = new Map(); + for (const operation of known.operations) { + const key = `${operation.conversation}:${operation.response}`; + const names = controls.get(key); + if (names === undefined) { + controls.set(key, [operation.component]); + } else if (!names.includes(operation.component)) { + names.push(operation.component); + } + } const rows: ReplSidekickTurnRow[] = known.turns.map((turn) => { const own = turn.reply?.response ?? @@ -4033,6 +4080,11 @@ export function sidekickTurnRows( conversation: turn.conversation, agent: turn.agent, turn: turn.turn, + answer: answers.get(`${turn.conversation}:${turn.turn}`), + controls: + own === undefined + ? undefined + : Object.freeze(controls.get(`${turn.conversation}:${own}`) ?? []), title: titleOf(turn.asked, turn.title), state: savedState(turn), usageLine: turnUsage(turn.usage), diff --git a/packages/cli/src/repl/screen-regions.ts b/packages/cli/src/repl/screen-regions.ts index 6b474fdb7..0002e48a7 100644 --- a/packages/cli/src/repl/screen-regions.ts +++ b/packages/cli/src/repl/screen-regions.ts @@ -237,7 +237,7 @@ function screenPlacement( if (key === "sessions:all" || key.startsWith("sessions:conversation:")) { return { region: transcript, groups: [CHOICES] }; } - if (key.startsWith("sessions:request:")) { + if (key.startsWith("sessions:request:") || (turn !== undefined && key === `${turn}:text`)) { return turn === undefined ? { region: transcript, groups: [TURNS] } : { region: transcript, groups: [TURNS, vertical(`turn:${turn}`)] }; @@ -273,6 +273,9 @@ function screenPlacement( } if ( key === "sidekick:back" || + key.startsWith("sidekick:chat:") || + key.startsWith("sidekick:work:") || + key.startsWith("sidekick:feedback:") || key.startsWith("sidekick:retry:") || key.startsWith("binding:") || key.startsWith("bindings-view:") || @@ -351,12 +354,13 @@ export function placeScreen( const children = read.children.map((child) => place(child, modal || read.modal)); let navigation: ReplPlacement | undefined; if (control(description)) { - if (!modal && turnRow(read.key)) { + if (!modal && turnRow(read.key) && read.key !== `${turn}:text`) { turn = read.key; } - navigation = modal - ? drawerPlacement(read.key, read.input) - : screenPlacement(read.key, facts, turn); + navigation = + modal || read.key.startsWith("drawer:") + ? drawerPlacement(read.key, read.input) + : screenPlacement(read.key, facts, turn); } if (navigation === undefined && children.every((child, at) => child === read.children[at])) { return description; diff --git a/packages/cli/src/repl/sidekick/model.ts b/packages/cli/src/repl/sidekick/model.ts index 7ba2a1bc1..707ccb7dc 100644 --- a/packages/cli/src/repl/sidekick/model.ts +++ b/packages/cli/src/repl/sidekick/model.ts @@ -481,6 +481,7 @@ export interface SidekickReading { * is that turn existing and having completed. */ readonly delivered: readonly { readonly conversation: string; readonly turn: number }[]; + readonly feedback: readonly SidekickFeedback[]; /** * Feedback this history states it sent and cannot establish. * @@ -524,6 +525,15 @@ export interface SidekickReading { }[]; } +/** The full canonical input that delivered one response's retained feedback. */ +export interface SidekickFeedback { + readonly conversation: string; + readonly response: string; + readonly turn: number; + readonly source: number; + readonly text: string; +} + /** * One request this history holds, and the saved turn its records own. * @@ -1086,6 +1096,27 @@ export function projectHistory(records: readonly SidekickRecord[]): Result(); let preferences: SidekickPreferences | undefined; const delivered = new Map(); + const feedback = new Map(); + const readingRequest = new Map(); + const responses = new Map(); + function acceptedFeedback( + record: Pick, + turn: number, + ) { + const source = responses.get(`${record.conversation}\u0000${record.response}`); + if (source !== undefined && source < turn) { + feedback.set( + `${record.conversation}\u0000${record.response}\u0000${turn}`, + Object.freeze({ + conversation: record.conversation, + response: record.response, + turn, + source, + text: record.text, + }), + ); + } + } const unestablished: { conversation: string; turn: number | null; at: number }[] = []; /** * Feedback text this history retained and never acknowledged, in record order. @@ -1098,6 +1129,7 @@ export function projectHistory(records: readonly SidekickRecord[]): Result retained.at && + held.completed.get(bounded) === retained.text + ) { + acceptedFeedback(retained, bounded); + } let owner: number | undefined; let owningAt = Number.POSITIVE_INFINITY; for (const [turn, input] of held.completed) { const at = held.at.get(turn); - if (at === undefined || at < feedback.at || input !== feedback.text) { + if (at === undefined || at < retained.at || input !== retained.text) { continue; } if (at < owningAt) { @@ -1399,10 +1446,10 @@ export function projectHistory(records: readonly SidekickRecord[]): Result Object.freeze({ conversation, turn })), ), + feedback: Object.freeze([...feedback.values()]), unestablished: Object.freeze( unestablished.map((held) => Object.freeze({ conversation: held.conversation, turn: held.turn }), diff --git a/packages/cli/src/repl/sidekick/owner.ts b/packages/cli/src/repl/sidekick/owner.ts index f5e2f93f6..c9fcbcd22 100644 --- a/packages/cli/src/repl/sidekick/owner.ts +++ b/packages/cli/src/repl/sidekick/owner.ts @@ -3119,6 +3119,7 @@ const EMPTY: SidekickReading = Object.freeze({ preferences: undefined, unfinished: Object.freeze([]), delivered: Object.freeze([]), + feedback: Object.freeze([]), unestablished: Object.freeze([]), answers: Object.freeze([]), }); diff --git a/packages/cli/tests/repl-sidekick-journey.test.ts b/packages/cli/tests/repl-sidekick-journey.test.ts index 2dd1bd269..ab1c60198 100644 --- a/packages/cli/tests/repl-sidekick-journey.test.ts +++ b/packages/cli/tests/repl-sidekick-journey.test.ts @@ -2255,11 +2255,11 @@ describe("Tier TE — a published binding becomes real greetings, and then a rea // the same output it settled with. expect(ran.greetingAfter).toEqual(ran.greeting); - // The chat is what the replies selected, not the source they captured or - // the envelope their feedback came in. expect(ran.chatHas("Prepared the greetings.")).toBe(true); expect(ran.chatHas("Revised it as a table.")).toBe(true); - expect(ran.chatHas("REPL.EntryInput")).toBe(false); + expect(ran.chatHas("[X] REPL.EntryInput result sent to Sidekick")).toBe(true); + expect(ran.chatHas(" { ), ); expect(page.repl.terminal.fed).toBe(fed); - expect(page.screen().shows("REPL.Bindings")).toBe(false); + expect(page.screen().shows(" settledTranscriptHas(one, "Automatic feedback"), ); expect(page.repl.terminal.fed).toBe(fed); - expect(page.screen().shows("REPL.Bindings")).toBe(false); + expect(page.screen().shows(" row.includes("Automatic feed")), ).toHaveLength(1); @@ -2917,7 +2917,7 @@ describe("Sidekick original interrupted identities and native input routes", () "the saved automatic status", (one) => transcriptHas(one, "Automatic") && transcriptHas(one, "Turn"), ); - expect(page.screen().shows("REPL.Bindings")).toBe(false); + expect(page.screen().shows(" sidekickShows(one, "Automatic feedback · Turn saved"), @@ -2927,7 +2927,7 @@ describe("Sidekick original interrupted identities and native input routes", () expect(at).toBeGreaterThanOrEqual(0); expect(rows[at]).toBe("Automatic feedback · Turn saved; no evaluated reply recorded."); expect(sidekickShows(page.screen(), "First answer.")).toBe(true); - expect(page.screen().shows("REPL.Bindings")).toBe(false); + expect(page.screen().shows(" { const said = shownChat(page.screen()).filter((row) => row !== "" && row !== "Usage unavailable"); const first = said.findIndex((row) => row.includes("[U] run it")); expect(first).toBeGreaterThanOrEqual(0); - expect(said[first + 1]).toContain("[U] say it"); + expect(said[first + 1]).toContain("[X] REPL.Bindings result sent to Sidekick"); + expect(said[first + 2]).toContain("[U] say it"); expect(sidekickShows(page.screen(), "answered without saying")).toBe(false); expect(sidekickShows(page.screen(), "Nothing to add.")).toBe(false); yield* reachTurn(page, "Automatic", "up"); @@ -3152,7 +3153,7 @@ describe("Sidekick original reveal and cold decision coverage", () => { expect(sidekickShows(page.screen(), "ANSWER-10")).toBe(false); expect(sidekickShows(page.screen(), "Nothing to add.")).toBe(false); expect(sidekickShows(page.screen(), "answered without saying")).toBe(false); - expect(sidekickShows(page.screen(), "REPL.Bindings")).toBe(false); + expect(sidekickShows(page.screen(), " Date: Sun, 15 Nov 2026 16:34:59 -0500 Subject: [PATCH 2/3] Align Sidekick exchange and feedback details with reviewed layouts --- .../repl-bench/journeys/conversation.test.md | 33 ++- packages/cli/src/repl/application.ts | 275 +++++++++++------- packages/cli/src/repl/program.ts | 1 + specs/repl-spec.md | 10 +- 4 files changed, 204 insertions(+), 115 deletions(-) diff --git a/examples/repl-bench/journeys/conversation.test.md b/examples/repl-bench/journeys/conversation.test.md index 55b045e46..bf89235e0 100644 --- a/examples/repl-bench/journeys/conversation.test.md +++ b/examples/repl-bench/journeys/conversation.test.md @@ -35,11 +35,21 @@ - + + + + + + + + + - + + + @@ -48,12 +58,31 @@ + + + + + + + + + + + + + + + + + + + diff --git a/packages/cli/src/repl/application.ts b/packages/cli/src/repl/application.ts index 108404866..7802b4b4b 100644 --- a/packages/cli/src/repl/application.ts +++ b/packages/cli/src/repl/application.ts @@ -372,6 +372,7 @@ export interface ReplSidekickTurnRow { readonly origin?: MessageOrigin; /** The mounted identity: this process's response, or the saved turn's own. */ readonly answer?: number; + readonly response?: string; readonly controls?: readonly string[]; readonly key: string; /** The chat this turn belongs to, which is what activating it opens. */ @@ -5666,6 +5667,9 @@ export function footerSentence(view: ReplView): string { if (refusalInBand(view)) { return `! ${(shownRefusal(view) ?? "").split("\n").join(" ")}`; } + if (profileFor(view.size) === "narrow" && presentedInspection(view) !== undefined) { + return "Esc closes · Tab moves · PageUp/PageDown in Content"; + } if (staged(view) !== undefined && !modalOpen(view)) { const readiness = readinessOf(view); const narrow = profileFor(view.size) === "narrow"; @@ -8043,7 +8047,7 @@ function inspectionRect(size: ReplTerminalSize): ReplBounds { return { x, y: 1, width, height: size.rows - 3 }; } const height = Math.floor(size.rows * 0.6); - return { x: 1, y: size.rows - height - 2, width: size.columns - 2, height }; + return { x: 0, y: size.rows - height - 2, width: size.columns, height }; } /** @@ -8323,66 +8327,54 @@ function exchangeOf(reading: ReplSidekickReading | undefined, key: string) { ); } -function inspectionLines(view: ReplView, inspection: ReplInspection) { - const sidekick = view.live.sidekick; - const turns = inspection.kind === "exchange" ? exchangeOf(sidekick, inspection.key) : []; - const pieces = - inspection.kind === "feedback" - ? inspection.expanded - ? [{ text: view.workspace?.feedback?.find((item) => item.key === inspection.key)?.text }] - : [] - : inspection.kind === "person" - ? [ - { - text: sidekick?.chat.find( - (item) => item.kind === "person" && item.key === inspection.key, - )?.text, - }, - ] - : inspection.kind === "entry" - ? [ - { - text: view.model.entries.find((entry) => entry.key === inspection.key)?.terminal - ?.output, - }, - ] - : turns - .filter((turn) => inspection.turn === undefined || turn.turn === inspection.turn) - .map((turn) => ({ text: turn.text })); - const lines = pieces.flatMap(({ text }) => - text === undefined || text === "" ? [] : inertCommandText(text).split("\n"), +function inspectionEntries(view: ReplView, turns: readonly ReplSidekickTurnRow[]) { + const replies = new Set( + turns.flatMap((turn) => + turn.response === undefined ? [] : [`chat:${turn.conversation}:${turn.response}`], + ), ); - return lines.map((text, offset) => ({ - key: `drawer:inspection:detail:${offset}`, - text, - runs: tokenRuns([{ text, token: "field-value" }]), - })); + const admitted = new Set( + view.workspace?.work + .filter((work) => work.settled && replies.has(work.message)) + .map((work) => work.entry), + ); + return view.model.entries.filter((entry) => admitted.has(entry.key)); } -function inspectionContent( +interface ReplInspectionRow { + readonly key: string; + readonly text: string; + readonly style: ReplRowStyle; + readonly action?: Readonly>; + readonly wrap?: boolean; +} + +function inspectionReading( view: ReplView, inspection: ReplInspection, - width: number, - details: readonly ReplFittedLine[] | undefined, -): DrawerContent | undefined { - const content: DrawerRow[] = []; - const say = (key: string, label: string, style = styleOf("metadata")) => { - content.push({ described: drawerLine(`drawer:inspection:${key}`, label, width, style) }); +): { readonly title: string; readonly rows: readonly ReplInspectionRow[] } | undefined { + const rows: ReplInspectionRow[] = []; + const say = (key: string, text: string, style = styleOf("metadata"), wrap = false) => { + rows.push({ key: `drawer:inspection:${key}`, text, style, wrap }); }; - const choose = (key: string, label: string, action: { readonly [name: string]: Json }) => { - content.push({ - described: row( - `drawer:inspection:${key}`, - padControl(fitControl([{ text: label, elide: true }], width), width), - action, - styleOf("action"), - { claim: focusClaim(view), here: view.focused }, - ), - }); + const choose = ( + key: string, + text: string, + action: Readonly>, + wrap = false, + ) => { + rows.push({ key: `drawer:inspection:${key}`, text, style: styleOf("action"), action, wrap }); }; const link = (key: string, round: number) => { choose(`entry:${key}`, `linked entry Round ${round} ›`, { select: "scope", scopes: [key] }); }; + const block = (key: string, text: string) => { + if (text !== "") { + for (const [offset, line] of inertCommandText(text).split("\n").entries()) { + say(`${key}:${offset}`, line, styleOf("field-value"), true); + } + } + }; const sidekick = view.live.sidekick; let title: string; if (inspection.kind === "feedback") { @@ -8395,12 +8387,30 @@ function inspectionContent( if (feedback.controls.length > 0) { say("controls", feedback.controls.join(" · ")); } - for (const entry of feedback.entries) { - link(entry.key, entry.round); + for (const linked of feedback.entries) { + link(linked.key, linked.round); + const entry = view.model.entries.find((item) => item.key === linked.key); + if (entry !== undefined) { + const state = workState(entry, view.model, view.live); + say(`outcome:${linked.key}`, `Outcome · ${state.word}`, state.style); + const output = entry.terminal?.output; + if (output !== undefined) { + const first = headline(trimLeadingBlankLines(inertCommandText(output))); + say( + `summary:${linked.key}`, + `Output · ${first === "" ? "(empty)" : first}`, + styleOf("metadata"), + true, + ); + } + } } choose("feedback", inspection.expanded ? "Hide recorded feedback" : "Show recorded feedback", { select: "toggle-recorded-feedback", }); + if (inspection.expanded) { + block("feedback-text", feedback.text); + } } else if (inspection.kind === "person") { const person = sidekick?.chat.find( (item) => item.kind === "person" && item.key === inspection.key, @@ -8409,6 +8419,7 @@ function inspectionContent( return undefined; } title = person.origin?.kind === "acp" ? "Attached client · Message" : "You · Message"; + block("person", person.text); } else if (inspection.kind === "entry") { const entry = view.model.entries.find((item) => item.key === inspection.key); if (entry === undefined) { @@ -8417,83 +8428,125 @@ function inspectionContent( title = `Round ${entry.order} · Result`; say("status", workState(entry, view.model, view.live).word); link(entry.key, entry.order); + block("entry", entry.terminal?.output ?? ""); } else { const turns = exchangeOf(sidekick, inspection.key); if (turns.length === 0) { return undefined; } - const selected = turns.findIndex((turn) => turn.turn === inspection.turn); + const selected = turns.find((turn) => turn.turn === inspection.turn); + const visible = selected === undefined ? turns : [selected]; title = - selected < 0 + selected === undefined ? `Sidekick · ${turns.length} saved ${turns.length === 1 ? "turn" : "turns"}` - : `Sidekick · saved turn ${selected + 1} of ${turns.length}`; + : `Sidekick · saved turn ${turns.indexOf(selected) + 1} of ${turns.length}`; + for (const entry of inspectionEntries(view, visible)) { + link(entry.key, entry.order); + } + if (selected?.controls !== undefined && selected.controls.length > 0) { + say("controls", selected.controls.join(" · "), styleOf("metadata"), true); + } + const outputs = visible.filter((turn) => turn.text.length > 0); + if (outputs.length > 0) { + say("output", "Output", styleOf("field-label")); + for (const turn of outputs) { + block(`output:${turn.turn}`, turn.text); + } + } say("saved", "SAVED TURNS", styleOf("field-label")); - if (selected >= 0) { + if (selected !== undefined) { choose("exchange", "‹ whole exchange", { select: "inspect-saved-turn", turn: null }); } + const incoming = new Map(); + for (const packet of view.workspace?.feedback ?? []) { + if (packet.conversation === turns[0]?.conversation && !incoming.has(packet.turn)) { + incoming.set(packet.turn, packet); + } + } for (const [index, turn] of turns.entries()) { if (turn.turn === null) { continue; } - const packet = view.workspace?.feedback?.find( - (item) => item.conversation === turn.conversation && item.turn === turn.turn, - ); + const packet = incoming.get(turn.turn); + const round = packet?.entries[0]?.round; + const controls = packet?.controls.join(", "); + const result = + round === undefined ? `${controls || "control"} result` : `Round ${round} result`; const origin = - packet === undefined - ? index === 0 - ? "prompted by your message" - : undefined - : `prompted by [X] ${packet.entries.length > 0 ? `Round ${packet.entries[0]!.round} result` : packet.controls.join(", ") || "control result"}`; - if (selected === index) { - if (origin !== undefined) { - say("origin", origin); - } - if (turn.controls !== undefined && turn.controls.length > 0) { - say("controls", turn.controls.join(" · ")); - } - for (const entry of packet?.entries ?? []) { - link(entry.key, entry.round); - } + index === 0 + ? "prompted by your message" + : packet === undefined + ? undefined + : `prompted by [X] ${result}`; + const label = [ + `Turn ${index + 1}`, + selected === turn ? "this turn" : undefined, + origin, + turn.failed ? turn.state : undefined, + view.state.showUsage === true ? turn.usageLine : undefined, + ] + .filter((one) => one !== undefined) + .join(" · "); + if (selected === turn) { + say(`turn:${turn.turn}`, label, styleOf("action", { selected: true }), true); } else { - const label = [ - `Turn ${index + 1}`, - origin, - turn.failed ? turn.state : undefined, - view.state.showUsage === true ? turn.usageLine : undefined, - ] - .filter((one) => one !== undefined) - .join(" · "); - choose(`turn:${turn.turn}`, label, { select: "inspect-saved-turn", turn: turn.turn }); + choose(`turn:${turn.turn}`, label, { select: "inspect-saved-turn", turn: turn.turn }, true); } } - if ( - selected >= 0 && - view.state.showUsage === true && - turns[selected]?.usageLine !== undefined - ) { - say("usage", turns[selected]!.usageLine!); - } - if ( - turns.some((turn) => (selected < 0 || turn.turn === inspection.turn) && turn.text.length > 0) - ) { - say("output", "Output", styleOf("field-label")); + } + return { title, rows }; +} + +function inspectionContent( + view: ReplView, + inspection: ReplInspection, + width: number, + details: readonly ReplFittedLine[] | undefined, +): DrawerContent | undefined { + const reading = inspectionReading(view, inspection); + if (reading === undefined) { + return undefined; + } + const fitted = new Map(); + for (const piece of details ?? []) { + const held = fitted.get(piece.line); + if (held === undefined) { + fitted.set(piece.line, [piece]); + } else { + held.push(piece); } } - const shown = - details ?? inspectionLines(view, inspection).map((line) => ({ ...line, indent: 0 })); - for (const line of shown) { - content.push({ - described: drawerLine( - line.key, - " ".repeat(line.indent) + line.text, - width, - styleOf("field-value"), - line.runs, - ), - }); + const content: DrawerRow[] = []; + for (const item of reading.rows) { + const pieces = fitted.get(item.key); + const label = [{ text: item.text, elide: true }] satisfies readonly ReplLabelPart[]; + const action = item.action; + if (action !== undefined) { + // A wrapped label is one control. The fitted continuations take rows + // without adding extra focus stops for the same saved turn. + const first = pieces?.[0]; + const text = + first === undefined + ? fitControl(label, width) + : (" ".repeat(first.indent) + first.text).slice(FOCUS_MARKER); + content.push({ + described: row(item.key, padControl(text, width), action, item.style, { + claim: focusClaim(view), + here: view.focused, + }), + }); + } + if (pieces === undefined && action === undefined) { + content.push({ described: drawerLine(item.key, fitLine(label, width), width, item.style) }); + } + for (const piece of pieces?.slice(action === undefined ? 0 : 1) ?? []) { + content.push({ + described: drawerLine(piece.key, " ".repeat(piece.indent) + piece.text, width, item.style), + }); + } } return { - title, + title: reading.title, titleStyle: styleOf("drawer-title"), content, entering: false, @@ -9792,7 +9845,11 @@ export function retainedDetailsOf(view: ReplView) { const open = view.selection.drawers.at(-1); const inspection = presentedInspection(view); if (inspection !== undefined) { - return inspectionLines(view, inspection); + return (inspectionReading(view, inspection)?.rows ?? []).flatMap((item) => + item.wrap === true + ? [{ key: item.key, text: (item.action === undefined ? "" : CONTROL_ROOM) + item.text }] + : [], + ); } if (open?.kind === "binding" || open?.kind === "entry-value") { return detailLines("drawer:value", open.binding.value, styleOf("field-value")); diff --git a/packages/cli/src/repl/program.ts b/packages/cli/src/repl/program.ts index 72207f0d0..c2e404f31 100644 --- a/packages/cli/src/repl/program.ts +++ b/packages/cli/src/repl/program.ts @@ -4081,6 +4081,7 @@ export function sidekickTurnRows( agent: turn.agent, turn: turn.turn, answer: answers.get(`${turn.conversation}:${turn.turn}`), + response: own, controls: own === undefined ? undefined diff --git a/specs/repl-spec.md b/specs/repl-spec.md index ce4cec473..fdd6f3845 100644 --- a/specs/repl-spec.md +++ b/specs/repl-spec.md @@ -1663,10 +1663,12 @@ lower drawer on the narrow Sidekick surface. **Show recorded feedback** reveals the complete input recorded for the receiving turn. A combined input is shown as one packet, including any queued message it carried. **Hide recorded feedback** collapses it. **Linked entry** selects the admitted entry when the -current history contains it. An addressed reply opens its exchange with the -saved turns it answered. Selecting a turn shows its own retained control -origin, Output, and usage when enabled. Escape and the close control dismiss -inspection. The selected work and Draft focus shortcuts close a centre +current history contains it. The feedback details summarize that entry's +recorded outcome and output before the expander. An addressed reply shows the +exchange's linked entries and Output above **Saved turns**. A selected turn +shows the entry it admitted, its own Output, and its retained origin. Its row +is marked **this turn**. Turn labels wrap at narrower widths and include +their usage when enabled. Escape and the close control dismiss inspection. The selected work and Draft focus shortcuts close a centre inspection and reveal their requested controls. These readings can be opened again after reopening the execution. From bc4d1f19e6c160c0793d485f25790df5f720ea4b Mon Sep 17 00:00:00 2001 From: Taras Mankovski Date: Sun, 15 Nov 2026 16:55:35 -0500 Subject: [PATCH 3/3] Assert Sidekick feedback before later table output --- packages/cli/tests/repl-sidekick-journey.test.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/cli/tests/repl-sidekick-journey.test.ts b/packages/cli/tests/repl-sidekick-journey.test.ts index ab1c60198..1a678aad1 100644 --- a/packages/cli/tests/repl-sidekick-journey.test.ts +++ b/packages/cli/tests/repl-sidekick-journey.test.ts @@ -2177,6 +2177,12 @@ describe("Tier TE — a published binding becomes real greetings, and then a rea ); const after = yield* settledReading(repl); + const feedback = yield* page.until( + "the prepared greetings feedback", + (one) => one.found("[X] REPL.EntryInput result sent to Sidekick", SIDEKICK_PANE) === 1, + ); + expect(feedback.found("