@cueloop/client 0.1.0-alpha.65 → 0.1.0-alpha.66

package/src/app-screens.tsx

@@ -12,11 +12,11 @@ import type { SettingsCategory, SettingsValues } from "./components/SettingsDial
 import type { SettingsNav } from "./use-settings-dialog";
 import { CLIENT_VERSION } from "./version";
 import { ThemeProvider } from "./components/theme-context";
-import { MenuBar } from "./components/MenuBar";
-import { KeybindsDialog } from "./components/KeybindsDialog";
+import { NERD } from "./components/primitives/icons";
+import type { InboxRow } from "./components/session-tree";
 import { SettingsDialog } from "./components/SettingsDialog";
 import { CompletionOverlay } from "./components/CompletionOverlay";
-import { InboxList } from "./components/InboxList";
+import { ThreadsSidebar } from "./components/ThreadsSidebar";
 import { ConfirmDialog } from "./components/ConfirmDialog";
 import { PromptDialog } from "./components/PromptDialog";
 import { WalkWizard } from "./components/WalkWizard";
@@ -39,12 +39,8 @@ export function ConnectingScreen({ theme }: { theme: Theme }): React.ReactNode {
 }
 
 export function MenuChrome(props: {
-  menuOpen: boolean;
   menuDialog: "keybinds" | "settings" | null;
-  status: string;
   theme: Theme;
-  setMenuOpen: Dispatch<SetStateAction<boolean>>;
-  setMenuDialog: Dispatch<SetStateAction<"keybinds" | "settings" | null>>;
   keybindsSections: CheatsheetSection[];
   settingsCategories: SettingsCategory[];
   settingsValues: SettingsValues;
@@ -53,12 +49,8 @@ export function MenuChrome(props: {
   cycleSetting: (rowKey: string) => void;
 }): React.ReactNode {
   const {
-    menuOpen,
     menuDialog,
-    status,
     theme,
-    setMenuOpen,
-    setMenuDialog,
     keybindsSections,
     settingsCategories,
     settingsValues,
@@ -67,53 +59,37 @@ export function MenuChrome(props: {
     cycleSetting,
   } = props;
 
+  // the gear opens the settings dialog directly; Keybinds is a leaf in its tree nav
+  if (menuDialog !== "settings") return null;
+
   return (
-    <>
-      <MenuBar
-        open={menuOpen}
-        version={CLIENT_VERSION}
-        status={status}
-        onToggle={() => setMenuOpen((isOpen) => !isOpen)}
-        onSettings={() => {
-          setMenuOpen(false);
-          setMenuDialog("settings");
-        }}
-        onKeybinds={() => {
-          setMenuOpen(false);
-          setMenuDialog("keybinds");
-        }}
-        theme={theme}
-      />
-      {menuDialog === "keybinds" ? (
-        <KeybindsDialog sections={keybindsSections} theme={theme} />
-      ) : null}
-      {menuDialog === "settings" ? (
-        <SettingsDialog
-          isOpen
-          categories={settingsCategories}
-          values={settingsValues}
-          activeCategoryId={settingsNav.categoryId}
-          activeRowIndex={settingsNav.rowIndex}
-          activeZone={settingsNav.zone}
-          onCategorySelect={onCategorySelect}
-          onRowActivate={(row) => cycleSetting(row.key)}
-          theme={theme}
-        />
-      ) : null}
-    </>
+    <SettingsDialog
+      isOpen
+      version={CLIENT_VERSION}
+      keybindsSections={keybindsSections}
+      categories={settingsCategories}
+      values={settingsValues}
+      activeCategoryId={settingsNav.categoryId}
+      activeRowIndex={settingsNav.rowIndex}
+      activeZone={settingsNav.zone}
+      onCategorySelect={onCategorySelect}
+      onRowActivate={(row) => cycleSetting(row.key)}
+      theme={theme}
+    />
   );
 }
 
 export function InboxScreen(props: {
-  inbox: ReviewSession[];
+  rows: InboxRow[];
   inboxCursor: number;
   mode: Mode;
   theme: Theme;
   controller: ReviewController;
   setMode: Dispatch<SetStateAction<Mode>>;
   menuChrome: React.ReactNode;
+  onOpenMenu: () => void;
 }): React.ReactNode {
-  const { inbox, inboxCursor, mode, theme, controller, setMode, menuChrome } = props;
+  const { rows, inboxCursor, mode, theme, controller, setMode, menuChrome, onOpenMenu } = props;
   const confirming = mode.type === "confirmDelete" ? mode : null;
 
   return (
@@ -139,6 +115,9 @@ export function InboxScreen(props: {
               flexDirection: "row",
             }}
           >
+            <box onMouseUp={onOpenMenu} style={{ paddingRight: 2 }}>
+              <text fg={theme.textMuted}>{NERD.settings}</text>
+            </box>
             <text>
               <span fg={theme.accent}>cueloop</span>
               <span fg={theme.textDim}> · resume</span>
@@ -146,11 +125,21 @@ export function InboxScreen(props: {
           </box>
           <box style={{ flexGrow: 1 }} />
         </box>
-        <InboxList
-          inbox={inbox}
-          cursor={inboxCursor}
-          onRequestDelete={(id, title) => setMode({ type: "confirmDelete", sessionId: id, title })}
-        />
+        <box style={{ flexGrow: 1, flexDirection: "row" }}>
+          <ThreadsSidebar
+            open
+            rows={rows}
+            cursor={inboxCursor}
+            onSelect={(id) => controller.open(id)}
+            onRequestDelete={(id, title) =>
+              setMode({ type: "confirmDelete", sessionId: id, title })
+            }
+            theme={theme}
+          />
+          <box style={{ flexGrow: 1, paddingLeft: 2, paddingTop: 1 }}>
+            <text fg={theme.textDim}>Select a thread</text>
+          </box>
+        </box>
         {menuChrome}
         <ConfirmDialog
           isOpen={confirming !== null}

package/src/app-view-model.ts

@@ -112,17 +112,15 @@ export function buildRenderFlags(params: {
   isDiff: boolean;
   isPrototype: boolean;
   resolved: boolean;
-  menuOpen: boolean;
   menuDialog: "keybinds" | "settings" | null;
   resolvedIds: Set<string>;
 }) {
-  const { session, isOwner, isDiff, isPrototype, resolved, menuOpen, menuDialog, resolvedIds } =
-    params;
+  const { session, isOwner, isDiff, isPrototype, resolved, menuDialog, resolvedIds } = params;
 
   return {
     showOwnerActions: isOwner && !isDiff && !resolved,
     prototypeCanComment: isOwner && !resolved,
-    chromeHidden: menuOpen || menuDialog !== null,
+    chromeHidden: menuDialog !== null,
     prototypePath: session.artifact.meta.prototypePath ?? "",
     railResolvedIds: isDiff || isPrototype ? null : resolvedIds,
   };

package/src/components/AnnotationCard.stories.tsx

@@ -3,7 +3,7 @@ import { DARK } from "../theme";
 import type { Story, StoryMeta } from "./story";
 import { AnnotationCard } from "./AnnotationCard";
 
-export const meta: StoryMeta = { title: "AnnotationCard" };
+export const meta: StoryMeta = { title: "Cards/AnnotationCard" };
 
 const draftCallbacks = { onInput: () => {}, onSave: () => {}, onCancel: () => {} };
 

package/src/components/AppShell.stories.tsx

@@ -0,0 +1,84 @@
+import React from "react";
+import { DARK } from "../theme";
+import type { Story, StoryMeta } from "./story";
+import { AppShell } from "./AppShell";
+
+export const meta: StoryMeta = { title: "Layout/AppShell" };
+
+function Sidebar(): React.ReactNode {
+  return (
+    <box style={{ flexDirection: "column", paddingLeft: 1, paddingTop: 1 }}>
+      <text fg={DARK.textDim}>Projects</text>
+      <text fg={DARK.text}> cueloop</text>
+      <box style={{ backgroundColor: DARK.elevated }}>
+        <text fg={DARK.accent}> Read Cueloop Repository</text>
+      </box>
+      <text> </text>
+      <text fg={DARK.textDim}>Threads</text>
+      <text fg={DARK.textMuted}> Welcome to cueloop</text>
+    </box>
+  );
+}
+
+function Main(): React.ReactNode {
+  return (
+    <box style={{ flexDirection: "column", paddingLeft: 1, paddingTop: 1 }}>
+      <text fg={DARK.text}>read the repo</text>
+      <text> </text>
+      <text fg={DARK.textMuted}>Repository context loaded. main is clean.</text>
+      <text> </text>
+      <text fg={DARK.text}>Core architecture</text>
+      <text fg={DARK.textMuted}> - packages/schema is the dependency root</text>
+      <text fg={DARK.textMuted}> - packages/daemon owns session state</text>
+    </box>
+  );
+}
+
+function Inspector(): React.ReactNode {
+  return (
+    <box style={{ flexDirection: "column", paddingLeft: 1, paddingTop: 1 }}>
+      <text fg={DARK.text}>cueloop/main</text>
+      <text fg={DARK.textDim}> No changes</text>
+    </box>
+  );
+}
+
+function Header(): React.ReactNode {
+  return (
+    <box style={{ flexDirection: "row", paddingLeft: 1 }}>
+      <text fg={DARK.textMuted}>Read Cueloop Repository</text>
+      <box style={{ flexGrow: 1 }} />
+      <text fg={DARK.textDim}>markdown.test.ts</text>
+    </box>
+  );
+}
+
+function Footer(): React.ReactNode {
+  return (
+    <box style={{ flexDirection: "row", paddingLeft: 1 }}>
+      <text fg={DARK.textDim}>cueloop / main</text>
+      <box style={{ flexGrow: 1 }} />
+      <text fg={DARK.textDim}>Fable 5</text>
+    </box>
+  );
+}
+
+export const ThreePane: Story = {
+  render: () => (
+    <AppShell
+      sidebar={<Sidebar />}
+      main={<Main />}
+      mainHeader={<Header />}
+      inspector={<Inspector />}
+      footer={<Footer />}
+    />
+  ),
+  expectedColors: [DARK.border, DARK.accent],
+  size: { width: 120, height: 28 },
+};
+
+export const SidebarAndMain: Story = {
+  render: () => <AppShell sidebar={<Sidebar />} main={<Main />} />,
+  expectedColors: [DARK.border],
+  size: { width: 90, height: 20 },
+};

package/src/components/AppShell.tsx

@@ -0,0 +1,127 @@
+// App shell: a grid of pane columns. Each column stacks a header cell over its body; the vertical
+// rules run full height (through the header), and each header cell's bottom rule joins into one
+// horizontal line across the columns. Rules only - no enclosing frames.
+
+import React from "react";
+import { DARK, type Theme } from "../theme";
+import type { BorderSides } from "@opentui/core";
+
+export interface AppShellProps {
+  headerHeight?: number;
+  sidebar?: React.ReactNode;
+  sidebarHeader?: React.ReactNode;
+  sidebarWidth?: number;
+  main: React.ReactNode;
+  mainHeader?: React.ReactNode;
+  inspector?: React.ReactNode;
+  inspectorHeader?: React.ReactNode;
+  inspectorWidth?: number;
+  footer?: React.ReactNode;
+  theme?: Theme;
+}
+
+interface PaneColumnProps {
+  width?: number;
+  grow?: boolean;
+  side?: BorderSides;
+  header: React.ReactNode;
+  body: React.ReactNode;
+  headerHeight: number;
+  theme: Theme;
+}
+
+function PaneColumn({
+  width,
+  grow,
+  side,
+  header,
+  body,
+  headerHeight,
+  theme,
+}: PaneColumnProps): React.ReactNode {
+  return (
+    <box
+      style={{
+        flexDirection: "column",
+        ...(grow ? { flexGrow: 1 } : { width }),
+        borderStyle: "single",
+        border: side ? [side] : [],
+        borderColor: theme.border,
+      }}
+    >
+      <box
+        style={{
+          height: headerHeight,
+          borderStyle: "single",
+          border: ["bottom"],
+          borderColor: theme.border,
+        }}
+      >
+        {header}
+      </box>
+      <box style={{ flexGrow: 1 }}>{body}</box>
+    </box>
+  );
+}
+
+export function AppShell({
+  headerHeight = 3,
+  sidebar,
+  sidebarHeader,
+  sidebarWidth = 28,
+  main,
+  mainHeader,
+  inspector,
+  inspectorHeader,
+  inspectorWidth = 40,
+  footer,
+  theme,
+}: AppShellProps): React.ReactNode {
+  const tokens = theme ?? DARK;
+
+  return (
+    <box
+      style={{
+        flexDirection: "column",
+        width: "100%",
+        height: "100%",
+        backgroundColor: tokens.background,
+      }}
+    >
+      <box style={{ flexDirection: "row", flexGrow: 1 }}>
+        {sidebar !== undefined ? (
+          <PaneColumn
+            width={sidebarWidth}
+            side="right"
+            header={sidebarHeader}
+            body={sidebar}
+            headerHeight={headerHeight}
+            theme={tokens}
+          />
+        ) : null}
+        <PaneColumn
+          grow
+          header={mainHeader}
+          body={main}
+          headerHeight={headerHeight}
+          theme={tokens}
+        />
+        {inspector !== undefined ? (
+          <PaneColumn
+            width={inspectorWidth}
+            side="left"
+            header={inspectorHeader}
+            body={inspector}
+            headerHeight={headerHeight}
+            theme={tokens}
+          />
+        ) : null}
+      </box>
+      {footer !== undefined ? (
+        <box style={{ borderStyle: "single", border: ["top"], borderColor: tokens.border }}>
+          {footer}
+        </box>
+      ) : null}
+    </box>
+  );
+}

package/src/components/Breadcrumb.stories.tsx

@@ -3,7 +3,7 @@ import { DARK } from "../theme";
 import type { Story, StoryMeta } from "./story";
 import { Breadcrumb } from "./Breadcrumb";
 
-export const meta: StoryMeta = { title: "Breadcrumb" };
+export const meta: StoryMeta = { title: "Chrome/Breadcrumb" };
 
 export const SessionHeader: Story = {
   render: () => (

package/src/components/ChangesColumn.stories.tsx

@@ -0,0 +1,39 @@
+import React from "react";
+import type { DiffFileContents } from "@cueloop/schema";
+import { DARK } from "../theme";
+import type { Story, StoryMeta } from "./story";
+import { ChangesColumn } from "./ChangesColumn";
+
+export const meta: StoryMeta = { title: "Surfaces/ChangesColumn" };
+
+function Frame({ children }: { children: React.ReactNode }): React.ReactNode {
+  return <box style={{ width: "100%", height: "100%", flexDirection: "row" }}>{children}</box>;
+}
+
+const files: DiffFileContents[] = [
+  { path: "packages/client/src/App.tsx", oldContents: "a", newContents: "b", status: "modified" },
+  {
+    path: "packages/client/src/components/ChangesColumn.tsx",
+    oldContents: "",
+    newContents: "c",
+    status: "added",
+  },
+  { path: "packages/daemon/src/review.ts", oldContents: "d", newContents: "", status: "deleted" },
+  { path: "README.md", oldContents: "e", newContents: "f", status: "modified" },
+];
+
+export const Changed: Story = {
+  render: () => (
+    <Frame>
+      <ChangesColumn
+        open
+        files={files}
+        selectedPath="packages/client/src/App.tsx"
+        onSelectFile={() => {}}
+        theme={DARK}
+      />
+    </Frame>
+  ),
+  expectedColors: [DARK.accent, DARK.border],
+  size: { width: 60, height: 12 },
+};

package/src/components/ChangesColumn.tsx

@@ -0,0 +1,147 @@
+// The right-hand Changes column: the diff's changed files as a directory tree.
+// A click on a file scrolls the diff to that file. Renders nothing when collapsed
+// so the diff reclaims the width. Mirrors the left Threads column on the far side.
+// Co-located here: the state hook that opens it by context and the header toggle.
+
+import React, { useMemo, useState } from "react";
+import type { DiffFileContents, ReviewSession } from "@cueloop/schema";
+import type { Theme } from "../theme";
+import type { DiffRow } from "../view-diff";
+import { Tree } from "./primitives/Tree";
+import { allFolderIds } from "./primitives/tree-model";
+import { IconButton } from "./primitives/IconButton";
+import { NERD } from "./primitives/icons";
+import { buildFileTree } from "./file-tree";
+
+export interface DiffColumnsState {
+  changesOpen: boolean;
+  toggleChanges: () => void;
+  /** The path under the diff cursor, highlighted in the Changes tree. */
+  currentFilePath?: string;
+  scrollToFile: (path: string) => void;
+}
+
+/**
+ * Owns the right Changes column for a diff: context opens it when you enter a
+ * diff thread, and a file click scrolls the sheet to that file's first row.
+ * Resets on session change via the guarded render-time pattern, no effect.
+ */
+export function useDiffColumns(params: {
+  session: ReviewSession | null;
+  rows: DiffRow[];
+  cursor: number;
+  setCursor: (index: number) => void;
+}): DiffColumnsState {
+  const { session, rows, cursor, setCursor } = params;
+  const contextDefault = session?.artifact.type === "diff";
+  const [changesOpen, setChangesOpen] = useState(contextDefault);
+  const [seenSessionId, setSeenSessionId] = useState(session?.id);
+
+  // entering another thread lets context decide again; within a thread the manual toggle stays
+  if (session?.id !== seenSessionId) {
+    setSeenSessionId(session?.id);
+    setChangesOpen(contextDefault);
+  }
+
+  return {
+    changesOpen,
+    toggleChanges: () => setChangesOpen((open) => !open),
+    currentFilePath: rows[cursor]?.file,
+    scrollToFile: (path: string) => {
+      const fileRowIndex = rows.findIndex((row) => row.kind === "file" && row.file === path);
+
+      if (fileRowIndex >= 0) setCursor(fileRowIndex);
+    },
+  };
+}
+
+/** The header toggle for the Changes column; shown only for a diff, where files exist to browse. */
+export function DiffChangesToggle({
+  isDiff,
+  open,
+  onToggle,
+  theme,
+}: {
+  isDiff: boolean;
+  open: boolean;
+  onToggle: () => void;
+  theme?: Theme;
+}): React.ReactNode {
+  if (!isDiff) return null;
+
+  return (
+    <IconButton
+      glyph={open ? NERD.sidebarRight : NERD.sidebarRightOff}
+      onPress={onToggle}
+      marginLeft={2}
+      theme={theme}
+    />
+  );
+}
+
+export interface ChangesColumnProps {
+  open: boolean;
+  files?: readonly DiffFileContents[];
+  /** The path whose diff the sheet is scrolled to, highlighted in the tree. */
+  selectedPath?: string;
+  onSelectFile: (path: string) => void;
+  width?: number;
+  theme?: Theme;
+}
+
+export function ChangesColumn({
+  open,
+  files = [],
+  selectedPath,
+  onSelectFile,
+  width = 32,
+  theme,
+}: ChangesColumnProps): React.ReactNode {
+  const nodes = useMemo(() => buildFileTree(files), [files]);
+  // every folder opens by default so each changed file is reachable; the user
+  // only ever names the folders they fold shut, so a new file set stays open
+  const [collapsedIds, setCollapsedIds] = useState<ReadonlySet<string>>(new Set());
+  const expandedIds = useMemo(() => {
+    const expanded = allFolderIds(nodes);
+
+    for (const id of collapsedIds) expanded.delete(id);
+
+    return expanded;
+  }, [nodes, collapsedIds]);
+
+  if (!open) return null;
+
+  return (
+    <box
+      style={{
+        width,
+        flexDirection: "column",
+        borderStyle: "single",
+        border: ["left"],
+        borderColor: theme?.border,
+      }}
+    >
+      <scrollbox style={{ flexGrow: 1 }} focused={false}>
+        <Tree
+          nodes={nodes}
+          expandedIds={expandedIds}
+          selectedId={selectedPath}
+          flattenEmptyDirectories
+          showStatus
+          onSelect={onSelectFile}
+          onToggle={(id) =>
+            setCollapsedIds((current) => {
+              const next = new Set(current);
+
+              if (next.has(id)) next.delete(id);
+              else next.add(id);
+
+              return next;
+            })
+          }
+          theme={theme}
+        />
+      </scrollbox>
+    </box>
+  );
+}

package/src/components/CodeBlock.stories.tsx

@@ -3,7 +3,7 @@ import { DARK } from "../theme";
 import type { Story, StoryMeta } from "./story";
 import { CodeBlock } from "./CodeBlock";
 
-export const meta: StoryMeta = { title: "CodeBlock" };
+export const meta: StoryMeta = { title: "Primitives/CodeBlock" };
 
 const SNIPPET = `export function gate(full: number) {
   // threshold

package/src/components/CompletionOverlay.stories.tsx

@@ -3,7 +3,7 @@ import { DARK } from "../theme";
 import type { Story, StoryMeta } from "./story";
 import { CompletionOverlay } from "./CompletionOverlay";
 
-export const meta: StoryMeta = { title: "CompletionOverlay" };
+export const meta: StoryMeta = { title: "Overlays/CompletionOverlay" };
 
 export const ApprovedPrompt: Story = {
   render: () => <CompletionOverlay verdict="approve" completion={{ phase: "prompt" }} status="" />,

package/src/components/ConfirmCard.stories.tsx

@@ -3,7 +3,7 @@ import { DARK } from "../theme";
 import type { Story, StoryMeta } from "./story";
 import { ConfirmCard } from "./ConfirmCard";
 
-export const meta: StoryMeta = { title: "ConfirmCard" };
+export const meta: StoryMeta = { title: "Cards/ConfirmCard" };
 
 const callbacks = {
   onInput: () => {},

package/src/components/ConfirmCard.tsx

@@ -98,11 +98,10 @@ export function ConfirmCard({
 
   return (
     <Card
-      title=" submit review "
+      title=" send message "
       contentRows={CONFIRM_CONTENT_ROWS + (viewedSummary !== undefined ? 2 : 0)}
       borderColor={tokens.text}
-      backgroundColor="transparent"
-      marginRight={1}
+      backgroundColor={tokens.elevated}
       theme={theme}
     >
       {viewedSummary !== undefined ? <text fg={tokens.textDim}>{viewedSummary}</text> : null}
@@ -118,7 +117,7 @@ export function ConfirmCard({
       <box style={{ height: 1 }} />
       <Toolbar>
         <Button variant="solid" marginRight={2} onPress={onSubmit} theme={theme}>
-          {" Submit "}
+          {" send message "}
         </Button>
         <Button onPress={onCancel} theme={theme}>
           {" Cancel "}

package/src/components/ConfirmDialog.stories.tsx

@@ -3,7 +3,7 @@ import { DARK } from "../theme";
 import type { Story, StoryMeta } from "./story";
 import { ConfirmDialog } from "./ConfirmDialog";
 
-export const meta: StoryMeta = { title: "ConfirmDialog" };
+export const meta: StoryMeta = { title: "Overlays/ConfirmDialog" };
 
 const callbacks = { onConfirm: () => {}, onCancel: () => {} };
 

package/src/components/DiffSheet.stories.tsx

@@ -4,7 +4,7 @@ import type { Story, StoryMeta } from "./story";
 import { DiffSheet } from "./DiffSheet";
 import { FIXTURE_PATCH, fixtureDiffRows } from "./story-fixtures";
 
-export const meta: StoryMeta = { title: "DiffSheet" };
+export const meta: StoryMeta = { title: "Surfaces/DiffSheet" };
 
 export const SignedRows: Story = {
   render: () => <DiffSheet rows={fixtureDiffRows()} cursor={0} annotations={[]} />,