@cueloop/client 0.1.0-alpha.94 → 0.1.0-alpha.95

package/src/{components → ui/components}/ConfirmDialog.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { ConfirmDialog } from "./ConfirmDialog";
 
 export const meta: StoryMeta = { title: "Overlays/ConfirmDialog" };

package/src/{components → ui/components}/ConfirmDialog.tsx

@@ -7,8 +7,8 @@
 
 import React from "react";
 import { useTerminalDimensions } from "@opentui/react";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
 import { Dialog } from "./primitives/Dialog";
 import { DialogActions } from "./primitives/DialogActions";
 

package/src/{components → ui/components}/OverlayScrollbar.stories.tsx

@@ -1,8 +1,8 @@
 import React, { useRef } from "react";
 import type { ScrollBoxRenderable } from "@opentui/core";
-import { DARK } from "../theme";
+import { DARK } from "../../appearance/theme";
 import { OverlayScrollbar } from "./OverlayScrollbar";
-import type { Story, StoryMeta } from "./story";
+import type { Story, StoryMeta } from "../../stories/story";
 
 export const meta: StoryMeta = { title: "Chrome/OverlayScrollbar" };
 

package/src/{components → ui/components}/OverlayScrollbar.test.tsx

@@ -8,11 +8,11 @@ import { describe, expect, test } from "bun:test";
 import { testRender } from "@opentui/react/test-utils";
 import { ScrollBoxRenderable, type Renderable } from "@opentui/core";
 import React from "react";
-import { DiffContentView } from "./DiffContentView";
-import { diffRows, marksByRows } from "../view-diff";
-import { allowEventLoopUpdates } from "../test-support";
-import { fixtureDiffSession } from "./story-fixtures";
-import { DARK } from "../theme";
+import { DiffContentView } from "../../diff/components/DiffContentView";
+import { diffRows, marksByRows } from "../../diff/view-diff";
+import { allowEventLoopUpdates } from "../../testing/test-support";
+import { fixtureDiffSession } from "../../stories/story-fixtures";
+import { DARK } from "../../appearance/theme";
 import { thumbGeometry } from "./OverlayScrollbar";
 
 const noop = (): void => {};

package/src/{components → ui/components}/OverlayScrollbar.tsx

@@ -7,9 +7,9 @@
 
 import React, { useEffect, useRef, useState, type RefObject } from "react";
 import type { BoxRenderable, ScrollBoxRenderable } from "@opentui/core";
-import type { Theme } from "../theme";
+import type { Theme } from "../../appearance/theme";
 import { useFrameMeasure } from "../use-frame-measure";
-import { useComponentTheme } from "./theme-context";
+import { useComponentTheme } from "../../appearance/components/theme-context";
 
 const HIDE_DELAY_MS = 1500;
 

package/src/{components → ui/components}/PromptDialog.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { PromptDialog } from "./PromptDialog";
 
 export const meta: StoryMeta = { title: "Overlays/PromptDialog" };

package/src/{components → ui/components}/PromptDialog.test.tsx

@@ -5,8 +5,8 @@ import { test, expect } from "bun:test";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { PromptDialog } from "./PromptDialog";
-import { locateText, settle, typeText } from "../test-support";
-import { DARK } from "../theme";
+import { locateText, settle, typeText } from "../../testing/test-support";
+import { DARK } from "../../appearance/theme";
 
 test("the input is focused on open, so typing lands in the dialog", async () => {
   const inputs: string[] = [];

package/src/{components → ui/components}/PromptDialog.tsx

@@ -8,8 +8,8 @@
 import React, { useEffect, useRef } from "react";
 import { useTerminalDimensions } from "@opentui/react";
 import type { KeyBinding, TextareaRenderable } from "@opentui/core";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
 import { Dialog } from "./primitives/Dialog";
 import { DialogActions } from "./primitives/DialogActions";
 

package/src/{components → ui/components}/RootOverlay.stories.tsx

@@ -1,6 +1,6 @@
 import React, { useEffect } from "react";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { RootOverlayProvider, useRootOverlay } from "./RootOverlay";
 
 export const meta: StoryMeta = { title: "Layout/RootOverlay" };

package/src/{components → ui/components}/ScrollArea.stories.tsx

@@ -1,7 +1,7 @@
 import React from "react";
-import { DARK } from "../theme";
+import { DARK } from "../../appearance/theme";
 import { ScrollArea } from "./ScrollArea";
-import type { Story, StoryMeta } from "./story";
+import type { Story, StoryMeta } from "../../stories/story";
 
 export const meta: StoryMeta = { title: "Chrome/ScrollArea" };
 

package/src/{components → ui/components}/ScrollArea.tsx

@@ -6,7 +6,7 @@
 
 import React, { useLayoutEffect, useMemo, useRef, type ReactNode, type RefObject } from "react";
 import { MacOSScrollAccel, type ScrollBoxRenderable } from "@opentui/core";
-import type { Theme } from "../theme";
+import type { Theme } from "../../appearance/theme";
 import { OverlayScrollbar } from "./OverlayScrollbar";
 
 export interface ScrollAreaProps {

package/src/{components → ui/components}/Toast.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { Toast } from "./Toast";
 
 export const meta: StoryMeta = { title: "Overlays/Toast" };

package/src/{components → ui/components}/Toast.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { useTerminalDimensions } from "@opentui/react";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
 import { Dialog } from "./primitives/Dialog";
 
 export interface ToastProps {

package/src/{components → ui/components}/Tooltip.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { TooltipProvider } from "./Tooltip";
 import { IconButton } from "./primitives/IconButton";
 import { NERD } from "./primitives/icons";

package/src/{components → ui/components}/Tooltip.tsx

@@ -4,7 +4,7 @@
 
 import React, { createContext, useContext, useMemo, useState } from "react";
 import { useTerminalDimensions } from "@opentui/react";
-import { DARK, type Theme } from "../theme";
+import { DARK, type Theme } from "../../appearance/theme";
 
 interface TooltipTarget {
   label: string;

package/src/{components → ui/components}/menu-control.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { MenuControlProvider, useMenuControl } from "./menu-control";
 
 export const meta: StoryMeta = { title: "Layout/MenuControl" };

package/src/{components → ui/components}/primitives/Button.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { Button } from "./Button";
 import { Toolbar } from "./Toolbar";
 

package/src/{components → ui/components}/primitives/Button.tsx

@@ -6,8 +6,8 @@
 
 import React from "react";
 import type { MouseEvent } from "@opentui/core";
-import type { Theme } from "../../theme";
-import { useComponentTheme } from "../theme-context";
+import type { Theme } from "../../../appearance/theme";
+import { useComponentTheme } from "../../../appearance/components/theme-context";
 
 export interface ButtonProps {
   /** Unified activation: mouse release today, keyboard activation tomorrow. */

package/src/{components → ui/components}/primitives/Card.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { Card } from "./Card";
 
 export const meta: StoryMeta = { title: "Primitives/Card" };

package/src/{components → ui/components}/primitives/Card.tsx

@@ -6,8 +6,8 @@
  */
 
 import React from "react";
-import type { Theme } from "../../theme";
-import { useComponentTheme } from "../theme-context";
+import type { Theme } from "../../../appearance/theme";
+import { useComponentTheme } from "../../../appearance/components/theme-context";
 import { FRAME_BORDER_STYLE, frameTitle } from "./frame";
 
 export interface CardProps {

package/src/{components → ui/components}/primitives/Dialog.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { Dialog } from "./Dialog";
 
 export const meta: StoryMeta = { title: "Primitives/Dialog" };

package/src/{components → ui/components}/primitives/Dialog.test.tsx

@@ -4,8 +4,8 @@ import { test, expect } from "bun:test";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { Dialog } from "./Dialog";
-import { settle } from "../../test-support";
-import { DARK } from "../../theme";
+import { settle } from "../../../testing/test-support";
+import { DARK } from "../../../appearance/theme";
 
 test("clicking the backdrop dismisses; clicking inside the panel does not", async () => {
   let dismissed = 0;

package/src/{components → ui/components}/primitives/Dialog.tsx

@@ -6,8 +6,8 @@
  */
 
 import React from "react";
-import type { Theme } from "../../theme";
-import { useComponentTheme } from "../theme-context";
+import type { Theme } from "../../../appearance/theme";
+import { useComponentTheme } from "../../../appearance/components/theme-context";
 import { FRAME_BORDER_STYLE, frameTitle } from "./frame";
 
 export interface DialogProps {

package/src/{components → ui/components}/primitives/DialogActions.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { DialogActions } from "./DialogActions";
 
 export const meta: StoryMeta = { title: "Primitives/DialogActions" };

package/src/{components → ui/components}/primitives/DialogActions.tsx

@@ -1,7 +1,7 @@
 /** The one action row every overlay uses: a solid confirm word-button and a plain cancel, lowercased. */
 
 import React from "react";
-import type { Theme } from "../../theme";
+import type { Theme } from "../../../appearance/theme";
 import { Toolbar } from "./Toolbar";
 import { Button } from "./Button";
 

package/src/{components → ui/components}/primitives/IconButton.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { IconButton } from "./IconButton";
 import { NERD } from "./icons";
 

package/src/{components → ui/components}/primitives/IconButton.tsx

@@ -4,7 +4,7 @@
 
 import React from "react";
 import type { MouseEvent as TerminalMouseEvent } from "@opentui/core";
-import { DARK, type Theme } from "../../theme";
+import { DARK, type Theme } from "../../../appearance/theme";
 import { useTooltip } from "../Tooltip";
 
 export interface IconButtonProps {

package/src/{components → ui/components}/primitives/StatusBar.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { StatusBar } from "./StatusBar";
 
 export const meta: StoryMeta = { title: "Primitives/StatusBar" };

package/src/{components → ui/components}/primitives/StatusBar.tsx

@@ -4,8 +4,8 @@
  */
 
 import React from "react";
-import type { Theme } from "../../theme";
-import { useComponentTheme } from "../theme-context";
+import type { Theme } from "../../../appearance/theme";
+import { useComponentTheme } from "../../../appearance/components/theme-context";
 
 export interface StatusBarProps {
   theme?: Theme;

package/src/{components → ui/components}/primitives/Switch.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { Switch } from "./Switch";
 
 export const meta: StoryMeta = { title: "Primitives/Switch" };

package/src/{components → ui/components}/primitives/Switch.tsx

@@ -6,8 +6,8 @@
 
 import React from "react";
 import type { MouseEvent } from "@opentui/core";
-import type { Theme } from "../../theme";
-import { useComponentTheme } from "../theme-context";
+import type { Theme } from "../../../appearance/theme";
+import { useComponentTheme } from "../../../appearance/components/theme-context";
 
 export interface SwitchProps {
   on: boolean;

package/src/{components → ui/components}/primitives/Tabs.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { Tab, TabList, Tabs } from "./Tabs";
 
 export const meta: StoryMeta = { title: "Primitives/Tabs" };

package/src/{components → ui/components}/primitives/Tabs.tsx

@@ -7,8 +7,8 @@
  */
 
 import React, { createContext, useContext } from "react";
-import type { Theme } from "../../theme";
-import { useComponentTheme } from "../theme-context";
+import type { Theme } from "../../../appearance/theme";
+import { useComponentTheme } from "../../../appearance/components/theme-context";
 import { FRAME_BORDER_STYLE } from "./frame";
 
 interface TabsContextValue {

package/src/{components → ui/components}/primitives/Toolbar.stories.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import type { Story, StoryMeta } from "../story";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { Button } from "./Button";
 import { Toolbar } from "./Toolbar";
 

package/src/{components → ui/components}/primitives/Tree.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../../theme";
-import type { Story, StoryMeta } from "../story";
+import { DARK } from "../../../appearance/theme";
+import type { Story, StoryMeta } from "../../../stories/story";
 import { Tree } from "./Tree";
 import type { TreeNode } from "./tree-model";
 

package/src/{components → ui/components}/primitives/Tree.tsx

@@ -1,8 +1,8 @@
 // OpenTUI renderer for the headless tree-model; the caller owns expansion and selection.
 
 import React, { useRef } from "react";
-import { DARK, type Theme } from "../../theme";
-import { isDoubleClick, type ClickStamp } from "../../thread-selection";
+import { DARK, type Theme } from "../../../appearance/theme";
+import { isDoubleClick, type ClickStamp } from "../../../annotations/thread-selection";
 import { flattenTree, statusMeta, type TreeNode, type TreeTone } from "./tree-model";
 import { NERD_TREE_ICONS, type TreeIcons } from "./icons";
 

package/src/{components → ui/components}/syntax-highlight.ts

@@ -12,7 +12,7 @@ import {
   extensionToFiletype,
   basenameToFiletype,
 } from "@opentui/core";
-import type { Theme } from "../theme";
+import type { Theme } from "../../appearance/theme";
 
 /** Markdown fence info -> tree-sitter filetype, with the aliases we accept. */
 export function filetypeFor(language?: string): string | undefined {

package/src/{components → workbench/components}/ChangesColumn.stories.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import type { DiffFileContents } from "@cueloop/schema";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { ChangesColumn } from "./ChangesColumn";
 
 export const meta: StoryMeta = { title: "Surfaces/ChangesColumn" };

package/src/{components → workbench/components}/ChangesColumn.tsx

@@ -3,16 +3,16 @@
 // 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 { ScrollArea } from "./ScrollArea";
+import { ScrollArea } from "../../ui/components/ScrollArea";
 import React, { useMemo, useState } from "react";
 import { useKeyboard } from "@opentui/react";
 import type { DiffFileContents, Thread } from "@cueloop/schema";
-import type { Theme } from "../theme";
-import type { DiffRow } from "../view-diff";
-import { Tree } from "./primitives/Tree";
-import { allFolderIds, flattenTree } from "./primitives/tree-model";
-import { IconButton } from "./primitives/IconButton";
-import { NERD } from "./primitives/icons";
+import type { Theme } from "../../appearance/theme";
+import type { DiffRow } from "../../diff/view-diff";
+import { Tree } from "../../ui/components/primitives/Tree";
+import { allFolderIds, flattenTree } from "../../ui/components/primitives/tree-model";
+import { IconButton } from "../../ui/components/primitives/IconButton";
+import { NERD } from "../../ui/components/primitives/icons";
 import { buildFileTree } from "./file-tree";
 
 export interface DiffColumnsState {

package/src/{components → workbench/components}/ChangesFileTree.test.tsx

@@ -7,8 +7,8 @@ import { testRender } from "@opentui/react/test-utils";
 import { ScrollBoxRenderable, TextRenderable, type Renderable } from "@opentui/core";
 import type { DiffFileContents } from "@cueloop/schema";
 import { ChangesFileTree } from "./ChangesColumn";
-import { settle, waitForText } from "../test-support";
-import { DARK } from "../theme";
+import { settle, waitForText } from "../../testing/test-support";
+import { DARK } from "../../appearance/theme";
 
 function findById(node: Renderable, id: string): Renderable | undefined {
   if (node.id === id) return node;

package/src/{components → workbench/components}/EditorGrid.split.test.tsx

@@ -2,7 +2,7 @@ import { expect, test } from "bun:test";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import type { Renderable } from "@opentui/core";
-import { allowEventLoopUpdates } from "../test-support";
+import { allowEventLoopUpdates } from "../../testing/test-support";
 import { EditorGrid } from "./EditorGrid";
 import { makeGroup, splitGroup, welcomeTab, type EditorNode } from "./editor-grid";
 import { WelcomePlayground } from "./WelcomePlayground";

package/src/{components → workbench/components}/EditorGrid.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { EditorGrid } from "./EditorGrid";
 import { changesTab, fileTab, makeGroup, splitGroup, type EditorTab } from "./editor-grid";
 

package/src/{components → workbench/components}/EditorGrid.tabs.test.tsx

@@ -9,8 +9,8 @@ import { testRender } from "@opentui/react/test-utils";
 import React from "react";
 import { EditorGrid, visibleTabWindow } from "./EditorGrid";
 import { changesTab, fileTab, makeGroup, type EditorTab } from "./editor-grid";
-import { NERD } from "./primitives/icons";
-import { allowEventLoopUpdates } from "../test-support";
+import { NERD } from "../../ui/components/primitives/icons";
+import { allowEventLoopUpdates } from "../../testing/test-support";
 
 describe("visibleTabWindow", () => {
   const tabs: EditorTab[] = ["aaaa", "bbbb", "cccc", "dddd", "eeee"].map((name) =>

package/src/{components → workbench/components}/EditorGrid.tsx

@@ -4,14 +4,14 @@
 
 import React, { useEffect, useRef, useState } from "react";
 import type { BoxRenderable } from "@opentui/core";
-import { isDoubleClick, type ClickStamp } from "../thread-selection";
-import { DARK, type Theme } from "../theme";
-import { useFrameMeasure } from "../use-frame-measure";
-import { useSharedKeyboard } from "../use-shared-keyboard";
-import { useRootOverlay } from "./RootOverlay";
-import { useMenuControl } from "./menu-control";
-import { IconButton } from "./primitives/IconButton";
-import { NERD, HEADER_UNDERLINE_CHARS } from "./primitives/icons";
+import { isDoubleClick, type ClickStamp } from "../../annotations/thread-selection";
+import { DARK, type Theme } from "../../appearance/theme";
+import { useFrameMeasure } from "../../ui/use-frame-measure";
+import { useSharedKeyboard } from "../../keyboard/use-shared-keyboard";
+import { useRootOverlay } from "../../ui/components/RootOverlay";
+import { useMenuControl } from "../../ui/components/menu-control";
+import { IconButton } from "../../ui/components/primitives/IconButton";
+import { NERD, HEADER_UNDERLINE_CHARS } from "../../ui/components/primitives/icons";
 import {
   countEditorGroups,
   MAX_EDITOR_GROUPS,

package/src/{components → workbench/components}/EditorGrid.zoom.test.tsx

@@ -10,8 +10,8 @@ import { testRender } from "@opentui/react/test-utils";
 import React from "react";
 import { EditorGrid } from "./EditorGrid";
 import { changesTab, fileTab, makeGroup, splitGroup } from "./editor-grid";
-import { NERD } from "./primitives/icons";
-import { allowEventLoopUpdates } from "../test-support";
+import { NERD } from "../../ui/components/primitives/icons";
+import { allowEventLoopUpdates } from "../../testing/test-support";
 
 const grid = makeGroup([changesTab(), fileTab("App.tsx", "src/App.tsx", "diff")]);
 

package/src/{components → workbench/components}/FileContentsView.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { FileContentsView } from "./FileContentsView";
 
 export const meta: StoryMeta = { title: "Surfaces/FileContentsView" };

package/src/{components → workbench/components}/FileContentsView.test.tsx

@@ -2,8 +2,8 @@ import { expect, test } from "bun:test";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { FileContentsView } from "./FileContentsView";
-import { waitForText } from "../test-support";
-import { DARK } from "../theme";
+import { waitForText } from "../../testing/test-support";
+import { DARK } from "../../appearance/theme";
 
 test("renders the loaded file contents", async () => {
   const setup = await testRender(

package/src/{components → workbench/components}/FileContentsView.tsx

@@ -4,12 +4,12 @@
 // Syntax highlighting comes from the native code renderable (tree-sitter), the language
 // auto-detected from the path; unknown languages simply render unstyled.
 
-import { ScrollArea } from "./ScrollArea";
+import { ScrollArea } from "../../ui/components/ScrollArea";
 import React, { useEffect, useRef, useState } from "react";
 import type { CodeRenderable } from "@opentui/core";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
-import { filetypeForPath, syntaxStyleFor } from "./syntax-highlight";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { filetypeForPath, syntaxStyleFor } from "../../ui/components/syntax-highlight";
 
 export interface FileContentsViewProps {
   path: string;

package/src/{components → workbench/components}/GridTabContent.actions.test.tsx

@@ -5,12 +5,12 @@ import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { changesTab, fileTab } from "./editor-grid";
 import { GridTabContent, type DiffSurfaceProps } from "./GridTabContent";
-import { FIXTURE_PATCH, fixtureDiffSession } from "./story-fixtures";
-import { NERD } from "./primitives/icons";
-import { TooltipProvider } from "./Tooltip";
-import { locateText, waitForText } from "../test-support";
-import { DARK } from "../theme";
-import { diffRows } from "../view-diff";
+import { FIXTURE_PATCH, fixtureDiffSession } from "../../stories/story-fixtures";
+import { NERD } from "../../ui/components/primitives/icons";
+import { TooltipProvider } from "../../ui/components/Tooltip";
+import { locateText, waitForText } from "../../testing/test-support";
+import { DARK } from "../../appearance/theme";
+import { diffRows } from "../../diff/view-diff";
 
 const noop = (): void => {};
 const rows = diffRows(

package/src/{components → workbench/components}/GridTabContent.stories.tsx

@@ -1,9 +1,9 @@
 import React from "react";
-import { DARK } from "../theme";
-import { DEFAULT_QUICK_ACTIONS } from "../config";
-import type { Story, StoryMeta } from "./story";
+import { DARK } from "../../appearance/theme";
+import { DEFAULT_QUICK_ACTIONS } from "../../settings/config";
+import type { Story, StoryMeta } from "../../stories/story";
 import { GridTabContent, type DiffSurfaceProps } from "./GridTabContent";
-import { fixtureDiffRows, fixtureDiffSession } from "./story-fixtures";
+import { fixtureDiffRows, fixtureDiffSession } from "../../stories/story-fixtures";
 import { changesTab, fileTab } from "./editor-grid";
 
 export const meta: StoryMeta = { title: "Surfaces/GridTabContent" };