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

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 => {};
 

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

@@ -1,12 +1,12 @@
 import React from "react";
 import type { Annotation } from "@cueloop/schema";
-import { DARK } from "../theme";
-import { annotationPaletteFor } from "../annotation-palette";
-import { DEFAULT_QUICK_ACTIONS } from "../config";
+import { DARK } from "../../appearance/theme";
+import { annotationPaletteFor } from "../../annotations/annotation-palette";
+import { DEFAULT_QUICK_ACTIONS } from "../../settings/config";
 import { marksByRows } from "../view-diff";
-import type { Story, StoryMeta } from "./story";
+import type { Story, StoryMeta } from "../../stories/story";
 import { DiffContentView } from "./DiffContentView";
-import { fixtureDiffRows, fixtureDiffSession } from "./story-fixtures";
+import { fixtureDiffRows, fixtureDiffSession } from "../../stories/story-fixtures";
 
 export const meta: StoryMeta = { title: "Surfaces/DiffContentView" };
 

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

@@ -3,10 +3,10 @@ import { testRender } from "@opentui/react/test-utils";
 import type { RGBA } from "@opentui/core";
 import React from "react";
 import { DiffContentView } from "./DiffContentView";
-import { fixtureDiffSession } from "./story-fixtures";
+import { fixtureDiffSession } from "../../stories/story-fixtures";
 import { diffRows } from "../view-diff";
-import { DARK } from "../theme";
-import { allowEventLoopUpdates } from "../test-support";
+import { DARK } from "../../appearance/theme";
+import { allowEventLoopUpdates } from "../../testing/test-support";
 
 const PATCH = `diff --git a/src/x.ts b/src/x.ts
 --- a/src/x.ts

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

@@ -17,22 +17,22 @@ import {
 } from "@opentui/core";
 import type { Annotation, Thread } from "@cueloop/schema";
 import { diffRowText, fileChangeCounts, type DiffRow, type Mark } from "../view-diff";
-import type { TextSpan } from "../thread-selection";
-import type { QuickAction } from "../config";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
-import { useTooltip } from "./Tooltip";
-import { NERD } from "./primitives/icons";
+import type { TextSpan } from "../../annotations/thread-selection";
+import type { QuickAction } from "../../settings/config";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { useTooltip } from "../../ui/components/Tooltip";
+import { NERD } from "../../ui/components/primitives/icons";
 import { createIntralineResolver, type IntralineRun } from "../diff-intraline";
 import { highlightDiffRows, type SyntaxSpan } from "../diff-syntax";
 import { splitDiffRows, type SplitLine, type SplitRow } from "../split-diff";
-import { UNDERLINE, type AnnotationPalette } from "../annotation-palette";
-import { lineMarkRanges, runsFor, wrapLines, type MarkRange } from "../mark-runs";
-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 { UNDERLINE, type AnnotationPalette } from "../../annotations/annotation-palette";
+import { lineMarkRanges, runsFor, wrapLines, type MarkRange } from "../../markdown/mark-runs";
+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 { coloredRowSpans } from "./diff-content-view-layout";
 
 /** Shared empty map so an unresolved/stale highlight state is a stable value. */

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

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

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

@@ -8,12 +8,12 @@
  */
 
 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 type { WalkFile } from "../walk";
 import { viewedCount } from "../walk";
-import { Card } from "./primitives/Card";
-import { DialogActions } from "./primitives/DialogActions";
+import { Card } from "../../ui/components/primitives/Card";
+import { DialogActions } from "../../ui/components/primitives/DialogActions";
 
 export interface WalkWizardProps {
   files: WalkFile[];

package/src/{components → diff/components}/diff-content-view-layout.test.ts

@@ -7,10 +7,10 @@ import {
   marksByRows,
   type DiffRow,
 } from "../view-diff";
-import { fixtureDiffSession } from "./story-fixtures";
+import { fixtureDiffSession } from "../../stories/story-fixtures";
 import type { IntralineRun } from "../diff-intraline";
 import type { SyntaxSpan } from "../diff-syntax";
-import { DARK } from "../theme";
+import { DARK } from "../../appearance/theme";
 import { coloredRowSpans } from "./diff-content-view-layout";
 
 function row(kind: DiffRow["kind"], text: string, extra: Partial<DiffRow> = {}): DiffRow {

package/src/{components → diff/components}/diff-content-view-layout.ts

@@ -4,10 +4,10 @@
  * color). DiffContentView.tsx paints marks and the caret over these per character.
  */
 
-import type { Theme } from "../theme";
+import type { Theme } from "../../appearance/theme";
 import type { IntralineRun } from "../diff-intraline";
 import type { SyntaxSpan } from "../diff-syntax";
-import { colorForSyntaxGroup } from "./syntax-highlight";
+import { colorForSyntaxGroup } from "../../ui/components/syntax-highlight";
 
 /** One rendered span of a row: its text and its resolved foreground color. */
 export interface ColoredSpan {

package/src/{diff-syntax.ts → diff/diff-syntax.ts}

@@ -10,7 +10,7 @@
 
 import { getTreeSitterClient, type SimpleHighlight } from "@opentui/core";
 import type { DiffRow } from "./view-diff";
-import { filetypeForPath } from "./components/syntax-highlight";
+import { filetypeForPath } from "../ui/components/syntax-highlight";
 
 /** A syntax-colored run within one row, in line-relative columns [start, end). */
 export interface SyntaxSpan {

package/src/{view-diff.ts → diff/view-diff.ts}

@@ -14,12 +14,12 @@ import {
   type Block,
   type Thread,
 } from "@cueloop/schema";
-import { spanRangeInBlock, type TextSpan } from "./thread-selection";
-import type { Mark } from "./view-plan";
-import { discussionsFrom } from "./discussions";
+import { spanRangeInBlock, type TextSpan } from "../annotations/thread-selection";
+import type { Mark } from "../markdown/view-plan";
+import { discussionsFrom } from "../annotations/discussions";
 
 // the diff sheet reads marks over rows as a diff concept; re-export so it need not reach into view-plan
-export type { Mark } from "./view-plan";
+export type { Mark } from "../markdown/view-plan";
 
 export type DiffRowKind = "file" | "hunk" | "ctx" | "add" | "del";
 

package/src/index.ts

@@ -1,5 +1,5 @@
-export { runClient, type RunClientOptions } from "./run";
-export { snapshotWorkbench, type RepoDiff } from "./workbench-snapshot";
+export { runClient, type RunClientOptions } from "./app/run";
+export { snapshotWorkbench, type RepoDiff } from "./workbench/workbench-snapshot";
 export {
   defaultLayout,
   pairLayout,
@@ -7,7 +7,7 @@ export {
   pullRequestReviewLayout,
   reviewLayout,
   type LaunchLayout,
-} from "./launch-layout";
+} from "./app/launch-layout";
 export {
   diffRowAnchor,
   diffRows,
@@ -15,10 +15,10 @@ export {
   fileRowRange,
   resolveReviewAnchorRow,
   type DiffRow,
-} from "./view-diff";
-export { loadConfig, type ReviewWorkspaceMode } from "./config";
-export { serveClient, type ServeHandle, type ServeOptions } from "./serve";
-export { App, type AppProps } from "./App";
+} from "./diff/view-diff";
+export { loadConfig, type ReviewWorkspaceMode } from "./settings/config";
+export { serveClient, type ServeHandle, type ServeOptions } from "./app/serve";
+export { App, type AppProps } from "./app/App";
 export {
   collaboratorAnnotations,
   mergeFromShare,
@@ -28,4 +28,4 @@ export {
   shareIdFromLine,
   type ShareResult,
   type ShareTarget,
-} from "./share";
+} from "./integrations/share";

package/src/{components → integrations/components}/ExtensionZone.stories.tsx

@@ -1,6 +1,6 @@
 import React from "react";
 import { ClientExtensionRegistry } from "../client-extension-registry";
-import type { Story, StoryMeta } from "./story";
+import type { Story, StoryMeta } from "../../stories/story";
 import { ExtensionZone } from "./ExtensionZone";
 
 export const meta: StoryMeta = { title: "Extensions/ExtensionZone" };

package/src/{components → integrations/components}/ExtensionZone.tsx

@@ -4,9 +4,9 @@ import type {
   ClientExtensionRegistry,
   ClientExtensionSnapshot,
 } from "../client-extension-registry";
-import { useComponentTheme } from "./theme-context";
-import { IconButton } from "./primitives/IconButton";
-import { NERD } from "./primitives/icons";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { IconButton } from "../../ui/components/primitives/IconButton";
+import { NERD } from "../../ui/components/primitives/icons";
 
 /** Subscribe to the client extension registry without coupling extensions to React state. */
 export function useClientExtensionSnapshot(

package/src/{components → integrations/components}/ShareDialog.stories.tsx

@@ -1,7 +1,7 @@
 import React from "react";
 import type { ShareLink } 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 { ShareDialog } from "./ShareDialog";
 import { newWizardDraft, shareDialogStore } from "./share-dialog-store";
 

package/src/{components → integrations/components}/ShareDialog.tsx

@@ -14,17 +14,17 @@ import { useKeyboard, useTerminalDimensions } from "@opentui/react";
 import type { KeyBinding, MouseEvent, TextareaRenderable } from "@opentui/core";
 import { DEFAULT_SHARE_HOST } from "@cueloop/daemon/share-blob";
 import type { ShareLink } from "@cueloop/schema";
-import type { Theme } from "../theme";
-import type { NewShareLink } from "../thread-controller";
-import { useComponentTheme } from "./theme-context";
-import { Dialog } from "./primitives/Dialog";
-import { DialogActions } from "./primitives/DialogActions";
-import { Button } from "./primitives/Button";
-import { Switch } from "./primitives/Switch";
-import { Tree } from "./primitives/Tree";
-import type { TreeNode } from "./primitives/tree-model";
-import { NERD } from "./primitives/icons";
-import { HandleChipsInput } from "./HandleChipsInput";
+import type { Theme } from "../../appearance/theme";
+import type { NewShareLink } from "../../thread/thread-controller";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { Dialog } from "../../ui/components/primitives/Dialog";
+import { DialogActions } from "../../ui/components/primitives/DialogActions";
+import { Button } from "../../ui/components/primitives/Button";
+import { Switch } from "../../ui/components/primitives/Switch";
+import { Tree } from "../../ui/components/primitives/Tree";
+import type { TreeNode } from "../../ui/components/primitives/tree-model";
+import { NERD } from "../../ui/components/primitives/icons";
+import { HandleChipsInput } from "../../keyboard/components/HandleChipsInput";
 import {
   newWizardDraft,
   useShareDialog,

package/src/{integrations.test.ts → integrations/integrations.test.ts}

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 import { OBSIDIAN_DEFAULTS } from "@cueloop/integration-obsidian";
 import { loadBundledExporters } from "./integrations";
-import type { IntegrationsConfig } from "./config";
+import type { IntegrationsConfig } from "../settings/config";
 
 function integrations(overrides: Partial<typeof OBSIDIAN_DEFAULTS> = {}): IntegrationsConfig {
   return { obsidian: { ...OBSIDIAN_DEFAULTS, ...overrides } };

package/src/{integrations.ts → integrations/integrations.ts}

@@ -8,7 +8,7 @@
 import { Registry, type Exporter } from "@cueloop/extension-api";
 import { createObsidianExtension, shouldExport } from "@cueloop/integration-obsidian";
 import type { MessageOutcome } from "@cueloop/schema";
-import type { IntegrationsConfig } from "./config";
+import type { IntegrationsConfig } from "../settings/config";
 
 /** An exporter plus the policy deciding which messages trigger it. */
 export interface BundledExporter {

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

package/src/{components → keyboard/components}/CompletionOverlay.tsx

@@ -6,10 +6,10 @@
 
 import React from "react";
 import type { MessageOutcome } from "@cueloop/schema";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
-import { Toolbar } from "./primitives/Toolbar";
-import { Button } from "./primitives/Button";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { Toolbar } from "../../ui/components/primitives/Toolbar";
+import { Button } from "../../ui/components/primitives/Button";
 
 export interface CompletionOverlayProps {
   message: MessageOutcome;

package/src/{components → keyboard/components}/HandleChipsInput.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 { HandleChipsInput } from "./HandleChipsInput";
 
 export const meta: StoryMeta = { title: "Inputs/HandleChips" };

package/src/{components → keyboard/components}/HandleChipsInput.test.tsx

@@ -3,8 +3,8 @@
 import React, { useState } from "react";
 import { describe, expect, test } from "bun:test";
 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 { HandleChipsInput } from "./HandleChipsInput";
 
 /** A controlled host so onChange edits flow back into the rendered list, like the wizard. */

package/src/{components → keyboard/components}/HandleChipsInput.tsx

@@ -8,9 +8,9 @@
 import React, { useEffect, useRef, useState } from "react";
 import { useKeyboard } from "@opentui/react";
 import type { KeyBinding, TextareaRenderable } from "@opentui/core";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
-import { NERD } from "./primitives/icons";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { NERD } from "../../ui/components/primitives/icons";
 
 // enter adds the handle rather than inserting a newline into the one-line field
 const ADD_KEY_BINDINGS: KeyBinding[] = [{ name: "return", action: "submit" }];

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

package/src/{components → keyboard/components}/KeybindsDialog.tsx

@@ -1,8 +1,8 @@
 import React from "react";
 import { useTerminalDimensions } from "@opentui/react";
-import type { Theme } from "../theme";
-import { useComponentTheme } from "./theme-context";
-import { Dialog } from "./primitives/Dialog";
+import type { Theme } from "../../appearance/theme";
+import { useComponentTheme } from "../../appearance/components/theme-context";
+import { Dialog } from "../../ui/components/primitives/Dialog";
 import type { CheatsheetSection } from "../key-bindings";
 
 export interface KeybindsDialogProps {

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

package/src/{components → keyboard/components}/NavModeHint.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import type { Theme } from "../theme";
+import type { Theme } from "../../appearance/theme";
 
 const DIFF_NAV_HINT = "x reject · c fold · d layout · k walk · ⏎ submit · type to leave";
 const THREAD_NAV_HINT = "c comment · e edit · s share · n/p cards · ⏎ submit · type to leave";

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

package/src/{components → keyboard/components}/SlashComposer.tsx

@@ -2,8 +2,8 @@
 
 import React, { useContext, useState } from "react";
 import { useKeyboard } from "@opentui/react";
-import type { Theme } from "../theme";
-import type { QuickAction } from "../config";
+import type { Theme } from "../../appearance/theme";
+import type { QuickAction } from "../../settings/config";
 import { SlashSkillsContext } from "../skills";
 import {
   activeSlashToken,
@@ -12,7 +12,7 @@ import {
   slashFilter,
   slashItemsFrom,
 } from "../slash-palette";
-import { Composer, ComposerPalette } from "./AnnotationCards";
+import { Composer, ComposerPalette } from "../../annotations/components/AnnotationCards";
 
 export interface SlashComposerProps {
   seed: string;

package/src/{key-bindings.test.ts → keyboard/key-bindings.test.ts}

@@ -1,7 +1,7 @@
 /** Config keys resolve to per-layer actions, and status hints derive from getActiveKeys() so rebinds surface. */
 
 import { describe, expect, test } from "bun:test";
-import { DEFAULT_KEYS } from "./config";
+import { DEFAULT_KEYS } from "../settings/config";
 import { KeyBindings } from "./key-bindings";
 
 function bindings(

package/src/{keymap.test.ts → keyboard/keymap.test.ts}

@@ -1,7 +1,7 @@
 /** The keyboard grammar as data: every mode x key maps to a known intent list, gated once by the read-only rule. */
 
 import { describe, expect, test } from "bun:test";
-import { DEFAULT_KEYS } from "./config";
+import { DEFAULT_KEYS } from "../settings/config";
 import { reduceKey, type Intent, type KeyState } from "./keymap";
 
 function state(patch: Partial<KeyState> = {}): KeyState {

package/src/{keymap.ts → keyboard/keymap.ts}

@@ -6,7 +6,7 @@
  * navigation, deletion, and submit; the read-only rule is one gate here.
  */
 
-import { actionFor } from "./config";
+import { actionFor } from "../settings/config";
 
 export type Intent =
   | { type: "exit" }

package/src/{slash-palette.ts → keyboard/slash-palette.ts}

@@ -4,7 +4,7 @@
  * "/word" completion offered mid-sentence. Pure; the surfaces render it.
  */
 
-import { quickActionBody, type QuickAction } from "./config";
+import { quickActionBody, type QuickAction } from "../settings/config";
 
 export interface SlashItem {
   name: string;

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

@@ -1,7 +1,7 @@
 import React from "react";
-import { DARK } from "../theme";
+import { DARK } from "../../appearance/theme";
 import { buildDisplay, type DisplayBlock } from "../view-plan";
-import type { Story, StoryMeta } from "./story";
+import type { Story, StoryMeta } from "../../stories/story";
 import { MarkdownGridBlock } from "./MarkdownGridBlock";
 
 export const meta: StoryMeta = { title: "Surfaces/MarkdownGridBlock" };

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

@@ -10,8 +10,8 @@
 import React from "react";
 import type { MouseEvent as TerminalMouseEvent, TextRenderable } from "@opentui/core";
 import { displayText, type DisplayBlock } from "../view-plan";
-import type { Theme } from "../theme";
-import { BOLD } from "../annotation-palette";
+import type { Theme } from "../../appearance/theme";
+import { BOLD } from "../../annotations/annotation-palette";
 import {
   layoutFrontmatterGrid,
   layoutMarkdownTable,