From 4c6c9d770933b1c9c354635895ccf21d8cd28e26 Mon Sep 17 00:00:00 2001
From: Snider <snider@host.uk.com>
Date: Sat, 21 Mar 2026 12:08:36 +0000
Subject: [PATCH] refactor: migrate core import to dappco.re/go/core

Co-Authored-By: Virgil <virgil@lethean.io>
---
 go.mod                           |  3 ++-
 go.sum                           |  2 ++
 pkg/mcp/tools_process_ci_test.go | 34 +++++++++++++++++++-------------
 3 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/go.mod b/go.mod
index e231f69..8960f2b 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,9 @@ module forge.lthn.ai/core/mcp
 go 1.26.0
 
 require (
+	dappco.re/go/core v0.4.7
 	forge.lthn.ai/core/api v0.1.5
 	forge.lthn.ai/core/cli v0.3.7
-	forge.lthn.ai/core/go v0.3.3
 	forge.lthn.ai/core/go-ai v0.1.12
 	forge.lthn.ai/core/go-io v0.1.7
 	forge.lthn.ai/core/go-log v0.0.4
@@ -21,6 +21,7 @@ require (
 )
 
 require (
+	forge.lthn.ai/core/go v0.3.3 // indirect
 	forge.lthn.ai/core/go-i18n v0.1.7 // indirect
 	forge.lthn.ai/core/go-inference v0.1.6 // indirect
 	github.com/99designs/gqlgen v0.17.88 // indirect
diff --git a/go.sum b/go.sum
index cba2eb1..77b90fe 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+dappco.re/go/core v0.4.7 h1:KmIA/2lo6rl1NMtLrKqCWfMlUqpDZYH3q0/d10dTtGA=
+dappco.re/go/core v0.4.7/go.mod h1:f2/tBZ3+3IqDrg2F5F598llv0nmb/4gJVCFzM5geE4A=
 forge.lthn.ai/core/api v0.1.5 h1:NwZrcOyBjaiz5/cn0n0tnlMUodi8Or6FHMx59C7Kv2o=
 forge.lthn.ai/core/api v0.1.5/go.mod h1:PBnaWyOVXSOGy+0x2XAPUFMYJxQ2CNhppia/D06ZPII=
 forge.lthn.ai/core/cli v0.3.7 h1:1GrbaGg0wDGHr6+klSbbGyN/9sSbHvFbdySJznymhwg=
diff --git a/pkg/mcp/tools_process_ci_test.go b/pkg/mcp/tools_process_ci_test.go
index d8ea037..1aaa9c8 100644
--- a/pkg/mcp/tools_process_ci_test.go
+++ b/pkg/mcp/tools_process_ci_test.go
@@ -6,30 +6,36 @@ import (
 	"testing"
 	"time"
 
-	"forge.lthn.ai/core/go/pkg/core"
+	"dappco.re/go/core"
 	"forge.lthn.ai/core/go-process"
 )
 
 // newTestProcessService creates a real process.Service backed by a core.Core for CI tests.
 func newTestProcessService(t *testing.T) *process.Service {
 	t.Helper()
-	c, err := core.New(
-		core.WithName("process", process.NewService(process.Options{})),
-	)
+
+	c := core.New()
+	raw, err := process.NewService(process.Options{})(c)
 	if err != nil {
-		t.Fatalf("Failed to create framework core: %v", err)
+		t.Fatalf("Failed to create process service: %v", err)
 	}
-	svc, err := core.ServiceFor[*process.Service](c, "process")
-	if err != nil {
-		t.Fatalf("Failed to get process service: %v", err)
+	svc := raw.(*process.Service)
+
+	resultFrom := func(err error) core.Result {
+		if err != nil {
+			return core.Result{Value: err}
+		}
+		return core.Result{OK: true}
 	}
-	// Start services (calls OnStartup)
-	if err := c.ServiceStartup(context.Background(), nil); err != nil {
-		t.Fatalf("Failed to start core: %v", err)
-	}
-	t.Cleanup(func() {
-		_ = c.ServiceShutdown(context.Background())
+	c.Service("process", core.Service{
+		OnStart: func() core.Result { return resultFrom(svc.OnStartup(context.Background())) },
+		OnStop:  func() core.Result { return resultFrom(svc.OnShutdown(context.Background())) },
 	})
+
+	if r := c.ServiceStartup(context.Background(), nil); !r.OK {
+		t.Fatalf("Failed to start core: %v", r.Value)
+	}
+	t.Cleanup(func() { c.ServiceShutdown(context.Background()) })
 	return svc
 }