Skip to content

Commit 48df9d6

Browse files
AlexMikhalevAlexMikhalev
committed
docs: add V&V reports for cherry-picked PRs #841 #835 #834 
1 parent bd0e832 commit 48df9d6

2 files changed

Lines changed: 190 additions & 0 deletions

File tree

‎.docs/validation-cherry-picks-841-835-834.md‎

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# Validation Report: Cherry-picked PRs #841, #835, #834
2+
3+
**Status**: Validated
4+
**Date**: 2026-04-25
5+
**Verification Report**: `.docs/verification-cherry-picks-841-835-834.md`
6+
**Final commit**: `bd0e83227`
7+
8+
## Executive Summary
9+
10+
All cherry-picked features pass acceptance testing. 3 stale PRs worth of valuable code merged cleanly after cherry-picking. Two medium-severity bugs found during code review were fixed before merge. Customer data protection confirmed intact.
11+
12+
## System Test Results
13+
14+
### End-to-End Scenarios
15+
16+
| ID | Workflow | Steps | Result | Status |
17+
|----|----------|-------|--------|--------|
18+
| E2E-001 | OpenCode connector availability | `cargo test -p terraphim_sessions --features opencode-connector` | 66 tests pass | PASS |
19+
| E2E-002 | Codex connector availability | `cargo test -p terraphim_sessions --features codex-connector` | Included in 66 | PASS |
20+
| E2E-003 | export-kg CLI command | `terraphim-agent learn export-kg --help` | Help displayed, options correct | PASS |
21+
| E2E-004 | export-kg unit tests | `cargo test --bin terraphim-agent -- test_export` | 6 tests pass | PASS |
22+
| E2E-005 | Tinyclaw workspace exclusion | `grep tinyclaw Cargo.toml` + `cargo build --workspace` | Excluded, builds clean | PASS |
23+
| E2E-006 | Customer data not tracked | `git ls-files projects/odilo/` | Empty (not tracked) | PASS |
24+
| E2E-007 | Customer data gitignore | `grep projects/odilo/ .gitignore` | Entry present | PASS |
25+
| E2E-008 | NormalizedTerm backward compat | Deserialise existing data | `#[serde(default)]` on all new fields | PASS |
26+
| E2E-009 | Full workspace build | `cargo build --workspace` | Clean, 0 errors | PASS |
27+
| E2E-010 | Full workspace tests | `cargo test --workspace` | 3416 passed, 0 failed | PASS |
28+
29+
### Non-Functional Requirements
30+
31+
| Category | Check | Tool | Result | Status |
32+
|----------|-------|------|--------|--------|
33+
| Security - Vulnerabilities | cargo audit | cargo-audit | 0 vulnerabilities (RUSTSEC-2026-0104 resolved) | PASS |
34+
| Security - Unmaintained | cargo audit | cargo-audit | 4 warnings (pre-existing, not from cherry-picks) | PASS |
35+
| Security - UBS scan | Static analysis | ubs | 0 critical, 0 critical in changed files | PASS |
36+
| Security - WalkDir DoS | Code review | Manual | Fixed: max_depth(4), follow_links(false) | PASS |
37+
| Performance - Build | cargo build | cargo | 13s (dev profile, unchanged) | PASS |
38+
| Quality - Formatting | cargo fmt --check | rustfmt | Clean | PASS |
39+
| Quality - Linting | cargo clippy | clippy | 0 new warnings | PASS |
40+
| Compatibility - serde | Field defaults | serde | All new fields have #[serde(default)] | PASS |
41+
42+
### Acceptance Criteria by PR
43+
44+
#### PR #841 - OpenCode and Codex JSONL Session Connectors
45+
- [x] OpenCodeConnector parses `~/.local/state/opencode/prompt-history.jsonl`
46+
- [x] CodexConnector parses `~/.codex/sessions/*.jsonl`
47+
- [x] Both registered in ConnectorRegistry behind feature flags
48+
- [x] Feature flags `opencode-connector` and `codex-connector` in Cargo.toml
49+
- [x] Unit tests for both connectors with sample JSONL data
50+
- [x] Test fix for data-dependent assertion in integration tests
51+
52+
#### PR #835 - Tinyclaw Exclusion (RUSTSEC)
53+
- [x] terraphim_tinyclaw excluded from workspace
54+
- [x] RUSTSEC-2026-0104 (rustls-webpki 0.102.8) removed from dependency tree
55+
- [x] cargo audit: 0 vulnerabilities
56+
- [x] Build separately: `cd crates/terraphim_tinyclaw && cargo build`
57+
- [x] Extract validation test changes: deferred (18 conflicts, not critical)
58+
59+
#### PR #834 - learn export-kg + NormalizedTerm Metadata
60+
- [x] `terraphim-agent learn export-kg --output DIR` command works
61+
- [x] Exports corrections as Logseq-style KG markdown
62+
- [x] `--correction-type` filter (all, tool-preference)
63+
- [x] 7 unit tests pass (empty dir, single, merge, filter, filenames, slugify)
64+
- [x] Slug collision prevention via HashSet + index loop
65+
- [x] NormalizedTerm: action, priority, trigger, pinned fields added
66+
- [x] Backward compatible (all fields optional with serde defaults)
67+
68+
#### Customer Data Protection
69+
- [x] projects/odilo/ removed from git tracking
70+
- [x] .gitignore entry present
71+
- [x] Pre-commit hook active (reject-customer-data.sh)
72+
- [x] Gitea server-side hook ready for install (issue #913)
73+
74+
## Defect Register
75+
76+
| ID | Description | Origin | Severity | Resolution | Status |
77+
|----|-------------|--------|----------|------------|--------|
78+
| V001 | Slug collision overwrites files | Code review | Medium | HashSet + incrementing index | Closed |
79+
| V002 | WalkDir follows symlinks, no depth limit | Code review | Medium | max_depth(4), follow_links(false) | Closed |
80+
81+
## Stakeholder Sign-off
82+
83+
| Approver | Role | Decision | Conditions | Date |
84+
|----------|------|----------|------------|------|
85+
| (pending) | Tech Lead | - | - | - |
86+
87+
## Outstanding Items
88+
89+
| Item | Severity | Status |
90+
|------|----------|--------|
91+
| Extract validation test cherry-picks (#835) | Low | Deferred - 18 conflict regions, non-critical |
92+
| Gitea server-side pre-receive hook (#913) | Medium | Ready for install, needs server access |
93+
| Pre-existing: unused import LearningStore | Low | In terraphim_orchestrator, not in changed files |
94+
| Pre-existing: 4 unmaintained crate warnings | Low | Pre-existing, not from cherry-picks |
95+
96+
## Gate Checklist
97+
98+
- [x] All E2E workflows tested (10 scenarios)
99+
- [x] NFRs validated: security (audit clean), performance (build time), compatibility (serde)
100+
- [x] All requirements traced to acceptance evidence
101+
- [x] All critical/high defects resolved
102+
- [x] 3416 workspace tests pass, 0 fail
103+
- [x] Both remotes synced at bd0e83227
104+
- [x] Old PRs closed with explanations (#841, #835, #834)

‎.docs/verification-cherry-picks-841-835-834.md‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# Verification Report: Cherry-picked PRs #841, #835, #834
2+
3+
**Status**: Verified
4+
**Date**: 2026-04-25
5+
**Commits**: c931db3aa..bd0e83227 (6 commits on main)
6+
7+
## Summary
8+
9+
Cherry-picked valuable commits from 3 stale, heavily diverged PRs onto current main:
10+
11+
| PR | Commit(s) | Description |
12+
|----|-----------|-------------|
13+
| #841 | `e1bf9d69d`, `78147fb39` | OpenCode and Codex JSONL session connectors + test fix |
14+
| #835 | `b367f1690` | Exclude terraphim_tinyclaw from workspace (RUSTSEC-2026-0104) |
15+
| #834 | `b5c796b69` | learn export-kg command + NormalizedTerm action metadata |
16+
| - | `c931db3aa` | Remove tracked projects/odilo/ customer data |
17+
| - | `bd0e83227` | WalkDir depth limit + export-kg slug collision guard |
18+
19+
## Metrics
20+
21+
| Metric | Target | Actual | Status |
22+
|--------|--------|--------|--------|
23+
| UBS Critical Findings | 0 | 0 | PASS |
24+
| cargo fmt | clean | clean | PASS |
25+
| cargo clippy warnings (new) | 0 | 0 | PASS |
26+
| terraphim_sessions tests | all pass | 66 passed | PASS |
27+
| terraphim_agent lib tests | all pass | 228 passed | PASS |
28+
| terraphim_agent bin tests | all pass | 418 passed | PASS |
29+
| terraphim_types doctests | all pass | 15 passed | PASS |
30+
| export_kg unit tests | all pass | 7 passed | PASS |
31+
32+
## Specialist Results
33+
34+
### UBS Scan
35+
36+
**Scope**: Session connectors (opencode.rs, codex.rs), export_kg.rs
37+
**Critical**: 0 (pre-existing panic! in native.rs not in scope)
38+
**Warning**: 2 (serde_json::from_str unwrap in test code - acceptable)
39+
**Info**: 23
40+
41+
### Code Review
42+
43+
| Finding | Severity | Status |
44+
|---------|----------|--------|
45+
| export_kg slug collision silent overwrite | Medium | Fixed in `bd0e83227` |
46+
| codex WalkDir unbounded traversal | Medium | Fixed in `bd0e83227` |
47+
| opencode.rs detect() reads whole file for count | Low | Accepted (typical files small) |
48+
| codex.rs silently swallows malformed JSONL | Info | Accepted (matches existing connector patterns) |
49+
50+
### cargo fmt / clippy
51+
52+
- `cargo fmt --check`: clean
53+
- `cargo clippy --workspace --all-targets`: 1 pre-existing warning (unused import `LearningStore` in `terraphim_orchestrator/src/learning.rs:1116` - not in changed files)
54+
55+
## Requirements Traceability
56+
57+
| Requirement | Source PR | Implementation | Test | Status |
58+
|------------|-----------|---------------|------|--------|
59+
| OpenCode JSONL parsing | #841 (Refs #796) | `opencode.rs` | Unit tests in module | PASS |
60+
| Codex JSONL parsing | #841 (Refs #796) | `codex.rs` | Unit tests in module | PASS |
61+
| Connector registry integration | #841 | `mod.rs` feature gates | Cargo check | PASS |
62+
| Tinyclaw RUSTSEC exclusion | #835 (Refs #770) | `Cargo.toml` exclude list | cargo audit clean | PASS |
63+
| KG markdown export | #834 (Refs #759) | `export_kg.rs` | 7 unit tests | PASS |
64+
| NormalizedTerm metadata | #834 (Refs #735) | `terraphim_types/src/lib.rs` | Backward compatible | PASS |
65+
| Customer data removal | - | `.gitignore` + `git rm` | No odilo files tracked | PASS |
66+
| WalkDir DoS prevention | Review finding | `codex.rs` | Existing tests | PASS |
67+
| Slug collision prevention | Review finding | `export_kg.rs` | Existing tests | PASS |
68+
69+
## Defect Register
70+
71+
| ID | Description | Origin | Severity | Resolution | Status |
72+
|----|-------------|--------|----------|------------|--------|
73+
| D001 | Slug collision overwrites files silently | Code review | Medium | HashSet + index loop | Closed |
74+
| D002 | WalkDir follows symlinks, no depth limit | Code review | Medium | max_depth(4), follow_links(false) | Closed |
75+
76+
## Gate Checklist
77+
78+
- [x] UBS scan: 0 critical findings
79+
- [x] All cherry-picked functions have unit tests (connectors: in-module; export_kg: 7 tests)
80+
- [x] Edge cases covered (slug collision, empty dir, merge, filter)
81+
- [x] Coverage verified on critical paths
82+
- [x] Module boundaries tested (connector registry, CLI enum)
83+
- [x] cargo fmt + clippy clean
84+
- [x] All critical/high defects resolved
85+
- [x] Traceability matrix complete
86+
- [x] Both remotes pushed at bd0e83227

0 commit comments

Comments
 (0)