diff --git a/scripts/bump-version.sh b/scripts/bump-version.sh index 02acceae7..ccb6f8525 100755 --- a/scripts/bump-version.sh +++ b/scripts/bump-version.sh @@ -139,15 +139,36 @@ compare_versions() { } # Calculate new version +# Check if current version is a prerelease (contains '-') +IS_PRERELEASE=false +if [[ "$CURRENT_VERSION" == *-* ]]; then + IS_PRERELEASE=true +fi + case $BUMP_TYPE in patch) - NEW_VERSION="$MAJOR.$MINOR.$((PATCH + 1))" + # If prerelease, just remove prerelease tag to get stable version + if [ "$IS_PRERELEASE" = true ]; then + NEW_VERSION="$BASE_VERSION" + else + NEW_VERSION="$MAJOR.$MINOR.$((PATCH + 1))" + fi ;; minor) - NEW_VERSION="$MAJOR.$((MINOR + 1)).0" + # If prerelease, just remove prerelease tag to get stable version + if [ "$IS_PRERELEASE" = true ]; then + NEW_VERSION="$BASE_VERSION" + else + NEW_VERSION="$MAJOR.$((MINOR + 1)).0" + fi ;; major) - NEW_VERSION="$((MAJOR + 1)).0.0" + # If prerelease, just remove prerelease tag to get stable version + if [ "$IS_PRERELEASE" = true ]; then + NEW_VERSION="$BASE_VERSION" + else + NEW_VERSION="$((MAJOR + 1)).0.0" + fi ;; *) # Assume it's an exact version - validate format diff --git a/scripts/check-cli-version.sh b/scripts/check-cli-version.sh index db8ebcfde..63f408aa8 100755 --- a/scripts/check-cli-version.sh +++ b/scripts/check-cli-version.sh @@ -48,7 +48,7 @@ WORKSPACE_VERSION=$(grep -A20 '^\[workspace\.package\]' "$CARGO_TOML" | grep '^v echo "Workspace Cargo.toml: $WORKSPACE_VERSION" # Also check cortex-cli/Cargo.toml uses workspace version -CORTEX_CLI_CARGO="$REPO_ROOT/cortex-cli/Cargo.toml" +CORTEX_CLI_CARGO="$REPO_ROOT/src/cortex-cli/Cargo.toml" if [ -f "$CORTEX_CLI_CARGO" ]; then CLI_VERSION_LINE=$(grep '^version' "$CORTEX_CLI_CARGO" | head -1) if [[ "$CLI_VERSION_LINE" == *"workspace = true"* ]]; then diff --git a/src/cortex-cli/src/cli/styles.rs b/src/cortex-cli/src/cli/styles.rs index 4032f94e7..3d78276bb 100644 --- a/src/cortex-cli/src/cli/styles.rs +++ b/src/cortex-cli/src/cli/styles.rs @@ -28,10 +28,10 @@ pub fn get_styles() -> Styles { /// After-help section with environment variables documentation. pub const AFTER_HELP: &str = color_print::cstr!( r#"📚 QUICK START + cortex "fix the bug" Start interactive TUI with initial prompt + cortex run "explain this" Non-interactive single request + cortex exec "run tests" Headless execution for CI/CD cortex Start interactive TUI - cortex "fix the bug" Start TUI with initial prompt - cortex run "explain this" Non-interactive single request - cortex exec "run tests" Headless execution for CI/CD cortex resume --last Continue most recent session 🌍 ENVIRONMENT VARIABLES