From ea433b84deba03f5b25be8031fd9f986fa5f605c Mon Sep 17 00:00:00 2001
From: Snider <snider@host.uk.com>
Date: Tue, 24 Mar 2026 20:51:51 +0000
Subject: [PATCH] =?UTF-8?q?feat:=20all=20services=20registered=20in=20core?=
 =?UTF-8?q?.New()=20=E2=80=94=20no=20manual=20wiring?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- process: registered as WithService in core.New()
- MCP: registered as WithName("mcp") in core.New(), retrieves
  agentic/monitor/brain via ServiceFor during construction
- Commands use ServiceFor to access services — no captured vars
- initMCP closure eliminated
- No service creation after core.New() completes

Co-Authored-By: Virgil <virgil@lethean.io>
---
 cmd/core-agent/main.go | 63 +++++++++++++++++++-----------------------
 1 file changed, 28 insertions(+), 35 deletions(-)

diff --git a/cmd/core-agent/main.go b/cmd/core-agent/main.go
index b9e6e4d..f0d3c24 100644
--- a/cmd/core-agent/main.go
+++ b/cmd/core-agent/main.go
@@ -20,9 +20,33 @@ import (
 func main() {
 	r := core.New(
 		core.WithOption("name", "core-agent"),
+		core.WithService(func(c *core.Core) core.Result {
+			svc, err := process.NewService(process.Options{})(c)
+			if err != nil {
+				return core.Result{Value: err, OK: false}
+			}
+			if procSvc, ok := svc.(*process.Service); ok {
+				_ = process.SetDefault(procSvc)
+			}
+			return core.Result{Value: svc, OK: true}
+		}),
 		core.WithService(agentic.Register),
 		core.WithService(monitor.Register),
 		core.WithService(brain.Register),
+		// MCP — registered last, retrieves other services for tool registration
+		core.WithName("mcp", func(c *core.Core) core.Result {
+			agSvc, _ := core.ServiceFor[*agentic.PrepSubsystem](c, "agentic")
+			monSvc, _ := core.ServiceFor[*monitor.Subsystem](c, "monitor")
+			brnSvc, _ := core.ServiceFor[*brain.DirectSubsystem](c, "brain")
+			mcpSvc, err := mcp.New(mcp.Options{
+				Subsystems: []mcp.Subsystem{brnSvc, agSvc, monSvc},
+			})
+			if err != nil {
+				return core.Result{Value: core.E("main", "create MCP service", err), OK: false}
+			}
+			monSvc.SetNotifier(mcpSvc)
+			return core.Result{Value: mcpSvc, OK: true}
+		}),
 	)
 	if !r.OK {
 		core.Error("failed to create core", "err", r.Value)
@@ -301,32 +325,6 @@ func main() {
 		},
 	})
 
-	// Retrieve service instances from conclave for MCP tool registration
-	agenticSvc, _ := core.ServiceFor[*agentic.PrepSubsystem](c, "agentic")
-	monitorSvc, _ := core.ServiceFor[*monitor.Subsystem](c, "monitor")
-	brainSvc, _ := core.ServiceFor[*brain.DirectSubsystem](c, "brain")
-
-	// Process service (lifecycle management)
-	procFactory := process.NewService(process.Options{})
-	procResult, procErr := procFactory(c)
-	if procErr == nil {
-		if procSvc, ok := procResult.(*process.Service); ok {
-			_ = process.SetDefault(procSvc)
-		}
-	}
-
-	// MCP service — wires subsystems for tool registration
-	initMCP := func() (*mcp.Service, error) {
-		mcpSvc, err := mcp.New(mcp.Options{
-			Subsystems: []mcp.Subsystem{brainSvc, agenticSvc, monitorSvc},
-		})
-		if err != nil {
-			return nil, core.E("main", "create MCP service", err)
-		}
-		monitorSvc.SetNotifier(mcpSvc)
-		return mcpSvc, nil
-	}
-
 	// Signal-aware context for clean shutdown
 	ctx, cancel := signal.NotifyContext(context.Background(), syscall.SIGINT, syscall.SIGTERM)
 	defer cancel()
@@ -335,10 +333,7 @@ func main() {
 	c.Command("mcp", core.Command{
 		Description: "Start the MCP server on stdio",
 		Action: func(opts core.Options) core.Result {
-			mcpSvc, err := initMCP()
-			if err != nil {
-				return core.Result{Value: err, OK: false}
-			}
+			mcpSvc, _ := core.ServiceFor[*mcp.Service](c, "mcp")
 			c.ServiceStartup(ctx, nil)
 			if err := mcpSvc.Run(ctx); err != nil {
 				return core.Result{Value: err, OK: false}
@@ -352,10 +347,7 @@ func main() {
 	c.Command("serve", core.Command{
 		Description: "Start as a persistent HTTP daemon",
 		Action: func(opts core.Options) core.Result {
-			mcpSvc, err := initMCP()
-			if err != nil {
-				return core.Result{Value: err, OK: false}
-			}
+			mcpSvc, _ := core.ServiceFor[*mcp.Service](c, "mcp")
 
 			addr := core.Env("MCP_HTTP_ADDR")
 			if addr == "" {
@@ -437,7 +429,8 @@ func main() {
 			core.Print(os.Stderr, "")
 
 			// Dispatch and wait
-			result := agenticSvc.DispatchSync(ctx, agentic.DispatchSyncInput{
+			agSvc, _ := core.ServiceFor[*agentic.PrepSubsystem](c, "agentic")
+			result := agSvc.DispatchSync(ctx, agentic.DispatchSyncInput{
 				Org:   org,
 				Repo:  repo,
 				Agent: agent,