|
| 1 | +# Two-Branch Subdirectories Cleanup Analysis |
| 2 | + |
| 3 | +**Date**: 2025-11-06 |
| 4 | +**Scope**: java/, bugs/, planning/, process/, migration/, testing/ |
| 5 | +**Total Files**: 33 markdown files |
| 6 | + |
| 7 | +--- |
| 8 | + |
| 9 | +## 📊 Summary |
| 10 | + |
| 11 | +| Directory | Files | Duplicates | Consolidation Opportunities | |
| 12 | +|-----------|-------|------------|---------------------------| |
| 13 | +| java/ | 9 | 2 | 4 dependency-check files overlap with consolidated guide | |
| 14 | +| bugs/ | 7 | 0 | Archive resolved bugs (BUG_072-078 are Sep 10) | |
| 15 | +| planning/ | 7 | 1 | Merge 2 implementation plans | |
| 16 | +| process/ | 9 | 2 | Consolidate multi-tool and performance docs | |
| 17 | +| migration/ | 1 | 0 | Keep (only 1 file) | |
| 18 | +| testing/ | 2 | 0 | Keep (recent Oct 30 files) | |
| 19 | + |
| 20 | +**Total Reduction Potential**: 33 → ~18 files (45% reduction) |
| 21 | + |
| 22 | +--- |
| 23 | + |
| 24 | +## 1. java/ Directory Analysis (9 files) |
| 25 | + |
| 26 | +### Exact Duplicates (2 files) |
| 27 | + |
| 28 | +**JAVA_TOOL_CONFIGURATION.md** |
| 29 | +- **java/ version**: 11K, Sep 30 11:11 (MD5: 346109e63178df8e9a9a6b0d47efe2ed) |
| 30 | +- **next/ version**: 11K, Sep 29 22:29 (MD5: 346109e63178df8e9a9a6b0d47efe2ed) ← **DUPLICATE** |
| 31 | +- **Action**: Delete next/JAVA_TOOL_CONFIGURATION.md |
| 32 | + |
| 33 | +**SEVERITY_FILTERING_STRATEGY.md** |
| 34 | +- **java/ version**: 9.7K, Sep 30 11:11 (MD5: eba8f58d2d78ed48f2f685dade86bb09) |
| 35 | +- **next/ version**: 9.7K, Sep 29 22:48 (MD5: eba8f58d2d78ed48f2f685dade86bb09) ← **DUPLICATE** |
| 36 | +- **Action**: Delete next/SEVERITY_FILTERING_STRATEGY.md |
| 37 | + |
| 38 | +### Consolidation Candidates (4 files) |
| 39 | + |
| 40 | +**Dependency-Check Files (4 files overlapping with consolidated guide)**: |
| 41 | + |
| 42 | +1. **DEPENDENCY_CHECK_CACHING_GUIDE.md** (14K, Sep 30) |
| 43 | + - Content: Database caching, monitoring, CronJob setup |
| 44 | + - **Overlap**: dependency_check/DEPENDENCY_CHECK_SETUP_GUIDE.md already covers this |
| 45 | + - **Action**: MERGE unique caching/monitoring content into consolidated guide, then delete |
| 46 | + |
| 47 | +2. **DEPENDENCY_CHECK_IMPLEMENTATION.md** (19K, Sep 30) |
| 48 | + - Content: Implementation guide for optional tool integration |
| 49 | + - **Overlap**: dependency_check/DEPENDENCY_CHECK_SETUP_GUIDE.md covers implementation |
| 50 | + - **Action**: MERGE unique implementation details, then delete |
| 51 | + |
| 52 | +3. **DEPENDENCY_CHECK_SETUP.md** (13K, Sep 30) |
| 53 | + - Content: Basic setup instructions |
| 54 | + - **Overlap**: Directly covered by consolidated guide |
| 55 | + - **Action**: DELETE (fully covered) |
| 56 | + |
| 57 | +4. **summary_dependency_check.md** (2K, Sep 30) |
| 58 | + - Content: Brief summary |
| 59 | + - **Action**: DELETE (redundant with README.md) |
| 60 | + |
| 61 | +### Keep as Java-Specific Docs (3 files) |
| 62 | + |
| 63 | +1. **README.md** (14K, Sep 30) |
| 64 | + - **Purpose**: Master index for Java tools documentation |
| 65 | + - **Action**: KEEP - Update to reference consolidated guides |
| 66 | + |
| 67 | +2. **OPTIONAL_TOOLS_UX_DESIGN.md** (24K, Sep 30) |
| 68 | + - **Purpose**: UX design for SpotBugs and Dependency-Check |
| 69 | + - **Action**: KEEP - Java-specific UX documentation |
| 70 | + |
| 71 | +3. **SPOTBUGS_SETUP.md** (14K, Sep 30) |
| 72 | + - **Purpose**: SpotBugs setup guide |
| 73 | + - **Action**: KEEP - Different from root SPOTBUGS_COMPLETE_GUIDE.md (checked MD5) |
| 74 | + - **Note**: Java/ version is setup guide, root version is comprehensive guide |
| 75 | + |
| 76 | +**java/ Result**: 9 → 3 files (67% reduction) |
| 77 | + |
| 78 | +--- |
| 79 | + |
| 80 | +## 2. bugs/ Directory Analysis (7 files) |
| 81 | + |
| 82 | +**All files dated**: September 10, 2025 (2 months old) |
| 83 | + |
| 84 | +| Bug ID | Size | Title | Status | |
| 85 | +|--------|------|-------|--------| |
| 86 | +| BUG_072 | 9.1K | COMPREHENSIVE_WORKFLOW_ARCHITECTURE_ISSUES | Sep 10 | |
| 87 | +| BUG_073 | 3.3K | V8_ANALYZER_MIGRATION | Sep 10 | |
| 88 | +| BUG_074 | 5.9K | V8_BASE_ANALYZER_SIZE_VIOLATION | Sep 10 | |
| 89 | +| BUG_075 | 3.5K | V9_MISSING_MODELAWARE_INTEGRATION | Sep 10 | |
| 90 | +| BUG_077 | 5.6K | V9_INCORRECT_FALLBACK_LOGIC | Sep 10 | |
| 91 | +| BUG_078 | 6.6K | V9_CLASS_INHERITANCE_ISSUES | Sep 10 | |
| 92 | +| BUG_104 | 4.9K | CONTAINER_FILE_DISCOVERY | Sep 17 | |
| 93 | + |
| 94 | +### Analysis |
| 95 | + |
| 96 | +**BUG_072-078**: September 10 bugs (V8/V9 architecture issues) |
| 97 | +- **Age**: 2 months old |
| 98 | +- **V8**: Deprecated (see docs/DEPRECATED_V7_WARNING.md) |
| 99 | +- **V9**: Current architecture has evolved significantly since Sep 10 |
| 100 | +- **Action**: Archive to `archive/bugs/resolved-2025-09/` |
| 101 | + |
| 102 | +**BUG_104**: September 17 (Container file discovery) |
| 103 | +- **Age**: 7 weeks old |
| 104 | +- **Status**: Likely resolved with V9 completion |
| 105 | +- **Action**: Archive to `archive/bugs/resolved-2025-09/` |
| 106 | + |
| 107 | +**bugs/ Result**: 7 → 0 files (all archived) |
| 108 | + |
| 109 | +--- |
| 110 | + |
| 111 | +## 3. planning/ Directory Analysis (7 files) |
| 112 | + |
| 113 | +### Duplicate Implementation Plans (2 files → 1) |
| 114 | + |
| 115 | +**IMPLEMENTATION_PLAN_2025.md** (25K, Oct 10 15:31) |
| 116 | +- Original comprehensive plan |
| 117 | + |
| 118 | +**IMPLEMENTATION_PLAN_2025_UPDATED.md** (14K, Oct 30 22:59) ← **NEWEST** |
| 119 | +- Updated version with latest priorities |
| 120 | +- **Action**: MERGE both into single IMPLEMENTATION_PLAN.md, delete originals |
| 121 | + |
| 122 | +### Other Planning Docs |
| 123 | + |
| 124 | +| File | Size | Date | Purpose | Action | |
| 125 | +|------|------|------|---------|--------| |
| 126 | +| COST_ANALYSIS.md | 8.5K | Sep 10 | Cost breakdown | KEEP | |
| 127 | +| PHASE_IMPLEMENTATION_PLAN.md | 9.5K | Sep 10 | Phase-based planning | Consider archiving (outdated?) | |
| 128 | +| PRODUCTION_ENVIRONMENT_SETUP.md | 9.0K | Oct 3 | Production setup | KEEP | |
| 129 | +| TESTING_STRATEGY.md | 17K | Sep 29 | Testing strategy | KEEP | |
| 130 | +| TODO_WORKSPACE_FIX.md | 9.6K | Oct 3 | Workspace fix tasks | Check if completed | |
| 131 | + |
| 132 | +### Analysis |
| 133 | + |
| 134 | +**COST_ANALYSIS.md** (Sep 10) |
| 135 | +- **Status**: May be outdated (2 months old) |
| 136 | +- **Action**: Review and either update or archive |
| 137 | + |
| 138 | +**PHASE_IMPLEMENTATION_PLAN.md** (Sep 10) |
| 139 | +- **Status**: Likely superseded by IMPLEMENTATION_PLAN_2025 |
| 140 | +- **Action**: Archive to `archive/planning/` |
| 141 | + |
| 142 | +**TODO_WORKSPACE_FIX.md** (Oct 3) |
| 143 | +- **Status**: Check if tasks are completed |
| 144 | +- **Action**: If completed, archive; otherwise keep |
| 145 | + |
| 146 | +**planning/ Result**: 7 → 4-5 files (30-40% reduction) |
| 147 | + |
| 148 | +--- |
| 149 | + |
| 150 | +## 4. process/ Directory Analysis (9 files) |
| 151 | + |
| 152 | +### Consolidation Candidates |
| 153 | + |
| 154 | +**Multi-Tool Strategy (2 files → 1)**: |
| 155 | +1. **MULTI_TOOL_EXECUTION_STRATEGY.md** (12K, Sep 29) |
| 156 | +2. **MULTI_TOOL_STRATEGY_SUMMARY.md** (9.2K, Sep 29) |
| 157 | +- **Action**: MERGE into single MULTI_TOOL_STRATEGY.md |
| 158 | + |
| 159 | +**Performance Docs (2 files → 1)**: |
| 160 | +1. **ORACLE_PERFORMANCE_SUMMARY.md** (6.9K, Sep 29) |
| 161 | +2. **PERFORMANCE_CALIBRATION_RESULTS.md** (6.8K, Sep 29) |
| 162 | +- **Action**: MERGE into single PERFORMANCE_RESULTS.md |
| 163 | + |
| 164 | +### Keep as Process Documentation |
| 165 | + |
| 166 | +| File | Size | Date | Purpose | Action | |
| 167 | +|------|------|------|---------|--------| |
| 168 | +| README.md | 6.0K | Sep 29 | Process docs index | KEEP | |
| 169 | +| TWO_BRANCH_ANALYSIS_COMPLETE_GUIDE.md | 18K | Sep 29 | Master guide | KEEP | |
| 170 | +| V9_ANALYZER_FIX_PROCESS.md | 4.8K | Sep 10 | Fix process | Archive (outdated) | |
| 171 | +| V9_DEPENDENCY_MIGRATION_PLAN.md | 6.1K | Sep 10 | Migration plan | Archive (completed?) | |
| 172 | + |
| 173 | +**process/ Result**: 9 → 5 files (44% reduction) |
| 174 | + |
| 175 | +--- |
| 176 | + |
| 177 | +## 5. migration/ Directory Analysis (1 file) |
| 178 | + |
| 179 | +**GKE-FALLBACK-GUIDE.md** (5.9K, Sep 19) |
| 180 | +- **Purpose**: Fallback guide for GKE migration |
| 181 | +- **Status**: Keep as migration reference |
| 182 | +- **Action**: KEEP |
| 183 | + |
| 184 | +**migration/ Result**: 1 → 1 file (no change) |
| 185 | + |
| 186 | +--- |
| 187 | + |
| 188 | +## 6. testing/ Directory Analysis (2 files) |
| 189 | + |
| 190 | +**MULTI_REPO_QUICK_START.md** (6.1K, Oct 30 22:59) |
| 191 | +**MULTI_REPO_TEST_MATRIX.md** (11K, Oct 30 22:59) |
| 192 | +- **Date**: October 30 (very recent!) |
| 193 | +- **Purpose**: Multi-repository testing framework |
| 194 | +- **Action**: KEEP both (active testing documentation) |
| 195 | + |
| 196 | +**testing/ Result**: 2 → 2 files (no change) |
| 197 | + |
| 198 | +--- |
| 199 | + |
| 200 | +## 🎯 Recommended Cleanup Plan |
| 201 | + |
| 202 | +### Phase 1: Remove Duplicates (2 files) |
| 203 | +```bash |
| 204 | +# Delete duplicates in next/ (keep java/ versions) |
| 205 | +rm packages/agents/src/two-branch/docs/next/JAVA_TOOL_CONFIGURATION.md |
| 206 | +rm packages/agents/src/two-branch/docs/next/SEVERITY_FILTERING_STRATEGY.md |
| 207 | +``` |
| 208 | + |
| 209 | +### Phase 2: Archive Resolved Bugs (7 files) |
| 210 | +```bash |
| 211 | +mkdir -p packages/agents/src/two-branch/docs/archive/bugs/resolved-2025-09 |
| 212 | +mv packages/agents/src/two-branch/docs/bugs/BUG_* \ |
| 213 | + packages/agents/src/two-branch/docs/archive/bugs/resolved-2025-09/ |
| 214 | +``` |
| 215 | + |
| 216 | +### Phase 3: Consolidate java/ Dependency-Check Docs (4 → 1) |
| 217 | + |
| 218 | +**Action**: Merge unique content from 4 files into dependency_check/DEPENDENCY_CHECK_SETUP_GUIDE.md |
| 219 | + |
| 220 | +**Files to merge**: |
| 221 | +1. java/DEPENDENCY_CHECK_CACHING_GUIDE.md → Add caching/monitoring sections |
| 222 | +2. java/DEPENDENCY_CHECK_IMPLEMENTATION.md → Add implementation details |
| 223 | +3. java/DEPENDENCY_CHECK_SETUP.md → DELETE (fully covered) |
| 224 | +4. java/summary_dependency_check.md → DELETE (redundant) |
| 225 | + |
| 226 | +**Keep in java/**: |
| 227 | +- README.md (update references) |
| 228 | +- OPTIONAL_TOOLS_UX_DESIGN.md |
| 229 | +- SPOTBUGS_SETUP.md |
| 230 | + |
| 231 | +### Phase 4: Consolidate planning/ (7 → 4) |
| 232 | +```bash |
| 233 | +# Merge implementation plans |
| 234 | +# (Manual merge: IMPLEMENTATION_PLAN_2025.md + _UPDATED.md → IMPLEMENTATION_PLAN.md) |
| 235 | + |
| 236 | +# Archive outdated |
| 237 | +mkdir -p packages/agents/src/two-branch/docs/archive/planning/2025-09 |
| 238 | +mv packages/agents/src/two-branch/docs/planning/PHASE_IMPLEMENTATION_PLAN.md \ |
| 239 | + packages/agents/src/two-branch/docs/archive/planning/2025-09/ |
| 240 | +``` |
| 241 | + |
| 242 | +### Phase 5: Consolidate process/ (9 → 5) |
| 243 | + |
| 244 | +**Merges**: |
| 245 | +1. MULTI_TOOL_EXECUTION_STRATEGY.md + MULTI_TOOL_STRATEGY_SUMMARY.md → MULTI_TOOL_STRATEGY.md |
| 246 | +2. ORACLE_PERFORMANCE_SUMMARY.md + PERFORMANCE_CALIBRATION_RESULTS.md → PERFORMANCE_RESULTS.md |
| 247 | + |
| 248 | +**Archives**: |
| 249 | +```bash |
| 250 | +mkdir -p packages/agents/src/two-branch/docs/archive/process/2025-09 |
| 251 | +mv packages/agents/src/two-branch/docs/process/V9_ANALYZER_FIX_PROCESS.md \ |
| 252 | + packages/agents/src/two-branch/docs/archive/process/2025-09/ |
| 253 | +mv packages/agents/src/two-branch/docs/process/V9_DEPENDENCY_MIGRATION_PLAN.md \ |
| 254 | + packages/agents/src/two-branch/docs/archive/process/2025-09/ |
| 255 | +``` |
| 256 | + |
| 257 | +--- |
| 258 | + |
| 259 | +## 📊 Expected Impact |
| 260 | + |
| 261 | +**Before**: 33 files across 6 subdirectories |
| 262 | + |
| 263 | +**After Cleanup**: |
| 264 | +- java/: 9 → 3 files |
| 265 | +- bugs/: 7 → 0 files (all archived) |
| 266 | +- planning/: 7 → 4 files |
| 267 | +- process/: 9 → 5 files |
| 268 | +- migration/: 1 → 1 file |
| 269 | +- testing/: 2 → 2 files |
| 270 | + |
| 271 | +**Total**: 33 → 15 files (55% reduction) |
| 272 | + |
| 273 | +**Archived**: 14 files → archive/ |
| 274 | +**Deleted**: 4 files (duplicates and redundant summaries) |
| 275 | +**Merged**: 10 files → 5 consolidated files |
| 276 | + |
| 277 | +--- |
| 278 | + |
| 279 | +## ⚠️ Manual Review Required |
| 280 | + |
| 281 | +1. **TODO_WORKSPACE_FIX.md** - Are tasks completed? |
| 282 | +2. **COST_ANALYSIS.md** - Update or archive? |
| 283 | +3. **java/README.md** - Update references after consolidation |
| 284 | +4. **Dependency-check consolidation** - Ensure no unique content lost |
| 285 | + |
| 286 | +--- |
| 287 | + |
| 288 | +## ✅ Priority Order |
| 289 | + |
| 290 | +1. **Phase 1** (Duplicates) - Safe, immediate cleanup |
| 291 | +2. **Phase 2** (Bugs) - Archive resolved bugs (2+ months old) |
| 292 | +3. **Phase 3** (Java) - Requires content review before merging |
| 293 | +4. **Phase 4** (Planning) - Merge implementation plans |
| 294 | +5. **Phase 5** (Process) - Consolidate multi-tool and performance docs |
| 295 | + |
| 296 | +**Status**: Ready for Execution |
| 297 | + |
| 298 | +**Next Step**: User approval to proceed with Phase 1 (safest cleanup) |
0 commit comments