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

package/src/{thread-controller.live-diff.test.ts → thread/thread-controller.live-diff.test.ts}

@@ -9,7 +9,7 @@ import { describe, expect, mock, test } from "bun:test";
 import { SCHEMA_VERSION, type Annotation, type Thread } from "@cueloop/schema";
 import type { ThreadClient } from "@cueloop/daemon/client";
 import { createReviewController, type ShareTransport } from "./thread-controller";
-import { mergeFromShare } from "./share";
+import { mergeFromShare } from "../integrations/share";
 
 const AT = "2026-01-01T00:00:00.000Z";
 
@@ -97,6 +97,36 @@ function fakeClient(session: Thread): ThreadClient {
 const tick = () => new Promise((resolve) => setTimeout(resolve, 0));
 
 describe("live working-tree diff for a non-diff thread", () => {
+  test("a preconnected workbench accepts a comment before its inbox refresh", async () => {
+    const session = planSession();
+    const sent: Annotation[] = [];
+    const client = {
+      ...fakeClient(session),
+      sessionComment: async (_id: string, annotation: Annotation) => {
+        sent.push(annotation);
+
+        return { ...session, annotations: sent };
+      },
+    } satisfies ThreadClient;
+    const controller = createReviewController({
+      sessionId: session.id,
+      initialSession: session,
+      initialDiff: { patch: PATCH, files: FILES },
+      initialClient: client,
+      shareTransport,
+    });
+
+    controller.addComment(
+      { quote: "const a = 2;", prefix: "", suffix: "" },
+      { kind: "file", path: "src/x.ts", rev: "worktree" },
+      "ready frame comment",
+    );
+
+    expect(sent).toHaveLength(1);
+    expect(sent[0]?.body).toBe("ready frame comment");
+    controller.close();
+  });
+
   test("repoChanges carries file contents and rows derive from the patch", async () => {
     const session = planSession();
     const controller = createReviewController({

package/src/{thread-controller.share.test.ts → thread/thread-controller.share.test.ts}

@@ -8,7 +8,7 @@ import {
   SHARE_RECONNECT_MIN_MS,
   type ShareTransport,
 } from "./thread-controller";
-import { mergeFromShare, type ShareWatchHandlers } from "./share";
+import { mergeFromShare, type ShareWatchHandlers } from "../integrations/share";
 
 const publishShare = mock(async () => ({ line: "ssh p_abc123xy@cueloop.dev", copied: true }));
 let remote: Thread;

package/src/{thread-controller.tree.test.ts → thread/thread-controller.tree.test.ts}

@@ -16,7 +16,7 @@ import {
 } from "@cueloop/schema";
 import type { ThreadClient } from "@cueloop/daemon/client";
 import { createReviewController, type ShareTransport } from "./thread-controller";
-import { mergeFromShare } from "./share";
+import { mergeFromShare } from "../integrations/share";
 
 const AT = "2026-01-01T00:00:00.000Z";
 

package/src/{thread-controller.ts → thread/thread-controller.ts}

@@ -44,7 +44,7 @@ import {
   type SessionHistory,
   type MessageOutcome,
 } from "@cueloop/schema";
-import { loadBundledExporters, type BundledExporter } from "./integrations";
+import { loadBundledExporters, type BundledExporter } from "../integrations/integrations";
 import {
   collaboratorAnnotations,
   mergeFromShare,
@@ -55,7 +55,7 @@ import {
   watchShare,
   shareIdFromLine,
   formatShareLine,
-} from "./share";
+} from "../integrations/share";
 import {
   baseRangeForRendered,
   blockRuns,
@@ -64,7 +64,7 @@ import {
   renderedSpanToWork,
   renderedText,
   type DisplayBlock,
-} from "./view-plan";
+} from "../markdown/view-plan";
 import { entryTarget, treeRows, type TreeRow } from "./tree-view";
 import {
   diffRowBlocks,
@@ -73,10 +73,10 @@ import {
   fileRowRange,
   readsFrozenDiff,
   type DiffRow,
-} from "./view-diff";
-import { applyFold } from "./diff-fold";
-import { snapshotWorkbench } from "./workbench-snapshot";
-import { copyToClipboard } from "./clipboard";
+} from "../diff/view-diff";
+import { applyFold } from "../diff/diff-fold";
+import { snapshotWorkbench } from "../workbench/workbench-snapshot";
+import { copyToClipboard } from "../integrations/clipboard";
 import {
   changeRejectionForRow,
   hunkRejectionForRow,
@@ -85,13 +85,18 @@ import {
   rejectsWholeHunk,
   sameRejection,
   type HunkRejection,
-} from "./diff-hunk-curate";
+} from "../diff/diff-hunk-curate";
 import type { FileDiffMetadata } from "@pierre/diffs";
-import { firstUnviewedIndex, walkFiles, type WalkFile } from "./walk";
-import { editInEditor } from "./editor";
-import { focusHerdrPane } from "./herdr";
-import { persistAutoClose, type AutoClose, type CueloopConfig, type QuickAction } from "./config";
-import { slashItemsFrom } from "./slash-palette";
+import { firstUnviewedIndex, walkFiles, type WalkFile } from "../diff/walk";
+import { editInEditor } from "../integrations/editor";
+import { focusHerdrPane } from "../integrations/herdr";
+import {
+  persistAutoClose,
+  type AutoClose,
+  type CueloopConfig,
+  type QuickAction,
+} from "../settings/config";
+import { slashItemsFrom } from "../keyboard/slash-palette";
 
 /**
  * Post-submit lifecycle (a review pane should hand you back to the agent,
@@ -251,6 +256,11 @@ export interface NewShareLink {
 export interface ReviewControllerOptions {
   home?: string;
   sessionId?: string;
+  /** Captured before the UI mounts, so the first review frame has its thread and live diff. */
+  initialSession?: Thread;
+  initialDiff?: { patch: string; files: DiffFileContents[] };
+  /** The owner connection that supplied the first review snapshot. */
+  initialClient?: ThreadClient;
   /** The directory the client launched in; its git repo backs the no-session welcome tree. Defaults to process.cwd(). */
   cwd?: string;
   /** Observer mode: stored for the key reducer's read-only gate. */
@@ -491,6 +501,7 @@ class Controller implements ReviewController {
   private derivedFor: Thread | null = null;
   /** The launch/workspace repo's live working-tree diff, feeding the Changes view for non-diff threads. */
   private liveDiff: LiveWorkingDiff | null = null;
+  private initialDiffAvailable = false;
   private derivedForLiveDiff: LiveWorkingDiff | null = null;
   private derived: DerivedSessionProjection = {
     display: [],
@@ -514,6 +525,12 @@ class Controller implements ReviewController {
   }
 
   constructor(private readonly options: ReviewControllerOptions) {
+    this.client = options.initialClient ?? null;
+    if (options.initialSession?.id === options.sessionId && options.initialDiff) {
+      this.liveDiff = options.initialDiff;
+      this.initialDiffAvailable = true;
+      this.store.setState({ session: options.initialSession });
+    }
     this.readOnly = options.readOnly ?? false;
     this.clock = options.clock ?? new SystemClock();
     this.shareTransport = options.shareTransport ?? DEFAULT_SHARE_TRANSPORT;
@@ -541,7 +558,9 @@ class Controller implements ReviewController {
       try {
         const openClient =
           this.options.openClient ??
-          (() => DaemonClient.connect({ home: this.options.home, autostart: true }));
+          (() =>
+            this.options.initialClient ??
+            DaemonClient.connect({ home: this.options.home, autostart: true }));
         const client = await openClient();
 
         if (this.closed) return void client.close();
@@ -839,6 +858,9 @@ class Controller implements ReviewController {
     // a plain diff review pins its captured snapshot; a workbench thread and every other thread reflect the live working tree
     const session = this.snapshot.session;
     if (readsFrozenDiff(session)) return session!.artifact.files ?? [];
+    const initialFiles = this.consumeInitialDiffFiles(session);
+
+    if (initialFiles !== null) return initialFiles;
     // eager: capture the live working-tree diff so the Changes navigator and its file tabs render a real diff
     if (this.client?.repoDiff !== undefined) {
       const diff = await this.client.repoDiff(
@@ -879,6 +901,13 @@ class Controller implements ReviewController {
     }));
   }
 
+  private consumeInitialDiffFiles(session: Thread | null): readonly DiffFileContents[] | null {
+    if (!this.initialDiffAvailable) return null;
+    this.initialDiffAvailable = false;
+
+    return session?.id === this.options.sessionId ? (this.liveDiff?.files ?? []) : null;
+  }
+
   async refreshDiff(): Promise<void> {
     const session = this.snapshot.session;
 

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

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

@@ -7,8 +7,8 @@
 
 import React from "react";
 import { createTextAttributes } 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 { filetypeFor, syntaxStyleFor } from "./syntax-highlight";
 
 /** A cut code block reads as removed: struck through and grayed, never red. */

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

@@ -1,7 +1,7 @@
 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 { ConfirmCard } from "./ConfirmCard";
 
 export const meta: StoryMeta = { title: "Cards/ConfirmCard" };

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

@@ -8,14 +8,19 @@
 import React, { useContext } from "react";
 import { useTerminalDimensions } from "@opentui/react";
 import { MESSAGE_OUTCOMES, type MessageOutcome } from "@cueloop/schema";
-import type { Theme } from "../theme";
-import type { QuickAction } from "../config";
-import { SlashSkillsContext } from "../skills";
-import { activeSlashToken, mergeSlashItems, slashFilter, slashItemsFrom } from "../slash-palette";
-import { useComponentTheme } from "./theme-context";
+import type { Theme } from "../../appearance/theme";
+import type { QuickAction } from "../../settings/config";
+import { SlashSkillsContext } from "../../keyboard/skills";
+import {
+  activeSlashToken,
+  mergeSlashItems,
+  slashFilter,
+  slashItemsFrom,
+} from "../../keyboard/slash-palette";
+import { useComponentTheme } from "../../appearance/components/theme-context";
 import { Card } from "./primitives/Card";
-import { composeRowCount } from "./AnnotationCards";
-import { SlashComposer } from "./SlashComposer";
+import { composeRowCount } from "../../annotations/components/AnnotationCards";
+import { SlashComposer } from "../../keyboard/components/SlashComposer";
 import { DialogActions } from "./primitives/DialogActions";
 
 const SUBMIT_CARD_MAX_WIDTH = 52;

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" };