cc-transcript 14.36.0__tar.gz → 14.37.1__tar.gz

{cc_transcript-14.36.0 → cc_transcript-14.37.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cc-transcript
-Version: 14.36.0
+Version: 14.37.1
 Classifier: Development Status :: 3 - Alpha
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -18,7 +18,7 @@ Requires-Dist: ruff>=0.8 ; extra == 'dev'
 Requires-Dist: sqlite-vec>=0.1.9 ; extra == 'judge'
 Requires-Dist: model2vec>=0.8.2 ; extra == 'judge'
 Requires-Dist: numpy>=1.26 ; extra == 'judge'
-Requires-Dist: spawnllm>=0.5.4,<0.6 ; extra == 'llm'
+Requires-Dist: spawnllm>=0.17.1,<0.18 ; extra == 'llm'
 Provides-Extra: dev
 Provides-Extra: judge
 Provides-Extra: llm

{cc_transcript-14.36.0 → cc_transcript-14.37.1}/cc_transcript/extract/correct.py

@@ -3,11 +3,12 @@
 :func:`extract_correction` harvests the candidate incorrect edits around a
 feedback anchor (deterministically, via :mod:`cc_transcript.evidence`), then picks
 the single edit the feedback faults and appends that one row to the shared
-ledger. The pick is an LLM call by default — lifted from cc-steer's enrich
-prompt — and degrades to the best-overlap candidate when no LLM backend is ready
-(:func:`usable_backend` returns None). The pick keys to the candidate's index, so
-the row carries the real cross-language ``incorrect_digest`` from the harvested
-tool call, never reconstructed content.
+ledger. The pick is a Jev label decision by default; when Jev errors or refuses
+it falls back to an LLM call — lifted from cc-steer's enrich prompt — and to the
+best-overlap candidate when no LLM backend is ready either (:func:`usable_backend`
+returns None). The pick keys to the candidate's index, so the row carries the
+real cross-language ``incorrect_digest`` from the harvested tool call, never
+reconstructed content.
 
 Behind the ``[llm]`` extra: this module imports pydantic at definition time and
 ``spawnllm`` lazily, so only LLM-capable consumers import it. A hook that merely
@@ -29,7 +30,7 @@ if TYPE_CHECKING:
     from collections.abc import Sequence
     from pathlib import Path
 
-    from spawnllm import LlmBackend, TModel
+    from spawnllm import Label, LlmBackend, TModel
 
     from cc_transcript.activity import SessionActivity
     from cc_transcript.corrections import Correction, CorrectionLog
@@ -38,6 +39,13 @@ if TYPE_CHECKING:
     from cc_transcript.tools import Hunk
 
 HUNK_BUDGET = Budget(tool_chars=600)
+NO_CANDIDATE = "none"
+
+PICK_QUESTION = """\
+Which single candidate edit does the developer FEEDBACK fault? The candidates are edits an AI coding \
+assistant made shortly before the feedback, newest first, each with the correction that later overwrote \
+it when one was found; the correction ranked most likely by content overlap is tagged [likely fix]. \
+Answer none when the feedback faults the approach, a command, or work outside these edits."""
 
 PICK_PROMPT = """\
 You are grounding one piece of developer FEEDBACK on an AI coding assistant's work
@@ -107,17 +115,37 @@ def candidate_block(index: int, pair: CandidatePair, *, anchor_turn: int, likely
     )
 
 
-def build_pick_prompt(feedback: str, pairs: Sequence[CandidatePair], *, anchor_turn: int) -> str:
+def candidate_blocks(pairs: Sequence[CandidatePair], *, anchor_turn: int) -> str:
     likely = likely_fix(pairs)
-    return PICK_PROMPT.format(
-        candidates="\n\n".join(
-            candidate_block(index, pair, anchor_turn=anchor_turn, likely=pair is likely)
-            for index, pair in enumerate(pairs, 1)
-        ),
-        feedback=feedback,
+    return "\n\n".join(
+        candidate_block(index, pair, anchor_turn=anchor_turn, likely=pair is likely)
+        for index, pair in enumerate(pairs, 1)
+    )
+
+
+def build_pick_prompt(feedback: str, pairs: Sequence[CandidatePair], *, anchor_turn: int) -> str:
+    return PICK_PROMPT.format(candidates=candidate_blocks(pairs, anchor_turn=anchor_turn), feedback=feedback)
+
+
+def pick_label(pairs: Sequence[CandidatePair]) -> Label:
+    from spawnllm import Label
+
+    return Label(
+        PICK_QUESTION,
+        {
+            NO_CANDIDATE: "The feedback is not about any of these edits",
+            **{
+                str(index): f"candidate {index}: {pair.incorrect.file_path} ({pair.incorrect.tool})"
+                for index, pair in enumerate(pairs, 1)
+            },
+        },
     )
 
 
+def pair_for(choice: str, pairs: Sequence[CandidatePair]) -> CandidatePair | None:
+    return None if choice == NO_CANDIDATE else pairs[int(choice) - 1]
+
+
 def usable_backend() -> LlmBackend | None:
     """The first ready spawnllm backend for the ``review`` specialty, or None when none is ready.
 
@@ -132,11 +160,27 @@ def usable_backend() -> LlmBackend | None:
         return None
 
 
+async def jev_choice(pairs: Sequence[CandidatePair], *, feedback: str, anchor_turn: int) -> str | None:
+    from spawnllm import DecideError, DecideKeyMissing, LabelAnswer, decide
+
+    try:
+        decision = await decide(
+            {"candidate_edits": candidate_blocks(pairs, anchor_turn=anchor_turn), "feedback": feedback},
+            {"pick": pick_label(pairs)},
+        )
+    except (DecideError, DecideKeyMissing, TimeoutError):
+        return None
+    answer = decision.answers["pick"]
+    return answer.choice if isinstance(answer, LabelAnswer) else None
+
+
 async def choose_pair(
     pairs: Sequence[CandidatePair], *, feedback: str, anchor_turn: int, tier: TModel, backend: LlmBackend | None
 ) -> CandidatePair | None:
     from spawnllm import extract
 
+    if (choice := await jev_choice(pairs, feedback=feedback, anchor_turn=anchor_turn)) is not None:
+        return pair_for(choice, pairs)
     if backend is None:
         return max(pairs, key=lambda pair: pair.overlap)
     pick = await extract(
@@ -158,9 +202,10 @@ async def extract_correction(
 ) -> Correction | None:
     """Harvests around ``anchor`` and appends the one correction ``feedback`` faults.
 
-    The faulted candidate is the LLM's pick when ``backend`` is given, else the
-    best-overlap candidate. Idempotent per anchor: a no-op when this anchor
-    already has a row, so re-runs and overlapping producers never duplicate.
+    The faulted candidate is Jev's pick; when Jev errors or refuses, it is the
+    LLM's pick when ``backend`` is given, else the best-overlap candidate.
+    Idempotent per anchor: a no-op when this anchor already has a row, so
+    re-runs and overlapping producers never duplicate.
     Returns the appended correction, or None when nothing is harvested or picked.
     """
     if await log.for_anchor(anchor.session_id, anchor.event_uuid):

{cc_transcript-14.36.0 → cc_transcript-14.37.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cc-transcript"
-version = "14.36.0" # informational — releases stamp the version from the git tag
+version = "14.37.1" # 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"
@@ -41,7 +41,7 @@ dev = [
     "ty>=0.0.44",
     "ruff>=0.8",
 ]
-llm = ["spawnllm>=0.5.4,<0.6"]
+llm = ["spawnllm>=0.17.1,<0.18"]
 judge = [
     "sqlite-vec>=0.1.9",
     "model2vec>=0.8.2",

{cc_transcript-14.36.0 → cc_transcript-14.37.1}/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.36.0 → cc_transcript-14.37.1}/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.36.0 → cc_transcript-14.37.1}/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.36.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()));
-}