Skip to content

fix: widen token columns and add overflow-safe formatting #124

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
mike1858 wants to merge 1 commit into
base: main
Choose a base branch
from
+436 −189
Open

fix: widen token columns and add overflow-safe formatting #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
76 changes: 37 additions & 39 deletions src/analyzers/codex_cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,45 +392,43 @@ pub(crate) fn parse_codex_cli_jsonl_file(
session_name: effective_name,
});
}
"assistant" => {
// Token usage is now emitted immediately when processing token_count
// events. We still track assistant messages without additional stats
// to avoid double-counting when Codex emits separate reasoning/tool
// outputs.
if !saw_token_usage {
let model_state = session_model.clone().unwrap_or_else(|| {
let fallback = SessionModel::inferred(
DEFAULT_FALLBACK_MODEL.to_string(),
);
warn_once(format!(
"WARNING: session {file_path_str} missing model metadata; using fallback model {} for cost estimation.",
fallback.name
));
session_model = Some(fallback.clone());
fallback
});

entries.push(ConversationMessage {
application: Application::CodexCli,
model: Some(model_state.name.clone()),
global_hash: hash_text(&format!(
"{}_{}_assistant_{}",
file_path_str,
wrapper.timestamp.to_rfc3339(),
entries.len()
)),
local_hash: None,
conversation_hash: hash_text(&file_path_str),
date: wrapper.timestamp,
project_hash: "".to_string(),
stats: Stats::default(),
role: MessageRole::Assistant,
uuid: None,
session_name: session_name
.clone()
.or_else(|| fallback_session_name.clone()),
});
}
// Token usage is now emitted immediately when processing token_count
// events. We still track assistant messages without additional stats
// to avoid double-counting when Codex emits separate reasoning/tool
// outputs.
"assistant" if !saw_token_usage => {
let model_state = session_model.clone().unwrap_or_else(|| {
let fallback = SessionModel::inferred(
DEFAULT_FALLBACK_MODEL.to_string(),
);
warn_once(format!(
"WARNING: session {file_path_str} missing model metadata; using fallback model {} for cost estimation.",
fallback.name
));
session_model = Some(fallback.clone());
fallback
});

entries.push(ConversationMessage {
application: Application::CodexCli,
model: Some(model_state.name.clone()),
global_hash: hash_text(&format!(
"{}_{}_assistant_{}",
file_path_str,
wrapper.timestamp.to_rfc3339(),
entries.len()
)),
local_hash: None,
conversation_hash: hash_text(&file_path_str),
date: wrapper.timestamp,
project_hash: "".to_string(),
stats: Stats::default(),
role: MessageRole::Assistant,
uuid: None,
session_name: session_name
.clone()
.or_else(|| fallback_session_name.clone()),
});
}
_ => {}
}
Expand Down
13 changes: 6 additions & 7 deletions src/analyzers/copilot.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,15 +149,14 @@ fn count_tokens(text: &str) -> u64 {
// Recursively extract all text content from a nested JSON structure
fn extract_text_from_value(value: &simd_json::OwnedValue, accumulated_text: &mut String) {
match value {
simd_json::OwnedValue::String(s) => {
// Only accumulate if it's a "text" field value, not metadata like URIs
// Only accumulate if it's a "text" field value, not metadata like URIs
simd_json::OwnedValue::String(s)
if !s.starts_with("vscode-")
&& !s.starts_with("file://")
&& !s.starts_with("ssh-remote")
{
accumulated_text.push_str(s);
accumulated_text.push(' ');
}
&& !s.starts_with("ssh-remote") =>
{
accumulated_text.push_str(s);
accumulated_text.push(' ');
}
simd_json::OwnedValue::Object(obj) => {
// Look for "text" fields specifically
Expand Down
Loading