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

package/src/{app-key-state.ts → app/app-key-state.ts}

@@ -1,9 +1,9 @@
 import type { Thread } from "@cueloop/schema";
 import type { Mode } from "./intent-dispatch";
-import type { KeyState } from "./keymap";
-import type { DisplayBlock } from "./view-plan";
-import type { DiffRow } from "./view-diff";
-import type { WalkFile } from "./walk";
+import type { KeyState } from "../keyboard/keymap";
+import type { DisplayBlock } from "../markdown/view-plan";
+import type { DiffRow } from "../diff/view-diff";
+import type { WalkFile } from "../diff/walk";
 
 export function buildKeyState(params: {
   keys: Record<string, string[]>;

package/src/{app-screens.tsx → app/app-screens.tsx}

@@ -1,42 +1,42 @@
-import { ScrollArea } from "./components/ScrollArea";
+import { ScrollArea } from "../ui/components/ScrollArea";
 import React, { useCallback, useMemo, type Dispatch, type SetStateAction } from "react";
 import type { Thread, MessageOutcome } from "@cueloop/schema";
 import { returnPaneFor } from "@cueloop/schema";
-import type { Theme } from "./theme";
-import type { DiffViewMode, QuickAction } from "./config";
+import type { Theme } from "../appearance/theme";
+import type { DiffViewMode, QuickAction } from "../settings/config";
 import type { LaunchLayout } from "./launch-layout";
-import { useRememberLayout } from "./use-remember-layout";
+import { useRememberLayout } from "../workbench/use-remember-layout";
 import type { Mode, TreeAsk } from "./intent-dispatch";
-import type { Intent } from "./keymap";
-import type { ReviewController, ToastState } from "./thread-controller";
-import { noteForFile } from "./walk";
-import type { WalkFile } from "./walk";
-import type { CheatsheetSection } from "./key-bindings";
-import type { SettingsCategory, SettingsValues } from "./components/SettingsDialog";
-import type { SettingsNav } from "./use-settings-dialog";
+import type { Intent } from "../keyboard/keymap";
+import type { ReviewController, ToastState } from "../thread/thread-controller";
+import { noteForFile } from "../diff/walk";
+import type { WalkFile } from "../diff/walk";
+import type { CheatsheetSection } from "../keyboard/key-bindings";
+import type { SettingsCategory, SettingsValues } from "../settings/components/SettingsDialog";
+import type { SettingsNav } from "../settings/use-settings-dialog";
 import { CLIENT_VERSION } from "./version";
-import { ThemeProvider } from "./components/theme-context";
-import type { InboxRow } from "./components/thread-tree";
-import { SettingsDialog } from "./components/SettingsDialog";
-import { CompletionOverlay } from "./components/CompletionOverlay";
-import { ThreadTree } from "./components/ThreadTree";
-import { WelcomePlayground } from "./components/WelcomePlayground";
+import { ThemeProvider } from "../appearance/components/theme-context";
+import type { InboxRow } from "../thread/components/thread-tree";
+import { SettingsDialog } from "../settings/components/SettingsDialog";
+import { CompletionOverlay } from "../keyboard/components/CompletionOverlay";
+import { ThreadTree } from "../thread/components/ThreadTree";
+import { WelcomePlayground } from "../workbench/components/WelcomePlayground";
 import { AppShell, type FocusPane, type ProjectPanelMode } from "./components/AppShell";
-import type { ClientExtensionRegistry } from "./client-extension-registry";
+import type { ClientExtensionRegistry } from "../integrations/client-extension-registry";
 import type { ExtensionUIContext } from "@cueloop/extension-api/client";
-import { EditorGrid } from "./components/EditorGrid";
-import { MenuControlProvider, type MenuControlApi } from "./components/menu-control";
-import { ProjectTreeView } from "./components/ProjectTreeView";
-import { ChangesFileTree } from "./components/ChangesColumn";
-import { BareWorkbenchFileView, draftThread } from "./components/BareWorkbenchFileView";
-import { GridTabContent, type DiffSurfaceProps } from "./components/GridTabContent";
-import type { DiffFoldControls } from "./components/DiffContentView";
-import { useChangesWorkbench } from "./use-changes-workbench";
-import { useRepoChanges } from "./use-repo-changes";
-import { ConfirmDialog } from "./components/ConfirmDialog";
-import { PromptDialog } from "./components/PromptDialog";
-import { WalkWizard } from "./components/WalkWizard";
-import { Toast } from "./components/Toast";
+import { EditorGrid } from "../workbench/components/EditorGrid";
+import { MenuControlProvider, type MenuControlApi } from "../ui/components/menu-control";
+import { ProjectTreeView } from "../workbench/components/ProjectTreeView";
+import { ChangesFileTree } from "../workbench/components/ChangesColumn";
+import { BareWorkbenchFileView, draftThread } from "../diff/components/BareWorkbenchFileView";
+import { GridTabContent, type DiffSurfaceProps } from "../workbench/components/GridTabContent";
+import type { DiffFoldControls } from "../diff/components/DiffContentView";
+import { useChangesWorkbench } from "../workbench/use-changes-workbench";
+import { useRepoChanges } from "../workbench/use-repo-changes";
+import { ConfirmDialog } from "../ui/components/ConfirmDialog";
+import { PromptDialog } from "../ui/components/PromptDialog";
+import { WalkWizard } from "../diff/components/WalkWizard";
+import { Toast } from "../ui/components/Toast";
 
 export function ErrorScreen({ error, theme }: { error: string; theme: Theme }): React.ReactNode {
   return (

package/src/{app-view-model.ts → app/app-view-model.ts}

@@ -1,12 +1,12 @@
 import type { Dispatch, MutableRefObject, SetStateAction } from "react";
 import type { Thread, MessageOutcome } from "@cueloop/schema";
 import type { Mode } from "./intent-dispatch";
-import type { Intent, KeyState } from "./keymap";
-import type { Completion } from "./thread-controller";
-import type { WalkFile } from "./walk";
-import type { QuickAction } from "./config";
-import { viewedCount } from "./walk";
-import type { ConfirmCardProps } from "./components/ConfirmCard";
+import type { Intent, KeyState } from "../keyboard/keymap";
+import type { Completion } from "../thread/thread-controller";
+import type { WalkFile } from "../diff/walk";
+import type { QuickAction } from "../settings/config";
+import { viewedCount } from "../diff/walk";
+import type { ConfirmCardProps } from "../ui/components/ConfirmCard";
 import type { BreadcrumbItem } from "./components/Breadcrumb";
 
 export function computeRoleCapabilities(

package/src/{components → app/components}/AppHeader.stories.tsx

@@ -1,9 +1,9 @@
 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 { AppHeader } from "./AppHeader";
-import { Button } from "./primitives/Button";
-import { Toolbar } from "./primitives/Toolbar";
+import { Button } from "../../ui/components/primitives/Button";
+import { Toolbar } from "../../ui/components/primitives/Toolbar";
 
 export const meta: StoryMeta = { title: "Chrome/AppHeader" };
 

package/src/{components → app/components}/AppHeader.tsx

@@ -5,9 +5,9 @@
 // right column. Collapsing a column keeps its toggle reachable at the edge.
 
 import React from "react";
-import type { Theme } from "../theme";
-import { IconButton } from "./primitives/IconButton";
-import { NERD } from "./primitives/icons";
+import type { Theme } from "../../appearance/theme";
+import { IconButton } from "../../ui/components/primitives/IconButton";
+import { NERD } from "../../ui/components/primitives/icons";
 
 export interface AppHeaderProps {
   onOpenMenu: () => void;

package/src/{components → app/components}/AppShell.brand.test.tsx

@@ -9,8 +9,8 @@ import { describe, expect, test } from "bun:test";
 import { testRender } from "@opentui/react/test-utils";
 import React from "react";
 import { AppShell } from "./AppShell";
-import { NERD } from "./primitives/icons";
-import { settle } from "../test-support";
+import { NERD } from "../../ui/components/primitives/icons";
+import { settle } from "../../testing/test-support";
 
 const LONG_TITLE = "working tree @ GRO-1981-fe-billing-promo-cookie-migration";
 

package/src/{components → app/components}/AppShell.extensions.test.tsx

@@ -7,8 +7,8 @@ import { testRender } from "@opentui/react/test-utils";
 import {
   ClientExtensionRegistry,
   loadInstalledClientExtensions,
-} from "../client-extension-registry";
-import { settle } from "../test-support";
+} from "../../integrations/client-extension-registry";
+import { settle } from "../../testing/test-support";
 import { AppShell } from "./AppShell";
 
 function shell(

package/src/{components → app/components}/AppShell.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 { AppShell } from "./AppShell";
 
 export const meta: StoryMeta = { title: "Layout/AppShell" };

package/src/{components → app/components}/AppShell.tsx

@@ -8,17 +8,20 @@
 import React, { useEffect, useRef } from "react";
 import { useTerminalDimensions } from "@opentui/react";
 import type { BoxRenderable } from "@opentui/core";
-import { DARK, type Theme } from "../theme";
-import { useFrameMeasure } from "../use-frame-measure";
-import { truncateTitle } from "./truncate-title";
+import { DARK, type Theme } from "../../appearance/theme";
+import { useFrameMeasure } from "../../ui/use-frame-measure";
+import { truncateTitle } from "../../ui/components/truncate-title";
 import { PanelColumn } from "./PanelColumn";
-import { IconButton } from "./primitives/IconButton";
-import { NERD, HEADER_UNDERLINE_CHARS } from "./primitives/icons";
-import { TooltipProvider } from "./Tooltip";
-import { RootOverlayProvider } from "./RootOverlay";
+import { IconButton } from "../../ui/components/primitives/IconButton";
+import { NERD, HEADER_UNDERLINE_CHARS } from "../../ui/components/primitives/icons";
+import { TooltipProvider } from "../../ui/components/Tooltip";
+import { RootOverlayProvider } from "../../ui/components/RootOverlay";
 import type { ExtensionUIContext } from "@cueloop/extension-api/client";
-import { ClientExtensionRegistry } from "../client-extension-registry";
-import { ExtensionZone, useClientExtensionSnapshot } from "./ExtensionZone";
+import { ClientExtensionRegistry } from "../../integrations/client-extension-registry";
+import {
+  ExtensionZone,
+  useClientExtensionSnapshot,
+} from "../../integrations/components/ExtensionZone";
 import { WorkspacePanels } from "./WorkspacePanels";
 
 const EMPTY_EXTENSION_REGISTRY = new ClientExtensionRegistry();

package/src/{components → app/components}/AppShell.zoom.test.tsx

@@ -10,10 +10,10 @@ import { describe, expect, test } from "bun:test";
 import { testRender } from "@opentui/react/test-utils";
 import React from "react";
 import { AppShell } from "./AppShell";
-import { EditorGrid } from "./EditorGrid";
-import { changesTab, makeGroup, splitGroup } from "./editor-grid";
-import { NERD } from "./primitives/icons";
-import { allowEventLoopUpdates } from "../test-support";
+import { EditorGrid } from "../../workbench/components/EditorGrid";
+import { changesTab, makeGroup, splitGroup } from "../../workbench/components/editor-grid";
+import { NERD } from "../../ui/components/primitives/icons";
+import { allowEventLoopUpdates } from "../../testing/test-support";
 
 const grid = makeGroup([changesTab()]);
 

package/src/{components → app/components}/Breadcrumb.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 { Breadcrumb } from "./Breadcrumb";
 
 export const meta: StoryMeta = { title: "Chrome/Breadcrumb" };

package/src/{components → app/components}/Breadcrumb.tsx

@@ -5,8 +5,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 type BreadcrumbTone = "accent" | "dim" | "text" | "green";
 

package/src/{components → app/components}/MenuBar.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 { MenuBar } from "./MenuBar";
 
 export const meta: StoryMeta = { title: "Chrome/MenuBar" };

package/src/{components → app/components}/MenuBar.tsx

@@ -1,7 +1,7 @@
 import React from "react";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
-import { FRAME_BORDER_STYLE } from "./primitives/frame";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { FRAME_BORDER_STYLE } from "../../ui/components/primitives/frame";
 
 export interface MenuBarProps {
   open: boolean;

package/src/{components → app/components}/PaneGrid.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 { PaneGrid } from "./PaneGrid";
 
 export const meta: StoryMeta = { title: "Layout/PaneGrid" };

package/src/{components → app/components}/PaneGrid.tsx

@@ -4,7 +4,7 @@
 // storybook runner); the product's four-pane workbench is AppShell.
 
 import React from "react";
-import { DARK, type Theme } from "../theme";
+import { DARK, type Theme } from "../../appearance/theme";
 import type { BorderSides } from "@opentui/core";
 
 export interface PaneGridProps {

package/src/{components → app/components}/PanelColumn.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 { PanelColumn, FileTab } from "./PanelColumn";
 
 export const meta: StoryMeta = { title: "Surfaces/PanelColumn" };

package/src/{components → app/components}/PanelColumn.tsx

@@ -4,8 +4,8 @@
 // header bottoms join the side rules into one grid. The side border runs from the top.
 
 import React, { useState } from "react";
-import type { Theme } from "../theme";
-import { NERD, HEADER_UNDERLINE_CHARS } from "./primitives/icons";
+import type { Theme } from "../../appearance/theme";
+import { NERD, HEADER_UNDERLINE_CHARS } from "../../ui/components/primitives/icons";
 
 export interface FileTabProps {
   label: string;

package/src/{components → app/components}/ShellHeader.stories.tsx

@@ -1,8 +1,8 @@
 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 { ShellHeader } from "./ShellHeader";
-import { NERD } from "./primitives/icons";
+import { NERD } from "../../ui/components/primitives/icons";
 
 export const meta: StoryMeta = { title: "Layout/ShellHeader" };
 

package/src/{components → app/components}/ShellHeader.tsx

@@ -1,8 +1,8 @@
 // The app shell's top bar: left panel toggle + icons + label, an optional title, right icons + panel toggle.
 
 import React from "react";
-import { DARK, type Theme } from "../theme";
-import { NERD } from "./primitives/icons";
+import { DARK, type Theme } from "../../appearance/theme";
+import { NERD } from "../../ui/components/primitives/icons";
 
 export interface ShellTab {
   label: string;

package/src/{components → app/components}/WorkspacePanels.stories.tsx

@@ -1,7 +1,7 @@
 import React from "react";
-import { ClientExtensionRegistry } from "../client-extension-registry";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import { ClientExtensionRegistry } from "../../integrations/client-extension-registry";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
 import { WorkspacePanels } from "./WorkspacePanels";
 
 export const meta: StoryMeta = { title: "Extensions/WorkspacePanels" };

package/src/{components → app/components}/WorkspacePanels.tsx

@@ -1,13 +1,17 @@
 import React, { useEffect, useMemo, useState } from "react";
 import { useKeyboard } from "@opentui/react";
 import type { ExtensionUIContext } from "@cueloop/extension-api/client";
-import type { ClientExtensionRegistry } from "../client-extension-registry";
-import type { Theme } from "../theme";
+import type { ClientExtensionRegistry } from "../../integrations/client-extension-registry";
+import type { Theme } from "../../appearance/theme";
 import type { ProjectPanelMode } from "./AppShell";
-import { ExtensionZone, useClientExtensionSnapshot, visibleContributions } from "./ExtensionZone";
+import {
+  ExtensionZone,
+  useClientExtensionSnapshot,
+  visibleContributions,
+} from "../../integrations/components/ExtensionZone";
 import { FileTab, PanelColumn } from "./PanelColumn";
-import { IconButton } from "./primitives/IconButton";
-import { NERD } from "./primitives/icons";
+import { IconButton } from "../../ui/components/primitives/IconButton";
+import { NERD } from "../../ui/components/primitives/icons";
 
 /** The existing right pane owns built-in modes and selectable extension views. */
 export function WorkspacePanels(props: {

package/src/{components → app/components}/pages/Workspace.stories.tsx

@@ -1,9 +1,9 @@
 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 { PaneGrid } from "../PaneGrid";
-import { Tree } from "../primitives/Tree";
-import type { TreeNode } from "../primitives/tree-model";
+import { Tree } from "../../../ui/components/primitives/Tree";
+import type { TreeNode } from "../../../ui/components/primitives/tree-model";
 
 export const meta: StoryMeta = { title: "Pages/Workspace" };
 

package/src/{intent-dispatch.test.ts → app/intent-dispatch.test.ts}

@@ -9,9 +9,13 @@ import { describe, expect, mock, test } from "bun:test";
 import type { SetStateAction } from "react";
 import { SCHEMA_VERSION, type Annotation, type Thread } from "@cueloop/schema";
 import { createIntentDispatch, type IntentDispatchDeps } from "./intent-dispatch";
-import type { ControllerSnapshot, CurationItem, ReviewController } from "./thread-controller";
-import type { DisplayBlock } from "./view-plan";
-import type { TreeRow } from "./tree-view";
+import type {
+  ControllerSnapshot,
+  CurationItem,
+  ReviewController,
+} from "../thread/thread-controller";
+import type { DisplayBlock } from "../markdown/view-plan";
+import type { TreeRow } from "../thread/tree-view";
 
 function block(text: string): DisplayBlock {
   return { type: "same", kind: "p", work: { kind: "p", text, lineStart: 0, lineEnd: 0 } };

package/src/{intent-dispatch.ts → app/intent-dispatch.ts}

@@ -9,12 +9,18 @@
 
 import type { Dispatch, MutableRefObject, SetStateAction } from "react";
 import { isAddressed, MESSAGE_OUTCOMES, type Thread, type MessageOutcome } from "@cueloop/schema";
-import { displayText, spanKey, startSpan, type DisplayBlock, type SpanState } from "./view-plan";
-import type { DiffRow } from "./view-diff";
-import type { ReviewController } from "./thread-controller";
-import type { Intent } from "./keymap";
-import type { TreeRow } from "./tree-view";
-import { quickActionBody, type QuickAction } from "./config";
+import {
+  displayText,
+  spanKey,
+  startSpan,
+  type DisplayBlock,
+  type SpanState,
+} from "../markdown/view-plan";
+import type { DiffRow } from "../diff/view-diff";
+import type { ReviewController } from "../thread/thread-controller";
+import type { Intent } from "../keyboard/keymap";
+import type { TreeRow } from "../thread/tree-view";
+import { quickActionBody, type QuickAction } from "../settings/config";
 
 /** Which pane of the session tree / review the keyboard grammar is aimed at. */
 export type RailTab = "review" | "tree";

package/src/{ready-signal.test.ts → app/ready-signal.test.ts}

@@ -7,7 +7,7 @@ import { join } from "node:path";
 import { createElement, useState } from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { READY_FILE_ENV, useReadySignal } from "./ready-signal";
-import { settle } from "./test-support";
+import { settle } from "../testing/test-support";
 
 const homes: string[] = [];
 

package/src/{run.ts → app/run.ts}

@@ -4,18 +4,18 @@ import React from "react";
 import { createCliRenderer } from "@opentui/core";
 import { createRoot } from "@opentui/react";
 import { App } from "./App";
-import { closePrototypeBrowser } from "./prototype-browser";
-import type { Appearance } from "./theme-presets";
+import { closePrototypeBrowser } from "../prototype/prototype-browser";
+import type { Appearance } from "../appearance/theme-presets";
 import type { DiffFileContents, Thread } from "@cueloop/schema";
 import type { ThreadClient } from "@cueloop/daemon/client";
-import { loadConfig } from "./config";
-import { perfMark } from "./perf/perf-timings";
-import { reportPerfMarks } from "./perf/perf-report";
+import { loadConfig } from "../settings/config";
+import { perfMark } from "../performance/perf-timings";
+import { reportPerfMarks } from "../performance/perf-report";
 import { defaultLayout, type LaunchLayout } from "./launch-layout";
 import {
   ClientExtensionRegistry,
   loadInstalledClientExtensions,
-} from "./client-extension-registry";
+} from "../integrations/client-extension-registry";
 
 export interface RunClientOptions {
   sessionId?: string;

package/src/{serve.ts → app/serve.ts}

@@ -23,7 +23,7 @@ import { cueloopHome } from "@cueloop/daemon";
 import { DaemonClient } from "@cueloop/daemon/client";
 import type { Artifact } from "@cueloop/schema";
 import { App } from "./App";
-import { snapshotWorkbench } from "./workbench-snapshot";
+import { snapshotWorkbench } from "../workbench/workbench-snapshot";
 
 /** OSC background query budget: brief so a terminal that never answers falls back to dark. */
 const THEME_QUERY_TIMEOUT_MS = 200;

package/src/{version.ts → app/version.ts}

@@ -1,5 +1,5 @@
 /** The published client version, read from the package manifest. */
 
-import manifest from "../package.json" with { type: "json" };
+import manifest from "../../package.json" with { type: "json" };
 
 export const CLIENT_VERSION: string = manifest.version;

package/src/{components → appearance/components}/theme-context.stories.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 import { DARK, type Theme } from "../theme";
-import type { Story, StoryMeta } from "./story";
+import type { Story, StoryMeta } from "../../stories/story";
 import { ThemeProvider } from "./theme-context";
-import { Card } from "./primitives/Card";
+import { Card } from "../../ui/components/primitives/Card";
 
 export const meta: StoryMeta = { title: "Foundations/Theme" };
 

package/src/{components → diff/components}/AnnotatableFileView.stories.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import { SCHEMA_VERSION, type Thread } 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 { AnnotatableFileView } from "./AnnotatableFileView";
 
 export const meta: StoryMeta = { title: "Surfaces/AnnotatableFileView" };

package/src/{components → diff/components}/AnnotatableFileView.test.tsx

@@ -9,8 +9,14 @@ import { testRender } from "@opentui/react/test-utils";
 import React from "react";
 import { SCHEMA_VERSION, type Anchor, type Thread } from "@cueloop/schema";
 import { AnnotatableFileView } from "./AnnotatableFileView";
-import { DARK } from "../theme";
-import { allowEventLoopUpdates, dragText, typeText, pressKey, waitForText } from "../test-support";
+import { DARK } from "../../appearance/theme";
+import {
+  allowEventLoopUpdates,
+  dragText,
+  typeText,
+  pressKey,
+  waitForText,
+} from "../../testing/test-support";
 
 const SAMPLE = "export function add(a: number, b: number) {\n  return a + b;\n}\n";
 

package/src/{components → diff/components}/AnnotatableFileView.tsx

@@ -11,9 +11,9 @@ import {
   type Annotation,
   type Thread,
 } from "@cueloop/schema";
-import type { Theme } from "../theme";
-import type { QuickAction } from "../config";
-import { useComponentTheme } from "./theme-context";
+import type { Theme } from "../../appearance/theme";
+import type { QuickAction } from "../../settings/config";
+import { useComponentTheme } from "../../appearance/components/theme-context";
 import { DiffContentView } from "./DiffContentView";
 import { diffRowBlocks, fileContentsRows, marksByRows } from "../view-diff";
 

package/src/{components → diff/components}/BareWorkbenchFileView.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 { BareWorkbenchFileView, type WorkbenchCommenter } from "./BareWorkbenchFileView";
 
 export const meta: StoryMeta = { title: "Surfaces/BareWorkbenchFileView" };

package/src/{components → diff/components}/BareWorkbenchFileView.tsx

@@ -4,8 +4,8 @@
 
 import React from "react";
 import { SCHEMA_VERSION, type Anchor, type AnnotationTarget, type Thread } from "@cueloop/schema";
-import type { Theme } from "../theme";
-import type { QuickAction } from "../config";
+import type { Theme } from "../../appearance/theme";
+import type { QuickAction } from "../../settings/config";
 import { AnnotatableFileView } from "./AnnotatableFileView";
 
 /** The controller slice this view needs: read a file, and route a comment to the workbench thread. */

package/src/{components → diff/components}/DiffContentView.scroll.test.tsx

@@ -7,10 +7,10 @@ import { ScrollBoxRenderable, type Renderable } from "@opentui/core";
 import type { Annotation } from "@cueloop/schema";
 import { DiffContentView } from "./DiffContentView";
 import { diffRows, marksByRows } from "../view-diff";
-import { DARK } from "../theme";
-import { annotationPaletteFor } from "../annotation-palette";
-import { press, settle, typeText } from "../test-support";
-import { fixtureDiffSession } from "./story-fixtures";
+import { DARK } from "../../appearance/theme";
+import { annotationPaletteFor } from "../../annotations/annotation-palette";
+import { press, settle, typeText } from "../../testing/test-support";
+import { fixtureDiffSession } from "../../stories/story-fixtures";
 
 const noop = (): void => {};
 

package/src/{components → diff/components}/DiffContentView.split.test.tsx

@@ -9,10 +9,10 @@ import { testRender } from "@opentui/react/test-utils";
 import React from "react";
 import { DiffContentView } from "./DiffContentView";
 import { diffRows } from "../view-diff";
-import { allowEventLoopUpdates } from "../test-support";
-import { fixtureDiffSession } from "./story-fixtures";
-import { annotationPaletteFor } from "../annotation-palette";
-import { DARK } from "../theme";
+import { allowEventLoopUpdates } from "../../testing/test-support";
+import { fixtureDiffSession } from "../../stories/story-fixtures";
+import { annotationPaletteFor } from "../../annotations/annotation-palette";
+import { DARK } from "../../appearance/theme";
 
 const noop = (): void => {};