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>
83 lines
2.8 KiB
Rust
83 lines
2.8 KiB
Rust
//! Co-access tracking — files touched within a 5-minute window.
|
|
//!
|
|
//! Constructor Pattern: one cube, single responsibility.
|
|
//! Derived from an in-house implementation, algorithmic spec documented in coaccess.md.
|
|
//!
|
|
//! Session_id IS used to scope the window query (avoiding cross-session
|
|
//! false co-access — we never pair file_a from session X with file_b
|
|
//! from session Y), but it isn't part of the coaccess row primary key
|
|
//! (the PK is the canonical file pair). This means a file pair seen in
|
|
//! 5 sessions has 1 row, not 5 — counts aggregate across sessions so
|
|
//! cross-session recurrences surface in `patterns`.
|
|
|
|
use rusqlite::{params, Connection, Result};
|
|
|
|
const WINDOW_SECS: i64 = 300;
|
|
|
|
/// Insert (or increment) pair entries for the new file vs any other file
|
|
/// touched in the same session within the last 5 minutes. Pair ordering
|
|
/// is canonicalised lexically so (A,B) and (B,A) collapse to one row.
|
|
pub fn record_coaccess(
|
|
conn: &Connection,
|
|
session_id: &str,
|
|
file_path: &str,
|
|
ts: i64,
|
|
) -> Result<()> {
|
|
let recent = recent_files_in_window(conn, session_id, file_path, ts)?;
|
|
for other in recent {
|
|
let (a, b) = canonical_pair(file_path, &other);
|
|
conn.execute(
|
|
"INSERT INTO coaccess (file_a, file_b, count) VALUES (?1, ?2, 1)
|
|
ON CONFLICT(file_a, file_b) DO UPDATE SET count = count + 1",
|
|
params![a, b],
|
|
)?;
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn canonical_pair<'a>(x: &'a str, y: &'a str) -> (&'a str, &'a str) {
|
|
if x < y {
|
|
(x, y)
|
|
} else {
|
|
(y, x)
|
|
}
|
|
}
|
|
|
|
fn recent_files_in_window(
|
|
conn: &Connection,
|
|
session_id: &str,
|
|
exclude: &str,
|
|
ts: i64,
|
|
) -> Result<Vec<String>> {
|
|
let mut stmt = conn.prepare(
|
|
"SELECT DISTINCT file_path FROM events
|
|
WHERE session_id = ?1
|
|
AND file_path IS NOT NULL
|
|
AND file_path != ?2
|
|
AND ts >= ?3
|
|
ORDER BY ts DESC LIMIT 10",
|
|
)?;
|
|
let rows = stmt
|
|
.query_map(params![session_id, exclude, ts - WINDOW_SECS], |r| {
|
|
r.get::<_, String>(0)
|
|
})?
|
|
.collect::<Result<Vec<_>>>()?;
|
|
Ok(rows)
|
|
}
|
|
|
|
/// Return (file_a, file_b, count) triples ordered by co-access count DESC.
|
|
/// Not yet exposed on the CLI — used by integration tests and reserved
|
|
/// for the upcoming `kei-memory coaccess --top` subcommand.
|
|
#[allow(dead_code)]
|
|
pub fn top_pairs(conn: &Connection, limit: usize) -> Result<Vec<(String, String, i64)>> {
|
|
let mut stmt = conn.prepare(
|
|
"SELECT file_a, file_b, count FROM coaccess
|
|
ORDER BY count DESC LIMIT ?1",
|
|
)?;
|
|
let rows = stmt
|
|
.query_map(params![limit as i64], |r| {
|
|
Ok((r.get::<_, String>(0)?, r.get::<_, String>(1)?, r.get::<_, i64>(2)?))
|
|
})?
|
|
.collect::<Result<Vec<_>>>()?;
|
|
Ok(rows)
|
|
}
|