@anchrd/intel-ui 0.25.0 → 0.28.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anchrd/intel-ui",
-  "version": "0.25.0",
+  "version": "0.28.0",
   "type": "module",
   "license": "UNLICENSED",
   "repository": {

package/src/app/app-tree/app-tree.tsx

@@ -85,6 +85,16 @@ function levelKey(level: Level): readonly unknown[] {
   return level.type === "flow" ? ["flow-calls", level.id] : treeLevelKey(level.id);
 }
 
+// What a drag carries: the row, and the LEVEL it was picked up from.
+//
+// ⚠️ The two are not the same, and that is the whole of #446. Since #429 the root level also shows
+// rows whose own record names a folder this reader may never see — a shared document reaches the
+// root only through the share. Asking `parentOf` again during the move answers with that invisible
+// folder, and then the root offers "move to the top" to a row already at the top, while the level
+// it actually left is never cleaned up. The level is known where the row is rendered; carrying it
+// is cheaper than deriving it wrongly.
+type Carried = { entry: TreeEntry; level: string | null };
+
 // What a row puts on the clipboard for anybody outside the tree. Its own media type rather than
 // `text/plain`, so a drop target that means "move this row" and one that means "make a node for
 // this" cannot be confused by the same payload.
@@ -99,8 +109,8 @@ export function AppTree() {
   const [creating, setCreating] = useState<Creating | null>(null);
   const [uploadTo, setUploadTo] = useState<string | null>(null);
   const uploadInput = useRef<HTMLInputElement>(null);
-  const [dragged, setDragged] = useState<TreeEntry | null>(null);
-  const draggedRef = useRef<TreeEntry | null>(null);
+  const [dragged, setDragged] = useState<Carried | null>(null);
+  const draggedRef = useRef<Carried | null>(null);
   // Which target the pointer is over: `undefined` for none, `null` for the root strip, an id for a
   // folder row. Three answers, because "the root" and "nothing" are not the same drop.
   const [over, setOver] = useState<string | null | undefined>(undefined);
@@ -273,14 +283,15 @@ export function AppTree() {
   // What a drop on this target would do. `undefined` means nothing is being dragged, so the target
   // is not a target at all.
   function verdictFor(
-    carried: TreeEntry | null,
+    carried: Carried | null,
     targetId: string | null,
     targetAncestors: ReadonlySet<string>,
   ) {
     if (!carried) return undefined;
     return moveVerdict({
-      draggedId: carried.id,
-      draggedParentId: parentOf(carried),
+      draggedId: carried.entry.id,
+      draggedParentId: parentOf(carried.entry),
+      draggedLevel: carried.level,
       targetId,
       targetAncestors,
     });
@@ -313,7 +324,7 @@ export function AppTree() {
           setDragged(null);
           draggedRef.current = null;
           if (carried && verdictFor(carried, target.id, ancestors) === "ok") {
-            move.start(carried, target);
+            move.start(carried.entry, carried.level, target);
           }
         },
       },
@@ -436,7 +447,7 @@ export function AppTree() {
     // default cursor while a drag is in progress, which is the answer "not here" without a word.
     const drop =
       isFolder && !derived ? dropHandlers({ id: entry.id, title: entry.title }, ancestors) : null;
-    const isDragged = dragged?.id === entry.id;
+    const isDragged = dragged?.entry.id === entry.id;
     // While a drag is in progress every row says which of the three it is: the row being carried,
     // a folder that would take it, or something that would not. Silence on the last two is what
     // turns a drag into a guess that only the drop answers.
@@ -465,10 +476,41 @@ export function AppTree() {
             row carries the fill and `flex-1` on the label pushes the actions to the end *inside* it.
             The button keeps its own hover and active fill switched off rather than doubled, so the
             row shows one surface instead of two overlapping ones. */}
+        {/* biome-ignore lint/a11y/noStaticElementInteractions: Native drag is the pointer shortcut;
+            the nested button and move dialog remain the keyboard path. */}
         <div
+          draggable={!derived}
+          onDragStart={(event) => {
+            // ⚠️ `draggable={!derived}` is not enough on its own: `dragstart` bubbles, so a drag
+            // begun on a descendant of a derived row would still land here — and carry a level
+            // (`["tree", <flow-id>]`) that nothing ever wrote. That is the very class of key #446
+            // is about, so the handler refuses it rather than trusting the attribute.
+            if (derived) return;
+            // Native drag initiation on form controls is not interoperable: Safari can leave a
+            // draggable button looking grabbable without ever starting the drag. The row owns the
+            // gesture while its button remains the keyboard-reachable navigation control (#483).
+            event.dataTransfer.effectAllowed = "copyMove";
+            event.dataTransfer.setData("text/plain", entry.id);
+            event.dataTransfer.setData(
+              TreeEntryMediaType,
+              JSON.stringify({ id: entry.id, kind: entry.kind, title: entry.title }),
+            );
+            // The level travels with the row, read from the level this row was rendered into —
+            // never from its own record, which for a shared row names a folder the reader cannot
+            // see (#446).
+            const carried: Carried = { entry, level: parent.id };
+            draggedRef.current = carried;
+            setDragged(carried);
+          }}
+          onDragEnd={() => {
+            draggedRef.current = null;
+            setDragged(null);
+            setOver(undefined);
+          }}
+          {...(drop?.props ?? {})}
           className={`group/row flex items-center gap-0.5 rounded-md pr-1 transition-colors hover:bg-sidebar-accent hover:text-sidebar-accent-foreground ${
             isActive ? "bg-sidebar-accent font-medium text-sidebar-accent-foreground" : ""
-          }`}
+          } ${derived ? "" : "cursor-grab active:cursor-grabbing"}`}
         >
           {expandable ? (
             <button
@@ -508,37 +550,14 @@ export function AppTree() {
             // 2px left of one with an arrow, and nothing said why.
             <span aria-hidden="true" className={TREE_GUTTER} />
           )}
-          {/* The row's own control is what is grabbed and what is dropped on: a real button, so the
-              gesture rides on something that is already focusable and named rather than on a bare
-              div that assistive technology would have to be told about twice. */}
+          {/* Navigation stays a real button. The enclosing row carries the native drag gesture;
+              putting `draggable` on this form control is precisely the Safari failure from #483. */}
           <SidebarMenuButton
             isActive={isActive}
-            draggable={!derived}
-            onDragStart={(event) => {
-              // ⚠️ Two formats, one gesture. `text/plain` is what a drop inside the tree reads —
-              // that is a MOVE, and it only ever needed the id. The flow canvas needs the kind as
-              // well, to know which node to make, and resolving an id there would mean a second
-              // read of something the drag already knows. `effectAllowed` says both are allowed;
-              // each drop target picks the one it means (#75).
-              event.dataTransfer.effectAllowed = "copyMove";
-              event.dataTransfer.setData("text/plain", entry.id);
-              event.dataTransfer.setData(
-                TreeEntryMediaType,
-                JSON.stringify({ id: entry.id, kind: entry.kind, title: entry.title }),
-              );
-              draggedRef.current = entry;
-              setDragged(entry);
-            }}
-            onDragEnd={() => {
-              draggedRef.current = null;
-              setDragged(null);
-              setOver(undefined);
-            }}
-            {...(drop?.props ?? {})}
             data-drop={
               dragged === null ? undefined : isDragged ? "dragged" : (drop?.verdict ?? "none")
             }
-            className={`min-w-0 flex-1 hover:bg-transparent data-[active=true]:bg-transparent ${derived ? "" : "cursor-grab active:cursor-grabbing"} ${isDragged ? "opacity-50" : ""} ${highlight}`}
+            className={`min-w-0 flex-1 hover:bg-transparent data-[active=true]:bg-transparent ${isDragged ? "opacity-50" : ""} ${highlight}`}
             onClick={() => void navigate({ to: area, search: { select: entry.id } })}
           >
             <Icon aria-hidden="true" className="size-4 shrink-0" />
@@ -588,7 +607,17 @@ export function AppTree() {
         <button
           type="button"
           {...rootDrop.props}
-          onClick={() => move.start(dragged, { id: null, title: i18n.t("tree.move.root") })}
+          onClick={() => {
+            // The strip is drawn for every verdict — greyed out when it would refuse — so the click
+            // has to read it too. Without this, a click on the grey strip performs exactly the write
+            // the drop path refuses, and `initial` being set skips the picker where the verdict is
+            // otherwise enforced.
+            if (rootDrop.verdict !== "ok") return;
+            move.start(dragged.entry, dragged.level, {
+              id: null,
+              title: i18n.t("tree.move.root"),
+            });
+          }}
           data-drop={rootDrop.verdict}
           className={`mb-1 flex w-full items-center gap-1 rounded-md border border-dashed px-2 py-1.5 text-left text-sm outline-none focus-visible:ring-2 focus-visible:ring-sidebar-ring ${
             rootDrop.verdict === "ok"

package/src/app/tree-move/tree-move.tsx

@@ -15,6 +15,12 @@ export type MoveVerdict = "ok" | "self" | "descendant" | "same-place";
 
 // The parent a row is filed under. Nodes and Flows keep their own record (ADR-0004), so the
 // answer is read from whichever one this row is, never from a merged shape.
+//
+// ⚠️ This is the parent the RECORD names, which since #429 is not always the level the row is shown
+// in: a shared document is filed inside the sharer's folder and reaches the root only through the
+// share. Everything about a move — which level loses the row, which one keeps it, and whether the
+// root is "same place" — is a question about the level on screen, so the level travels with the
+// move instead of being read back out of the record here (#446).
 export function parentOf(entry: TreeEntry): string | null {
   return entry.type === "node" ? entry.node.parentId : entry.flow.parentId;
 }
@@ -25,6 +31,30 @@ export function treeLevelKey(parentId: string | null): readonly unknown[] {
   return ["tree", parentId];
 }
 
+/**
+ * Which cached levels a move has to take the row out of.
+ *
+ * ⚠️ Normally one, and the caller names it. When it does not — the title line has no tree level to
+ * name — the answer is not a guess but the full set of places the row can be standing in, and that
+ * set has exactly two members.
+ *
+ * It is two rather than "all of them" because of how a level is read (`db.ts`): every level except
+ * the root is strictly `parent_id IS ?`, so there the level and the record always agree. Only the
+ * root also collects the top of every readable region — a shared row whose own record names the
+ * sharer's folder (#429). So a row is either in the level its record names, or in the root.
+ *
+ * Cleaning up one level too many costs a re-read of a list the reader is looking at anyway.
+ * Cleaning up one too few is #446: the row stays where it no longer is.
+ */
+export function levelsToClear(
+  entry: TreeEntry,
+  level: string | null | undefined,
+): (string | null)[] {
+  if (level !== undefined) return [level];
+  const recorded = parentOf(entry);
+  return recorded === null ? [null] : [recorded, null];
+}
+
 // The optimistic row, filed where it is about to land. Its own parent has to travel with it, or the
 // plus on the moved row would still file into the folder it just left.
 function withParent(entry: TreeEntry, parentId: string | null): TreeEntry {
@@ -45,13 +75,32 @@ function withParent(entry: TreeEntry, parentId: string | null): TreeEntry {
  */
 export function moveVerdict(input: {
   draggedId: string;
+  // ⚠️ Two answers to "where is this row", and since #429 they can differ — which is why both are
+  // asked (#446). `draggedParentId` is what the record says and what a move would overwrite;
+  // `draggedLevel` is the level the row is shown in.
+  //
+  // "Same place" has to be true for either, and for different reasons:
+  //
+  // - The record: dropping a row on the folder its own record already names writes the value that
+  //   is already there. Nothing happens, and offering it says something will.
+  // - The level: a shared row reaches the root only through the share, and its record names the
+  //   sharer's folder. Dropping it on the root looks like a no-op to the reader — but it would
+  //   write `parentId = null` and lift the document OUT of the folder it was shared from. That is
+  //   the opposite of nothing, done by somebody who was told nothing would happen.
+  //
+  // `draggedLevel` is optional because a surface without a tree has no level to name — the resource
+  // menu opens the same dialog from a title line. There the record is the only answer there is.
   draggedParentId: string | null;
+  draggedLevel?: string | null | undefined;
   targetId: string | null;
   targetAncestors: ReadonlySet<string>;
 }): MoveVerdict {
   if (input.targetId === input.draggedId) return "self";
   if (input.targetId !== null && input.targetAncestors.has(input.draggedId)) return "descendant";
   if (input.targetId === input.draggedParentId) return "same-place";
+  if (input.draggedLevel !== undefined && input.targetId === input.draggedLevel) {
+    return "same-place";
+  }
   return "ok";
 }
 
@@ -98,11 +147,14 @@ export function moveErrorKey(error: unknown): string {
  */
 export function MoveDialog({
   entry,
+  level,
   initial,
   close,
   submit,
 }: {
   entry: TreeEntry;
+  // `undefined` where no tree level was rendered — the verdict then rests on the record alone.
+  level: string | null | undefined;
   initial: MoveDestination | null;
   close(): void;
   submit(destination: MoveDestination): void;
@@ -114,17 +166,20 @@ export function MoveDialog({
   // being moved is never offered, so its subtree can never be entered in the first place.
   const [path, setPath] = useState<MoveDestination[]>([]);
   const here: MoveDestination = path.at(-1) ?? { id: null, title: i18n.t("tree.move.root") };
-  const level = useQuery({
+  const children = useQuery({
     queryKey: ["tree", here.id],
     queryFn: async () => await data.listTreeChildren(here.id),
     enabled: destination === null,
   });
-  const folders = (level.data ?? []).filter(
+  const folders = (children.data ?? []).filter(
     (child) => child.kind === "folder" && child.id !== entry.id,
   );
   const verdict = moveVerdict({
     draggedId: entry.id,
     draggedParentId: parentOf(entry),
+    // Handed down by the caller, because the dialog is opened from two places and only one of them
+    // has a tree level to name (#446).
+    draggedLevel: level,
     targetId: here.id,
     targetAncestors: new Set(path.map((step) => step.id).filter((id) => id !== null)),
   });
@@ -147,7 +202,7 @@ export function MoveDialog({
             <p className="min-w-0 flex-1 truncate text-sm font-medium">{here.title}</p>
           </div>
           <ul className="max-h-56 space-y-1 overflow-y-auto">
-            {level.isPending ? (
+            {children.isPending ? (
               <li className="px-2 py-1.5 text-sm text-muted-foreground">
                 {i18n.t("common.loading")}
               </li>
@@ -236,7 +291,17 @@ export function useTreeMove({
   // folder so the row is where the eye follows it. Nobody else has a tree to open.
   onMoved?: ((destination: MoveDestination) => void) | undefined;
 } = {}): {
-  start(entry: TreeEntry, destination: MoveDestination | null): void;
+  // `level` is the one the row is standing in, and the caller says it or says `undefined` — the tree
+  // knows it from the level it rendered into, the title line has no tree at all. Guessing it here
+  // with `parentOf` is what filed a moved row into a cache level that does not exist (#446).
+  //
+  // ⚠️ `undefined` is not "root". It means the level is unknown, and it is handled by cleaning up
+  // BOTH levels such a row can stand in — see `levelsToClear`.
+  start(
+    entry: TreeEntry,
+    level: string | null | undefined,
+    destination: MoveDestination | null,
+  ): void;
   error: unknown;
   dialog: React.ReactNode;
 } {
@@ -244,6 +309,7 @@ export function useTreeMove({
   const queryClient = useQueryClient();
   const [moving, setMoving] = useState<{
     entry: TreeEntry;
+    level: string | null | undefined;
     initial: MoveDestination | null;
   } | null>(null);
 
@@ -253,6 +319,7 @@ export function useTreeMove({
       destination,
     }: {
       entry: TreeEntry;
+      level: string | null | undefined;
       destination: MoveDestination;
     }) => {
       // `baseUpdatedAt` travels with the move: it is what turns a concurrent edit into a 409 the
@@ -273,20 +340,21 @@ export function useTreeMove({
         });
       }
     },
-    onMutate: async ({ entry, destination }) => {
-      const fromKey = treeLevelKey(parentOf(entry));
+    onMutate: async ({ entry, level, destination }) => {
+      const fromKeys = levelsToClear(entry, level).map(treeLevelKey);
       const toKey = treeLevelKey(destination.id);
-      await Promise.all([
-        queryClient.cancelQueries({ queryKey: fromKey }),
-        queryClient.cancelQueries({ queryKey: toKey }),
-      ]);
-      const snapshot = [
-        [fromKey, queryClient.getQueryData<TreeEntry[]>(fromKey)],
-        [toKey, queryClient.getQueryData<TreeEntry[]>(toKey)],
-      ] as const;
-      queryClient.setQueryData<TreeEntry[]>(fromKey, (current) =>
-        current?.filter((row) => row.id !== entry.id),
+      await Promise.all(
+        [...fromKeys, toKey].map(async (queryKey) => await queryClient.cancelQueries({ queryKey })),
       );
+      const snapshot = [
+        ...fromKeys.map((key) => [key, queryClient.getQueryData<TreeEntry[]>(key)] as const),
+        [toKey, queryClient.getQueryData<TreeEntry[]>(toKey)] as const,
+      ];
+      for (const key of fromKeys) {
+        queryClient.setQueryData<TreeEntry[]>(key, (current) =>
+          current?.filter((row) => row.id !== entry.id),
+        );
+      }
       // A level nobody has opened stays unloaded: writing one here would show a folder's contents
       // that were never read.
       queryClient.setQueryData<TreeEntry[]>(toKey, (current) =>
@@ -300,9 +368,11 @@ export function useTreeMove({
       for (const [key, value] of context?.snapshot ?? []) queryClient.setQueryData(key, value);
     },
     onSuccess: (_result, { destination }) => onMoved?.(destination),
-    onSettled: async (_result, _error, { entry, destination }) => {
+    onSettled: async (_result, _error, { entry, level, destination }) => {
       await Promise.all([
-        queryClient.invalidateQueries({ queryKey: treeLevelKey(parentOf(entry)) }),
+        ...levelsToClear(entry, level).map(
+          async (from) => await queryClient.invalidateQueries({ queryKey: treeLevelKey(from) }),
+        ),
         queryClient.invalidateQueries({ queryKey: treeLevelKey(destination.id) }),
         queryClient.invalidateQueries({
           queryKey: [entry.type === "flow" ? "flows" : "node-graph"],
@@ -313,19 +383,20 @@ export function useTreeMove({
   });
 
   return {
-    start(entry, destination) {
+    start(entry, level, destination) {
       move.reset();
-      setMoving({ entry, initial: destination });
+      setMoving({ entry, level, initial: destination });
     },
     error: move.isError ? move.error : null,
     dialog: moving ? (
       <MoveDialog
         entry={moving.entry}
+        level={moving.level}
         initial={moving.initial}
         close={() => setMoving(null)}
         submit={(destination) => {
           setMoving(null);
-          move.mutate({ entry: moving.entry, destination });
+          move.mutate({ entry: moving.entry, level: moving.level, destination });
         }}
       />
     ) : null,

package/src/app/view-toggle/view-toggle.tsx

@@ -64,7 +64,7 @@ export function ViewToggle({ views = ["editor", "graph"] }: { views?: readonly I
                     search: view === "editor" ? rest : { ...rest, view },
                   });
                 }}
-                className="inline-flex size-8 items-center justify-center rounded-md border bg-background outline-none hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring"
+                className="inline-flex size-8 items-center justify-center rounded-md outline-none hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring"
               >
                 <Icon aria-hidden="true" className="size-4" />
               </TooltipTrigger>

package/src/archive/archive.tsx

@@ -8,7 +8,7 @@ import { useI18n } from "@/i18n/i18n-context.tsx";
 import { kindIcons } from "@/kind-icon.ts";
 import { Modal } from "@/modal/modal.tsx";
 import { useIntelRouterContext } from "@/router/router-context.ts";
-import { useDateTime } from "@/time/time-context.tsx";
+import { RelativeTime } from "@/time/relative-time.tsx";
 
 // One archived thing, whichever side of the tree it came from. The two records stay apart
 // everywhere else (ADR-0004); here they are one list because "what did I throw away" is one
@@ -29,7 +29,6 @@ interface ArchivedEntry {
 export function Archive() {
   const { data } = useIntelRouterContext();
   const i18n = useI18n();
-  const dateTime = useDateTime();
   const queryClient = useQueryClient();
 
   const archived = useQuery({
@@ -180,8 +179,9 @@ export function Archive() {
               <span className="sr-only">{i18n.t(`node.kind.${entry.kind}`)}</span>
               <span className="grid min-w-0 flex-1 leading-tight">
                 <span className="truncate text-sm font-medium">{entry.title}</span>
-                <span className="truncate text-xs text-muted-foreground">
-                  {i18n.t("archive.archivedAt", { when: dateTime.at(entry.archivedAt) })}
+                <span className="flex items-center gap-1 truncate text-xs text-muted-foreground">
+                  {i18n.t("archive.archived")}
+                  <RelativeTime value={entry.archivedAt} />
                 </span>
               </span>
               {/* Both actions stay permanently visible: the archive is the one place where getting

package/src/data/intel-data-provider/intel-data-provider.ts

@@ -9,6 +9,7 @@ import {
   FlowPublishPreview,
   FlowRequirements,
   FlowValidation,
+  FlowVersionList,
   ListFlowsInput,
   PreviewFlowPublishInput,
   PublishFlowInput,
@@ -441,6 +442,9 @@ export function createIntelDataProvider(
         body: JSON.stringify(parsed),
       });
     },
+    async listFlowVersions(flowId) {
+      return await request(`/flows/${encodeURIComponent(flowId)}/versions`, FlowVersionList);
+    },
     async previewFlowPublish(input) {
       const parsed = PreviewFlowPublishInput.parse(input);
       return await request(

package/src/data/intel-data-provider/intel-data-provider.types.ts

@@ -9,6 +9,7 @@ import type {
   FlowPublishPreview,
   FlowRequirements,
   FlowValidation,
+  FlowVersionList,
   ListFlowsInput,
   PreviewFlowPublishInput,
   PublishFlowInput,
@@ -166,6 +167,7 @@ export interface IntelDataProvider {
   // stops resolving as another flow's callee; its versions stay untouched.
   archiveFlow(input: ArchiveFlowInput): Promise<Flow>;
   saveFlow(input: SaveFlowVersionInput): Promise<FlowDocument>;
+  listFlowVersions(flowId: string): Promise<FlowVersionList>;
   // Which version each sub-flow call will take once published, and which of them publishing
   // freezes. Read before publishing, so the author agrees to the pins rather than discovering them.
   previewFlowPublish(input: PreviewFlowPublishInput): Promise<FlowPublishPreview>;

package/src/flow-runs/flow-runs.tsx

@@ -5,7 +5,8 @@ import { useState } from "react";
 import type { I18n } from "@/i18n/i18n.types.ts";
 import { useI18n } from "@/i18n/i18n-context.tsx";
 import { useIntelRouterContext } from "@/router/router-context.ts";
-import { useDateTime } from "@/time/time-context.tsx";
+import { RelativeTime } from "@/time/relative-time.tsx";
+import { TitleRowScrollArea } from "@/title-row/title-row.tsx";
 
 // One page is what a person reads before deciding, not what a database can return. The server caps
 // it at fifty; twenty is what fits on a screen without scrolling past the answer.
@@ -63,7 +64,7 @@ export function FlowRuns({ flowId }: { flowId: string }) {
           {i18n.t("runs.onlyFailed")}
         </label>
       </div>
-      <div className="min-h-0 flex-1 overflow-y-auto p-5">
+      <TitleRowScrollArea className="min-h-0 flex-1 overflow-y-auto p-5">
         {runs.isPending && (
           <p className="text-sm text-muted-foreground">{i18n.t("common.loading")}</p>
         )}
@@ -109,14 +110,13 @@ export function FlowRuns({ flowId }: { flowId: string }) {
             {runs.isFetchingNextPage ? i18n.t("common.loading") : i18n.t("runs.more")}
           </button>
         )}
-      </div>
+      </TitleRowScrollArea>
     </section>
   );
 }
 
 function RunRow({ run, open, toggle }: { run: FlowRunSummary; open: boolean; toggle(): void }) {
   const i18n = useI18n();
-  const dateTime = useDateTime();
   const failed = run.status === "failed";
   const Chevron = open ? ChevronDown : ChevronRight;
   return (
@@ -135,7 +135,7 @@ function RunRow({ run, open, toggle }: { run: FlowRunSummary; open: boolean; tog
             >
               {i18n.t(`runs.status.${run.status}`)}
             </span>
-            <span>{dateTime.at(run.startedAt)}</span>
+            <RelativeTime value={run.startedAt} />
             <span className="text-muted-foreground">
               {run.durationMs === null
                 ? i18n.t("runs.stillRunning")

package/src/flows/flows.tsx

@@ -38,7 +38,7 @@ import { useIntelRouterContext } from "@/router/router-context.ts";
 import { selectedFrom, viewFrom } from "@/router/selection-search.ts";
 import { SaveButton, UnsavedChangesGuard } from "@/save-button/save-button.tsx";
 import { useResolvedTheme } from "@/theme/theme-context.tsx";
-import { TitleRow } from "@/title-row/title-row.tsx";
+import { TitleRow, TitleRowFrame, TitleRowScrollArea } from "@/title-row/title-row.tsx";
 
 type CanvasNode = ReactFlowNode<{ node: FlowNode }, "intel">;
 type CanvasEdge = Edge;
@@ -455,7 +455,7 @@ function FlowsEditor() {
   }
 
   return (
-    <div className="flex h-full min-h-0 flex-col">
+    <TitleRowFrame className="flex h-full min-h-0 flex-col">
       {selectedFlowId && document.data ? (
         <FlowTitle
           flow={document.data.flow}
@@ -634,14 +634,18 @@ function FlowsEditor() {
                 <Controls />
               </ReactFlow>
             </section>
-            <aside className="flex w-80 shrink-0 flex-col overflow-y-auto border-l bg-card">
-              <NodeInspector
-                node={selectedNode}
-                update={updateNode}
-                tools={tools.data?.items ?? []}
-                flows={(callable.data?.items ?? []).filter((entry) => entry.id !== selectedFlowId)}
-              />
-              <FlowNeeds flowId={selectedFlowId} />
+            <aside className="flex w-80 shrink-0 flex-col border-l bg-card">
+              <TitleRowScrollArea className="min-h-0 flex-1 overflow-y-auto">
+                <NodeInspector
+                  node={selectedNode}
+                  update={updateNode}
+                  tools={tools.data?.items ?? []}
+                  flows={(callable.data?.items ?? []).filter(
+                    (entry) => entry.id !== selectedFlowId,
+                  )}
+                />
+                <FlowNeeds flowId={selectedFlowId} />
+              </TitleRowScrollArea>
             </aside>
           </>
         )}
@@ -673,7 +677,7 @@ function FlowsEditor() {
           }}
         />
       ) : null}
-    </div>
+    </TitleRowFrame>
   );
 }
 
@@ -729,7 +733,7 @@ function FlowTitle({
           applies EVERYWHERE stands. But it says how THIS flow is shown, and so belongs in the line
           that names this flow. A flow is the only level with runs, and therefore the only one with
           three views (#35). */}
-      <ViewToggle views={["editor", "graph", "runs"]} />
+      <SaveButton dirty={dirty && canMutate} saving={saving} onSave={onSave} />
       <TooltipProvider delayDuration={300}>
         <Tooltip>
           <TooltipTrigger asChild>
@@ -742,8 +746,8 @@ function FlowTitle({
                 onClick={onPublish}
                 disabled={!publishable}
                 aria-label={publishLabel}
-                className={`inline-flex size-8 items-center justify-center rounded-md border bg-background outline-none hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50 ${
-                  publishable && unpublished ? "border-primary text-primary" : ""
+                className={`inline-flex size-8 items-center justify-center rounded-md outline-none hover:bg-accent focus-visible:ring-2 focus-visible:ring-ring disabled:opacity-50 ${
+                  publishable && unpublished ? "bg-primary/10 text-primary" : ""
                 }`}
               >
                 <Send aria-hidden="true" className="size-4" />
@@ -753,14 +757,7 @@ function FlowTitle({
           <TooltipContent>{publishLabel}</TooltipContent>
         </Tooltip>
       </TooltipProvider>
-      {/* A draft that was never saved has no version, and the button says so rather than claiming
-          one (#432) — the same distinction the publish button next to it already draws. */}
-      <SaveButton
-        dirty={dirty && canMutate}
-        saving={saving}
-        stored={flow.currentVersionId !== null}
-        onSave={onSave}
-      />
+      <ViewToggle views={["editor", "graph", "runs"]} />
     </TitleRow>
   );
 }