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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cueloop/client",
-  "version": "0.1.0-alpha.94",
+  "version": "0.1.0-alpha.96",
   "description": "The cueloop review UI: projection renderer, keyboard grammar, review rail",
   "homepage": "https://github.com/mmurakaru/cueloop#readme",
   "bugs": {
@@ -20,17 +20,17 @@
   "type": "module",
   "exports": {
     ".": "./src/index.ts",
-    "./config": "./src/config.ts",
-    "./slash-palette": "./src/slash-palette.ts"
+    "./config": "./src/settings/config.ts",
+    "./slash-palette": "./src/keyboard/slash-palette.ts"
   },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
-    "@cueloop/daemon": "0.1.0-alpha.94",
-    "@cueloop/extension-api": "0.1.0-alpha.94",
-    "@cueloop/integration-obsidian": "0.1.0-alpha.94",
-    "@cueloop/schema": "0.1.0-alpha.94",
+    "@cueloop/daemon": "0.1.0-alpha.96",
+    "@cueloop/extension-api": "0.1.0-alpha.96",
+    "@cueloop/integration-obsidian": "0.1.0-alpha.96",
+    "@cueloop/schema": "0.1.0-alpha.96",
     "@opentui/core": "^0.5.12",
     "@opentui/keymap": "0.5.12",
     "@opentui/react": "^0.5.12",

package/src/{annotation-palette.ts → annotations/annotation-palette.ts}

@@ -6,7 +6,7 @@
  */
 
 import { createTextAttributes } from "@opentui/core";
-import type { Theme } from "./theme";
+import type { Theme } from "../appearance/theme";
 
 export const UNDERLINE = createTextAttributes({ underline: true });
 export const CUT = createTextAttributes({ strikethrough: true, dim: true });

package/src/{components → annotations/components}/AnnotationCards.stories.tsx

@@ -1,10 +1,10 @@
 import React from "react";
 import type { Annotation } from "@cueloop/schema";
-import { DARK } from "../theme";
+import { DARK } from "../../appearance/theme";
 import { annotationPaletteFor } from "../annotation-palette";
-import { slashItemsFrom } from "../slash-palette";
-import { DEFAULT_QUICK_ACTIONS } from "../config";
-import type { Story, StoryMeta } from "./story";
+import { slashItemsFrom } from "../../keyboard/slash-palette";
+import { DEFAULT_QUICK_ACTIONS } from "../../settings/config";
+import type { Story, StoryMeta } from "../../stories/story";
 import { CommentRow, ComposerPalette, DiscussionCard } from "./AnnotationCards";
 
 export const meta: StoryMeta = { title: "Chrome/AnnotationCards" };

package/src/{components → annotations/components}/AnnotationCards.tsx

@@ -15,14 +15,14 @@ import type {
   TextareaRenderable,
 } from "@opentui/core";
 import type { Annotation } from "@cueloop/schema";
-import type { Theme } from "../theme";
-import { useTooltip } from "./Tooltip";
+import type { Theme } from "../../appearance/theme";
+import { useTooltip } from "../../ui/components/Tooltip";
 import { lighten } from "../annotation-palette";
-import { useFrameMeasure } from "../use-frame-measure";
-import { imagePlaceholder, looksLikeBinaryPaste } from "../pasted-image";
-import { skillReferenceRanges, type SlashItem } from "../slash-palette";
-import { PaletteNamesContext } from "../skills";
-import { referenceStyleFor } from "./syntax-highlight";
+import { useFrameMeasure } from "../../ui/use-frame-measure";
+import { imagePlaceholder, looksLikeBinaryPaste } from "../../integrations/pasted-image";
+import { skillReferenceRanges, type SlashItem } from "../../keyboard/slash-palette";
+import { PaletteNamesContext } from "../../keyboard/skills";
+import { referenceStyleFor } from "../../ui/components/syntax-highlight";
 
 /* -------------------------------------------------------------- composer */
 

package/src/{components → annotations/components}/DiscussionMarkerRail.stories.tsx

@@ -1,11 +1,11 @@
 import React from "react";
 import type { Annotation } from "@cueloop/schema";
-import { DARK } from "../theme";
+import { DARK } from "../../appearance/theme";
 import type { Discussion } from "../discussions";
 import type { TextSpan } from "../thread-selection";
-import { RootOverlayProvider } from "./RootOverlay";
+import { RootOverlayProvider } from "../../ui/components/RootOverlay";
 import { DiscussionMarkerRail } from "./DiscussionMarkerRail";
-import type { Story, StoryMeta } from "./story";
+import type { Story, StoryMeta } from "../../stories/story";
 
 export const meta: StoryMeta = { title: "Chrome/DiscussionMarkerRail" };
 

package/src/{components → annotations/components}/DiscussionMarkerRail.tsx

@@ -8,13 +8,13 @@
 
 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 type { TextSpan } from "../thread-selection";
 import type { Discussion } from "../discussions";
-import { useFrameMeasure } from "../use-frame-measure";
-import { useComponentTheme } from "./theme-context";
-import { useRootOverlay } from "./RootOverlay";
-import { OverlayScrollbar } from "./OverlayScrollbar";
+import { useFrameMeasure } from "../../ui/use-frame-measure";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { useRootOverlay } from "../../ui/components/RootOverlay";
+import { OverlayScrollbar } from "../../ui/components/OverlayScrollbar";
 
 interface HoveredMarker {
   key: string;

package/src/{discussions.ts → annotations/discussions.ts}

@@ -6,7 +6,7 @@
  */
 
 import type { Annotation, Thread } from "@cueloop/schema";
-import type { Mark } from "./view-plan";
+import type { Mark } from "../markdown/view-plan";
 import { comparePositions, type TextSpan } from "./thread-selection";
 
 /** One conversation: a root annotation, its replies, and the span they mark. */

package/src/{use-annotation-surface.tsx → annotations/use-annotation-surface.tsx}

@@ -15,11 +15,11 @@
 import React, { useContext, useEffect, useRef, useState } from "react";
 import type { KeyEvent, MouseEvent as TerminalMouseEvent, TextRenderable } from "@opentui/core";
 import { flushSync } from "@opentui/react";
-import { useSharedKeyboard } from "./use-shared-keyboard";
+import { useSharedKeyboard } from "../keyboard/use-shared-keyboard";
 import type { Annotation, Thread } from "@cueloop/schema";
-import type { Mark } from "./view-plan";
-import type { QuickAction } from "./config";
-import type { Theme } from "./theme";
+import type { Mark } from "../markdown/view-plan";
+import type { QuickAction } from "../settings/config";
+import type { Theme } from "../appearance/theme";
 import {
   comparePositions,
   isDoubleClick,
@@ -37,7 +37,7 @@ import {
   type TextSpan,
 } from "./thread-selection";
 import { annotationPaletteFor, type AnnotationPalette } from "./annotation-palette";
-import { printableSequence, type MarkRange, type VisualLine } from "./mark-runs";
+import { printableSequence, type MarkRange, type VisualLine } from "../markdown/mark-runs";
 import {
   activeSlashToken,
   insertSlashItem,
@@ -45,8 +45,8 @@ import {
   mergeSlashItems,
   slashFilter,
   slashItemsFrom,
-} from "./slash-palette";
-import { SlashSkillsContext } from "./skills";
+} from "../keyboard/slash-palette";
+import { SlashSkillsContext } from "../keyboard/skills";
 import { discussionsFrom, type Discussion } from "./discussions";
 import {
   CommentRow,

package/src/{App.appearance.test.tsx → app/App.appearance.test.tsx}

@@ -8,7 +8,7 @@ import React from "react";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { isolateUserConfig, settle, waitForText, renderReadyApp } from "./test-support";
+import { isolateUserConfig, settle, waitForText, renderReadyApp } from "../testing/test-support";
 
 const PLAN = "# Sync Plan\n\n## Steps\n\n- flush the queue\n";
 

package/src/{App.autoclose.test.tsx → app/App.autoclose.test.tsx}

@@ -10,7 +10,7 @@ import { ManualClock } from "@opentui/core/testing";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { isolateUserConfig, press, settle, waitForText, pressKey } from "./test-support";
+import { isolateUserConfig, press, settle, waitForText, pressKey } from "../testing/test-support";
 
 const PLAN = "# Plan\n\nShip the thing.\n";
 

package/src/{App.deleted-scroll.test.tsx → app/App.deleted-scroll.test.tsx}

@@ -8,8 +8,8 @@ import React from "react";
 import { ScrollBoxRenderable, type Renderable } from "@opentui/core";
 import { DaemonServer } from "@cueloop/daemon";
 import { App } from "./App";
-import { annotationPaletteFor } from "./annotation-palette";
-import { DARK } from "./theme";
+import { annotationPaletteFor } from "../annotations/annotation-palette";
+import { DARK } from "../appearance/theme";
 import {
   isolateUserConfig,
   locateText,
@@ -17,7 +17,7 @@ import {
   renderReadyApp,
   settle,
   waitForText,
-} from "./test-support";
+} from "../testing/test-support";
 
 function findScrollbox(node: Renderable): ScrollBoxRenderable | null {
   if (node.id === "diff-scroll" && node instanceof ScrollBoxRenderable) return node;

package/src/{App.diff.test.tsx → app/App.diff.test.tsx}

@@ -9,7 +9,7 @@ import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
 import { pullRequestReviewLayout } from "./launch-layout";
-import { DARK } from "./theme";
+import { DARK } from "../appearance/theme";
 import {
   clickText,
   dragText,
@@ -21,7 +21,7 @@ import {
   typeText,
   waitForState,
   waitForText,
-} from "./test-support";
+} from "../testing/test-support";
 
 const PATCH = `diff --git a/src/store.ts b/src/store.ts
 index 111..222 100644

package/src/{App.export.test.tsx → app/App.export.test.tsx}

@@ -22,7 +22,7 @@ import {
   waitForText,
   pressKey,
   renderReadyApp,
-} from "./test-support";
+} from "../testing/test-support";
 
 const PLAN = `# Migration Plan
 

package/src/{App.identity.test.tsx → app/App.identity.test.tsx}

@@ -7,7 +7,12 @@ import { join } from "node:path";
 import React from "react";
 import { DaemonServer } from "@cueloop/daemon";
 import { App } from "./App";
-import { isolateUserConfig, locateText, renderReadyApp, waitForText } from "./test-support";
+import {
+  isolateUserConfig,
+  locateText,
+  renderReadyApp,
+  waitForText,
+} from "../testing/test-support";
 
 const PLAN = "# Migration Plan\n\nThe daemon persists sessions to disk atomically.\n";
 

package/src/{App.plan-render.test.tsx → app/App.plan-render.test.tsx}

@@ -16,7 +16,7 @@ import React from "react";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { DARK } from "./theme";
+import { DARK } from "../appearance/theme";
 import {
   dragText,
   isolateUserConfig,
@@ -26,7 +26,7 @@ import {
   typeText as type,
   waitForState,
   waitForText,
-} from "./test-support";
+} from "../testing/test-support";
 
 const PLAN = `---
 title: Migration Plan

package/src/{App.plan-review.test.tsx → app/App.plan-review.test.tsx}

@@ -8,8 +8,8 @@ import React from "react";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { DEFAULT_QUICK_ACTIONS } from "./config";
-import { slashItemsFrom } from "./slash-palette";
+import { DEFAULT_QUICK_ACTIONS } from "../settings/config";
+import { slashItemsFrom } from "../keyboard/slash-palette";
 import {
   clickText,
   dragText,
@@ -22,7 +22,7 @@ import {
   waitForState,
   waitForText,
   waitForTextGone,
-} from "./test-support";
+} from "../testing/test-support";
 
 const PLAN = `# Migration Plan
 

package/src/{App.prototype-markdown.test.tsx → app/App.prototype-markdown.test.tsx}

@@ -8,8 +8,8 @@ import React from "react";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { DARK } from "./theme";
-import { isolateUserConfig, renderReadyApp, settle, waitForText } from "./test-support";
+import { DARK } from "../appearance/theme";
+import { isolateUserConfig, renderReadyApp, settle, waitForText } from "../testing/test-support";
 
 const DOC = `# PromoCard
 

package/src/{App.prototype.test.tsx → app/App.prototype.test.tsx}

@@ -12,7 +12,7 @@ import {
   setPrototypeRendererFactory,
   type PrototypeElement,
   type PrototypeRenderer,
-} from "./prototype-browser";
+} from "../prototype/prototype-browser";
 import {
   isolateUserConfig,
   press,
@@ -22,7 +22,7 @@ import {
   waitForState,
   waitForText,
   waitForTextGone,
-} from "./test-support";
+} from "../testing/test-support";
 
 const HTML = "<main><div class='card'><h2>Pro</h2><p>$24/mo</p></div></main>";
 

package/src/{App.readonly.test.tsx → app/App.readonly.test.tsx}

@@ -18,7 +18,7 @@ import {
   renderReadyApp,
   typeText,
   waitForText,
-} from "./test-support";
+} from "../testing/test-support";
 
 const PLAN = `# Migration Plan
 

package/src/{App.regression.test.tsx → app/App.regression.test.tsx}

@@ -14,7 +14,7 @@ import {
   pressKey,
   renderReadyApp,
   waitForText,
-} from "./test-support";
+} from "../testing/test-support";
 
 const ACCENT_DARK: [number, number, number] = [203, 166, 247];
 

package/src/{App.rendering.test.tsx → app/App.rendering.test.tsx}

@@ -8,7 +8,7 @@ import React from "react";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { isolateUserConfig, waitForText, renderReadyApp } from "./test-support";
+import { isolateUserConfig, waitForText, renderReadyApp } from "../testing/test-support";
 
 const PLAN = `# Render Plan
 

package/src/{App.share-dialog.test.tsx → app/App.share-dialog.test.tsx}

@@ -9,7 +9,7 @@ import { testRender } from "@opentui/react/test-utils";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import type { ShareTransport } from "./thread-controller";
+import type { ShareTransport } from "../thread/thread-controller";
 import {
   isolateUserConfig,
   press,
@@ -17,7 +17,7 @@ import {
   settle,
   waitForText,
   waitForTextGone,
-} from "./test-support";
+} from "../testing/test-support";
 
 const shareTransport: ShareTransport = {
   publish: mock(async () => ({ line: "ssh p_share01@cueloop.dev", copied: true })),

package/src/{App.submit-confirm.test.tsx → app/App.submit-confirm.test.tsx}

@@ -16,7 +16,7 @@ import {
   settle,
   waitForText,
   waitForTextGone,
-} from "./test-support";
+} from "../testing/test-support";
 
 const PLAN = `# Migration Plan
 

package/src/{App.test.tsx → app/App.test.tsx}

@@ -8,7 +8,7 @@ import React from "react";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { DARK } from "./theme";
+import { DARK } from "../appearance/theme";
 import {
   clickText,
   dragText,
@@ -22,7 +22,7 @@ import {
   typeText as type,
   waitForState,
   waitForText,
-} from "./test-support";
+} from "../testing/test-support";
 
 const PLAN = `# Migration Plan
 

package/src/{App.toast.test.tsx → app/App.toast.test.tsx}

@@ -9,7 +9,7 @@ import { testRender } from "@opentui/react/test-utils";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import type { ShareTransport } from "./thread-controller";
+import type { ShareTransport } from "../thread/thread-controller";
 import {
   clickText,
   isolateUserConfig,
@@ -19,7 +19,7 @@ import {
   typeText,
   waitForText,
   waitForTextGone,
-} from "./test-support";
+} from "../testing/test-support";
 
 const publishShare = mock(async () => ({ line: "ssh p_share01@cueloop.dev", copied: true }));
 const shareTransport: ShareTransport = {

package/src/{App.tsx → app/App.tsx}

@@ -8,7 +8,7 @@ import React, {
 } from "react";
 import { useKeyboard, useRenderer, useTerminalDimensions } from "@opentui/react";
 import type { Clock, KeyEvent } from "@opentui/core";
-import { buildDisplay, marksByDisplay, type Mark } from "./view-plan";
+import { buildDisplay, marksByDisplay, type Mark } from "../markdown/view-plan";
 import {
   DEFAULT_KEYS,
   DEFAULT_QUICK_ACTIONS,
@@ -22,48 +22,48 @@ import {
   type IdentityConfig,
   type QuickAction,
   type ReviewWorkspaceMode,
-} from "./config";
-import { resolveDisplayName } from "./attribution";
-import { resolveGithubIdentity } from "./github-identity";
-import { loadSkills, PaletteNamesContext, SlashSkillsContext } from "./skills";
-import { mergeSlashItems, slashItemsFrom, type SlashItem } from "./slash-palette";
+} from "../settings/config";
+import { resolveDisplayName } from "../integrations/attribution";
+import { resolveGithubIdentity } from "../integrations/github-identity";
+import { loadSkills, PaletteNamesContext, SlashSkillsContext } from "../keyboard/skills";
+import { mergeSlashItems, slashItemsFrom, type SlashItem } from "../keyboard/slash-palette";
 import {
   composeTheme,
   DEFAULT_THEME_NAME,
   themeForName,
   type Appearance,
   type ThemeName,
-} from "./theme-presets";
-import type { Theme } from "./theme";
-import { createReviewController, type ShareTransport } from "./thread-controller";
+} from "../appearance/theme-presets";
+import type { Theme } from "../appearance/theme";
+import { createReviewController, type ShareTransport } from "../thread/thread-controller";
 import type { ThreadClient } from "@cueloop/daemon/client";
 import { createIntentDispatch, type Mode, type RailTab } from "./intent-dispatch";
-import { reduceKey, type KeyState } from "./keymap";
-import { KeyBindings, type CheatsheetSection } from "./key-bindings";
+import { reduceKey, type KeyState } from "../keyboard/keymap";
+import { KeyBindings, type CheatsheetSection } from "../keyboard/key-bindings";
 import { useReadySignal } from "./ready-signal";
-import { ThemeProvider } from "./components/theme-context";
-import { Button } from "./components/primitives/Button";
-import { ShareDialog } from "./components/ShareDialog";
-import { shareDialogStore } from "./components/share-dialog-store";
-import { Toolbar } from "./components/primitives/Toolbar";
-import { groupInbox, projectName, threadTitle } from "./components/thread-tree";
-import { ThreadTree } from "./components/ThreadTree";
-import { ChangesFileTree } from "./components/ChangesColumn";
-import { MenuControlProvider, useMenuControlState } from "./components/menu-control";
-import { ProjectTreeView } from "./components/ProjectTreeView";
+import { ThemeProvider } from "../appearance/components/theme-context";
+import { Button } from "../ui/components/primitives/Button";
+import { ShareDialog } from "../integrations/components/ShareDialog";
+import { shareDialogStore } from "../integrations/components/share-dialog-store";
+import { Toolbar } from "../ui/components/primitives/Toolbar";
+import { groupInbox, projectName, threadTitle } from "../thread/components/thread-tree";
+import { ThreadTree } from "../thread/components/ThreadTree";
+import { ChangesFileTree } from "../workbench/components/ChangesColumn";
+import { MenuControlProvider, useMenuControlState } from "../ui/components/menu-control";
+import { ProjectTreeView } from "../workbench/components/ProjectTreeView";
 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 { GridTabContent } from "./components/GridTabContent";
-import { useChangesWorkbench } from "./use-changes-workbench";
-import { useRepoChanges } from "./use-repo-changes";
-import { useThreadBodyEditing } from "./use-thread-body-editing";
-import { useRememberLayout } from "./use-remember-layout";
+import { EditorGrid } from "../workbench/components/EditorGrid";
+import { GridTabContent } from "../workbench/components/GridTabContent";
+import { useChangesWorkbench } from "../workbench/use-changes-workbench";
+import { useRepoChanges } from "../workbench/use-repo-changes";
+import { useThreadBodyEditing } from "../markdown/use-thread-body-editing";
+import { useRememberLayout } from "../workbench/use-remember-layout";
 import type { LaunchLayout } from "./launch-layout";
-import { ThreadFooter, THREAD_FOOTER_HEIGHT } from "./components/ThreadFooter";
-import { ConfirmCard } from "./components/ConfirmCard";
-import { THREAD_VIEW_CHEATSHEET, ThreadView } from "./components/ThreadView";
+import { ThreadFooter, THREAD_FOOTER_HEIGHT } from "../thread/components/ThreadFooter";
+import { ConfirmCard } from "../ui/components/ConfirmCard";
+import { THREAD_VIEW_CHEATSHEET, ThreadView } from "../markdown/components/ThreadView";
 import {
   curationCommandEntries,
   diffCommandEntries,
@@ -71,9 +71,9 @@ import {
   resolveSessionChord,
   sessionCommandEntries,
   treeCommandEntries,
-} from "./thread-chords";
-import { type DiffFoldControls } from "./components/DiffContentView";
-import { commentCountsByFile, readsFrozenDiff } from "./view-diff";
+} from "../keyboard/thread-chords";
+import { type DiffFoldControls } from "../diff/components/DiffContentView";
+import { commentCountsByFile, readsFrozenDiff } from "../diff/view-diff";
 import { annotationTarget, isAddressed, isAgentNote, threadShareLinks } from "@cueloop/schema";
 import type {
   Annotation,
@@ -84,8 +84,8 @@ import type {
   Thread,
   MessageOutcome,
 } from "@cueloop/schema";
-import { PrototypePixels } from "./prototype-pixels";
-import type { PrototypeElement } from "./prototype-browser";
+import { PrototypePixels } from "../prototype/prototype-pixels";
+import type { PrototypeElement } from "../prototype/prototype-browser";
 import {
   buildRenderFlags,
   buildSubmitConfirmState,
@@ -97,7 +97,7 @@ import {
   resolveOverlay,
 } from "./app-view-model";
 import { buildKeyState } from "./app-key-state";
-import { useSettingsDialog } from "./use-settings-dialog";
+import { useSettingsDialog } from "../settings/use-settings-dialog";
 import {
   CompletionScreen,
   ConnectingScreen,

package/src/{App.visual.test.tsx → app/App.visual.test.tsx}

@@ -4,10 +4,10 @@
 import { afterEach, beforeEach, expect, test } from "bun:test";
 import React from "react";
 import { App } from "./App";
-import { clickText, isolateUserConfig, renderReadyApp, waitForText } from "./test-support";
-import { themeForName } from "./theme-presets";
-import { rgbColorFromHex } from "./visual/contrast";
-import { createTestReviewHome, type TestReviewHome } from "../../../test/helpers/review-home";
+import { clickText, isolateUserConfig, renderReadyApp, waitForText } from "../testing/test-support";
+import { themeForName } from "../appearance/theme-presets";
+import { rgbColorFromHex } from "../appearance/visual/contrast";
+import { createTestReviewHome, type TestReviewHome } from "../../../../test/helpers/review-home";
 
 let reviewHome: TestReviewHome;
 let restoreUserConfig: () => void;

package/src/{App.walk.test.tsx → app/App.walk.test.tsx}

@@ -8,7 +8,7 @@ import React from "react";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { DARK } from "./theme";
+import { DARK } from "../appearance/theme";
 import {
   isolateUserConfig,
   press,
@@ -18,7 +18,7 @@ import {
   waitForState,
   waitForText,
   waitForTextGone,
-} from "./test-support";
+} from "../testing/test-support";
 
 const PATCH = `diff --git a/src/a.ts b/src/a.ts
 index 111..222 100644

package/src/{App.workbench.test.tsx → app/App.workbench.test.tsx}

@@ -11,11 +11,11 @@ import { mkdtempSync, mkdirSync, rmSync, writeFileSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import React from "react";
-import { testRender } from "@opentui/react/test-utils";
+import { testRender as renderTestComponent } from "@opentui/react/test-utils";
 import { DaemonServer } from "@cueloop/daemon";
 import type { Thread } from "@cueloop/schema";
 import { App } from "./App";
-import { loadConfig } from "./config";
+import { loadConfig } from "../settings/config";
 import { pairLayout, planLayout, reviewLayout } from "./launch-layout";
 import {
   dragText,
@@ -27,9 +27,9 @@ import {
   waitForState,
   waitForText,
   waitForTextGone,
-  renderReadyApp,
-} from "./test-support";
-import { NERD } from "./components/primitives/icons";
+  renderReadyApp as renderReadyTestApp,
+} from "../testing/test-support";
+import { NERD } from "../ui/components/primitives/icons";
 
 const PATCH = `diff --git a/src/store.ts b/src/store.ts
 index 111..222 100644
@@ -47,6 +47,23 @@ let repo: string;
 let restoreUserConfig: () => void;
 let server: DaemonServer;
 let session: Thread;
+const renderers = new Set<Awaited<ReturnType<typeof renderTestComponent>>["renderer"]>();
+
+async function testRender(...args: Parameters<typeof renderTestComponent>) {
+  const setup = await renderTestComponent(...args);
+
+  renderers.add(setup.renderer);
+
+  return setup;
+}
+
+async function renderReadyApp(...args: Parameters<typeof renderReadyTestApp>) {
+  const setup = await renderReadyTestApp(...args);
+
+  renderers.add(setup.renderer);
+
+  return setup;
+}
 
 /** A throwaway git repo so the Project tree (git ls-files) and file contents resolve without a real checkout. */
 function makeRepo(): string {
@@ -79,6 +96,10 @@ beforeEach(() => {
   });
 });
 afterEach(() => {
+  for (const renderer of renderers) {
+    if (!renderer.isDestroyed) renderer.destroy();
+  }
+  renderers.clear();
   restoreUserConfig();
   server.stop();
   rmSync(home, { recursive: true, force: true });