Skip to content

Merge upstream 1.0.4#2

Merged
ding113 merged 12 commits intomasterfrom
merge-upstream-1.0.4
Aug 28, 2025
Merged

Merge upstream 1.0.4#2
ding113 merged 12 commits intomasterfrom
merge-upstream-1.0.4

Conversation

@ding113
Copy link
Owner

@ding113 ding113 commented Aug 28, 2025

No description provided.

Haleclipse and others added 12 commits August 27, 2025 09:57
- Add models.toml configuration file for model definitions
- Implement ModelConfig with pattern matching for model identification
- Extend TranscriptEntry with uuid fields for cross-session lookup
- Add Cost, OutputStyle, Session to SegmentId enum and InputData struct
- Update dependency versions in Cargo.toml
- Add Cost segment showing monetary cost with $0 display for zero cost
- Add Session segment for duration and line changes with integer time format
- Add OutputStyle segment for style name display
- Enhance Usage segment with leafUuid traversal and cross-session fallback
- Update Model segment with simplified name display using ModelConfig
- Register all new segments in segments module
- Integrate Cost, Session, and OutputStyle segments into statusline assembly
- Maintain backward compatibility with existing segment processing
- Support new segment data structures and formatting
…gurations

- Create 9 independent theme modules organized by theme category
- Add theme_cometix.rs with bold text styling for enhanced visibility
- Add theme_default.rs, theme_minimal.rs, theme_gruvbox.rs, theme_nord.rs
- Add 4 powerline theme variants: dark, light, rose_pine, tokyo_night
- Each theme contains complete 7-segment configurations (model, directory, git, usage, cost, session, output_style)
- Refactor presets.rs from 1700+ lines to 300 lines using modular imports
- Implement powerline-specific color schemes with proper dark/light contrasts
- Default disable Cost, Session, and OutputStyle segments for clean initial display
- Update themes/mod.rs to declare all theme modules
- Support both file-based and built-in theme loading system
- Integrate Cost, Session, and OutputStyle segments into preview rendering
- Update segment list component to handle new segment types
- Enhance settings component with new segment configuration options
- Maintain UI component compatibility with expanded segment system
- Remove src/themes/powerline_importer.rs (obsoleted by modular theme system)
- Remove redundant models.toml from root (configuration moved to src/config/models.rs)
- Clean up isolated themes directory conflicting with ui/themes structure
- Eliminate historical legacy code using outdated interfaces
- Add MainMenu component with cursor navigation and selection
- Display menu when ccline is executed without stdin input
- Integrate with existing TUI configurator functionality
- Include consistent key highlighting across help components
- Support menu options: configurator, init config, check config, exit
- Enhance user experience for CLI tool discovery and usage

Fixes issue where direct execution would hang waiting for stdin input.
- Add robust patcher for Claude Code cli.js modifications
- Disable context low warnings by replacing condition with if(true)return null
- Enable verbose mode for enhanced output detail
- Use stable text patterns to survive version updates
- Create automatic backups for easy recovery
- Integrate as --patch CLI parameter in ccline
- Update CHANGELOG.md with comprehensive 1.0.4 release notes
- Update README.md and README.zh.md to reflect new features
- Bump version to 1.0.4 in Cargo.toml and Cargo.lock
- Document new segments, theme system, and Claude Code patcher
- Record cross-platform improvements and compatibility fixes
…idance

- Remove incorrect 'automatically configured' and 'ready to use' claims
- Add clear guidance to follow configuration steps after installation
- Include fallback configuration option for npm global installations
- Add TUI configuration panel hint with ccline -c command
- Prevent user confusion about manual setup requirements
- Merged upstream CCometixLine v1.0.4 changes
- Preserved PackyCode-specific features (quota monitoring, dual-endpoint API)
- Integrated new upstream features:
  * Interactive TUI main menu
  * Claude Code patcher (--patch command)
  * New segments: Cost, Session, OutputStyle
  * Modular theme system with 9 built-in themes
  * Enhanced configuration management
- Maintained PackyCode package identity and repository links
- Resolved conflicts while preserving both codebases' strengths
@ding113 ding113 merged commit ad3303b into master Aug 28, 2025
0 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants