Skip to content

fix: case-insensitive arguments. #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Skyrion9 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: case-insensitive arguments. #42

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f140614
fix: case-insensitive arguments.
Skyrion9 Jul 15, 2026
29c5de3
fix: changed metal's -M to -mt due to model's -m flag overlapping whe…
Skyrion9 Jul 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 46 additions & 38 deletions src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ void print_uso() {
safe_print(" -o, --output <path> Output WAV path\n");
safe_print(" -v, --vulkan <id> Vulkan device index (-1 = CPU)\n");
safe_print(" -c, --cuda <id> CUDA device index (-1 = CPU)\n");
safe_print(" -M, --metal Use Metal backend (macOS only)\n");
safe_print(" -mt, --metal Use Metal backend (macOS only)\n");

@coderabbitai coderabbitai Bot Jul 30, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

Update the documented Metal flag or preserve -M as an alias.

README.md still documents -M, --metal, but normalization converts -M to -m, which dispatches it as the model option instead of selecting Metal. This breaks the existing documented CLI contract.

Proposed documentation fix 
- | `-M`, `--metal` | off | Use the default Metal device on macOS |
+ | `-mt`, `--metal` | off | Use the default Metal device on macOS |

Also applies to: 178-178

🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/main.cpp` at line 76, Fix the Metal CLI contract around the help text in
main.cpp and the argument normalization/dispatch logic: either update README.md
to document the actual -m form, or preserve the documented -M alias by ensuring
normalization does not convert it into the model option and dispatches it as
Metal. Apply the same correction to both Metal help entries.

safe_print(" -ngl, --gpu-layers <n> Transformer layers on GPU (-1 = auto, 0 = CPU only)\n");
safe_print(" -threads, --threads <n> CPU threads (0 = auto)\n");
safe_print(" -max-tokens, --max-tokens <n> Max tokens to generate\n");
Expand Down Expand Up @@ -155,53 +155,61 @@ int main(int argc, char** argv) {

for (int i = 1; i < argc; ++i) {
std::string arg = argv[i];
if (arg == "-m" || arg == "--model") { if (i+1 < argc) params.model_path = argv[++i]; }
else if (arg == "-t" || arg == "--tokenizer") { if (i+1 < argc) params.tokenizer_path = argv[++i]; }
else if (arg == "-text" || arg == "--text") { if (i+1 < argc) params.text = argv[++i]; }
else if (arg == "-pa" || arg == "--prompt-audio") { if (i+1 < argc) params.prompt_audio_path = argv[++i]; }
else if (arg == "-pt" || arg == "--prompt-text") { if (i+1 < argc) params.prompt_text = argv[++i]; }
else if (arg == "--voice") { if (i+1 < argc) params.voice_id = argv[++i]; }
else if (arg == "--save-voice") { params.save_voice = true; }
else if (arg == "--voice-dir") { if (i+1 < argc) params.voice_storage_dir = argv[++i]; }
else if (arg == "--list-voices") { list_voices = true; }
else if (arg == "-o" || arg == "--output") { if (i+1 < argc) params.output_path = argv[++i]; }
else if (arg == "-v" || arg == "--vulkan") { if (i+1 < argc) { try { params.gpu_device = std::stoi(argv[++i]); } catch(...) {} params.backend_type = s2::BackendType::Vulkan; } }
else if (arg == "-c" || arg == "--cuda") { if (i+1 < argc) { try { params.gpu_device = std::stoi(argv[++i]); } catch(...) {} params.backend_type = s2::BackendType::CUDA; } }
else if (arg == "-M" || arg == "--metal") { params.gpu_device = 0; params.backend_type = s2::BackendType::Metal; }
else if (arg == "-ngl" || arg == "--gpu-layers") { if (i+1 < argc) { try { params.n_gpu_layers = std::stoi(argv[++i]); } catch(...) {} } }
else if (arg == "-threads" || arg == "--threads") { if (i+1 < argc) { try { params.gen.n_threads = std::stoi(argv[++i]); } catch(...) {} } }
else if (arg == "-max-tokens" || arg == "--max-tokens") {

// Normalize flag arguments to lowercase for case-insensitive matching
std::string arg_lower = arg;
if (!arg.empty() && arg[0] == '-') {
std::transform(arg_lower.begin(), arg_lower.end(), arg_lower.begin(),
[](unsigned char c) { return static_cast<char>(std::tolower(c)); });
}
Comment on lines +158 to +164

@coderabbitai coderabbitai Bot Jul 15, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎯 Functional Correctness | 🔴 Critical | ⚡ Quick win

Case-insensitive short options create collisions and dead code.

Lowercasing all dash-prefixed arguments introduces critical logic errors for short options that rely on case sensitivity:

  • -M (Metal) is lowercased to -m, colliding with --model at line 166.
  • -H (Host) is lowercased to -h, colliding with --help at line 234.
  • -P (Port) is lowercased to -p, which skips the condition chain entirely.

Additionally, comparisons like arg_lower == "-M" and arg_lower == "-H" become dead code because arg_lower will never contain uppercase letters after the transformation.

To fix this while keeping long options case-insensitive, restrict the lowercase transformation to flags longer than 2 characters. This correctly preserves standard short flags like -M, -H, and -P.

🐛 Proposed fix 
-        if (!arg.empty() && arg[0] == '-') {
+        if (arg.length() > 2 && arg[0] == '-') {
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// Normalize flag arguments to lowercase for case-insensitive matching
std::string arg_lower = arg;
if (!arg.empty() && arg[0] == '-') {
std::transform(arg_lower.begin(), arg_lower.end(), arg_lower.begin(),
[](unsigned char c) { return static_cast<char>(std::tolower(c)); });
}
// Normalize flag arguments to lowercase for case-insensitive matching
std::string arg_lower = arg;
if (arg.length() > 2 && arg[0] == '-') {
std::transform(arg_lower.begin(), arg_lower.end(), arg_lower.begin(),
[](unsigned char c) { return static_cast<char>(std::tolower(c)); });
}
🤖 Prompt for AI Agents 
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@src/main.cpp` around lines 158 - 164, Restrict the lowercase transformation
in the argument-normalization block to dash-prefixed flags longer than two
characters, preserving case for short options such as -M, -H, and -P. Keep the
existing long-option matching flow unchanged and ensure comparisons against
uppercase short flags remain reachable.


if (arg_lower == "-m" || arg_lower == "--model") { if (i+1 < argc) params.model_path = argv[++i]; }
else if (arg_lower == "-t" || arg_lower == "--tokenizer") { if (i+1 < argc) params.tokenizer_path = argv[++i]; }
else if (arg_lower == "-text" || arg_lower == "--text") { if (i+1 < argc) params.text = argv[++i]; }
else if (arg_lower == "-pa" || arg_lower == "--prompt-audio") { if (i+1 < argc) params.prompt_audio_path = argv[++i]; }
else if (arg_lower == "-pt" || arg_lower == "--prompt-text") { if (i+1 < argc) params.prompt_text = argv[++i]; }
else if (arg_lower == "--voice") { if (i+1 < argc) params.voice_id = argv[++i]; }
else if (arg_lower == "--save-voice") { params.save_voice = true; }
else if (arg_lower == "--voice-dir") { if (i+1 < argc) params.voice_storage_dir = argv[++i]; }
else if (arg_lower == "--list-voices") { list_voices = true; }
else if (arg_lower == "-o" || arg_lower == "--output") { if (i+1 < argc) params.output_path = argv[++i]; }
else if (arg_lower == "-v" || arg_lower == "--vulkan") { if (i+1 < argc) { try { params.gpu_device = std::stoi(argv[++i]); } catch(...) {} params.backend_type = s2::BackendType::Vulkan; } }
else if (arg_lower == "-c" || arg_lower == "--cuda") { if (i+1 < argc) { try { params.gpu_device = std::stoi(argv[++i]); } catch(...) {} params.backend_type = s2::BackendType::CUDA; } }
else if (arg_lower == "-mt" || arg_lower == "--metal") { params.gpu_device = 0; params.backend_type = s2::BackendType::Metal; }
else if (arg_lower == "-ngl" || arg_lower == "--gpu-layers") { if (i+1 < argc) { try { params.n_gpu_layers = std::stoi(argv[++i]); } catch(...) {} } }
else if (arg_lower == "-threads" || arg_lower == "--threads") { if (i+1 < argc) { try { params.gen.n_threads = std::stoi(argv[++i]); } catch(...) {} } }
else if (arg_lower == "-max-tokens" || arg_lower == "--max-tokens") {
if (i+1 < argc) {
try { params.gen.max_new_tokens = std::stoi(argv[++i]); } catch(...) {}
}
}
else if (arg == "--min-tokens-before-end") {
else if (arg_lower == "--min-tokens-before-end") {
if (i+1 < argc) {
try {
params.gen.min_tokens_before_end = std::stoi(argv[++i]);
if (params.gen.min_tokens_before_end < 0) params.gen.min_tokens_before_end = 0;
} catch(...) {}
}
}
else if (arg == "-temp" || arg == "--temp" || arg == "--temperature") { if (i+1 < argc) { try { params.gen.temperature = std::stof(argv[++i]); } catch(...) {} } }
else if (arg == "-top-p" || arg == "--top-p") { if (i+1 < argc) { try { params.gen.top_p = std::stof(argv[++i]); } catch(...) {} } }
else if (arg == "-top-k" || arg == "--top-k") { if (i+1 < argc) { try { params.gen.top_k = std::stoi(argv[++i]); } catch(...) {} } }
else if (arg == "--dynamic-normalize") { params.normalize_dynamic = true; }
else if (arg == "--no-dynamic-normalize") { params.normalize_dynamic = false; }
else if (arg == "--no-trim-silence") { params.trim_silence = false; }
else if (arg == "--trim-silence") { params.trim_silence = true; }
else if (arg == "--no-normalize") { params.normalize_output = false; }
else if (arg == "--normalize") { params.normalize_output = true; }
else if (arg == "--codec-auto") { params.codec_auto_backend = true; params.codec_follow_backend = true; }
else if (arg == "--codec-follow-backend") { params.codec_auto_backend = false; params.codec_follow_backend = true; }
else if (arg == "--codec-cpu") { params.codec_auto_backend = false; params.codec_follow_backend = false; }
else if (arg == "--stream-file") { use_stream_file = true; }
else if (arg == "--stream-decode-stride") {
else if (arg_lower == "-temp" || arg_lower == "--temp" || arg_lower == "--temperature") { if (i+1 < argc) { try { params.gen.temperature = std::stof(argv[++i]); } catch(...) {} } }
else if (arg_lower == "-top-p" || arg_lower == "--top-p") { if (i+1 < argc) { try { params.gen.top_p = std::stof(argv[++i]); } catch(...) {} } }
else if (arg_lower == "-top-k" || arg_lower == "--top-k") { if (i+1 < argc) { try { params.gen.top_k = std::stoi(argv[++i]); } catch(...) {} } }
else if (arg_lower == "--dynamic-normalize") { params.normalize_dynamic = true; }
else if (arg_lower == "--no-dynamic-normalize") { params.normalize_dynamic = false; }
else if (arg_lower == "--no-trim-silence") { params.trim_silence = false; }
else if (arg_lower == "--trim-silence") { params.trim_silence = true; }
else if (arg_lower == "--no-normalize") { params.normalize_output = false; }
else if (arg_lower == "--normalize") { params.normalize_output = true; }
else if (arg_lower == "--codec-auto") { params.codec_auto_backend = true; params.codec_follow_backend = true; }
else if (arg_lower == "--codec-follow-backend") { params.codec_auto_backend = false; params.codec_follow_backend = true; }
else if (arg_lower == "--codec-cpu") { params.codec_auto_backend = false; params.codec_follow_backend = false; }
else if (arg_lower == "--stream-file") { use_stream_file = true; }
else if (arg_lower == "--stream-decode-stride") {
if (i+1 < argc) {
try { params.stream_decode_stride_frames = std::stoi(argv[++i]); } catch(...) {}
}
}
else if (arg == "--codec-context-frames") {
else if (arg_lower == "--codec-context-frames") {
if (i+1 < argc) {
#ifdef WIN32
try { params.codec_decode_context_frames = max(0, std::stoi(argv[++i])); } catch(...) {}
Expand All @@ -210,7 +218,7 @@ int main(int argc, char** argv) {
#endif
}
}
else if (arg == "--log-level") {
else if (arg_lower == "--log-level") {
if (i+1 < argc) {
s2::LogLevel log_level;
if (parse_log_level(argv[++i], log_level)) {
Expand All @@ -220,10 +228,10 @@ int main(int argc, char** argv) {
}
}
}
else if (arg == "--server") { use_server = true; }
else if (arg == "-H" || arg == "--host") { if (i+1 < argc) serverParams.host = argv[++i]; }
else if (arg == "-P" || arg == "--port") { if (i+1 < argc) { try { serverParams.port = std::stoi(argv[++i]); } catch(...) {} } }
else if (arg == "-h" || arg == "--help") { print_uso(); return 0; }
else if (arg_lower == "--server") { use_server = true; }
else if (arg_lower == "-H" || arg_lower == "--host") { if (i+1 < argc) serverParams.host = argv[++i]; }
else if (arg_lower == "-P" || arg_lower == "--port") { if (i+1 < argc) { try { serverParams.port = std::stoi(argv[++i]); } catch(...) {} } }
else if (arg_lower == "-h" || arg_lower == "--help") { print_uso(); return 0; }
}

if (list_voices) {
Expand Down