Skip to content

Commit ce90c65

Browse files
committed
fix(cli): address parser review findings
Clear stale inline option values before reading the next flag, and reject inline values on non-option tokens. This prevents a valueless flag written as --flag=value from leaking that value into a later option that expects an argument. Improve contextual help routing by stripping path-like argv[0] values, including Windows-style ccusage.exe paths. Also detect help/version control flags before semantic validation so help/version requests are not masked by compatibility errors. Validation: direnv exec . cargo test --manifest-path rust/Cargo.toml -p ccusage-cli; direnv exec . env -u CFLAGS cargo check --manifest-path rust/Cargo.toml -p ccusage-cli -p ccusage; direnv exec . env -u CFLAGS pnpm run test; direnv exec . pnpm run format.
1 parent 75f9c57 commit ce90c65

4 files changed

Lines changed: 121 additions & 17 deletions

File tree

‎rust/crates/ccusage-cli/src/arg_parser.rs‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,14 @@ impl ArgParser {
3333
}
3434

3535
pub(crate) fn next_flag(&mut self) -> Result<String, String> {
36+
self.pending_value = None;
3637
let arg = self
3738
.next()
3839
.ok_or_else(|| "Expected option but reached end of arguments".to_string())?;
3940
if let Some((flag, value)) = arg.split_once('=') {
41+
if !flag.starts_with('-') {
42+
return Err(format!("Expected option, got '{arg}'"));
43+
}
4044
self.pending_value = Some(value.to_string());
4145
return Ok(flag.to_string());
4246
}
@@ -63,3 +67,33 @@ impl ArgParser {
6367
Ok(value)
6468
}
6569
}
70+
71+
#[cfg(test)]
72+
mod tests {
73+
use std::ffi::OsString;
74+
75+
use super::*;
76+
77+
fn parser(args: &[&str]) -> ArgParser {
78+
ArgParser::new(args.iter().map(OsString::from).collect()).unwrap()
79+
}
80+
81+
#[test]
82+
fn clears_inline_value_when_reading_next_flag() {
83+
let mut parser = parser(&["--json=ignored", "--since", "20260101"]);
84+
85+
assert_eq!(parser.next_flag().unwrap(), "--json");
86+
assert_eq!(parser.next_flag().unwrap(), "--since");
87+
assert_eq!(parser.value_for("--since").unwrap(), "20260101");
88+
}
89+
90+
#[test]
91+
fn rejects_inline_values_on_non_options() {
92+
let mut parser = parser(&["daily=bad"]);
93+
94+
assert_eq!(
95+
parser.next_flag().unwrap_err(),
96+
"Expected option, got 'daily=bad'"
97+
);
98+
}
99+
}

‎rust/crates/ccusage-cli/src/help.rs‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use std::process;
1+
use std::{path::Path, process};
22

33
use crate::parser::command_tokens;
44

@@ -34,13 +34,24 @@ pub(crate) fn help_text_for_args(args: &[String]) -> String {
3434
}
3535

3636
fn strip_program_name(args: &[String]) -> &[String] {
37-
if args.first().is_some_and(|arg| arg == "ccusage") {
37+
if args.first().is_some_and(|arg| is_program_name(arg)) {
3838
&args[1..]
3939
} else {
4040
args
4141
}
4242
}
4343

44+
fn is_program_name(arg: &str) -> bool {
45+
let name = Path::new(arg)
46+
.file_name()
47+
.and_then(|name| name.to_str())
48+
.unwrap_or(arg)
49+
.rsplit('\\')
50+
.next()
51+
.unwrap_or(arg);
52+
matches!(name, "ccusage" | "ccusage.exe")
53+
}
54+
4455
fn help_text_for_tokens(tokens: &[String]) -> String {
4556
find_help_page(tokens).map_or_else(root_help_text, render_help_page)
4657
}

‎rust/crates/ccusage-cli/src/parser.rs‎

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@ use crate::{
99
SortOrder, StatuslineArgs, VisualBurnRate, WeekDay, WeeklyArgs,
1010
};
1111

12+
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
13+
enum ControlArg {
14+
Help,
15+
Version,
16+
}
17+
1218
impl Cli {
1319
pub fn parse() -> Self {
1420
Self::parse_from(env::args_os()).unwrap_or_else(|message| {
@@ -36,6 +42,11 @@ impl Cli {
3642
{
3743
let mut parser = ArgParser::new(args.into_iter().skip(1).collect())?;
3844
normalize_legacy_agent_command_args(&mut parser.args);
45+
match control_arg(&parser.args) {
46+
Some(ControlArg::Version) => print_version_and_exit(version),
47+
Some(ControlArg::Help) => print_help_and_exit(&parser.args),
48+
None => {}
49+
}
3950
if let Some(message) = report_flag_alias_error(&parser.args) {
4051
return Err(message);
4152
}
@@ -45,21 +56,6 @@ impl Cli {
4556
if let Some(message) = unsupported_agent_report_error(&parser.args) {
4657
return Err(message);
4758
}
48-
if parser
49-
.args
50-
.iter()
51-
.any(|arg| matches!(arg.as_str(), "-v" | "-V" | "--version"))
52-
{
53-
print_version_and_exit(version);
54-
}
55-
if parser
56-
.args
57-
.iter()
58-
.any(|arg| matches!(arg.as_str(), "-h" | "--help"))
59-
{
60-
print_help_and_exit(&parser.args);
61-
}
62-
6359
let mut shared = SharedArgs::with_defaults();
6460
config.apply_shared(&mut shared);
6561
while let Some(arg) = parser.peek() {
@@ -89,6 +85,22 @@ impl Cli {
8985
}
9086
}
9187

88+
fn control_arg(args: &[String]) -> Option<ControlArg> {
89+
if args
90+
.iter()
91+
.any(|arg| matches!(arg.as_str(), "-v" | "-V" | "--version"))
92+
{
93+
return Some(ControlArg::Version);
94+
}
95+
if args
96+
.iter()
97+
.any(|arg| matches!(arg.as_str(), "-h" | "--help"))
98+
{
99+
return Some(ControlArg::Help);
100+
}
101+
None
102+
}
103+
92104
fn parse_command(
93105
command: &str,
94106
parser: &mut ArgParser,
@@ -905,3 +917,28 @@ fn parse_cost_source(value: &str) -> Result<CostSource, String> {
905917
_ => Err(format!("Invalid cost source '{value}'")),
906918
}
907919
}
920+
921+
#[cfg(test)]
922+
mod tests {
923+
use super::*;
924+
925+
fn args(values: &[&str]) -> Vec<String> {
926+
values.iter().map(|value| value.to_string()).collect()
927+
}
928+
929+
#[test]
930+
fn detects_help_before_semantic_validation() {
931+
assert_eq!(
932+
control_arg(&args(&["--help", "--daily"])),
933+
Some(ControlArg::Help)
934+
);
935+
}
936+
937+
#[test]
938+
fn version_takes_precedence_over_help() {
939+
assert_eq!(
940+
control_arg(&args(&["--help", "--version"])),
941+
Some(ControlArg::Version)
942+
);
943+
}
944+
}

‎rust/crates/ccusage-cli/src/tests.rs‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,28 @@ fn contextual_codex_help_lists_speed_choices() {
391391
assert!(help.contains("choices: auto | standard | fast"));
392392
}
393393

394+
#[test]
395+
fn contextual_help_strips_path_like_program_name() {
396+
let help = help_text_for_args(&[
397+
"/usr/local/bin/ccusage".to_string(),
398+
"codex".to_string(),
399+
"daily".to_string(),
400+
]);
401+
402+
assert!(help.contains("USAGE:\n ccusage codex daily <OPTIONS>"));
403+
}
404+
405+
#[test]
406+
fn contextual_help_strips_windows_program_name() {
407+
let help = help_text_for_args(&[
408+
"C:\\Tools\\ccusage.exe".to_string(),
409+
"codex".to_string(),
410+
"daily".to_string(),
411+
]);
412+
413+
assert!(help.contains("USAGE:\n ccusage codex daily <OPTIONS>"));
414+
}
415+
394416
#[test]
395417
fn contextual_agent_help_lists_agent_subcommands() {
396418
let help = help_text_for_args(&["ccusage".to_string(), "claude".to_string()]);

0 commit comments

Comments
 (0)