Wave A — Functional ingest fix (root cause of empty Sleep reports):
- Rewrote TraceLine struct to match real Claude Code trace JSONL:
type (was kind), timestamp ISO8601 (was epoch ts), message Object,
cwd / gitBranch / parentUuid / uuid / subtype / toolUseID / toolUseResult
- New src/extract.rs: extract_tool_uses + extract_tool_result walks
message.content[] for nested tool_use / tool_result blocks
- New src/classifier.rs: explicit table classifier (tool_error, user_correction,
retry_loop, permission_denied, tool_use:<name>, ...) replaces shallow heuristic
- New src/error.rs: KeiMemoryError enum (IO/Parse/Db) replaces semantic
mismatch where IO error was wrapped as rusqlite::InvalidParameterName
- New src/trace_line.rs: TraceLine + helpers (cube extraction)
- Schema migration v3: events.cwd column + 3 hot-query indices
(events.tool, events.file_path, events.ts) + UNIQUE on patterns
- New tests/ingest_real_trace.rs: synth-fixture asserts tool/file/cwd/class extraction
Wave B — Lib crate split:
- Cargo.toml: [lib] target added alongside existing [[bin]]
- src/lib.rs: pub re-export of all 18 modules
- src/main.rs: 11 mod declarations replaced by single use kei_memory::{…}
- tests/integration.rs: #[path] hack replaced by use kei_memory::{…}
Wave C — TF-IDF dedup + single-JOIN + filter_map fix:
- Schema migration v2: tokens.idf_dirty column + flag-based dedup
- index_document no longer triggers per-call recompute_idf rebuild
- top_similar uses single JOIN via vectors_for_overlapping_sessions helper
(was N round-trips, one session_vector per candidate)
- All filter_map(|r| r.ok()) row-error swallowing replaced with ? propagation
- New tests/tfidf_idf_dedup.rs: 4 tests covering dedup behaviour, IDF emptiness,
JOIN-pruning, empty-query safety
Wave D — Commands split + nits:
- New src/dump.rs (43 LOC) + src/stats.rs (33 LOC):
CLI renderers extracted from commands.rs (was inline SQL + format)
- src/commands.rs: thin wrappers, -42 LOC
- src/injection_guard.rs: inline tests removed (-26 LOC), file under 200 LOC threshold
- tests/injection_guard_unit.rs (new): 4 tests in proper integration crate
- src/patterns.rs: INSERT replaced with INSERT...ON CONFLICT...DO UPDATE
(idempotent re-ingest, uses Wave A's UNIQUE index)
- src/analyze.rs + src/coaccess.rs: filter_map row-error fixes
- src/coaccess.rs: misleading PK comment rewritten
Verify-before-commit (RULE 0.13 §"Verify-before-commit"):
- cargo check --all-targets: PASS (1 unrelated dead-code warning)
- cargo test: 42 passed, 0 failed across 9 test binaries
- STATUS-TRUTH markers aggregated at .claude/agents/_merge/kei-memory-2026-05-01/
Architect-spotted ARCH-MAJOR + ARCH-MINOR + ARCH-NIT findings addressed:
- ARCH-MAJOR Cargo.toml binary-only (Wave B)
- ARCH-MAJOR schema missing indices (Wave A v3)
- ARCH-MAJOR ingest_jsonl choke point (Wave A — extract.rs + classifier.rs)
- ARCH-MAJOR idf O(N·V) per-call rebuild (Wave C)
- ARCH-MINOR patterns no UPSERT (Wave D)
- ARCH-MINOR commands.rs houses dump+stats (Wave D)
- ARCH-MINOR classifier silent contract (Wave A)
- ARCH-MINOR IO error wrapped as rusqlite (Wave A)
- ARCH-MINOR injection_guard inline tests (Wave D)
- ARCH-MINOR tfidf top_similar N round-trips (Wave C)
- ARCH-NIT 3× filter_map(|r| r.ok()) sites (Wave C + D)
- ARCH-NIT coaccess misleading comment (Wave D)
=== STATUS-TRUTH MARKER ===
shipped: functional
stubs: 0
cargo-check: PASS
cargo-test: PASS (42 tests, 0 failures)
behaviour-verified: yes
follow-up-required:
- tests/ingest_guard_tests.rs + tests/guard_test_corpus.rs still on #[path] hack (Wave B follow-up note, ~5 LOC)
- dead_code warning Severity::Warn unused (pre-existing, not blocking)
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
123 lines
3.4 KiB
Rust
123 lines
3.4 KiB
Rust
//! Command handlers — one function per CLI subcommand.
|
|
//!
|
|
//! Constructor Pattern: each handler <30 LOC, single responsibility.
|
|
//! Pulled out of main.rs to keep the dispatcher under the 200 LOC limit.
|
|
|
|
use crate::{analyze, dump, ingest, patterns, stats, tfidf};
|
|
use rusqlite::Connection;
|
|
use std::path::PathBuf;
|
|
use std::process::ExitCode;
|
|
|
|
fn err(msg: &str) -> ExitCode {
|
|
eprintln!("kei-memory: {msg}");
|
|
ExitCode::from(1)
|
|
}
|
|
|
|
pub fn cmd_ingest(
|
|
conn: &Connection,
|
|
session_id: &str,
|
|
transcript: &PathBuf,
|
|
prompt: Option<String>,
|
|
) -> ExitCode {
|
|
match ingest::ingest_jsonl(conn, session_id, transcript) {
|
|
Ok(n) => {
|
|
if let Some(p) = prompt {
|
|
let _ = tfidf::index_document(conn, session_id, &p);
|
|
}
|
|
// Single IDF recompute after any prompt(s) — was per-document.
|
|
let _ = tfidf::recompute_idf_if_stale(conn);
|
|
let _ = patterns::detect_in_session(conn, session_id);
|
|
println!("ingested {n} events into session {session_id}");
|
|
ExitCode::SUCCESS
|
|
}
|
|
Err(e) => err(&format!("ingest failed: {e}")),
|
|
}
|
|
}
|
|
|
|
pub fn cmd_analyze(
|
|
conn: &Connection,
|
|
session: Option<String>,
|
|
last: usize,
|
|
summary: bool,
|
|
) -> ExitCode {
|
|
let _ = tfidf::recompute_idf_if_stale(conn);
|
|
let out = match session {
|
|
Some(id) => analyze::render_report(conn, &id, summary),
|
|
None => analyze::render_recent(conn, last, summary),
|
|
};
|
|
match out {
|
|
Ok(s) => {
|
|
print!("{s}");
|
|
ExitCode::SUCCESS
|
|
}
|
|
Err(e) => err(&format!("analyze failed: {e}")),
|
|
}
|
|
}
|
|
|
|
pub fn cmd_patterns(
|
|
conn: &Connection,
|
|
cross_session: bool,
|
|
session: Option<String>,
|
|
) -> ExitCode {
|
|
let _ = tfidf::recompute_idf_if_stale(conn);
|
|
let rows = if cross_session {
|
|
patterns::detect_cross_session(conn)
|
|
} else if let Some(id) = session {
|
|
patterns::detect_in_session(conn, &id)
|
|
} else {
|
|
patterns::list_all(conn, 50)
|
|
};
|
|
match rows {
|
|
Ok(list) => {
|
|
if list.is_empty() {
|
|
println!("(no patterns)");
|
|
}
|
|
for p in list {
|
|
println!(
|
|
"{:>4} {} session={}",
|
|
p.count,
|
|
p.event_class,
|
|
p.session_id.as_deref().unwrap_or("-")
|
|
);
|
|
}
|
|
ExitCode::SUCCESS
|
|
}
|
|
Err(e) => err(&format!("patterns failed: {e}")),
|
|
}
|
|
}
|
|
|
|
pub fn cmd_similar(conn: &Connection, prompt: &str, limit: usize) -> ExitCode {
|
|
match tfidf::top_similar(conn, prompt, limit) {
|
|
Ok(rows) => {
|
|
if rows.is_empty() {
|
|
println!("(no matches)");
|
|
}
|
|
for (sid, score) in rows {
|
|
println!("{:.4} {}", score, sid);
|
|
}
|
|
ExitCode::SUCCESS
|
|
}
|
|
Err(e) => err(&format!("similar failed: {e}")),
|
|
}
|
|
}
|
|
|
|
pub fn cmd_dump(conn: &Connection, session_id: &str) -> ExitCode {
|
|
match dump::render_events(conn, session_id) {
|
|
Ok(s) => {
|
|
print!("{s}");
|
|
ExitCode::SUCCESS
|
|
}
|
|
Err(e) => err(&format!("dump failed: {e}")),
|
|
}
|
|
}
|
|
|
|
pub fn cmd_stats(conn: &Connection) -> ExitCode {
|
|
match stats::render_stats(conn) {
|
|
Ok(s) => {
|
|
print!("{s}");
|
|
ExitCode::SUCCESS
|
|
}
|
|
Err(e) => err(&format!("stats failed: {e}")),
|
|
}
|
|
}
|
|
|