|
| 1 | +# Branch Split Summary |
| 2 | + |
| 3 | +## Branches Created |
| 4 | +- `optimizer-enablers`: Infrastructure improvements and bugfixes (no optimizer code) |
| 5 | +- `optimizer-implementation`: Full optimizer implementation (includes all changes) |
| 6 | + |
| 7 | +## Files Removed from optimizer-enablers Branch |
| 8 | +✅ Already removed: |
| 9 | +- `cmd/thv-operator/pkg/optimizer/` (entire directory) |
| 10 | +- `pkg/vmcp/optimizer/` (entire directory) |
| 11 | +- `pkg/vmcp/server/adapter/optimizer_adapter.go` |
| 12 | +- `pkg/vmcp/server/adapter/optimizer_adapter_test.go` |
| 13 | +- `pkg/vmcp/server/optimizer_test.go` |
| 14 | +- `examples/vmcp-config-optimizer.yaml` |
| 15 | +- `test/e2e/thv-operator/virtualmcp/virtualmcp_optimizer_test.go` |
| 16 | + |
| 17 | +## Files That Need Manual Cleanup in optimizer-enablers Branch |
| 18 | + |
| 19 | +### 1. `pkg/vmcp/config/config.go` |
| 20 | +- Revert `OptimizerConfig` struct to simpler version from main |
| 21 | +- Keep the `Optimizer *OptimizerConfig` field in `Config` struct (exists in main) |
| 22 | + |
| 23 | +### 2. `pkg/vmcp/server/server.go` |
| 24 | +- Remove optimizer initialization code |
| 25 | +- Remove optimizer-related imports |
| 26 | +- Keep other improvements (tracing, health checks, etc.) |
| 27 | + |
| 28 | +### 3. `cmd/vmcp/app/commands.go` |
| 29 | +- Remove optimizer configuration parsing |
| 30 | +- Remove optimizer-related imports |
| 31 | +- Keep other CLI improvements |
| 32 | + |
| 33 | +### 4. `pkg/vmcp/router/default_router.go` |
| 34 | +- Remove `optim_*` prefix handling (if added) |
| 35 | +- Keep other router improvements |
| 36 | + |
| 37 | +### 5. `cmd/thv-operator/pkg/vmcpconfig/converter.go` |
| 38 | +- Remove `resolveEmbeddingService` function |
| 39 | +- Remove optimizer config conversion logic |
| 40 | +- Keep other converter improvements |
| 41 | + |
| 42 | +### 6. CRD Files |
| 43 | +- `deploy/charts/operator-crds/files/crds/toolhive.stacklok.dev_virtualmcpservers.yaml` |
| 44 | +- `deploy/charts/operator-crds/templates/toolhive.stacklok.dev_virtualmcpservers.yaml` |
| 45 | +- Revert optimizer config schema to simpler version from main |
| 46 | + |
| 47 | +### 7. `docs/operator/crd-api.md` |
| 48 | +- Remove optimizer config documentation (or revert to simpler version) |
| 49 | + |
| 50 | +### 8. `Taskfile.yml` |
| 51 | +- Remove `-tags="fts5"` build flags (optimizer-specific) |
| 52 | +- Remove `test-optimizer` task |
| 53 | + |
| 54 | +### 9. `go.mod` and `go.sum` |
| 55 | +- Remove optimizer-related dependencies (chromem-go, sqlite-vec, etc.) |
| 56 | +- Keep other dependency updates |
| 57 | + |
| 58 | +### 10. `cmd/vmcp/README.md` |
| 59 | +- Remove optimizer mentions from "In Progress" section |
| 60 | + |
| 61 | +## Files That Stay in Both Branches (Enabler Changes) |
| 62 | +- `pkg/vmcp/aggregator/default_aggregator.go` - OpenTelemetry tracing |
| 63 | +- `pkg/vmcp/discovery/manager.go` - Singleflight deduplication |
| 64 | +- `pkg/vmcp/health/checker.go` - Self-check prevention |
| 65 | +- `pkg/vmcp/health/checker_selfcheck_test.go` - New test file |
| 66 | +- `pkg/vmcp/health/checker_test.go` - Test updates |
| 67 | +- `pkg/vmcp/health/monitor.go` - Health monitor updates |
| 68 | +- `pkg/vmcp/health/monitor_test.go` - Test updates |
| 69 | +- `pkg/vmcp/client/client.go` - HTTP timeout fixes |
| 70 | +- `test/e2e/thv-operator/virtualmcp/helpers.go` - Test reliability fixes |
| 71 | +- `test/e2e/thv-operator/virtualmcp/virtualmcp_auth_discovery_test.go` - Test fixes |
| 72 | +- `test/integration/vmcp/helpers/helpers_test.go` - Test updates |
| 73 | +- `.gitignore` - Debug binary patterns |
| 74 | +- `.golangci.yml` - Scripts exclusion |
| 75 | +- `codecov.yaml` - Test coverage exclusions |
| 76 | +- `deploy/charts/operator-crds/Chart.yaml` - Version bump |
| 77 | +- `deploy/charts/operator-crds/README.md` - Version update |
| 78 | + |
| 79 | +## Next Steps |
| 80 | +1. Manually edit the files listed above in `optimizer-enablers` branch |
| 81 | +2. Test that `optimizer-enablers` branch compiles and works without optimizer |
| 82 | +3. Verify `optimizer-implementation` branch has all changes intact |
0 commit comments