feat: the plan window — the plan's ambient, live, auto-moving presence
The successor of the injected plan blocks (docs/probe-teach-split.md §6): always on once a tree exists, a zoomed-in window (2:1, ~2¼ node widths) centered on the CURRENT node, re-centering by pure derivation as tagged checks move the lesson — statuses derive live from the transcript on every render (derivePlanStatuses), glow on current, fallback focus on the lesson's first node, click opens the existing full-DAG popup. Bottom-left, mirroring the activity dock's bottom-right; hidden on narrow viewports; the learner's visual polish pass comes later. PlanDiagram gains a viewBoxOverride (exported); latestTree exported. Tests: viewBox centering/clamping (pure) + render (hidden pre-plan, windowed viewBox, glowing current, starting fallback).
This commit is contained in:
@@ -22,6 +22,7 @@ import { Composer } from "@/components/composer";
|
|||||||
import { JobsContext } from "@/components/jobs-context";
|
import { JobsContext } from "@/components/jobs-context";
|
||||||
import { StatsBar } from "@/components/stats-bar";
|
import { StatsBar } from "@/components/stats-bar";
|
||||||
import { PlanBlock, PlanPopup } from "@/components/plan-block";
|
import { PlanBlock, PlanPopup } from "@/components/plan-block";
|
||||||
|
import { PlanWindow } from "@/components/plan-window";
|
||||||
import type { PlanBlockData } from "@/src/core";
|
import type { PlanBlockData } from "@/src/core";
|
||||||
import { QuestionDock } from "@/components/question-dock";
|
import { QuestionDock } from "@/components/question-dock";
|
||||||
import { SidebarToggle } from "@/components/sidebar";
|
import { SidebarToggle } from "@/components/sidebar";
|
||||||
@@ -506,6 +507,8 @@ export function Chat({
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{planOpen && <PlanPopup messages={messages} onClose={() => setPlanOpen(false)} />}
|
{planOpen && <PlanPopup messages={messages} onClose={() => setPlanOpen(false)} />}
|
||||||
|
{/* The plan's ambient presence: live, zoomed on the current node; click → popup. */}
|
||||||
|
<PlanWindow messages={messages} onOpen={() => setPlanOpen(true)} />
|
||||||
</JobsContext.Provider>
|
</JobsContext.Provider>
|
||||||
</ChatActionsContext.Provider>
|
</ChatActionsContext.Provider>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -144,23 +144,26 @@ const TEXT: Record<PlanNodeStatus, string> = {
|
|||||||
|
|
||||||
/** The diagram itself: positioned nodes + bezier edges. Pure-ish render —
|
/** The diagram itself: positioned nodes + bezier edges. Pure-ish render —
|
||||||
* every input is data, so SSR render tests pin the whole thing. */
|
* every input is data, so SSR render tests pin the whole thing. */
|
||||||
function PlanDiagram({
|
export function PlanDiagram({
|
||||||
nodes,
|
nodes,
|
||||||
edges,
|
edges,
|
||||||
statusOf,
|
statusOf,
|
||||||
glowId,
|
glowId,
|
||||||
markerId,
|
markerId,
|
||||||
|
viewBoxOverride,
|
||||||
}: {
|
}: {
|
||||||
nodes: readonly LayoutNode[];
|
nodes: readonly LayoutNode[];
|
||||||
edges: ReadonlyArray<{ from: string; to: string }>;
|
edges: ReadonlyArray<{ from: string; to: string }>;
|
||||||
statusOf: (id: string) => PlanNodeStatus;
|
statusOf: (id: string) => PlanNodeStatus;
|
||||||
glowId?: string | null;
|
glowId?: string | null;
|
||||||
markerId: string;
|
markerId: string;
|
||||||
|
/** A windowed viewBox (the plan window) instead of the full extent. */
|
||||||
|
viewBoxOverride?: string;
|
||||||
}) {
|
}) {
|
||||||
const layout = useMemo(() => blockLayout(nodes, edges), [nodes, edges]);
|
const layout = useMemo(() => blockLayout(nodes, edges), [nodes, edges]);
|
||||||
return (
|
return (
|
||||||
<svg
|
<svg
|
||||||
viewBox={`0 0 ${Math.max(layout.width, 1)} ${Math.max(layout.height, 1)}`}
|
viewBox={viewBoxOverride ?? `0 0 ${Math.max(layout.width, 1)} ${Math.max(layout.height, 1)}`}
|
||||||
className="block h-auto w-full"
|
className="block h-auto w-full"
|
||||||
role="img"
|
role="img"
|
||||||
aria-label="Plan diagram"
|
aria-label="Plan diagram"
|
||||||
@@ -264,7 +267,7 @@ export interface PopupMessage {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** The latest plan tree in the transcript (latest tool-plan_ output). */
|
/** The latest plan tree in the transcript (latest tool-plan_ output). */
|
||||||
function latestTree(messages: readonly PopupMessage[]): PlanTree | null {
|
export function latestTree(messages: readonly PopupMessage[]): PlanTree | null {
|
||||||
for (let m = messages.length - 1; m >= 0; m--) {
|
for (let m = messages.length - 1; m >= 0; m--) {
|
||||||
const parts = messages[m]?.parts;
|
const parts = messages[m]?.parts;
|
||||||
if (!parts) continue;
|
if (!parts) continue;
|
||||||
|
|||||||
@@ -0,0 +1,102 @@
|
|||||||
|
"use client";
|
||||||
|
|
||||||
|
import { useId, useMemo } from "react";
|
||||||
|
import { WaypointsIcon } from "lucide-react";
|
||||||
|
import type { PlanTree } from "@/src/core";
|
||||||
|
import { derivedNodeStatus, derivePlanStatuses } from "@/src/core";
|
||||||
|
import {
|
||||||
|
PlanDiagram,
|
||||||
|
blockLayout,
|
||||||
|
latestTree,
|
||||||
|
NODE_H,
|
||||||
|
NODE_W,
|
||||||
|
type PopupMessage,
|
||||||
|
} from "@/components/plan-block";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* THE PLAN WINDOW (docs/probe-teach-split.md §6): the plan's persistent,
|
||||||
|
* ambient presence — the successor of the injected plan blocks. Always on
|
||||||
|
* once a tree exists, it shows a ZOOMED-IN window on the CURRENT node and
|
||||||
|
* moves by itself as the lesson advances (auto-pan: the viewBox re-centers
|
||||||
|
* on the latest tagged check — no animation machinery, the window just
|
||||||
|
* follows the derived position). Click opens the full-DAG popup.
|
||||||
|
*
|
||||||
|
* Live by construction: statuses derive from the transcript on every
|
||||||
|
* render (derivePlanStatuses — calls, not results), so the window moves
|
||||||
|
* the moment a tagged check call streams in or a record adoption lands.
|
||||||
|
* Hidden on narrow viewports (the dock owns that corner's collapse
|
||||||
|
* pattern); the learner's visual polish pass (colors, motion) comes later.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** Window dimensions in SVG units — 2:1, ~2¼ node widths: the current
|
||||||
|
* node plus its immediate neighborhood. Aspect-matched to the card. */
|
||||||
|
const VIEW_W = 360;
|
||||||
|
const VIEW_H = 180;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The windowed viewBox, centered on the current node — pure (exported for
|
||||||
|
* tests). Falls back to the FIRST node (authoring order — the lesson's
|
||||||
|
* start) while no check has been tagged. A layout smaller than the window
|
||||||
|
* centers itself; a larger one clamps so the window never strays into
|
||||||
|
* empty space beyond an edge node.
|
||||||
|
*/
|
||||||
|
export function planWindowViewBox(tree: PlanTree, current: string | null): string {
|
||||||
|
const layout = blockLayout(tree.nodes, tree.edges);
|
||||||
|
const focusId =
|
||||||
|
current && layout.x.has(current)
|
||||||
|
? current
|
||||||
|
: (tree.nodes[0]?.id ?? null);
|
||||||
|
const cx =
|
||||||
|
focusId !== null
|
||||||
|
? (layout.x.get(focusId) ?? 0) + NODE_W / 2
|
||||||
|
: Math.max(layout.width, 1) / 2;
|
||||||
|
const cy =
|
||||||
|
focusId !== null
|
||||||
|
? (layout.y.get(focusId) ?? 0) + NODE_H / 2
|
||||||
|
: Math.max(layout.height, 1) / 2;
|
||||||
|
const clamp = (c: number, extent: number, view: number) =>
|
||||||
|
extent <= view ? extent / 2 : Math.min(Math.max(c, view / 2), extent - view / 2);
|
||||||
|
const x = clamp(cx, layout.width, VIEW_W) - VIEW_W / 2;
|
||||||
|
const y = clamp(cy, layout.height, VIEW_H) - VIEW_H / 2;
|
||||||
|
return `${x} ${y} ${VIEW_W} ${VIEW_H}`;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function PlanWindow({ messages, onOpen }: { messages: readonly PopupMessage[]; onOpen: () => void }) {
|
||||||
|
const markerId = useId().replace(/[^a-zA-Z0-9-]/g, "");
|
||||||
|
const tree = useMemo(() => latestTree(messages), [messages]);
|
||||||
|
const statuses = useMemo(
|
||||||
|
() => (tree ? derivePlanStatuses(tree, messages as Parameters<typeof derivePlanStatuses>[1]) : null),
|
||||||
|
[tree, messages],
|
||||||
|
);
|
||||||
|
if (!tree || tree.nodes.length === 0) return null; // no plan yet: no window
|
||||||
|
const statusOf = (id: string) => (statuses ? derivedNodeStatus(statuses, id) : "upcoming");
|
||||||
|
const currentTitle = statuses?.current
|
||||||
|
? (tree.nodes.find((n) => n.id === statuses.current)?.title ?? null)
|
||||||
|
: null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
data-testid="plan-window"
|
||||||
|
onClick={onOpen}
|
||||||
|
title="Open the full plan"
|
||||||
|
className="fixed bottom-3 left-3 z-30 hidden w-80 flex-col gap-1 rounded-xl border bg-card/95 p-2 text-left shadow-lg backdrop-blur sm:flex"
|
||||||
|
>
|
||||||
|
<div className="flex items-center gap-2 px-1 text-[11px] font-medium uppercase tracking-wide text-muted-foreground">
|
||||||
|
<WaypointsIcon className="size-3.5 text-primary" />
|
||||||
|
The plan
|
||||||
|
<span className="ml-auto min-w-0 truncate font-normal normal-case" title={currentTitle ?? undefined}>
|
||||||
|
{currentTitle ?? "starting"}
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<PlanDiagram
|
||||||
|
nodes={tree.nodes}
|
||||||
|
edges={tree.edges}
|
||||||
|
statusOf={statusOf}
|
||||||
|
glowId={statuses?.current ?? null}
|
||||||
|
markerId={markerId}
|
||||||
|
viewBoxOverride={planWindowViewBox(tree, statuses?.current ?? null)}
|
||||||
|
/>
|
||||||
|
</button>
|
||||||
|
);
|
||||||
|
}
|
||||||
Vendored
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
/// <reference types="next" />
|
/// <reference types="next" />
|
||||||
/// <reference types="next/image-types/global" />
|
/// <reference types="next/image-types/global" />
|
||||||
import "./.next/dev/types/routes.d.ts";
|
import "./.next/types/routes.d.ts";
|
||||||
import "./.next/dev/types/root-params.d.ts";
|
import "./.next/types/root-params.d.ts";
|
||||||
|
|
||||||
// NOTE: This file should not be edited
|
// NOTE: This file should not be edited
|
||||||
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
|
// see https://nextjs.org/docs/app/api-reference/config/typescript for more information.
|
||||||
|
|||||||
@@ -0,0 +1,111 @@
|
|||||||
|
import { renderToStaticMarkup } from "react-dom/server";
|
||||||
|
import { describe, it } from "node:test";
|
||||||
|
import assert from "node:assert/strict";
|
||||||
|
import { planWindowViewBox, PlanWindow } from "../components/plan-window.tsx";
|
||||||
|
import { blockLayout, NODE_H, NODE_W, type PopupMessage } from "../components/plan-block.tsx";
|
||||||
|
import type { PlanTree } from "../src/core/contracts.ts";
|
||||||
|
|
||||||
|
// The plan window: the ambient live view — a windowed viewBox centered on
|
||||||
|
// the current node (auto-pan by derivation, not animation), full plan
|
||||||
|
// hidden until a tree exists, click → popup.
|
||||||
|
|
||||||
|
const CHAIN: PlanTree = {
|
||||||
|
nodes: [
|
||||||
|
{ id: "a", title: "Alpha" },
|
||||||
|
{ id: "b", title: "Beta" },
|
||||||
|
{ id: "c", title: "Gamma" },
|
||||||
|
],
|
||||||
|
edges: [
|
||||||
|
{ from: "a", to: "b" },
|
||||||
|
{ from: "b", to: "c" },
|
||||||
|
],
|
||||||
|
version: 1,
|
||||||
|
};
|
||||||
|
|
||||||
|
/** A transcript with a successful plan_init (carrying `tree`) and
|
||||||
|
* optionally a tagged quiz call. */
|
||||||
|
function transcript(tree: PlanTree, taggedNodeId?: string): PopupMessage[] {
|
||||||
|
return [
|
||||||
|
{ id: "m1", role: "user", parts: [] } as never,
|
||||||
|
{
|
||||||
|
id: "m2",
|
||||||
|
role: "assistant",
|
||||||
|
parts: [{ type: "tool-plan_init", state: "output-available", output: { ok: true, tree } }],
|
||||||
|
} as never,
|
||||||
|
...(taggedNodeId
|
||||||
|
? [
|
||||||
|
{
|
||||||
|
id: "m3",
|
||||||
|
role: "assistant",
|
||||||
|
parts: [{ type: "tool-quiz", state: "input-available", input: { nodeId: taggedNodeId } }],
|
||||||
|
} as never,
|
||||||
|
]
|
||||||
|
: []),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
describe("planWindowViewBox (pure)", () => {
|
||||||
|
it("centers the window on the current node", () => {
|
||||||
|
const layout = blockLayout(CHAIN.nodes, CHAIN.edges);
|
||||||
|
const cy = layout.y.get("b")! + NODE_H / 2; // chain: all x = 0
|
||||||
|
const vb = planWindowViewBox(CHAIN, "b").split(" ").map(Number);
|
||||||
|
assert.equal(vb[3], 180); // 2:1 window
|
||||||
|
assert.equal(vb[1]! + 90, cy, "vertical center = node b's center");
|
||||||
|
// layout narrower than the window → centered on the (single-column) layout
|
||||||
|
assert.equal(vb[0]! + 180, layout.width / 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("falls back to the first node while no check has been tagged — clamped at the layout's top edge", () => {
|
||||||
|
const layout = blockLayout(CHAIN.nodes, CHAIN.edges);
|
||||||
|
const vb = planWindowViewBox(CHAIN, null).split(" ").map(Number);
|
||||||
|
// Focusing row 0 would center half-off the layout; the clamp pins the
|
||||||
|
// window to the top edge instead — node a stays fully inside it.
|
||||||
|
assert.equal(vb[1], 0);
|
||||||
|
const aTop = layout.y.get("a")!;
|
||||||
|
assert.ok(aTop >= vb[1] && aTop + NODE_H <= vb[1] + 180, "the first node is inside the window");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("clamps along wide rows — the window never strays past an edge node", () => {
|
||||||
|
const wide: PlanTree = {
|
||||||
|
nodes: [
|
||||||
|
{ id: "r1", title: "R1" },
|
||||||
|
{ id: "r2", title: "R2" },
|
||||||
|
{ id: "r3", title: "R3" },
|
||||||
|
{ id: "t", title: "T" },
|
||||||
|
],
|
||||||
|
edges: [
|
||||||
|
{ from: "r1", to: "t" },
|
||||||
|
{ from: "r2", to: "t" },
|
||||||
|
{ from: "r3", to: "t" },
|
||||||
|
],
|
||||||
|
version: 1,
|
||||||
|
};
|
||||||
|
const layout = blockLayout(wide.nodes, wide.edges);
|
||||||
|
assert.ok(layout.width > 360, "fixture: a row wider than the window");
|
||||||
|
// Rightmost root: window's right edge must not exceed the layout width.
|
||||||
|
const vb = planWindowViewBox(wide, "r3").split(" ").map(Number);
|
||||||
|
assert.ok(vb[0]! + 360 <= layout.width + 0.001, "clamped at the right edge");
|
||||||
|
// Leftmost root: window's left edge must not go negative.
|
||||||
|
const vb2 = planWindowViewBox(wide, "r1").split(" ").map(Number);
|
||||||
|
assert.ok(vb2[0]! >= -0.001, "clamped at the left edge");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("PlanWindow render", () => {
|
||||||
|
it("hidden while no plan exists", () => {
|
||||||
|
assert.equal(renderToStaticMarkup(<PlanWindow messages={[]} onOpen={() => {}} />), "");
|
||||||
|
});
|
||||||
|
|
||||||
|
it("with a plan: renders windowed, glowing current from the latest tagged call; click target present", () => {
|
||||||
|
const html = renderToStaticMarkup(<PlanWindow messages={transcript(CHAIN, "b")} onOpen={() => {}} />);
|
||||||
|
assert.ok(html.includes('data-testid="plan-window"'));
|
||||||
|
assert.ok(html.includes('data-status="current"'));
|
||||||
|
assert.ok(html.includes('data-status="upcoming"'));
|
||||||
|
// the viewBox is windowed (not the full layout extent)
|
||||||
|
assert.ok(/viewBox="-?\d+(\.\d+)? -?\d+(\.\d+)? 360 180"/.test(html));
|
||||||
|
// no current yet → first node is the fallback focus, header says starting
|
||||||
|
const html2 = renderToStaticMarkup(<PlanWindow messages={transcript(CHAIN)} onOpen={() => {}} />);
|
||||||
|
assert.ok(html2.includes("starting"));
|
||||||
|
assert.ok(!html2.includes('data-status="current"'), "nothing current before the first tagged check");
|
||||||
|
});
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user