merge(mcp): reconcile origin AX-6 sweep + brainclient refactor with homelab migration + features
Parent SHAs:
origin/dev: 4420670 feat(mcp/brain): OpenBrain T1+T2 — shared client + direct/brain-seed adoption (#175 #176)
homelab/dev: 95f8ad3 docs(security): document accepted ollama CVEs + operator runbook
Resolution strategy (29 conflicts: 26 UU + 3 AA):
- Took origin's body for every conflicting file (AX-6-clean, uses core.* helpers
not banned stdlib; preserves the brainclient.New() refactor that landed in
origin commit 4420670 and lifted inline HTTP code into pkg/mcp/brain/client/).
- Sed-rewrote `dappco.re/go/core/X` → `dappco.re/go/X` import paths inline so
origin's body uses the migrated paths that homelab's go.mod declares.
- go.mod auto-merged toward homelab's NEW dep paths (dappco.re/go/{ai,api,cli,
io,log,process,rag,webview,ws} v0.8.0-alpha.1) — correct outcome.
- Homelab's standalone-new files (cmd/openbrain-mcp/, ipc.go, tools_metrics.go,
tools_ws_client.go, tools_webview_embed.go, etc.) preserved via git's
non-conflicting auto-merge.
Followups (filed separately):
- Stale `replace dappco.re/go/core/process => ../go-process` directive remains
in go.mod — pre-existing, doesn't match any current dep, will catch in
future cleanup pass.
- Local build verification deferred: workspace-level go-proxy half-migration
+ missing go-ws entry in ~/Code/go.work block `go build ./...` from
succeeding host-side; this merge resolved by per-file inspection.
Co-authored-by: Codex <noreply@openai.com>
8b48b33622