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

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

package/src/{components → markdown/components}/MarkdownThreadEditor.test.tsx

@@ -1,8 +1,8 @@
 import { describe, expect, test } from "bun:test";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
-import { DARK } from "../theme";
-import { press, settle } from "../test-support";
+import { DARK } from "../../appearance/theme";
+import { press, settle } from "../../testing/test-support";
 import { MarkdownThreadEditor, type MarkdownEditorHandle } from "./MarkdownThreadEditor";
 
 describe("MarkdownThreadEditor", () => {

package/src/{components → markdown/components}/MarkdownThreadEditor.tsx

@@ -13,7 +13,7 @@
 
 import React, { forwardRef, useImperativeHandle, useLayoutEffect, useRef, useState } from "react";
 import type { KeyBinding, TextareaRenderable } from "@opentui/core";
-import { type Theme } from "../theme";
+import { type Theme } from "../../appearance/theme";
 import { markdownHighlightRanges } from "../markdown-highlight";
 import { markdownEditorStyle } from "../markdown-editor-syntax-style";
 

package/src/{components → markdown/components}/ThreadView.selection.test.tsx

@@ -12,13 +12,13 @@ import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { TextAttributes } from "@opentui/core";
 import type { TestRendererSetup } from "@opentui/core/testing";
-import { DEFAULT_QUICK_ACTIONS } from "../config";
-import { settle, typeText } from "../test-support";
+import { DEFAULT_QUICK_ACTIONS } from "../../settings/config";
+import { settle, typeText } from "../../testing/test-support";
 import { buildDisplay, marksByDisplay } from "../view-plan";
 import { makeAnchor, parseBlocks, type Annotation } from "@cueloop/schema";
-import type { TextSpan } from "../thread-selection";
+import type { TextSpan } from "../../annotations/thread-selection";
 import * as markRuns from "../mark-runs";
-import { fixturePlanSession } from "./story-fixtures";
+import { fixturePlanSession } from "../../stories/story-fixtures";
 import { ThreadView } from "./ThreadView";
 
 const PARAGRAPH =

package/src/{components → markdown/components}/ThreadView.slash.test.tsx

@@ -4,14 +4,14 @@ import { describe, expect, test } from "bun:test";
 import React from "react";
 import type { RGBA } from "@opentui/core";
 import { testRender } from "@opentui/react/test-utils";
-import type { QuickAction } from "../config";
-import { settle, typeText } from "../test-support";
-import { DARK } from "../theme";
+import type { QuickAction } from "../../settings/config";
+import { settle, typeText } from "../../testing/test-support";
+import { DARK } from "../../appearance/theme";
 import { buildDisplay, marksByDisplay } from "../view-plan";
-import { fixturePlanSession } from "./story-fixtures";
+import { fixturePlanSession } from "../../stories/story-fixtures";
 import { ThreadView } from "./ThreadView";
-import { mergeSlashItems, slashItemsFrom, type SlashItem } from "../slash-palette";
-import { PaletteNamesContext, SlashSkillsContext } from "../skills";
+import { mergeSlashItems, slashItemsFrom, type SlashItem } from "../../keyboard/slash-palette";
+import { PaletteNamesContext, SlashSkillsContext } from "../../keyboard/skills";
 
 const SKILLS: QuickAction[] = [
   { prompt: "typescript magician" },

package/src/{components → markdown/components}/ThreadView.stories.tsx

@@ -1,8 +1,8 @@
 import React from "react";
-import { DEFAULT_QUICK_ACTIONS } from "../config";
-import { DARK } from "../theme";
-import type { Story, StoryMeta } from "./story";
-import { fixtureDisplay, fixtureMarks, fixturePlanSession } from "./story-fixtures";
+import { DEFAULT_QUICK_ACTIONS } from "../../settings/config";
+import { DARK } from "../../appearance/theme";
+import type { Story, StoryMeta } from "../../stories/story";
+import { fixtureDisplay, fixtureMarks, fixturePlanSession } from "../../stories/story-fixtures";
 import { ThreadView } from "./ThreadView";
 
 export const meta: StoryMeta = { title: "Surfaces/ThreadView" };

package/src/{components → markdown/components}/ThreadView.tsx

@@ -27,26 +27,26 @@ import {
   type RunRole,
   type StyledRun,
 } from "../view-plan";
-import type { TextSpan } from "../thread-selection";
-import type { QuickAction } from "../config";
-import type { CheatsheetSection } from "../key-bindings";
-import type { Theme } from "../theme";
-import { BOLD, CUT, ITALIC, UNDERLINE } from "../annotation-palette";
+import type { TextSpan } from "../../annotations/thread-selection";
+import type { QuickAction } from "../../settings/config";
+import type { CheatsheetSection } from "../../keyboard/key-bindings";
+import type { Theme } from "../../appearance/theme";
+import { BOLD, CUT, ITALIC, UNDERLINE } from "../../annotations/annotation-palette";
 import { wrapLines, type MarkRange, type VisualLine } from "../mark-runs";
 import { MarkdownGridBlock } from "./MarkdownGridBlock";
-import { useFrameMeasure } from "../use-frame-measure";
-import { scrollBoxDragViewport, useTerminalVirtualizer } from "../use-terminal-virtualizer";
-import { useAnnotationSurface, type LineSource } from "../use-annotation-surface";
-import { NavModeHint } from "./NavModeHint";
-import { DiscussionMarkerRail } from "./DiscussionMarkerRail";
-import { useComponentTheme } from "./theme-context";
-import { colorForSyntaxGroup } from "./syntax-highlight";
+import { useFrameMeasure } from "../../ui/use-frame-measure";
+import { scrollBoxDragViewport, useTerminalVirtualizer } from "../../ui/use-terminal-virtualizer";
+import { useAnnotationSurface, type LineSource } from "../../annotations/use-annotation-surface";
+import { NavModeHint } from "../../keyboard/components/NavModeHint";
+import { DiscussionMarkerRail } from "../../annotations/components/DiscussionMarkerRail";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { colorForSyntaxGroup } from "../../ui/components/syntax-highlight";
 import { highlightThreadCodeBlocks, type SyntaxSpan } from "../thread-code-syntax";
 
 /** Blocks kept mounted beyond the viewport, so a scroll step or a drag past the edge never shows a gap. */
 const OVERSCAN_BLOCKS = 8;
 
-export { lighten } from "../annotation-palette";
+export { lighten } from "../../annotations/annotation-palette";
 
 interface CodeSyntaxState {
   display: DisplayBlock[];

package/src/{mark-runs.ts → markdown/mark-runs.ts}

@@ -6,7 +6,7 @@
  */
 
 import type { KeyEvent } from "@opentui/core";
-import { wordRanges } from "./thread-selection";
+import { wordRanges } from "../annotations/thread-selection";
 
 export interface MarkRange {
   start: number;

package/src/{markdown-editor-syntax-style.ts → markdown/markdown-editor-syntax-style.ts}

@@ -7,7 +7,7 @@
  */
 
 import { SyntaxStyle, type StyleDefinitionInput } from "@opentui/core";
-import { type Theme } from "./theme";
+import { type Theme } from "../appearance/theme";
 import { MARKDOWN_HIGHLIGHT_GROUPS, type MarkdownHighlightGroup } from "./markdown-highlight";
 
 /** A markdown SyntaxStyle plus the lookup from token group to its native styleId. */

package/src/{thread-code-syntax.ts → markdown/thread-code-syntax.ts}

@@ -3,10 +3,10 @@
 import { getTreeSitterClient } from "@opentui/core";
 import type { DisplayBlock } from "./view-plan";
 import { renderedText } from "./view-plan";
-import { spansByLine, type SyntaxSpan } from "./diff-syntax";
-import { filetypeFor } from "./components/syntax-highlight";
+import { spansByLine, type SyntaxSpan } from "../diff/diff-syntax";
+import { filetypeFor } from "../ui/components/syntax-highlight";
 
-export type { SyntaxSpan } from "./diff-syntax";
+export type { SyntaxSpan } from "../diff/diff-syntax";
 
 /** Highlight whole code blocks so multi-line syntax stays intact. */
 export async function highlightThreadCodeBlocks(

package/src/{use-thread-body-editing.tsx → markdown/use-thread-body-editing.tsx}

@@ -10,8 +10,8 @@
  */
 
 import React, { useRef, useState } from "react";
-import type { Theme } from "./theme";
-import type { ReviewController } from "./thread-controller";
+import type { Theme } from "../appearance/theme";
+import type { ReviewController } from "../thread/thread-controller";
 import { MarkdownThreadEditor, type MarkdownEditorHandle } from "./components/MarkdownThreadEditor";
 
 export interface ThreadBodyEditing {

package/src/{view-plan.ts → markdown/view-plan.ts}

@@ -20,10 +20,10 @@ import {
   type BlockTextSourceSegment,
   type TextCut,
 } from "@cueloop/schema";
-import { wordLevelChanges } from "./diff-intraline";
-import { spanRangeInBlock, type CharRange, type TextSpan } from "./thread-selection";
+import { wordLevelChanges } from "../diff/diff-intraline";
+import { spanRangeInBlock, type CharRange, type TextSpan } from "../annotations/thread-selection";
 import type { MarkRange, VisualLine } from "./mark-runs";
-import type { SyntaxSpan } from "./diff-syntax";
+import type { SyntaxSpan } from "../diff/diff-syntax";
 
 // ── display model ─────────────────────────────
 

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

package/src/{components → prototype/components}/PrototypeContentView.tsx

@@ -13,10 +13,10 @@ import React, { useEffect, useRef, useState } from "react";
 import type { BoxRenderable } from "@opentui/core";
 import * as v from "valibot";
 import { useKeyboard, useRenderer } from "@opentui/react";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
-import { Composer, DiscussionCard } from "./AnnotationCards";
-import { annotationPaletteFor } from "../annotation-palette";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { Composer, DiscussionCard } from "../../annotations/components/AnnotationCards";
+import { annotationPaletteFor } from "../../annotations/annotation-palette";
 import {
   cssBoxToCell,
   imageCellToCss,
@@ -31,7 +31,7 @@ import {
   resolveTransmitMedium,
   transmitKittyImage,
   type CellRegion,
-} from "../kitty-image";
+} from "../../terminal/kitty-image";
 
 export interface PrototypeContentViewProps {
   prototypePath: string;

package/src/{components → settings/components}/SettingsDialog.stories.tsx

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

package/src/{components → settings/components}/SettingsDialog.tsx

@@ -7,15 +7,15 @@
  * stories catalog) drive it without a second key handler inside.
  */
 
-import { ScrollArea } from "./ScrollArea";
+import { ScrollArea } from "../../ui/components/ScrollArea";
 import React from "react";
 import { useTerminalDimensions } from "@opentui/react";
-import type { Theme } from "../theme";
-import type { CheatsheetSection } from "../key-bindings";
-import { useComponentTheme } from "./theme-context";
-import { Dialog } from "./primitives/Dialog";
-import { Tree } from "./primitives/Tree";
-import type { TreeNode } from "./primitives/tree-model";
+import type { Theme } from "../../appearance/theme";
+import type { CheatsheetSection } from "../../keyboard/key-bindings";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { Dialog } from "../../ui/components/primitives/Dialog";
+import { Tree } from "../../ui/components/primitives/Tree";
+import type { TreeNode } from "../../ui/components/primitives/tree-model";
 import { CycleRow, TextRow, ToggleRow, type SettingsRowDescriptor } from "./SettingsRows";
 
 export interface SettingsCategory {

package/src/{components → settings/components}/SettingsRows.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 { CycleRow, TextRow, ToggleRow } from "./SettingsRows";
 
 export const meta: StoryMeta = { title: "Chrome/SettingsRows" };

package/src/{components → settings/components}/SettingsRows.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";
 
 export interface SettingsRowDescriptor {
   key: string;

package/src/{components → settings/components}/quick-actions-editor.stories.tsx

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

package/src/{components → settings/components}/quick-actions-editor.test.tsx

@@ -4,7 +4,7 @@ import { describe, expect, test } from "bun:test";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import type { QuickAction } from "../config";
-import { locateText, settle, typeText } from "../test-support";
+import { locateText, settle, typeText } from "../../testing/test-support";
 import { QuickActionsEditor } from "./quick-actions-editor";
 
 const MANY: QuickAction[] = Array.from({ length: 14 }, (_, index) => ({

package/src/{components → settings/components}/quick-actions-editor.tsx

@@ -9,9 +9,9 @@
 import React, { useEffect, useRef, useState } from "react";
 import type { KeyBinding, ScrollBoxRenderable, TextareaRenderable } from "@opentui/core";
 import type { QuickAction } from "../config";
-import type { Theme } from "../theme";
-import { ScrollArea } from "./ScrollArea";
-import { useComponentTheme } from "./theme-context";
+import type { Theme } from "../../appearance/theme";
+import { ScrollArea } from "../../ui/components/ScrollArea";
+import { useComponentTheme } from "../../appearance/components/theme-context";
 
 // ⏎ never inserts a newline: a system prompt is one line, esc closes the editor.
 const ACTION_INPUT_KEY_BINDINGS: KeyBinding[] = [{ name: "return", action: "submit" }];

package/src/{config.test.ts → settings/config.test.ts}

@@ -17,8 +17,8 @@ import {
   quickActionBody,
   resolveQuickAction,
 } from "./config";
-import { DARK } from "./theme";
-import { themeForName } from "./theme-presets";
+import { DARK } from "../appearance/theme";
+import { themeForName } from "../appearance/theme-presets";
 
 describe("loadConfig", () => {
   test("review defaults use the bundled skill in an isolated worktree", () => {

package/src/{config.ts → settings/config.ts}

@@ -13,9 +13,14 @@ import { MESSAGE_OUTCOMES, type MessageOutcome } from "@cueloop/schema";
 import { writeFileSync, mkdirSync } from "node:fs";
 import { dirname } from "node:path";
 import * as v from "valibot";
-import { DARK, type Theme } from "./theme";
-import { DEFAULT_THEME_NAME, isThemeName, themeForName, type ThemeName } from "./theme-presets";
-import type { LaunchLayout } from "./launch-layout";
+import { DARK, type Theme } from "../appearance/theme";
+import {
+  DEFAULT_THEME_NAME,
+  isThemeName,
+  themeForName,
+  type ThemeName,
+} from "../appearance/theme-presets";
+import type { LaunchLayout } from "../app/launch-layout";
 
 export interface KeymapConfig {
   [action: string]: string | string[];

package/src/{use-settings-dialog.tsx → settings/use-settings-dialog.tsx}

@@ -17,8 +17,8 @@ import {
   THEME_NAMES,
   type Appearance,
   type ThemeName,
-} from "./theme-presets";
-import type { Theme } from "./theme";
+} from "../appearance/theme-presets";
+import type { Theme } from "../appearance/theme";
 import type { SettingsCategory } from "./components/SettingsDialog";
 import { QuickActionsEditor } from "./components/quick-actions-editor";
 

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

@@ -8,15 +8,15 @@
 import React, { useEffect, useMemo, useRef, useState } from "react";
 import { createCliRenderer, type ScrollBoxRenderable } from "@opentui/core";
 import { createRoot, useKeyboard } from "@opentui/react";
-import { DARK } from "../theme";
-import { ThemeProvider } from "./theme-context";
+import { DARK } from "../appearance/theme";
+import { ThemeProvider } from "../appearance/components/theme-context";
 import { buildStoryTree, loadStories, type LoadedStory } from "./story";
-import { PaneGrid } from "./PaneGrid";
-import { ShellHeader } from "./ShellHeader";
-import { AnsiScreen } from "./AnsiScreen";
-import { Tree } from "./primitives/Tree";
-import { NERD } from "./primitives/icons";
-import { flattenTree } from "./primitives/tree-model";
+import { PaneGrid } from "../app/components/PaneGrid";
+import { ShellHeader } from "../app/components/ShellHeader";
+import { AnsiScreen } from "../terminal/components/AnsiScreen";
+import { Tree } from "../ui/components/primitives/Tree";
+import { NERD } from "../ui/components/primitives/icons";
+import { flattenTree } from "../ui/components/primitives/tree-model";
 
 interface StoriesAppProps {
   stories: LoadedStory[];

package/src/{components → stories}/stories.test.tsx

@@ -10,8 +10,8 @@ import { describe, expect, test } from "bun:test";
 import { testRender } from "@opentui/react/test-utils";
 import { RGBA } from "@opentui/core";
 import { componentFilesMissingStories, loadStories } from "./story";
-import { AnsiScreen } from "./AnsiScreen";
-import { settle } from "../test-support";
+import { AnsiScreen } from "../terminal/components/AnsiScreen";
+import { settle } from "../testing/test-support";
 
 const stories = await loadStories();
 

package/src/{components → stories}/story-fixtures.ts

@@ -1,8 +1,8 @@
 /** Shared fixture data for the stories catalog: one plan session, one diff. */
 
 import type { Annotation, Thread } from "@cueloop/schema";
-import { buildDisplay, marksByDisplay } from "../view-plan";
-import { diffRows } from "../view-diff";
+import { buildDisplay, marksByDisplay } from "../markdown/view-plan";
+import { diffRows } from "../diff/view-diff";
 
 export const FIXTURE_PLAN = `# Migration Plan
 

package/src/{components → stories}/story-tree.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import { buildStoryTree, type LoadedStory, type StorySection } from "./story";
-import type { TreeNode } from "./primitives/tree-model";
+import type { TreeNode } from "../ui/components/primitives/tree-model";
 
 /** A story object whose render is never invoked in these structural tests. */
 const STUB = { render: () => null };

package/src/{components → stories}/story.ts

@@ -7,7 +7,7 @@
  */
 
 import type React from "react";
-import type { TreeNode } from "./primitives/tree-model";
+import type { TreeNode } from "../ui/components/primitives/tree-model";
 
 export interface StoryMeta {
   /** Catalog path, e.g. "primitives/Card". */
@@ -80,7 +80,7 @@ async function collectStories(
 export async function loadStories(): Promise<LoadedStory[]> {
   const loaded: LoadedStory[] = [];
 
-  await collectStories(import.meta.dir, "**/*.stories.tsx", "App", loaded);
+  await collectStories(`${import.meta.dir}/..`, "**/*.stories.tsx", "App", loaded);
   await collectStories(GATEWAY_SRC_DIR, "**/*.stories.ts", "SSH", loaded);
 
   return loaded;
@@ -142,8 +142,8 @@ export function buildStoryTree(stories: LoadedStory[]): TreeNode[] {
 
 /** Component files that must carry stories: every .tsx that is not a story/test/prototype. */
 export function componentFilesMissingStories(): string[] {
-  const componentGlob = new Bun.Glob("**/*.tsx");
-  const files = [...componentGlob.scanSync({ cwd: import.meta.dir })];
+  const componentGlob = new Bun.Glob("**/components/**/*.tsx");
+  const files = [...componentGlob.scanSync({ cwd: `${import.meta.dir}/..` })];
   const missing: string[] = [];
 
   for (const file of files) {

package/src/{components → terminal/components}/AnsiScreen.stories.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import type { Story, StoryMeta } from "./story";
+import type { Story, StoryMeta } from "../../stories/story";
 import { AnsiScreen } from "./AnsiScreen";
 
 export const meta: StoryMeta = { title: "Primitives/AnsiScreen" };

package/src/{components → terminal/components}/AnsiScreen.tsx

@@ -1,9 +1,9 @@
 /** Paints a raw ANSI screen (cursor-positioned text) as a terminal would, for previewing SSH surfaces. */
 
 import React from "react";
-import type { Theme } from "../theme";
+import type { Theme } from "../../appearance/theme";
 import { ansiScreenToLines } from "../ansi-screen";
-import { useComponentTheme } from "./theme-context";
+import { useComponentTheme } from "../../appearance/components/theme-context";
 
 export interface AnsiScreenProps {
   ansi: string;

package/src/{components → terminal/components}/terminal-pane.test.tsx

@@ -3,7 +3,7 @@
 import { describe, expect, test } from "bun:test";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
-import { waitForText } from "../test-support";
+import { waitForText } from "../../testing/test-support";
 import {
   embeddedTerminalAvailable,
   registerTerminalPane,

package/src/{ghostty-terminal.ts → terminal/ghostty-terminal.ts}

@@ -55,7 +55,7 @@ type CvtLib = ReturnType<typeof dlopen<typeof CVT_SYMBOLS>>["symbols"];
 function nativeLibraryPath(): string | null {
   const suffix = process.platform === "darwin" ? "dylib" : "so";
   const dir = `${process.platform}-${process.arch}`;
-  const path = join(import.meta.dir, "..", "native", dir, `libcueloopvt.${suffix}`);
+  const path = join(import.meta.dir, "..", "..", "native", dir, `libcueloopvt.${suffix}`);
 
   return existsSync(path) ? path : null;
 }

package/src/{pty.ts → terminal/pty.ts}

@@ -69,7 +69,7 @@ type PtyLib = ReturnType<typeof dlopen<typeof PTY_SYMBOLS>>["symbols"];
 function nativeLibraryPath(): string | null {
   const suffix = process.platform === "darwin" ? "dylib" : "so";
   const dir = `${process.platform}-${process.arch}`;
-  const path = join(import.meta.dir, "..", "native", dir, `libcuelooppty.${suffix}`);
+  const path = join(import.meta.dir, "..", "..", "native", dir, `libcuelooppty.${suffix}`);
 
   return existsSync(path) ? path : null;
 }

package/src/{test-support.test.ts → testing/test-support.test.ts}

@@ -7,7 +7,7 @@ import type { KeyEvent, MouseEvent } from "@opentui/core";
 import type { TestRendererSetup } from "@opentui/core/testing";
 import { useKeyboard } from "@opentui/react";
 import { testRender } from "@opentui/react/test-utils";
-import { loadConfig } from "./config";
+import { loadConfig } from "../settings/config";
 import {
   clickText,
   dragText,

package/src/{test-support.ts → testing/test-support.ts}

@@ -10,7 +10,7 @@ import { join } from "node:path";
 import { cloneElement, isValidElement, type ReactNode } from "react";
 import type { TestRendererOptions, TestRendererSetup } from "@opentui/core/testing";
 import { testRender } from "@opentui/react/test-utils";
-import type { AppProps } from "./App";
+import type { AppProps } from "../app/App";
 
 /**
  * A probe for the App's ready signal in an in-process suite: pass `onReady`

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

package/src/{components → thread/components}/ThreadFooter.test.tsx

@@ -5,8 +5,8 @@ import { test, expect } from "bun:test";
 import React from "react";
 import { testRender } from "@opentui/react/test-utils";
 import { ThreadFooter } from "./ThreadFooter";
-import { settle } from "../test-support";
-import { DARK } from "../theme";
+import { settle } from "../../testing/test-support";
+import { DARK } from "../../appearance/theme";
 
 test("a long branch truncates on one line and keeps the send control in place", async () => {
   const setup = await testRender(

package/src/{components → thread/components}/ThreadFooter.tsx

@@ -4,10 +4,10 @@
 
 import React, { useRef } from "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 { NERD } from "./primitives/icons";
+import { DARK, type Theme } from "../../appearance/theme";
+import { useFrameMeasure } from "../../ui/use-frame-measure";
+import { truncateTitle } from "../../ui/components/truncate-title";
+import { NERD } from "../../ui/components/primitives/icons";
 
 export interface ThreadFooterProps {
   repo: string;

package/src/{components → thread/components}/ThreadTree.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 { ThreadTree } from "./ThreadTree";
 import { groupInbox } from "./thread-tree";
-import { fixtureDiffSession, fixturePlanSession } from "./story-fixtures";
+import { fixtureDiffSession, fixturePlanSession } from "../../stories/story-fixtures";
 
 export const meta: StoryMeta = { title: "Surfaces/ThreadTree" };
 

package/src/{components → thread/components}/ThreadTree.tsx

@@ -9,14 +9,14 @@
 
 import React, { useEffect, useRef, useState } from "react";
 import type { BoxRenderable } from "@opentui/core";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
-import { useFrameMeasure } from "../use-frame-measure";
-import { useRootOverlay } from "./RootOverlay";
-import { useMenuControl } from "./menu-control";
-import { IconButton } from "./primitives/IconButton";
-import { NERD } from "./primitives/icons";
-import { truncateTitle } from "./truncate-title";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { useFrameMeasure } from "../../ui/use-frame-measure";
+import { useRootOverlay } from "../../ui/components/RootOverlay";
+import { useMenuControl } from "../../ui/components/menu-control";
+import { IconButton } from "../../ui/components/primitives/IconButton";
+import { NERD } from "../../ui/components/primitives/icons";
+import { truncateTitle } from "../../ui/components/truncate-title";
 import { threadTitle, type InboxRow } from "./thread-tree";
 
 export interface ThreadTreeProps {