mirror of
https://github.com/samiyev/puaros.git
synced 2025-12-27 23:06:54 +05:00
feat(ipuaro): add display configuration
Add DisplayConfigSchema with theme support (dark/light), stats/tool calls visibility toggles, bell notification on completion, and progress bar control. Includes theme utilities with dynamic color schemes and 46 new tests.
This commit is contained in:
@@ -5,6 +5,89 @@ All notable changes to this project will be documented in this file.
|
|||||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
||||||
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
||||||
|
|
||||||
|
## [0.22.1] - 2025-12-02 - Display Configuration
|
||||||
|
|
||||||
|
### Added
|
||||||
|
|
||||||
|
- **DisplayConfigSchema (0.22.1)**
|
||||||
|
- New configuration schema for display settings in `src/shared/constants/config.ts`
|
||||||
|
- `showStats: boolean` (default: true) - toggle statistics display in chat
|
||||||
|
- `showToolCalls: boolean` (default: true) - toggle tool calls display in chat
|
||||||
|
- `theme: "dark" | "light"` (default: "dark") - color theme for TUI
|
||||||
|
- `bellOnComplete: boolean` (default: false) - ring terminal bell on completion
|
||||||
|
- `progressBar: boolean` (default: true) - toggle progress bar display
|
||||||
|
- Integrated into main ConfigSchema with `.default({})`
|
||||||
|
- Exported `DisplayConfig` type from config module
|
||||||
|
|
||||||
|
- **Theme Utilities (0.22.1)**
|
||||||
|
- New `theme.ts` utility in `src/tui/utils/theme.ts`
|
||||||
|
- `Theme` type: "dark" | "light"
|
||||||
|
- `ColorScheme` interface with semantic colors (primary, secondary, success, warning, error, info, muted)
|
||||||
|
- Dark theme colors: cyan primary, blue secondary, black background, white foreground
|
||||||
|
- Light theme colors: blue primary, cyan secondary, white background, black foreground
|
||||||
|
- `getColorScheme()` - get color scheme for theme
|
||||||
|
- `getStatusColor()` - dynamic colors for status (ready, thinking, error, tool_call, awaiting_confirmation)
|
||||||
|
- `getRoleColor()` - dynamic colors for message roles (user, assistant, system, tool)
|
||||||
|
- `getContextColor()` - dynamic colors for context usage (green <60%, yellow 60-79%, red ≥80%)
|
||||||
|
|
||||||
|
- **Bell Notification (0.22.1)**
|
||||||
|
- New `bell.ts` utility in `src/tui/utils/bell.ts`
|
||||||
|
- `ringBell()` function for terminal bell notification
|
||||||
|
- Uses ASCII bell character (\u0007) via stdout
|
||||||
|
- Triggered when status changes to "ready" if `bellOnComplete` enabled
|
||||||
|
|
||||||
|
### Changed
|
||||||
|
|
||||||
|
- **StatusBar Component**
|
||||||
|
- Added `theme?: Theme` prop (default: "dark")
|
||||||
|
- Uses `getStatusColor()` for dynamic status indicator colors
|
||||||
|
- Uses `getContextColor()` for dynamic context usage colors
|
||||||
|
- Theme-aware color scheme throughout component
|
||||||
|
|
||||||
|
- **Chat Component**
|
||||||
|
- Added `theme?: Theme` prop (default: "dark")
|
||||||
|
- Added `showStats?: boolean` prop (default: true)
|
||||||
|
- Added `showToolCalls?: boolean` prop (default: true)
|
||||||
|
- Created `MessageComponentProps` interface for consistent prop passing
|
||||||
|
- All message subcomponents (UserMessage, AssistantMessage, ToolMessage, SystemMessage) now theme-aware
|
||||||
|
- Uses `getRoleColor()` for dynamic message role colors
|
||||||
|
- Stats conditionally displayed based on `showStats`
|
||||||
|
- Tool calls conditionally displayed based on `showToolCalls`
|
||||||
|
- ThinkingIndicator now theme-aware
|
||||||
|
|
||||||
|
- **App Component**
|
||||||
|
- Added `theme?: "dark" | "light"` prop (default: "dark")
|
||||||
|
- Added `showStats?: boolean` prop (default: true)
|
||||||
|
- Added `showToolCalls?: boolean` prop (default: true)
|
||||||
|
- Added `bellOnComplete?: boolean` prop (default: false)
|
||||||
|
- Extended `ExtendedAppProps` interface with display config props
|
||||||
|
- Passes display config to StatusBar and Chat components
|
||||||
|
- Added useEffect hook for bell notification on status change to "ready"
|
||||||
|
- Imports `ringBell` utility
|
||||||
|
|
||||||
|
### Technical Details
|
||||||
|
|
||||||
|
- Total tests: 1571 (was 1525, +46 new tests)
|
||||||
|
- New test files:
|
||||||
|
- `display-config.test.ts` with 20 tests (schema validation)
|
||||||
|
- `theme.test.ts` with 24 tests (color scheme, status/role/context colors)
|
||||||
|
- `bell.test.ts` with 2 tests (stdout write verification)
|
||||||
|
- Coverage: 97.68% lines, 91.38% branches, 98.97% functions, 97.68% statements
|
||||||
|
- 0 ESLint errors, 0 warnings
|
||||||
|
- Build successful with no TypeScript errors
|
||||||
|
- 3 new utility files created, 4 components updated
|
||||||
|
- All display options configurable via DisplayConfigSchema
|
||||||
|
|
||||||
|
### Notes
|
||||||
|
|
||||||
|
This release completes the first item (0.22.1) of the v0.22.0 Extended Configuration milestone. Remaining items for v0.22.0:
|
||||||
|
- 0.22.2 - Session Configuration
|
||||||
|
- 0.22.3 - Context Configuration
|
||||||
|
- 0.22.4 - Autocomplete Configuration
|
||||||
|
- 0.22.5 - Commands Configuration
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## [0.21.4] - 2025-12-02 - Syntax Highlighting in DiffView
|
## [0.21.4] - 2025-12-02 - Syntax Highlighting in DiffView
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -1648,9 +1648,9 @@ interface DiffViewProps {
|
|||||||
## Version 0.22.0 - Extended Configuration ⚙️
|
## Version 0.22.0 - Extended Configuration ⚙️
|
||||||
|
|
||||||
**Priority:** MEDIUM
|
**Priority:** MEDIUM
|
||||||
**Status:** Pending
|
**Status:** In Progress (1/5 complete)
|
||||||
|
|
||||||
### 0.22.1 - Display Configuration
|
### 0.22.1 - Display Configuration ✅
|
||||||
|
|
||||||
```typescript
|
```typescript
|
||||||
// src/shared/constants/config.ts additions
|
// src/shared/constants/config.ts additions
|
||||||
@@ -1664,11 +1664,11 @@ export const DisplayConfigSchema = z.object({
|
|||||||
```
|
```
|
||||||
|
|
||||||
**Deliverables:**
|
**Deliverables:**
|
||||||
- [ ] DisplayConfigSchema in config.ts
|
- [x] DisplayConfigSchema in config.ts
|
||||||
- [ ] Bell notification on response complete
|
- [x] Bell notification on response complete
|
||||||
- [ ] Theme support (dark/light color schemes)
|
- [x] Theme support (dark/light color schemes)
|
||||||
- [ ] Configurable stats display
|
- [x] Configurable stats display
|
||||||
- [ ] Unit tests
|
- [x] Unit tests (46 new tests: 20 schema, 24 theme, 2 bell)
|
||||||
|
|
||||||
### 0.22.2 - Session Configuration
|
### 0.22.2 - Session Configuration
|
||||||
|
|
||||||
@@ -1880,6 +1880,6 @@ sessions:list # List<session_id>
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
**Last Updated:** 2025-12-01
|
**Last Updated:** 2025-12-02
|
||||||
**Target Version:** 1.0.0
|
**Target Version:** 1.0.0
|
||||||
**Current Version:** 0.18.0
|
**Current Version:** 0.22.1
|
||||||
@@ -86,6 +86,17 @@ export const InputConfigSchema = z.object({
|
|||||||
multiline: z.union([z.boolean(), z.literal("auto")]).default(false),
|
multiline: z.union([z.boolean(), z.literal("auto")]).default(false),
|
||||||
})
|
})
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Display configuration schema.
|
||||||
|
*/
|
||||||
|
export const DisplayConfigSchema = z.object({
|
||||||
|
showStats: z.boolean().default(true),
|
||||||
|
showToolCalls: z.boolean().default(true),
|
||||||
|
theme: z.enum(["dark", "light"]).default("dark"),
|
||||||
|
bellOnComplete: z.boolean().default(false),
|
||||||
|
progressBar: z.boolean().default(true),
|
||||||
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Full configuration schema.
|
* Full configuration schema.
|
||||||
*/
|
*/
|
||||||
@@ -97,6 +108,7 @@ export const ConfigSchema = z.object({
|
|||||||
undo: UndoConfigSchema.default({}),
|
undo: UndoConfigSchema.default({}),
|
||||||
edit: EditConfigSchema.default({}),
|
edit: EditConfigSchema.default({}),
|
||||||
input: InputConfigSchema.default({}),
|
input: InputConfigSchema.default({}),
|
||||||
|
display: DisplayConfigSchema.default({}),
|
||||||
})
|
})
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -110,6 +122,7 @@ export type WatchdogConfig = z.infer<typeof WatchdogConfigSchema>
|
|||||||
export type UndoConfig = z.infer<typeof UndoConfigSchema>
|
export type UndoConfig = z.infer<typeof UndoConfigSchema>
|
||||||
export type EditConfig = z.infer<typeof EditConfigSchema>
|
export type EditConfig = z.infer<typeof EditConfigSchema>
|
||||||
export type InputConfig = z.infer<typeof InputConfigSchema>
|
export type InputConfig = z.infer<typeof InputConfigSchema>
|
||||||
|
export type DisplayConfig = z.infer<typeof DisplayConfigSchema>
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Default configuration.
|
* Default configuration.
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ import { Chat, ConfirmDialog, Input, StatusBar } from "./components/index.js"
|
|||||||
import { type CommandResult, useCommands, useHotkeys, useSession } from "./hooks/index.js"
|
import { type CommandResult, useCommands, useHotkeys, useSession } from "./hooks/index.js"
|
||||||
import type { AppProps, BranchInfo } from "./types.js"
|
import type { AppProps, BranchInfo } from "./types.js"
|
||||||
import type { ConfirmChoice } from "../shared/types/index.js"
|
import type { ConfirmChoice } from "../shared/types/index.js"
|
||||||
|
import { ringBell } from "./utils/bell.js"
|
||||||
|
|
||||||
export interface AppDependencies {
|
export interface AppDependencies {
|
||||||
storage: IStorage
|
storage: IStorage
|
||||||
@@ -31,6 +32,10 @@ export interface ExtendedAppProps extends AppProps {
|
|||||||
onExit?: () => void
|
onExit?: () => void
|
||||||
multiline?: boolean | "auto"
|
multiline?: boolean | "auto"
|
||||||
syntaxHighlight?: boolean
|
syntaxHighlight?: boolean
|
||||||
|
theme?: "dark" | "light"
|
||||||
|
showStats?: boolean
|
||||||
|
showToolCalls?: boolean
|
||||||
|
bellOnComplete?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
function LoadingScreen(): React.JSX.Element {
|
function LoadingScreen(): React.JSX.Element {
|
||||||
@@ -69,6 +74,10 @@ export function App({
|
|||||||
onExit,
|
onExit,
|
||||||
multiline = false,
|
multiline = false,
|
||||||
syntaxHighlight = true,
|
syntaxHighlight = true,
|
||||||
|
theme = "dark",
|
||||||
|
showStats = true,
|
||||||
|
showToolCalls = true,
|
||||||
|
bellOnComplete = false,
|
||||||
}: ExtendedAppProps): React.JSX.Element {
|
}: ExtendedAppProps): React.JSX.Element {
|
||||||
const { exit } = useApp()
|
const { exit } = useApp()
|
||||||
|
|
||||||
@@ -193,6 +202,12 @@ export function App({
|
|||||||
}
|
}
|
||||||
}, [session])
|
}, [session])
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (bellOnComplete && status === "ready") {
|
||||||
|
ringBell()
|
||||||
|
}
|
||||||
|
}, [bellOnComplete, status])
|
||||||
|
|
||||||
const handleSubmit = useCallback(
|
const handleSubmit = useCallback(
|
||||||
(text: string): void => {
|
(text: string): void => {
|
||||||
if (isCommand(text)) {
|
if (isCommand(text)) {
|
||||||
@@ -228,8 +243,15 @@ export function App({
|
|||||||
branch={branch}
|
branch={branch}
|
||||||
sessionTime={sessionTime}
|
sessionTime={sessionTime}
|
||||||
status={status}
|
status={status}
|
||||||
|
theme={theme}
|
||||||
|
/>
|
||||||
|
<Chat
|
||||||
|
messages={messages}
|
||||||
|
isThinking={status === "thinking"}
|
||||||
|
theme={theme}
|
||||||
|
showStats={showStats}
|
||||||
|
showToolCalls={showToolCalls}
|
||||||
/>
|
/>
|
||||||
<Chat messages={messages} isThinking={status === "thinking"} />
|
|
||||||
{commandResult && (
|
{commandResult && (
|
||||||
<Box
|
<Box
|
||||||
borderStyle="round"
|
borderStyle="round"
|
||||||
|
|||||||
@@ -7,10 +7,14 @@ import { Box, Text } from "ink"
|
|||||||
import type React from "react"
|
import type React from "react"
|
||||||
import type { ChatMessage } from "../../domain/value-objects/ChatMessage.js"
|
import type { ChatMessage } from "../../domain/value-objects/ChatMessage.js"
|
||||||
import type { ToolCall } from "../../domain/value-objects/ToolCall.js"
|
import type { ToolCall } from "../../domain/value-objects/ToolCall.js"
|
||||||
|
import { getRoleColor, type Theme } from "../utils/theme.js"
|
||||||
|
|
||||||
export interface ChatProps {
|
export interface ChatProps {
|
||||||
messages: ChatMessage[]
|
messages: ChatMessage[]
|
||||||
isThinking: boolean
|
isThinking: boolean
|
||||||
|
theme?: Theme
|
||||||
|
showStats?: boolean
|
||||||
|
showToolCalls?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
function formatTimestamp(timestamp: number): string {
|
function formatTimestamp(timestamp: number): string {
|
||||||
@@ -42,11 +46,20 @@ function formatToolCall(call: ToolCall): string {
|
|||||||
return `[${call.name} ${params}]`
|
return `[${call.name} ${params}]`
|
||||||
}
|
}
|
||||||
|
|
||||||
function UserMessage({ message }: { message: ChatMessage }): React.JSX.Element {
|
interface MessageComponentProps {
|
||||||
|
message: ChatMessage
|
||||||
|
theme: Theme
|
||||||
|
showStats: boolean
|
||||||
|
showToolCalls: boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
function UserMessage({ message, theme }: MessageComponentProps): React.JSX.Element {
|
||||||
|
const roleColor = getRoleColor("user", theme)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box flexDirection="column" marginBottom={1}>
|
<Box flexDirection="column" marginBottom={1}>
|
||||||
<Box gap={1}>
|
<Box gap={1}>
|
||||||
<Text color="green" bold>
|
<Text color={roleColor} bold>
|
||||||
You
|
You
|
||||||
</Text>
|
</Text>
|
||||||
<Text color="gray" dimColor>
|
<Text color="gray" dimColor>
|
||||||
@@ -60,13 +73,19 @@ function UserMessage({ message }: { message: ChatMessage }): React.JSX.Element {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function AssistantMessage({ message }: { message: ChatMessage }): React.JSX.Element {
|
function AssistantMessage({
|
||||||
|
message,
|
||||||
|
theme,
|
||||||
|
showStats,
|
||||||
|
showToolCalls,
|
||||||
|
}: MessageComponentProps): React.JSX.Element {
|
||||||
const stats = formatStats(message.stats)
|
const stats = formatStats(message.stats)
|
||||||
|
const roleColor = getRoleColor("assistant", theme)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box flexDirection="column" marginBottom={1}>
|
<Box flexDirection="column" marginBottom={1}>
|
||||||
<Box gap={1}>
|
<Box gap={1}>
|
||||||
<Text color="cyan" bold>
|
<Text color={roleColor} bold>
|
||||||
Assistant
|
Assistant
|
||||||
</Text>
|
</Text>
|
||||||
<Text color="gray" dimColor>
|
<Text color="gray" dimColor>
|
||||||
@@ -74,7 +93,7 @@ function AssistantMessage({ message }: { message: ChatMessage }): React.JSX.Elem
|
|||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
{message.toolCalls && message.toolCalls.length > 0 && (
|
{showToolCalls && message.toolCalls && message.toolCalls.length > 0 && (
|
||||||
<Box flexDirection="column" marginLeft={2} marginBottom={1}>
|
<Box flexDirection="column" marginLeft={2} marginBottom={1}>
|
||||||
{message.toolCalls.map((call) => (
|
{message.toolCalls.map((call) => (
|
||||||
<Text key={call.id} color="yellow">
|
<Text key={call.id} color="yellow">
|
||||||
@@ -90,7 +109,7 @@ function AssistantMessage({ message }: { message: ChatMessage }): React.JSX.Elem
|
|||||||
</Box>
|
</Box>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{stats && (
|
{showStats && stats && (
|
||||||
<Box marginLeft={2} marginTop={1}>
|
<Box marginLeft={2} marginTop={1}>
|
||||||
<Text color="gray" dimColor>
|
<Text color="gray" dimColor>
|
||||||
{stats}
|
{stats}
|
||||||
@@ -101,7 +120,9 @@ function AssistantMessage({ message }: { message: ChatMessage }): React.JSX.Elem
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function ToolMessage({ message }: { message: ChatMessage }): React.JSX.Element {
|
function ToolMessage({ message, theme }: MessageComponentProps): React.JSX.Element {
|
||||||
|
const roleColor = getRoleColor("tool", theme)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box flexDirection="column" marginBottom={1} marginLeft={2}>
|
<Box flexDirection="column" marginBottom={1} marginLeft={2}>
|
||||||
{message.toolResults?.map((result) => (
|
{message.toolResults?.map((result) => (
|
||||||
@@ -115,31 +136,39 @@ function ToolMessage({ message }: { message: ChatMessage }): React.JSX.Element {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function SystemMessage({ message }: { message: ChatMessage }): React.JSX.Element {
|
function SystemMessage({ message, theme }: MessageComponentProps): React.JSX.Element {
|
||||||
const isError = message.content.toLowerCase().startsWith("error")
|
const isError = message.content.toLowerCase().startsWith("error")
|
||||||
|
const roleColor = getRoleColor("system", theme)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box marginBottom={1} marginLeft={2}>
|
<Box marginBottom={1} marginLeft={2}>
|
||||||
<Text color={isError ? "red" : "gray"} dimColor={!isError}>
|
<Text color={isError ? "red" : roleColor} dimColor={!isError}>
|
||||||
{message.content}
|
{message.content}
|
||||||
</Text>
|
</Text>
|
||||||
</Box>
|
</Box>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
function MessageComponent({ message }: { message: ChatMessage }): React.JSX.Element {
|
function MessageComponent({
|
||||||
|
message,
|
||||||
|
theme,
|
||||||
|
showStats,
|
||||||
|
showToolCalls,
|
||||||
|
}: MessageComponentProps): React.JSX.Element {
|
||||||
|
const props = { message, theme, showStats, showToolCalls }
|
||||||
|
|
||||||
switch (message.role) {
|
switch (message.role) {
|
||||||
case "user": {
|
case "user": {
|
||||||
return <UserMessage message={message} />
|
return <UserMessage {...props} />
|
||||||
}
|
}
|
||||||
case "assistant": {
|
case "assistant": {
|
||||||
return <AssistantMessage message={message} />
|
return <AssistantMessage {...props} />
|
||||||
}
|
}
|
||||||
case "tool": {
|
case "tool": {
|
||||||
return <ToolMessage message={message} />
|
return <ToolMessage {...props} />
|
||||||
}
|
}
|
||||||
case "system": {
|
case "system": {
|
||||||
return <SystemMessage message={message} />
|
return <SystemMessage {...props} />
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
return <></>
|
return <></>
|
||||||
@@ -147,24 +176,35 @@ function MessageComponent({ message }: { message: ChatMessage }): React.JSX.Elem
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function ThinkingIndicator(): React.JSX.Element {
|
function ThinkingIndicator({ theme }: { theme: Theme }): React.JSX.Element {
|
||||||
|
const color = getRoleColor("assistant", theme)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box marginBottom={1}>
|
<Box marginBottom={1}>
|
||||||
<Text color="yellow">Thinking...</Text>
|
<Text color={color}>Thinking...</Text>
|
||||||
</Box>
|
</Box>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
export function Chat({ messages, isThinking }: ChatProps): React.JSX.Element {
|
export function Chat({
|
||||||
|
messages,
|
||||||
|
isThinking,
|
||||||
|
theme = "dark",
|
||||||
|
showStats = true,
|
||||||
|
showToolCalls = true,
|
||||||
|
}: ChatProps): React.JSX.Element {
|
||||||
return (
|
return (
|
||||||
<Box flexDirection="column" flexGrow={1} paddingX={1}>
|
<Box flexDirection="column" flexGrow={1} paddingX={1}>
|
||||||
{messages.map((message, index) => (
|
{messages.map((message, index) => (
|
||||||
<MessageComponent
|
<MessageComponent
|
||||||
key={`${String(message.timestamp)}-${String(index)}`}
|
key={`${String(message.timestamp)}-${String(index)}`}
|
||||||
message={message}
|
message={message}
|
||||||
|
theme={theme}
|
||||||
|
showStats={showStats}
|
||||||
|
showToolCalls={showToolCalls}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
{isThinking && <ThinkingIndicator />}
|
{isThinking && <ThinkingIndicator theme={theme} />}
|
||||||
</Box>
|
</Box>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
import { Box, Text } from "ink"
|
import { Box, Text } from "ink"
|
||||||
import type React from "react"
|
import type React from "react"
|
||||||
import type { BranchInfo, TuiStatus } from "../types.js"
|
import type { BranchInfo, TuiStatus } from "../types.js"
|
||||||
|
import { getContextColor, getStatusColor, type Theme } from "../utils/theme.js"
|
||||||
|
|
||||||
export interface StatusBarProps {
|
export interface StatusBarProps {
|
||||||
contextUsage: number
|
contextUsage: number
|
||||||
@@ -13,27 +14,30 @@ export interface StatusBarProps {
|
|||||||
branch: BranchInfo
|
branch: BranchInfo
|
||||||
sessionTime: string
|
sessionTime: string
|
||||||
status: TuiStatus
|
status: TuiStatus
|
||||||
|
theme?: Theme
|
||||||
}
|
}
|
||||||
|
|
||||||
function getStatusIndicator(status: TuiStatus): { text: string; color: string } {
|
function getStatusIndicator(status: TuiStatus, theme: Theme): { text: string; color: string } {
|
||||||
|
const color = getStatusColor(status, theme)
|
||||||
|
|
||||||
switch (status) {
|
switch (status) {
|
||||||
case "ready": {
|
case "ready": {
|
||||||
return { text: "ready", color: "green" }
|
return { text: "ready", color }
|
||||||
}
|
}
|
||||||
case "thinking": {
|
case "thinking": {
|
||||||
return { text: "thinking...", color: "yellow" }
|
return { text: "thinking...", color }
|
||||||
}
|
}
|
||||||
case "tool_call": {
|
case "tool_call": {
|
||||||
return { text: "executing...", color: "cyan" }
|
return { text: "executing...", color }
|
||||||
}
|
}
|
||||||
case "awaiting_confirmation": {
|
case "awaiting_confirmation": {
|
||||||
return { text: "confirm?", color: "magenta" }
|
return { text: "confirm?", color }
|
||||||
}
|
}
|
||||||
case "error": {
|
case "error": {
|
||||||
return { text: "error", color: "red" }
|
return { text: "error", color }
|
||||||
}
|
}
|
||||||
default: {
|
default: {
|
||||||
return { text: "ready", color: "green" }
|
return { text: "ready", color }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -48,9 +52,11 @@ export function StatusBar({
|
|||||||
branch,
|
branch,
|
||||||
sessionTime,
|
sessionTime,
|
||||||
status,
|
status,
|
||||||
|
theme = "dark",
|
||||||
}: StatusBarProps): React.JSX.Element {
|
}: StatusBarProps): React.JSX.Element {
|
||||||
const statusIndicator = getStatusIndicator(status)
|
const statusIndicator = getStatusIndicator(status, theme)
|
||||||
const branchDisplay = branch.isDetached ? `HEAD@${branch.name.slice(0, 7)}` : branch.name
|
const branchDisplay = branch.isDetached ? `HEAD@${branch.name.slice(0, 7)}` : branch.name
|
||||||
|
const contextColor = getContextColor(contextUsage, theme)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box borderStyle="single" borderColor="gray" paddingX={1} justifyContent="space-between">
|
<Box borderStyle="single" borderColor="gray" paddingX={1} justifyContent="space-between">
|
||||||
@@ -59,11 +65,7 @@ export function StatusBar({
|
|||||||
[ipuaro]
|
[ipuaro]
|
||||||
</Text>
|
</Text>
|
||||||
<Text color="gray">
|
<Text color="gray">
|
||||||
[ctx:{" "}
|
[ctx: <Text color={contextColor}>{formatContextUsage(contextUsage)}</Text>]
|
||||||
<Text color={contextUsage > 0.8 ? "red" : "white"}>
|
|
||||||
{formatContextUsage(contextUsage)}
|
|
||||||
</Text>
|
|
||||||
]
|
|
||||||
</Text>
|
</Text>
|
||||||
<Text color="gray">
|
<Text color="gray">
|
||||||
[<Text color="blue">{projectName}</Text>]
|
[<Text color="blue">{projectName}</Text>]
|
||||||
|
|||||||
11
packages/ipuaro/src/tui/utils/bell.ts
Normal file
11
packages/ipuaro/src/tui/utils/bell.ts
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
/**
|
||||||
|
* Bell notification utility for terminal.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ring the terminal bell.
|
||||||
|
* Works by outputting the ASCII bell character (\u0007).
|
||||||
|
*/
|
||||||
|
export function ringBell(): void {
|
||||||
|
process.stdout.write("\u0007")
|
||||||
|
}
|
||||||
115
packages/ipuaro/src/tui/utils/theme.ts
Normal file
115
packages/ipuaro/src/tui/utils/theme.ts
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
/**
|
||||||
|
* Theme color utilities for TUI.
|
||||||
|
*/
|
||||||
|
|
||||||
|
export type Theme = "dark" | "light"
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Color scheme for a theme.
|
||||||
|
*/
|
||||||
|
export interface ColorScheme {
|
||||||
|
primary: string
|
||||||
|
secondary: string
|
||||||
|
success: string
|
||||||
|
warning: string
|
||||||
|
error: string
|
||||||
|
info: string
|
||||||
|
muted: string
|
||||||
|
background: string
|
||||||
|
foreground: string
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Dark theme color scheme (default).
|
||||||
|
*/
|
||||||
|
const DARK_THEME: ColorScheme = {
|
||||||
|
primary: "cyan",
|
||||||
|
secondary: "blue",
|
||||||
|
success: "green",
|
||||||
|
warning: "yellow",
|
||||||
|
error: "red",
|
||||||
|
info: "cyan",
|
||||||
|
muted: "gray",
|
||||||
|
background: "black",
|
||||||
|
foreground: "white",
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Light theme color scheme.
|
||||||
|
*/
|
||||||
|
const LIGHT_THEME: ColorScheme = {
|
||||||
|
primary: "blue",
|
||||||
|
secondary: "cyan",
|
||||||
|
success: "green",
|
||||||
|
warning: "yellow",
|
||||||
|
error: "red",
|
||||||
|
info: "blue",
|
||||||
|
muted: "gray",
|
||||||
|
background: "white",
|
||||||
|
foreground: "black",
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get color scheme for a theme.
|
||||||
|
*/
|
||||||
|
export function getColorScheme(theme: Theme): ColorScheme {
|
||||||
|
return theme === "dark" ? DARK_THEME : LIGHT_THEME
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get color for a status.
|
||||||
|
*/
|
||||||
|
export function getStatusColor(
|
||||||
|
status: "ready" | "thinking" | "error" | "tool_call" | "awaiting_confirmation",
|
||||||
|
theme: Theme = "dark",
|
||||||
|
): string {
|
||||||
|
const scheme = getColorScheme(theme)
|
||||||
|
|
||||||
|
switch (status) {
|
||||||
|
case "ready":
|
||||||
|
return scheme.success
|
||||||
|
case "thinking":
|
||||||
|
case "tool_call":
|
||||||
|
return scheme.warning
|
||||||
|
case "awaiting_confirmation":
|
||||||
|
return scheme.info
|
||||||
|
case "error":
|
||||||
|
return scheme.error
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get color for a message role.
|
||||||
|
*/
|
||||||
|
export function getRoleColor(
|
||||||
|
role: "user" | "assistant" | "system" | "tool",
|
||||||
|
theme: Theme = "dark",
|
||||||
|
): string {
|
||||||
|
const scheme = getColorScheme(theme)
|
||||||
|
|
||||||
|
switch (role) {
|
||||||
|
case "user":
|
||||||
|
return scheme.success
|
||||||
|
case "assistant":
|
||||||
|
return scheme.primary
|
||||||
|
case "system":
|
||||||
|
return scheme.muted
|
||||||
|
case "tool":
|
||||||
|
return scheme.secondary
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get color for context usage percentage.
|
||||||
|
*/
|
||||||
|
export function getContextColor(usage: number, theme: Theme = "dark"): string {
|
||||||
|
const scheme = getColorScheme(theme)
|
||||||
|
|
||||||
|
if (usage >= 0.8) {
|
||||||
|
return scheme.error
|
||||||
|
}
|
||||||
|
if (usage >= 0.6) {
|
||||||
|
return scheme.warning
|
||||||
|
}
|
||||||
|
return scheme.success
|
||||||
|
}
|
||||||
150
packages/ipuaro/tests/unit/shared/display-config.test.ts
Normal file
150
packages/ipuaro/tests/unit/shared/display-config.test.ts
Normal file
@@ -0,0 +1,150 @@
|
|||||||
|
/**
|
||||||
|
* Tests for DisplayConfigSchema.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { describe, expect, it } from "vitest"
|
||||||
|
import { DisplayConfigSchema } from "../../../src/shared/constants/config.js"
|
||||||
|
|
||||||
|
describe("DisplayConfigSchema", () => {
|
||||||
|
describe("default values", () => {
|
||||||
|
it("should use defaults when empty object provided", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({})
|
||||||
|
|
||||||
|
expect(result).toEqual({
|
||||||
|
showStats: true,
|
||||||
|
showToolCalls: true,
|
||||||
|
theme: "dark",
|
||||||
|
bellOnComplete: false,
|
||||||
|
progressBar: true,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should use defaults via .default({})", () => {
|
||||||
|
const result = DisplayConfigSchema.default({}).parse({})
|
||||||
|
|
||||||
|
expect(result).toEqual({
|
||||||
|
showStats: true,
|
||||||
|
showToolCalls: true,
|
||||||
|
theme: "dark",
|
||||||
|
bellOnComplete: false,
|
||||||
|
progressBar: true,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("showStats", () => {
|
||||||
|
it("should accept true", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ showStats: true })
|
||||||
|
expect(result.showStats).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should accept false", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ showStats: false })
|
||||||
|
expect(result.showStats).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should reject non-boolean", () => {
|
||||||
|
expect(() => DisplayConfigSchema.parse({ showStats: "yes" })).toThrow()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("showToolCalls", () => {
|
||||||
|
it("should accept true", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ showToolCalls: true })
|
||||||
|
expect(result.showToolCalls).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should accept false", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ showToolCalls: false })
|
||||||
|
expect(result.showToolCalls).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should reject non-boolean", () => {
|
||||||
|
expect(() => DisplayConfigSchema.parse({ showToolCalls: "yes" })).toThrow()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("theme", () => {
|
||||||
|
it("should accept dark", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ theme: "dark" })
|
||||||
|
expect(result.theme).toBe("dark")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should accept light", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ theme: "light" })
|
||||||
|
expect(result.theme).toBe("light")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should reject invalid theme", () => {
|
||||||
|
expect(() => DisplayConfigSchema.parse({ theme: "blue" })).toThrow()
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should reject non-string", () => {
|
||||||
|
expect(() => DisplayConfigSchema.parse({ theme: 123 })).toThrow()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("bellOnComplete", () => {
|
||||||
|
it("should accept true", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ bellOnComplete: true })
|
||||||
|
expect(result.bellOnComplete).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should accept false", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ bellOnComplete: false })
|
||||||
|
expect(result.bellOnComplete).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should reject non-boolean", () => {
|
||||||
|
expect(() => DisplayConfigSchema.parse({ bellOnComplete: "yes" })).toThrow()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("progressBar", () => {
|
||||||
|
it("should accept true", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ progressBar: true })
|
||||||
|
expect(result.progressBar).toBe(true)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should accept false", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({ progressBar: false })
|
||||||
|
expect(result.progressBar).toBe(false)
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should reject non-boolean", () => {
|
||||||
|
expect(() => DisplayConfigSchema.parse({ progressBar: "yes" })).toThrow()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("partial config", () => {
|
||||||
|
it("should merge partial config with defaults", () => {
|
||||||
|
const result = DisplayConfigSchema.parse({
|
||||||
|
theme: "light",
|
||||||
|
bellOnComplete: true,
|
||||||
|
})
|
||||||
|
|
||||||
|
expect(result).toEqual({
|
||||||
|
showStats: true,
|
||||||
|
showToolCalls: true,
|
||||||
|
theme: "light",
|
||||||
|
bellOnComplete: true,
|
||||||
|
progressBar: true,
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("full config", () => {
|
||||||
|
it("should accept valid full config", () => {
|
||||||
|
const config = {
|
||||||
|
showStats: false,
|
||||||
|
showToolCalls: false,
|
||||||
|
theme: "light" as const,
|
||||||
|
bellOnComplete: true,
|
||||||
|
progressBar: false,
|
||||||
|
}
|
||||||
|
|
||||||
|
const result = DisplayConfigSchema.parse(config)
|
||||||
|
expect(result).toEqual(config)
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
29
packages/ipuaro/tests/unit/tui/utils/bell.test.ts
Normal file
29
packages/ipuaro/tests/unit/tui/utils/bell.test.ts
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
/**
|
||||||
|
* Tests for bell utility.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { describe, expect, it, vi } from "vitest"
|
||||||
|
import { ringBell } from "../../../../src/tui/utils/bell.js"
|
||||||
|
|
||||||
|
describe("ringBell", () => {
|
||||||
|
it("should write bell character to stdout", () => {
|
||||||
|
const writeSpy = vi.spyOn(process.stdout, "write").mockImplementation(() => true)
|
||||||
|
|
||||||
|
ringBell()
|
||||||
|
|
||||||
|
expect(writeSpy).toHaveBeenCalledWith("\u0007")
|
||||||
|
writeSpy.mockRestore()
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should write correct ASCII bell character", () => {
|
||||||
|
const writeSpy = vi.spyOn(process.stdout, "write").mockImplementation(() => true)
|
||||||
|
|
||||||
|
ringBell()
|
||||||
|
|
||||||
|
const callArg = writeSpy.mock.calls[0]?.[0]
|
||||||
|
expect(callArg).toBe("\u0007")
|
||||||
|
expect(callArg?.charCodeAt(0)).toBe(7)
|
||||||
|
|
||||||
|
writeSpy.mockRestore()
|
||||||
|
})
|
||||||
|
})
|
||||||
158
packages/ipuaro/tests/unit/tui/utils/theme.test.ts
Normal file
158
packages/ipuaro/tests/unit/tui/utils/theme.test.ts
Normal file
@@ -0,0 +1,158 @@
|
|||||||
|
/**
|
||||||
|
* Tests for theme utilities.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { describe, expect, it } from "vitest"
|
||||||
|
import { getColorScheme, getContextColor, getRoleColor, getStatusColor } from "../../../../src/tui/utils/theme.js"
|
||||||
|
|
||||||
|
describe("theme utilities", () => {
|
||||||
|
describe("getColorScheme", () => {
|
||||||
|
it("should return dark theme colors for dark", () => {
|
||||||
|
const scheme = getColorScheme("dark")
|
||||||
|
|
||||||
|
expect(scheme).toEqual({
|
||||||
|
primary: "cyan",
|
||||||
|
secondary: "blue",
|
||||||
|
success: "green",
|
||||||
|
warning: "yellow",
|
||||||
|
error: "red",
|
||||||
|
info: "cyan",
|
||||||
|
muted: "gray",
|
||||||
|
background: "black",
|
||||||
|
foreground: "white",
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return light theme colors for light", () => {
|
||||||
|
const scheme = getColorScheme("light")
|
||||||
|
|
||||||
|
expect(scheme).toEqual({
|
||||||
|
primary: "blue",
|
||||||
|
secondary: "cyan",
|
||||||
|
success: "green",
|
||||||
|
warning: "yellow",
|
||||||
|
error: "red",
|
||||||
|
info: "blue",
|
||||||
|
muted: "gray",
|
||||||
|
background: "white",
|
||||||
|
foreground: "black",
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("getStatusColor", () => {
|
||||||
|
it("should return success color for ready status", () => {
|
||||||
|
const color = getStatusColor("ready", "dark")
|
||||||
|
expect(color).toBe("green")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return warning color for thinking status", () => {
|
||||||
|
const color = getStatusColor("thinking", "dark")
|
||||||
|
expect(color).toBe("yellow")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return warning color for tool_call status", () => {
|
||||||
|
const color = getStatusColor("tool_call", "dark")
|
||||||
|
expect(color).toBe("yellow")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return info color for awaiting_confirmation status", () => {
|
||||||
|
const color = getStatusColor("awaiting_confirmation", "dark")
|
||||||
|
expect(color).toBe("cyan")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return error color for error status", () => {
|
||||||
|
const color = getStatusColor("error", "dark")
|
||||||
|
expect(color).toBe("red")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should use light theme colors when theme is light", () => {
|
||||||
|
const color = getStatusColor("awaiting_confirmation", "light")
|
||||||
|
expect(color).toBe("blue")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should use dark theme by default", () => {
|
||||||
|
const color = getStatusColor("ready")
|
||||||
|
expect(color).toBe("green")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("getRoleColor", () => {
|
||||||
|
it("should return success color for user role", () => {
|
||||||
|
const color = getRoleColor("user", "dark")
|
||||||
|
expect(color).toBe("green")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return primary color for assistant role", () => {
|
||||||
|
const color = getRoleColor("assistant", "dark")
|
||||||
|
expect(color).toBe("cyan")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return muted color for system role", () => {
|
||||||
|
const color = getRoleColor("system", "dark")
|
||||||
|
expect(color).toBe("gray")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return secondary color for tool role", () => {
|
||||||
|
const color = getRoleColor("tool", "dark")
|
||||||
|
expect(color).toBe("blue")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should use light theme colors when theme is light", () => {
|
||||||
|
const color = getRoleColor("assistant", "light")
|
||||||
|
expect(color).toBe("blue")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should use dark theme by default", () => {
|
||||||
|
const color = getRoleColor("user")
|
||||||
|
expect(color).toBe("green")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
|
||||||
|
describe("getContextColor", () => {
|
||||||
|
it("should return success color for low usage", () => {
|
||||||
|
const color = getContextColor(0.5, "dark")
|
||||||
|
expect(color).toBe("green")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return warning color for medium usage", () => {
|
||||||
|
const color = getContextColor(0.7, "dark")
|
||||||
|
expect(color).toBe("yellow")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return error color for high usage", () => {
|
||||||
|
const color = getContextColor(0.9, "dark")
|
||||||
|
expect(color).toBe("red")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return success color at 59% usage", () => {
|
||||||
|
const color = getContextColor(0.59, "dark")
|
||||||
|
expect(color).toBe("green")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return warning color at 60% usage", () => {
|
||||||
|
const color = getContextColor(0.6, "dark")
|
||||||
|
expect(color).toBe("yellow")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return warning color at 79% usage", () => {
|
||||||
|
const color = getContextColor(0.79, "dark")
|
||||||
|
expect(color).toBe("yellow")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should return error color at 80% usage", () => {
|
||||||
|
const color = getContextColor(0.8, "dark")
|
||||||
|
expect(color).toBe("red")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should use light theme colors when theme is light", () => {
|
||||||
|
const color = getContextColor(0.7, "light")
|
||||||
|
expect(color).toBe("yellow")
|
||||||
|
})
|
||||||
|
|
||||||
|
it("should use dark theme by default", () => {
|
||||||
|
const color = getContextColor(0.5)
|
||||||
|
expect(color).toBe("green")
|
||||||
|
})
|
||||||
|
})
|
||||||
|
})
|
||||||
Reference in New Issue
Block a user