chore(release): v0.2.7

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tokemon"
-version = "0.2.6"
+version = "0.2.7"
 edition = "2021"
 description = "Unified LLM token usage tracking across all providers"
 license = "MIT"

README.md

@@ -25,6 +25,7 @@ Unified token usage tracking across all your AI coding tools. `tokemon top` prov
 - **SQLite cache** — parsed data is cached for instant repeated runs and survives log rotation
 - **Budget pacemaker** — set daily/weekly/monthly spending limits with progress tracking
 - **Statusline mode** — compact one-line output for shell prompts and status bars (`tokemon statusline`)
+- **Versioned status JSON** — stable machine-readable summaries for lightweight clients (`tokemon status --json`)
 - **Session breakdown** — per-session cost analysis across all providers (`tokemon sessions`)
 - **MCP server** — expose usage data to AI tools via Model Context Protocol (`tokemon mcp`)
 - **Two display modes** — compact one-row-per-day (default) or detailed per-model breakdown with responsive API Provider and Client columns
@@ -111,6 +112,7 @@ tokemon [OPTIONS] <COMMAND>
 Commands:
   top          Live monitoring dashboard
   report       Generate a static usage report (table, json, or csv)
+  status       Emit a versioned machine-readable status document
   statusline   Compact one-line output for shell prompts and status bars
   budget       Show spending vs configured limits
   sessions     Show per-session cost breakdown
@@ -169,6 +171,23 @@ cost = true
 
 CLI flags always override config values.
 
+### Local pricing overrides
+
+Create `~/.config/tokemon/pricing_override.json` to replace downloaded prices or add custom models:
+
+```json
+{
+  "custom-model": {
+    "input_cost_per_token": 0.000001,
+    "output_cost_per_token": 0.000004,
+    "cache_read_cost": 0.0000001,
+    "cache_creation_cost": 0.00000125
+  }
+}
+```
+
+Prices are in USD per token. Entries are merged by exact model key after the base pricing data is loaded. Supplied fields replace base values, while omitted fields keep their base values. The file is optional and changes take effect the next time `tokemon` starts.
+
 ## Supported Providers
 
 | Provider | Log Location | Format |
@@ -181,7 +200,7 @@ CLI flags always override config values.
 | Cline | VSCode globalStorage | JSON |
 | Roo Code | VSCode globalStorage | JSON |
 | Kilo Code | VSCode globalStorage | JSON |
-| Copilot | VSCode workspaceStorage | JSON (stub) |
+| Copilot | VSCode globalStorage telemetry directories | JSONL |
 | Cursor | `~/.config/tokscale/cursor-cache/usage*.csv` | CSV |
 | Qwen Code | `~/.qwen/tmp/{project}/session.json` | JSON |
 | Pi Agent | `~/.pi/agent/sessions/{project}/*.jsonl` | JSONL |

src/cli.rs

@@ -1,5 +1,6 @@
 use chrono::NaiveDate;
 use clap::{Parser, Subcommand, ValueEnum};
+use std::path::PathBuf;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, ValueEnum)]
 pub enum DisplayMode {
@@ -112,6 +113,8 @@ pub enum Frequency {
 pub enum Commands {
     /// Generate a static usage report (table, json, or csv)
     Report,
+    /// Emit a versioned machine-readable status document
+    Status,
     /// Compact one-line output for shell prompts and status bars
     Statusline,
     /// Show budget progress against configured limits
@@ -120,6 +123,13 @@ pub enum Commands {
     Discover,
     /// Generate default config file at ~/.config/tokemon/config.toml
     Init,
+    /// Manage declarative local usage sources
+    Source {
+        #[command(subcommand)]
+        command: SourceCommands,
+    },
+    /// Open the interactive configuration editor
+    Config,
     /// Show per-session cost breakdown
     Sessions {
         /// Show top N sessions by cost
@@ -145,3 +155,12 @@ pub enum Commands {
         interval: u64,
     },
 }
+
+#[derive(Subcommand)]
+pub enum SourceCommands {
+    /// Validate a definition and preview discovered records
+    Validate {
+        /// TOML definition file to validate
+        definition: PathBuf,
+    },
+}

src/config.rs

@@ -1,4 +1,5 @@
 use std::fs;
+use std::io::ErrorKind;
 use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
@@ -303,22 +304,59 @@ impl Config {
         if let Some(parent) = path.parent() {
             fs::create_dir_all(parent)?;
         }
-        let content = toml::to_string_pretty(self)?;
+        let mut document = match fs::read_to_string(&path) {
+            Ok(existing) => toml::from_str::<toml::Value>(&existing)
+                .unwrap_or_else(|_| toml::Value::Table(toml::map::Map::new())),
+            Err(error) if error.kind() == ErrorKind::NotFound => {
+                toml::Value::Table(toml::map::Map::new())
+            }
+            Err(error) => return Err(error.into()),
+        };
+        let updated = toml::Value::try_from(self)?;
+        merge_toml_tables(&mut document, updated);
+        let content = toml::to_string_pretty(&document)?;
         let header = "# Tokemon configuration\n\
                       # Location: ~/.config/tokemon/config.toml\n\
                       #\n\
                       # Changes here affect default behavior.\n\
                       # CLI flags always override config values.\n\n";
-        fs::write(&path, format!("{header}{content}"))?;
+        let temporary_path = path.with_extension(format!("toml.{}.tmp", std::process::id()));
+        fs::write(&temporary_path, format!("{header}{content}"))?;
+        match fs::rename(&temporary_path, &path) {
+            Ok(()) => {}
+            Err(error) if error.kind() == ErrorKind::AlreadyExists => {
+                fs::remove_file(&path)?;
+                fs::rename(&temporary_path, &path)?;
+            }
+            Err(error) => {
+                let _ = fs::remove_file(&temporary_path);
+                return Err(error.into());
+            }
+        }
         Ok(())
     }
 
     pub fn config_path() -> PathBuf {
-        let config_dir = directories::ProjectDirs::from("", "", "tokemon").map_or_else(
-            || paths::home_dir().join(".config/tokemon"),
-            |d| d.config_dir().to_path_buf(),
-        );
-        config_dir.join(CONFIG_FILENAME)
+        paths::config_dir().join(CONFIG_FILENAME)
+    }
+}
+
+fn merge_toml_tables(existing: &mut toml::Value, updated: toml::Value) {
+    match updated {
+        toml::Value::Table(updated_table) => {
+            if let toml::Value::Table(existing_table) = existing {
+                for (key, value) in updated_table {
+                    if let Some(existing_value) = existing_table.get_mut(&key) {
+                        merge_toml_tables(existing_value, value);
+                    } else {
+                        existing_table.insert(key, value);
+                    }
+                }
+            } else {
+                *existing = toml::Value::Table(updated_table);
+            }
+        }
+        updated => *existing = updated,
     }
 }
 
@@ -422,4 +460,31 @@ mod tests {
         assert_eq!(validated.month_bucket_days, 1);
         assert_eq!(validated.tick_interval, 300); // Clamped to 300
     }
+
+    #[test]
+    fn merging_saved_values_preserves_unknown_keys() {
+        let mut existing: toml::Value = toml::from_str(
+            r#"
+            custom_option = "keep"
+            [columns]
+            custom_column = true
+            cost = false
+            "#,
+        )
+        .expect("valid TOML");
+        let updated: toml::Value = toml::from_str(
+            r#"
+            [columns]
+            cost = true
+            "#,
+        )
+        .expect("valid TOML");
+
+        merge_toml_tables(&mut existing, updated);
+
+        let table = existing.as_table().expect("root table");
+        assert_eq!(table["custom_option"].as_str(), Some("keep"));
+        assert_eq!(table["columns"]["custom_column"].as_bool(), Some(true));
+        assert_eq!(table["columns"]["cost"].as_bool(), Some(true));
+    }
 }