@golba98/codexa 1.0.4 → 1.0.5

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

@@ -1,6 +1,6 @@
-import type { WrappedTextRow } from "./textLayout.js";
-import { getTextWidth, normalizeLineBreaks, wrapTextRows } from "./textLayout.js";
-import { sanitizeTerminalInput } from "../core/terminal/terminalSanitize.js";
+import type { WrappedTextRow } from "../render/textLayout.js";
+import { getTextWidth, normalizeLineBreaks, wrapTextRows } from "../render/textLayout.js";
+import { sanitizeTerminalInput } from "../../core/terminal/terminalSanitize.js";
 
 export type WrappedInputRow = WrappedTextRow;
 

package/src/ui/{AttachmentImportPanel.tsx → panels/AttachmentImportPanel.tsx}

@@ -1,7 +1,7 @@
 import React from "react";
 import { Box, Text, useFocus, useInput } from "ink";
 import path from "node:path";
-import { useTheme } from "./theme.js";
+import { useTheme } from "../theme.js";
 
 export interface PendingImportFile {
   srcPath: string;

package/src/ui/{AuthPanel.tsx → panels/AuthPanel.tsx}

@@ -1,10 +1,10 @@
 import React from "react";
 import { Box, Text, useFocus, useInput } from "ink";
-import { AUTH_PREFERENCES, formatAuthPreferenceLabel } from "../config/settings.js";
-import type { CodexAuthProbeResult } from "../core/auth/codexAuth.js";
-import { getAuthStateLabel } from "../core/auth/codexAuth.js";
-import type { BackendProvider } from "../core/providers/types.js";
-import { useTheme } from "./theme.js";
+import { AUTH_PREFERENCES, formatAuthPreferenceLabel } from "../../config/settings.js";
+import type { CodexAuthProbeResult } from "../../core/auth/codexAuth.js";
+import { getAuthStateLabel } from "../../core/auth/codexAuth.js";
+import type { BackendProvider } from "../../core/providers/types.js";
+import { useTheme } from "../theme.js";
 
 interface AuthPanelProps {
   focusId: string;

package/src/ui/{BackendPicker.tsx → panels/BackendPicker.tsx}

@@ -1,6 +1,6 @@
 import React from "react";
-import { AVAILABLE_BACKENDS } from "../config/settings.js";
-import { FOCUS_IDS } from "./focus.js";
+import { AVAILABLE_BACKENDS } from "../../config/settings.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import { SelectionPanel } from "./SelectionPanel.js";
 
 interface BackendPickerProps {

package/src/ui/{ModePicker.tsx → panels/ModePicker.tsx}

@@ -1,5 +1,5 @@
-import { AVAILABLE_MODES } from "../config/settings.js";
-import { FOCUS_IDS } from "./focus.js";
+import { AVAILABLE_MODES } from "../../config/settings.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import { SelectionPanel } from "./SelectionPanel.js";
 
 interface ModePickerProps {

package/src/ui/{ModelPicker.tsx → panels/ModelPicker.tsx}

@@ -1,5 +1,5 @@
-import { type CodexModelCapability } from "../core/models/codexModelCapabilities.js";
-import { FOCUS_IDS } from "./focus.js";
+import { type CodexModelCapability } from "../../core/models/codexModelCapabilities.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import { SelectionPanel } from "./SelectionPanel.js";
 
 interface ModelPickerProps {

package/src/ui/{ModelPickerScreen.tsx → panels/ModelPickerScreen.tsx}

@@ -4,10 +4,10 @@ import {
   type CodexModelCapability,
   type ReasoningEffortCapability,
   normalizeReasoningForModelCapabilities,
-} from "../core/models/codexModelCapabilities.js";
-import { formatReasoningLabel } from "../config/settings.js";
-import { traceInputDebug } from "../core/debug/inputDebug.js";
-import { FOCUS_IDS } from "./focus.js";
+} from "../../core/models/codexModelCapabilities.js";
+import { formatReasoningLabel } from "../../config/settings.js";
+import { traceInputDebug } from "../../core/debug/inputDebug.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import {
   clampVisualText,
   getShellWidth,
@@ -19,10 +19,10 @@ import {
   type ActivePanelLayout,
   type PanelLayout,
   usePanelLayout,
-} from "./layout.js";
-import { calculateListWindow } from "./layoutListWindow.js";
-import { useTheme } from "./theme.js";
-import type { GeminiModelSelection } from "../core/providerRuntime/types.js";
+} from "../layout.js";
+import { calculateListWindow } from "../timeline/layoutListWindow.js";
+import { useTheme } from "../theme.js";
+import type { GeminiModelSelection } from "../../core/providerRuntime/types.js";
 
 // ─── Types & helpers ─────────────────────────────────────────────────────────
 
@@ -498,7 +498,9 @@ export function ModelPickerScreen({
         >
           {models.length === 0 ? (
             <Text color={theme.textMuted}>
-              {isLoading ? "Discovering models from the Codex runtime..." : (emptyMessage ?? "No models available.")}
+              {isLoading
+                ? `Discovering models from ${activeProviderLabel === "OpenAI" ? "the Codex runtime" : activeProviderLabel}...`
+                : (emptyMessage ?? "No models available.")}
             </Text>
           ) : (
             visibleModels.map((model, index) => {

package/src/ui/{ModelReasoningPicker.tsx → panels/ModelReasoningPicker.tsx}

@@ -4,11 +4,11 @@ import {
   type CodexModelCapability,
   type ReasoningEffortCapability,
   normalizeReasoningForModelCapabilities,
-} from "../core/models/codexModelCapabilities.js";
-import { formatReasoningLabel } from "../config/settings.js";
-import { traceInputDebug } from "../core/debug/inputDebug.js";
-import { FOCUS_IDS } from "./focus.js";
-import { useTheme } from "./theme.js";
+} from "../../core/models/codexModelCapabilities.js";
+import { formatReasoningLabel } from "../../config/settings.js";
+import { traceInputDebug } from "../../core/debug/inputDebug.js";
+import { FOCUS_IDS } from "../input/focus.js";
+import { useTheme } from "../theme.js";
 
 // ─── Types & helpers ─────────────────────────────────────────────────────────
 

package/src/ui/{Panel.tsx → panels/Panel.tsx}

@@ -1,6 +1,6 @@
 import React from "react";
 import { Box, Text } from "ink";
-import { useTheme } from "./theme.js";
+import { useTheme } from "../theme.js";
 
 interface PanelProps {
   cols: number;

package/src/ui/{PermissionsPanel.tsx → panels/PermissionsPanel.tsx}

@@ -1,10 +1,10 @@
-import type { ResolvedRuntimeConfig, RuntimeConfig } from "../config/runtimeConfig.js";
+import type { ResolvedRuntimeConfig, RuntimeConfig } from "../../config/runtimeConfig.js";
 import {
   formatApprovalPolicyLabel,
   formatNetworkAccessLabel,
   formatSandboxModeLabel,
-} from "../config/runtimeConfig.js";
-import { FOCUS_IDS } from "./focus.js";
+} from "../../config/runtimeConfig.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import { SelectionPanel } from "./SelectionPanel.js";
 
 export type PermissionsPanelAction =

package/src/ui/{PlanActionPicker.tsx → panels/PlanActionPicker.tsx}

@@ -1,7 +1,7 @@
 import React, { useEffect, useRef, useState } from "react";
 import { Box, Text, useFocus, useInput, useStdin } from "ink";
-import { FOCUS_IDS } from "./focus.js";
-import { useTheme } from "./theme.js";
+import { FOCUS_IDS } from "../input/focus.js";
+import { useTheme } from "../theme.js";
 
 export type PlanActionValue = "implement" | "revise" | "cancel";
 

package/src/ui/{PlanReviewPanel.tsx → panels/PlanReviewPanel.tsx}

@@ -1,10 +1,10 @@
 import { useMemo } from "react";
 import { Box, Text } from "ink";
-import { normalizePlanReviewMarkdown } from "../core/workspace/planStorage.js";
-import { getUsableShellWidth } from "./layout.js";
-import { parseMarkdown } from "./Markdown.js";
-import { getTextWidth } from "./textLayout.js";
-import { useTheme } from "./theme.js";
+import { normalizePlanReviewMarkdown } from "../../core/workspace/planStorage.js";
+import { getUsableShellWidth } from "../layout.js";
+import { parseMarkdown } from "../render/Markdown.js";
+import { getTextWidth } from "../render/textLayout.js";
+import { useTheme } from "../theme.js";
 
 // ─── Types ────────────────────────────────────────────────────────────────────
 

package/src/ui/{ProviderPicker.tsx → panels/ProviderPicker.tsx}

@@ -1,8 +1,8 @@
 import React, { useMemo, useState } from "react";
 import { Box, Text, useFocus, useInput } from "ink";
-import type { ProviderConfig, ProviderId, ProviderPickerAction } from "../core/providerLauncher/types.js";
-import { traceInputDebug } from "../core/debug/inputDebug.js";
-import { FOCUS_IDS } from "./focus.js";
+import type { ProviderConfig, ProviderId, ProviderPickerAction } from "../../core/providerLauncher/types.js";
+import { traceInputDebug } from "../../core/debug/inputDebug.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import {
   clampVisualText,
   getShellWidth,
@@ -14,9 +14,9 @@ import {
   type ActivePanelLayout,
   type PanelLayout,
   usePanelLayout,
-} from "./layout.js";
-import { calculateListWindow } from "./layoutListWindow.js";
-import { useTheme } from "./theme.js";
+} from "../layout.js";
+import { calculateListWindow } from "../timeline/layoutListWindow.js";
+import { useTheme } from "../theme.js";
 
 // ─── Types & helpers ─────────────────────────────────────────────────────────
 
@@ -247,7 +247,9 @@ export function ProviderPicker({
       return;
     }
     if (key.return && selectedProvider) {
-      onAction(selectedProvider.id, actions[actionIndex]?.value ?? "cancel");
+      const action = actions[actionIndex];
+      if (action?.disabledReason) return;
+      onAction(selectedProvider.id, action?.value ?? "cancel");
     }
   }, { isActive: isFocused });
 

package/src/ui/{ReasoningPicker.tsx → panels/ReasoningPicker.tsx}

@@ -1,7 +1,7 @@
 import React from "react";
-import { type ReasoningEffortCapability } from "../core/models/codexModelCapabilities.js";
-import { formatReasoningLabel } from "../config/settings.js";
-import { FOCUS_IDS } from "./focus.js";
+import { type ReasoningEffortCapability } from "../../core/models/codexModelCapabilities.js";
+import { formatReasoningLabel } from "../../config/settings.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import { SelectionPanel } from "./SelectionPanel.js";
 
 interface ReasoningPickerProps {

package/src/ui/{SelectionPanel.tsx → panels/SelectionPanel.tsx}

@@ -1,7 +1,7 @@
 import React from "react";
 import { Box, Text, useFocus, useInput } from "ink";
 import SelectInput from "ink-select-input";
-import { useTheme } from "./theme.js";
+import { useTheme } from "../theme.js";
 
 interface SelectionPanelProps {
   focusId: string;

package/src/ui/{SettingsPanel.tsx → panels/SettingsPanel.tsx}

@@ -1,8 +1,8 @@
 import React, { useMemo, useState } from "react";
 import { Box, Text, useFocus, useInput } from "ink";
-import type { SettingDefinition } from "../config/settings.js";
-import type { FocusTargetId } from "./focus.js";
-import { useTheme } from "./theme.js";
+import type { SettingDefinition } from "../../config/settings.js";
+import type { FocusTargetId } from "../input/focus.js";
+import { useTheme } from "../theme.js";
 
 export interface SettingsPanelProps<TKey extends string> {
   focusId: FocusTargetId;

package/src/ui/{TextEntryPanel.tsx → panels/TextEntryPanel.tsx}

@@ -1,8 +1,8 @@
 import React, { useMemo, useState } from "react";
 import { Box, Text, useFocus, useInput } from "ink";
-import type { FocusTargetId } from "./focus.js";
-import { useTheme } from "./theme.js";
-import { stripMouseEscapes } from "./inputBuffer.js";
+import type { FocusTargetId } from "../input/focus.js";
+import { useTheme } from "../theme.js";
+import { stripMouseEscapes } from "../input/inputBuffer.js";
 
 interface TextEntryPanelProps {
   focusId: FocusTargetId;

package/src/ui/{ThemePicker.tsx → panels/ThemePicker.tsx}

@@ -1,6 +1,6 @@
 import React from "react";
-import { AVAILABLE_THEMES, formatThemeLabel } from "../config/settings.js";
-import { FOCUS_IDS } from "./focus.js";
+import { AVAILABLE_THEMES, formatThemeLabel } from "../../config/settings.js";
+import { FOCUS_IDS } from "../input/focus.js";
 import { SelectionPanel } from "./SelectionPanel.js";
 
 interface ThemePickerProps {

package/src/ui/{UpdatePromptPanel.tsx → panels/UpdatePromptPanel.tsx}

@@ -1,8 +1,8 @@
 import React, { useEffect, useRef, useState } from "react";
 import { Box, Text, useFocus, useInput } from "ink";
 import { spawn } from "child_process";
-import { useTheme } from "./theme.js";
-import { CODEXA_NPM_PACKAGE, CODEXA_UPDATE_COMMAND, formatVersionLabel } from "../core/version/updateCheck.js";
+import { useTheme } from "../theme.js";
+import { CODEXA_NPM_PACKAGE, CODEXA_UPDATE_COMMAND, formatVersionLabel } from "../../core/version/updateCheck.js";
 
 type Phase = "menu" | "running" | "done" | "error";
 

package/src/ui/{Markdown.tsx → render/Markdown.tsx}

@@ -1,7 +1,7 @@
 import React from "react";
 import { Box, Text } from "ink";
-import { useTheme } from "./theme.js";
-import { Panel } from "./Panel.js";
+import { useTheme } from "../theme.js";
+import { Panel } from "../panels/Panel.js";
 import { maybeRenderDiff, type DiffRenderLineType } from "./diffRenderer.js";
 import { formatLocalPathForTerminal, formatTerminalAnswerInline } from "./terminalAnswerFormat.js";
 

package/src/ui/{diffRenderer.ts → render/diffRenderer.ts}

@@ -1,4 +1,4 @@
-import { sanitizeTerminalOutput } from "../core/terminal/terminalSanitize.js";
+import { sanitizeTerminalOutput } from "../../core/terminal/terminalSanitize.js";
 
 export type DiffRenderLineType = "file" | "hunk" | "add" | "remove" | "context" | "meta";
 

package/src/ui/{modeDisplay.ts → render/modeDisplay.ts}

@@ -1,5 +1,5 @@
-import { formatModeLabel } from "../config/settings.js";
-import type { Theme } from "./theme.js";
+import { formatModeLabel } from "../../config/settings.js";
+import type { Theme } from "../theme.js";
 
 export interface ModeDisplaySpec {
   label: string;

package/src/ui/{outputPipeline.ts → render/outputPipeline.ts}

@@ -1,5 +1,5 @@
-import { isNoiseLine } from "../core/providers/codexTranscript.js";
-import { sanitizeTerminalOutput } from "../core/terminal/terminalSanitize.js";
+import { isNoiseLine } from "../../core/providers/codexTranscript.js";
+import { sanitizeTerminalOutput } from "../../core/terminal/terminalSanitize.js";
 import { parseMarkdown, type Segment } from "./Markdown.js";
 
 /**

package/src/ui/{runtimeDisplay.ts → render/runtimeDisplay.ts}

@@ -1,11 +1,11 @@
-import { formatModeLabel, formatReasoningLabel } from "../config/settings.js";
-import type { RuntimeSummary } from "../config/runtimeConfig.js";
-import type { CodexModelCapability } from "../core/models/codexModelCapabilities.js";
-import type { ModelSpec } from "../core/models/modelSpecs.js";
-import type { ModelContextMetadata } from "../core/providerRuntime/contextMetadata.js";
-import { contextMetadataToModelSpec, formatContextCompact } from "../core/providerRuntime/contextMetadata.js";
-import type { ActiveProviderRoute } from "../core/providerRuntime/types.js";
-import { getAntigravityModelLabel } from "../core/providerRuntime/antigravity.js";
+import { formatModeLabel, formatReasoningLabel } from "../../config/settings.js";
+import type { RuntimeSummary } from "../../config/runtimeConfig.js";
+import type { CodexModelCapability } from "../../core/models/codexModelCapabilities.js";
+import type { ModelSpec } from "../../core/models/modelSpecs.js";
+import type { ModelContextMetadata } from "../../core/providerRuntime/contextMetadata.js";
+import { contextMetadataToModelSpec, formatContextCompact } from "../../core/providerRuntime/contextMetadata.js";
+import type { ActiveProviderRoute } from "../../core/providerRuntime/types.js";
+import { getAntigravityModelLabel } from "../../core/providerRuntime/antigravity.js";
 
 export interface ActiveRuntimeDisplayInput {
   route: ActiveProviderRoute;
@@ -29,6 +29,7 @@ const PROVIDER_DISPLAY: Record<string, string> = {
   openai: "OpenAI Codex CLI",
   anthropic: "Claude Code CLI",
   google: "Gemini CLI",
+  mistral: "Mistral Vibe CLI",
   local: "Local",
   antigravity: "Antigravity CLI",
 };

package/src/ui/{ActionRequiredBlock.tsx → timeline/ActionRequiredBlock.tsx}

@@ -1,8 +1,8 @@
 import React from "react";
 import { Box, Text } from "ink";
-import { getUsableShellWidth } from "./layout.js";
-import { wrapPlainText } from "./textLayout.js";
-import { useTheme } from "./theme.js";
+import { getUsableShellWidth } from "../layout.js";
+import { wrapPlainText } from "../render/textLayout.js";
+import { useTheme } from "../theme.js";
 
 interface ActionRequiredBlockProps {
   cols: number;

package/src/ui/{AgentBlock.tsx → timeline/AgentBlock.tsx}

@@ -1,21 +1,21 @@
 import React, { memo, useDeferredValue, useMemo } from "react";
 import { Box, Text } from "ink";
-import type { AssistantEvent, RunEvent } from "../session/types.js";
-import { getAssistantContent } from "../session/types.js";
-import { MemoizedRenderMessage } from "./Markdown.js";
-import { getUsableShellWidth } from "./layout.js";
-import { useTheme } from "./theme.js";
-import { wrapPlainText } from "./textLayout.js";
-import { RUN_OUTPUT_TRUNCATION_NOTICE } from "../session/chatLifecycle.js";
-import { sanitizeTerminalOutput } from "../core/terminal/terminalSanitize.js";
+import type { AssistantEvent, RunEvent } from "../../session/types.js";
+import { getAssistantContent } from "../../session/types.js";
+import { MemoizedRenderMessage } from "../render/Markdown.js";
+import { getUsableShellWidth } from "../layout.js";
+import { useTheme } from "../theme.js";
+import { wrapPlainText } from "../render/textLayout.js";
+import { RUN_OUTPUT_TRUNCATION_NOTICE } from "../../session/chatLifecycle.js";
+import { sanitizeTerminalOutput } from "../../core/terminal/terminalSanitize.js";
 import {
   sanitizeOutput,
   sanitizeStreamChunk,
   normalizeOutput,
   classifyOutput,
   formatForBox,
-} from "./outputPipeline.js";
-import { DashCard } from "./DashCard.js";
+} from "../render/outputPipeline.js";
+import { DashCard } from "../chrome/DashCard.js";
 
 
 function formatDuration(ms: number): string {

package/src/ui/{StaticIntroItem.tsx → timeline/StaticIntroItem.tsx}

@@ -1,7 +1,7 @@
 import React from "react";
 import { Box } from "ink";
-import type { CodexAuthState } from "../core/auth/codexAuth.js";
-import { getShellWidth, type Layout, type StartupHeaderMode } from "./layout.js";
+import type { CodexAuthState } from "../../core/auth/codexAuth.js";
+import { getShellWidth, type Layout, type StartupHeaderMode } from "../layout.js";
 import { buildIntroRenderItem, TimelineRowView } from "./Timeline.js";
 import type { TimelineRow } from "./timelineMeasure.js";
 import { buildTimelineSnapshot } from "./timelineMeasure.js";

package/src/ui/{ThinkingBlock.tsx → timeline/ThinkingBlock.tsx}

@@ -1,9 +1,9 @@
 import React from "react";
 import { Box, Text } from "ink";
-import type { RunEvent } from "../session/types.js";
-import { clampVisualText, getUsableShellWidth } from "./layout.js";
-import { useTheme } from "./theme.js";
-import { DashCard } from "./DashCard.js";
+import type { RunEvent } from "../../session/types.js";
+import { clampVisualText, getUsableShellWidth } from "../layout.js";
+import { useTheme } from "../theme.js";
+import { DashCard } from "../chrome/DashCard.js";
 import {
   formatProgressBlockBodyLines,
   getProgressUpdateCount,

package/src/ui/{Timeline.tsx → timeline/Timeline.tsx}

@@ -10,17 +10,17 @@ import {
   type TimelineEvent,
   type UIState,
   type UserPromptEvent,
-} from "../session/types.js";
-import { APP_VERSION } from "../config/settings.js";
-import { formatCodexaVersionLabel } from "../core/version/channel.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 { getShellWidth, type Layout, type StartupHeaderMode } from "./layout.js";
+} from "../../session/types.js";
+import { APP_VERSION } from "../../config/settings.js";
+import { formatCodexaVersionLabel } from "../../core/version/channel.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 { getShellWidth, type Layout, type StartupHeaderMode } from "../layout.js";
 import type { TimelineRow, TimelineSnapshot, TimelineTone } from "./timelineMeasure.js";
 import { buildStableTimelineSnapshot, buildTimelineSnapshot } from "./timelineMeasure.js";
 import { resolveTurnRunPhase, type TurnOpacity, type TurnRunPhase } from "./TurnGroup.js";
-import { useTheme } from "./theme.js";
+import { useTheme } from "../theme.js";
 
 // ─── Types & constants ────────────────────────────────────────────────────────
 

package/src/ui/{TranscriptShell.tsx → timeline/TranscriptShell.tsx}

@@ -1,9 +1,9 @@
 import React, { memo, useEffect, useMemo, useRef } from "react";
 import { Box, Static } from "ink";
-import type { RuntimeSummary } from "../config/runtimeConfig.js";
-import type { CodexAuthState } from "../core/auth/codexAuth.js";
-import * as renderDebug from "../core/perf/renderDebug.js";
-import type { TimelineEvent, UIState } from "../session/types.js";
+import type { RuntimeSummary } from "../../config/runtimeConfig.js";
+import type { CodexAuthState } from "../../core/auth/codexAuth.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
+import type { TimelineEvent, UIState } from "../../session/types.js";
 import {
   buildActiveRenderItems,
   buildIntroRenderItem,
@@ -12,13 +12,13 @@ import {
   TimelineRowView,
   type TimelineItem,
 } from "./Timeline.js";
-import { getShellHeight, getShellWidth, resolveStartupHeaderMode, type TerminalViewport } from "./layout.js";
+import { getShellHeight, getShellWidth, resolveStartupHeaderMode, type TerminalViewport } from "../layout.js";
 import {
   buildNativeTranscriptParts,
   type NativeTranscriptRowItem,
   type TimelineRow,
 } from "./timelineMeasure.js";
-import { LOGO_COMPACT, LOGO_COMPACT_MIN_COLS, LOGO_LARGE, LOGO_MEDIUM, selectLogoVariant } from "./logoVariants.js";
+import { LOGO_COMPACT, LOGO_COMPACT_MIN_COLS, LOGO_LARGE, LOGO_MEDIUM, selectLogoVariant } from "../render/logoVariants.js";
 
 type TranscriptStaticItem = NativeTranscriptRowItem & { type: "rows" };
 type StaticRenderItem = TranscriptStaticItem;

package/src/ui/{TurnGroup.tsx → timeline/TurnGroup.tsx}

@@ -9,30 +9,30 @@ import type {
   RunToolActivity,
   UIState,
   UserPromptEvent,
-} from "../session/types.js";
-import { getAssistantContent, getResponseSegmentText, getRunPlanText } from "../session/types.js";
-import { formatTerminalAnswerInline } from "./terminalAnswerFormat.js";
+} from "../../session/types.js";
+import { getAssistantContent, getResponseSegmentText, getRunPlanText } from "../../session/types.js";
+import { formatTerminalAnswerInline } from "../render/terminalAnswerFormat.js";
 import { ActionRequiredBlock } from "./ActionRequiredBlock.js";
-import { DashCard } from "./DashCard.js";
-import { useTheme } from "./theme.js";
-import { sanitizeTerminalOutput } from "../core/terminal/terminalSanitize.js";
-import { wrapPlainText, wrapCommandText } from "./textLayout.js";
+import { DashCard } from "../chrome/DashCard.js";
+import { useTheme } from "../theme.js";
+import { sanitizeTerminalOutput } from "../../core/terminal/terminalSanitize.js";
+import { wrapPlainText, wrapCommandText } from "../render/textLayout.js";
 import { selectVisibleRunActivity } from "./runActivityView.js";
-import type { RunFileActivity } from "../core/workspace/workspaceActivity.js";
-import { RUN_OUTPUT_TRUNCATION_NOTICE } from "../session/chatLifecycle.js";
+import type { RunFileActivity } from "../../core/workspace/workspaceActivity.js";
+import { RUN_OUTPUT_TRUNCATION_NOTICE } from "../../session/chatLifecycle.js";
 import { formatProgressBlockBodyLines } from "./progressEntries.js";
-import { getUsableShellWidth, transcriptContentIndent } from "./layout.js";
-import { MemoizedRenderMessage } from "./Markdown.js";
+import { getUsableShellWidth, transcriptContentIndent } from "../layout.js";
+import { MemoizedRenderMessage } from "../render/Markdown.js";
 import {
   sanitizeOutput,
   sanitizeStreamChunk,
   normalizeOutput,
   classifyOutput,
   formatForBox,
-} from "./outputPipeline.js";
-import { normalizeCommand, getFriendlyActionLabel } from "./commandNormalize.js";
-import * as renderDebug from "../core/perf/renderDebug.js";
-import { normalizePlanReviewMarkdown } from "../core/workspace/planStorage.js";
+} from "../render/outputPipeline.js";
+import { normalizeCommand, getFriendlyActionLabel } from "../input/commandNormalize.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
+import { normalizePlanReviewMarkdown } from "../../core/workspace/planStorage.js";
 
 export type TurnOpacity = "active" | "recent" | "dim";
 

package/src/ui/{progressEntries.ts → timeline/progressEntries.ts}

@@ -1,6 +1,6 @@
-import type { RunProgressBlock, RunProgressEntry, RunProgressSource } from "../session/types.js";
-import { sanitizeTerminalOutput } from "../core/terminal/terminalSanitize.js";
-import { wrapPlainText } from "./textLayout.js";
+import type { RunProgressBlock, RunProgressEntry, RunProgressSource } from "../../session/types.js";
+import { sanitizeTerminalOutput } from "../../core/terminal/terminalSanitize.js";
+import { wrapPlainText } from "../render/textLayout.js";
 
 // ─── Types ───────────────────────────────────────────────────────────────────
 

package/src/ui/{runActivityView.ts → timeline/runActivityView.ts}

@@ -1,4 +1,4 @@
-import type { RunEvent } from "../session/types.js";
+import type { RunEvent } from "../../session/types.js";
 
 const MAX_VISIBLE_ACTIVE_ACTIVITY = 6;
 const MAX_VISIBLE_SUMMARY_ACTIVITY = 4;

package/src/ui/{timelineMeasure.ts → timeline/timelineMeasure.ts}

@@ -4,17 +4,17 @@ import type {
   RunProgressBlock,
   RunResponseSegment,
   RunToolActivity,
-} from "../session/types.js";
-import * as renderDebug from "../core/perf/renderDebug.js";
-import { getAssistantContent, getResponseSegmentText, getRunPlanText } from "../session/types.js";
-import { normalizeCommand, getFriendlyActionLabel } from "./commandNormalize.js";
-import { formatTerminalAnswerInline } from "./terminalAnswerFormat.js";
-import { RUN_OUTPUT_TRUNCATION_NOTICE } from "../session/chatLifecycle.js";
-import { sanitizeTerminalLines, sanitizeTerminalOutput } from "../core/terminal/terminalSanitize.js";
-import { clampVisualText, transcriptContentIndent } from "./layout.js";
-import type { Segment } from "./Markdown.js";
-import { classifyOutput, formatForBox, normalizeOutput, sanitizeOutput, sanitizeStreamChunk } from "./outputPipeline.js";
-import { maybeRenderDiff, type DiffRenderLineType } from "./diffRenderer.js";
+} from "../../session/types.js";
+import * as renderDebug from "../../core/perf/renderDebug.js";
+import { getAssistantContent, getResponseSegmentText, getRunPlanText } from "../../session/types.js";
+import { normalizeCommand, getFriendlyActionLabel } from "../input/commandNormalize.js";
+import { formatTerminalAnswerInline } from "../render/terminalAnswerFormat.js";
+import { RUN_OUTPUT_TRUNCATION_NOTICE } from "../../session/chatLifecycle.js";
+import { sanitizeTerminalLines, sanitizeTerminalOutput } from "../../core/terminal/terminalSanitize.js";
+import { clampVisualText, transcriptContentIndent } from "../layout.js";
+import type { Segment } from "../render/Markdown.js";
+import { classifyOutput, formatForBox, normalizeOutput, sanitizeOutput, sanitizeStreamChunk } from "../render/outputPipeline.js";
+import { maybeRenderDiff, type DiffRenderLineType } from "../render/diffRenderer.js";
 import {
   formatProgressBlockBodyLines,
   getProgressUpdateCount,
@@ -22,10 +22,10 @@ import {
   type VisibleProgressBlock,
 } from "./progressEntries.js";
 import { selectVisibleRunActivity } from "./runActivityView.js";
-import { getTextUnits, getTextWidth, wrapPlainText, wrapCommandText, splitTextAtColumn } from "./textLayout.js";
+import { getTextUnits, getTextWidth, wrapPlainText, wrapCommandText, splitTextAtColumn } from "../render/textLayout.js";
 import type { RenderTimelineItem } from "./Timeline.js";
-import { normalizePlanReviewMarkdown } from "../core/workspace/planStorage.js";
-import { LOGO_COMPACT, LOGO_COMPACT_MIN_COLS, LOGO_LARGE_MIN_COLS, selectLogoVariant } from "./logoVariants.js";
+import { normalizePlanReviewMarkdown } from "../../core/workspace/planStorage.js";
+import { LOGO_COMPACT, LOGO_COMPACT_MIN_COLS, LOGO_LARGE_MIN_COLS, selectLogoVariant } from "../render/logoVariants.js";
 
 // ─── Exported types ───────────────────────────────────────────────────────────