@golba98/codexa 1.0.4 → 1.0.5

package/src/core/providerRuntime/reasoning.ts

@@ -1,4 +1,5 @@
-import type { ReasoningEffortCapability } from "../models/codexModelCapabilities.js";
+import type { ReasoningEffortCapability } from "../models/codexModelCapabilities.js";
+import { formatReasoningLabel } from "../../config/settings.js";
 
 export const CLAUDE_CODE_EFFORT_LEVELS: readonly ReasoningEffortCapability[] = [
   { id: "low", label: "Low", description: "Claude Code low effort." },
@@ -10,8 +11,10 @@ export const CLAUDE_CODE_EFFORT_LEVELS: readonly ReasoningEffortCapability[] = [
 
 export const CLAUDE_CODE_EFFORT_IDS = new Set(CLAUDE_CODE_EFFORT_LEVELS.map((level) => level.id));
 
-export function getClaudeCodeEffortLevels(ids: readonly string[]): readonly ReasoningEffortCapability[] {
-  return ids
-    .map((id) => CLAUDE_CODE_EFFORT_LEVELS.find((level) => level.id === id))
-    .filter((level): level is ReasoningEffortCapability => Boolean(level));
-}
+export function getClaudeCodeEffortLevels(ids: readonly string[]): readonly ReasoningEffortCapability[] {
+  return ids.map((id) => CLAUDE_CODE_EFFORT_LEVELS.find((level) => level.id === id) ?? {
+    id,
+    label: formatReasoningLabel(id),
+    description: null,
+  });
+}

package/src/core/providerRuntime/registry.ts

@@ -1,10 +1,13 @@
 import { codexSubprocessProvider } from "../providers/codexSubprocess.js";
+import { loadSeededOpenAiModels } from "../models/codexModelsCacheSeed.js";
+import { loadCachedProviderModels, saveCachedProviderModels } from "../models/providerModelCache.js";
 import type { BackendRunHandlers } from "../providers/types.js";
 import type { ProviderId, ProviderActiveRoute, ProviderWorkspaceOverride } from "../providerLauncher/types.js";
-import { anthropicRuntime } from "./anthropic.js";
-import { geminiRuntime } from "./gemini.js";
-import { localRuntime } from "./local.js";
-import { antigravityRuntime, ANTIGRAVITY_DEFAULT_MODEL_ID, migrateAntigravityLegacyModelId } from "./antigravity.js";
+import { anthropicRuntime } from "./anthropic.js";
+import { geminiRuntime } from "./gemini.js";
+import { localRuntime } from "./local.js";
+import { antigravityRuntime, ANTIGRAVITY_DEFAULT_MODEL_ID, migrateAntigravityLegacyModelId } from "./antigravity.js";
+import { mistralVibeRuntime } from "./mistralVibe.js";
 import {
   ANTHROPIC_FALLBACK_MODELS,
   GEMINI_DEFAULT_MODEL_ID,
@@ -28,11 +31,14 @@ const openAiRuntime: ProviderRuntime = {
   routeAvailable: true,
   routeStatus: "Uses the configured Codex/OpenAI backend inside Codexa.",
   launchAvailable: true,
+  // Seeded from local caches (codex's own models_cache.json or Codexa's
+  // last-good discovery); live app-server discovery refreshes them via
+  // getCodexModelCapabilities in the app run loop.
   discoverModels: () => ({
     status: "ready",
     providerId: "openai",
     backendKind: "codex-cli-auth",
-    models: [],
+    models: loadSeededOpenAiModels()?.models ?? [],
   }),
   run: (request: ProviderChatRequest, handlers: BackendRunHandlers) => {
     handlers.onProgress?.({
@@ -72,11 +78,12 @@ function unavailableRuntime(providerId: ProviderId, label: string): ProviderRunt
 
 const PROVIDER_RUNTIMES: Record<ProviderId, ProviderRuntime> = {
   openai: openAiRuntime,
-  anthropic: anthropicRuntime,
-  google: geminiRuntime,
-  local: localRuntime,
-  antigravity: antigravityRuntime,
-};
+  anthropic: anthropicRuntime,
+  google: geminiRuntime,
+  mistral: mistralVibeRuntime,
+  local: localRuntime,
+  antigravity: antigravityRuntime,
+};
 
 export function getProviderRuntime(providerId: ProviderId): ProviderRuntime {
   return PROVIDER_RUNTIMES[providerId];
@@ -97,17 +104,39 @@ export function getProviderRouteSetupMessage(providerId: ProviderId): string {
 }
 
 export function discoverProviderModels(providerId: ProviderId): ProviderModelDiscoveryResult {
-  return getProviderRuntime(providerId).discoverModels();
+  const result = getProviderRuntime(providerId).discoverModels();
+  // When the live/synchronous probe only produced fallback entries (or none),
+  // prefer the last-good discovery persisted from a previous session.
+  const hasRuntimeModels = result.models.some((model) => model.source && model.source !== "fallback");
+  if (result.status === "ready" && !hasRuntimeModels) {
+    const cached = loadCachedProviderModels(providerId);
+    if (cached) {
+      return { ...result, models: cached.models };
+    }
+  }
+  return result;
+}
+
+// Persist a ready discovery so the next session starts from last-good models.
+export function persistProviderDiscovery(discovery: ProviderModelDiscoveryResult): void {
+  const runtimeModels = discovery.models.filter((model) => model.source && model.source !== "fallback");
+  if (discovery.status !== "ready" || runtimeModels.length === 0) {
+    return;
+  }
+  saveCachedProviderModels(discovery.providerId, {
+    discoveredAt: Date.now(),
+    models: runtimeModels,
+  });
 }
 
 export async function validateProviderRouteActivation(options: {
   route: ProviderRoute;
-  workspaceRoot: string;
-  geminiCommandPath?: string | null;
-  claudeCommandPath?: string | null;
-  antigravityCommandPath?: string | null;
-  localConfig?: ProviderWorkspaceOverride | null;
-}): Promise<ProviderRouteValidationResult> {
+  workspaceRoot: string;
+  geminiCommandPath?: string | null;
+  claudeCommandPath?: string | null;
+  antigravityCommandPath?: string | null;
+  localConfig?: ProviderWorkspaceOverride | null;
+}): Promise<ProviderRouteValidationResult> {
   const runtime = getProviderRuntime(options.route.providerId);
   if (!runtime.routeAvailable) {
     return {
@@ -157,7 +186,7 @@ export function resolveActiveProviderRoute(options: {
   currentReasoning: string;
 }): ActiveProviderRoute {
   const configuredRoute = options.workspaceConfigActiveRoute;
-  if (configuredRoute && configuredRoute.providerId !== "google" && isProviderRoutableInCodexa(configuredRoute.providerId)) {
+  if (configuredRoute && configuredRoute.providerId !== "google" && isProviderRoutableInCodexa(configuredRoute.providerId)) {
     const route: ActiveProviderRoute = {
       providerId: configuredRoute.providerId,
       modelId: configuredRoute.modelId,
@@ -166,36 +195,48 @@ export function resolveActiveProviderRoute(options: {
       ...(configuredRoute.modelSelection ? { modelSelection: configuredRoute.modelSelection } : {}),
     };
 
-    if (route.providerId === "google" && route.modelSelection) {
-      route.modelId = resolveGeminiModelId(route.modelSelection);
-    } else if (route.providerId === "google") {
-      route.modelId = normalizeGeminiModelId(route.modelId);
-    } else if (route.providerId === "anthropic") {
-      const discovery = discoverProviderModels("anthropic");
-      const stillAvailable = discovery.models.some((model) =>
-        model.modelId === route.modelId ||
-        model.id === route.modelId ||
-        model.canonicalId === route.modelId
-      );
-      const hasNonFallbackModels = discovery.models.some((model) => model.source !== "fallback");
-      if (discovery.status === "ready" && hasNonFallbackModels && discovery.models.length > 0 && !stillAvailable) {
-        route.modelId = discovery.models[0]!.modelId;
-      }
-    } else if (route.providerId === "local") {
-      const discovery = discoverProviderModels("local");
-      const selectedModel = typeof discovery.diagnostics?.selectedModel === "string"
+    if (route.providerId === "google" && route.modelSelection) {
+      route.modelId = resolveGeminiModelId(route.modelSelection);
+    } else if (route.providerId === "google") {
+      route.modelId = normalizeGeminiModelId(route.modelId);
+    } else if (route.providerId === "anthropic") {
+      const discovery = discoverProviderModels("anthropic");
+      const stillAvailable = discovery.models.some((model) =>
+        model.modelId === route.modelId ||
+        model.id === route.modelId ||
+        model.canonicalId === route.modelId
+      );
+      const hasNonFallbackModels = discovery.models.some((model) => model.source !== "fallback");
+      if (discovery.status === "ready" && hasNonFallbackModels && discovery.models.length > 0 && !stillAvailable) {
+        route.modelId = discovery.models[0]!.modelId;
+      }
+    } else if (route.providerId === "local") {
+      const discovery = discoverProviderModels("local");
+      const selectedModel = typeof discovery.diagnostics?.selectedModel === "string"
         ? discovery.diagnostics.selectedModel.trim()
         : "";
-      if (discovery.status === "ready" && selectedModel) {
-        route.modelId = selectedModel;
-      }
+      if (discovery.status === "ready" && selectedModel) {
+        route.modelId = selectedModel;
+      }
     } else if (route.providerId === "antigravity") {
       const migrated = migrateAntigravityLegacyModelId(route.modelId);
       route.modelId = migrated.modelId;
       if (!route.reasoning && migrated.reasoning) {
         route.reasoning = migrated.reasoning;
       }
-    }
+      const discovery = discoverProviderModels("antigravity");
+      if (discovery.status === "ready" && discovery.models.length > 0) {
+        let model = discovery.models.find((item) => item.modelId === route.modelId || item.id === route.modelId);
+        if (!model) {
+          model = discovery.models[0];
+          route.modelId = model.modelId;
+        }
+        const levels = model.supportedReasoningLevels;
+        if (levels?.length && (!route.reasoning || !levels.some((level) => level.id === route.reasoning))) {
+          route.reasoning = model.defaultReasoningLevel ?? levels[0]?.id;
+        }
+      }
+    }
 
     return route;
   }
@@ -214,17 +255,21 @@ export function getDefaultRouteModel(providerId: ProviderId, currentOpenAiModel:
     if (discovered.status === "ready" && discovered.models.length > 0) {
       return discovered.models[0].modelId;
     }
-    return ANTHROPIC_FALLBACK_MODELS[0]?.modelId ?? "sonnet";
+    return ANTHROPIC_FALLBACK_MODELS[0]?.modelId ?? "sonnet";
   }
   if (providerId === "google") {
     return GEMINI_FALLBACK_MODELS[0]?.modelId ?? GEMINI_DEFAULT_MODEL_ID;
   }
-  if (providerId === "local") {
-    const discovery = discoverProviderModels("local");
-    return discovery.models[0]?.modelId ?? "Local default";
-  }
+  if (providerId === "local") {
+    const discovery = discoverProviderModels("local");
+    return discovery.models[0]?.modelId ?? "Local default";
+  }
+  if (providerId === "mistral") {
+    const discovery = discoverProviderModels("mistral");
+    return discovery.models[0]?.modelId ?? "Vibe default";
+  }
   if (providerId === "antigravity") {
-    return ANTIGRAVITY_DEFAULT_MODEL_ID;
-  }
-  return currentOpenAiModel;
-}
+    return discoverProviderModels("antigravity").models[0]?.modelId ?? ANTIGRAVITY_DEFAULT_MODEL_ID;
+  }
+  return currentOpenAiModel;
+}

package/src/core/providerRuntime/types.ts

@@ -10,6 +10,7 @@ export type ProviderBackendKind =
   | "codex-cli-auth"
   | "gemini-cli-auth"
   | "claude-code-auth"
+  | "mistral-vibe-cli-auth"
   | "antigravity-cli-auth"
   | "openai-api-key"
   | "gemini-api-key"

package/src/index.tsx

@@ -18,11 +18,24 @@ import {
 import { resolveInkRenderInstance, type InkRenderInstance } from "./core/terminal/inkRenderReset.js";
 import { resetFrameLockForResize, wrapStdoutWithFrameLock } from "./core/terminal/frameLock.js";
 
-type RenderHandle = Pick<Instance, "clear" | "cleanup" | "waitUntilExit">;
-const KITTY_KEYBOARD_OPTIONS: RenderOptions["kittyKeyboard"] = {
-  mode: "auto",
-  flags: ["disambiguateEscapeCodes"],
-};
+type RenderHandle = Pick<Instance, "clear" | "cleanup" | "waitUntilExit">;
+
+export function resolveKittyKeyboardOptions(
+  env: Record<string, string | undefined>,
+): RenderOptions["kittyKeyboard"] | undefined {
+  // Ink's auto mode probes with CSI ? u. Kitty's response can race Ink's
+  // regular input listeners and leak into both the first frame and composer.
+  // A direct Kitty session is already known to support the protocol, so enable
+  // it without probing. Avoid protocol negotiation in all other terminals.
+  if ((env.TERM ?? "").toLowerCase() !== "xterm-kitty") {
+    return undefined;
+  }
+
+  return {
+    mode: "enabled",
+    flags: ["disambiguateEscapeCodes"],
+  };
+}
 
 export interface AppStdout {
   isTTY: boolean;
@@ -222,10 +235,11 @@ export function startApp({
   process.on("uncaughtException", handleFatal);
   process.on("unhandledRejection", handleFatal);
 
-  renderHandle = renderApp(<App launchArgs={launchArgs} />, {
-    kittyKeyboard: KITTY_KEYBOARD_OPTIONS,
-    stdout: wrappedStdout as any,
-  });
+  const kittyKeyboard = resolveKittyKeyboardOptions(env);
+  renderHandle = renderApp(<App launchArgs={launchArgs} />, {
+    ...(kittyKeyboard ? { kittyKeyboard } : {}),
+    stdout: wrappedStdout as any,
+  });
 
   // Resolve the real Ink class instance to get access to lastOutput,
   // onRender, calculateLayout, etc.  Gracefully degrades to null in tests.

package/src/test/runtimeTestUtils.ts

@@ -1,4 +1,11 @@
+import { mkdtempSync, rmSync, writeFileSync } from "node:fs";
+import { tmpdir } from "node:os";
+import { join } from "node:path";
 import { resolveRuntimeConfig, type RuntimeConfig, DEFAULT_RUNTIME_CONFIG, type ResolvedRuntimeConfig } from "../config/runtimeConfig.js";
+import type { ProviderId } from "../core/providerLauncher/types.js";
+import { resetAnthropicRouteValidationCacheForTests } from "../core/providerRuntime/anthropic.js";
+import { resetAntigravityRouteValidationCacheForTests } from "../core/providerRuntime/antigravity.js";
+import type { ProviderModel } from "../core/providerRuntime/types.js";
 
 export function makeResolvedRuntime(overrides: Partial<RuntimeConfig> = {}): ResolvedRuntimeConfig {
   return resolveRuntimeConfig({
@@ -12,3 +19,86 @@ export function makeResolvedRuntime(overrides: Partial<RuntimeConfig> = {}): Res
 }
 
 export const TEST_RUNTIME = makeResolvedRuntime();
+
+function agyModel(id: string, label: string): ProviderModel {
+  return {
+    id,
+    modelId: id,
+    label,
+    description: null,
+    defaultReasoningLevel: null,
+    supportedReasoningLevels: null,
+    source: "discovered",
+  };
+}
+
+/**
+ * The catalog `agy models` reports on a configured machine. Antigravity resolves
+ * its status, backend kind, and model labels from whatever discovery last found,
+ * so tests that assert on any of those need a catalog seeded rather than
+ * whatever happens to be installed.
+ */
+export const ANTIGRAVITY_FIXTURE_MODELS: readonly ProviderModel[] = [
+  agyModel("gemini-3.5-flash", "Gemini 3.5 Flash"),
+  agyModel("gemini-3.1-pro", "Gemini 3.1 Pro"),
+  agyModel("claude-sonnet-4-6", "Claude Sonnet 4.6"),
+  agyModel("claude-sonnet-4-6-think", "Claude Sonnet 4.6 (Thinking)"),
+  agyModel("gpt-oss-120b", "GPT-OSS 120B"),
+];
+
+/**
+ * Drops every provider's in-memory discovery result.
+ *
+ * Bun shares the module registry across test files, so a catalog discovered by
+ * one test (some probe the real `claude` / `agy` CLIs) otherwise survives into
+ * the next and takes precedence over both the cache and the fallback list —
+ * making assertions depend on file order and on what is installed locally.
+ */
+export function resetProviderDiscoveryState(): void {
+  resetAntigravityRouteValidationCacheForTests();
+  resetAnthropicRouteValidationCacheForTests();
+}
+
+/**
+ * Runs `fn` with HOME pointed at a throwaway directory holding only the provider
+ * model cache built from `seed`.
+ *
+ * Provider discovery reads `~/.codexa-model-cache.json`, so a test that calls it
+ * without this is asserting against the developer's own machine — it passes with
+ * a warm cache and fails on a cold one (or in CI). HOME is read per call (see
+ * `getProviderModelCacheFile`), so redirecting the env var here is enough.
+ *
+ * Antigravity's in-memory discovery is reset around the body as well: Bun shares
+ * the module registry across test files, so a catalog discovered by one file
+ * otherwise leaks into the next and takes precedence over the seeded cache,
+ * making results depend on file order. Seed exactly what the assertions need.
+ */
+export function withSeededModelCache<T>(
+  seed: Partial<Record<ProviderId, readonly ProviderModel[]>>,
+  fn: () => T,
+): T {
+  const tempHome = mkdtempSync(join(tmpdir(), "codexa-test-home-"));
+  const previousHome = process.env.HOME;
+  const previousUserProfile = process.env.USERPROFILE;
+  try {
+    process.env.HOME = tempHome;
+    delete process.env.USERPROFILE;
+    const providers = Object.fromEntries(
+      Object.entries(seed).map(([providerId, models]) => [providerId, { discoveredAt: 1, models }]),
+    );
+    writeFileSync(
+      join(tempHome, ".codexa-model-cache.json"),
+      `${JSON.stringify({ version: 1, providers }, null, 2)}\n`,
+      "utf8",
+    );
+    resetProviderDiscoveryState();
+    return fn();
+  } finally {
+    if (previousHome === undefined) delete process.env.HOME;
+    else process.env.HOME = previousHome;
+    if (previousUserProfile === undefined) delete process.env.USERPROFILE;
+    else process.env.USERPROFILE = previousUserProfile;
+    rmSync(tempHome, { recursive: true, force: true });
+    resetProviderDiscoveryState();
+  }
+}

package/src/ui/{ActivityBars.tsx → chrome/ActivityBars.tsx}

@@ -1,6 +1,6 @@
 import React from "react";
 import { Box, Text } from "ink";
-import { useTheme } from "./theme.js";
+import { useTheme } from "../theme.js";
 
 // ─── WaveBar ─────────────────────────────────────────────────────────────────
 // Audio-visualizer style wave. Renders as a single <Text> node to minimise

package/src/ui/{ActivityIndicator.tsx → chrome/ActivityIndicator.tsx}

@@ -1,7 +1,7 @@
 import React, { useState, useEffect } from "react";
 import { Text } from "ink";
-import type { UIState, ExternalCliStatus } from "../session/types.js";
-import { useTheme } from "./theme.js";
+import type { UIState, ExternalCliStatus } from "../../session/types.js";
+import { useTheme } from "../theme.js";
 
 const SPINNER_FRAMES = ["?", "?", "?", "?", "?", "?", "?", "?", "?", "?"];
 const STREAMING_FRAMES = ["?", "?", "?", "?"];
@@ -36,7 +36,7 @@ export function ActivityIndicator({ uiState, externalCliStatus = "idle" }: Activ
   let bold = false;
 
   if (isError) {
-    glyph = "�";
+    glyph = "�";
     color = theme.error;
     bold = true;
   } else if (isAction) {

package/src/ui/{AnimatedStatusText.tsx → chrome/AnimatedStatusText.tsx}

@@ -1,8 +1,8 @@
 import React, { useEffect, useState } from "react";
 import { Text } from "ink";
-import * as renderDebug from "../core/perf/renderDebug.js";
-import { useTheme } from "./theme.js";
-import { sanitizeTerminalOutput } from "../core/terminal/terminalSanitize.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
+import { useTheme } from "../theme.js";
+import { sanitizeTerminalOutput } from "../../core/terminal/terminalSanitize.js";
 import { BUSY_STATUS_FRAME_MS, BUSY_STATUS_FRAMES, getBusyStatusFrame } from "./busyStatusAnimation.js";
 
 interface AnimatedStatusTextProps {

package/src/ui/{AppShell.tsx → chrome/AppShell.tsx}

@@ -1,12 +1,12 @@
 import React, { memo, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useStdin } from "ink";
-import { useTheme } from "./theme.js";
-import type { RuntimeSummary } from "../config/runtimeConfig.js";
-import type { CodexAuthState } from "../core/auth/codexAuth.js";
-import { HEADER_CONFIG_DEFAULTS, type HeaderConfig } from "../config/settings.js";
-import * as renderDebug from "../core/perf/renderDebug.js";
-import type { Screen, TimelineEvent, UIState } from "../session/types.js";
-import { isBusy } from "../session/types.js";
+import { useTheme } from "../theme.js";
+import type { RuntimeSummary } from "../../config/runtimeConfig.js";
+import type { CodexAuthState } from "../../core/auth/codexAuth.js";
+import { HEADER_CONFIG_DEFAULTS, type HeaderConfig } from "../../config/settings.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
+import type { Screen, TimelineEvent, UIState } from "../../session/types.js";
+import { isBusy } from "../../session/types.js";
 import {
   ActivePanelLayoutContext,
   type ActivePanelLayout,
@@ -24,7 +24,7 @@ import {
   MIN_TERMINAL_COLS,
   MIN_TERMINAL_ROWS,
   type TerminalViewport,
-} from "./layout.js";
+} from "../layout.js";
 import {
   buildActiveRenderItems,
   buildStaticRenderItems,
@@ -33,9 +33,9 @@ import {
   Timeline,
   TimelineRowView,
   type TimelineItem,
-} from "./Timeline.js";
-import { buildNativeTranscriptParts, type NativeTranscriptRowItem, type TimelineRow } from "./timelineMeasure.js";
-import type { TerminalSelectionProfile } from "../core/terminal/terminalSelection.js";
+} from "../timeline/Timeline.js";
+import { buildNativeTranscriptParts, type NativeTranscriptRowItem, type TimelineRow } from "../timeline/timelineMeasure.js";
+import type { TerminalSelectionProfile } from "../../core/terminal/terminalSelection.js";
 import { MemoizedTopHeader, measureTopHeaderRows, type UpdateAvailableInfo } from "./TopHeader.js";
 
 const COMPACT_HEADER_TO_COMPOSER_GAP_ROWS = 1;

package/src/ui/{BottomComposer.tsx → chrome/BottomComposer.tsx}

@@ -1,9 +1,9 @@
 import React, { memo, useEffect, useMemo, useRef, useState } from "react";
 import { Box, Text, useFocus, useInput, useStdin } from "ink";
-import { formatContextCompact } from "../core/providerRuntime/contextMetadata.js";
-import type { ModelSpec } from "../core/models/modelSpecs.js";
-import type { ExternalCliStatus, UIState } from "../session/types.js";
-import { FOCUS_IDS } from "./focus.js";
+import { formatContextCompact } from "../../core/providerRuntime/contextMetadata.js";
+import type { ModelSpec } from "../../core/models/modelSpecs.js";
+import type { ExternalCliStatus, UIState } from "../../session/types.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import {
   createInputViewport,
   deleteInputBackward,
@@ -14,22 +14,22 @@ import {
   moveCursorRight,
   normalizeInputText,
   normalizeCursorOffset,
-} from "./inputBuffer.js";
-import { getModeDisplaySpec } from "./modeDisplay.js";
+} from "../input/inputBuffer.js";
+import { getModeDisplaySpec } from "../render/modeDisplay.js";
 import { ActivityIndicator } from "./ActivityIndicator.js";
 import { measureRunFooterRows, MemoizedRunFooter } from "./RunFooter.js";
-import { useTheme } from "./theme.js";
-import { clampVisualText, getShellWidth, type Layout } from "./layout.js";
-import { getTextWidth, splitTextAtColumn } from "./textLayout.js";
-import { useThrottledValue } from "./useThrottledValue.js";
-import { sanitizeTerminalOutput } from "../core/terminal/terminalSanitize.js";
-import { getStdinDebugState, traceInputDebug } from "../core/debug/inputDebug.js";
-import * as renderDebug from "../core/perf/renderDebug.js";
+import { useTheme } from "../theme.js";
+import { clampVisualText, getShellWidth, type Layout } from "../layout.js";
+import { getTextWidth, splitTextAtColumn } from "../render/textLayout.js";
+import { useThrottledValue } from "../useThrottledValue.js";
+import { sanitizeTerminalOutput } from "../../core/terminal/terminalSanitize.js";
+import { getStdinDebugState, traceInputDebug } from "../../core/debug/inputDebug.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
 import { AnimatedStatusText } from "./AnimatedStatusText.js";
 import { isAnimatedBusyState } from "./busyStatusAnimation.js";
 import { Spinner } from "./Spinner.js";
-import type { TerminalSelectionProfile } from "../core/terminal/terminalSelection.js";
-import { getSlashCommandSuggestions, type CommandSuggestion } from "./slashCommands.js";
+import type { TerminalSelectionProfile } from "../../core/terminal/terminalSelection.js";
+import { getSlashCommandSuggestions, type CommandSuggestion } from "../input/slashCommands.js";
 
 // ─── Types & constants ────────────────────────────────────────────────────────
 

package/src/ui/{DashCard.tsx → chrome/DashCard.tsx}

@@ -1,8 +1,8 @@
 import React from "react";
 import type { ReactNode } from "react";
 import { Box, Text } from "ink";
-import { useTheme } from "./theme.js";
-import { getVisualWidth } from "./layout.js";
+import { useTheme } from "../theme.js";
+import { getVisualWidth } from "../layout.js";
 
 interface DashCardProps {
   cols: number;

package/src/ui/{RunFooter.tsx → chrome/RunFooter.tsx}

@@ -1,8 +1,8 @@
 import React, { memo } from "react";
 import { Box, Text } from "ink";
-import type { UIState } from "../session/types.js";
-import * as renderDebug from "../core/perf/renderDebug.js";
-import { useTheme } from "./theme.js";
+import type { UIState } from "../../session/types.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
+import { useTheme } from "../theme.js";
 import { AnimatedStatusText } from "./AnimatedStatusText.js";
 import { isAnimatedBusyState } from "./busyStatusAnimation.js";
 

package/src/ui/{RuntimeStatusBar.tsx → chrome/RuntimeStatusBar.tsx}

@@ -1,8 +1,8 @@
 import React from "react";
 import { Box, Text } from "ink";
-import { useTheme } from "./theme.js";
-import type { Layout } from "./layout.js";
-import * as renderDebug from "../core/perf/renderDebug.js";
+import { useTheme } from "../theme.js";
+import type { Layout } from "../layout.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
 
 export type RuntimeAvailability = "available" | "checking" | "reconnecting" | "unavailable" | "unknown";
 

package/src/ui/{Spinner.tsx → chrome/Spinner.tsx}

@@ -1,6 +1,6 @@
 import React, { startTransition, useEffect, useState } from "react";
 import { Text } from "ink";
-import { useTheme } from "./theme.js";
+import { useTheme } from "../theme.js";
 
 const frames = ["⠋", "⠙", "⠹", "⠸", "⠼", "⠴", "⠦", "⠧", "⠇", "⠏"];
 

package/src/ui/{TopHeader.tsx → chrome/TopHeader.tsx}

@@ -1,15 +1,15 @@
 import React, { memo } from "react";
 import { Box, Text } from "ink";
-import { HEADER_CONFIG_DEFAULTS, type HeaderConfig } from "../config/settings.js";
-import { formatCodexaBrandLabel } from "../core/version/channel.js";
-import { formatVersionLabel } from "../core/version/updateCheck.js";
-import type { RuntimeSummary } from "../config/runtimeConfig.js";
-import type { CodexAuthState } from "../core/auth/codexAuth.js";
-import { getAuthStateLabel } from "../core/auth/codexAuth.js";
-import * as renderDebug from "../core/perf/renderDebug.js";
-import { useTheme } from "./theme.js";
-import { clampVisualText, isDecorativeLayoutMode, type Layout, useAppLayoutBudget } from "./layout.js";
-import { getTextWidth } from "./textLayout.js";
+import { HEADER_CONFIG_DEFAULTS, type HeaderConfig } from "../../config/settings.js";
+import { formatCodexaBrandLabel } from "../../core/version/channel.js";
+import { formatVersionLabel } from "../../core/version/updateCheck.js";
+import type { RuntimeSummary } from "../../config/runtimeConfig.js";
+import type { CodexAuthState } from "../../core/auth/codexAuth.js";
+import { getAuthStateLabel } from "../../core/auth/codexAuth.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
+import { useTheme } from "../theme.js";
+import { clampVisualText, isDecorativeLayoutMode, type Layout, useAppLayoutBudget } from "../layout.js";
+import { getTextWidth } from "../render/textLayout.js";
 import { UPDATE_CARD_ROWS, UpdateAvailableCard } from "./UpdateAvailableCard.js";
 import {
   LOGO_LARGE,
@@ -18,7 +18,7 @@ import {
   LOGO_LARGE_MIN_COLS,
   LOGO_LARGE_MIN_ROWS,
   getLogoWidth,
-} from "./logoVariants.js";
+} from "../render/logoVariants.js";
 
 // Re-exported for backward compatibility with existing tests.
 export const HEADER_WORDMARK_LINES = LOGO_LARGE;
@@ -434,4 +434,4 @@ export const MemoizedTopHeader = memo(TopHeader, (prev, next) => {
 export const MIN_LOGO_TERMINAL_WIDTH = LOGO_COMPACT_MIN_COLS;
 
 // Re-export for consumers that reference these constants directly.
-export { LOGO_LARGE_MIN_COLS, LOGO_MEDIUM_MIN_COLS, LOGO_COMPACT_MIN_COLS } from "./logoVariants.js";
+export { LOGO_LARGE_MIN_COLS, LOGO_MEDIUM_MIN_COLS, LOGO_COMPACT_MIN_COLS } from "../render/logoVariants.js";

package/src/ui/{UpdateAvailableCard.tsx → chrome/UpdateAvailableCard.tsx}

@@ -1,8 +1,8 @@
 import React from "react";
 import { Box, Text } from "ink";
-import { CODEXA_UPDATE_COMMAND, formatVersionLabel } from "../core/version/updateCheck.js";
-import { clampVisualText } from "./layout.js";
-import { useTheme } from "./theme.js";
+import { CODEXA_UPDATE_COMMAND, formatVersionLabel } from "../../core/version/updateCheck.js";
+import { clampVisualText } from "../layout.js";
+import { useTheme } from "../theme.js";
 
 export const UPDATE_CARD_CONTENT_ROWS = 4; // title + available + using + command
 export const UPDATE_CARD_ROWS = UPDATE_CARD_CONTENT_ROWS + 2; // +2 for top/bottom border rows

package/src/ui/{commandNormalize.ts → input/commandNormalize.ts}

@@ -1,4 +1,4 @@
-import { formatTerminalAnswerInline } from "./terminalAnswerFormat.js";
+import { formatTerminalAnswerInline } from "../render/terminalAnswerFormat.js";
 
 function stripOuterQuotes(s: string): string {
   if ((s.startsWith("'") && s.endsWith("'")) || (s.startsWith('"') && s.endsWith('"'))) {

package/src/ui/{focus.ts → input/focus.ts}

@@ -1,4 +1,4 @@
-import type { Screen } from "../session/types.js";
+import type { Screen } from "../../session/types.js";
 
 export const FOCUS_IDS = {
   composer: "composer",