cc-transcript 14.45.10__tar.gz → 14.45.11__tar.gz

{cc_transcript-14.45.10 → cc_transcript-14.45.11}/PKG-INFO

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

{cc_transcript-14.45.10 → cc_transcript-14.45.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cc-transcript"
-version = "14.45.10" # informational — releases stamp the version from the git tag
+version = "14.45.11" # 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.45.10 → cc_transcript-14.45.11}/rust/crates/core/src/snapshot.rs

@@ -14565,6 +14565,74 @@ mod tests {
         assert!(validate().unwrap_err().status == Status::PermissionDenied);
     }
 
+    #[test]
+    fn source_validation_skips_its_parent_hold_once_cancelled_or_past_its_deadline() {
+        let source = Source::new(&format!("{}\n", user("root")));
+        let sources = canonical_members(&source.directory.join("members"), &["a", "b"], "");
+        let store = store();
+        let owner = context("a");
+        let validate = |cancel: &Cancellation, deadline: u64| {
+            let before = store.source_resolutions.load(Ordering::Relaxed);
+            let validated = store
+                .validate_source_stamps(&sources, &owner, cancel, deadline)
+                .map_err(|error| error.status);
+            (
+                validated,
+                store.source_resolutions.load(Ordering::Relaxed) - before,
+            )
+        };
+        assert_eq!(
+            validate(&Cancellation::default(), now_ms() + 30_000),
+            (Ok(true), 2)
+        );
+        for (cancels, status) in [(true, Status::Cancelled), (false, Status::Deadline)] {
+            let cancel = Cancellation::default();
+            let deadline = now_ms() + 1_000;
+            *store.resolve_hook.lock().unwrap() = Some(Arc::new({
+                let (cancel, last) = (cancel.clone(), sources[1].path.clone());
+                move |path: &Path| {
+                    if path != last {
+                        return;
+                    }
+                    if cancels {
+                        cancel.cancel();
+                    } else {
+                        while now_ms() <= deadline {
+                            std::thread::sleep(std::time::Duration::from_millis(5));
+                        }
+                    }
+                }
+            }));
+            assert_eq!(validate(&cancel, deadline), (Err(status), 1));
+        }
+    }
+
+    #[test]
+    fn empty_membership_validation_reports_cancellation_and_an_expired_deadline() {
+        let store = store();
+        let owner = context("a");
+        let cancelled = Cancellation::default();
+        cancelled.cancel();
+        for (cancel, deadline, status) in [
+            (Cancellation::default(), now_ms(), Status::Deadline),
+            (cancelled, now_ms() + 30_000, Status::Cancelled),
+        ] {
+            let before = store.source_resolutions.load(Ordering::Relaxed);
+            assert_eq!(
+                (
+                    store
+                        .validate_source_stamps(&[], &owner, &cancel, deadline)
+                        .map_err(|error| error.status),
+                    store
+                        .validate_sidechain_dirs(&[], &owner, &cancel, deadline)
+                        .map_err(|error| error.status),
+                ),
+                (Err(status), Err(status))
+            );
+            assert_eq!(store.source_resolutions.load(Ordering::Relaxed), before);
+        }
+    }
+
     #[test]
     fn early_positive_query_rejects_a_parent_retargeted_during_its_page() {
         let source = Source::new(&format!("{}\n", user("root")));
@@ -17846,6 +17914,32 @@ mod tests {
         );
     }
 
+    #[test]
+    fn registered_warmer_cancelled_on_its_last_step_fails_its_final_hold() {
+        let (source, store, owner, mut request) = registered_warming(300);
+        registered_pages(&store, &owner, &request);
+        std::fs::OpenOptions::new()
+            .append(true)
+            .open(source.directory.join("thread-0255.jsonl"))
+            .unwrap()
+            .write_all(format!("{}\n", user("appended")).as_bytes())
+            .unwrap();
+        let cancel = Cancellation::default();
+        *store.built_facts_hook.lock().unwrap() = Some(Arc::new({
+            let cancel = cancel.clone();
+            move |_: &Arc<crate::snapshot_prepared::PreparedFacts>| cancel.cancel()
+        }));
+        let builds = store.fact_builds.load(Ordering::Relaxed);
+        request.insert("deadline_unix_ms", json!(now_ms() + 120_000));
+        let cancelled = store.request(&request, &owner, &cancel);
+        assert_eq!(
+            cancelled["status"].as_str(),
+            Some("cancelled"),
+            "{cancelled:?}"
+        );
+        assert_eq!(store.fact_builds.load(Ordering::Relaxed) - builds, 1);
+    }
+
     #[test]
     fn disk_facts_complete_queries_when_memory_fact_budget_is_smaller() {
         let source = Source::new(&format!("{}\n", user("root")));

{cc_transcript-14.45.10 → cc_transcript-14.45.11}/rust/crates/core/src/snapshot_prepared_service.rs

@@ -904,7 +904,7 @@ impl NativeStore {
                 return Ok(false);
             }
         }
-        dirs.hold()
+        dirs.hold(|| cancel.check(deadline))
     }
 
     fn validate_sidechain_dirs(
@@ -935,7 +935,7 @@ impl NativeStore {
                 return Ok(false);
             }
         }
-        dirs.hold()
+        dirs.hold(|| cancel.check(deadline))
     }
 
     fn prepare_graph(
@@ -1670,7 +1670,7 @@ impl NativeStore {
             });
         }
         let since = active_since_ns(request)?;
-        if !dirs.hold()?
+        if !dirs.hold(|| cancel.check(remaining.deadline_unix_ms))?
             || members
                 .iter()
                 .filter(|member| active(member, since))
@@ -2146,7 +2146,10 @@ impl NativeStore {
             steps += 1;
             uncached_steps += usize::from(!cached);
         }
-        if !dirs.hold()? {
+        if !dirs.hold(|| match cancel.check(remaining.deadline_unix_ms) {
+            Err(error) if error.status == Status::Deadline => Ok(()),
+            checked => checked,
+        })? {
             return Err(SnapshotError::new(
                 Status::Changed,
                 "registered source changed",
@@ -2253,7 +2256,7 @@ impl NativeStore {
         let page = self
             .prepared_query_steps(&mut cursor, &mut dirs, context, reservation, cancel, usage)
             .and_then(|page| {
-                if dirs.hold()? {
+                if dirs.hold(|| cancel.check(cursor.remaining.deadline_unix_ms))? {
                     Ok(page)
                 } else {
                     Err(SnapshotError::new(
@@ -3075,8 +3078,10 @@ impl<'a> ResolvedDirs<'a> {
         Ok(canonical)
     }
 
-    fn hold(&self) -> Result<bool, SnapshotError> {
+    fn hold(&self, check: impl Fn() -> Result<(), SnapshotError>) -> Result<bool, SnapshotError> {
+        check()?;
         for (directory, canonical) in &self.dirs {
+            check()?;
             match self.store.canonical_path(directory) {
                 Ok(current) if current == *canonical => {}
                 Ok(_) => return Ok(false),
@@ -3084,6 +3089,7 @@ impl<'a> ResolvedDirs<'a> {
                 Err(error) => return Err(io_error(error)),
             }
         }
+        check()?;
         Ok(true)
     }
 }