cc-transcript 14.37.0__tar.gz → 14.37.2__tar.gz

{cc_transcript-14.37.0 → cc_transcript-14.37.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-transcript
-Version: 14.37.0
+Version: 14.37.2
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{cc_transcript-14.37.0 → cc_transcript-14.37.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cc-transcript"
-version = "14.37.0" # informational — releases stamp the version from the git tag
+version = "14.37.2" # informational — releases stamp the version from the git tag
 description = "Grep every Claude Code session you've ever run."
 readme = "README.md"
 license = "PolyForm-Noncommercial-1.0.0"

{cc_transcript-14.37.0 → cc_transcript-14.37.2}/rust/crates/cli/Cargo.toml

@@ -4,10 +4,6 @@ version = "0.9.0"
 edition = "2021"
 publish = false
 
-[[bin]]
-name = "cc-transcript"
-path = "src/main.rs"
-
 [dependencies]
 cc-transcript-core = { path = "../core", features = ["command", "sqlite"] }
 clap = { version = "4.5", features = ["derive", "env", "string"] }

{cc_transcript-14.37.0 → cc_transcript-14.37.2}/rust/crates/cli/src/lib.rs

@@ -1,11 +1,12 @@
-//! The cc-transcript CLI: the clap twin of the retired click tree (cli.py), sharing one
-//! command surface between the `[[bin]]` and the `_native.cli_main` pyfunction.
+//! The cc-transcript CLI: the clap twin of the retired click tree (cli.py), run by the
+//! `_native.cli_main` pyfunction.
 
 use std::path::PathBuf;
 use std::sync::atomic::{AtomicBool, Ordering};
+use std::sync::OnceLock;
 
 use clap::error::ErrorKind as ClapErrorKind;
-use clap::{Args, Parser, Subcommand};
+use clap::{Args, CommandFactory, FromArgMatches, Parser, Subcommand};
 
 pub mod commands;
 pub mod output;
@@ -18,6 +19,15 @@ use output::CliExit;
 /// (cli.py watch_ catches KeyboardInterrupt); outside watch it means exit 130.
 pub static WATCH_ACTIVE: AtomicBool = AtomicBool::new(false);
 pub static WATCH_INTERRUPTED: AtomicBool = AtomicBool::new(false);
+
+static VERSION: OnceLock<String> = OnceLock::new();
+
+fn pkg_version() -> &'static str {
+    VERSION
+        .get()
+        .expect("run records the version before dispatch")
+}
+
 pub(crate) static SCAN_CANCELLATION: std::sync::Mutex<
     Option<cc_transcript_core::snapshot::Cancellation>,
 > = std::sync::Mutex::new(None);
@@ -40,16 +50,6 @@ pub fn install_sigint_handler() {
     });
 }
 
-fn pkg_version() -> String {
-    let pyproject = include_str!("../../../../pyproject.toml");
-    pyproject
-        .lines()
-        .find_map(|line| line.strip_prefix("version = \""))
-        .and_then(|rest| rest.strip_suffix('"'))
-        .unwrap_or(env!("CARGO_PKG_VERSION"))
-        .to_string()
-}
-
 const KIND_CHOICES: [&str; 6] = ["user", "assistant", "system", "mode", "other", "attachment"];
 const WHERE_CHOICES: [&str; 3] = ["text", "thinking", "tools"];
 const LIST_PROVIDER_CHOICES: [&str; 3] = ["claude", "codex", "all"];
@@ -78,7 +78,6 @@ const CORPUS_INCOMPATIBLE: [&str; 15] = [
 #[derive(Parser)]
 #[command(
     name = "cc-transcript",
-    version = pkg_version(),
     about = "Investigate Claude Code transcripts: list, show, grep, and stats.",
     disable_help_subcommand = true
 )]
@@ -498,10 +497,14 @@ pub enum CorrectionsCmd {
     Sql { statement: String },
 }
 
-/// Full-argv entry shared by the `[[bin]]` and `_native.cli_main`: parses, dispatches,
-/// and returns the exit code verbatim.
-pub fn run(argv: Vec<String>) -> i32 {
-    let cli = match Cli::try_parse_from(&argv) {
+/// Full-argv entry for `_native.cli_main`: parses, dispatches, and returns the exit
+/// code verbatim. `version` is what `--version` prints.
+pub fn run(argv: Vec<String>, version: String) -> i32 {
+    let parsed = Cli::command()
+        .version(VERSION.get_or_init(|| version).as_str())
+        .try_get_matches_from(&argv)
+        .and_then(|matches| Cli::from_arg_matches(&matches));
+    let cli = match parsed {
         Ok(cli) => cli,
         Err(err) => {
             let code = match err.kind() {
@@ -514,7 +517,7 @@ pub fn run(argv: Vec<String>) -> i32 {
     };
     let Some(cmd) = cli.cmd else {
         // click: a bare group invocation prints help to stderr and exits 2.
-        let mut help = <Cli as clap::CommandFactory>::command();
+        let mut help = Cli::command();
         eprint!("{}", help.render_long_help());
         return 2;
     };

{cc_transcript-14.37.0 → cc_transcript-14.37.2}/rust/crates/core/src/snapshot.rs

@@ -204,6 +204,10 @@ impl SourceStamp {
         self
     }
 
+    pub fn window_bytes(&self) -> u64 {
+        self.size - self.identity.window_base
+    }
+
     pub fn viewed_as(mut self, pinned: SourceStamp) -> Self {
         self.identity.window_base = pinned.identity.window_base;
         self
@@ -6765,13 +6769,10 @@ impl NativeStore {
             return Err(invalid("source must be a regular file"));
         }
         let stamp = SourceStamp::of(&metadata);
-        if stamp.size > self.config.source as u64 {
-            return Err(SnapshotError::new(
-                Status::SourceLimit,
-                "source exceeds owner bound",
-            ));
-        }
-        let budget = limits.max_source_read_bytes.min(stamp.size as usize);
+        let budget = limits
+            .max_source_read_bytes
+            .min(self.config.source)
+            .min(stamp.size as usize);
         let mut reservation = self.reserve_projection(context, 0)?;
         let mut pending: Vec<u8> = Vec::new();
         let mut pending_start = stamp.size;
@@ -6962,7 +6963,7 @@ impl NativeStore {
         }
         let window = tail_bytes(request)?;
         let stamp = SourceStamp::of(&metadata).windowed(window);
-        if stamp.size > self.config.source as u64 {
+        if stamp.window_bytes() > self.config.source as u64 {
             return Err(SnapshotError::new(
                 Status::SourceLimit,
                 "source exceeds owner bound",
@@ -11875,6 +11876,22 @@ mod tests {
         );
     }
 
+    #[test]
+    fn tail_reads_the_newest_events_of_a_source_past_the_owner_bound() {
+        let source = Source::new(&users(0..50));
+        let store = NativeStore::new(&json!({"max_read_bytes_per_step":64,"max_source_bytes":users(40..50).len(),"max_retained_bytes":32*1024*1024,"reserved_hook_accounted_bytes":4096})).unwrap();
+        let owner = context("a");
+        let response = store.request(
+            &tail_request(&source.path, 5, 1024 * 1024),
+            &owner,
+            &Cancellation::default(),
+        );
+        assert_eq!(response["status"].as_str(), Some("ok"), "{response:?}");
+        assert_eq!(tail_uuids(&response), ["45", "46", "47", "48", "49"]);
+        let read = response["usage"]["source_bytes_read"].as_u64().unwrap() as usize;
+        assert!(read <= users(40..50).len(), "{read}");
+    }
+
     #[test]
     fn tail_refuses_codex_sources_and_counts_outside_the_budgets() {
         let codex = Source::new(

{cc_transcript-14.37.0 → cc_transcript-14.37.2}/rust/crates/core/src/snapshot_root_warm.rs

@@ -23,7 +23,7 @@ impl NativeStore {
             return Err(invalid("root source must be a regular file"));
         }
         let current = SourceStamp::of(&metadata).windowed(tail_bytes(request)?);
-        if current.size > self.config.source as u64 {
+        if current.window_bytes() > self.config.source as u64 {
             return Err(SnapshotError::new(
                 Status::SourceLimit,
                 "root source exceeds owner bound",
@@ -346,6 +346,41 @@ mod root_warm_tests {
         std::fs::remove_dir_all(directory).unwrap();
     }
 
+    #[test]
+    fn a_trailing_window_of_a_root_past_the_source_bound_warms_and_acquires() {
+        let (directory, path) = source(4 * 1024 * 1024);
+        let bound = std::fs::metadata(&path).unwrap().len() - 1;
+        let store = NativeStore::new(&json!({"max_read_bytes_per_step":256*1024,"max_source_bytes":bound,"max_retained_bytes":128*1024*1024,"reserved_hook_accounted_bytes":4096,"max_leases":16,"reserved_hook_leases":1})).unwrap();
+        let context = context("bounded-window");
+        let mut request = warm_request(&path, 256 * 1024);
+        request.insert("tail_bytes", json!(256 * 1024));
+        let mut finished = false;
+        for _ in 0..24 {
+            let reply = store.request(&request, &context, &Cancellation::default());
+            assert_eq!(reply["status"].as_str(), Some("ok"), "{reply:?}");
+            if reply["data"]["complete"].as_bool() == Some(true) {
+                finished = true;
+                break;
+            }
+        }
+        assert!(finished);
+        let mut acquire = request.clone();
+        acquire.insert("operation", json!("acquire"));
+        let acquired = store.request(&acquire, &context, &Cancellation::default());
+        assert_eq!(acquired["status"].as_str(), Some("ok"), "{acquired:?}");
+        acquire.insert("tail_bytes", json!(null));
+        let whole = store.request(&acquire, &context, &Cancellation::default());
+        assert_eq!(whole["status"].as_str(), Some("source_limit"), "{whole:?}");
+        assert_eq!(whole["reason"].as_str(), Some("source exceeds owner bound"));
+        let whole_warm = store.request(
+            &warm_request(&path, 256 * 1024),
+            &context,
+            &Cancellation::default(),
+        );
+        assert_eq!(whole_warm["status"].as_str(), Some("source_limit"), "{whole_warm:?}");
+        std::fs::remove_dir_all(directory).unwrap();
+    }
+
     #[test]
     fn a_base_advance_supersedes_the_previous_window_pin() {
         let (directory, path) = source(4 * 1024 * 1024);

{cc_transcript-14.37.0 → cc_transcript-14.37.2}/rust/crates/py/src/python.rs

@@ -1031,8 +1031,12 @@ fn tool_facts<'py>(
 #[pyfunction]
 fn cli_main(py: Python<'_>) -> PyResult<i32> {
     let argv: Vec<String> = py.import("sys")?.getattr("argv")?.extract()?;
+    let version: String = py
+        .import("importlib.metadata")?
+        .call_method1("version", ("cc-transcript",))?
+        .extract()?;
     cc_transcript_cli::install_sigint_handler();
-    Ok(py.detach(|| cc_transcript_cli::run(argv)))
+    Ok(py.detach(|| cc_transcript_cli::run(argv, version)))
 }
 
 #[pyo3_stub_gen::derive::gen_stub_pyfunction]

cc_transcript-14.37.0/rust/crates/cli/src/main.rs

@@ -1,4 +0,0 @@
-fn main() {
-    cc_transcript_cli::install_sigint_handler();
-    std::process::exit(cc_transcript_cli::run(std::env::args().collect()));
-}