93 changed files with 1397 additions and 11534 deletions
--- a/EXCEPTIONS.md
+++ b/EXCEPTIONS.md
@ -1,17 +0,0 @@
 # Exceptions
 Items from the Codex review that cannot be fixed, with reasons.
 ## 6. Compile-time interface assertions in subsystem packages
 **Files:** `brain/brain.go`, `brain/direct.go`, `agentic/prep.go`, `ide/ide.go`
 **Finding:** Add `var _ Subsystem = (*T)(nil)` compile-time assertions.
 **Reason:** The `Subsystem` interface is defined in the parent `mcp` package. Subsystem packages (`brain`, `agentic`, `ide`) cannot import `mcp` because `mcp` already imports them via `Options.Subsystems` — this would create a circular import. The interface conformance is enforced at runtime when `RegisterTools` is called during `mcp.New()`.
 ## 7. Compile-time Notifier assertion on Service
 **Finding:** Add `var _ Notifier = (*Service)(nil)`.
 **Resolution:** Fixed — assertion added to `pkg/mcp/subsystem.go` (where the `Notifier` interface is defined). The TODO originally claimed this was already done in commit `907d62a`, but it was not present in the codebase.
--- a/cmd/brain-seed/main.go
+++ b/cmd/brain-seed/main.go
@ -19,7 +19,7 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
-	goio "io"
+	"io"
 	"net/http"
 	"os"
 	"path/filepath"
@ -27,8 +27,8 @@ import (
 	"strings"
 	"time"
-	coreio "dappco.re/go/core/io"
+	coreio "forge.lthn.ai/core/go-io"
-	coreerr "dappco.re/go/core/log"
+	coreerr "forge.lthn.ai/core/go-log"
 )
 var (
@ -130,7 +130,7 @@ func main() {
 		filename := strings.TrimSuffix(filepath.Base(f), ".md")
 		if len(sections) == 0 {
-			coreerr.Warn("brain-seed: skip file (no sections)", "project", project, "file", filename)
+			fmt.Printf("  skip %s/%s (no sections)\n", project, filename)
 			skipped++
 			continue
 		}
@ -157,7 +157,7 @@ func main() {
 			}
 			if err := callBrainRemember(content, memType, tags, project, confidence); err != nil {
-				coreerr.Error("brain-seed: import failed", "project", project, "file", filename, "heading", sec.heading, "err", err)
+				fmt.Printf("  FAIL %s/%s :: %s — %v\n", project, filename, sec.heading, err)
 				errors++
 				continue
 			}
@ -197,7 +197,7 @@ func main() {
 				}
 				if err := callBrainRemember(content, "plan", tags, project, 0.6); err != nil {
-					coreerr.Error("brain-seed: plan import failed", "project", project, "file", filename, "heading", sec.heading, "err", err)
+					fmt.Printf("  FAIL %s :: %s / %s — %v\n", project, filename, sec.heading, err)
 					errors++
 					continue
 				}
@ -237,7 +237,7 @@ func main() {
 				}
 				if err := callBrainRemember(content, "convention", tags, project, 0.9); err != nil {
-					coreerr.Error("brain-seed: claude-md import failed", "project", project, "heading", sec.heading, "err", err)
+					fmt.Printf("  FAIL %s :: CLAUDE.md / %s — %v\n", project, sec.heading, err)
 					errors++
 					continue
 				}
@ -291,7 +291,7 @@ func callBrainRemember(content, memType string, tags []string, project string, c
 	}
 	defer resp.Body.Close()
-	respBody, _ := goio.ReadAll(resp.Body)
+	respBody, _ := io.ReadAll(resp.Body)
 	if resp.StatusCode != 200 {
 		return coreerr.E("callBrainRemember", "HTTP "+string(respBody), nil)
--- a/cmd/core-mcp/main.go
+++ b/cmd/core-mcp/main.go
@ -1,8 +1,8 @@
 package main
 import (
-	"dappco.re/go/core/cli/pkg/cli"
+	"forge.lthn.ai/core/cli/pkg/cli"
-	mcpcmd "dappco.re/go/mcp/cmd/mcpcmd"
+	mcpcmd "forge.lthn.ai/core/mcp/cmd/mcpcmd"
 )
 func main() {
--- a/cmd/mcpcmd/cmd_mcp.go
+++ b/cmd/mcpcmd/cmd_mcp.go
@ -1,14 +1,7 @@
-// SPDX-License-Identifier: EUPL-1.2
+// Package mcpcmd provides the MCP server command.
 // Package mcpcmd registers the `mcp` and `mcp serve` CLI commands.
 //
 // Wiring example:
 //
 //	cli.Main(cli.WithCommands("mcp", mcpcmd.AddMCPCommands))
 //
 // Commands:
-//   - mcp           Start the MCP server on stdio (default transport).
+//   - mcp serve: Start the MCP server for AI tool integration
 //   - mcp serve     Start the MCP server with auto-selected transport.
 package mcpcmd
 import (
@ -17,112 +10,80 @@ import (
 	"os/signal"
 	"syscall"
-	core "dappco.re/go/core"
+	"forge.lthn.ai/core/cli/pkg/cli"
-	"dappco.re/go/mcp/pkg/mcp"
+	"forge.lthn.ai/core/mcp/pkg/mcp"
-	"dappco.re/go/mcp/pkg/mcp/agentic"
+	"forge.lthn.ai/core/mcp/pkg/mcp/agentic"
-	"dappco.re/go/mcp/pkg/mcp/brain"
+	"forge.lthn.ai/core/mcp/pkg/mcp/brain"
 )
 // newMCPService is the service constructor, indirected for tests.
 var newMCPService = mcp.New
 // runMCPService starts the MCP server, indirected for tests.
 var runMCPService = func(svc *mcp.Service, ctx context.Context) error {
 	return svc.Run(ctx)
 }
 // shutdownMCPService performs graceful shutdown, indirected for tests.
 var shutdownMCPService = func(svc *mcp.Service, ctx context.Context) error {
 	return svc.Shutdown(ctx)
 }
 // workspaceFlag mirrors the --workspace CLI flag value.
 var workspaceFlag string
-// unrestrictedFlag mirrors the --unrestricted CLI flag value.
+var mcpCmd = &cli.Command{
-var unrestrictedFlag bool
+	Use:   "mcp",
-
+	Short: "MCP server for AI tool integration",
-// AddMCPCommands registers the `mcp` command tree on the Core instance.
+	Long:  "Model Context Protocol (MCP) server providing file operations, RAG, and metrics tools.",
 //
 //	cli.Main(cli.WithCommands("mcp", mcpcmd.AddMCPCommands))
 func AddMCPCommands(c *core.Core) {
 	c.Command("mcp", core.Command{
 		Description: "Model Context Protocol server (stdio, TCP, Unix socket, HTTP).",
 		Action:      runServeAction,
 		Flags: core.NewOptions(
 			core.Option{Key: "workspace", Value: ""},
 			core.Option{Key: "w", Value: ""},
 			core.Option{Key: "unrestricted", Value: false},
 		),
 	})
 	c.Command("mcp/serve", core.Command{
 		Description: "Start the MCP server with auto-selected transport (stdio, TCP, Unix, or HTTP).",
 		Action:      runServeAction,
 		Flags: core.NewOptions(
 			core.Option{Key: "workspace", Value: ""},
 			core.Option{Key: "w", Value: ""},
 			core.Option{Key: "unrestricted", Value: false},
 		),
 	})
 }
-// runServeAction is the CLI entrypoint for `mcp` and `mcp serve`.
+var serveCmd = &cli.Command{
-//
+	Use:   "serve",
-//	opts := core.NewOptions(core.Option{Key: "workspace", Value: "."})
+	Short: "Start the MCP server",
-//	result := runServeAction(opts)
+	Long: `Start the MCP server on stdio (default) or TCP.
 func runServeAction(opts core.Options) core.Result {
 	workspaceFlag = core.Trim(firstNonEmpty(opts.String("workspace"), opts.String("w")))
 	unrestrictedFlag = opts.Bool("unrestricted")
-	if err := runServe(); err != nil {
+The server provides file operations, RAG tools, and metrics tools for AI assistants.
-		return core.Result{Value: err, OK: false}
+
-	}
+Environment variables:
-	return core.Result{OK: true}
+  MCP_ADDR    TCP address to listen on (e.g., "localhost:9999")
              If not set, uses stdio transport.
 Examples:
  # Start with stdio transport (for Claude Code integration)
  core mcp serve
  # Start with workspace restriction
  core mcp serve --workspace /path/to/project
  # Start TCP server
  MCP_ADDR=localhost:9999 core mcp serve`,
 	RunE: func(cmd *cli.Command, args []string) error {
 		return runServe()
 	},
 }
-// firstNonEmpty returns the first non-empty string argument.
+func initFlags() {
-//
+	cli.StringFlag(serveCmd, &workspaceFlag, "workspace", "w", "", "Restrict file operations to this directory (empty = unrestricted)")
-//	firstNonEmpty("", "foo") == "foo"
+}
-//	firstNonEmpty("bar", "baz") == "bar"
+
-func firstNonEmpty(values ...string) string {
+// AddMCPCommands registers the 'mcp' command and all subcommands.
-	for _, v := range values {
+func AddMCPCommands(root *cli.Command) {
-		if v != "" {
+	initFlags()
-			return v
+	mcpCmd.AddCommand(serveCmd)
-		}
+	root.AddCommand(mcpCmd)
 	}
 	return ""
 }
 // runServe wires the MCP service together and blocks until the context is
 // cancelled by SIGINT/SIGTERM or a transport error.
 //
 //	if err := runServe(); err != nil {
 //	    core.Error("mcp serve failed", "err", err)
 //	}
 func runServe() error {
-	opts := mcp.Options{}
+	// Build MCP service options
 	var opts []mcp.Option
-	if unrestrictedFlag {
+	if workspaceFlag != "" {
-		opts.Unrestricted = true
+		opts = append(opts, mcp.WithWorkspaceRoot(workspaceFlag))
-	} else if workspaceFlag != "" {
+	} else {
-		opts.WorkspaceRoot = workspaceFlag
+		// Explicitly unrestricted when no workspace specified
 		opts = append(opts, mcp.WithWorkspaceRoot(""))
 	}
-	// Register OpenBrain and agentic subsystems.
+	// Register OpenBrain subsystem (direct HTTP to api.lthn.sh)
-	opts.Subsystems = []mcp.Subsystem{
+	opts = append(opts, mcp.WithSubsystem(brain.NewDirect()))
 		brain.NewDirect(),
 		agentic.NewPrep(),
 	}
-	svc, err := newMCPService(opts)
+	// Register agentic subsystem (workspace prep, agent orchestration)
 	opts = append(opts, mcp.WithSubsystem(agentic.NewPrep()))
 	// Create the MCP service
 	svc, err := mcp.New(opts...)
 	if err != nil {
-		return core.E("mcpcmd.runServe", "create MCP service", err)
+		return cli.Wrap(err, "create MCP service")
 	}
 	defer func() {
 		_ = shutdownMCPService(svc, context.Background())
 	}()
 	// Set up signal handling for clean shutdown
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
@ -130,12 +91,10 @@ func runServe() error {
 	signal.Notify(sigCh, syscall.SIGINT, syscall.SIGTERM)
 	go func() {
-		select {
+		<-sigCh
 		case <-sigCh:
 		cancel()
 		case <-ctx.Done():
 		}
 	}()
-	return runMCPService(svc, ctx)
+	// Run the server (blocks until context cancelled or error)
 	return svc.Run(ctx)
 }
--- a/cmd/mcpcmd/cmd_mcp_test.go
+++ b/cmd/mcpcmd/cmd_mcp_test.go
@ -1,227 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcpcmd
 import (
 	"context"
 	"testing"
 	core "dappco.re/go/core"
 	"dappco.re/go/mcp/pkg/mcp"
 )
 func TestCmdMCP_RunServe_Good_ShutsDownService(t *testing.T) {
 	restore := stubMCPService(t)
 	defer restore()
 	workspaceFlag = ""
 	unrestrictedFlag = false
 	var runCalled bool
 	var shutdownCalled bool
 	newMCPService = func(opts mcp.Options) (*mcp.Service, error) {
 		return mcp.New(mcp.Options{})
 	}
 	runMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		runCalled = true
 		return nil
 	}
 	shutdownMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		shutdownCalled = true
 		return nil
 	}
 	if err := runServe(); err != nil {
 		t.Fatalf("runServe() returned error: %v", err)
 	}
 	if !runCalled {
 		t.Fatal("expected runMCPService to be called")
 	}
 	if !shutdownCalled {
 		t.Fatal("expected shutdownMCPService to be called")
 	}
 }
 func TestCmdMCP_RunServeAction_Good_PropagatesFlags(t *testing.T) {
 	restore := stubMCPService(t)
 	defer restore()
 	workspaceFlag = ""
 	unrestrictedFlag = false
 	var gotOpts mcp.Options
 	newMCPService = func(opts mcp.Options) (*mcp.Service, error) {
 		gotOpts = opts
 		return mcp.New(mcp.Options{WorkspaceRoot: t.TempDir()})
 	}
 	runMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		return nil
 	}
 	shutdownMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		return nil
 	}
 	tmp := t.TempDir()
 	opts := core.NewOptions(core.Option{Key: "workspace", Value: tmp})
 	result := runServeAction(opts)
 	if !result.OK {
 		t.Fatalf("expected OK, got %+v", result)
 	}
 	if gotOpts.WorkspaceRoot != tmp {
 		t.Fatalf("expected workspace root %q, got %q", tmp, gotOpts.WorkspaceRoot)
 	}
 	if gotOpts.Unrestricted {
 		t.Fatal("expected Unrestricted=false when --workspace is set")
 	}
 }
 func TestCmdMCP_RunServeAction_Good_UnrestrictedFlag(t *testing.T) {
 	restore := stubMCPService(t)
 	defer restore()
 	workspaceFlag = ""
 	unrestrictedFlag = false
 	var gotOpts mcp.Options
 	newMCPService = func(opts mcp.Options) (*mcp.Service, error) {
 		gotOpts = opts
 		return mcp.New(mcp.Options{Unrestricted: true})
 	}
 	runMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		return nil
 	}
 	shutdownMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		return nil
 	}
 	opts := core.NewOptions(core.Option{Key: "unrestricted", Value: true})
 	result := runServeAction(opts)
 	if !result.OK {
 		t.Fatalf("expected OK, got %+v", result)
 	}
 	if !gotOpts.Unrestricted {
 		t.Fatal("expected Unrestricted=true when --unrestricted is set")
 	}
 }
 func TestCmdMCP_RunServe_Bad_CreateServiceFails(t *testing.T) {
 	restore := stubMCPService(t)
 	defer restore()
 	workspaceFlag = ""
 	unrestrictedFlag = false
 	sentinel := core.E("mcpcmd.test", "boom", nil)
 	newMCPService = func(opts mcp.Options) (*mcp.Service, error) {
 		return nil, sentinel
 	}
 	runMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		t.Fatal("runMCPService should not be called when New fails")
 		return nil
 	}
 	shutdownMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		t.Fatal("shutdownMCPService should not be called when New fails")
 		return nil
 	}
 	err := runServe()
 	if err == nil {
 		t.Fatal("expected error when newMCPService fails")
 	}
 }
 func TestCmdMCP_RunServeAction_Bad_PropagatesFailure(t *testing.T) {
 	restore := stubMCPService(t)
 	defer restore()
 	workspaceFlag = ""
 	unrestrictedFlag = false
 	newMCPService = func(opts mcp.Options) (*mcp.Service, error) {
 		return nil, core.E("mcpcmd.test", "construction failed", nil)
 	}
 	runMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		return nil
 	}
 	shutdownMCPService = func(svc *mcp.Service, ctx context.Context) error {
 		return nil
 	}
 	result := runServeAction(core.NewOptions())
 	if result.OK {
 		t.Fatal("expected runServeAction to fail when service creation fails")
 	}
 	if result.Value == nil {
 		t.Fatal("expected error value on failure")
 	}
 }
 func TestCmdMCP_FirstNonEmpty_Ugly_HandlesAllVariants(t *testing.T) {
 	tests := []struct {
 		name   string
 		values []string
 		want   string
 	}{
 		{"no args", nil, ""},
 		{"empty string", []string{""}, ""},
 		{"all empty", []string{"", "", ""}, ""},
 		{"first non-empty", []string{"foo", "bar"}, "foo"},
 		{"skip empty", []string{"", "baz"}, "baz"},
 		{"mixed", []string{"", "", "last"}, "last"},
 	}
 	for _, tc := range tests {
 		t.Run(tc.name, func(t *testing.T) {
 			got := firstNonEmpty(tc.values...)
 			if got != tc.want {
 				t.Fatalf("firstNonEmpty(%v) = %q, want %q", tc.values, got, tc.want)
 			}
 		})
 	}
 }
 func TestCmdMCP_AddMCPCommands_Good_RegistersMcpTree(t *testing.T) {
 	c := core.New()
 	AddMCPCommands(c)
 	commands := c.Commands()
 	if len(commands) == 0 {
 		t.Fatal("expected at least one registered command")
 	}
 	mustHave := map[string]bool{
 		"mcp":       false,
 		"mcp/serve": false,
 	}
 	for _, path := range commands {
 		if _, ok := mustHave[path]; ok {
 			mustHave[path] = true
 		}
 	}
 	for path, present := range mustHave {
 		if !present {
 			t.Fatalf("expected command %q to be registered", path)
 		}
 	}
 }
 // stubMCPService captures the package-level function pointers and returns a
 // restore hook so each test can mutate them without leaking into siblings.
 func stubMCPService(t *testing.T) func() {
 	t.Helper()
 	oldNew := newMCPService
 	oldRun := runMCPService
 	oldShutdown := shutdownMCPService
 	oldWorkspace := workspaceFlag
 	oldUnrestricted := unrestrictedFlag
 	return func() {
 		newMCPService = oldNew
 		runMCPService = oldRun
 		shutdownMCPService = oldShutdown
 		workspaceFlag = oldWorkspace
 		unrestrictedFlag = oldUnrestricted
 	}
 }
--- a/docs/architecture.md
+++ b/docs/architecture.md
@ -19,18 +19,14 @@ slice of `ToolRecord` metadata that powers the REST bridge.
 ```go
 svc, err := mcp.New(
-    mcp.Options{
+    mcp.WithWorkspaceRoot("/home/user/project"),
-        WorkspaceRoot:  "/home/user/project",
+    mcp.WithSubsystem(mcp.NewMLSubsystem(mlService)),
-        ProcessService: processService,
+    mcp.WithProcessService(processService),
-        WSHub:         wsHub,
+    mcp.WithWSHub(wsHub),
        Subsystems: []mcp.Subsystem{
            &MySubsystem{},
        },
    },
 )
 ```
-Options are provided via the `mcp.Options` DTO. `WorkspaceRoot` creates a
+Options follow the functional-options pattern. `WithWorkspaceRoot` creates a
 sandboxed `io.Medium` that confines all file operations to a single directory
 tree. Passing an empty string disables sandboxing (not recommended for
 untrusted clients).
@ -75,7 +71,7 @@ The service registers the following tools at startup:
 | **ws** | `ws_start`, `ws_info` | `tools_ws.go` |
 Process and WebSocket tools are conditionally registered -- they require
-`ProcessService` and `WSHub` in `Options` respectively.
+`WithProcessService` and `WithWSHub` respectively.
 ### Subsystem interface
@ -97,22 +93,17 @@ type SubsystemWithShutdown interface {
 }
 ```
-Three subsystems ship with this repo:
+Two subsystems ship with this repo:
-#### Agentic subsystem (`pkg/mcp/agentic/`)
+#### ML subsystem (`tools_ml.go`)
-`agentic` tools prepare workspaces, dispatch agents, and track execution
+`MLSubsystem` wraps a `go-ml.Service` and exposes five tools:
 status for issue-driven task workflows.
-#### Brain subsystem (`pkg/mcp/brain/`)
+- `ml_generate` -- text generation via any registered inference backend.
-
+- `ml_score` -- heuristic and semantic scoring of prompt/response pairs.
-Proxies OpenBrain knowledge-store operations to the Laravel backend via the IDE
+- `ml_probe` -- capability probes (predefined prompts run through the model).
-bridge. Four tools:
+- `ml_status` -- training and generation progress from InfluxDB.
-
+- `ml_backends` -- lists registered inference backends and their availability.
 - `brain_remember` -- store a memory (decision, observation, bug, etc.).
 - `brain_recall` -- semantic search across stored memories.
 - `brain_forget` -- permanently delete a memory.
 - `brain_list` -- list memories with filtering (no vector search).
 #### IDE subsystem (`pkg/mcp/ide/`)
@ -129,6 +120,16 @@ The IDE bridge (`Bridge`) maintains a persistent WebSocket connection to the
 Laravel backend with exponential-backoff reconnection. Messages are forwarded
 from Laravel to a local `ws.Hub` for real-time streaming to the IDE frontend.
 #### Brain subsystem (`pkg/mcp/brain/`)
 Proxies OpenBrain knowledge-store operations to the Laravel backend via the
 IDE bridge. Four tools:
 - `brain_remember` -- store a memory (decision, observation, bug, etc.).
 - `brain_recall` -- semantic search across stored memories.
 - `brain_forget` -- permanently delete a memory.
 - `brain_list` -- list memories with filtering (no vector search).
 ### Transports
 The Go server supports three transports, all using line-delimited JSON-RPC:
@ -140,8 +141,8 @@ The Go server supports three transports, all using line-delimited JSON-RPC:
 | **Unix** | `ServeUnix(ctx, path)` | caller-specified socket path |
 TCP binds to `127.0.0.1` by default when the host component is empty. Binding
-to `0.0.0.0` emits a security warning. Each accepted connection becomes a
+to `0.0.0.0` emits a security warning. Each accepted connection spawns a
-session on the shared `mcp.Server`.
+fresh `mcp.Server` instance with its own tool set.
 ### REST bridge
@ -226,7 +227,7 @@ The `McpApiController` exposes five endpoints behind `mcp.auth` middleware:
 | `GET` | `/servers/{id}.json` | Server details with tool definitions |
 | `GET` | `/servers/{id}/tools` | List tools for a server |
 | `POST` | `/tools/call` | Execute a tool |
-| `GET` | `/resources/{uri}` | Read a resource |
+| `GET` | `/resources/{uri}` | Read a resource (not yet implemented -- returns 501) |
 `POST /tools/call` accepts:
--- a/docs/development.md
+++ b/docs/development.md
@ -93,7 +93,7 @@ Key test files:
 | `transport_tcp_test.go` | TCP transport, loopback default, `0.0.0.0` warning |
 | `transport_e2e_test.go` | End-to-end TCP client/server round-trip |
 | `tools_metrics_test.go` | Duration parsing, metrics record/query |
-| `brain/brain_test.go` | Brain subsystem registration and bridge-nil handling |
+| `tools_ml_test.go` | ML subsystem tool registration |
 | `tools_process_test.go` | Process start/stop/kill/list/output/input |
 | `tools_process_ci_test.go` | CI-safe process tests (no external binaries) |
 | `tools_rag_test.go` | RAG query/ingest/collections |
@ -170,17 +170,17 @@ core/mcp/
 |   +-- mcp/
 |       +-- mcp.go           # Service, file tools, Run()
 |       +-- registry.go      # ToolRecord, addToolRecorded, schema extraction
-|       +-- subsystem.go     # Subsystem interface, Options-based registration
+|       +-- subsystem.go     # Subsystem interface, WithSubsystem option
 |       +-- bridge.go        # BridgeToAPI (MCP-to-REST adapter)
 |       +-- transport_stdio.go
 |       +-- transport_tcp.go
 |       +-- transport_unix.go
 |       +-- tools_metrics.go # Metrics record/query
 |       +-- tools_ml.go      # MLSubsystem (generate, score, probe, status, backends)
 |       +-- tools_process.go # Process management tools
 |       +-- tools_rag.go     # RAG query/ingest/collections
 |       +-- tools_webview.go # Chrome DevTools automation
 |       +-- tools_ws.go      # WebSocket server tools
 |       +-- agentic/
 |       +-- brain/
 |       |   +-- brain.go     # Brain subsystem
 |       |   +-- tools.go     # remember/recall/forget/list tools
@ -321,11 +321,7 @@ func (s *Subsystem) RegisterTools(server *mcp.Server) {
 2. Register when creating the service:
 ```go
-mcp.New(mcp.Options{
+mcp.New(mcp.WithSubsystem(&mysubsystem.Subsystem{}))
    Subsystems: []mcp.Subsystem{
        &mysubsystem.Subsystem{},
    },
 })
 ```
 ## Adding a new PHP tool
--- a/docs/migration-guide-options.md
+++ b/docs/migration-guide-options.md
@ -1,50 +0,0 @@
 # Migrating to `Options{}` for MCP Service Construction
 ## Before (functional options)
 ```go
 svc, err := mcp.New(
    mcp.WithWorkspaceRoot("/path/to/project"),
    mcp.WithProcessService(processSvc),
    mcp.WithWSHub(hub),
    mcp.WithSubsystem(brainSub),
    mcp.WithSubsystem(ideSub),
 )
 ```
 ## After (`Options{}` DTO)
 ```go
 svc, err := mcp.New(mcp.Options{
    WorkspaceRoot:  "/path/to/project",
    ProcessService: processSvc,
    WSHub:         hub,
    Subsystems: []mcp.Subsystem{
        brainSub,
        ideSub,
    },
 })
 ```
 ## Notification helpers
 ```go
 // Broadcast to all MCP sessions.
 svc.SendNotificationToAllClients(ctx, "info", "build", map[string]any{
    "event": "build.complete",
    "repo":  "go-io",
 })
 // Broadcast a named channel event.
 svc.ChannelSend(ctx, "build.complete", map[string]any{
    "repo": "go-io",
    "status": "passed",
 })
 // Send to one session.
 for session := range svc.Sessions() {
    svc.ChannelSendToSession(ctx, session, "agent.status", map[string]any{
        "state": "running",
    })
 }
 ```
--- a/docs/plans/2026-03-21-mcp-sdk-migration.md
+++ b/docs/plans/2026-03-21-mcp-sdk-migration.md
@ -1,772 +0,0 @@
 # MCP SDK & AX Convention Migration Plan
 > **For agentic workers:** REQUIRED: Use superpowers:subagent-driven-development (if subagents available) or superpowers:executing-plans to implement this plan. Steps use checkbox (`- [ ]`) syntax for tracking.
 **Goal:** Align the MCP service layer with CoreGO AX conventions (Options/Result/Service DTOs), add server→client notification broadcasting via `SendNotificationToAllClients()`, and register the `claude/channel` experimental capability for pushing events into Claude Code sessions.
 **Architecture:** Refactor `mcp.Service` from functional options (`Option func(*Service) error`) to an `Options{}` struct. Add notification broadcasting by iterating the official SDK's `Server.Sessions()` (refactoring TCP/Unix transports to use `Server.Connect()` so all sessions are visible). Register `claude/channel` in `ServerCapabilities.Experimental` so clients can discover push-event support.
 **Tech Stack:** Go 1.26, `github.com/modelcontextprotocol/go-sdk` v1.4.1, `dappco.re/go/core` v0.4.7
 ---
 ## SDK Evaluation
 **Current SDK:** `github.com/modelcontextprotocol/go-sdk v1.4.1` (official MCP Go SDK)
 **Alternative evaluated:** `github.com/mark3labs/mcp-go` — community SDK with built-in `SendNotificationToAllClients()` and `SendNotificationToClient()`.
 | Criteria | Official SDK | mark3labs/mcp-go |
 |----------|-------------|------------------|
 | Multi-session support | `Server.Sessions()` iterator, `Server.Connect()` | `SendNotificationToAllClients()` built-in |
 | Tool registration | Generic `AddTool[In, Out]()` — matches existing pattern | `AddTool(NewTool(), handler)` — would require rewrite |
 | Experimental capabilities | `ServerCapabilities.Experimental map[string]any` | Same |
 | Transport support | Stdio, SSE, StreamableHTTP, InMemory | Stdio, SSE, StreamableHTTP |
 | Options pattern | `*ServerOptions` struct — aligns with AX DTOs | Functional options — conflicts with AX migration |
 | Handler signatures | `func(ctx, *CallToolRequest, In) (*CallToolResult, Out, error)` | `func(ctx, CallToolRequest) (*CallToolResult, error)` |
 **Decision:** Stay on official SDK. It already uses struct-based options (closer to AX), preserves our generic `addToolRecorded[In, Out]()` pattern, and supports multi-session via `Server.Sessions()`. Implement `SendNotificationToAllClients()` as a thin wrapper.
 ## Existing Infrastructure
 Already built:
 - `Service` struct wrapping `*mcp.Server` with functional options (`mcp.go`)
 - Generic `addToolRecorded[In, Out]()` for tool registration + REST bridge (`registry.go`)
 - `Subsystem` / `SubsystemWithShutdown` interfaces (`subsystem.go`)
 - 4 transports: stdio, TCP, Unix, HTTP (`transport_*.go`)
 - `BridgeToAPI` REST bridge (`bridge.go`)
 - 7 tool groups: files, language, metrics, process, rag, webview, ws
 - 3 subsystems: brain, ide, agentic
 - Import migration to `dappco.re/go/core` already committed (4c6c9d7)
 ## Consumer Impact
 2 consumers import `forge.lthn.ai/core/mcp`: **agent**, **ide**.
 Both call `mcp.New(...)` with functional options and `mcp.WithSubsystem(...)`. Both must be updated after Phase 1.
 ## File Structure
 | File | Action | Purpose |
 |------|--------|---------|
 | `pkg/mcp/mcp.go` | Modify | Replace `Option` func type with `Options{}` struct; update `New()` |
 | `pkg/mcp/subsystem.go` | Modify | Remove `WithSubsystem` func; subsystems move into `Options.Subsystems` |
 | `pkg/mcp/notify.go` | Create | `SendNotificationToAllClients()`, `ChannelSend()`, channel helpers |
 | `pkg/mcp/registry.go` | Modify | Add usage-example comments |
 | `pkg/mcp/bridge.go` | Modify | Minor: usage-example comments |
 | `pkg/mcp/transport_stdio.go` | Modify | Usage-example comments |
 | `pkg/mcp/transport_tcp.go` | Modify | Usage-example comments |
 | `pkg/mcp/transport_unix.go` | Modify | Usage-example comments |
 | `pkg/mcp/transport_http.go` | Modify | Usage-example comments |
 | `pkg/mcp/tools_metrics.go` | Modify | Usage-example comments on Input/Output types |
 | `pkg/mcp/tools_process.go` | Modify | Usage-example comments on Input/Output types |
 | `pkg/mcp/tools_rag.go` | Modify | Usage-example comments on Input/Output types |
 | `pkg/mcp/tools_webview.go` | Modify | Usage-example comments on Input/Output types |
 | `pkg/mcp/tools_ws.go` | Modify | Usage-example comments on Input/Output types |
 | `pkg/mcp/mcp_test.go` | Modify | Update tests for `Options{}` constructor |
 | `pkg/mcp/subsystem_test.go` | Modify | Update tests for `Options.Subsystems` |
 | `pkg/mcp/notify_test.go` | Create | Tests for notification broadcasting |
 ---
 ## Phase 1: Service Options{} Refactoring
 Replace the functional options pattern with an `Options{}` struct. This is the breaking change — consumers must update their `mcp.New()` calls.
 **Files:**
 - Modify: `pkg/mcp/mcp.go`
 - Modify: `pkg/mcp/subsystem.go`
 - Modify: `pkg/mcp/mcp_test.go`
 - Modify: `pkg/mcp/subsystem_test.go`
 - [ ] **Step 1: Define Options struct and update New()**
 Replace the current functional option pattern:
 ```go
 // BEFORE:
 type Option func(*Service) error
 func WithWorkspaceRoot(root string) Option { ... }
 func WithProcessService(ps *process.Service) Option { ... }
 func WithWSHub(hub *ws.Hub) Option { ... }
 func WithSubsystem(sub Subsystem) Option { ... }
 func New(opts ...Option) (*Service, error) { ... }
 ```
 With an `Options{}` struct:
 ```go
 // Options configures a Service.
 //
 //   svc, err := mcp.New(mcp.Options{
 //       WorkspaceRoot:  "/path/to/project",
 //       ProcessService: ps,
 //       WSHub:          hub,
 //       Subsystems:     []Subsystem{brain, ide},
 //   })
 type Options struct {
    WorkspaceRoot  string           // Restrict file ops to this directory (empty = cwd)
    Unrestricted   bool             // Disable sandboxing entirely (not recommended)
    ProcessService *process.Service // Optional process management
    WSHub          *ws.Hub          // Optional WebSocket hub for real-time streaming
    Subsystems     []Subsystem      // Additional tool groups registered at startup
 }
 // New creates a new MCP service with file operations.
 //
 //   svc, err := mcp.New(mcp.Options{WorkspaceRoot: "."})
 func New(opts Options) (*Service, error) {
    impl := &mcp.Implementation{
        Name:    "core-cli",
        Version: "0.1.0",
    }
    server := mcp.NewServer(impl, &mcp.ServerOptions{
        Capabilities: &mcp.ServerCapabilities{
            Tools: &mcp.ToolCapabilities{ListChanged: true},
        },
    })
    s := &Service{
        server:         server,
        processService: opts.ProcessService,
        wsHub:          opts.WSHub,
        subsystems:     opts.Subsystems,
        logger:         log.Default(),
    }
    // Workspace root: unrestricted, explicit root, or default to cwd
    if opts.Unrestricted {
        s.workspaceRoot = ""
        s.medium = io.Local
    } else {
        root := opts.WorkspaceRoot
        if root == "" {
            cwd, err := os.Getwd()
            if err != nil {
                return nil, log.E("mcp.New", "failed to get working directory", err)
            }
            root = cwd
        }
        abs, err := filepath.Abs(root)
        if err != nil {
            return nil, log.E("mcp.New", "invalid workspace root", err)
        }
        m, merr := io.NewSandboxed(abs)
        if merr != nil {
            return nil, log.E("mcp.New", "failed to create workspace medium", merr)
        }
        s.workspaceRoot = abs
        s.medium = m
    }
    s.registerTools(s.server)
    for _, sub := range s.subsystems {
        sub.RegisterTools(s.server)
    }
    return s, nil
 }
 ```
 - [ ] **Step 2: Remove functional option functions**
 Delete from `mcp.go`:
 - `type Option func(*Service) error`
 - `func WithWorkspaceRoot(root string) Option`
 - `func WithProcessService(ps *process.Service) Option`
 - `func WithWSHub(hub *ws.Hub) Option`
 Delete from `subsystem.go`:
 - `func WithSubsystem(sub Subsystem) Option`
 - [ ] **Step 3: Update tests**
 Find all test calls to `New(...)` in `mcp_test.go`, `subsystem_test.go`, `integration_test.go`, `transport_e2e_test.go`, and other `_test.go` files. All tests use `package mcp` (internal). Replace:
 ```go
 // BEFORE:
 svc, err := New(WithWorkspaceRoot(dir))
 svc, err := New(WithSubsystem(&fakeSub{}))
 // AFTER:
 svc, err := New(Options{WorkspaceRoot: dir})
 svc, err := New(Options{Subsystems: []Subsystem{&fakeSub{}}})
 ```
 - [ ] **Step 4: Verify compilation**
 ```bash
 go vet ./pkg/mcp/...
 go build ./pkg/mcp/...
 go test ./pkg/mcp/...
 ```
 - [ ] **Step 5: Commit**
 ```bash
 git add pkg/mcp/mcp.go pkg/mcp/subsystem.go pkg/mcp/*_test.go
 git commit -m "refactor(mcp): replace functional options with Options{} struct
 Aligns with CoreGO AX convention: Options{} DTOs instead of
 functional option closures. Breaking change for consumers
 (agent, ide) — they must update their mcp.New() calls.
 Co-Authored-By: Virgil <virgil@lethean.io>"
 ```
 ---
 ## Phase 2: Notification Support + claude/channel Capability
 Add server→client notification broadcasting and register the `claude/channel` experimental capability.
 **Files:**
 - Create: `pkg/mcp/notify.go`
 - Create: `pkg/mcp/notify_test.go`
 - Modify: `pkg/mcp/mcp.go` (register experimental capability in `New()`)
 - Modify: `pkg/mcp/transport_tcp.go` (use `s.server.Connect()` instead of per-connection servers)
 - Modify: `pkg/mcp/transport_unix.go` (same as TCP)
 **Important: Transport-level limitation.** The TCP and Unix transports currently create a **new `mcp.Server` per connection** in `handleConnection()`. Sessions on those per-connection servers are invisible to `s.server.Sessions()`. Notifications therefore only reach stdio and HTTP (StreamableHTTP) clients out of the box. To support TCP/Unix notifications, Phase 2 also refactors TCP/Unix to use `s.server.Connect()` instead of creating independent servers — this registers each connection's session on the shared server instance.
 - [ ] **Step 1: Refactor TCP/Unix to use shared server sessions**
 In `transport_tcp.go` and `transport_unix.go`, replace the per-connection `mcp.NewServer()` call with `s.server.Connect()`:
 ```go
 // BEFORE (transport_tcp.go handleConnection):
 server := mcp.NewServer(impl, nil)
 s.registerTools(server)
 for _, sub := range s.subsystems { sub.RegisterTools(server) }
 _ = server.Run(ctx, transport)
 // AFTER:
 session, err := s.server.Connect(ctx, transport, nil)
 if err != nil {
    s.logger.Debug("tcp: connect failed", "error", err)
    return
 }
 <-session.Wait()
 ```
 This ensures every TCP/Unix connection registers its session on the shared `s.server`, making it visible to `Sessions()` and `SendNotificationToAllClients`.
 - [ ] **Step 2: Create notify.go with notification methods**
 ```go
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
    "context"
    "iter"
    "forge.lthn.ai/core/go-log"
    "github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // SendNotificationToAllClients broadcasts a log-level notification to every
 // connected MCP session (stdio, HTTP, TCP, and Unix).
 // Errors on individual sessions are logged but do not stop the broadcast.
 //
 //   s.SendNotificationToAllClients(ctx, "info", "build complete", map[string]any{"duration": "3.2s"})
 func (s *Service) SendNotificationToAllClients(ctx context.Context, level mcp.LoggingLevel, logger string, data any) {
    for session := range s.server.Sessions() {
        if err := session.Log(ctx, &mcp.LoggingMessageParams{
            Level:  level,
            Logger: logger,
            Data:   data,
        }); err != nil {
            s.logger.Debug("notify: failed to send to session", "session", session.ID(), "error", err)
        }
    }
 }
 // ChannelSend pushes a channel event to all connected clients.
 // This uses the claude/channel experimental capability.
 // Channel names follow the convention "subsystem.event" (e.g. "build.complete", "agent.status").
 //
 //   s.ChannelSend(ctx, "build.complete", map[string]any{"repo": "go-io", "status": "passed"})
 func (s *Service) ChannelSend(ctx context.Context, channel string, data any) {
    payload := map[string]any{
        "channel": channel,
        "data":    data,
    }
    s.SendNotificationToAllClients(ctx, "info", "channel", payload)
 }
 // ChannelSendToSession pushes a channel event to a specific session.
 //
 //   s.ChannelSendToSession(ctx, session, "agent.progress", progressData)
 func (s *Service) ChannelSendToSession(ctx context.Context, session *mcp.ServerSession, channel string, data any) {
    payload := map[string]any{
        "channel": channel,
        "data":    data,
    }
    if err := session.Log(ctx, &mcp.LoggingMessageParams{
        Level:  "info",
        Logger: "channel",
        Data:   payload,
    }); err != nil {
        s.logger.Debug("channel: failed to send to session", "session", session.ID(), "channel", channel, "error", err)
    }
 }
 // Sessions returns an iterator over all connected MCP sessions.
 // Useful for subsystems that need to send targeted notifications.
 //
 //   for session := range s.Sessions() {
 //       s.ChannelSendToSession(ctx, session, "status", data)
 //   }
 func (s *Service) Sessions() iter.Seq[*mcp.ServerSession] {
    return s.server.Sessions()
 }
 // channelCapability returns the experimental capability descriptor
 // for claude/channel, registered during New().
 func channelCapability() map[string]any {
    return map[string]any{
        "claude/channel": map[string]any{
            "version":     "1",
            "description": "Push events into client sessions via named channels",
            "channels": []string{
                "build.complete",
                "build.failed",
                "agent.status",
                "agent.blocked",
                "agent.complete",
                "brain.recall.complete",
                "process.exit",
                "test.result",
            },
        },
    }
 }
 ```
 - [ ] **Step 3: Register experimental capability in New()**
 Update `New()` in `mcp.go` to pass capabilities to `mcp.NewServer`:
 ```go
 server := mcp.NewServer(impl, &mcp.ServerOptions{
    Capabilities: &mcp.ServerCapabilities{
        Tools:        &mcp.ToolCapabilities{ListChanged: true},
        Logging:      &mcp.LoggingCapabilities{},
        Experimental: channelCapability(),
    },
 })
 ```
 - [ ] **Step 4: Create notify_test.go**
 Uses `package mcp` (internal tests) consistent with all existing test files in this package.
 ```go
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
    "context"
    "testing"
    "github.com/stretchr/testify/assert"
 )
 func TestSendNotificationToAllClients_Good(t *testing.T) {
    svc, err := New(Options{})
    assert.NoError(t, err)
    // With no connected sessions, should not panic
    ctx := context.Background()
    svc.SendNotificationToAllClients(ctx, "info", "test", map[string]any{"key": "value"})
 }
 func TestChannelSend_Good(t *testing.T) {
    svc, err := New(Options{})
    assert.NoError(t, err)
    ctx := context.Background()
    svc.ChannelSend(ctx, "build.complete", map[string]any{"repo": "go-io"})
 }
 func TestChannelCapability_Good(t *testing.T) {
    // Verify the capability struct is well-formed
    svc, err := New(Options{})
    assert.NoError(t, err)
    assert.NotNil(t, svc.Server())
 }
 ```
 - [ ] **Step 5: Verify compilation and tests**
 ```bash
 go vet ./pkg/mcp/...
 go test ./pkg/mcp/...
 ```
 - [ ] **Step 6: Commit**
 ```bash
 git add pkg/mcp/notify.go pkg/mcp/notify_test.go pkg/mcp/mcp.go pkg/mcp/transport_tcp.go pkg/mcp/transport_unix.go
 git commit -m "feat(mcp): add notification broadcasting + claude/channel capability
 New methods:
 - SendNotificationToAllClients: broadcasts to all connected MCP sessions
 - ChannelSend: push named channel events (build.complete, agent.status, etc.)
 - ChannelSendToSession: push to a specific session
 - Sessions: iterator over connected sessions for subsystem use
 Refactors TCP/Unix transports to use Server.Connect() instead of
 creating per-connection servers, so all sessions are visible to
 the notification broadcaster.
 Registers claude/channel as an experimental MCP capability so clients
 (Claude Code, IDEs) can discover and subscribe to push events.
 Co-Authored-By: Virgil <virgil@lethean.io>"
 ```
 ---
 ## Phase 3: Usage-Example Comments + Naming
 Add usage-example comments to all public types and functions. This is the CoreGO convention: comments show how to call the thing, not just what it does.
 **Files:**
 - Modify: `pkg/mcp/mcp.go` (Input/Output types)
 - Modify: `pkg/mcp/registry.go`
 - Modify: `pkg/mcp/bridge.go`
 - Modify: `pkg/mcp/tools_metrics.go`
 - Modify: `pkg/mcp/tools_process.go`
 - Modify: `pkg/mcp/tools_rag.go`
 - Modify: `pkg/mcp/tools_webview.go`
 - Modify: `pkg/mcp/tools_ws.go`
 - Modify: `pkg/mcp/transport_stdio.go`
 - Modify: `pkg/mcp/transport_tcp.go`
 - Modify: `pkg/mcp/transport_unix.go`
 - Modify: `pkg/mcp/transport_http.go`
 - [ ] **Step 1: Update Input/Output type comments in mcp.go**
 Add inline usage examples to field comments:
 ```go
 // ReadFileInput contains parameters for reading a file.
 //
 //   input := ReadFileInput{Path: "src/main.go"}
 type ReadFileInput struct {
    Path string `json:"path"` // e.g. "src/main.go"
 }
 // ReadFileOutput contains the result of reading a file.
 type ReadFileOutput struct {
    Content  string `json:"content"`  // File contents as string
    Language string `json:"language"` // e.g. "go", "typescript"
    Path     string `json:"path"`     // Echoed input path
 }
 ```
 Apply the same pattern to all Input/Output types in `mcp.go`:
 - `WriteFileInput/Output`
 - `ListDirectoryInput/Output`, `DirectoryEntry`
 - `CreateDirectoryInput/Output`
 - `DeleteFileInput/Output`
 - `RenameFileInput/Output`
 - `FileExistsInput/Output`
 - `DetectLanguageInput/Output`
 - `GetSupportedLanguagesInput/Output`
 - `EditDiffInput/Output`
 - [ ] **Step 2: Update tool file comments**
 For each tool file (`tools_metrics.go`, `tools_process.go`, `tools_rag.go`, `tools_webview.go`, `tools_ws.go`), add usage-example comments to:
 - Input/Output struct definitions
 - Handler function doc comments
 - Registration function doc comments
 Example pattern:
 ```go
 // ProcessStartInput contains parameters for starting a new process.
 //
 //   input := ProcessStartInput{Command: "go", Args: []string{"test", "./..."}}
 type ProcessStartInput struct {
    Command string   `json:"command"`        // e.g. "go", "npm"
    Args    []string `json:"args,omitempty"` // e.g. ["test", "./..."]
    Dir     string   `json:"dir,omitempty"`  // Working directory, e.g. "/path/to/project"
    Env     []string `json:"env,omitempty"`  // e.g. ["DEBUG=true", "PORT=8080"]
 }
 ```
 - [ ] **Step 3: Update registry.go comments**
 ```go
 // addToolRecorded registers a tool with the MCP server AND records its metadata
 // for the REST bridge. The generic type parameters capture In/Out for schema extraction.
 //
 //   addToolRecorded(s, server, "files", &mcp.Tool{
 //       Name:        "file_read",
 //       Description: "Read the contents of a file",
 //   }, s.readFile)
 func addToolRecorded[In, Out any](...) { ... }
 ```
 - [ ] **Step 4: Update transport comments**
 ```go
 // ServeStdio starts the MCP server on stdin/stdout.
 // This is the default transport for IDE integration.
 //
 //   err := svc.ServeStdio(ctx)
 func (s *Service) ServeStdio(ctx context.Context) error { ... }
 // ServeTCP starts the MCP server on a TCP address.
 // Each connection gets its own MCP session.
 //
 //   err := svc.ServeTCP(ctx, "127.0.0.1:9100")
 func (s *Service) ServeTCP(ctx context.Context, addr string) error { ... }
 // ServeUnix starts the MCP server on a Unix domain socket.
 //
 //   err := svc.ServeUnix(ctx, "/tmp/core-mcp.sock")
 func (s *Service) ServeUnix(ctx context.Context, socketPath string) error { ... }
 // ServeHTTP starts the MCP server with Streamable HTTP transport.
 // Supports optional Bearer token auth via MCP_AUTH_TOKEN env var.
 //
 //   err := svc.ServeHTTP(ctx, "127.0.0.1:9101")
 func (s *Service) ServeHTTP(ctx context.Context, addr string) error { ... }
 ```
 - [ ] **Step 5: Verify compilation**
 ```bash
 go vet ./pkg/mcp/...
 go build ./pkg/mcp/...
 ```
 - [ ] **Step 6: Commit**
 ```bash
 git add pkg/mcp/*.go
 git commit -m "docs(mcp): add usage-example comments to all public types
 CoreGO convention: comments show how to call the thing, not just
 what it does. Adds inline examples to Input/Output structs, handler
 functions, transport methods, and registry functions.
 Co-Authored-By: Virgil <virgil@lethean.io>"
 ```
 ---
 ## Phase 4: Wire Notifications into Subsystems
 Connect the notification system to existing subsystems so they emit channel events.
 **Files:**
 - Modify: `pkg/mcp/subsystem.go` (add Notifier interface, SubsystemWithNotifier)
 - Modify: `pkg/mcp/mcp.go` (call SetNotifier in New())
 - Modify: `pkg/mcp/tools_process.go` (emit process lifecycle events)
 - Modify: `pkg/mcp/brain/brain.go` (accept Notifier, emit brain events from bridge callback)
 - [ ] **Step 1: Define Notifier interface to avoid circular imports**
 Sub-packages (`brain/`, `ide/`) cannot import `pkg/mcp` without creating a cycle. Define a small `Notifier` interface that sub-packages can accept without importing the parent package:
 ```go
 // Notifier pushes events to connected MCP sessions.
 // Implemented by *Service. Sub-packages accept this interface
 // to avoid circular imports.
 //
 //   notifier.ChannelSend(ctx, "build.complete", data)
 type Notifier interface {
    ChannelSend(ctx context.Context, channel string, data any)
 }
 ```
 Add an optional `SubsystemWithNotifier` interface:
 ```go
 // SubsystemWithNotifier extends Subsystem for those that emit channel events.
 // SetNotifier is called after New() before any tool calls.
 type SubsystemWithNotifier interface {
    Subsystem
    SetNotifier(n Notifier)
 }
 ```
 In `New()`, after creating the service:
 ```go
 for _, sub := range s.subsystems {
    sub.RegisterTools(s.server)
    if sn, ok := sub.(SubsystemWithNotifier); ok {
        sn.SetNotifier(s)
    }
 }
 ```
 - [ ] **Step 2: Emit process lifecycle events**
 Process tools live in `pkg/mcp/` (same package as Service), so they can call `s.ChannelSend` directly:
 ```go
 // After successful process start:
 s.ChannelSend(ctx, "process.start", map[string]any{
    "id":      output.ID,
    "command": input.Command,
 })
 // In the process exit callback (if wired via ProcessEventCallback):
 s.ChannelSend(ctx, "process.exit", map[string]any{
    "id":       id,
    "exitCode": code,
 })
 ```
 - [ ] **Step 3: Emit brain events in brain subsystem**
 The brain subsystem's recall handler sends requests to the Laravel bridge asynchronously — the returned `output` does not contain real results (they arrive via WebSocket later). Instead, emit the notification from the bridge callback where results actually arrive.
 In `pkg/mcp/brain/brain.go`, add a `Notifier` field and `SetNotifier` method:
 ```go
 type Subsystem struct {
    bridge   *ide.Bridge
    notifier Notifier // set by SubsystemWithNotifier
 }
 // Notifier pushes events to MCP sessions (matches pkg/mcp.Notifier).
 type Notifier interface {
    ChannelSend(ctx context.Context, channel string, data any)
 }
 func (s *Subsystem) SetNotifier(n Notifier) {
    s.notifier = n
 }
 ```
 Then in the bridge message handler (where recall results are received from Laravel), emit the notification with the actual result count:
 ```go
 // In the bridge callback that processes recall results:
 if s.notifier != nil {
    s.notifier.ChannelSend(ctx, "brain.recall.complete", map[string]any{
        "query": query,
        "count": len(memories),
    })
 }
 ```
 - [ ] **Step 4: Verify compilation and tests**
 ```bash
 go vet ./pkg/mcp/...
 go test ./pkg/mcp/...
 ```
 - [ ] **Step 5: Commit**
 ```bash
 git add pkg/mcp/subsystem.go pkg/mcp/mcp.go pkg/mcp/tools_process.go pkg/mcp/brain/brain.go
 git commit -m "feat(mcp): wire channel notifications into process and brain subsystems
 Adds Notifier interface to avoid circular imports between pkg/mcp
 and sub-packages. Subsystems that implement SubsystemWithNotifier
 receive a Notifier reference. Process tools emit process.start and
 process.exit channel events. Brain subsystem emits
 brain.recall.complete from the bridge callback (not the handler
 return, which is async).
 Co-Authored-By: Virgil <virgil@lethean.io>"
 ```
 ---
 ## Phase 5: Consumer Migration Guide
 Document the breaking changes for the 2 consumers (agent, ide modules).
 **Files:**
 - Create: `docs/migration-guide-options.md`
 - [ ] **Step 1: Write migration guide**
 ```markdown
 # Migrating to Options{} Constructor
 ## Before (functional options)
    svc, err := mcp.New(
        mcp.WithWorkspaceRoot("/path"),
        mcp.WithProcessService(ps),
        mcp.WithWSHub(hub),
        mcp.WithSubsystem(brainSub),
        mcp.WithSubsystem(ideSub),
    )
 ## After (Options struct)
    svc, err := mcp.New(mcp.Options{
        WorkspaceRoot:  "/path",
        ProcessService: ps,
        WSHub:          hub,
        Subsystems:     []mcp.Subsystem{brainSub, ideSub},
    })
 ## New notification API
    // Broadcast to all sessions (LoggingLevel is a string type)
    svc.SendNotificationToAllClients(ctx, "info", "build", data)
    // Push a named channel event
    svc.ChannelSend(ctx, "build.complete", data)
    // Push to a specific session
    for session := range svc.Sessions() {
        svc.ChannelSendToSession(ctx, session, "agent.status", data)
    }
 ```
 - [ ] **Step 2: Commit**
 ```bash
 git add docs/migration-guide-options.md
 git commit -m "docs(mcp): add migration guide for Options{} constructor
 Documents breaking changes from functional options to Options{}
 struct for consumers (agent, ide modules). Includes notification
 API examples.
 Co-Authored-By: Virgil <virgil@lethean.io>"
 ```
 ---
 ## Summary
 **Total: 5 phases, 24 steps**
 | Phase | Scope | Breaking? |
 |-------|-------|-----------|
 | 1 | `Options{}` struct replaces functional options | Yes — 2 consumers |
 | 2 | Notification broadcasting + claude/channel | No — new API |
 | 3 | Usage-example comments | No — docs only |
 | 4 | Wire notifications into subsystems | No — additive |
 | 5 | Consumer migration guide | No — docs only |
 After completion:
 - `mcp.New(mcp.Options{...})` replaces `mcp.New(mcp.WithXxx(...))`
 - `svc.SendNotificationToAllClients(ctx, level, logger, data)` broadcasts to all sessions
 - `svc.ChannelSend(ctx, "build.complete", data)` pushes named events
 - `claude/channel` experimental capability advertised during MCP initialisation
 - Clients (Claude Code, IDEs) can discover push-event support and receive real-time updates
 - All public types and functions have usage-example comments
--- a/go.mod
+++ b/go.mod
@ -1,28 +1,29 @@
-module dappco.re/go/mcp
+module forge.lthn.ai/core/mcp
 go 1.26.0
 require (
-	dappco.re/go/core v0.8.0-alpha.1
+	dappco.re/go/core v0.4.7
-	dappco.re/go/core/ai v0.2.2
+	forge.lthn.ai/core/api v0.1.5
-	dappco.re/go/core/api v0.3.0
+	forge.lthn.ai/core/cli v0.3.7
-	dappco.re/go/core/cli v0.5.2
+	forge.lthn.ai/core/go-ai v0.1.12
-	dappco.re/go/core/io v0.4.1
+	forge.lthn.ai/core/go-io v0.1.7
-	dappco.re/go/core/log v0.1.2
+	forge.lthn.ai/core/go-log v0.0.4
-	dappco.re/go/core/process v0.5.0
+	forge.lthn.ai/core/go-process v0.2.9
-	dappco.re/go/core/rag v0.1.13
+	forge.lthn.ai/core/go-rag v0.1.11
-	dappco.re/go/core/webview v0.2.1
+	forge.lthn.ai/core/go-webview v0.1.6
-	dappco.re/go/core/ws v0.4.0
+	forge.lthn.ai/core/go-ws v0.2.5
 	github.com/gin-gonic/gin v1.12.0
 	github.com/gorilla/websocket v1.5.3
-	github.com/modelcontextprotocol/go-sdk v1.5.0
+	github.com/modelcontextprotocol/go-sdk v1.4.1
 	github.com/stretchr/testify v1.11.1
 	gopkg.in/yaml.v3 v3.0.1
 )
 require (
-	dappco.re/go/core/i18n v0.2.3 // indirect
+	forge.lthn.ai/core/go v0.3.3 // indirect
-	dappco.re/go/core/inference v0.3.0 // 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
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/agnivade/levenshtein v1.2.1 // indirect
@ -148,5 +149,3 @@ require (
 	google.golang.org/grpc v1.79.2 // indirect
 	google.golang.org/protobuf v1.36.11 // indirect
 )
 replace dappco.re/go/core/process => ../go-process
--- a/go.sum
+++ b/go.sum
@ -1,25 +1,29 @@
-dappco.re/go/core v0.8.0-alpha.1 h1:gj7+Scv+L63Z7wMxbJYHhaRFkHJo2u4MMPuUSv/Dhtk=
+dappco.re/go/core v0.4.7 h1:KmIA/2lo6rl1NMtLrKqCWfMlUqpDZYH3q0/d10dTtGA=
-dappco.re/go/core v0.8.0-alpha.1/go.mod h1:f2/tBZ3+3IqDrg2F5F598llv0nmb/4gJVCFzM5geE4A=
+dappco.re/go/core v0.4.7/go.mod h1:f2/tBZ3+3IqDrg2F5F598llv0nmb/4gJVCFzM5geE4A=
-dappco.re/go/core/ai v0.2.2 h1:fkSKm3ezAljYbghlax5qHDm11uq7LUyIedIQO1PtdcY=
+forge.lthn.ai/core/api v0.1.5 h1:NwZrcOyBjaiz5/cn0n0tnlMUodi8Or6FHMx59C7Kv2o=
-dappco.re/go/core/ai v0.2.2/go.mod h1:+MZN/EArn/W2ag91McL034WxdMSO4IPqFcQER5/POGU=
+forge.lthn.ai/core/api v0.1.5/go.mod h1:PBnaWyOVXSOGy+0x2XAPUFMYJxQ2CNhppia/D06ZPII=
-dappco.re/go/core/api v0.3.0 h1:uWYgDQ+B4e5pXPX3S5lMsqSJamfpui3LWD5hcdwvWew=
+forge.lthn.ai/core/cli v0.3.7 h1:1GrbaGg0wDGHr6+klSbbGyN/9sSbHvFbdySJznymhwg=
-dappco.re/go/core/api v0.3.0/go.mod h1:1ZDNwPHV6YjkUsjtC3nfLk6U4eqWlQ6qj6yT/MB8r6k=
+forge.lthn.ai/core/cli v0.3.7/go.mod h1:DBUppJkA9P45ZFGgI2B8VXw1rAZxamHoI/KG7fRvTNs=
-dappco.re/go/core/cli v0.5.2 h1:mo+PERo3lUytE+r3ArHr8o2nTftXjgPPsU/rn3ETXDM=
+forge.lthn.ai/core/go v0.3.3 h1:kYYZ2nRYy0/Be3cyuLJspRjLqTMxpckVyhb/7Sw2gd0=
-dappco.re/go/core/cli v0.5.2/go.mod h1:D4zfn3ec/hb72AWX/JWDvkW+h2WDKQcxGUrzoss7q2s=
+forge.lthn.ai/core/go v0.3.3/go.mod h1:Cp4ac25pghvO2iqOu59t1GyngTKVOzKB5/VPdhRi9CQ=
-dappco.re/go/core/i18n v0.2.3 h1:GqFaTR1I0SfSEc4WtsAkgao+jp8X5qcMPqrX0eMAOrY=
+forge.lthn.ai/core/go-ai v0.1.12 h1:OHt0bUABlyhvgxZxyMwueRoh8rS3YKWGFY6++zCAwC8=
-dappco.re/go/core/i18n v0.2.3/go.mod h1:LoyX/4fIEJO/wiHY3Q682+4P0Ob7zPemcATfwp0JBUg=
+forge.lthn.ai/core/go-ai v0.1.12/go.mod h1:5Pc9lszxgkO7Aj2Z3dtq4L9Xk9l/VNN+Baj1t///OCM=
-dappco.re/go/core/inference v0.3.0 h1:ANFnlVO1LEYDipeDeBgqmb8CHvOTUFhMPyfyHGqO0IY=
+forge.lthn.ai/core/go-i18n v0.1.7 h1:aHkAoc3W8fw3RPNvw/UszQbjyFWXHszzbZgty3SwyAA=
-dappco.re/go/core/inference v0.3.0/go.mod h1:wbRY0v6iwOoJCpTvcBFarAM08bMgpPcrF6yv3vccYoA=
+forge.lthn.ai/core/go-i18n v0.1.7/go.mod h1:0VDjwtY99NSj2iqwrI09h5GUsJeM9s48MLkr+/Dn4G8=
-dappco.re/go/core/io v0.4.1 h1:15dm7ldhFIAuZOrBiQG6XVZDpSvCxtZsUXApwTAB3wQ=
+forge.lthn.ai/core/go-inference v0.1.6 h1:ce42zC0zO8PuISUyAukAN1NACEdWp5wF1mRgnh5+58E=
-dappco.re/go/core/io v0.4.1/go.mod h1:w71dukyunczLb8frT9JOd5B78PjwWQD3YAXiCt3AcPA=
+forge.lthn.ai/core/go-inference v0.1.6/go.mod h1:jfWz+IJX55wAH98+ic6FEqqGB6/P31CHlg7VY7pxREw=
-dappco.re/go/core/log v0.1.2 h1:pQSZxKD8VycdvjNJmatXbPSq2OxcP2xHbF20zgFIiZI=
+forge.lthn.ai/core/go-io v0.1.7 h1:Tdb6sqh+zz1lsGJaNX9RFWM6MJ/RhSAyxfulLXrJsbk=
-dappco.re/go/core/log v0.1.2/go.mod h1:Nkqb8gsXhZAO8VLpx7B8i1iAmohhzqA20b9Zr8VUcJs=
+forge.lthn.ai/core/go-io v0.1.7/go.mod h1:8lRLFk4Dnp5cR/Cyzh9WclD5566TbpdRgwcH7UZLWn4=
-dappco.re/go/core/rag v0.1.13 h1:R2Q+Xw5YenT4uFemXLBu+xQYtyUIYGSmMln5/Z+nol4=
+forge.lthn.ai/core/go-log v0.0.4 h1:KTuCEPgFmuM8KJfnyQ8vPOU1Jg654W74h8IJvfQMfv0=
-dappco.re/go/core/rag v0.1.13/go.mod h1:wthXtCqYEChjlGIHcJXetlgk49lPDmzG6jFWd1PEIZc=
+forge.lthn.ai/core/go-log v0.0.4/go.mod h1:r14MXKOD3LF/sI8XUJQhRk/SZHBE7jAFVuCfgkXoZPw=
-dappco.re/go/core/webview v0.2.1 h1:rdy2sV+MS6RZsav8BiARJxtWhfx7eOAJp3b1Ynp1sYs=
+forge.lthn.ai/core/go-process v0.2.9 h1:Wql+5TUF+lfU2oJ9I+S764MkTqJhBsuyMM0v1zsfZC4=
-dappco.re/go/core/webview v0.2.1/go.mod h1:Qdo1V/sJJwOnL0hYd3+vzVUJxWYC8eGyILZROya6KoM=
+forge.lthn.ai/core/go-process v0.2.9/go.mod h1:NIzZOF5IVYYCjHkcNIGcg1mZH+bzGoie4SlZUDYOKIM=
-dappco.re/go/core/ws v0.4.0 h1:yEDV9whXyo+GWzBSjuB3NiLiH2bmBPBWD6rydwHyBn8=
+forge.lthn.ai/core/go-rag v0.1.11 h1:KXTOtnOdrx8YKmvnj0EOi2EI/+cKjE8w2PpJCQIrSd8=
-dappco.re/go/core/ws v0.4.0/go.mod h1:L1rrgW6zU+DztcVBJW2yO5Lm3rGXpyUMOA8OL9zsAok=
+forge.lthn.ai/core/go-rag v0.1.11/go.mod h1:vIlOKVD1SdqqjkJ2XQyXPuKPtiajz/STPLCaDpqOzk8=
 forge.lthn.ai/core/go-webview v0.1.6 h1:szXQxRJf2bOZJKh3v1P01B1Vf9mgXaBCXzh0EZu9aoc=
 forge.lthn.ai/core/go-webview v0.1.6/go.mod h1:5n1tECD1wBV/uFZRY9ZjfPFO5TYZrlaR3mQFwvO2nek=
 forge.lthn.ai/core/go-ws v0.2.5 h1:ZIV7Yrv01R/xpJUogA5vrfP9yB9li1w7EV3eZFMt8h0=
 forge.lthn.ai/core/go-ws v0.2.5/go.mod h1:C3riJyLLcV6QhLvYlq3P/XkGTsN598qQeGBoLdoHBU4=
 github.com/99designs/gqlgen v0.17.88 h1:neMQDgehMwT1vYIOx/w5ZYPUU/iMNAJzRO44I5Intoc=
 github.com/99designs/gqlgen v0.17.88/go.mod h1:qeqYFEgOeSKqWedOjogPizimp2iu4E23bdPvl4jTYic=
 github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc=
@ -218,8 +222,8 @@ github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2J
 github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
 github.com/mattn/go-runewidth v0.0.21 h1:jJKAZiQH+2mIinzCJIaIG9Be1+0NR+5sz/lYEEjdM8w=
 github.com/mattn/go-runewidth v0.0.21/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/modelcontextprotocol/go-sdk v1.5.0 h1:CHU0FIX9kpueNkxuYtfYQn1Z0slhFzBZuq+x6IiblIU=
+github.com/modelcontextprotocol/go-sdk v1.4.1 h1:M4x9GyIPj+HoIlHNGpK2hq5o3BFhC+78PkEaldQRphc=
-github.com/modelcontextprotocol/go-sdk v1.5.0/go.mod h1:gggDIhoemhWs3BGkGwd1umzEXCEMMvAnhTrnbXJKKKA=
+github.com/modelcontextprotocol/go-sdk v1.4.1/go.mod h1:Bo/mS87hPQqHSRkMv4dQq1XCu6zv4INdXnFZabkNU6s=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
--- a/pkg/mcp/agentic/dispatch.go
+++ b/pkg/mcp/agentic/dispatch.go
@ -4,18 +4,27 @@ package agentic
 import (
 	"context"
 	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"syscall"
 	"time"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
-	coreio "dappco.re/go/core/io"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // PipelineStep defines a follow-up dispatch that runs after the current agent completes.
 // The task can contain {{.Findings}} which gets replaced with the previous agent's output.
 type PipelineStep struct {
 	Task     string `json:"task"`               // Task description ({{.Findings}} = previous output)
 	Agent    string `json:"agent,omitempty"`    // Agent type (default: same as parent)
 	Template string `json:"template,omitempty"` // Template (default: coding)
 }
 // DispatchInput is the input for agentic_dispatch.
 type DispatchInput struct {
 	Repo         string            `json:"repo"`                    // Target repo (e.g. "go-io")
@ -28,6 +37,7 @@ type DispatchInput struct {
 	Persona      string            `json:"persona,omitempty"`       // Persona: engineering/backend-architect, testing/api-tester, etc.
 	Issue        int               `json:"issue,omitempty"`         // Forge issue to work from
 	DryRun       bool              `json:"dry_run,omitempty"`       // Preview without executing
 	Pipeline     []PipelineStep    `json:"pipeline,omitempty"`      // Follow-up steps: review → fix → verify
 }
 // DispatchOutput is the output for agentic_dispatch.
@ -41,9 +51,8 @@ type DispatchOutput struct {
 	OutputFile   string `json:"output_file,omitempty"`
 }
-func (s *PrepSubsystem) registerDispatchTool(svc *coremcp.Service) {
+func (s *PrepSubsystem) registerDispatchTool(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_dispatch",
 		Description: "Dispatch a subagent (Gemini, Codex, or Claude) to work on a task. Preps a sandboxed workspace first, then spawns the agent inside it. Templates: conventions, security, coding.",
 	}, s.dispatch)
@ -52,7 +61,7 @@ func (s *PrepSubsystem) registerDispatchTool(svc *coremcp.Service) {
 // agentCommand returns the command and args for a given agent type.
 // Supports model variants: "gemini", "gemini:flash", "gemini:pro", "claude", "claude:haiku".
 func agentCommand(agent, prompt string) (string, []string, error) {
-	parts := core.SplitN(agent, ":", 2)
+	parts := strings.SplitN(agent, ":", 2)
 	base := parts[0]
 	model := ""
 	if len(parts) > 1 {
@ -76,7 +85,7 @@ func agentCommand(agent, prompt string) (string, []string, error) {
 		return "claude", args, nil
 	case "local":
 		home, _ := os.UserHomeDir()
-		script := core.Path(home, "Code", "core", "agent", "scripts", "local-agent.sh")
+		script := filepath.Join(home, "Code", "core", "agent", "scripts", "local-agent.sh")
 		return "bash", []string{script, prompt}, nil
 	default:
 		return "", nil, coreerr.E("agentCommand", "unknown agent: "+agent, nil)
@ -84,25 +93,6 @@ func agentCommand(agent, prompt string) (string, []string, error) {
 }
 func (s *PrepSubsystem) dispatch(ctx context.Context, req *mcp.CallToolRequest, input DispatchInput) (*mcp.CallToolResult, DispatchOutput, error) {
 	progressToken := any(nil)
 	if req != nil && req.Params != nil {
 		progressToken = req.Params.GetProgressToken()
 	}
 	sendProgress := func(progress float64, total float64, message string) {
 		if req == nil || req.Session == nil || progressToken == nil {
 			return
 		}
 		_ = req.Session.NotifyProgress(ctx, &mcp.ProgressNotificationParams{
 			ProgressToken: progressToken,
 			Progress:      progress,
 			Total:         total,
 			Message:       message,
 		})
 	}
 	const dispatchProgressTotal = 4
 	if input.Repo == "" {
 		return nil, DispatchOutput{}, coreerr.E("dispatch", "repo is required", nil)
 	}
@ -119,10 +109,7 @@ func (s *PrepSubsystem) dispatch(ctx context.Context, req *mcp.CallToolRequest,
 		input.Template = "coding"
 	}
 	sendProgress(1, dispatchProgressTotal, "validated dispatch request")
 	// Step 1: Prep the sandboxed workspace
 	sendProgress(2, dispatchProgressTotal, "preparing workspace")
 	prepInput := PrepInput{
 		Repo:         input.Repo,
 		Org:          input.Org,
@ -137,18 +124,16 @@ func (s *PrepSubsystem) dispatch(ctx context.Context, req *mcp.CallToolRequest,
 	if err != nil {
 		return nil, DispatchOutput{}, coreerr.E("dispatch", "prep workspace failed", err)
 	}
 	sendProgress(3, dispatchProgressTotal, core.Sprintf("workspace prepared for %s", prepOut.Branch))
 	wsDir := prepOut.WorkspaceDir
-	srcDir := core.Path(wsDir, "src")
+	srcDir := filepath.Join(wsDir, "src")
 	// The prompt is just: read PROMPT.md and do the work
 	prompt := "Read PROMPT.md for instructions. All context files (CLAUDE.md, TODO.md, CONTEXT.md, CONSUMERS.md, RECENT.md) are in the parent directory. Work in this directory."
 	if input.DryRun {
 		// Read PROMPT.md for the dry run output
-		promptRaw, _ := coreio.Local.Read(core.Path(wsDir, "PROMPT.md"))
+		promptRaw, _ := coreio.Local.Read(filepath.Join(wsDir, "PROMPT.md"))
 		sendProgress(dispatchProgressTotal, dispatchProgressTotal, "dry run complete")
 		return nil, DispatchOutput{
 			Success:      true,
 			Agent:        input.Agent,
@ -161,18 +146,15 @@ func (s *PrepSubsystem) dispatch(ctx context.Context, req *mcp.CallToolRequest,
 	// Step 2: Check per-agent concurrency limit
 	if !s.canDispatchAgent(input.Agent) {
 		// Queue the workspace — write status as "queued" and return
-		s.saveStatus(wsDir, &WorkspaceStatus{
+		writeStatus(wsDir, &WorkspaceStatus{
 			Status:    "queued",
 			Agent:     input.Agent,
 			Repo:      input.Repo,
 			Org:       input.Org,
 			Task:      input.Task,
 			Issue:     input.Issue,
 			Branch:    prepOut.Branch,
 			StartedAt: time.Now(),
 			Runs:      0,
 		})
 		sendProgress(dispatchProgressTotal, dispatchProgressTotal, "queued until an agent slot is available")
 		return nil, DispatchOutput{
 			Success:      true,
 			Agent:        input.Agent,
@ -184,21 +166,17 @@ func (s *PrepSubsystem) dispatch(ctx context.Context, req *mcp.CallToolRequest,
 	// Step 3: Write status BEFORE spawning so concurrent dispatches
 	// see this workspace as "running" during the concurrency check.
-	s.saveStatus(wsDir, &WorkspaceStatus{
+	writeStatus(wsDir, &WorkspaceStatus{
 		Status:    "running",
 		Agent:     input.Agent,
 		Repo:      input.Repo,
 		Org:       input.Org,
 		Task:      input.Task,
 		Issue:     input.Issue,
 		Branch:    prepOut.Branch,
 		StartedAt: time.Now(),
 		Runs:      1,
 	})
 	sendProgress(3.5, dispatchProgressTotal, "dispatch slot acquired")
 	// Step 4: Spawn agent as a detached process
 	sendProgress(4, dispatchProgressTotal, core.Sprintf("spawning agent %s", input.Agent))
 	// Uses Setpgid so the agent survives parent (MCP server) death.
 	// Output goes directly to log file (not buffered in memory).
 	command, args, err := agentCommand(input.Agent, prompt)
@ -206,7 +184,7 @@ func (s *PrepSubsystem) dispatch(ctx context.Context, req *mcp.CallToolRequest,
 		return nil, DispatchOutput{}, err
 	}
-	outputFile := core.Path(wsDir, core.Sprintf("agent-%s.log", input.Agent))
+	outputFile := filepath.Join(wsDir, fmt.Sprintf("agent-%s.log", input.Agent))
 	outFile, err := os.Create(outputFile)
 	if err != nil {
 		return nil, DispatchOutput{}, coreerr.E("dispatch", "failed to create log file", err)
@ -235,71 +213,57 @@ func (s *PrepSubsystem) dispatch(ctx context.Context, req *mcp.CallToolRequest,
 	if err := cmd.Start(); err != nil {
 		outFile.Close()
 		// Revert status so the slot is freed
-		s.saveStatus(wsDir, &WorkspaceStatus{
+		writeStatus(wsDir, &WorkspaceStatus{
 			Status: "failed",
 			Agent:  input.Agent,
 			Repo:   input.Repo,
 			Task:   input.Task,
 			Issue:  input.Issue,
 			Branch: prepOut.Branch,
 		})
 		return nil, DispatchOutput{}, coreerr.E("dispatch", "failed to spawn "+input.Agent, err)
 	}
 	pid := cmd.Process.Pid
 	sendProgress(dispatchProgressTotal, dispatchProgressTotal, "agent process started")
 	// Update status with PID now that agent is running
-	s.saveStatus(wsDir, &WorkspaceStatus{
+	writeStatus(wsDir, &WorkspaceStatus{
 		Status:    "running",
 		Agent:     input.Agent,
 		Repo:      input.Repo,
 		Org:       input.Org,
 		Task:      input.Task,
 		Issue:     input.Issue,
 		Branch:    prepOut.Branch,
 		PID:       pid,
 		StartedAt: time.Now(),
 		Runs:      1,
 	})
 	// Store pipeline steps in status for the completion handler
 	if len(input.Pipeline) > 0 {
 		if st, err := readStatus(wsDir); err == nil {
 			st.NextSteps = input.Pipeline
 			writeStatus(wsDir, st)
 		}
 	}
 	// Background goroutine: close file handle when process exits,
-	// update status, then drain queue if a slot opened up.
+	// update status, run pipeline next step, then drain queue.
 	go func() {
 		cmd.Wait()
 		outFile.Close()
-		postCtx := context.WithoutCancel(ctx)
+		st, err := readStatus(wsDir)
-		status := "completed"
+		if err != nil {
-		channel := coremcp.ChannelAgentComplete
+			s.drainQueue()
-		payload := map[string]any{
+			return
 			"workspace": core.PathBase(wsDir),
 			"repo":      input.Repo,
 			"org":       input.Org,
 			"agent":     input.Agent,
 			"branch":    prepOut.Branch,
 		}
-		// Update status to completed or blocked.
+		st.Status = "completed"
 		if st, err := readStatus(wsDir); err == nil {
 		st.PID = 0
-			if data, err := coreio.Local.Read(core.Path(wsDir, "src", "BLOCKED.md")); err == nil {
+		writeStatus(wsDir, st)
 				status = "blocked"
 				channel = coremcp.ChannelAgentBlocked
 				st.Status = status
 				st.Question = core.Trim(data)
 				if st.Question != "" {
 					payload["question"] = st.Question
 				}
 			} else {
 				st.Status = status
 			}
 			s.saveStatus(wsDir, st)
 		}
-		payload["status"] = status
+		// Pipeline: if there are next steps, dispatch the next one
-		s.emitChannel(postCtx, channel, payload)
+		if len(st.NextSteps) > 0 {
-		s.emitChannel(postCtx, coremcp.ChannelAgentStatus, payload)
+			s.runNextPipelineStep(ctx, req, wsDir, st)
 		}
 		// Ingest scan findings as issues
 		s.ingestFindings(wsDir)
@ -317,3 +281,49 @@ func (s *PrepSubsystem) dispatch(ctx context.Context, req *mcp.CallToolRequest,
 		OutputFile:   outputFile,
 	}, nil
 }
 // runNextPipelineStep reads the completed agent's output, injects findings
 // into the next step's task, and dispatches it. For coding→verify loops,
 // it re-dispatches the fix step if verify finds non-exception findings.
 func (s *PrepSubsystem) runNextPipelineStep(ctx context.Context, req *mcp.CallToolRequest, wsDir string, st *WorkspaceStatus) {
 	// Read the agent's output log for findings
 	logFiles, _ := filepath.Glob(filepath.Join(wsDir, "agent-*.log"))
 	findings := ""
 	if len(logFiles) > 0 {
 		if data, err := coreio.Local.Read(logFiles[len(logFiles)-1]); err == nil {
 			// Extract last 2000 chars as findings summary
 			if len(data) > 2000 {
 				findings = data[len(data)-2000:]
 			} else {
 				findings = data
 			}
 		}
 	}
 	// Pop the next step
 	step := st.NextSteps[0]
 	remaining := st.NextSteps[1:]
 	// Default agent/template from parent
 	agent := step.Agent
 	if agent == "" {
 		agent = st.Agent
 	}
 	template := step.Template
 	if template == "" {
 		template = "coding"
 	}
 	// Replace {{.Findings}} in task with actual findings
 	task := strings.ReplaceAll(step.Task, "{{.Findings}}", findings)
 	// Dispatch next step with remaining pipeline
 	s.dispatch(ctx, req, DispatchInput{
 		Repo:     st.Repo,
 		Org:      st.Org,
 		Task:     task,
 		Agent:    agent,
 		Template: template,
 		Pipeline: remaining,
 	})
 }
--- a/pkg/mcp/agentic/epic.go
+++ b/pkg/mcp/agentic/epic.go
@ -6,11 +6,11 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"strings"
-	core "dappco.re/go/core"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -45,9 +45,8 @@ type ChildRef struct {
 	URL    string `json:"url"`
 }
-func (s *PrepSubsystem) registerEpicTool(svc *coremcp.Service) {
+func (s *PrepSubsystem) registerEpicTool(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_create_epic",
 		Description: "Create an epic issue with child issues on Forge. Each task becomes a child issue linked via checklist. Optionally auto-dispatch agents to work each child.",
 	}, s.createEpic)
@ -100,14 +99,14 @@ func (s *PrepSubsystem) createEpic(ctx context.Context, req *mcp.CallToolRequest
 	}
 	// Step 2: Build epic body with checklist
-	body := core.NewBuilder()
+	var body strings.Builder
 	if input.Body != "" {
 		body.WriteString(input.Body)
 		body.WriteString("\n\n")
 	}
 	body.WriteString("## Tasks\n\n")
 	for _, child := range children {
-		body.WriteString(core.Sprintf("- [ ] #%d %s\n", child.Number, child.Title))
+		body.WriteString(fmt.Sprintf("- [ ] #%d %s\n", child.Number, child.Title))
 	}
 	// Step 3: Create epic issue
@ -156,12 +155,8 @@ func (s *PrepSubsystem) createIssue(ctx context.Context, org, repo, title, body
 		payload["labels"] = labelIDs
 	}
-	r := core.JSONMarshal(payload)
+	data, _ := json.Marshal(payload)
-	if !r.OK {
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/issues", s.forgeURL, org, repo)
 		return ChildRef{}, coreerr.E("createIssue", "failed to encode issue payload", nil)
 	}
 	data := r.Value.([]byte)
 	url := core.Sprintf("%s/api/v1/repos/%s/%s/issues", s.forgeURL, org, repo)
 	req, _ := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(data))
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "token "+s.forgeToken)
@ -173,7 +168,7 @@ func (s *PrepSubsystem) createIssue(ctx context.Context, org, repo, title, body
 	defer resp.Body.Close()
 	if resp.StatusCode != 201 {
-		return ChildRef{}, coreerr.E("createIssue", core.Sprintf("returned %d", resp.StatusCode), nil)
+		return ChildRef{}, coreerr.E("createIssue", fmt.Sprintf("returned %d", resp.StatusCode), nil)
 	}
 	var result struct {
@ -196,7 +191,7 @@ func (s *PrepSubsystem) resolveLabelIDs(ctx context.Context, org, repo string, n
 	}
 	// Fetch existing labels
-	url := core.Sprintf("%s/api/v1/repos/%s/%s/labels?limit=50", s.forgeURL, org, repo)
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/labels?limit=50", s.forgeURL, org, repo)
 	req, _ := http.NewRequestWithContext(ctx, "GET", url, nil)
 	req.Header.Set("Authorization", "token "+s.forgeToken)
@ -249,16 +244,12 @@ func (s *PrepSubsystem) createLabel(ctx context.Context, org, repo, name string)
 		colour = "#6b7280"
 	}
-	r := core.JSONMarshal(map[string]string{
+	payload, _ := json.Marshal(map[string]string{
 		"name":  name,
 		"color": colour,
 	})
 	if !r.OK {
 		return 0
 	}
 	payload := r.Value.([]byte)
-	url := core.Sprintf("%s/api/v1/repos/%s/%s/labels", s.forgeURL, org, repo)
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/labels", s.forgeURL, org, repo)
 	req, _ := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(payload))
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "token "+s.forgeToken)
--- a/pkg/mcp/agentic/ingest.go
+++ b/pkg/mcp/agentic/ingest.go
@ -3,12 +3,15 @@
 package agentic
 import (
-	"context"
+	"bytes"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
 	coreio "dappco.re/go/core/io"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 )
 // ingestFindings reads the agent output log and creates issues via the API
@ -20,7 +23,10 @@ func (s *PrepSubsystem) ingestFindings(wsDir string) {
 	}
 	// Read the log file
-	logFiles := core.PathGlob(core.Path(wsDir, "agent-*.log"))
+	logFiles, err := filepath.Glob(filepath.Join(wsDir, "agent-*.log"))
 	if err != nil {
 		return
 	}
 	if len(logFiles) == 0 {
 		return
 	}
@ -33,28 +39,26 @@ func (s *PrepSubsystem) ingestFindings(wsDir string) {
 	body := contentStr
 	// Skip quota errors
-	if core.Contains(body, "QUOTA_EXHAUSTED") || core.Contains(body, "QuotaError") {
+	if strings.Contains(body, "QUOTA_EXHAUSTED") || strings.Contains(body, "QuotaError") {
 		return
 	}
 	// Only ingest if there are actual findings (file:line references)
 	findings := countFileRefs(body)
 	issueCreated := false
 	if findings < 2 {
 		s.emitHarvestComplete(context.Background(), wsDir, st.Repo, findings, issueCreated)
 		return // No meaningful findings
 	}
 	// Determine issue type from the template used
 	issueType := "task"
 	priority := "normal"
-	if core.Contains(body, "security") || core.Contains(body, "Security") {
+	if strings.Contains(body, "security") || strings.Contains(body, "Security") {
 		issueType = "bug"
 		priority = "high"
 	}
 	// Create a single issue per repo with all findings in the body
-	title := core.Sprintf("Scan findings for %s (%d items)", st.Repo, findings)
+	title := fmt.Sprintf("Scan findings for %s (%d items)", st.Repo, findings)
 	// Truncate body to reasonable size for issue description
 	description := body
@ -62,8 +66,7 @@ func (s *PrepSubsystem) ingestFindings(wsDir string) {
 		description = description[:10000] + "\n\n... (truncated, see full log in workspace)"
 	}
-	issueCreated = s.createIssueViaAPI(st.Repo, title, description, issueType, priority, "scan")
+	s.createIssueViaAPI(st.Repo, title, description, issueType, priority, "scan")
 	s.emitHarvestComplete(context.Background(), wsDir, st.Repo, findings, issueCreated)
 }
 // countFileRefs counts file:line references in the output (indicates real findings)
@ -78,7 +81,7 @@ func countFileRefs(body string) int {
 			}
 			if j < len(body) && body[j] == '`' {
 				ref := body[i+1 : j]
-				if core.Contains(ref, ".go:") || core.Contains(ref, ".php:") {
+				if strings.Contains(ref, ".go:") || strings.Contains(ref, ".php:") {
 					count++
 				}
 			}
@ -88,20 +91,20 @@ func countFileRefs(body string) int {
 }
 // createIssueViaAPI posts an issue to the lthn.sh API
-func (s *PrepSubsystem) createIssueViaAPI(repo, title, description, issueType, priority, source string) bool {
+func (s *PrepSubsystem) createIssueViaAPI(repo, title, description, issueType, priority, source string) {
 	if s.brainKey == "" {
-		return false
+		return
 	}
 	// Read the agent API key from file
-	home := core.Env("HOME")
+	home, _ := os.UserHomeDir()
-	apiKeyData, err := coreio.Local.Read(core.Path(home, ".claude", "agent-api.key"))
+	apiKeyData, err := coreio.Local.Read(filepath.Join(home, ".claude", "agent-api.key"))
 	if err != nil {
-		return false
+		return
 	}
-	apiKey := core.Trim(apiKeyData)
+	apiKey := strings.TrimSpace(apiKeyData)
-	payloadStr := core.JSONMarshalString(map[string]string{
+	payload, _ := json.Marshal(map[string]string{
 		"title":       title,
 		"description": description,
 		"type":        issueType,
@ -109,31 +112,14 @@ func (s *PrepSubsystem) createIssueViaAPI(repo, title, description, issueType, p
 		"reporter":    "cladius",
 	})
-	req, err := http.NewRequest("POST", s.brainURL+"/v1/issues", core.NewReader(payloadStr))
+	req, _ := http.NewRequest("POST", s.brainURL+"/v1/issues", bytes.NewReader(payload))
 	if err != nil {
 		return false
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Accept", "application/json")
 	req.Header.Set("Authorization", "Bearer "+apiKey)
 	resp, err := s.client.Do(req)
 	if err != nil {
-		return false
+		return
 	}
 	resp.Body.Close()
 	return resp.StatusCode < 400
 }
 // emitHarvestComplete announces that finding ingestion finished for a workspace.
 //
 //	ctx := context.Background()
 //	s.emitHarvestComplete(ctx, "go-io-123", "go-io", 4, true)
 func (s *PrepSubsystem) emitHarvestComplete(ctx context.Context, workspace, repo string, findings int, issueCreated bool) {
 	s.emitChannel(ctx, coremcp.ChannelHarvestComplete, map[string]any{
 		"workspace":     workspace,
 		"repo":          repo,
 		"findings":      findings,
 		"issue_created": issueCreated,
 	})
 }
--- a/pkg/mcp/agentic/issue.go
+++ b/pkg/mcp/agentic/issue.go
@ -1,224 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"net/http"
 	core "dappco.re/go/core"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // IssueDispatchInput is the input for agentic_dispatch_issue.
 //
 //	input := IssueDispatchInput{
 //	    Repo:  "go-io",
 //	    Issue: 123,
 //	    Agent: "claude",
 //	}
 type IssueDispatchInput struct {
 	Repo     string `json:"repo"`               // Target repo (e.g. "go-io")
 	Org      string `json:"org,omitempty"`      // Forge org (default "core")
 	Issue    int    `json:"issue"`              // Forge issue number
 	Agent    string `json:"agent,omitempty"`    // "claude" (default), "codex", "gemini"
 	Template string `json:"template,omitempty"` // "conventions", "security", "coding" (default)
 	DryRun   bool   `json:"dry_run,omitempty"`  // Preview without executing
 }
 type forgeIssue struct {
 	Title  string `json:"title"`
 	Body   string `json:"body"`
 	State  string `json:"state"`
 	Labels []struct {
 		Name string `json:"name"`
 	} `json:"labels"`
 	Assignee *struct {
 		Login string `json:"login"`
 	} `json:"assignee"`
 }
 func (s *PrepSubsystem) registerIssueTools(svc *coremcp.Service) {
 	server := svc.Server()
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_dispatch_issue",
 		Description: "Dispatch an agent to work on a Forge issue. Assigns the issue as a lock, prepends the issue body to TODO.md, creates an issue-specific branch, and spawns the agent.",
 	}, s.dispatchIssue)
 	// agentic_issue_dispatch is the spec-aligned name for the same action.
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_issue_dispatch",
 		Description: "Dispatch an agent to work on a Forge issue. Spec-aligned alias for agentic_dispatch_issue.",
 	}, s.dispatchIssue)
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_pr",
 		Description: "Create a pull request from an agent workspace. Pushes the branch and creates a Forge PR linked to the tracked issue, if any.",
 	}, s.createPR)
 }
 func (s *PrepSubsystem) dispatchIssue(ctx context.Context, req *mcp.CallToolRequest, input IssueDispatchInput) (*mcp.CallToolResult, DispatchOutput, error) {
 	if input.Repo == "" {
 		return nil, DispatchOutput{}, coreerr.E("dispatchIssue", "repo is required", nil)
 	}
 	if input.Issue == 0 {
 		return nil, DispatchOutput{}, coreerr.E("dispatchIssue", "issue is required", nil)
 	}
 	if input.Org == "" {
 		input.Org = "core"
 	}
 	if input.Agent == "" {
 		input.Agent = "claude"
 	}
 	if input.Template == "" {
 		input.Template = "coding"
 	}
 	issue, err := s.fetchIssue(ctx, input.Org, input.Repo, input.Issue)
 	if err != nil {
 		return nil, DispatchOutput{}, err
 	}
 	if issue.State != "open" {
 		return nil, DispatchOutput{}, coreerr.E("dispatchIssue", core.Sprintf("issue %d is %s, not open", input.Issue, issue.State), nil)
 	}
 	if issue.Assignee != nil && issue.Assignee.Login != "" {
 		return nil, DispatchOutput{}, coreerr.E("dispatchIssue", core.Sprintf("issue %d is already assigned to %s", input.Issue, issue.Assignee.Login), nil)
 	}
 	if !input.DryRun {
 		if err := s.lockIssue(ctx, input.Org, input.Repo, input.Issue, input.Agent); err != nil {
 			return nil, DispatchOutput{}, err
 		}
 		var dispatchErr error
 		defer func() {
 			if dispatchErr != nil {
 				_ = s.unlockIssue(ctx, input.Org, input.Repo, input.Issue, issue.Labels)
 			}
 		}()
 		result, out, dispatchErr := s.dispatch(ctx, req, DispatchInput{
 			Repo:     input.Repo,
 			Org:      input.Org,
 			Issue:    input.Issue,
 			Task:     issue.Title,
 			Agent:    input.Agent,
 			Template: input.Template,
 			DryRun:   input.DryRun,
 		})
 		if dispatchErr != nil {
 			return nil, DispatchOutput{}, dispatchErr
 		}
 		return result, out, nil
 	}
 	return s.dispatch(ctx, req, DispatchInput{
 		Repo:     input.Repo,
 		Org:      input.Org,
 		Issue:    input.Issue,
 		Task:     issue.Title,
 		Agent:    input.Agent,
 		Template: input.Template,
 		DryRun:   input.DryRun,
 	})
 }
 func (s *PrepSubsystem) unlockIssue(ctx context.Context, org, repo string, issue int, labels []struct {
 	Name string `json:"name"`
 }) error {
 	updateURL := core.Sprintf("%s/api/v1/repos/%s/%s/issues/%d", s.forgeURL, org, repo, issue)
 	issueLabels := make([]string, 0, len(labels))
 	for _, label := range labels {
 		if label.Name == "in-progress" {
 			continue
 		}
 		issueLabels = append(issueLabels, label.Name)
 	}
 	if issueLabels == nil {
 		issueLabels = []string{}
 	}
 	r := core.JSONMarshal(map[string]any{
 		"assignees": []string{},
 		"labels":    issueLabels,
 	})
 	if !r.OK {
 		return coreerr.E("unlockIssue", "failed to encode issue unlock", nil)
 	}
 	payload := r.Value.([]byte)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPatch, updateURL, bytes.NewReader(payload))
 	if err != nil {
 		return coreerr.E("unlockIssue", "failed to build unlock request", err)
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "token "+s.forgeToken)
 	resp, err := s.client.Do(req)
 	if err != nil {
 		return coreerr.E("unlockIssue", "failed to update issue", err)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode >= http.StatusBadRequest {
 		return coreerr.E("unlockIssue", core.Sprintf("issue unlock returned %d", resp.StatusCode), nil)
 	}
 	return nil
 }
 func (s *PrepSubsystem) fetchIssue(ctx context.Context, org, repo string, issue int) (*forgeIssue, error) {
 	url := core.Sprintf("%s/api/v1/repos/%s/%s/issues/%d", s.forgeURL, org, repo, issue)
 	req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
 	if err != nil {
 		return nil, coreerr.E("fetchIssue", "failed to build request", err)
 	}
 	req.Header.Set("Authorization", "token "+s.forgeToken)
 	resp, err := s.client.Do(req)
 	if err != nil {
 		return nil, coreerr.E("fetchIssue", "failed to fetch issue", err)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
 		return nil, coreerr.E("fetchIssue", core.Sprintf("issue %d not found in %s/%s", issue, org, repo), nil)
 	}
 	var out forgeIssue
 	if err := json.NewDecoder(resp.Body).Decode(&out); err != nil {
 		return nil, coreerr.E("fetchIssue", "failed to decode issue", err)
 	}
 	return &out, nil
 }
 func (s *PrepSubsystem) lockIssue(ctx context.Context, org, repo string, issue int, assignee string) error {
 	updateURL := core.Sprintf("%s/api/v1/repos/%s/%s/issues/%d", s.forgeURL, org, repo, issue)
 	r := core.JSONMarshal(map[string]any{
 		"assignees": []string{assignee},
 		"labels":    []string{"in-progress"},
 	})
 	if !r.OK {
 		return coreerr.E("lockIssue", "failed to encode issue update", nil)
 	}
 	payload := r.Value.([]byte)
 	req, err := http.NewRequestWithContext(ctx, http.MethodPatch, updateURL, bytes.NewReader(payload))
 	if err != nil {
 		return coreerr.E("lockIssue", "failed to build update request", err)
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "token "+s.forgeToken)
 	resp, err := s.client.Do(req)
 	if err != nil {
 		return coreerr.E("lockIssue", "failed to update issue", err)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode >= http.StatusBadRequest {
 		return coreerr.E("lockIssue", core.Sprintf("issue update returned %d", resp.StatusCode), nil)
 	}
 	return nil
 }
--- a/pkg/mcp/agentic/issue_test.go
+++ b/pkg/mcp/agentic/issue_test.go
@ -1,227 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"io"
 	"net/http"
 	"net/http/httptest"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"testing"
 )
 func TestBranchSlug_Good(t *testing.T) {
 	got := branchSlug("Fix login crash in API v2")
 	want := "fix-login-crash-in-api-v2"
 	if got != want {
 		t.Fatalf("expected %q, got %q", want, got)
 	}
 }
 func TestPrepWorkspace_Good_IssueBranchName(t *testing.T) {
 	codePath := t.TempDir()
 	repoDir := initTestRepo(t, codePath, "demo")
 	_ = repoDir
 	s := &PrepSubsystem{codePath: codePath}
 	_, out, err := s.prepWorkspace(context.Background(), nil, PrepInput{
 		Repo:  "demo",
 		Issue: 42,
 		Task:  "Fix login crash",
 	})
 	if err != nil {
 		t.Fatalf("prepWorkspace failed: %v", err)
 	}
 	want := "agent/issue-42-fix-login-crash"
 	if out.Branch != want {
 		t.Fatalf("expected branch %q, got %q", want, out.Branch)
 	}
 	srcDir := filepath.Join(out.WorkspaceDir, "src")
 	cmd := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD")
 	cmd.Dir = srcDir
 	data, err := cmd.Output()
 	if err != nil {
 		t.Fatalf("failed to read branch: %v", err)
 	}
 	if got := strings.TrimSpace(string(data)); got != want {
 		t.Fatalf("expected git branch %q, got %q", want, got)
 	}
 }
 func TestDispatchIssue_Bad_AssignedIssue(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.Method {
 		case http.MethodGet:
 			_ = json.NewEncoder(w).Encode(map[string]any{
 				"title": "Fix login crash",
 				"body":  "details",
 				"state": "open",
 				"assignee": map[string]any{
 					"login": "someone-else",
 				},
 			})
 		default:
 			w.WriteHeader(http.StatusOK)
 		}
 	}))
 	defer srv.Close()
 	s := &PrepSubsystem{
 		forgeURL: srv.URL,
 		client:   srv.Client(),
 	}
 	_, _, err := s.dispatchIssue(context.Background(), nil, IssueDispatchInput{
 		Repo:   "demo",
 		Org:    "core",
 		Issue:  42,
 		DryRun: true,
 	})
 	if err == nil {
 		t.Fatal("expected assigned issue to fail")
 	}
 }
 func TestDispatchIssue_Good_UnlocksOnPrepFailure(t *testing.T) {
 	var methods []string
 	var bodies []string
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		body, _ := io.ReadAll(r.Body)
 		methods = append(methods, r.Method)
 		bodies = append(bodies, string(body))
 		switch r.Method {
 		case http.MethodGet:
 			_ = json.NewEncoder(w).Encode(map[string]any{
 				"title": "Fix login crash",
 				"body":  "details",
 				"state": "open",
 				"labels": []map[string]any{
 					{"name": "bug"},
 				},
 			})
 		case http.MethodPatch:
 			w.WriteHeader(http.StatusOK)
 		default:
 			w.WriteHeader(http.StatusMethodNotAllowed)
 		}
 	}))
 	defer srv.Close()
 	s := &PrepSubsystem{
 		forgeURL:   srv.URL,
 		forgeToken: "token",
 		client:     srv.Client(),
 		codePath:   t.TempDir(),
 	}
 	_, _, err := s.dispatchIssue(context.Background(), nil, IssueDispatchInput{
 		Repo:  "demo",
 		Org:   "core",
 		Issue: 42,
 	})
 	if err == nil {
 		t.Fatal("expected dispatch to fail when the repo clone is missing")
 	}
 	if got, want := len(methods), 3; got != want {
 		t.Fatalf("expected %d requests, got %d (%v)", want, got, methods)
 	}
 	if methods[0] != http.MethodGet {
 		t.Fatalf("expected first request to fetch issue, got %s", methods[0])
 	}
 	if methods[1] != http.MethodPatch {
 		t.Fatalf("expected second request to lock issue, got %s", methods[1])
 	}
 	if methods[2] != http.MethodPatch {
 		t.Fatalf("expected third request to unlock issue, got %s", methods[2])
 	}
 	if !strings.Contains(bodies[1], `"assignees":["claude"]`) {
 		t.Fatalf("expected lock request to assign claude, got %s", bodies[1])
 	}
 	if !strings.Contains(bodies[2], `"assignees":[]`) {
 		t.Fatalf("expected unlock request to clear assignees, got %s", bodies[2])
 	}
 	if !strings.Contains(bodies[2], `"labels":["bug"]`) {
 		t.Fatalf("expected unlock request to preserve original labels, got %s", bodies[2])
 	}
 }
 func TestLockIssue_Good_RequestBody(t *testing.T) {
 	var gotMethod string
 	var gotPath string
 	var gotBody []byte
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		gotMethod = r.Method
 		gotPath = r.URL.Path
 		body, _ := io.ReadAll(r.Body)
 		gotBody = append([]byte(nil), body...)
 		w.WriteHeader(http.StatusOK)
 	}))
 	defer srv.Close()
 	s := &PrepSubsystem{
 		forgeURL: srv.URL,
 		client:   srv.Client(),
 	}
 	if err := s.lockIssue(context.Background(), "core", "demo", 42, "claude"); err != nil {
 		t.Fatalf("lockIssue failed: %v", err)
 	}
 	if gotMethod != http.MethodPatch {
 		t.Fatalf("expected PATCH, got %s", gotMethod)
 	}
 	if gotPath != "/api/v1/repos/core/demo/issues/42" {
 		t.Fatalf("unexpected path %q", gotPath)
 	}
 	if !bytes.Contains(gotBody, []byte(`"assignees":["claude"]`)) {
 		t.Fatalf("expected assignee in body, got %s", string(gotBody))
 	}
 	if !bytes.Contains(gotBody, []byte(`"in-progress"`)) {
 		t.Fatalf("expected in-progress label in body, got %s", string(gotBody))
 	}
 }
 func initTestRepo(t *testing.T, codePath, repo string) string {
 	t.Helper()
 	repoDir := filepath.Join(codePath, "core", repo)
 	if err := os.MkdirAll(repoDir, 0o755); err != nil {
 		t.Fatalf("mkdir repo dir: %v", err)
 	}
 	run := func(args ...string) {
 		t.Helper()
 		cmd := exec.Command("git", args...)
 		cmd.Dir = repoDir
 		cmd.Env = append(os.Environ(),
 			"GIT_AUTHOR_NAME=Test User",
 			"GIT_AUTHOR_EMAIL=test@example.com",
 			"GIT_COMMITTER_NAME=Test User",
 			"GIT_COMMITTER_EMAIL=test@example.com",
 		)
 		if out, err := cmd.CombinedOutput(); err != nil {
 			t.Fatalf("git %v failed: %v\n%s", args, err, string(out))
 		}
 	}
 	run("init", "-b", "main")
 	if err := os.WriteFile(filepath.Join(repoDir, "README.md"), []byte("# demo\n"), 0o644); err != nil {
 		t.Fatalf("write file: %v", err)
 	}
 	run("add", "README.md")
 	run("commit", "-m", "initial commit")
 	return repoDir
 }
--- a/pkg/mcp/agentic/mirror.go
+++ b/pkg/mcp/agentic/mirror.go
@ -1,124 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"context"
 	"os/exec"
 	core "dappco.re/go/core"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // MirrorInput controls Forge to GitHub mirror sync.
 type MirrorInput struct {
 	Repo     string `json:"repo,omitempty"`
 	DryRun   bool   `json:"dry_run,omitempty"`
 	MaxFiles int    `json:"max_files,omitempty"`
 }
 // MirrorOutput reports mirror sync results.
 type MirrorOutput struct {
 	Success bool         `json:"success"`
 	Synced  []MirrorSync `json:"synced"`
 	Skipped []string     `json:"skipped,omitempty"`
 	Count   int          `json:"count"`
 }
 // MirrorSync records one repo sync attempt.
 type MirrorSync struct {
 	Repo         string `json:"repo"`
 	CommitsAhead int    `json:"commits_ahead"`
 	FilesChanged int    `json:"files_changed"`
 	PRURL        string `json:"pr_url,omitempty"`
 	Pushed       bool   `json:"pushed"`
 	Skipped      string `json:"skipped,omitempty"`
 }
 func (s *PrepSubsystem) registerMirrorTool(svc *coremcp.Service) {
 	server := svc.Server()
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_mirror",
 		Description: "Mirror Forge repositories to GitHub and open a GitHub PR when there are commits ahead of the remote mirror.",
 	}, s.mirror)
 }
 func (s *PrepSubsystem) mirror(ctx context.Context, _ *mcp.CallToolRequest, input MirrorInput) (*mcp.CallToolResult, MirrorOutput, error) {
 	maxFiles := input.MaxFiles
 	if maxFiles <= 0 {
 		maxFiles = 50
 	}
 	basePath := repoRootFromCodePath(s.codePath)
 	repos := []string{}
 	if input.Repo != "" {
 		repos = []string{input.Repo}
 	} else {
 		repos = listLocalRepos(basePath)
 	}
 	synced := make([]MirrorSync, 0, len(repos))
 	skipped := make([]string, 0)
 	for _, repo := range repos {
 		repoDir := core.Path(basePath, repo)
 		if !hasRemote(repoDir, "github") {
 			skipped = append(skipped, repo+": no github remote")
 			continue
 		}
 		if _, err := exec.LookPath("git"); err != nil {
 			return nil, MirrorOutput{}, coreerr.E("mirror", "git CLI is not available", err)
 		}
 		_, _ = gitOutput(repoDir, "fetch", "github")
 		ahead := commitsAhead(repoDir, "github/main", "HEAD")
 		if ahead <= 0 {
 			continue
 		}
 		files := filesChanged(repoDir, "github/main", "HEAD")
 		sync := MirrorSync{
 			Repo:         repo,
 			CommitsAhead: ahead,
 			FilesChanged: files,
 		}
 		if files > maxFiles {
 			sync.Skipped = core.Sprintf("%d files exceeds limit of %d", files, maxFiles)
 			synced = append(synced, sync)
 			continue
 		}
 		if input.DryRun {
 			sync.Skipped = "dry run"
 			synced = append(synced, sync)
 			continue
 		}
 		if err := ensureDevBranch(repoDir); err != nil {
 			sync.Skipped = err.Error()
 			synced = append(synced, sync)
 			continue
 		}
 		sync.Pushed = true
 		prURL, err := createGitHubPR(ctx, repoDir, repo, ahead, files)
 		if err != nil {
 			sync.Skipped = err.Error()
 		} else {
 			sync.PRURL = prURL
 		}
 		synced = append(synced, sync)
 	}
 	return nil, MirrorOutput{
 		Success: true,
 		Synced:  synced,
 		Skipped: skipped,
 		Count:   len(synced),
 	}, nil
 }
--- a/pkg/mcp/agentic/plan.go
+++ b/pkg/mcp/agentic/plan.go
@ -7,21 +7,16 @@ import (
 	"crypto/rand"
 	"encoding/hex"
 	"encoding/json"
 	"path/filepath"
 	"strings"
 	"time"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
-	coreio "dappco.re/go/core/io"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // Plan represents an implementation plan for agent work.
 //
 //	plan := Plan{
 //	    Title:  "Add notifications",
 //	    Status: "draft",
 //	}
 type Plan struct {
 	ID        string    `json:"id"`
 	Title     string    `json:"title"`
@ -37,8 +32,6 @@ type Plan struct {
 }
 // Phase represents a phase within an implementation plan.
 //
 //	phase := Phase{Name: "Implementation", Status: "pending"}
 type Phase struct {
 	Number   int      `json:"number"`
 	Name     string   `json:"name"`
@ -46,23 +39,11 @@ type Phase struct {
 	Criteria []string `json:"criteria,omitempty"`
 	Tests    int      `json:"tests,omitempty"`
 	Notes    string   `json:"notes,omitempty"`
 	Checkpoints []Checkpoint `json:"checkpoints,omitempty"`
 }
 // Checkpoint records phase progress or completion details.
 //
 //	cp := Checkpoint{Notes: "Implemented transport hooks", Done: true}
 type Checkpoint struct {
 	Notes     string    `json:"notes,omitempty"`
 	Done      bool      `json:"done,omitempty"`
 	CreatedAt time.Time `json:"created_at"`
 }
 // --- Input/Output types ---
 // PlanCreateInput is the input for agentic_plan_create.
 //
 //	input := PlanCreateInput{Title: "Add notifications", Objective: "Broadcast MCP events"}
 type PlanCreateInput struct {
 	Title     string  `json:"title"`
 	Objective string  `json:"objective"`
@ -73,8 +54,6 @@ type PlanCreateInput struct {
 }
 // PlanCreateOutput is the output for agentic_plan_create.
 //
 //	// out.Success == true, out.ID != ""
 type PlanCreateOutput struct {
 	Success bool   `json:"success"`
 	ID      string `json:"id"`
@ -82,23 +61,17 @@ type PlanCreateOutput struct {
 }
 // PlanReadInput is the input for agentic_plan_read.
 //
 //	input := PlanReadInput{ID: "add-notifications"}
 type PlanReadInput struct {
 	ID string `json:"id"`
 }
 // PlanReadOutput is the output for agentic_plan_read.
 //
 //	// out.Plan.Title == "Add notifications"
 type PlanReadOutput struct {
 	Success bool `json:"success"`
 	Plan    Plan `json:"plan"`
 }
 // PlanUpdateInput is the input for agentic_plan_update.
 //
 //	input := PlanUpdateInput{ID: "add-notifications", Status: "ready"}
 type PlanUpdateInput struct {
 	ID        string  `json:"id"`
 	Status    string  `json:"status,omitempty"`
@ -110,102 +83,62 @@ type PlanUpdateInput struct {
 }
 // PlanUpdateOutput is the output for agentic_plan_update.
 //
 //	// out.Plan.Status == "ready"
 type PlanUpdateOutput struct {
 	Success bool `json:"success"`
 	Plan    Plan `json:"plan"`
 }
 // PlanDeleteInput is the input for agentic_plan_delete.
 //
 //	input := PlanDeleteInput{ID: "add-notifications"}
 type PlanDeleteInput struct {
 	ID string `json:"id"`
 }
 // PlanDeleteOutput is the output for agentic_plan_delete.
 //
 //	// out.Deleted == "add-notifications"
 type PlanDeleteOutput struct {
 	Success bool   `json:"success"`
 	Deleted string `json:"deleted"`
 }
 // PlanListInput is the input for agentic_plan_list.
 //
 //	input := PlanListInput{Status: "draft"}
 type PlanListInput struct {
 	Status string `json:"status,omitempty"`
 	Repo   string `json:"repo,omitempty"`
 }
 // PlanListOutput is the output for agentic_plan_list.
 //
 //	// len(out.Plans) >= 1
 type PlanListOutput struct {
 	Success bool   `json:"success"`
 	Count   int    `json:"count"`
 	Plans   []Plan `json:"plans"`
 }
 // PlanCheckpointInput is the input for agentic_plan_checkpoint.
 //
 //	input := PlanCheckpointInput{ID: "add-notifications", Phase: 1, Done: true}
 type PlanCheckpointInput struct {
 	ID    string `json:"id"`
 	Phase int    `json:"phase"`
 	Notes string `json:"notes,omitempty"`
 	Done  bool   `json:"done,omitempty"`
 }
 // PlanCheckpointOutput is the output for agentic_plan_checkpoint.
 //
 //	// out.Plan.Phases[0].Status == "done"
 type PlanCheckpointOutput struct {
 	Success bool `json:"success"`
 	Plan    Plan `json:"plan"`
 }
 // --- Registration ---
-func (s *PrepSubsystem) registerPlanTools(svc *coremcp.Service) {
+func (s *PrepSubsystem) registerPlanTools(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_plan_create",
 		Description: "Create an implementation plan. Plans track phased work with acceptance criteria, status lifecycle (draft → ready → in_progress → needs_verification → verified → approved), and per-phase progress.",
 	}, s.planCreate)
-	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "agentic_plan_read",
 		Description: "Read an implementation plan by ID. Returns the full plan with all phases, criteria, and status.",
 	}, s.planRead)
-	// agentic_plan_status is kept as a user-facing alias for the read tool.
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_plan_status",
 		Description: "Get the current status of an implementation plan by ID. Returns the full plan with all phases, criteria, and status.",
 	}, s.planRead)
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_plan_update",
 		Description: "Update an implementation plan. Supports partial updates — only provided fields are changed. Use this to advance status, update phases, or add notes.",
 	}, s.planUpdate)
-	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "agentic_plan_delete",
 		Description: "Delete an implementation plan by ID. Permanently removes the plan file.",
 	}, s.planDelete)
-	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "agentic_plan_list",
 		Description: "List implementation plans. Supports filtering by status (draft, ready, in_progress, etc.) and repo.",
 	}, s.planList)
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_plan_checkpoint",
 		Description: "Record a checkpoint for a plan phase and optionally mark the phase done.",
 	}, s.planCheckpoint)
 }
 // --- Handlers ---
@ -348,11 +281,11 @@ func (s *PrepSubsystem) planList(_ context.Context, _ *mcp.CallToolRequest, inpu
 	var plans []Plan
 	for _, entry := range entries {
-		if entry.IsDir() || !core.HasSuffix(entry.Name(), ".json") {
+		if entry.IsDir() || !strings.HasSuffix(entry.Name(), ".json") {
 			continue
 		}
-		id := core.TrimSuffix(entry.Name(), ".json")
+		id := strings.TrimSuffix(entry.Name(), ".json")
 		plan, err := readPlan(dir, id)
 		if err != nil {
 			continue
@ -376,86 +309,44 @@ func (s *PrepSubsystem) planList(_ context.Context, _ *mcp.CallToolRequest, inpu
 	}, nil
 }
 func (s *PrepSubsystem) planCheckpoint(_ context.Context, _ *mcp.CallToolRequest, input PlanCheckpointInput) (*mcp.CallToolResult, PlanCheckpointOutput, error) {
 	if input.ID == "" {
 		return nil, PlanCheckpointOutput{}, coreerr.E("planCheckpoint", "id is required", nil)
 	}
 	if input.Phase <= 0 {
 		return nil, PlanCheckpointOutput{}, coreerr.E("planCheckpoint", "phase must be greater than zero", nil)
 	}
 	if input.Notes == "" && !input.Done {
 		return nil, PlanCheckpointOutput{}, coreerr.E("planCheckpoint", "notes or done is required", nil)
 	}
 	plan, err := readPlan(s.plansDir(), input.ID)
 	if err != nil {
 		return nil, PlanCheckpointOutput{}, err
 	}
 	phaseIndex := input.Phase - 1
 	if phaseIndex >= len(plan.Phases) {
 		return nil, PlanCheckpointOutput{}, coreerr.E("planCheckpoint", "phase not found", nil)
 	}
 	phase := &plan.Phases[phaseIndex]
 	phase.Checkpoints = append(phase.Checkpoints, Checkpoint{
 		Notes:     input.Notes,
 		Done:      input.Done,
 		CreatedAt: time.Now(),
 	})
 	if input.Done {
 		phase.Status = "done"
 	}
 	plan.UpdatedAt = time.Now()
 	if _, err := writePlan(s.plansDir(), plan); err != nil {
 		return nil, PlanCheckpointOutput{}, coreerr.E("planCheckpoint", "failed to write plan", err)
 	}
 	return nil, PlanCheckpointOutput{
 		Success: true,
 		Plan:    *plan,
 	}, nil
 }
 // --- Helpers ---
 func (s *PrepSubsystem) plansDir() string {
-	return core.Path(s.codePath, ".core", "plans")
+	return filepath.Join(s.codePath, ".core", "plans")
 }
 func planPath(dir, id string) string {
-	return core.Path(dir, id+".json")
+	return filepath.Join(dir, id+".json")
 }
 func generatePlanID(title string) string {
-	b := core.NewBuilder()
+	slug := strings.Map(func(r rune) rune {
-	b.Grow(len(title))
+		if r >= 'a' && r <= 'z' || r >= '0' && r <= '9' || r == '-' {
-	for _, r := range title {
+			return r
 		switch {
 		case r >= 'a' && r <= 'z', r >= '0' && r <= '9', r == '-':
 			b.WriteRune(r)
 		case r >= 'A' && r <= 'Z':
 			b.WriteRune(r + 32)
 		case r == ' ':
 			b.WriteByte('-')
 		}
 		if r >= 'A' && r <= 'Z' {
 			return r + 32
 		}
-	slug := b.String()
+		if r == ' ' {
 			return '-'
 		}
 		return -1
 	}, title)
-	// Collapse consecutive dashes and cap length
+	// Trim consecutive dashes and cap length
-	for core.Contains(slug, "--") {
+	for strings.Contains(slug, "--") {
-		slug = core.Replace(slug, "--", "-")
+		slug = strings.ReplaceAll(slug, "--", "-")
 	}
-	slug = trimDashes(slug)
+	slug = strings.Trim(slug, "-")
 	if len(slug) > 30 {
-		slug = trimDashes(slug[:30])
+		slug = slug[:30]
 	}
 	slug = strings.TrimRight(slug, "-")
 	// Append short random suffix for uniqueness
-	rnd := make([]byte, 3)
+	b := make([]byte, 3)
-	rand.Read(rnd)
+	rand.Read(b)
-	return slug + "-" + hex.EncodeToString(rnd)
+	return slug + "-" + hex.EncodeToString(b)
 }
 func readPlan(dir, id string) (*Plan, error) {
@ -465,8 +356,8 @@ func readPlan(dir, id string) (*Plan, error) {
 	}
 	var plan Plan
-	if r := core.JSONUnmarshal([]byte(data), &plan); !r.OK {
+	if err := json.Unmarshal([]byte(data), &plan); err != nil {
-		return nil, coreerr.E("readPlan", "failed to parse plan "+id, nil)
+		return nil, coreerr.E("readPlan", "failed to parse plan "+id, err)
 	}
 	return &plan, nil
 }
@ -482,7 +373,7 @@ func writePlan(dir string, plan *Plan) (string, error) {
 		return "", err
 	}
-	return path, writeAtomic(path, string(data))
+	return path, coreio.Local.Write(path, string(data))
 }
 func validPlanStatus(status string) bool {
--- a/pkg/mcp/agentic/plan_test.go
+++ b/pkg/mcp/agentic/plan_test.go
@ -1,62 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"context"
 	"testing"
 	"time"
 )
 func TestPlanCheckpoint_Good_AppendsCheckpointAndMarksPhaseDone(t *testing.T) {
 	root := t.TempDir()
 	sub := &PrepSubsystem{codePath: root}
 	plan := &Plan{
 		ID:        "plan-1",
 		Title:     "Test plan",
 		Status:    "in_progress",
 		Objective: "Verify checkpoints",
 		Phases: []Phase{
 			{
 				Number: 1,
 				Name:   "Phase 1",
 				Status: "in_progress",
 			},
 		},
 		CreatedAt: time.Now(),
 		UpdatedAt: time.Now(),
 	}
 	if _, err := writePlan(sub.plansDir(), plan); err != nil {
 		t.Fatalf("writePlan failed: %v", err)
 	}
 	_, out, err := sub.planCheckpoint(context.Background(), nil, PlanCheckpointInput{
 		ID:    plan.ID,
 		Phase: 1,
 		Notes: "Implementation verified",
 		Done:  true,
 	})
 	if err != nil {
 		t.Fatalf("planCheckpoint failed: %v", err)
 	}
 	if !out.Success {
 		t.Fatal("expected checkpoint output success")
 	}
 	if out.Plan.Phases[0].Status != "done" {
 		t.Fatalf("expected phase status done, got %q", out.Plan.Phases[0].Status)
 	}
 	if len(out.Plan.Phases[0].Checkpoints) != 1 {
 		t.Fatalf("expected 1 checkpoint, got %d", len(out.Plan.Phases[0].Checkpoints))
 	}
 	if out.Plan.Phases[0].Checkpoints[0].Notes != "Implementation verified" {
 		t.Fatalf("unexpected checkpoint notes: %q", out.Plan.Phases[0].Checkpoints[0].Notes)
 	}
 	if !out.Plan.Phases[0].Checkpoints[0].Done {
 		t.Fatal("expected checkpoint to be marked done")
 	}
 	if out.Plan.Phases[0].Checkpoints[0].CreatedAt.IsZero() {
 		t.Fatal("expected checkpoint timestamp")
 	}
 }
--- a/pkg/mcp/agentic/pr.go
+++ b/pkg/mcp/agentic/pr.go
@ -6,25 +6,21 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"os/exec"
 	"path/filepath"
 	"strings"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
-	coreio "dappco.re/go/core/io"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // --- agentic_create_pr ---
-// PRInput is the input for agentic_create_pr and agentic_pr.
+// CreatePRInput is the input for agentic_create_pr.
-//
+type CreatePRInput struct {
 //	input := PRInput{
 //	    Workspace: "mcp-1773581873",
 //	    Base:      "main",
 //	}
 type PRInput struct {
 	Workspace string `json:"workspace"`            // workspace name (e.g. "mcp-1773581873")
 	Title     string `json:"title,omitempty"`       // PR title (default: task description)
 	Body      string `json:"body,omitempty"`        // PR body (default: auto-generated)
@ -32,12 +28,7 @@ type PRInput struct {
 	DryRun    bool   `json:"dry_run,omitempty"`     // preview without creating
 }
 // CreatePRInput is kept as a compatibility alias for older callers.
 type CreatePRInput = PRInput
 // CreatePROutput is the output for agentic_create_pr.
 //
 //	// out.Success == true, out.Branch == "agent/issue-123-fix", out.Pushed == true
 type CreatePROutput struct {
 	Success bool   `json:"success"`
 	PRURL   string `json:"pr_url,omitempty"`
@ -48,15 +39,14 @@ type CreatePROutput struct {
 	Pushed  bool   `json:"pushed"`
 }
-func (s *PrepSubsystem) registerCreatePRTool(svc *coremcp.Service) {
+func (s *PrepSubsystem) registerCreatePRTool(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_create_pr",
 		Description: "Create a pull request from an agent workspace. Pushes the branch to Forge and opens a PR. Links to the source issue if one was tracked.",
 	}, s.createPR)
 }
-func (s *PrepSubsystem) createPR(ctx context.Context, _ *mcp.CallToolRequest, input PRInput) (*mcp.CallToolResult, CreatePROutput, error) {
+func (s *PrepSubsystem) createPR(ctx context.Context, _ *mcp.CallToolRequest, input CreatePRInput) (*mcp.CallToolResult, CreatePROutput, error) {
 	if input.Workspace == "" {
 		return nil, CreatePROutput{}, coreerr.E("createPR", "workspace is required", nil)
 	}
@ -64,8 +54,8 @@ func (s *PrepSubsystem) createPR(ctx context.Context, _ *mcp.CallToolRequest, in
 		return nil, CreatePROutput{}, coreerr.E("createPR", "no Forge token configured", nil)
 	}
-	wsDir := core.Path(s.workspaceRoot(), input.Workspace)
+	wsDir := filepath.Join(s.workspaceRoot(), input.Workspace)
-	srcDir := core.Path(wsDir, "src")
+	srcDir := filepath.Join(wsDir, "src")
 	if _, err := coreio.Local.List(srcDir); err != nil {
 		return nil, CreatePROutput{}, coreerr.E("createPR", "workspace not found: "+input.Workspace, nil)
@ -85,7 +75,7 @@ func (s *PrepSubsystem) createPR(ctx context.Context, _ *mcp.CallToolRequest, in
 		if err != nil {
 			return nil, CreatePROutput{}, coreerr.E("createPR", "failed to detect branch", err)
 		}
-		st.Branch = core.Trim(string(out))
+		st.Branch = strings.TrimSpace(string(out))
 	}
 	org := st.Org
@ -103,7 +93,7 @@ func (s *PrepSubsystem) createPR(ctx context.Context, _ *mcp.CallToolRequest, in
 		title = st.Task
 	}
 	if title == "" {
-		title = core.Sprintf("Agent work on %s", st.Branch)
+		title = fmt.Sprintf("Agent work on %s", st.Branch)
 	}
 	// Build PR body
@ -137,11 +127,11 @@ func (s *PrepSubsystem) createPR(ctx context.Context, _ *mcp.CallToolRequest, in
 	// Update status with PR URL
 	st.PRURL = prURL
-	s.saveStatus(wsDir, st)
+	writeStatus(wsDir, st)
 	// Comment on issue if tracked
 	if st.Issue > 0 {
-		comment := core.Sprintf("Pull request created: %s", prURL)
+		comment := fmt.Sprintf("Pull request created: %s", prURL)
 		s.commentOnIssue(ctx, org, st.Repo, st.Issue, comment)
 	}
@ -157,37 +147,31 @@ func (s *PrepSubsystem) createPR(ctx context.Context, _ *mcp.CallToolRequest, in
 }
 func (s *PrepSubsystem) buildPRBody(st *WorkspaceStatus) string {
-	b := core.NewBuilder()
+	var b strings.Builder
 	b.WriteString("## Summary\n\n")
 	if st.Task != "" {
 		b.WriteString(st.Task)
 		b.WriteString("\n\n")
 	}
 	if st.Issue > 0 {
-		b.WriteString(core.Sprintf("Closes #%d\n\n", st.Issue))
+		b.WriteString(fmt.Sprintf("Closes #%d\n\n", st.Issue))
 	}
-	b.WriteString(core.Sprintf("**Agent:** %s\n", st.Agent))
+	b.WriteString(fmt.Sprintf("**Agent:** %s\n", st.Agent))
-	b.WriteString(core.Sprintf("**Runs:** %d\n", st.Runs))
+	b.WriteString(fmt.Sprintf("**Runs:** %d\n", st.Runs))
 	b.WriteString("\n---\n*Created by agentic dispatch*\n")
 	return b.String()
 }
 func (s *PrepSubsystem) forgeCreatePR(ctx context.Context, org, repo, head, base, title, body string) (string, int, error) {
-	payload, err := json.Marshal(map[string]any{
+	payload, _ := json.Marshal(map[string]any{
 		"title": title,
 		"body":  body,
 		"head":  head,
 		"base":  base,
 	})
 	if err != nil {
 		return "", 0, coreerr.E("forgeCreatePR", "failed to marshal PR payload", err)
 	}
-	url := core.Sprintf("%s/api/v1/repos/%s/%s/pulls", s.forgeURL, org, repo)
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls", s.forgeURL, org, repo)
-	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(payload))
+	req, _ := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(payload))
 	if err != nil {
 		return "", 0, coreerr.E("forgeCreatePR", "failed to build PR request", err)
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "token "+s.forgeToken)
@ -199,35 +183,25 @@ func (s *PrepSubsystem) forgeCreatePR(ctx context.Context, org, repo, head, base
 	if resp.StatusCode != 201 {
 		var errBody map[string]any
-		if err := json.NewDecoder(resp.Body).Decode(&errBody); err != nil {
+		json.NewDecoder(resp.Body).Decode(&errBody)
 			return "", 0, coreerr.E("forgeCreatePR", core.Sprintf("HTTP %d with unreadable error body", resp.StatusCode), err)
 		}
 		msg, _ := errBody["message"].(string)
-		return "", 0, coreerr.E("forgeCreatePR", core.Sprintf("HTTP %d: %s", resp.StatusCode, msg), nil)
+		return "", 0, coreerr.E("forgeCreatePR", fmt.Sprintf("HTTP %d: %s", resp.StatusCode, msg), nil)
 	}
 	var pr struct {
 		Number  int    `json:"number"`
 		HTMLURL string `json:"html_url"`
 	}
-	if err := json.NewDecoder(resp.Body).Decode(&pr); err != nil {
+	json.NewDecoder(resp.Body).Decode(&pr)
 		return "", 0, coreerr.E("forgeCreatePR", "failed to decode PR response", err)
 	}
 	return pr.HTMLURL, pr.Number, nil
 }
 func (s *PrepSubsystem) commentOnIssue(ctx context.Context, org, repo string, issue int, comment string) {
-	payload, err := json.Marshal(map[string]string{"body": comment})
+	payload, _ := json.Marshal(map[string]string{"body": comment})
 	if err != nil {
 		return
 	}
-	url := core.Sprintf("%s/api/v1/repos/%s/%s/issues/%d/comments", s.forgeURL, org, repo, issue)
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/issues/%d/comments", s.forgeURL, org, repo, issue)
-	req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(payload))
+	req, _ := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(payload))
 	if err != nil {
 		return
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Authorization", "token "+s.forgeToken)
@ -241,8 +215,6 @@ func (s *PrepSubsystem) commentOnIssue(ctx context.Context, org, repo string, is
 // --- agentic_list_prs ---
 // ListPRsInput is the input for agentic_list_prs.
 //
 //	input := ListPRsInput{Org: "core", Repo: "go-io", State: "open", Limit: 20}
 type ListPRsInput struct {
 	Org   string `json:"org,omitempty"`   // forge org (default "core")
 	Repo  string `json:"repo,omitempty"` // specific repo, or empty for all
@ -251,8 +223,6 @@ type ListPRsInput struct {
 }
 // ListPRsOutput is the output for agentic_list_prs.
 //
 //	// out.Success == true, len(out.PRs) <= 20
 type ListPRsOutput struct {
 	Success bool     `json:"success"`
 	Count   int      `json:"count"`
@ -260,8 +230,6 @@ type ListPRsOutput struct {
 }
 // PRInfo represents a pull request.
 //
 //	// pr.Number == 42, pr.Branch == "agent/issue-42-fix"
 type PRInfo struct {
 	Repo      string   `json:"repo"`
 	Number    int      `json:"number"`
@ -275,9 +243,8 @@ type PRInfo struct {
 	URL       string   `json:"url"`
 }
-func (s *PrepSubsystem) registerListPRsTool(svc *coremcp.Service) {
+func (s *PrepSubsystem) registerListPRsTool(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_list_prs",
 		Description: "List pull requests across Forge repos. Filter by org, repo, and state (open/closed/all).",
 	}, s.listPRs)
@ -335,7 +302,7 @@ func (s *PrepSubsystem) listPRs(ctx context.Context, _ *mcp.CallToolRequest, inp
 }
 func (s *PrepSubsystem) listRepoPRs(ctx context.Context, org, repo, state string) ([]PRInfo, error) {
-	url := core.Sprintf("%s/api/v1/repos/%s/%s/pulls?state=%s&limit=10",
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/pulls?state=%s&limit=10",
 		s.forgeURL, org, repo, state)
 	req, _ := http.NewRequestWithContext(ctx, "GET", url, nil)
 	req.Header.Set("Authorization", "token "+s.forgeToken)
@ -346,7 +313,7 @@ func (s *PrepSubsystem) listRepoPRs(ctx context.Context, org, repo, state string
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != 200 {
-		return nil, coreerr.E("listRepoPRs", core.Sprintf("HTTP %d for "+repo, resp.StatusCode), nil)
+		return nil, coreerr.E("listRepoPRs", fmt.Sprintf("HTTP %d for "+repo, resp.StatusCode), nil)
 	}
 	var prs []struct {
--- a/pkg/mcp/agentic/pr_test.go
+++ b/pkg/mcp/agentic/pr_test.go
@ -1,28 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"context"
 	"net/http"
 	"net/http/httptest"
 	"testing"
 )
 func TestForgeCreatePR_Bad_InvalidJSONResponse(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusCreated)
 		_, _ = w.Write([]byte("{not-json"))
 	}))
 	defer srv.Close()
 	s := &PrepSubsystem{
 		forgeURL: srv.URL,
 		client:   srv.Client(),
 	}
 	_, _, err := s.forgeCreatePR(context.Background(), "core", "demo", "agent/test", "main", "Fix bug", "body")
 	if err == nil {
 		t.Fatal("expected malformed PR response to fail")
 	}
 }
--- a/pkg/mcp/agentic/prep.go
+++ b/pkg/mcp/agentic/prep.go
@ -8,14 +8,17 @@ import (
 	"context"
 	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"time"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
-	coreio "dappco.re/go/core/io"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"gopkg.in/yaml.v3"
 )
@ -29,30 +32,21 @@ type PrepSubsystem struct {
 	specsPath   string
 	codePath    string
 	client *http.Client
 	notifier   coremcp.Notifier
 }
 var (
 	_ coremcp.Subsystem             = (*PrepSubsystem)(nil)
 	_ coremcp.SubsystemWithShutdown = (*PrepSubsystem)(nil)
 	_ coremcp.SubsystemWithNotifier = (*PrepSubsystem)(nil)
 )
 // NewPrep creates an agentic subsystem.
 //
 //	prep := NewPrep()
 func NewPrep() *PrepSubsystem {
-	home := core.Env("HOME")
+	home, _ := os.UserHomeDir()
-	forgeToken := core.Env("FORGE_TOKEN")
+	forgeToken := os.Getenv("FORGE_TOKEN")
 	if forgeToken == "" {
-		forgeToken = core.Env("GITEA_TOKEN")
+		forgeToken = os.Getenv("GITEA_TOKEN")
 	}
-	brainKey := core.Env("CORE_BRAIN_KEY")
+	brainKey := os.Getenv("CORE_BRAIN_KEY")
 	if brainKey == "" {
-		if data, err := coreio.Local.Read(core.Path(home, ".claude", "brain.key")); err == nil {
+		if data, err := coreio.Local.Read(filepath.Join(home, ".claude", "brain.key")); err == nil {
-			brainKey = core.Trim(data)
+			brainKey = strings.TrimSpace(data)
 		}
 	}
@ -61,95 +55,42 @@ func NewPrep() *PrepSubsystem {
 		forgeToken:  forgeToken,
 		brainURL:    envOr("CORE_BRAIN_URL", "https://api.lthn.sh"),
 		brainKey:    brainKey,
-		specsPath:  envOr("SPECS_PATH", core.Path(home, "Code", "host-uk", "specs")),
+		specsPath:   envOr("SPECS_PATH", filepath.Join(home, "Code", "host-uk", "specs")),
-		codePath:   envOr("CODE_PATH", core.Path(home, "Code")),
+		codePath:    envOr("CODE_PATH", filepath.Join(home, "Code")),
 		client: &http.Client{Timeout: 30 * time.Second},
 	}
 }
 // SetNotifier wires the shared MCP notifier into the agentic subsystem.
 func (s *PrepSubsystem) SetNotifier(n coremcp.Notifier) {
 	s.notifier = n
 }
 // emitChannel pushes an agentic event through the shared notifier.
 func (s *PrepSubsystem) emitChannel(ctx context.Context, channel string, data any) {
 	if s.notifier != nil {
 		s.notifier.ChannelSend(ctx, channel, data)
 	}
 }
 func envOr(key, fallback string) string {
-	if v := core.Env(key); v != "" {
+	if v := os.Getenv(key); v != "" {
 		return v
 	}
 	return fallback
 }
 func sanitizeRepoPathSegment(value, field string, allowSubdirs bool) (string, error) {
 	if core.Trim(value) != value {
 		return "", coreerr.E("prepWorkspace", field+" contains whitespace", nil)
 	}
 	if value == "" {
 		return "", nil
 	}
 	if core.Contains(value, "\\") {
 		return "", coreerr.E("prepWorkspace", field+" contains invalid path separator", nil)
 	}
 	parts := core.Split(value, "/")
 	if !allowSubdirs && len(parts) != 1 {
 		return "", coreerr.E("prepWorkspace", field+" may not contain subdirectories", nil)
 	}
 	for _, part := range parts {
 		if part == "" || part == "." || part == ".." {
 			return "", coreerr.E("prepWorkspace", field+" contains invalid path segment", nil)
 		}
 		for _, r := range part {
 			switch {
 			case r >= 'a' && r <= 'z',
 				r >= 'A' && r <= 'Z',
 				r >= '0' && r <= '9',
 				r == '-' || r == '_' || r == '.':
 				continue
 			default:
 				return "", coreerr.E("prepWorkspace", field+" contains invalid characters", nil)
 			}
 		}
 	}
 	return value, nil
 }
 // Name implements mcp.Subsystem.
 func (s *PrepSubsystem) Name() string { return "agentic" }
 // RegisterTools implements mcp.Subsystem.
-func (s *PrepSubsystem) RegisterTools(svc *coremcp.Service) {
+func (s *PrepSubsystem) RegisterTools(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_prep_workspace",
 		Description: "Prepare a sandboxed agent workspace with TODO.md, CLAUDE.md, CONTEXT.md, CONSUMERS.md, RECENT.md, and a git clone of the target repo in src/.",
 	}, s.prepWorkspace)
-	s.registerDispatchTool(svc)
+	s.registerDispatchTool(server)
-	s.registerIssueTools(svc)
+	s.registerStatusTool(server)
-	s.registerStatusTool(svc)
+	s.registerResumeTool(server)
-	s.registerResumeTool(svc)
+	s.registerCreatePRTool(server)
-	s.registerCreatePRTool(svc)
+	s.registerListPRsTool(server)
-	s.registerListPRsTool(svc)
+	s.registerEpicTool(server)
 	s.registerEpicTool(svc)
 	s.registerWatchTool(svc)
 	s.registerReviewQueueTool(svc)
 	s.registerMirrorTool(svc)
-	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "agentic_scan",
 		Description: "Scan Forge repos for open issues with actionable labels (agentic, help-wanted, bug).",
 	}, s.scan)
-	s.registerPlanTools(svc)
+	s.registerPlanTools(server)
 }
 // Shutdown implements mcp.SubsystemWithShutdown.
@ -157,7 +98,7 @@ func (s *PrepSubsystem) Shutdown(_ context.Context) error { return nil }
 // workspaceRoot returns the base directory for agent workspaces.
 func (s *PrepSubsystem) workspaceRoot() string {
-	return core.Path(s.codePath, ".core", "workspace")
+	return filepath.Join(s.codePath, ".core", "workspace")
 }
 // --- Input/Output types ---
@ -168,7 +109,6 @@ type PrepInput struct {
 	Org          string            `json:"org,omitempty"`           // default "core"
 	Issue        int               `json:"issue,omitempty"`         // Forge issue number
 	Task         string            `json:"task,omitempty"`          // Task description (if no issue)
 	Branch       string            `json:"branch,omitempty"`        // Override branch name
 	Template     string            `json:"template,omitempty"`      // Prompt template: conventions, security, coding (default: coding)
 	PlanTemplate string            `json:"plan_template,omitempty"` // Plan template slug: bug-fix, code-review, new-feature, refactor, feature-port
 	Variables    map[string]string `json:"variables,omitempty"`     // Template variable substitution
@ -179,7 +119,6 @@ type PrepInput struct {
 type PrepOutput struct {
 	Success       bool   `json:"success"`
 	WorkspaceDir  string `json:"workspace_dir"`
 	Branch       string `json:"branch,omitempty"`
 	WikiPages     int    `json:"wiki_pages"`
 	SpecFiles     int    `json:"spec_files"`
 	Memories      int    `json:"memories"`
@ -192,27 +131,6 @@ func (s *PrepSubsystem) prepWorkspace(ctx context.Context, _ *mcp.CallToolReques
 	if input.Repo == "" {
 		return nil, PrepOutput{}, coreerr.E("prepWorkspace", "repo is required", nil)
 	}
 	repo, err := sanitizeRepoPathSegment(input.Repo, "repo", false)
 	if err != nil {
 		return nil, PrepOutput{}, err
 	}
 	input.Repo = repo
 	planTemplate, err := sanitizeRepoPathSegment(input.PlanTemplate, "plan_template", false)
 	if err != nil {
 		return nil, PrepOutput{}, err
 	}
 	input.PlanTemplate = planTemplate
 	persona := input.Persona
 	if persona != "" {
 		persona, err = sanitizeRepoPathSegment(persona, "persona", true)
 		if err != nil {
 			return nil, PrepOutput{}, err
 		}
 	}
 	if input.Org == "" {
 		input.Org = "core"
 	}
@ -222,9 +140,8 @@ func (s *PrepSubsystem) prepWorkspace(ctx context.Context, _ *mcp.CallToolReques
 	// Workspace root: .core/workspace/{repo}-{timestamp}/
 	wsRoot := s.workspaceRoot()
-	coreio.Local.EnsureDir(wsRoot)
+	wsName := fmt.Sprintf("%s-%d", input.Repo, time.Now().Unix())
-	wsName := core.Sprintf("%s-%d", input.Repo, time.Now().Unix())
+	wsDir := filepath.Join(wsRoot, wsName)
 	wsDir := core.Path(wsRoot, wsName)
 	// Create workspace structure
 	// kb/ and specs/ will be created inside src/ after clone
@ -232,62 +149,57 @@ func (s *PrepSubsystem) prepWorkspace(ctx context.Context, _ *mcp.CallToolReques
 	out := PrepOutput{WorkspaceDir: wsDir}
 	// Source repo path
-	repoPath := core.Path(s.codePath, "core", input.Repo)
+	repoPath := filepath.Join(s.codePath, "core", input.Repo)
 	// 1. Clone repo into src/ and create feature branch
-	srcDir := core.Path(wsDir, "src")
+	srcDir := filepath.Join(wsDir, "src")
 	cloneCmd := exec.CommandContext(ctx, "git", "clone", repoPath, srcDir)
-	if err := cloneCmd.Run(); err != nil {
+	cloneCmd.Run()
 		return nil, PrepOutput{}, coreerr.E("prepWorkspace", "failed to clone repository", err)
 	}
-	// Create feature branch.
+	// Create feature branch
-	branchName := input.Branch
+	taskSlug := strings.Map(func(r rune) rune {
-	if branchName == "" {
+		if r >= 'a' && r <= 'z' || r >= '0' && r <= '9' || r == '-' {
-		taskSlug := branchSlug(input.Task)
+			return r
 		if input.Issue > 0 {
 			issueSlug := branchSlug(input.Task)
 			branchName = core.Sprintf("agent/issue-%d", input.Issue)
 			if issueSlug != "" {
 				branchName += "-" + issueSlug
 		}
-		} else if taskSlug != "" {
+		if r >= 'A' && r <= 'Z' {
-			branchName = core.Sprintf("agent/%s", taskSlug)
+			return r + 32 // lowercase
 		}
 		return '-'
 	}, input.Task)
 	if len(taskSlug) > 40 {
 		taskSlug = taskSlug[:40]
 	}
-	if branchName != "" {
+	taskSlug = strings.Trim(taskSlug, "-")
 	branchName := fmt.Sprintf("agent/%s", taskSlug)
 	branchCmd := exec.CommandContext(ctx, "git", "checkout", "-b", branchName)
 	branchCmd.Dir = srcDir
-		if err := branchCmd.Run(); err != nil {
+	branchCmd.Run()
 			return nil, PrepOutput{}, coreerr.E("prepWorkspace", "failed to create branch", err)
 		}
 		out.Branch = branchName
 	}
 	// Create context dirs inside src/
-	coreio.Local.EnsureDir(core.Path(srcDir, "kb"))
+	coreio.Local.EnsureDir(filepath.Join(srcDir, "kb"))
-	coreio.Local.EnsureDir(core.Path(srcDir, "specs"))
+	coreio.Local.EnsureDir(filepath.Join(srcDir, "specs"))
 	// Remote stays as local clone origin — agent cannot push to forge.
 	// Reviewer pulls changes from workspace and pushes after verification.
 	// 2. Copy CLAUDE.md and GEMINI.md to workspace
-	claudeMdPath := core.Path(repoPath, "CLAUDE.md")
+	claudeMdPath := filepath.Join(repoPath, "CLAUDE.md")
 	if data, err := coreio.Local.Read(claudeMdPath); err == nil {
-		_ = writeAtomic(core.Path(wsDir, "src", "CLAUDE.md"), data)
+		coreio.Local.Write(filepath.Join(wsDir, "src", "CLAUDE.md"), data)
 		out.ClaudeMd = true
 	}
 	// Copy GEMINI.md from core/agent (ethics framework for all agents)
-	agentGeminiMd := core.Path(s.codePath, "core", "agent", "GEMINI.md")
+	agentGeminiMd := filepath.Join(s.codePath, "core", "agent", "GEMINI.md")
 	if data, err := coreio.Local.Read(agentGeminiMd); err == nil {
-		_ = writeAtomic(core.Path(wsDir, "src", "GEMINI.md"), data)
+		coreio.Local.Write(filepath.Join(wsDir, "src", "GEMINI.md"), data)
 	}
 	// Copy persona if specified
-	if persona != "" {
+	if input.Persona != "" {
-		personaPath := core.Path(s.codePath, "core", "agent", "prompts", "personas", persona+".md")
+		personaPath := filepath.Join(s.codePath, "core", "agent", "prompts", "personas", input.Persona+".md")
 		if data, err := coreio.Local.Read(personaPath); err == nil {
-			_ = writeAtomic(core.Path(wsDir, "src", "PERSONA.md"), data)
+			coreio.Local.Write(filepath.Join(wsDir, "src", "PERSONA.md"), data)
 		}
 	}
@ -295,9 +207,9 @@ func (s *PrepSubsystem) prepWorkspace(ctx context.Context, _ *mcp.CallToolReques
 	if input.Issue > 0 {
 		s.generateTodo(ctx, input.Org, input.Repo, input.Issue, wsDir)
 	} else if input.Task != "" {
-		todo := core.Sprintf("# TASK: %s\n\n**Repo:** %s/%s\n**Status:** ready\n\n## Objective\n\n%s\n",
+		todo := fmt.Sprintf("# TASK: %s\n\n**Repo:** %s/%s\n**Status:** ready\n\n## Objective\n\n%s\n",
 			input.Task, input.Org, input.Repo, input.Task)
-		_ = writeAtomic(core.Path(wsDir, "src", "TODO.md"), todo)
+		coreio.Local.Write(filepath.Join(wsDir, "src", "TODO.md"), todo)
 	}
 	// 4. Generate CONTEXT.md from OpenBrain
@ -327,70 +239,6 @@ func (s *PrepSubsystem) prepWorkspace(ctx context.Context, _ *mcp.CallToolReques
 	return nil, out, nil
 }
 // branchSlug converts a free-form string into a git-friendly branch suffix.
 func branchSlug(value string) string {
 	value = core.Lower(core.Trim(value))
 	if value == "" {
 		return ""
 	}
 	b := core.NewBuilder()
 	b.Grow(len(value))
 	lastDash := false
 	for _, r := range value {
 		switch {
 		case r >= 'a' && r <= 'z', r >= '0' && r <= '9':
 			b.WriteRune(r)
 			lastDash = false
 		case r == '-' || r == '_' || r == '.' || r == ' ':
 			if !lastDash {
 				b.WriteByte('-')
 				lastDash = true
 			}
 		default:
 			if !lastDash {
 				b.WriteByte('-')
 				lastDash = true
 			}
 		}
 	}
 	slug := trimDashes(b.String())
 	if len(slug) > 40 {
 		slug = trimDashes(slug[:40])
 	}
 	return slug
 }
 // sanitizeFilename replaces non-alphanumeric characters (except - _ .) with dashes.
 func sanitizeFilename(title string) string {
 	b := core.NewBuilder()
 	b.Grow(len(title))
 	for _, r := range title {
 		switch {
 		case r >= 'a' && r <= 'z', r >= 'A' && r <= 'Z', r >= '0' && r <= '9',
 			r == '-', r == '_', r == '.':
 			b.WriteRune(r)
 		default:
 			b.WriteByte('-')
 		}
 	}
 	return b.String()
 }
 // trimDashes strips leading and trailing dash characters from a string.
 func trimDashes(s string) string {
 	start := 0
 	for start < len(s) && s[start] == '-' {
 		start++
 	}
 	end := len(s)
 	for end > start && s[end-1] == '-' {
 		end--
 	}
 	return s[start:end]
 }
 // --- Prompt templates ---
 func (s *PrepSubsystem) writePromptTemplate(template, wsDir string) {
@ -458,7 +306,7 @@ Do NOT push. Commit only — a reviewer will verify and push.
 		prompt = "Read TODO.md and complete the task. Work in src/.\n"
 	}
-	_ = writeAtomic(core.Path(wsDir, "src", "PROMPT.md"), prompt)
+	coreio.Local.Write(filepath.Join(wsDir, "src", "PROMPT.md"), prompt)
 }
 // --- Plan template rendering ---
@ -467,11 +315,11 @@ Do NOT push. Commit only — a reviewer will verify and push.
 // and writes PLAN.md into the workspace src/ directory.
 func (s *PrepSubsystem) writePlanFromTemplate(templateSlug string, variables map[string]string, task string, wsDir string) {
 	// Look for template in core/agent/prompts/templates/
-	templatePath := core.Path(s.codePath, "core", "agent", "prompts", "templates", templateSlug+".yaml")
+	templatePath := filepath.Join(s.codePath, "core", "agent", "prompts", "templates", templateSlug+".yaml")
 	content, err := coreio.Local.Read(templatePath)
 	if err != nil {
 		// Try .yml extension
-		templatePath = core.Path(s.codePath, "core", "agent", "prompts", "templates", templateSlug+".yml")
+		templatePath = filepath.Join(s.codePath, "core", "agent", "prompts", "templates", templateSlug+".yml")
 		content, err = coreio.Local.Read(templatePath)
 		if err != nil {
 			return // Template not found, skip silently
@ -480,8 +328,8 @@ func (s *PrepSubsystem) writePlanFromTemplate(templateSlug string, variables map
 	// Substitute variables ({{variable_name}} → value)
 	for key, value := range variables {
-		content = core.Replace(content, "{{"+key+"}}", value)
+		content = strings.ReplaceAll(content, "{{"+key+"}}", value)
-		content = core.Replace(content, "{{ "+key+" }}", value)
+		content = strings.ReplaceAll(content, "{{ "+key+" }}", value)
 	}
 	// Parse the YAML to render as markdown
@ -501,7 +349,7 @@ func (s *PrepSubsystem) writePlanFromTemplate(templateSlug string, variables map
 	}
 	// Render as PLAN.md
-	plan := core.NewBuilder()
+	var plan strings.Builder
 	plan.WriteString("# Plan: " + tmpl.Name + "\n\n")
 	if task != "" {
 		plan.WriteString("**Task:** " + task + "\n\n")
@ -519,7 +367,7 @@ func (s *PrepSubsystem) writePlanFromTemplate(templateSlug string, variables map
 	}
 	for i, phase := range tmpl.Phases {
-		plan.WriteString(core.Sprintf("## Phase %d: %s\n\n", i+1, phase.Name))
+		plan.WriteString(fmt.Sprintf("## Phase %d: %s\n\n", i+1, phase.Name))
 		if phase.Description != "" {
 			plan.WriteString(phase.Description + "\n\n")
 		}
@ -536,7 +384,7 @@ func (s *PrepSubsystem) writePlanFromTemplate(templateSlug string, variables map
 		plan.WriteString("\n**Commit after completing this phase.**\n\n---\n\n")
 	}
-	_ = writeAtomic(core.Path(wsDir, "src", "PLAN.md"), plan.String())
+	coreio.Local.Write(filepath.Join(wsDir, "src", "PLAN.md"), plan.String())
 }
 // --- Helpers (unchanged) ---
@ -546,11 +394,8 @@ func (s *PrepSubsystem) pullWiki(ctx context.Context, org, repo, wsDir string) i
 		return 0
 	}
-	url := core.Sprintf("%s/api/v1/repos/%s/%s/wiki/pages", s.forgeURL, org, repo)
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/wiki/pages", s.forgeURL, org, repo)
-	req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
+	req, _ := http.NewRequestWithContext(ctx, "GET", url, nil)
 	if err != nil {
 		return 0
 	}
 	req.Header.Set("Authorization", "token "+s.forgeToken)
 	resp, err := s.client.Do(req)
@ -566,9 +411,7 @@ func (s *PrepSubsystem) pullWiki(ctx context.Context, org, repo, wsDir string) i
 		Title  string `json:"title"`
 		SubURL string `json:"sub_url"`
 	}
-	if err := json.NewDecoder(resp.Body).Decode(&pages); err != nil {
+	json.NewDecoder(resp.Body).Decode(&pages)
 		return 0
 	}
 	count := 0
 	for _, page := range pages {
@ -577,11 +420,8 @@ func (s *PrepSubsystem) pullWiki(ctx context.Context, org, repo, wsDir string) i
 			subURL = page.Title
 		}
-		pageURL := core.Sprintf("%s/api/v1/repos/%s/%s/wiki/page/%s", s.forgeURL, org, repo, subURL)
+		pageURL := fmt.Sprintf("%s/api/v1/repos/%s/%s/wiki/page/%s", s.forgeURL, org, repo, subURL)
-		pageReq, err := http.NewRequestWithContext(ctx, "GET", pageURL, nil)
+		pageReq, _ := http.NewRequestWithContext(ctx, "GET", pageURL, nil)
 		if err != nil {
 			continue
 		}
 		pageReq.Header.Set("Authorization", "token "+s.forgeToken)
 		pageResp, err := s.client.Do(pageReq)
@ -596,22 +436,22 @@ func (s *PrepSubsystem) pullWiki(ctx context.Context, org, repo, wsDir string) i
 		var pageData struct {
 			ContentBase64 string `json:"content_base64"`
 		}
-		if err := json.NewDecoder(pageResp.Body).Decode(&pageData); err != nil {
+		json.NewDecoder(pageResp.Body).Decode(&pageData)
 			continue
 		}
 		pageResp.Body.Close()
 		if pageData.ContentBase64 == "" {
 			continue
 		}
-		content, err := base64.StdEncoding.DecodeString(pageData.ContentBase64)
+		content, _ := base64.StdEncoding.DecodeString(pageData.ContentBase64)
-		if err != nil {
+		filename := strings.Map(func(r rune) rune {
-			continue
+			if r >= 'a' && r <= 'z' || r >= 'A' && r <= 'Z' || r >= '0' && r <= '9' || r == '-' || r == '_' || r == '.' {
 				return r
 			}
-		filename := sanitizeFilename(page.Title) + ".md"
+			return '-'
 		}, page.Title) + ".md"
-		_ = writeAtomic(core.Path(wsDir, "src", "kb", filename), string(content))
+		coreio.Local.Write(filepath.Join(wsDir, "src", "kb", filename), string(content))
 		count++
 	}
@ -623,9 +463,9 @@ func (s *PrepSubsystem) copySpecs(wsDir string) int {
 	count := 0
 	for _, file := range specFiles {
-		src := core.Path(s.specsPath, file)
+		src := filepath.Join(s.specsPath, file)
 		if data, err := coreio.Local.Read(src); err == nil {
-			_ = writeAtomic(core.Path(wsDir, "src", "specs", file), data)
+			coreio.Local.Write(filepath.Join(wsDir, "src", "specs", file), data)
 			count++
 		}
 	}
@ -638,20 +478,14 @@ func (s *PrepSubsystem) generateContext(ctx context.Context, repo, wsDir string)
 		return 0
 	}
-	body, err := json.Marshal(map[string]any{
+	body, _ := json.Marshal(map[string]any{
 		"query":    "architecture conventions key interfaces for " + repo,
 		"top_k":    10,
 		"project":  repo,
 		"agent_id": "cladius",
 	})
 	if err != nil {
 		return 0
 	}
-	req, err := http.NewRequestWithContext(ctx, "POST", s.brainURL+"/v1/brain/recall", core.NewReader(string(body)))
+	req, _ := http.NewRequestWithContext(ctx, "POST", s.brainURL+"/v1/brain/recall", strings.NewReader(string(body)))
 	if err != nil {
 		return 0
 	}
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set("Accept", "application/json")
 	req.Header.Set("Authorization", "Bearer "+s.brainKey)
@ -665,18 +499,13 @@ func (s *PrepSubsystem) generateContext(ctx context.Context, repo, wsDir string)
 		return 0
 	}
-	readResult := core.ReadAll(resp.Body)
+	respData, _ := io.ReadAll(resp.Body)
 	if !readResult.OK {
 		return 0
 	}
 	var result struct {
 		Memories []map[string]any `json:"memories"`
 	}
-	if ur := core.JSONUnmarshal([]byte(readResult.Value.(string)), &result); !ur.OK {
+	json.Unmarshal(respData, &result)
 		return 0
 	}
-	content := core.NewBuilder()
+	var content strings.Builder
 	content.WriteString("# Context — " + repo + "\n\n")
 	content.WriteString("> Relevant knowledge from OpenBrain.\n\n")
@ -685,15 +514,15 @@ func (s *PrepSubsystem) generateContext(ctx context.Context, repo, wsDir string)
 		memContent, _ := mem["content"].(string)
 		memProject, _ := mem["project"].(string)
 		score, _ := mem["score"].(float64)
-		content.WriteString(core.Sprintf("### %d. %s [%s] (score: %.3f)\n\n%s\n\n", i+1, memProject, memType, score, memContent))
+		content.WriteString(fmt.Sprintf("### %d. %s [%s] (score: %.3f)\n\n%s\n\n", i+1, memProject, memType, score, memContent))
 	}
-	_ = writeAtomic(core.Path(wsDir, "src", "CONTEXT.md"), content.String())
+	coreio.Local.Write(filepath.Join(wsDir, "src", "CONTEXT.md"), content.String())
 	return len(result.Memories)
 }
 func (s *PrepSubsystem) findConsumers(repo, wsDir string) int {
-	goWorkPath := core.Path(s.codePath, "go.work")
+	goWorkPath := filepath.Join(s.codePath, "go.work")
 	modulePath := "forge.lthn.ai/core/" + repo
 	workData, err := coreio.Local.Read(goWorkPath)
@ -702,19 +531,19 @@ func (s *PrepSubsystem) findConsumers(repo, wsDir string) int {
 	}
 	var consumers []string
-	for _, line := range core.Split(workData, "\n") {
+	for _, line := range strings.Split(workData, "\n") {
-		line = core.Trim(line)
+		line = strings.TrimSpace(line)
-		if !core.HasPrefix(line, "./") {
+		if !strings.HasPrefix(line, "./") {
 			continue
 		}
-		dir := core.Path(s.codePath, core.TrimPrefix(line, "./"))
+		dir := filepath.Join(s.codePath, strings.TrimPrefix(line, "./"))
-		goMod := core.Path(dir, "go.mod")
+		goMod := filepath.Join(dir, "go.mod")
 		modData, err := coreio.Local.Read(goMod)
 		if err != nil {
 			continue
 		}
-		if core.Contains(modData, modulePath) && !core.HasPrefix(modData, "module "+modulePath) {
+		if strings.Contains(modData, modulePath) && !strings.HasPrefix(modData, "module "+modulePath) {
-			consumers = append(consumers, core.PathBase(dir))
+			consumers = append(consumers, filepath.Base(dir))
 		}
 	}
@ -724,8 +553,8 @@ func (s *PrepSubsystem) findConsumers(repo, wsDir string) int {
 		for _, c := range consumers {
 			content += "- " + c + "\n"
 		}
-		content += core.Sprintf("\n**Breaking change risk: %d consumers.**\n", len(consumers))
+		content += fmt.Sprintf("\n**Breaking change risk: %d consumers.**\n", len(consumers))
-		_ = writeAtomic(core.Path(wsDir, "src", "CONSUMERS.md"), content)
+		coreio.Local.Write(filepath.Join(wsDir, "src", "CONSUMERS.md"), content)
 	}
 	return len(consumers)
@ -739,10 +568,10 @@ func (s *PrepSubsystem) gitLog(repoPath, wsDir string) int {
 		return 0
 	}
-	lines := core.Split(core.Trim(string(output)), "\n")
+	lines := strings.Split(strings.TrimSpace(string(output)), "\n")
 	if len(lines) > 0 && lines[0] != "" {
 		content := "# Recent Changes\n\n```\n" + string(output) + "```\n"
-		_ = writeAtomic(core.Path(wsDir, "src", "RECENT.md"), content)
+		coreio.Local.Write(filepath.Join(wsDir, "src", "RECENT.md"), content)
 	}
 	return len(lines)
@ -753,7 +582,7 @@ func (s *PrepSubsystem) generateTodo(ctx context.Context, org, repo string, issu
 		return
 	}
-	url := core.Sprintf("%s/api/v1/repos/%s/%s/issues/%d", s.forgeURL, org, repo, issue)
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/issues/%d", s.forgeURL, org, repo, issue)
 	req, _ := http.NewRequestWithContext(ctx, "GET", url, nil)
 	req.Header.Set("Authorization", "token "+s.forgeToken)
@ -772,11 +601,11 @@ func (s *PrepSubsystem) generateTodo(ctx context.Context, org, repo string, issu
 	}
 	json.NewDecoder(resp.Body).Decode(&issueData)
-	content := core.Sprintf("# TASK: %s\n\n", issueData.Title)
+	content := fmt.Sprintf("# TASK: %s\n\n", issueData.Title)
-	content += core.Sprintf("**Status:** ready\n")
+	content += fmt.Sprintf("**Status:** ready\n")
-	content += core.Sprintf("**Source:** %s/%s/%s/issues/%d\n", s.forgeURL, org, repo, issue)
+	content += fmt.Sprintf("**Source:** %s/%s/%s/issues/%d\n", s.forgeURL, org, repo, issue)
-	content += core.Sprintf("**Repo:** %s/%s\n\n---\n\n", org, repo)
+	content += fmt.Sprintf("**Repo:** %s/%s\n\n---\n\n", org, repo)
 	content += "## Objective\n\n" + issueData.Body + "\n"
-	_ = writeAtomic(core.Path(wsDir, "src", "TODO.md"), content)
+	coreio.Local.Write(filepath.Join(wsDir, "src", "TODO.md"), content)
 }
--- a/pkg/mcp/agentic/prep_test.go
+++ b/pkg/mcp/agentic/prep_test.go
@ -1,151 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"context"
 	"strings"
 	"testing"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 )
 type recordingNotifier struct {
 	channel string
 	data    any
 }
 func (r *recordingNotifier) ChannelSend(_ context.Context, channel string, data any) {
 	r.channel = channel
 	r.data = data
 }
 func TestSanitizeRepoPathSegment_Good(t *testing.T) {
 	t.Run("repo", func(t *testing.T) {
 		value, err := sanitizeRepoPathSegment("go-io", "repo", false)
 		if err != nil {
 			t.Fatalf("expected valid repo name, got error: %v", err)
 		}
 		if value != "go-io" {
 			t.Fatalf("expected normalized value, got: %q", value)
 		}
 	})
 	t.Run("persona", func(t *testing.T) {
 		value, err := sanitizeRepoPathSegment("engineering/backend-architect", "persona", true)
 		if err != nil {
 			t.Fatalf("expected valid persona path, got error: %v", err)
 		}
 		if value != "engineering/backend-architect" {
 			t.Fatalf("expected persona path, got: %q", value)
 		}
 	})
 }
 func TestSanitizeRepoPathSegment_Bad(t *testing.T) {
 	cases := []struct {
 		name      string
 		value     string
 		allowPath bool
 	}{
 		{"repo segment traversal", "../repo", false},
 		{"repo nested path", "team/repo", false},
 		{"plan template traversal", "../secret", false},
 		{"persona traversal", "engineering/../../admin", true},
 		{"backslash", "org\\repo", false},
 	}
 	for _, tc := range cases {
 		t.Run(tc.name, func(t *testing.T) {
 			_, err := sanitizeRepoPathSegment(tc.value, tc.name, tc.allowPath)
 			if err == nil {
 				t.Fatal("expected error")
 			}
 		})
 	}
 }
 func TestPrepWorkspace_Bad_BadRepoTraversal(t *testing.T) {
 	s := &PrepSubsystem{codePath: t.TempDir()}
 	_, _, err := s.prepWorkspace(context.Background(), nil, PrepInput{Repo: "../repo"})
 	if err == nil {
 		t.Fatal("expected error")
 	}
 	if !strings.Contains(strings.ToLower(err.Error()), "repo") {
 		t.Fatalf("expected repo error, got %q", err)
 	}
 }
 func TestPrepWorkspace_Bad_BadPersonaTraversal(t *testing.T) {
 	s := &PrepSubsystem{codePath: t.TempDir()}
 	_, _, err := s.prepWorkspace(context.Background(), nil, PrepInput{
 		Repo:    "repo",
 		Persona: "engineering/../../admin",
 	})
 	if err == nil {
 		t.Fatal("expected error")
 	}
 	if !strings.Contains(strings.ToLower(err.Error()), "persona") {
 		t.Fatalf("expected persona error, got %q", err)
 	}
 }
 func TestPrepWorkspace_Bad_BadPlanTemplateTraversal(t *testing.T) {
 	s := &PrepSubsystem{codePath: t.TempDir()}
 	_, _, err := s.prepWorkspace(context.Background(), nil, PrepInput{
 		Repo:         "repo",
 		PlanTemplate: "../secret",
 	})
 	if err == nil {
 		t.Fatal("expected error")
 	}
 	if !strings.Contains(strings.ToLower(err.Error()), "plan_template") {
 		t.Fatalf("expected plan template error, got %q", err)
 	}
 }
 func TestSetNotifier_Good_EmitsChannelEvents(t *testing.T) {
 	s := NewPrep()
 	notifier := &recordingNotifier{}
 	s.SetNotifier(notifier)
 	s.emitChannel(context.Background(), coremcp.ChannelAgentStatus, map[string]any{"status": "running"})
 	if notifier.channel != coremcp.ChannelAgentStatus {
 		t.Fatalf("expected %s channel, got %q", coremcp.ChannelAgentStatus, notifier.channel)
 	}
 	if payload, ok := notifier.data.(map[string]any); !ok || payload["status"] != "running" {
 		t.Fatalf("expected payload to include running status, got %#v", notifier.data)
 	}
 }
 func TestEmitHarvestComplete_Good_EmitsChannelEvents(t *testing.T) {
 	s := NewPrep()
 	notifier := &recordingNotifier{}
 	s.SetNotifier(notifier)
 	s.emitHarvestComplete(context.Background(), "go-io-123", "go-io", 4, true)
 	if notifier.channel != coremcp.ChannelHarvestComplete {
 		t.Fatalf("expected %s channel, got %q", coremcp.ChannelHarvestComplete, notifier.channel)
 	}
 	payload, ok := notifier.data.(map[string]any)
 	if !ok {
 		t.Fatalf("expected payload object, got %#v", notifier.data)
 	}
 	if payload["workspace"] != "go-io-123" {
 		t.Fatalf("expected workspace go-io-123, got %#v", payload["workspace"])
 	}
 	if payload["repo"] != "go-io" {
 		t.Fatalf("expected repo go-io, got %#v", payload["repo"])
 	}
 	if payload["findings"] != 4 {
 		t.Fatalf("expected findings 4, got %#v", payload["findings"])
 	}
 	if payload["issue_created"] != true {
 		t.Fatalf("expected issue_created true, got %#v", payload["issue_created"])
 	}
 }
--- a/pkg/mcp/agentic/queue.go
+++ b/pkg/mcp/agentic/queue.go
@ -3,19 +3,18 @@
 package agentic
 import (
 	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
 	"syscall"
 	"time"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
 	coreio "dappco.re/go/core/io"
 	"gopkg.in/yaml.v3"
 )
 // os.Create, os.Open, os.DevNull, os.Environ, os.FindProcess are used for
 // process spawning and management — no core equivalents for these OS primitives.
 // DispatchConfig controls agent dispatch behaviour.
 type DispatchConfig struct {
 	DefaultAgent    string `yaml:"default_agent"`
@ -44,7 +43,7 @@ type AgentsConfig struct {
 // loadAgentsConfig reads config/agents.yaml from the code path.
 func (s *PrepSubsystem) loadAgentsConfig() *AgentsConfig {
 	paths := []string{
-		core.Path(s.codePath, ".core", "agents.yaml"),
+		filepath.Join(s.codePath, ".core", "agents.yaml"),
 	}
 	for _, path := range paths {
@ -80,16 +79,9 @@ func (s *PrepSubsystem) delayForAgent(agent string) time.Duration {
 		return 0
 	}
-	// Parse reset time (format: "HH:MM")
+	// Parse reset time
 	resetHour, resetMin := 6, 0
-	if parts := core.Split(rate.ResetUTC, ":"); len(parts) == 2 {
+	fmt.Sscanf(rate.ResetUTC, "%d:%d", &resetHour, &resetMin)
 		if h, ok := parseSimpleInt(parts[0]); ok {
 			resetHour = h
 		}
 		if m, ok := parseSimpleInt(parts[1]); ok {
 			resetMin = m
 		}
 	}
 	now := time.Now().UTC()
 	resetToday := time.Date(now.Year(), now.Month(), now.Day(), resetHour, resetMin, 0, 0, time.UTC)
@ -123,9 +115,9 @@ func (s *PrepSubsystem) listWorkspaceDirs() []string {
 		if !entry.IsDir() {
 			continue
 		}
-		path := core.Path(wsRoot, entry.Name())
+		path := filepath.Join(wsRoot, entry.Name())
 		// Check if this dir has a status.json (it's a workspace)
-		if coreio.Local.IsFile(core.Path(path, "status.json")) {
+		if coreio.Local.IsFile(filepath.Join(path, "status.json")) {
 			dirs = append(dirs, path)
 			continue
 		}
@ -136,8 +128,8 @@ func (s *PrepSubsystem) listWorkspaceDirs() []string {
 		}
 		for _, sub := range subEntries {
 			if sub.IsDir() {
-				subPath := core.Path(path, sub.Name())
+				subPath := filepath.Join(path, sub.Name())
-				if coreio.Local.IsFile(core.Path(subPath, "status.json")) {
+				if coreio.Local.IsFile(filepath.Join(subPath, "status.json")) {
 					dirs = append(dirs, subPath)
 				}
 			}
@ -154,7 +146,7 @@ func (s *PrepSubsystem) countRunningByAgent(agent string) int {
 		if err != nil || st.Status != "running" {
 			continue
 		}
-		stBase := core.SplitN(st.Agent, ":", 2)[0]
+		stBase := strings.SplitN(st.Agent, ":", 2)[0]
 		if stBase != agent {
 			continue
 		}
@ -170,7 +162,7 @@ func (s *PrepSubsystem) countRunningByAgent(agent string) int {
 // baseAgent strips the model variant (gemini:flash → gemini).
 func baseAgent(agent string) string {
-	return core.SplitN(agent, ":", 2)[0]
+	return strings.SplitN(agent, ":", 2)[0]
 }
 // canDispatchAgent checks if we're under the concurrency limit for a specific agent type.
@ -184,23 +176,6 @@ func (s *PrepSubsystem) canDispatchAgent(agent string) bool {
 	return s.countRunningByAgent(base) < limit
 }
 // parseSimpleInt parses a small non-negative integer from a string.
 // Returns (value, true) on success, (0, false) on failure.
 func parseSimpleInt(s string) (int, bool) {
 	s = core.Trim(s)
 	if s == "" {
 		return 0, false
 	}
 	n := 0
 	for _, r := range s {
 		if r < '0' || r > '9' {
 			return 0, false
 		}
 		n = n*10 + int(r-'0')
 	}
 	return n, true
 }
 // canDispatch is kept for backwards compat.
 func (s *PrepSubsystem) canDispatch() bool {
 	return true
@ -230,7 +205,7 @@ func (s *PrepSubsystem) drainQueue() {
 			continue
 		}
-		srcDir := core.Path(wsDir, "src")
+		srcDir := filepath.Join(wsDir, "src")
 		prompt := "Read PROMPT.md for instructions. All context files (CLAUDE.md, TODO.md, CONTEXT.md, CONSUMERS.md, RECENT.md) are in the parent directory. Work in this directory."
 		command, args, err := agentCommand(st.Agent, prompt)
@ -238,7 +213,7 @@ func (s *PrepSubsystem) drainQueue() {
 			continue
 		}
-		outputFile := core.Path(wsDir, core.Sprintf("agent-%s.log", st.Agent))
+		outputFile := filepath.Join(wsDir, fmt.Sprintf("agent-%s.log", st.Agent))
 		outFile, err := os.Create(outputFile)
 		if err != nil {
 			continue
@ -268,7 +243,7 @@ func (s *PrepSubsystem) drainQueue() {
 		st.Status = "running"
 		st.PID = cmd.Process.Pid
 		st.Runs++
-		s.saveStatus(wsDir, st)
+		writeStatus(wsDir, st)
 		go func() {
 			cmd.Wait()
@ -277,7 +252,7 @@ func (s *PrepSubsystem) drainQueue() {
 			if st2, err := readStatus(wsDir); err == nil {
 				st2.Status = "completed"
 				st2.PID = 0
-				s.saveStatus(wsDir, st2)
+				writeStatus(wsDir, st2)
 			}
 			// Ingest scan findings as issues
--- a/pkg/mcp/agentic/repo_helpers.go
+++ b/pkg/mcp/agentic/repo_helpers.go
@ -1,208 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"context"
 	"encoding/json"
 	"os/exec"
 	"regexp"
 	"strconv"
 	"time"
 	core "dappco.re/go/core"
 	coreio "dappco.re/go/core/io"
 	coreerr "dappco.re/go/core/log"
 )
 func listLocalRepos(basePath string) []string {
 	entries, err := coreio.Local.List(basePath)
 	if err != nil {
 		return nil
 	}
 	repos := make([]string, 0, len(entries))
 	for _, entry := range entries {
 		if entry.IsDir() {
 			repos = append(repos, entry.Name())
 		}
 	}
 	return repos
 }
 func hasRemote(repoDir, remote string) bool {
 	cmd := exec.Command("git", "remote", "get-url", remote)
 	cmd.Dir = repoDir
 	if out, err := cmd.Output(); err == nil {
 		return core.Trim(string(out)) != ""
 	}
 	return false
 }
 func commitsAhead(repoDir, baseRef, headRef string) int {
 	cmd := exec.Command("git", "rev-list", "--count", baseRef+".."+headRef)
 	cmd.Dir = repoDir
 	out, err := cmd.Output()
 	if err != nil {
 		return 0
 	}
 	count, err := parsePositiveInt(core.Trim(string(out)))
 	if err != nil {
 		return 0
 	}
 	return count
 }
 func filesChanged(repoDir, baseRef, headRef string) int {
 	cmd := exec.Command("git", "diff", "--name-only", baseRef+".."+headRef)
 	cmd.Dir = repoDir
 	out, err := cmd.Output()
 	if err != nil {
 		return 0
 	}
 	count := 0
 	for _, line := range core.Split(core.Trim(string(out)), "\n") {
 		if core.Trim(line) != "" {
 			count++
 		}
 	}
 	return count
 }
 func gitOutput(repoDir string, args ...string) (string, error) {
 	cmd := exec.Command("git", args...)
 	cmd.Dir = repoDir
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		return "", coreerr.E("gitOutput", string(out), err)
 	}
 	return core.Trim(string(out)), nil
 }
 func parsePositiveInt(value string) (int, error) {
 	value = core.Trim(value)
 	if value == "" {
 		return 0, coreerr.E("parsePositiveInt", "empty value", nil)
 	}
 	n := 0
 	for _, r := range value {
 		if r < '0' || r > '9' {
 			return 0, coreerr.E("parsePositiveInt", "value contains non-numeric characters", nil)
 		}
 		n = n*10 + int(r-'0')
 	}
 	return n, nil
 }
 func readGitHubPRURL(repoDir string) (string, error) {
 	cmd := exec.Command("gh", "pr", "list", "--head", "dev", "--state", "open", "--json", "url", "--limit", "1")
 	cmd.Dir = repoDir
 	out, err := cmd.Output()
 	if err != nil {
 		return "", err
 	}
 	var rows []struct {
 		URL string `json:"url"`
 	}
 	if err := json.Unmarshal(out, &rows); err != nil {
 		return "", err
 	}
 	if len(rows) == 0 {
 		return "", nil
 	}
 	return rows[0].URL, nil
 }
 func createGitHubPR(ctx context.Context, repoDir, repo string, commits, files int) (string, error) {
 	if _, err := exec.LookPath("gh"); err != nil {
 		return "", coreerr.E("createGitHubPR", "gh CLI is not available", err)
 	}
 	if url, err := readGitHubPRURL(repoDir); err == nil && url != "" {
 		return url, nil
 	}
 	body := "## Forge -> GitHub Sync\n\n"
 	body += "**Commits:** " + itoa(commits) + "\n"
 	body += "**Files changed:** " + itoa(files) + "\n\n"
 	body += "Automated sync from Forge (forge.lthn.ai) to GitHub mirror.\n"
 	body += "Review with CodeRabbit before merging.\n\n"
 	body += "---\n"
 	body += "Co-Authored-By: Virgil <virgil@lethean.io>"
 	title := "[sync] " + repo + ": " + itoa(commits) + " commits, " + itoa(files) + " files"
 	cmd := exec.CommandContext(ctx, "gh", "pr", "create",
 		"--head", "dev",
 		"--base", "main",
 		"--title", title,
 		"--body", body,
 	)
 	cmd.Dir = repoDir
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		return "", coreerr.E("createGitHubPR", string(out), err)
 	}
 	lines := core.Split(core.Trim(string(out)), "\n")
 	if len(lines) == 0 {
 		return "", nil
 	}
 	return core.Trim(lines[len(lines)-1]), nil
 }
 func ensureDevBranch(repoDir string) error {
 	cmd := exec.Command("git", "push", "github", "HEAD:refs/heads/dev", "--force")
 	cmd.Dir = repoDir
 	out, err := cmd.CombinedOutput()
 	if err != nil {
 		return coreerr.E("ensureDevBranch", string(out), err)
 	}
 	return nil
 }
 func reviewerCommand(ctx context.Context, repoDir, reviewer string) *exec.Cmd {
 	switch reviewer {
 	case "coderabbit":
 		return exec.CommandContext(ctx, "coderabbit", "review")
 	case "codex":
 		return exec.CommandContext(ctx, "codex", "review")
 	case "both":
 		return exec.CommandContext(ctx, "coderabbit", "review")
 	default:
 		return exec.CommandContext(ctx, reviewer)
 	}
 }
 func itoa(value int) string {
 	return strconv.Itoa(value)
 }
 func parseRetryAfter(detail string) time.Duration {
 	re := regexp.MustCompile(`(?i)(\d+)\s*(minute|minutes|hour|hours|second|seconds)`)
 	match := re.FindStringSubmatch(detail)
 	if len(match) != 3 {
 		return 5 * time.Minute
 	}
 	n, err := strconv.Atoi(match[1])
 	if err != nil || n <= 0 {
 		return 5 * time.Minute
 	}
 	switch core.Lower(match[2]) {
 	case "hour", "hours":
 		return time.Duration(n) * time.Hour
 	case "second", "seconds":
 		return time.Duration(n) * time.Second
 	default:
 		return time.Duration(n) * time.Minute
 	}
 }
 func repoRootFromCodePath(codePath string) string {
 	return core.Path(codePath, "core")
 }
--- a/pkg/mcp/agentic/resume.go
+++ b/pkg/mcp/agentic/resume.go
@ -4,20 +4,18 @@ package agentic
 import (
 	"context"
 	"fmt"
 	"os"
 	"os/exec"
 	"path/filepath"
 	"syscall"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
-	coreio "dappco.re/go/core/io"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // ResumeInput is the input for agentic_resume.
 //
 //	input := ResumeInput{Workspace: "go-mcp-1700000000", Answer: "Use the shared notifier"}
 type ResumeInput struct {
 	Workspace string `json:"workspace"`           // workspace name (e.g. "go-scm-1773581173")
 	Answer    string `json:"answer,omitempty"`     // answer to the blocked question (written to ANSWER.md)
@ -26,8 +24,6 @@ type ResumeInput struct {
 }
 // ResumeOutput is the output for agentic_resume.
 //
 //	// out.Success == true, out.PID > 0
 type ResumeOutput struct {
 	Success      bool   `json:"success"`
 	Workspace    string `json:"workspace"`
@ -37,9 +33,8 @@ type ResumeOutput struct {
 	Prompt       string `json:"prompt,omitempty"`
 }
-func (s *PrepSubsystem) registerResumeTool(svc *coremcp.Service) {
+func (s *PrepSubsystem) registerResumeTool(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_resume",
 		Description: "Resume a blocked agent workspace. Writes ANSWER.md if an answer is provided, then relaunches the agent with instructions to read it and continue.",
 	}, s.resume)
@ -50,8 +45,8 @@ func (s *PrepSubsystem) resume(ctx context.Context, _ *mcp.CallToolRequest, inpu
 		return nil, ResumeOutput{}, coreerr.E("resume", "workspace is required", nil)
 	}
-	wsDir := core.Path(s.workspaceRoot(), input.Workspace)
+	wsDir := filepath.Join(s.workspaceRoot(), input.Workspace)
-	srcDir := core.Path(wsDir, "src")
+	srcDir := filepath.Join(wsDir, "src")
 	// Verify workspace exists
 	if _, err := coreio.Local.List(srcDir); err != nil {
@ -76,9 +71,9 @@ func (s *PrepSubsystem) resume(ctx context.Context, _ *mcp.CallToolRequest, inpu
 	// Write ANSWER.md if answer provided
 	if input.Answer != "" {
-		answerPath := core.Path(srcDir, "ANSWER.md")
+		answerPath := filepath.Join(srcDir, "ANSWER.md")
-		content := core.Sprintf("# Answer\n\n%s\n", input.Answer)
+		content := fmt.Sprintf("# Answer\n\n%s\n", input.Answer)
-		if err := writeAtomic(answerPath, content); err != nil {
+		if err := coreio.Local.Write(answerPath, content); err != nil {
 			return nil, ResumeOutput{}, coreerr.E("resume", "failed to write ANSWER.md", err)
 		}
 	}
@ -100,7 +95,7 @@ func (s *PrepSubsystem) resume(ctx context.Context, _ *mcp.CallToolRequest, inpu
 	}
 	// Spawn agent as detached process (survives parent death)
-	outputFile := core.Path(wsDir, core.Sprintf("agent-%s-run%d.log", agent, st.Runs+1))
+	outputFile := filepath.Join(wsDir, fmt.Sprintf("agent-%s-run%d.log", agent, st.Runs+1))
 	command, args, err := agentCommand(agent, prompt)
 	if err != nil {
@ -136,38 +131,11 @@ func (s *PrepSubsystem) resume(ctx context.Context, _ *mcp.CallToolRequest, inpu
 	st.PID = cmd.Process.Pid
 	st.Runs++
 	st.Question = ""
-	s.saveStatus(wsDir, st)
+	writeStatus(wsDir, st)
 	go func() {
 		cmd.Wait()
 		outFile.Close()
 		postCtx := context.WithoutCancel(ctx)
 		status := "completed"
 		channel := coremcp.ChannelAgentComplete
 		payload := map[string]any{
 			"workspace": input.Workspace,
 			"agent":     agent,
 			"repo":      st.Repo,
 			"branch":    st.Branch,
 		}
 		if data, err := coreio.Local.Read(core.Path(srcDir, "BLOCKED.md")); err == nil {
 			status = "blocked"
 			channel = coremcp.ChannelAgentBlocked
 			st.Question = core.Trim(data)
 			if st.Question != "" {
 				payload["question"] = st.Question
 			}
 		}
 		st.Status = status
 		st.PID = 0
 		s.saveStatus(wsDir, st)
 		payload["status"] = status
 		s.emitChannel(postCtx, channel, payload)
 		s.emitChannel(postCtx, coremcp.ChannelAgentStatus, payload)
 	}()
 	return nil, ResumeOutput{
--- a/pkg/mcp/agentic/review_queue.go
+++ b/pkg/mcp/agentic/review_queue.go
@ -1,271 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"context"
 	"encoding/json"
 	"os"
 	"os/exec"
 	"regexp"
 	"time"
 	core "dappco.re/go/core"
 	coreio "dappco.re/go/core/io"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // ReviewQueueInput controls the review queue runner.
 type ReviewQueueInput struct {
 	Limit     int    `json:"limit,omitempty"`
 	Reviewer  string `json:"reviewer,omitempty"`
 	DryRun    bool   `json:"dry_run,omitempty"`
 	LocalOnly bool   `json:"local_only,omitempty"`
 }
 // ReviewQueueOutput reports what happened.
 type ReviewQueueOutput struct {
 	Success   bool           `json:"success"`
 	Processed []ReviewResult `json:"processed"`
 	Skipped   []string       `json:"skipped,omitempty"`
 	RateLimit *RateLimitInfo `json:"rate_limit,omitempty"`
 }
 // ReviewResult is the outcome of reviewing one repo.
 type ReviewResult struct {
 	Repo     string `json:"repo"`
 	Verdict  string `json:"verdict"`
 	Findings int    `json:"findings"`
 	Action   string `json:"action"`
 	Detail   string `json:"detail,omitempty"`
 }
 // RateLimitInfo tracks review rate limit state.
 type RateLimitInfo struct {
 	Limited bool      `json:"limited"`
 	RetryAt time.Time `json:"retry_at,omitempty"`
 	Message string    `json:"message,omitempty"`
 }
 func reviewQueueHomeDir() string {
 	if home := os.Getenv("DIR_HOME"); home != "" {
 		return home
 	}
 	home, _ := os.UserHomeDir()
 	return home
 }
 func (s *PrepSubsystem) registerReviewQueueTool(svc *coremcp.Service) {
 	server := svc.Server()
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_review_queue",
 		Description: "Process repositories that are ahead of the GitHub mirror and summarise review findings.",
 	}, s.reviewQueue)
 }
 func (s *PrepSubsystem) reviewQueue(ctx context.Context, _ *mcp.CallToolRequest, input ReviewQueueInput) (*mcp.CallToolResult, ReviewQueueOutput, error) {
 	limit := input.Limit
 	if limit <= 0 {
 		limit = 4
 	}
 	basePath := repoRootFromCodePath(s.codePath)
 	candidates := s.findReviewCandidates(basePath)
 	if len(candidates) == 0 {
 		return nil, ReviewQueueOutput{Success: true, Processed: []ReviewResult{}}, nil
 	}
 	processed := make([]ReviewResult, 0, len(candidates))
 	skipped := make([]string, 0)
 	var rateInfo *RateLimitInfo
 	for _, repo := range candidates {
 		if len(processed) >= limit {
 			skipped = append(skipped, repo+" (limit reached)")
 			continue
 		}
 		if rateInfo != nil && rateInfo.Limited && time.Now().Before(rateInfo.RetryAt) {
 			skipped = append(skipped, repo+" (rate limited)")
 			continue
 		}
 		repoDir := core.Path(basePath, repo)
 		reviewer := input.Reviewer
 		if reviewer == "" {
 			reviewer = "coderabbit"
 		}
 		result := s.reviewRepo(ctx, repoDir, repo, reviewer, input.DryRun, input.LocalOnly)
 		if result.Verdict == "rate_limited" {
 			retryAfter := parseRetryAfter(result.Detail)
 			rateInfo = &RateLimitInfo{
 				Limited: true,
 				RetryAt: time.Now().Add(retryAfter),
 				Message: result.Detail,
 			}
 			skipped = append(skipped, repo+" (rate limited)")
 			continue
 		}
 		processed = append(processed, result)
 	}
 	if rateInfo != nil {
 		s.saveRateLimitState(rateInfo)
 	}
 	return nil, ReviewQueueOutput{
 		Success:   true,
 		Processed: processed,
 		Skipped:   skipped,
 		RateLimit: rateInfo,
 	}, nil
 }
 func (s *PrepSubsystem) findReviewCandidates(basePath string) []string {
 	entries, err := os.ReadDir(basePath)
 	if err != nil {
 		return nil
 	}
 	candidates := make([]string, 0, len(entries))
 	for _, entry := range entries {
 		if !entry.IsDir() {
 			continue
 		}
 		repoDir := core.Path(basePath, entry.Name())
 		if !hasRemote(repoDir, "github") {
 			continue
 		}
 		if commitsAhead(repoDir, "github/main", "HEAD") <= 0 {
 			continue
 		}
 		candidates = append(candidates, entry.Name())
 	}
 	return candidates
 }
 func (s *PrepSubsystem) reviewRepo(ctx context.Context, repoDir, repo, reviewer string, dryRun, localOnly bool) ReviewResult {
 	result := ReviewResult{Repo: repo}
 	if rl := s.loadRateLimitState(); rl != nil && rl.Limited && time.Now().Before(rl.RetryAt) {
 		result.Verdict = "rate_limited"
 		result.Detail = core.Sprintf("retry after %s", rl.RetryAt.Format(time.RFC3339))
 		return result
 	}
 	cmd := reviewerCommand(ctx, repoDir, reviewer)
 	cmd.Dir = repoDir
 	out, err := cmd.CombinedOutput()
 	output := core.Trim(string(out))
 	if core.Contains(core.Lower(output), "rate limit") {
 		result.Verdict = "rate_limited"
 		result.Detail = output
 		return result
 	}
 	if err != nil && !core.Contains(output, "No findings") && !core.Contains(output, "no issues") {
 		result.Verdict = "error"
 		if output != "" {
 			result.Detail = output
 		} else {
 			result.Detail = err.Error()
 		}
 		return result
 	}
 	s.storeReviewOutput(repoDir, repo, reviewer, output)
 	result.Findings = countFindingHints(output)
 	if core.Contains(output, "No findings") || core.Contains(output, "no issues") || core.Contains(output, "LGTM") {
 		result.Verdict = "clean"
 		if dryRun {
 			result.Action = "skipped (dry run)"
 			return result
 		}
 		if localOnly {
 			result.Action = "local only"
 			return result
 		}
 		if url, err := readGitHubPRURL(repoDir); err == nil && url != "" {
 			mergeCmd := exec.CommandContext(ctx, "gh", "pr", "merge", "--auto", "--squash", "--delete-branch")
 			mergeCmd.Dir = repoDir
 			if mergeOut, err := mergeCmd.CombinedOutput(); err == nil {
 				result.Action = "merged"
 				result.Detail = core.Trim(string(mergeOut))
 				return result
 			}
 		}
 		result.Action = "waiting"
 		return result
 	}
 	result.Verdict = "findings"
 	if dryRun {
 		result.Action = "skipped (dry run)"
 		return result
 	}
 	result.Action = "waiting"
 	return result
 }
 func (s *PrepSubsystem) storeReviewOutput(repoDir, repo, reviewer, output string) {
 	home := reviewQueueHomeDir()
 	dataDir := core.Path(home, ".core", "training", "reviews")
 	if err := coreio.Local.EnsureDir(dataDir); err != nil {
 		return
 	}
 	payload := map[string]string{
 		"repo":     repo,
 		"reviewer": reviewer,
 		"output":   output,
 		"source":   repoDir,
 	}
 	data, err := json.MarshalIndent(payload, "", "  ")
 	if err != nil {
 		return
 	}
 	name := core.Sprintf("%s-%s-%d.json", repo, reviewer, time.Now().Unix())
 	_ = writeAtomic(core.Path(dataDir, name), string(data))
 }
 func (s *PrepSubsystem) saveRateLimitState(info *RateLimitInfo) {
 	home := reviewQueueHomeDir()
 	path := core.Path(home, ".core", "coderabbit-ratelimit.json")
 	data, err := json.Marshal(info)
 	if err != nil {
 		return
 	}
 	_ = writeAtomic(path, string(data))
 }
 func (s *PrepSubsystem) loadRateLimitState() *RateLimitInfo {
 	home := reviewQueueHomeDir()
 	path := core.Path(home, ".core", "coderabbit-ratelimit.json")
 	data, err := coreio.Local.Read(path)
 	if err != nil {
 		return nil
 	}
 	var info RateLimitInfo
 	if err := json.Unmarshal([]byte(data), &info); err != nil {
 		return nil
 	}
 	if !info.Limited {
 		return nil
 	}
 	return &info
 }
 func countFindingHints(output string) int {
 	re := regexp.MustCompile(`(?m)[^ \t\n\r]+\.(?:go|php|ts|tsx|js|jsx|py|rb|java|cs|cpp|cxx|cc|md):\d+`)
 	return len(re.FindAllString(output, -1))
 }
--- a/pkg/mcp/agentic/scan.go
+++ b/pkg/mcp/agentic/scan.go
@ -5,10 +5,11 @@ package agentic
 import (
 	"context"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"strings"
-	core "dappco.re/go/core"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -80,7 +81,7 @@ func (s *PrepSubsystem) scan(ctx context.Context, _ *mcp.CallToolRequest, input
 	seen := make(map[string]bool)
 	var unique []ScanIssue
 	for _, issue := range allIssues {
-		key := core.Sprintf("%s#%d", issue.Repo, issue.Number)
+		key := fmt.Sprintf("%s#%d", issue.Repo, issue.Number)
 		if !seen[key] {
 			seen[key] = true
 			unique = append(unique, issue)
@ -99,7 +100,7 @@ func (s *PrepSubsystem) scan(ctx context.Context, _ *mcp.CallToolRequest, input
 }
 func (s *PrepSubsystem) listOrgRepos(ctx context.Context, org string) ([]string, error) {
-	url := core.Sprintf("%s/api/v1/orgs/%s/repos?limit=50", s.forgeURL, org)
+	url := fmt.Sprintf("%s/api/v1/orgs/%s/repos?limit=50", s.forgeURL, org)
 	req, _ := http.NewRequestWithContext(ctx, "GET", url, nil)
 	req.Header.Set("Authorization", "token "+s.forgeToken)
@ -109,7 +110,7 @@ func (s *PrepSubsystem) listOrgRepos(ctx context.Context, org string) ([]string,
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != 200 {
-		return nil, coreerr.E("listOrgRepos", core.Sprintf("HTTP %d listing repos", resp.StatusCode), nil)
+		return nil, coreerr.E("listOrgRepos", fmt.Sprintf("HTTP %d listing repos", resp.StatusCode), nil)
 	}
 	var repos []struct {
@ -125,7 +126,7 @@ func (s *PrepSubsystem) listOrgRepos(ctx context.Context, org string) ([]string,
 }
 func (s *PrepSubsystem) listRepoIssues(ctx context.Context, org, repo, label string) ([]ScanIssue, error) {
-	url := core.Sprintf("%s/api/v1/repos/%s/%s/issues?state=open&labels=%s&limit=10&type=issues",
+	url := fmt.Sprintf("%s/api/v1/repos/%s/%s/issues?state=open&labels=%s&limit=10&type=issues",
 		s.forgeURL, org, repo, label)
 	req, _ := http.NewRequestWithContext(ctx, "GET", url, nil)
 	req.Header.Set("Authorization", "token "+s.forgeToken)
@ -136,7 +137,7 @@ func (s *PrepSubsystem) listRepoIssues(ctx context.Context, org, repo, label str
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != 200 {
-		return nil, coreerr.E("listRepoIssues", core.Sprintf("HTTP %d for "+repo, resp.StatusCode), nil)
+		return nil, coreerr.E("listRepoIssues", fmt.Sprintf("HTTP %d for "+repo, resp.StatusCode), nil)
 	}
 	var issues []struct {
@ -169,7 +170,7 @@ func (s *PrepSubsystem) listRepoIssues(ctx context.Context, org, repo, label str
 			Title:    issue.Title,
 			Labels:   labels,
 			Assignee: assignee,
-			URL:      core.Replace(issue.HTMLURL, "https://forge.lthn.ai", s.forgeURL),
+			URL:      strings.Replace(issue.HTMLURL, "https://forge.lthn.ai", s.forgeURL, 1),
 		})
 	}
--- a/pkg/mcp/agentic/status.go
+++ b/pkg/mcp/agentic/status.go
@ -6,18 +6,15 @@ import (
 	"context"
 	"encoding/json"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
-	coreio "dappco.re/go/core/io"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // os.Stat and os.FindProcess are used for workspace age detection and PID
 // liveness checks — these are OS-level queries with no core equivalent.
 // Workspace status file convention:
 //
 //   {workspace}/status.json  — current state of the workspace
@ -31,12 +28,6 @@ import (
 //   running → failed        (agent crashed / non-zero exit)
 // WorkspaceStatus represents the current state of an agent workspace.
 //
 //	status := WorkspaceStatus{
 //	    Status: "blocked",
 //	    Agent:  "claude",
 //	    Repo:   "go-mcp",
 //	}
 type WorkspaceStatus struct {
 	Status    string         `json:"status"`              // running, completed, blocked, failed
 	Agent     string         `json:"agent"`               // gemini, claude, codex
@ -51,6 +42,7 @@ type WorkspaceStatus struct {
 	Question  string         `json:"question,omitempty"`  // from BLOCKED.md
 	Runs      int            `json:"runs"`                // how many times dispatched/resumed
 	PRURL     string         `json:"pr_url,omitempty"`    // pull request URL (after PR created)
 	NextSteps []PipelineStep `json:"next_steps,omitempty"` // remaining pipeline steps
 }
 func writeStatus(wsDir string, status *WorkspaceStatus) error {
@ -59,64 +51,45 @@ func writeStatus(wsDir string, status *WorkspaceStatus) error {
 	if err != nil {
 		return err
 	}
-	return writeAtomic(core.JoinPath(wsDir, "status.json"), string(data))
+	return coreio.Local.Write(filepath.Join(wsDir, "status.json"), string(data))
 }
 func (s *PrepSubsystem) saveStatus(wsDir string, status *WorkspaceStatus) {
 	if err := writeStatus(wsDir, status); err != nil {
 		coreerr.Warn("failed to write workspace status", "workspace", core.PathBase(wsDir), "err", err)
 	}
 }
 func readStatus(wsDir string) (*WorkspaceStatus, error) {
-	data, err := coreio.Local.Read(core.JoinPath(wsDir, "status.json"))
+	data, err := coreio.Local.Read(filepath.Join(wsDir, "status.json"))
 	if err != nil {
 		return nil, err
 	}
 	var s WorkspaceStatus
-	if r := core.JSONUnmarshal([]byte(data), &s); !r.OK {
+	if err := json.Unmarshal([]byte(data), &s); err != nil {
-		return nil, coreerr.E("readStatus", "failed to parse status.json", nil)
+		return nil, err
 	}
 	return &s, nil
 }
 // --- agentic_status tool ---
 // StatusInput is the input for agentic_status.
 //
 //	input := StatusInput{Workspace: "go-mcp-1700000000"}
 type StatusInput struct {
 	Workspace string `json:"workspace,omitempty"` // specific workspace name, or empty for all
 }
 // StatusOutput is the output for agentic_status.
 //
 //	// out.Count == 2, len(out.Workspaces) == 2
 type StatusOutput struct {
 	Workspaces []WorkspaceInfo `json:"workspaces"`
 	Count      int             `json:"count"`
 }
 // WorkspaceInfo summarizes a tracked workspace.
 //
 //	// ws.Name == "go-mcp-1700000000", ws.Status == "running"
 type WorkspaceInfo struct {
 	Name      string `json:"name"`
 	Status    string `json:"status"`
 	Agent     string `json:"agent"`
 	Repo      string `json:"repo"`
 	Branch   string `json:"branch,omitempty"`
 	Issue    int    `json:"issue,omitempty"`
 	PRURL    string `json:"pr_url,omitempty"`
 	Task      string `json:"task"`
 	Age       string `json:"age"`
 	Question  string `json:"question,omitempty"`
 	Runs      int    `json:"runs"`
 }
-func (s *PrepSubsystem) registerStatusTool(svc *coremcp.Service) {
+func (s *PrepSubsystem) registerStatusTool(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_status",
 		Description: "List agent workspaces and their status (running, completed, blocked, failed). Shows blocked agents with their questions.",
 	}, s.status)
@ -124,11 +97,14 @@ func (s *PrepSubsystem) registerStatusTool(svc *coremcp.Service) {
 func (s *PrepSubsystem) status(ctx context.Context, _ *mcp.CallToolRequest, input StatusInput) (*mcp.CallToolResult, StatusOutput, error) {
 	wsDirs := s.listWorkspaceDirs()
 	if len(wsDirs) == 0 {
 		return nil, StatusOutput{}, coreerr.E("status", "no workspaces found", nil)
 	}
 	var workspaces []WorkspaceInfo
 	for _, wsDir := range wsDirs {
-		name := core.PathBase(wsDir)
+		name := filepath.Base(wsDir)
 		// Filter by specific workspace if requested
 		if input.Workspace != "" && name != input.Workspace {
@ -141,7 +117,7 @@ func (s *PrepSubsystem) status(ctx context.Context, _ *mcp.CallToolRequest, inpu
 		st, err := readStatus(wsDir)
 		if err != nil {
 			// Legacy workspace (no status.json) — check for log file
-			logFiles := core.PathGlob(core.Path(wsDir, "agent-*.log"))
+			logFiles, _ := filepath.Glob(filepath.Join(wsDir, "agent-*.log"))
 			if len(logFiles) > 0 {
 				info.Status = "completed"
 			} else {
@ -157,9 +133,6 @@ func (s *PrepSubsystem) status(ctx context.Context, _ *mcp.CallToolRequest, inpu
 		info.Status = st.Status
 		info.Agent = st.Agent
 		info.Repo = st.Repo
 		info.Branch = st.Branch
 		info.Issue = st.Issue
 		info.PRURL = st.PRURL
 		info.Task = st.Task
 		info.Runs = st.Runs
 		info.Age = time.Since(st.StartedAt).Truncate(time.Minute).String()
@ -168,39 +141,18 @@ func (s *PrepSubsystem) status(ctx context.Context, _ *mcp.CallToolRequest, inpu
 		if st.Status == "running" && st.PID > 0 {
 			proc, err := os.FindProcess(st.PID)
 			if err != nil || proc.Signal(nil) != nil {
 				prevStatus := st.Status
 				status := "completed"
 				channel := coremcp.ChannelAgentComplete
 				payload := map[string]any{
 					"workspace": name,
 					"agent":     st.Agent,
 					"repo":      st.Repo,
 					"branch":    st.Branch,
 				}
 				// Process died — check for BLOCKED.md
-				blockedPath := core.Path(wsDir, "src", "BLOCKED.md")
+				blockedPath := filepath.Join(wsDir, "src", "BLOCKED.md")
 				if data, err := coreio.Local.Read(blockedPath); err == nil {
 					info.Status = "blocked"
-					info.Question = core.Trim(data)
+					info.Question = strings.TrimSpace(data)
 					st.Status = "blocked"
 					st.Question = info.Question
 					status = "blocked"
 					channel = coremcp.ChannelAgentBlocked
 					if st.Question != "" {
 						payload["question"] = st.Question
 					}
 				} else {
 					info.Status = "completed"
 					st.Status = "completed"
 				}
-				s.saveStatus(wsDir, st)
+				writeStatus(wsDir, st)
 				if prevStatus != status {
 					payload["status"] = status
 					s.emitChannel(ctx, channel, payload)
 					s.emitChannel(ctx, coremcp.ChannelAgentStatus, payload)
 				}
 			}
 		}
--- a/pkg/mcp/agentic/status_test.go
+++ b/pkg/mcp/agentic/status_test.go
@ -1,94 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"context"
 	"path/filepath"
 	"testing"
 	"time"
 )
 func TestStatus_Good_EmptyWorkspaceSet(t *testing.T) {
 	sub := &PrepSubsystem{codePath: t.TempDir()}
 	_, out, err := sub.status(context.Background(), nil, StatusInput{})
 	if err != nil {
 		t.Fatalf("status failed: %v", err)
 	}
 	if out.Count != 0 {
 		t.Fatalf("expected count 0, got %d", out.Count)
 	}
 	if len(out.Workspaces) != 0 {
 		t.Fatalf("expected empty workspace list, got %d entries", len(out.Workspaces))
 	}
 }
 func TestPlanRead_Good_ReturnsWrittenPlan(t *testing.T) {
 	sub := &PrepSubsystem{codePath: t.TempDir()}
 	plan := &Plan{
 		ID:        "plan-1",
 		Title:     "Read me",
 		Status:    "ready",
 		Objective: "Verify plan reads",
 		CreatedAt: time.Now(),
 		UpdatedAt: time.Now(),
 	}
 	if _, err := writePlan(sub.plansDir(), plan); err != nil {
 		t.Fatalf("writePlan failed: %v", err)
 	}
 	_, out, err := sub.planRead(context.Background(), nil, PlanReadInput{ID: plan.ID})
 	if err != nil {
 		t.Fatalf("planRead failed: %v", err)
 	}
 	if !out.Success {
 		t.Fatal("expected success output")
 	}
 	if out.Plan.ID != plan.ID {
 		t.Fatalf("expected plan %q, got %q", plan.ID, out.Plan.ID)
 	}
 	if out.Plan.Title != plan.Title {
 		t.Fatalf("expected title %q, got %q", plan.Title, out.Plan.Title)
 	}
 }
 func TestStatus_Good_ExposesWorkspaceMetadata(t *testing.T) {
 	root := t.TempDir()
 	sub := &PrepSubsystem{codePath: root}
 	wsDir := filepath.Join(root, ".core", "workspace", "repo-123")
 	plan := &WorkspaceStatus{
 		Status: "completed",
 		Agent:  "claude",
 		Repo:   "go-mcp",
 		Branch: "agent/issue-42-fix-status",
 		Issue:  42,
 		PRURL:  "https://forge.example/pr/42",
 		Task:   "Fix status output",
 		Runs:   2,
 	}
 	if err := writeStatus(wsDir, plan); err != nil {
 		t.Fatalf("writeStatus failed: %v", err)
 	}
 	_, out, err := sub.status(context.Background(), nil, StatusInput{})
 	if err != nil {
 		t.Fatalf("status failed: %v", err)
 	}
 	if out.Count != 1 {
 		t.Fatalf("expected count 1, got %d", out.Count)
 	}
 	info := out.Workspaces[0]
 	if info.Branch != plan.Branch {
 		t.Fatalf("expected branch %q, got %q", plan.Branch, info.Branch)
 	}
 	if info.Issue != plan.Issue {
 		t.Fatalf("expected issue %d, got %d", plan.Issue, info.Issue)
 	}
 	if info.PRURL != plan.PRURL {
 		t.Fatalf("expected PR URL %q, got %q", plan.PRURL, info.PRURL)
 	}
 }
--- a/pkg/mcp/agentic/watch.go
+++ b/pkg/mcp/agentic/watch.go
@ -1,201 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"context"
 	"time"
 	core "dappco.re/go/core"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // WatchInput is the input for agentic_watch.
 type WatchInput struct {
 	Workspaces   []string `json:"workspaces,omitempty"`
 	PollInterval int      `json:"poll_interval,omitempty"`
 	Timeout      int      `json:"timeout,omitempty"`
 }
 // WatchOutput is the result of watching one or more workspaces.
 type WatchOutput struct {
 	Success   bool          `json:"success"`
 	Completed []WatchResult `json:"completed"`
 	Failed    []WatchResult `json:"failed,omitempty"`
 	Duration  string        `json:"duration"`
 }
 // WatchResult describes one workspace result.
 type WatchResult struct {
 	Workspace string `json:"workspace"`
 	Agent     string `json:"agent"`
 	Repo      string `json:"repo"`
 	Status    string `json:"status"`
 	Branch    string `json:"branch,omitempty"`
 	Issue     int    `json:"issue,omitempty"`
 	PRURL     string `json:"pr_url,omitempty"`
 }
 func (s *PrepSubsystem) registerWatchTool(svc *coremcp.Service) {
 	server := svc.Server()
 	coremcp.AddToolRecorded(svc, server, "agentic", &mcp.Tool{
 		Name:        "agentic_watch",
 		Description: "Watch running or queued agent workspaces until they finish and return a completion summary.",
 	}, s.watch)
 }
 func (s *PrepSubsystem) watch(ctx context.Context, req *mcp.CallToolRequest, input WatchInput) (*mcp.CallToolResult, WatchOutput, error) {
 	pollInterval := time.Duration(input.PollInterval) * time.Second
 	if pollInterval <= 0 {
 		pollInterval = 5 * time.Second
 	}
 	timeout := time.Duration(input.Timeout) * time.Second
 	if timeout <= 0 {
 		timeout = 10 * time.Minute
 	}
 	start := time.Now()
 	deadline := start.Add(timeout)
 	targets := input.Workspaces
 	if len(targets) == 0 {
 		targets = s.findActiveWorkspaces()
 	}
 	if len(targets) == 0 {
 		return nil, WatchOutput{Success: true, Duration: "0s"}, nil
 	}
 	progressToken := any(nil)
 	if req != nil && req.Params != nil {
 		progressToken = req.Params.GetProgressToken()
 	}
 	progress := float64(0)
 	total := float64(len(targets))
 	sendProgress := func(current float64, status WorkspaceStatus) {
 		if req == nil || req.Session == nil || progressToken == nil {
 			return
 		}
 		_ = req.Session.NotifyProgress(ctx, &mcp.ProgressNotificationParams{
 			ProgressToken: progressToken,
 			Progress:      current,
 			Total:         total,
 			Message:       core.Sprintf("%s %s (%s)", status.Repo, status.Status, status.Agent),
 		})
 	}
 	remaining := make(map[string]struct{}, len(targets))
 	for _, workspace := range targets {
 		remaining[workspace] = struct{}{}
 	}
 	completed := make([]WatchResult, 0, len(targets))
 	failed := make([]WatchResult, 0)
 	for len(remaining) > 0 {
 		if time.Now().After(deadline) {
 			for workspace := range remaining {
 				failed = append(failed, WatchResult{
 					Workspace: workspace,
 					Status:    "timeout",
 				})
 			}
 			break
 		}
 		select {
 		case <-ctx.Done():
 			return nil, WatchOutput{}, coreerr.E("watch", "cancelled", ctx.Err())
 		case <-time.After(pollInterval):
 		}
 		_, statusOut, err := s.status(ctx, req, StatusInput{})
 		if err != nil {
 			return nil, WatchOutput{}, coreerr.E("watch", "failed to refresh status", err)
 		}
 		for _, info := range statusOut.Workspaces {
 			if _, ok := remaining[info.Name]; !ok {
 				continue
 			}
 			switch info.Status {
 			case "completed", "merged", "ready-for-review":
 				status := WorkspaceStatus{
 					Repo:   info.Repo,
 					Agent:  info.Agent,
 					Status: info.Status,
 				}
 				completed = append(completed, WatchResult{
 					Workspace: info.Name,
 					Agent:     info.Agent,
 					Repo:      info.Repo,
 					Status:    info.Status,
 					Branch:    info.Branch,
 					Issue:     info.Issue,
 					PRURL:     info.PRURL,
 				})
 				delete(remaining, info.Name)
 				progress++
 				sendProgress(progress, status)
 			case "failed", "blocked":
 				status := WorkspaceStatus{
 					Repo:   info.Repo,
 					Agent:  info.Agent,
 					Status: info.Status,
 				}
 				failed = append(failed, WatchResult{
 					Workspace: info.Name,
 					Agent:     info.Agent,
 					Repo:      info.Repo,
 					Status:    info.Status,
 					Branch:    info.Branch,
 					Issue:     info.Issue,
 					PRURL:     info.PRURL,
 				})
 				delete(remaining, info.Name)
 				progress++
 				sendProgress(progress, status)
 			}
 		}
 	}
 	return nil, WatchOutput{
 		Success:   len(failed) == 0,
 		Completed: completed,
 		Failed:    failed,
 		Duration:  time.Since(start).Round(time.Second).String(),
 	}, nil
 }
 func (s *PrepSubsystem) findActiveWorkspaces() []string {
 	wsDirs := s.listWorkspaceDirs()
 	if len(wsDirs) == 0 {
 		return nil
 	}
 	active := make([]string, 0, len(wsDirs))
 	for _, wsDir := range wsDirs {
 		st, err := readStatus(wsDir)
 		if err != nil {
 			continue
 		}
 		switch st.Status {
 		case "running", "queued":
 			active = append(active, core.PathBase(wsDir))
 		}
 	}
 	return active
 }
 func (s *PrepSubsystem) resolveWorkspaceDir(name string) string {
 	if core.PathIsAbs(name) {
 		return name
 	}
 	return core.JoinPath(s.workspaceRoot(), name)
 }
--- a/pkg/mcp/agentic/write_atomic.go
+++ b/pkg/mcp/agentic/write_atomic.go
@ -1,54 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package agentic
 import (
 	"os"
 	core "dappco.re/go/core"
 	coreio "dappco.re/go/core/io"
 )
 // os.CreateTemp, os.Remove, os.Rename are framework-boundary calls for
 // atomic file writes — no core equivalent exists for temp file creation.
 // writeAtomic writes content to path by staging it in a temporary file and
 // renaming it into place.
 //
 // This avoids exposing partially written workspace files to agents that may
 // read status, prompt, or plan documents while they are being updated.
 func writeAtomic(path, content string) error {
 	dir := core.PathDir(path)
 	if err := coreio.Local.EnsureDir(dir); err != nil {
 		return err
 	}
 	tmp, err := os.CreateTemp(dir, "."+core.PathBase(path)+".*.tmp")
 	if err != nil {
 		return err
 	}
 	tmpPath := tmp.Name()
 	cleanup := func() {
 		_ = tmp.Close()
 		_ = os.Remove(tmpPath)
 	}
 	if _, err := tmp.WriteString(content); err != nil {
 		cleanup()
 		return err
 	}
 	if err := tmp.Sync(); err != nil {
 		cleanup()
 		return err
 	}
 	if err := tmp.Close(); err != nil {
 		_ = os.Remove(tmpPath)
 		return err
 	}
 	if err := os.Rename(tmpPath, path); err != nil {
 		_ = os.Remove(tmpPath)
 		return err
 	}
 	return nil
 }
--- a/pkg/mcp/authz.go
+++ b/pkg/mcp/authz.go
@ -1,400 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"crypto/hmac"
 	"crypto/sha256"
 	"crypto/subtle"
 	"encoding/base64"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"reflect"
 	"strconv"
 	"strings"
 	"time"
 	core "dappco.re/go/core"
 	coreerr "dappco.re/go/core/log"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 const (
 	// authTokenPrefix is the prefix used by HTTP Authorization headers.
 	authTokenPrefix = "Bearer "
 	// authDefaultJWTTTL is the default validity duration for minted JWTs.
 	authDefaultJWTTTL = time.Hour
 	// authJWTSecretEnv is the HMAC secret used for JWT signing and verification.
 	authJWTSecretEnv = "MCP_JWT_SECRET"
 	// authJWTTTLSecondsEnv allows overriding token lifetime.
 	authJWTTTLSecondsEnv = "MCP_JWT_TTL_SECONDS"
 )
 // authClaims is the compact claim payload stored inside our internal JWTs.
 type authClaims struct {
 	Workspace    string   `json:"workspace,omitempty"`
 	Entitlements []string `json:"entitlements,omitempty"`
 	Subject      string   `json:"sub,omitempty"`
 	Issuer       string   `json:"iss,omitempty"`
 	IssuedAt     int64    `json:"iat,omitempty"`
 	ExpiresAt    int64    `json:"exp,omitempty"`
 }
 type authContextKey struct{}
 func withAuthClaims(ctx context.Context, claims *authClaims) context.Context {
 	if ctx == nil {
 		return context.Background()
 	}
 	return context.WithValue(ctx, authContextKey{}, claims)
 }
 func claimsFromContext(ctx context.Context) *authClaims {
 	if ctx == nil {
 		return nil
 	}
 	if c := ctx.Value(authContextKey{}); c != nil {
 		if cl, ok := c.(*authClaims); ok {
 			return cl
 		}
 	}
 	return nil
 }
 // authConfig holds token verification options derived from environment.
 type authConfig struct {
 	apiToken string
 	secret   []byte
 	ttl      time.Duration
 }
 func currentAuthConfig(apiToken string) authConfig {
 	cfg := authConfig{
 		apiToken: apiToken,
 		secret:   []byte(core.Env(authJWTSecretEnv)),
 		ttl:      authDefaultJWTTTL,
 	}
 	if len(cfg.secret) == 0 {
 		cfg.secret = []byte(apiToken)
 	}
 	if ttlRaw := core.Trim(core.Env(authJWTTTLSecondsEnv)); ttlRaw != "" {
 		if ttlVal, err := strconv.Atoi(ttlRaw); err == nil && ttlVal > 0 {
 			cfg.ttl = time.Duration(ttlVal) * time.Second
 		}
 	}
 	return cfg
 }
 func extractBearerToken(raw string) string {
 	raw = strings.TrimSpace(raw)
 	if strings.HasPrefix(raw, authTokenPrefix) {
 		return strings.TrimSpace(strings.TrimPrefix(raw, authTokenPrefix))
 	}
 	return ""
 }
 func parseAuthClaims(authToken, apiToken string) (*authClaims, error) {
 	cfg := currentAuthConfig(apiToken)
 	if cfg.apiToken == "" {
 		return nil, nil
 	}
 	tkn := extractBearerToken(authToken)
 	if tkn == "" {
 		return nil, errors.New("missing bearer token")
 	}
 	if subtle.ConstantTimeCompare([]byte(tkn), []byte(cfg.apiToken)) == 1 {
 		return &authClaims{
 			Subject: "api-key",
 			IssuedAt: time.Now().Unix(),
 		}, nil
 	}
 	if len(cfg.secret) == 0 {
 		return nil, errors.New("jwt secret is not configured")
 	}
 	parts := strings.Split(tkn, ".")
 	if len(parts) != 3 {
 		return nil, errors.New("invalid token format")
 	}
 	headerJSON, err := decodeJWTSection(parts[0])
 	if err != nil {
 		return nil, err
 	}
 	var header map[string]any
 	if err := json.Unmarshal(headerJSON, &header); err != nil {
 		return nil, err
 	}
 	if alg, _ := header["alg"].(string); alg != "" && alg != "HS256" {
 		return nil, fmt.Errorf("unsupported jwt algorithm: %s", alg)
 	}
 	signatureBase := parts[0] + "." + parts[1]
 	mac := hmac.New(sha256.New, cfg.secret)
 	mac.Write([]byte(signatureBase))
 	expectedSig := mac.Sum(nil)
 	actualSig, err := decodeJWTSection(parts[2])
 	if err != nil {
 		return nil, err
 	}
 	if !hmac.Equal(expectedSig, actualSig) {
 		return nil, errors.New("invalid token signature")
 	}
 	payloadJSON, err := decodeJWTSection(parts[1])
 	if err != nil {
 		return nil, err
 	}
 	var claims authClaims
 	if err := json.Unmarshal(payloadJSON, &claims); err != nil {
 		return nil, err
 	}
 	now := time.Now().Unix()
 	if claims.ExpiresAt > 0 && claims.ExpiresAt < now {
 		return nil, errors.New("token has expired")
 	}
 	return &claims, nil
 }
 func decodeJWTSection(value string) ([]byte, error) {
 	raw, err := base64.RawURLEncoding.DecodeString(value)
 	if err != nil {
 		return nil, err
 	}
 	return raw, nil
 }
 func encodeJWTSection(value []byte) string {
 	return base64.RawURLEncoding.EncodeToString(value)
 }
 func mintJWTToken(rawClaims authClaims, cfg authConfig) (string, error) {
 	now := time.Now().Unix()
 	if rawClaims.IssuedAt == 0 {
 		rawClaims.IssuedAt = now
 	}
 	if rawClaims.ExpiresAt == 0 {
 		rawClaims.ExpiresAt = now + int64(cfg.ttl.Seconds())
 	}
 	header := map[string]string{
 		"alg": "HS256",
 		"typ": "JWT",
 	}
 	headerJSON, err := json.Marshal(header)
 	if err != nil {
 		return "", err
 	}
 	payloadJSON, err := json.Marshal(rawClaims)
 	if err != nil {
 		return "", err
 	}
 	signingInput := encodeJWTSection(headerJSON) + "." + encodeJWTSection(payloadJSON)
 	mac := hmac.New(sha256.New, cfg.secret)
 	mac.Write([]byte(signingInput))
 	signature := mac.Sum(nil)
 	return signingInput + "." + encodeJWTSection(signature), nil
 }
 func authClaimsFromToolRequest(ctx context.Context, req *mcp.CallToolRequest, apiToken string) (claims *authClaims, inTransport bool, err error) {
 	cfg := currentAuthConfig(apiToken)
 	if cfg.apiToken == "" {
 		return nil, false, nil
 	}
 	if req != nil {
 		extra := req.GetExtra()
 		if extra == nil || extra.Header == nil {
 			return nil, true, errors.New("missing request auth metadata")
 		}
 		raw := extra.Header.Get("Authorization")
 		parsed, err := parseAuthClaims(raw, apiToken)
 		if err != nil {
 			return nil, true, err
 		}
 		return parsed, true, nil
 	}
 	if claims = claimsFromContext(ctx); claims != nil {
 		return claims, true, nil
 	}
 	return nil, false, nil
 }
 func (s *Service) authorizeToolAccess(ctx context.Context, req *mcp.CallToolRequest, tool string, input any) error {
 	apiToken := core.Env("MCP_AUTH_TOKEN")
 	cfg := currentAuthConfig(apiToken)
 	if cfg.apiToken == "" {
 		return nil
 	}
 	claims, inTransport, err := authClaimsFromToolRequest(ctx, req, apiToken)
 	if err != nil {
 		return coreerr.E("auth", "unauthorized", err)
 	}
 	if !inTransport {
 		// Allow direct service method calls in-process, while still enforcing
 		// transport requests where auth metadata is present.
 		return nil
 	}
 	if claims == nil {
 		return coreerr.E("auth", "unauthorized", errors.New("missing auth claims"))
 	}
 	if !claims.canRunTool(tool) {
 		return coreerr.E("auth", "forbidden", errors.New("tool not allowed for token"))
 	}
 	if !claims.canAccessWorkspaceFromInput(input) {
 		return coreerr.E("auth", "forbidden", errors.New("workspace scope mismatch"))
 	}
 	return nil
 }
 func (c *authClaims) canRunTool(tool string) bool {
 	if c == nil {
 		return false
 	}
 	if len(c.Entitlements) == 0 {
 		return true
 	}
 	toolAllow := "tool:" + tool
 	for _, e := range c.Entitlements {
 		switch e {
 		case "*", "tool:*", "tools:*":
 			return true
 		default:
 			if e == tool {
 				return true
 			}
 			if e == toolAllow || e == "tools:"+tool {
 				return true
 			}
 		}
 	}
 	return false
 }
 func (c *authClaims) canAccessWorkspaceFromInput(input any) bool {
 	if c == nil || c.Workspace == "" || c.Workspace == "*" {
 		return true
 	}
 	target := inputWorkspaceFromValue(input)
 	if target == "" {
 		return true
 	}
 	return workspaceMatch(c.Workspace, target)
 }
 func workspaceMatch(claimed, target string) bool {
 	if strings.TrimSpace(claimed) == "" {
 		return true
 	}
 	if strings.TrimSpace(target) == "" {
 		return true
 	}
 	if claimed == target {
 		return true
 	}
 	if strings.HasSuffix(claimed, "*") {
 		prefix := strings.TrimSuffix(claimed, "*")
 		return strings.HasPrefix(target, prefix)
 	}
 	return strings.HasPrefix(target, claimed+"/")
 }
 func inputWorkspaceFromValue(input any) string {
 	if input == nil {
 		return ""
 	}
 	v := reflect.ValueOf(input)
 	for v.Kind() == reflect.Pointer && !v.IsNil() {
 		v = v.Elem()
 	}
 	if !v.IsValid() {
 		return ""
 	}
 	switch v.Kind() {
 	case reflect.Map:
 		return workspaceFromMap(v)
 	case reflect.Struct:
 		return workspaceFromStruct(v)
 	default:
 		return ""
 	}
 }
 func workspaceFromMap(v reflect.Value) string {
 	if v.IsNil() {
 		return ""
 	}
 	keyType := v.Type().Key()
 	if keyType.Kind() != reflect.String {
 		return ""
 	}
 	for _, key := range []string{
 		"workspace",
 		"repo",
 		"repository",
 		"project",
 		"workspace_id",
 	} {
 		mapKey := reflect.ValueOf(key)
 		if mapKey.Type() != keyType {
 			if mapKey.Type().ConvertibleTo(keyType) {
 				mapKey = mapKey.Convert(keyType)
 			} else {
 				continue
 			}
 		}
 		if mapKey.IsValid() {
 			raw := v.MapIndex(mapKey)
 			if raw.IsValid() && raw.Kind() == reflect.String {
 				return strings.TrimSpace(raw.String())
 			}
 		}
 	}
 	return ""
 }
 func workspaceFromStruct(v reflect.Value) string {
 	t := v.Type()
 	for i := 0; i < v.NumField(); i++ {
 		f := v.Field(i)
 		ft := t.Field(i)
 		if !f.CanInterface() {
 			continue
 		}
 		keys := []string{strings.ToLower(ft.Name)}
 		if tag := ft.Tag.Get("json"); tag != "" {
 			keys = append(keys, strings.ToLower(strings.Split(tag, ",")[0]))
 		}
 		for _, candidate := range keys {
 			if candidate != "workspace" && candidate != "repo" && candidate != "repository" {
 				continue
 			}
 			switch f.Kind() {
 			case reflect.String:
 				if s := strings.TrimSpace(f.String()); s != "" {
 					return s
 				}
 			case reflect.Pointer:
 				if f.IsNil() {
 					continue
 				}
 				if f.Elem().Kind() == reflect.String {
 					if s := strings.TrimSpace(f.Elem().String()); s != "" {
 						return s
 					}
 				}
 			}
 		}
 	}
 	return ""
 }
--- a/pkg/mcp/brain/brain.go
+++ b/pkg/mcp/brain/brain.go
@ -7,9 +7,9 @@ package brain
 import (
 	"context"
-	coremcp "dappco.re/go/mcp/pkg/mcp"
+	coreerr "forge.lthn.ai/core/go-log"
-	"dappco.re/go/mcp/pkg/mcp/ide"
+	"forge.lthn.ai/core/mcp/pkg/mcp/ide"
-	coreerr "dappco.re/go/core/log"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // errBridgeNotAvailable is returned when a tool requires the Laravel bridge
@ -20,56 +20,20 @@ var errBridgeNotAvailable = coreerr.E("brain", "bridge not available", nil)
 // It proxies brain_* tool calls to the Laravel backend via the shared IDE bridge.
 type Subsystem struct {
 	bridge *ide.Bridge
 	notifier coremcp.Notifier
 }
 var (
 	_ coremcp.Subsystem             = (*Subsystem)(nil)
 	_ coremcp.SubsystemWithShutdown = (*Subsystem)(nil)
 	_ coremcp.SubsystemWithNotifier = (*Subsystem)(nil)
 )
 // New creates a brain subsystem that uses the given IDE bridge for Laravel communication.
 //
 //	brain := New(ideBridge)
 //
 // Pass nil if headless (tools will return errBridgeNotAvailable).
 func New(bridge *ide.Bridge) *Subsystem {
-	s := &Subsystem{bridge: bridge}
+	return &Subsystem{bridge: bridge}
 	if bridge != nil {
 		bridge.AddObserver(func(msg ide.BridgeMessage) {
 			s.handleBridgeMessage(msg)
 		})
 	}
 	return s
 }
 // Name implements mcp.Subsystem.
 func (s *Subsystem) Name() string { return "brain" }
 // SetNotifier stores the shared notifier so this subsystem can emit channel events.
 func (s *Subsystem) SetNotifier(n coremcp.Notifier) {
 	s.notifier = n
 }
 // RegisterTools implements mcp.Subsystem.
-func (s *Subsystem) RegisterTools(svc *coremcp.Service) {
+func (s *Subsystem) RegisterTools(server *mcp.Server) {
-	s.registerBrainTools(svc)
+	s.registerBrainTools(server)
 }
 func (s *Subsystem) handleBridgeMessage(msg ide.BridgeMessage) {
 	switch msg.Type {
 	case "brain_remember":
 		emitBridgeChannel(context.Background(), s.notifier, coremcp.ChannelBrainRememberDone, bridgePayload(msg.Data, "type", "project"))
 	case "brain_recall":
 		payload := bridgePayload(msg.Data, "query", "project", "type", "agent_id")
 		payload["count"] = bridgeCount(msg.Data)
 		emitBridgeChannel(context.Background(), s.notifier, coremcp.ChannelBrainRecallDone, payload)
 	case "brain_forget":
 		emitBridgeChannel(context.Background(), s.notifier, coremcp.ChannelBrainForgetDone, bridgePayload(msg.Data, "id", "reason"))
 	case "brain_list":
 		emitBridgeChannel(context.Background(), s.notifier, coremcp.ChannelBrainListDone, bridgePayload(msg.Data, "project", "type", "agent_id", "limit"))
 	}
 }
 // Shutdown implements mcp.SubsystemWithShutdown.
--- a/pkg/mcp/brain/brain_test.go
+++ b/pkg/mcp/brain/brain_test.go
@ -7,20 +7,8 @@ import (
 	"encoding/json"
 	"testing"
 	"time"
 	"dappco.re/go/mcp/pkg/mcp/ide"
 )
 type recordingNotifier struct {
 	channel string
 	data    any
 }
 func (r *recordingNotifier) ChannelSend(_ context.Context, channel string, data any) {
 	r.channel = channel
 	r.data = data
 }
 // --- Nil bridge tests (headless mode) ---
 func TestBrainRemember_Bad_NilBridge(t *testing.T) {
@ -80,38 +68,6 @@ func TestSubsystem_Good_ShutdownNoop(t *testing.T) {
 	}
 }
 func TestSubsystem_Good_BridgeRecallNotification(t *testing.T) {
 	sub := New(nil)
 	notifier := &recordingNotifier{}
 	sub.notifier = notifier
 	sub.handleBridgeMessage(ide.BridgeMessage{
 		Type: "brain_recall",
 		Data: map[string]any{
 			"query": "how does scoring work?",
 			"memories": []any{
 				map[string]any{"id": "m1"},
 				map[string]any{"id": "m2"},
 			},
 		},
 	})
 	if notifier.channel != "brain.recall.complete" {
 		t.Fatalf("expected brain.recall.complete, got %q", notifier.channel)
 	}
 	payload, ok := notifier.data.(map[string]any)
 	if !ok {
 		t.Fatalf("expected payload map, got %T", notifier.data)
 	}
 	if payload["count"] != 2 {
 		t.Fatalf("expected count 2, got %v", payload["count"])
 	}
 	if payload["query"] != "how does scoring work?" {
 		t.Fatalf("expected query to be forwarded, got %v", payload["query"])
 	}
 }
 // --- Struct round-trip tests ---
 func TestRememberInput_Good_RoundTrip(t *testing.T) {
--- a/pkg/mcp/brain/bridge_events.go
+++ b/pkg/mcp/brain/bridge_events.go
@ -1,59 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package brain
 import (
 	"context"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 )
 func bridgePayload(data any, keys ...string) map[string]any {
 	payload := make(map[string]any)
 	m, ok := data.(map[string]any)
 	if !ok {
 		return payload
 	}
 	for _, key := range keys {
 		if value, ok := m[key]; ok {
 			payload[key] = value
 		}
 	}
 	return payload
 }
 func bridgeCount(data any) int {
 	m, ok := data.(map[string]any)
 	if !ok {
 		return 0
 	}
 	if count, ok := m["count"]; ok {
 		switch v := count.(type) {
 		case int:
 			return v
 		case int32:
 			return int(v)
 		case int64:
 			return int(v)
 		case float64:
 			return int(v)
 		}
 	}
 	if memories, ok := m["memories"].([]any); ok {
 		return len(memories)
 	}
 	return 0
 }
 func emitBridgeChannel(ctx context.Context, notifier coremcp.Notifier, channel string, data any) {
 	if notifier == nil {
 		return
 	}
 	notifier.ChannelSend(ctx, channel, data)
 }
--- a/pkg/mcp/brain/direct.go
+++ b/pkg/mcp/brain/direct.go
@ -3,21 +3,22 @@
 package brain
 import (
 	"bytes"
 	"context"
 	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
-	"net/url"
+	"os"
 	"strings"
 	"time"
-	core "dappco.re/go/core"
+	coreio "forge.lthn.ai/core/go-io"
-	coreio "dappco.re/go/core/io"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // channelSender is the callback for pushing channel events.
 //
 //	fn := func(ctx context.Context, channel string, data any) { ... }
 type channelSender func(ctx context.Context, channel string, data any)
 // DirectSubsystem implements mcp.Subsystem for OpenBrain via direct HTTP calls.
@ -30,12 +31,6 @@ type DirectSubsystem struct {
 	onChannel channelSender
 }
 var (
 	_ coremcp.Subsystem                    = (*DirectSubsystem)(nil)
 	_ coremcp.SubsystemWithShutdown        = (*DirectSubsystem)(nil)
 	_ coremcp.SubsystemWithChannelCallback = (*DirectSubsystem)(nil)
 )
 // OnChannel sets a callback for channel event broadcasting.
 // Called by the MCP service after creation to wire up notifications.
 //
@ -47,22 +42,18 @@ func (s *DirectSubsystem) OnChannel(fn func(ctx context.Context, channel string,
 }
 // NewDirect creates a brain subsystem that calls the OpenBrain API directly.
 //
 //	brain := NewDirect()
 //
 // Reads CORE_BRAIN_URL and CORE_BRAIN_KEY from environment, or falls back
 // to ~/.claude/brain.key for the API key.
 func NewDirect() *DirectSubsystem {
-	apiURL := core.Env("CORE_BRAIN_URL")
+	apiURL := os.Getenv("CORE_BRAIN_URL")
 	if apiURL == "" {
 		apiURL = "https://api.lthn.sh"
 	}
-	apiKey := core.Env("CORE_BRAIN_KEY")
+	apiKey := os.Getenv("CORE_BRAIN_KEY")
 	if apiKey == "" {
-		home := core.Env("HOME")
+		if data, err := coreio.Local.Read(os.ExpandEnv("$HOME/.claude/brain.key")); err == nil {
-		if data, err := coreio.Local.Read(core.Path(home, ".claude", "brain.key")); err == nil {
+			apiKey = strings.TrimSpace(data)
 			apiKey = core.Trim(data)
 		}
 	}
@ -77,27 +68,21 @@ func NewDirect() *DirectSubsystem {
 func (s *DirectSubsystem) Name() string { return "brain" }
 // RegisterTools implements mcp.Subsystem.
-func (s *DirectSubsystem) RegisterTools(svc *coremcp.Service) {
+func (s *DirectSubsystem) RegisterTools(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "brain", &mcp.Tool{
 		Name:        "brain_remember",
 		Description: "Store a memory in OpenBrain. Types: fact, decision, observation, plan, convention, architecture, research, documentation, service, bug, pattern, context, procedure.",
 	}, s.remember)
-	coremcp.AddToolRecorded(svc, server, "brain", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "brain_recall",
 		Description: "Semantic search across OpenBrain memories. Returns memories ranked by similarity. Use agent_id 'cladius' for Cladius's memories.",
 	}, s.recall)
-	coremcp.AddToolRecorded(svc, server, "brain", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "brain_forget",
 		Description: "Remove a memory from OpenBrain by ID.",
 	}, s.forget)
 	coremcp.AddToolRecorded(svc, server, "brain", &mcp.Tool{
 		Name:        "brain_list",
 		Description: "List memories in OpenBrain with optional filtering by project, type, and agent.",
 	}, s.list)
 }
 // Shutdown implements mcp.SubsystemWithShutdown.
@ -108,12 +93,16 @@ func (s *DirectSubsystem) apiCall(ctx context.Context, method, path string, body
 		return nil, coreerr.E("brain.apiCall", "no API key (set CORE_BRAIN_KEY or create ~/.claude/brain.key)", nil)
 	}
-	var bodyStr string
+	var reqBody io.Reader
 	if body != nil {
-		bodyStr = core.JSONMarshalString(body)
+		data, err := json.Marshal(body)
 		if err != nil {
 			return nil, coreerr.E("brain.apiCall", "marshal request", err)
 		}
 		reqBody = bytes.NewReader(data)
 	}
-	req, err := http.NewRequestWithContext(ctx, method, s.apiURL+path, core.NewReader(bodyStr))
+	req, err := http.NewRequestWithContext(ctx, method, s.apiURL+path, reqBody)
 	if err != nil {
 		return nil, coreerr.E("brain.apiCall", "create request", err)
 	}
@ -127,22 +116,18 @@ func (s *DirectSubsystem) apiCall(ctx context.Context, method, path string, body
 	}
 	defer resp.Body.Close()
-	r := core.ReadAll(resp.Body)
+	respData, err := io.ReadAll(resp.Body)
-	if !r.OK {
+	if err != nil {
-		if readErr, ok := r.Value.(error); ok {
+		return nil, coreerr.E("brain.apiCall", "read response", err)
 			return nil, coreerr.E("brain.apiCall", "read response", readErr)
 	}
 		return nil, coreerr.E("brain.apiCall", "read response failed", nil)
 	}
 	respData := r.Value.(string)
 	if resp.StatusCode >= 400 {
-		return nil, coreerr.E("brain.apiCall", "API returned "+respData, nil)
+		return nil, coreerr.E("brain.apiCall", "API returned "+string(respData), nil)
 	}
 	var result map[string]any
-	if ur := core.JSONUnmarshal([]byte(respData), &result); !ur.OK {
+	if err := json.Unmarshal(respData, &result); err != nil {
-		return nil, coreerr.E("brain.apiCall", "parse response", nil)
+		return nil, coreerr.E("brain.apiCall", "parse response", err)
 	}
 	return result, nil
@ -162,7 +147,7 @@ func (s *DirectSubsystem) remember(ctx context.Context, _ *mcp.CallToolRequest,
 	id, _ := result["id"].(string)
 	if s.onChannel != nil {
-		s.onChannel(ctx, coremcp.ChannelBrainRememberDone, map[string]any{
+		s.onChannel(ctx, "brain.remember.complete", map[string]any{
 			"id":      id,
 			"type":    input.Type,
 			"project": input.Project,
@ -196,10 +181,33 @@ func (s *DirectSubsystem) recall(ctx context.Context, _ *mcp.CallToolRequest, in
 		return nil, RecallOutput{}, err
 	}
-	memories := memoriesFromResult(result)
+	var memories []Memory
 	if mems, ok := result["memories"].([]any); ok {
 		for _, m := range mems {
 			if mm, ok := m.(map[string]any); ok {
 				mem := Memory{
 					Content:   fmt.Sprintf("%v", mm["content"]),
 					Type:      fmt.Sprintf("%v", mm["type"]),
 					Project:   fmt.Sprintf("%v", mm["project"]),
 					AgentID:   fmt.Sprintf("%v", mm["agent_id"]),
 					CreatedAt: fmt.Sprintf("%v", mm["created_at"]),
 				}
 				if id, ok := mm["id"].(string); ok {
 					mem.ID = id
 				}
 				if score, ok := mm["score"].(float64); ok {
 					mem.Confidence = score
 				}
 				if source, ok := mm["source"].(string); ok {
 					mem.Tags = append(mem.Tags, "source:"+source)
 				}
 				memories = append(memories, mem)
 			}
 		}
 	}
 	if s.onChannel != nil {
-		s.onChannel(ctx, coremcp.ChannelBrainRecallDone, map[string]any{
+		s.onChannel(ctx, "brain.recall.complete", map[string]any{
 			"query": input.Query,
 			"count": len(memories),
 		})
@ -217,103 +225,9 @@ func (s *DirectSubsystem) forget(ctx context.Context, _ *mcp.CallToolRequest, in
 		return nil, ForgetOutput{}, err
 	}
 	if s.onChannel != nil {
 		s.onChannel(ctx, coremcp.ChannelBrainForgetDone, map[string]any{
 			"id":     input.ID,
 			"reason": input.Reason,
 		})
 	}
 	return nil, ForgetOutput{
 		Success:   true,
 		Forgotten: input.ID,
 		Timestamp: time.Now(),
 	}, nil
 }
 func (s *DirectSubsystem) list(ctx context.Context, _ *mcp.CallToolRequest, input ListInput) (*mcp.CallToolResult, ListOutput, error) {
 	limit := input.Limit
 	if limit == 0 {
 		limit = 50
 	}
 	values := url.Values{}
 	if input.Project != "" {
 		values.Set("project", input.Project)
 	}
 	if input.Type != "" {
 		values.Set("type", input.Type)
 	}
 	if input.AgentID != "" {
 		values.Set("agent_id", input.AgentID)
 	}
 	values.Set("limit", core.Sprintf("%d", limit))
 	result, err := s.apiCall(ctx, http.MethodGet, "/v1/brain/list?"+values.Encode(), nil)
 	if err != nil {
 		return nil, ListOutput{}, err
 	}
 	memories := memoriesFromResult(result)
 	if s.onChannel != nil {
 		s.onChannel(ctx, coremcp.ChannelBrainListDone, map[string]any{
 			"project":  input.Project,
 			"type":     input.Type,
 			"agent_id": input.AgentID,
 			"limit":    limit,
 		})
 	}
 	return nil, ListOutput{
 		Success:  true,
 		Count:    len(memories),
 		Memories: memories,
 	}, nil
 }
 // memoriesFromResult extracts Memory entries from an API response map.
 func memoriesFromResult(result map[string]any) []Memory {
 	var memories []Memory
 	mems, ok := result["memories"].([]any)
 	if !ok {
 		return memories
 	}
 	for _, m := range mems {
 		mm, ok := m.(map[string]any)
 		if !ok {
 			continue
 		}
 		mem := Memory{
 			Content:   stringFromMap(mm, "content"),
 			Type:      stringFromMap(mm, "type"),
 			Project:   stringFromMap(mm, "project"),
 			AgentID:   stringFromMap(mm, "agent_id"),
 			CreatedAt: stringFromMap(mm, "created_at"),
 		}
 		if id, ok := mm["id"].(string); ok {
 			mem.ID = id
 		}
 		if score, ok := mm["score"].(float64); ok {
 			mem.Confidence = score
 		}
 		if source, ok := mm["source"].(string); ok {
 			mem.Tags = append(mem.Tags, "source:"+source)
 		}
 		memories = append(memories, mem)
 	}
 	return memories
 }
 // stringFromMap extracts a string value from a map, returning "" if missing or wrong type.
 func stringFromMap(m map[string]any, key string) string {
 	v, ok := m[key]
 	if !ok || v == nil {
 		return ""
 	}
 	s, ok := v.(string)
 	if !ok {
 		return core.Sprintf("%v", v)
 	}
 	return s
 }
--- a/pkg/mcp/brain/direct_test.go
+++ b/pkg/mcp/brain/direct_test.go
@ -290,48 +290,6 @@ func TestDirectForget_Good(t *testing.T) {
 	}
 }
 func TestDirectForget_Good_EmitsChannel(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(200)
 		json.NewEncoder(w).Encode(map[string]any{"success": true})
 	}))
 	defer srv.Close()
 	var gotChannel string
 	var gotPayload map[string]any
 	s := newTestDirect(srv.URL)
 	s.onChannel = func(_ context.Context, channel string, data any) {
 		gotChannel = channel
 		if payload, ok := data.(map[string]any); ok {
 			gotPayload = payload
 		}
 	}
 	_, out, err := s.forget(context.Background(), nil, ForgetInput{
 		ID:     "mem-789",
 		Reason: "outdated",
 	})
 	if err != nil {
 		t.Fatalf("forget failed: %v", err)
 	}
 	if !out.Success {
 		t.Fatal("expected success=true")
 	}
 	if gotChannel != "brain.forget.complete" {
 		t.Fatalf("expected brain.forget.complete, got %q", gotChannel)
 	}
 	if gotPayload == nil {
 		t.Fatal("expected channel payload")
 	}
 	if gotPayload["id"] != "mem-789" {
 		t.Fatalf("expected id=mem-789, got %v", gotPayload["id"])
 	}
 	if gotPayload["reason"] != "outdated" {
 		t.Fatalf("expected reason=outdated, got %v", gotPayload["reason"])
 	}
 }
 func TestDirectForget_Bad_ApiError(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(404)
@ -345,124 +303,3 @@ func TestDirectForget_Bad_ApiError(t *testing.T) {
 		t.Error("expected error on 404")
 	}
 }
 // --- list tool tests ---
 func TestDirectList_Good(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if r.Method != http.MethodGet {
 			t.Errorf("expected GET, got %s", r.Method)
 		}
 		if got := r.URL.Query().Get("project"); got != "eaas" {
 			t.Errorf("expected project=eaas, got %q", got)
 		}
 		if got := r.URL.Query().Get("type"); got != "decision" {
 			t.Errorf("expected type=decision, got %q", got)
 		}
 		if got := r.URL.Query().Get("agent_id"); got != "virgil" {
 			t.Errorf("expected agent_id=virgil, got %q", got)
 		}
 		if got := r.URL.Query().Get("limit"); got != "20" {
 			t.Errorf("expected limit=20, got %q", got)
 		}
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]any{
 			"memories": []any{
 				map[string]any{
 					"id":         "mem-1",
 					"content":    "use qdrant",
 					"type":       "decision",
 					"project":    "eaas",
 					"agent_id":   "virgil",
 					"score":      0.88,
 					"created_at": "2026-03-01T00:00:00Z",
 				},
 			},
 		})
 	}))
 	defer srv.Close()
 	s := newTestDirect(srv.URL)
 	_, out, err := s.list(context.Background(), nil, ListInput{
 		Project: "eaas",
 		Type:    "decision",
 		AgentID: "virgil",
 		Limit:   20,
 	})
 	if err != nil {
 		t.Fatalf("list failed: %v", err)
 	}
 	if !out.Success || out.Count != 1 {
 		t.Fatalf("expected 1 memory, got %+v", out)
 	}
 	if out.Memories[0].ID != "mem-1" {
 		t.Errorf("expected id=mem-1, got %q", out.Memories[0].ID)
 	}
 	if out.Memories[0].Confidence != 0.88 {
 		t.Errorf("expected score=0.88, got %f", out.Memories[0].Confidence)
 	}
 }
 func TestDirectList_Good_EmitsAgentIDChannelPayload(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]any{"memories": []any{}})
 	}))
 	defer srv.Close()
 	var gotChannel string
 	var gotPayload map[string]any
 	s := newTestDirect(srv.URL)
 	s.onChannel = func(_ context.Context, channel string, data any) {
 		gotChannel = channel
 		if payload, ok := data.(map[string]any); ok {
 			gotPayload = payload
 		}
 	}
 	_, out, err := s.list(context.Background(), nil, ListInput{
 		Project: "eaas",
 		Type:    "decision",
 		AgentID: "virgil",
 		Limit:   20,
 	})
 	if err != nil {
 		t.Fatalf("list failed: %v", err)
 	}
 	if !out.Success {
 		t.Fatal("expected list success")
 	}
 	if gotChannel != "brain.list.complete" {
 		t.Fatalf("expected brain.list.complete, got %q", gotChannel)
 	}
 	if gotPayload == nil {
 		t.Fatal("expected channel payload")
 	}
 	if gotPayload["agent_id"] != "virgil" {
 		t.Fatalf("expected agent_id=virgil, got %v", gotPayload["agent_id"])
 	}
 	if gotPayload["project"] != "eaas" {
 		t.Fatalf("expected project=eaas, got %v", gotPayload["project"])
 	}
 }
 func TestDirectList_Good_DefaultLimit(t *testing.T) {
 	srv := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		if got := r.URL.Query().Get("limit"); got != "50" {
 			t.Errorf("expected limit=50, got %q", got)
 		}
 		w.WriteHeader(http.StatusOK)
 		json.NewEncoder(w).Encode(map[string]any{"memories": []any{}})
 	}))
 	defer srv.Close()
 	s := newTestDirect(srv.URL)
 	_, out, err := s.list(context.Background(), nil, ListInput{})
 	if err != nil {
 		t.Fatalf("list failed: %v", err)
 	}
 	if !out.Success || out.Count != 0 {
 		t.Fatalf("expected empty list, got %+v", out)
 	}
 }
--- a/pkg/mcp/brain/provider.go
+++ b/pkg/mcp/brain/provider.go
@ -5,11 +5,10 @@ package brain
 import (
 	"net/http"
-	coremcp "dappco.re/go/mcp/pkg/mcp"
+	"forge.lthn.ai/core/api"
-	"dappco.re/go/mcp/pkg/mcp/ide"
+	"forge.lthn.ai/core/api/pkg/provider"
-	"dappco.re/go/core/api"
+	"forge.lthn.ai/core/go-ws"
-	"dappco.re/go/core/api/pkg/provider"
+	"forge.lthn.ai/core/mcp/pkg/mcp/ide"
 	"dappco.re/go/core/ws"
 	"github.com/gin-gonic/gin"
 )
@ -31,16 +30,10 @@ var (
 // NewProvider creates a brain provider that proxies to Laravel via the IDE bridge.
 // The WS hub is used to emit brain events. Pass nil for hub if not needed.
 func NewProvider(bridge *ide.Bridge, hub *ws.Hub) *BrainProvider {
-	p := &BrainProvider{
+	return &BrainProvider{
 		bridge: bridge,
 		hub:    hub,
 	}
 	if bridge != nil {
 		bridge.AddObserver(func(msg ide.BridgeMessage) {
 			p.handleBridgeMessage(msg)
 		})
 	}
 	return p
 }
 // Name implements api.RouteGroup.
@ -52,10 +45,9 @@ func (p *BrainProvider) BasePath() string { return "/api/brain" }
 // Channels implements provider.Streamable.
 func (p *BrainProvider) Channels() []string {
 	return []string{
-		coremcp.ChannelBrainRememberDone,
+		"brain.remember.complete",
-		coremcp.ChannelBrainRecallDone,
+		"brain.recall.complete",
-		coremcp.ChannelBrainForgetDone,
+		"brain.forget.complete",
 		coremcp.ChannelBrainListDone,
 	}
 }
@ -219,7 +211,7 @@ func (p *BrainProvider) remember(c *gin.Context) {
 		return
 	}
-	p.emitEvent(coremcp.ChannelBrainRememberDone, map[string]any{
+	p.emitEvent("brain.remember.complete", map[string]any{
 		"type":    input.Type,
 		"project": input.Project,
 	})
@ -252,6 +244,10 @@ func (p *BrainProvider) recall(c *gin.Context) {
 		return
 	}
 	p.emitEvent("brain.recall.complete", map[string]any{
 		"query": input.Query,
 	})
 	c.JSON(http.StatusOK, api.OK(RecallOutput{
 		Success:  true,
 		Memories: []Memory{},
@ -282,7 +278,7 @@ func (p *BrainProvider) forget(c *gin.Context) {
 		return
 	}
-	p.emitEvent(coremcp.ChannelBrainForgetDone, map[string]any{
+	p.emitEvent("brain.forget.complete", map[string]any{
 		"id": input.ID,
 	})
@ -298,18 +294,13 @@ func (p *BrainProvider) list(c *gin.Context) {
 		return
 	}
 	project := c.Query("project")
 	typ := c.Query("type")
 	agentID := c.Query("agent_id")
 	limit := c.Query("limit")
 	err := p.bridge.Send(ide.BridgeMessage{
 		Type: "brain_list",
 		Data: map[string]any{
-			"project":  project,
+			"project":  c.Query("project"),
-			"type":     typ,
+			"type":     c.Query("type"),
-			"agent_id": agentID,
+			"agent_id": c.Query("agent_id"),
-			"limit":    limit,
+			"limit":    c.Query("limit"),
 		},
 	})
 	if err != nil {
@ -317,13 +308,6 @@ func (p *BrainProvider) list(c *gin.Context) {
 		return
 	}
 	p.emitEvent(coremcp.ChannelBrainListDone, map[string]any{
 		"project":  project,
 		"type":     typ,
 		"agent_id": agentID,
 		"limit":    limit,
 	})
 	c.JSON(http.StatusOK, api.OK(ListOutput{
 		Success:  true,
 		Memories: []Memory{},
@ -350,18 +334,3 @@ func (p *BrainProvider) emitEvent(channel string, data any) {
 		Data: data,
 	})
 }
 func (p *BrainProvider) handleBridgeMessage(msg ide.BridgeMessage) {
 	switch msg.Type {
 	case "brain_remember":
 		p.emitEvent(coremcp.ChannelBrainRememberDone, bridgePayload(msg.Data, "type", "project"))
 	case "brain_recall":
 		payload := bridgePayload(msg.Data, "query", "project", "type", "agent_id")
 		payload["count"] = bridgeCount(msg.Data)
 		p.emitEvent(coremcp.ChannelBrainRecallDone, payload)
 	case "brain_forget":
 		p.emitEvent(coremcp.ChannelBrainForgetDone, bridgePayload(msg.Data, "id", "reason"))
 	case "brain_list":
 		p.emitEvent(coremcp.ChannelBrainListDone, bridgePayload(msg.Data, "project", "type", "agent_id", "limit"))
 	}
 }
--- a/pkg/mcp/brain/provider_test.go
+++ b/pkg/mcp/brain/provider_test.go
@ -1,38 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package brain
 import (
 	"testing"
 	"dappco.re/go/mcp/pkg/mcp/ide"
 )
 func TestBrainProviderChannels_Good_IncludesListComplete(t *testing.T) {
 	p := NewProvider(nil, nil)
 	channels := p.Channels()
 	found := false
 	for _, channel := range channels {
 		if channel == "brain.list.complete" {
 			found = true
 			break
 		}
 	}
 	if !found {
 		t.Fatalf("expected brain.list.complete in provider channels: %#v", channels)
 	}
 }
 func TestBrainProviderHandleBridgeMessage_Good_SupportsBrainEvents(t *testing.T) {
 	p := NewProvider(nil, nil)
 	for _, msg := range []ide.BridgeMessage{
 		{Type: "brain_remember", Data: map[string]any{"type": "bug", "project": "core/mcp"}},
 		{Type: "brain_recall", Data: map[string]any{"query": "test", "memories": []any{map[string]any{"id": "m1"}}}},
 		{Type: "brain_forget", Data: map[string]any{"id": "mem-123", "reason": "outdated"}},
 		{Type: "brain_list", Data: map[string]any{"project": "core/mcp", "limit": 10}},
 	} {
 		p.handleBridgeMessage(msg)
 	}
 }
--- a/pkg/mcp/brain/tools.go
+++ b/pkg/mcp/brain/tools.go
@ -6,24 +6,14 @@ import (
 	"context"
 	"time"
-	coremcp "dappco.re/go/mcp/pkg/mcp"
+	coreerr "forge.lthn.ai/core/go-log"
-	"dappco.re/go/mcp/pkg/mcp/ide"
+	"forge.lthn.ai/core/mcp/pkg/mcp/ide"
 	coreerr "dappco.re/go/core/log"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // emitChannel pushes a brain event through the shared notifier.
 func (s *Subsystem) emitChannel(ctx context.Context, channel string, data any) {
 	if s.notifier != nil {
 		s.notifier.ChannelSend(ctx, channel, data)
 	}
 }
 // -- Input/Output types -------------------------------------------------------
 // RememberInput is the input for brain_remember.
 //
 //	input := RememberInput{Content: "Use Qdrant for vector search", Type: "decision"}
 type RememberInput struct {
 	Content    string   `json:"content"`
 	Type       string   `json:"type"`
@ -35,8 +25,6 @@ type RememberInput struct {
 }
 // RememberOutput is the output for brain_remember.
 //
 //	// out.Success == true
 type RememberOutput struct {
 	Success   bool      `json:"success"`
 	MemoryID  string    `json:"memoryId,omitempty"`
@ -44,8 +32,6 @@ type RememberOutput struct {
 }
 // RecallInput is the input for brain_recall.
 //
 //	input := RecallInput{Query: "vector search", TopK: 5}
 type RecallInput struct {
 	Query string       `json:"query"`
 	TopK  int          `json:"top_k,omitempty"`
@ -53,8 +39,6 @@ type RecallInput struct {
 }
 // RecallFilter holds optional filter criteria for brain_recall.
 //
 //	filter := RecallFilter{Project: "core/mcp", MinConfidence: 0.5}
 type RecallFilter struct {
 	Project       string   `json:"project,omitempty"`
 	Type          any      `json:"type,omitempty"`
@ -63,8 +47,6 @@ type RecallFilter struct {
 }
 // RecallOutput is the output for brain_recall.
 //
 //	// out.Memories contains ranked matches
 type RecallOutput struct {
 	Success  bool     `json:"success"`
 	Count    int      `json:"count"`
@ -72,8 +54,6 @@ type RecallOutput struct {
 }
 // Memory is a single memory entry returned by recall or list.
 //
 //	mem := Memory{ID: "m1", Type: "bug", Content: "Fix timeout handling"}
 type Memory struct {
 	ID           string   `json:"id"`
 	AgentID      string   `json:"agent_id"`
@ -89,16 +69,12 @@ type Memory struct {
 }
 // ForgetInput is the input for brain_forget.
 //
 //	input := ForgetInput{ID: "m1"}
 type ForgetInput struct {
 	ID     string `json:"id"`
 	Reason string `json:"reason,omitempty"`
 }
 // ForgetOutput is the output for brain_forget.
 //
 //	// out.Forgotten contains the deleted memory ID
 type ForgetOutput struct {
 	Success   bool      `json:"success"`
 	Forgotten string    `json:"forgotten"`
@ -106,8 +82,6 @@ type ForgetOutput struct {
 }
 // ListInput is the input for brain_list.
 //
 //	input := ListInput{Project: "core/mcp", Limit: 50}
 type ListInput struct {
 	Project string `json:"project,omitempty"`
 	Type    string `json:"type,omitempty"`
@ -116,8 +90,6 @@ type ListInput struct {
 }
 // ListOutput is the output for brain_list.
 //
 //	// out.Count reports how many memories were returned
 type ListOutput struct {
 	Success  bool     `json:"success"`
 	Count    int      `json:"count"`
@ -126,24 +98,23 @@ type ListOutput struct {
 // -- Tool registration --------------------------------------------------------
-func (s *Subsystem) registerBrainTools(svc *coremcp.Service) {
+func (s *Subsystem) registerBrainTools(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "brain", &mcp.Tool{
 		Name:        "brain_remember",
 		Description: "Store a memory in the shared OpenBrain knowledge store. Persists decisions, observations, conventions, research, plans, bugs, or architecture knowledge for other agents.",
 	}, s.brainRemember)
-	coremcp.AddToolRecorded(svc, server, "brain", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "brain_recall",
 		Description: "Semantic search across the shared OpenBrain knowledge store. Returns memories ranked by similarity to your query, with optional filtering.",
 	}, s.brainRecall)
-	coremcp.AddToolRecorded(svc, server, "brain", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "brain_forget",
 		Description: "Remove a memory from the shared OpenBrain knowledge store. Permanently deletes from both database and vector index.",
 	}, s.brainForget)
-	coremcp.AddToolRecorded(svc, server, "brain", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "brain_list",
 		Description: "List memories in the shared OpenBrain knowledge store. Supports filtering by project, type, and agent. No vector search -- use brain_recall for semantic queries.",
 	}, s.brainList)
@ -151,7 +122,7 @@ func (s *Subsystem) registerBrainTools(svc *coremcp.Service) {
 // -- Tool handlers ------------------------------------------------------------
-func (s *Subsystem) brainRemember(ctx context.Context, _ *mcp.CallToolRequest, input RememberInput) (*mcp.CallToolResult, RememberOutput, error) {
+func (s *Subsystem) brainRemember(_ context.Context, _ *mcp.CallToolRequest, input RememberInput) (*mcp.CallToolResult, RememberOutput, error) {
 	if s.bridge == nil {
 		return nil, RememberOutput{}, errBridgeNotAvailable
 	}
@ -172,18 +143,13 @@ func (s *Subsystem) brainRemember(ctx context.Context, _ *mcp.CallToolRequest, i
 		return nil, RememberOutput{}, coreerr.E("brain.remember", "failed to send brain_remember", err)
 	}
 	s.emitChannel(ctx, coremcp.ChannelBrainRememberDone, map[string]any{
 		"type":    input.Type,
 		"project": input.Project,
 	})
 	return nil, RememberOutput{
 		Success:   true,
 		Timestamp: time.Now(),
 	}, nil
 }
-func (s *Subsystem) brainRecall(ctx context.Context, _ *mcp.CallToolRequest, input RecallInput) (*mcp.CallToolResult, RecallOutput, error) {
+func (s *Subsystem) brainRecall(_ context.Context, _ *mcp.CallToolRequest, input RecallInput) (*mcp.CallToolResult, RecallOutput, error) {
 	if s.bridge == nil {
 		return nil, RecallOutput{}, errBridgeNotAvailable
 	}
@ -206,7 +172,7 @@ func (s *Subsystem) brainRecall(ctx context.Context, _ *mcp.CallToolRequest, inp
 	}, nil
 }
-func (s *Subsystem) brainForget(ctx context.Context, _ *mcp.CallToolRequest, input ForgetInput) (*mcp.CallToolResult, ForgetOutput, error) {
+func (s *Subsystem) brainForget(_ context.Context, _ *mcp.CallToolRequest, input ForgetInput) (*mcp.CallToolResult, ForgetOutput, error) {
 	if s.bridge == nil {
 		return nil, ForgetOutput{}, errBridgeNotAvailable
 	}
@ -222,10 +188,6 @@ func (s *Subsystem) brainForget(ctx context.Context, _ *mcp.CallToolRequest, inp
 		return nil, ForgetOutput{}, coreerr.E("brain.forget", "failed to send brain_forget", err)
 	}
 	s.emitChannel(ctx, coremcp.ChannelBrainForgetDone, map[string]any{
 		"id": input.ID,
 	})
 	return nil, ForgetOutput{
 		Success:   true,
 		Forgotten: input.ID,
@ -233,7 +195,7 @@ func (s *Subsystem) brainForget(ctx context.Context, _ *mcp.CallToolRequest, inp
 	}, nil
 }
-func (s *Subsystem) brainList(ctx context.Context, _ *mcp.CallToolRequest, input ListInput) (*mcp.CallToolResult, ListOutput, error) {
+func (s *Subsystem) brainList(_ context.Context, _ *mcp.CallToolRequest, input ListInput) (*mcp.CallToolResult, ListOutput, error) {
 	if s.bridge == nil {
 		return nil, ListOutput{}, errBridgeNotAvailable
 	}
@ -255,13 +217,6 @@ func (s *Subsystem) brainList(ctx context.Context, _ *mcp.CallToolRequest, input
 		return nil, ListOutput{}, coreerr.E("brain.list", "failed to send brain_list", err)
 	}
 	s.emitChannel(ctx, coremcp.ChannelBrainListDone, map[string]any{
 		"project":  input.Project,
 		"type":     input.Type,
 		"agent_id": input.AgentID,
 		"limit":    limit,
 	})
 	return nil, ListOutput{
 		Success:  true,
 		Memories: []Memory{},
--- a/pkg/mcp/bridge.go
+++ b/pkg/mcp/bridge.go
@ -3,12 +3,14 @@
 package mcp
 import (
 	"encoding/json"
 	"errors"
 	"io"
 	"net/http"
 	core "dappco.re/go/core"
 	"github.com/gin-gonic/gin"
-	api "dappco.re/go/core/api"
+	api "forge.lthn.ai/core/api"
 )
 // maxBodySize is the maximum request body size accepted by bridged tool endpoints.
@ -23,10 +25,6 @@ const maxBodySize = 10 << 20 // 10 MB
 //	mcp.BridgeToAPI(svc, bridge)
 //	bridge.Mount(router, "/v1/tools")
 func BridgeToAPI(svc *Service, bridge *api.ToolBridge) {
 	if svc == nil || bridge == nil {
 		return
 	}
 	for rec := range svc.ToolsSeq() {
 		desc := api.ToolDescriptor{
 			Name:         rec.Name,
@ -42,27 +40,21 @@ func BridgeToAPI(svc *Service, bridge *api.ToolBridge) {
 		bridge.Add(desc, func(c *gin.Context) {
 			var body []byte
 			if c.Request.Body != nil {
-				c.Request.Body = http.MaxBytesReader(c.Writer, c.Request.Body, maxBodySize)
+				var err error
-				r := core.ReadAll(c.Request.Body)
+				body, err = io.ReadAll(io.LimitReader(c.Request.Body, maxBodySize))
-				if !r.OK {
+				if err != nil {
 					if err, ok := r.Value.(error); ok {
 						var maxBytesErr *http.MaxBytesError
 						if core.As(err, &maxBytesErr) || core.Contains(err.Error(), "request body too large") {
 							c.JSON(http.StatusRequestEntityTooLarge, api.Fail("request_too_large", "Request body exceeds 10 MB limit"))
 							return
 						}
 					}
 					c.JSON(http.StatusBadRequest, api.Fail("invalid_request", "Failed to read request body"))
 					return
 				}
 				body = []byte(r.Value.(string))
 			}
 			result, err := handler(c.Request.Context(), body)
 			if err != nil {
-				// Body present + error = likely bad input (malformed JSON).
+				// Classify JSON parse errors as client errors (400),
-				// No body + error = tool execution failure.
+				// everything else as server errors (500).
-				if core.Is(err, errInvalidRESTInput) {
+				var syntaxErr *json.SyntaxError
 				var typeErr *json.UnmarshalTypeError
 				if errors.As(err, &syntaxErr) || errors.As(err, &typeErr) {
 					c.JSON(http.StatusBadRequest, api.Fail("invalid_input", "Malformed JSON in request body"))
 					return
 				}
--- a/pkg/mcp/bridge_test.go
+++ b/pkg/mcp/bridge_test.go
@ -1,6 +1,6 @@
 // SPDX-License-Identifier: EUPL-1.2
-package mcp_test
+package mcp
 import (
 	"encoding/json"
@ -13,11 +13,7 @@ import (
 	"github.com/gin-gonic/gin"
-	mcp "dappco.re/go/mcp/pkg/mcp"
+	api "forge.lthn.ai/core/api"
 	"dappco.re/go/mcp/pkg/mcp/agentic"
 	"dappco.re/go/mcp/pkg/mcp/brain"
 	"dappco.re/go/mcp/pkg/mcp/ide"
 	api "dappco.re/go/core/api"
 )
 func init() {
@ -25,20 +21,13 @@ func init() {
 }
 func TestBridgeToAPI_Good_AllTools(t *testing.T) {
-	svc, err := mcp.New(mcp.Options{
+	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 		WorkspaceRoot: t.TempDir(),
 		Subsystems: []mcp.Subsystem{
 			brain.New(nil),
 			agentic.NewPrep(),
 			ide.New(nil, ide.Config{}),
 		},
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
 	bridge := api.NewToolBridge("/tools")
-	mcp.BridgeToAPI(svc, bridge)
+	BridgeToAPI(svc, bridge)
 	svcCount := len(svc.Tools())
 	bridgeCount := len(bridge.Tools())
@ -60,37 +49,28 @@ func TestBridgeToAPI_Good_AllTools(t *testing.T) {
 			t.Errorf("bridge has tool %q not found in service", td.Name)
 		}
 	}
 	for _, want := range []string{"brain_list", "agentic_plan_create", "ide_dashboard_overview"} {
 		if !svcNames[want] {
 			t.Fatalf("expected recorded tool %q to be present", want)
 		}
 	}
 }
 func TestBridgeToAPI_Good_DescribableGroup(t *testing.T) {
-	svc, err := mcp.New(mcp.Options{WorkspaceRoot: t.TempDir()})
+	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	bridge := api.NewToolBridge("/tools")
-	mcp.BridgeToAPI(svc, bridge)
+	BridgeToAPI(svc, bridge)
 	// ToolBridge implements DescribableGroup.
 	var dg api.DescribableGroup = bridge
 	descs := dg.Describe()
-	// ToolBridge.Describe prepends a GET entry describing the tool listing
+	if len(descs) != len(svc.Tools()) {
-	// endpoint, so the expected count is svc.Tools() + 1.
+		t.Fatalf("expected %d descriptions, got %d", len(svc.Tools()), len(descs))
 	wantDescs := len(svc.Tools()) + 1
 	if len(descs) != wantDescs {
 		t.Fatalf("expected %d descriptions, got %d", wantDescs, len(descs))
 	}
 	for _, d := range descs {
-		if d.Method != "POST" && d.Method != "GET" {
+		if d.Method != "POST" {
-			t.Errorf("expected Method=POST or GET for %s, got %q", d.Path, d.Method)
+			t.Errorf("expected Method=POST for %s, got %q", d.Path, d.Method)
 		}
 		if d.Summary == "" {
 			t.Errorf("expected non-empty Summary for %s", d.Path)
@ -110,13 +90,13 @@ func TestBridgeToAPI_Good_FileRead(t *testing.T) {
 		t.Fatal(err)
 	}
-	svc, err := mcp.New(mcp.Options{WorkspaceRoot: tmpDir})
+	svc, err := New(Options{WorkspaceRoot: tmpDir})
 	if err != nil {
 		t.Fatal(err)
 	}
 	bridge := api.NewToolBridge("/tools")
-	mcp.BridgeToAPI(svc, bridge)
+	BridgeToAPI(svc, bridge)
 	// Register with a Gin engine and make a request.
 	engine := gin.New()
@ -134,7 +114,7 @@ func TestBridgeToAPI_Good_FileRead(t *testing.T) {
 	}
 	// Parse the response envelope.
-	var resp api.Response[mcp.ReadFileOutput]
+	var resp api.Response[ReadFileOutput]
 	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
 		t.Fatalf("unmarshal error: %v", err)
 	}
@ -150,13 +130,13 @@ func TestBridgeToAPI_Good_FileRead(t *testing.T) {
 }
 func TestBridgeToAPI_Bad_InvalidJSON(t *testing.T) {
-	svc, err := mcp.New(mcp.Options{WorkspaceRoot: t.TempDir()})
+	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	bridge := api.NewToolBridge("/tools")
-	mcp.BridgeToAPI(svc, bridge)
+	BridgeToAPI(svc, bridge)
 	engine := gin.New()
 	rg := engine.Group(bridge.BasePath())
@ -168,8 +148,13 @@ func TestBridgeToAPI_Bad_InvalidJSON(t *testing.T) {
 	req.Header.Set("Content-Type", "application/json")
 	engine.ServeHTTP(w, req)
-	if w.Code != http.StatusBadRequest {
+	if w.Code != http.StatusInternalServerError {
-		t.Fatalf("expected 400 for invalid JSON, got %d: %s", w.Code, w.Body.String())
+		// The handler unmarshals via RESTHandler which returns an error,
 		// but since it's a JSON parse error it ends up as tool_error.
 		// Check we get a non-200 with an error envelope.
 		if w.Code == http.StatusOK {
 			t.Fatalf("expected non-200 for invalid JSON, got 200")
 		}
 	}
 	var resp api.Response[any]
@ -184,49 +169,14 @@ func TestBridgeToAPI_Bad_InvalidJSON(t *testing.T) {
 	}
 }
 func TestBridgeToAPI_Bad_OversizedBody(t *testing.T) {
 	svc, err := mcp.New(mcp.Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	bridge := api.NewToolBridge("/tools")
 	mcp.BridgeToAPI(svc, bridge)
 	engine := gin.New()
 	rg := engine.Group(bridge.BasePath())
 	bridge.RegisterRoutes(rg)
 	body := strings.Repeat("a", 10<<20+1)
 	w := httptest.NewRecorder()
 	req, _ := http.NewRequest(http.MethodPost, "/tools/file_read", strings.NewReader(body))
 	req.Header.Set("Content-Type", "application/json")
 	engine.ServeHTTP(w, req)
 	if w.Code != http.StatusRequestEntityTooLarge {
 		t.Fatalf("expected 413 for oversized body, got %d: %s", w.Code, w.Body.String())
 	}
 	var resp api.Response[any]
 	if err := json.Unmarshal(w.Body.Bytes(), &resp); err != nil {
 		t.Fatalf("unmarshal error: %v", err)
 	}
 	if resp.Success {
 		t.Fatal("expected Success=false for oversized body")
 	}
 	if resp.Error == nil {
 		t.Fatal("expected error in response")
 	}
 }
 func TestBridgeToAPI_Good_EndToEnd(t *testing.T) {
-	svc, err := mcp.New(mcp.Options{WorkspaceRoot: t.TempDir()})
+	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	bridge := api.NewToolBridge("/tools")
-	mcp.BridgeToAPI(svc, bridge)
+	BridgeToAPI(svc, bridge)
 	// Create an api.Engine with the bridge registered and Swagger enabled.
 	e, err := api.New(
@ -253,7 +203,7 @@ func TestBridgeToAPI_Good_EndToEnd(t *testing.T) {
 	}
 	// Verify a tool endpoint is reachable through the engine.
-	resp2, err := http.Post(srv.URL+"/tools/lang_list", "application/json", strings.NewReader("{}"))
+	resp2, err := http.Post(srv.URL+"/tools/lang_list", "application/json", nil)
 	if err != nil {
 		t.Fatalf("lang_list request failed: %v", err)
 	}
@ -262,7 +212,7 @@ func TestBridgeToAPI_Good_EndToEnd(t *testing.T) {
 		t.Fatalf("expected 200 for /tools/lang_list, got %d", resp2.StatusCode)
 	}
-	var langResp api.Response[mcp.GetSupportedLanguagesOutput]
+	var langResp api.Response[GetSupportedLanguagesOutput]
 	if err := json.NewDecoder(resp2.Body).Decode(&langResp); err != nil {
 		t.Fatalf("unmarshal error: %v", err)
 	}
--- a/pkg/mcp/ide/bridge.go
+++ b/pkg/mcp/ide/bridge.go
@ -1,26 +1,18 @@
 // SPDX-License-Identifier: EUPL-1.2
 package ide
 import (
 	"context"
-	core "dappco.re/go/core"
+	"encoding/json"
 	"net/http"
 	"sync"
 	"time"
-	coreerr "dappco.re/go/core/log"
+	coreerr "forge.lthn.ai/core/go-log"
-	"dappco.re/go/core/ws"
+	"forge.lthn.ai/core/go-ws"
 	"github.com/gorilla/websocket"
 )
-// BridgeMessage is the wire format between the IDE bridge and Laravel.
+// BridgeMessage is the wire format between the IDE and Laravel.
 //
 //	msg := BridgeMessage{
 //	    Type: "chat_send",
 //	    SessionID: "sess-42",
 //	    Data: "hello",
 //	}
 type BridgeMessage struct {
 	Type      string    `json:"type"`
 	Channel   string    `json:"channel,omitempty"`
@ -31,8 +23,6 @@ type BridgeMessage struct {
 // Bridge maintains a WebSocket connection to the Laravel core-agentic
 // backend and forwards responses to a local ws.Hub.
 //
 //	bridge := NewBridge(hub, cfg)
 type Bridge struct {
 	cfg  Config
 	hub  *ws.Hub
@ -41,57 +31,22 @@ type Bridge struct {
 	mu        sync.Mutex
 	connected bool
 	cancel    context.CancelFunc
 	observers []func(BridgeMessage)
 }
 // NewBridge creates a bridge that will connect to the Laravel backend and
 // forward incoming messages to the provided ws.Hub channels.
 //
 //	bridge := NewBridge(hub, cfg)
 func NewBridge(hub *ws.Hub, cfg Config) *Bridge {
 	return &Bridge{cfg: cfg, hub: hub}
 }
 // SetObserver registers a callback for inbound bridge messages.
 //
 //	bridge.SetObserver(func(msg BridgeMessage) {
 //	    fmt.Println(msg.Type)
 //	})
 func (b *Bridge) SetObserver(fn func(BridgeMessage)) {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 	if fn == nil {
 		b.observers = nil
 		return
 	}
 	b.observers = []func(BridgeMessage){fn}
 }
 // AddObserver registers an additional bridge observer.
 // Observers are invoked in registration order after each inbound message.
 //
 //	bridge.AddObserver(func(msg BridgeMessage) { log.Println(msg.Type) })
 func (b *Bridge) AddObserver(fn func(BridgeMessage)) {
 	if fn == nil {
 		return
 	}
 	b.mu.Lock()
 	defer b.mu.Unlock()
 	b.observers = append(b.observers, fn)
 }
 // Start begins the connection loop in a background goroutine.
 // Call Shutdown to stop it.
 //
 //	bridge.Start(ctx)
 func (b *Bridge) Start(ctx context.Context) {
 	ctx, b.cancel = context.WithCancel(ctx)
 	go b.connectLoop(ctx)
 }
 // Shutdown cleanly closes the bridge.
 //
 //	bridge.Shutdown()
 func (b *Bridge) Shutdown() {
 	if b.cancel != nil {
 		b.cancel()
@ -106,10 +61,6 @@ func (b *Bridge) Shutdown() {
 }
 // Connected reports whether the bridge has an active connection.
 //
 //	if bridge.Connected() {
 //	    fmt.Println("online")
 //	}
 func (b *Bridge) Connected() bool {
 	b.mu.Lock()
 	defer b.mu.Unlock()
@ -117,8 +68,6 @@ func (b *Bridge) Connected() bool {
 }
 // Send sends a message to the Laravel backend.
 //
 //	err := bridge.Send(BridgeMessage{Type: "dashboard_overview"})
 func (b *Bridge) Send(msg BridgeMessage) error {
 	b.mu.Lock()
 	defer b.mu.Unlock()
@ -126,7 +75,10 @@ func (b *Bridge) Send(msg BridgeMessage) error {
 		return coreerr.E("bridge.Send", "not connected", nil)
 	}
 	msg.Timestamp = time.Now()
-	data := []byte(core.JSONMarshalString(msg))
+	data, err := json.Marshal(msg)
 	if err != nil {
 		return coreerr.E("bridge.Send", "marshal failed", err)
 	}
 	return b.conn.WriteMessage(websocket.TextMessage, data)
 }
@ -206,28 +158,13 @@ func (b *Bridge) readLoop(ctx context.Context) {
 		}
 		var msg BridgeMessage
-		if r := core.JSONUnmarshal(data, &msg); !r.OK {
+		if err := json.Unmarshal(data, &msg); err != nil {
-			coreerr.Warn("ide bridge: unmarshal error")
+			coreerr.Warn("ide bridge: unmarshal error", "err", err)
 			continue
 		}
 		b.dispatch(msg)
 		for _, observer := range b.snapshotObservers() {
 			observer(msg)
 	}
 	}
 }
 func (b *Bridge) snapshotObservers() []func(BridgeMessage) {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 	if len(b.observers) == 0 {
 		return nil
 	}
 	observers := make([]func(BridgeMessage), len(b.observers))
 	copy(observers, b.observers)
 	return observers
 }
 // dispatch routes an incoming message to the appropriate ws.Hub channel.
--- a/pkg/mcp/ide/bridge_test.go
+++ b/pkg/mcp/ide/bridge_test.go
@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
-	"dappco.re/go/core/ws"
+	"forge.lthn.ai/core/go-ws"
 	"github.com/gorilla/websocket"
 )
@ -164,71 +164,6 @@ func TestBridge_Good_MessageDispatch(t *testing.T) {
 	// This confirms the dispatch path ran without error.
 }
 func TestBridge_Good_MultipleObservers(t *testing.T) {
 	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		conn, err := testUpgrader.Upgrade(w, r, nil)
 		if err != nil {
 			return
 		}
 		defer conn.Close()
 		msg := BridgeMessage{
 			Type: "brain_recall",
 			Data: map[string]any{
 				"query": "test query",
 				"count": 3,
 			},
 		}
 		data, _ := json.Marshal(msg)
 		_ = conn.WriteMessage(websocket.TextMessage, data)
 		for {
 			if _, _, err := conn.ReadMessage(); err != nil {
 				break
 			}
 		}
 	}))
 	defer ts.Close()
 	hub := ws.NewHub()
 	ctx := t.Context()
 	go hub.Run(ctx)
 	cfg := DefaultConfig()
 	cfg.LaravelWSURL = wsURL(ts)
 	cfg.ReconnectInterval = 100 * time.Millisecond
 	bridge := NewBridge(hub, cfg)
 	first := make(chan struct{}, 1)
 	second := make(chan struct{}, 1)
 	bridge.AddObserver(func(msg BridgeMessage) {
 		if msg.Type == "brain_recall" {
 			first <- struct{}{}
 		}
 	})
 	bridge.AddObserver(func(msg BridgeMessage) {
 		if msg.Type == "brain_recall" {
 			second <- struct{}{}
 		}
 	})
 	bridge.Start(ctx)
 	waitConnected(t, bridge, 2*time.Second)
 	select {
 	case <-first:
 	case <-time.After(2 * time.Second):
 		t.Fatal("timed out waiting for first observer")
 	}
 	select {
 	case <-second:
 	case <-time.After(2 * time.Second):
 		t.Fatal("timed out waiting for second observer")
 	}
 }
 func TestBridge_Good_Reconnect(t *testing.T) {
 	// Use atomic counter to avoid data race between HTTP handler goroutine
 	// and the test goroutine.
@ -477,10 +412,11 @@ func TestBridge_Good_NoAuthHeaderWhenTokenEmpty(t *testing.T) {
 	}
 }
-func TestBridge_Good_ConfigToken(t *testing.T) {
+func TestBridge_Good_WithTokenOption(t *testing.T) {
-	// Verify the Config DTO carries token settings through unchanged.
+	// Verify the WithToken option function works.
 	cfg := DefaultConfig()
-	cfg.Token = "my-token"
+	opt := WithToken("my-token")
 	opt(&cfg)
 	if cfg.Token != "my-token" {
 		t.Errorf("expected token 'my-token', got %q", cfg.Token)
@ -488,14 +424,14 @@ func TestBridge_Good_ConfigToken(t *testing.T) {
 }
 func TestSubsystem_Good_Name(t *testing.T) {
-	sub := New(nil, Config{})
+	sub := New(nil)
 	if sub.Name() != "ide" {
 		t.Errorf("expected name 'ide', got %q", sub.Name())
 	}
 }
 func TestSubsystem_Good_NilHub(t *testing.T) {
-	sub := New(nil, Config{})
+	sub := New(nil)
 	if sub.Bridge() != nil {
 		t.Error("expected nil bridge when hub is nil")
 	}
--- a/pkg/mcp/ide/config.go
+++ b/pkg/mcp/ide/config.go
@ -1,17 +1,10 @@
 // Package ide provides an MCP subsystem that bridges the desktop IDE to
 // a Laravel core-agentic backend over WebSocket.
 // SPDX-License-Identifier: EUPL-1.2
 package ide
 import "time"
 // Config holds connection and workspace settings for the IDE subsystem.
 //
 //	cfg := Config{
 //	    LaravelWSURL: "ws://localhost:9876/ws",
 //	    WorkspaceRoot: "/workspace",
 //	}
 type Config struct {
 	// LaravelWSURL is the WebSocket endpoint for the Laravel core-agentic backend.
 	LaravelWSURL string
@ -31,27 +24,34 @@ type Config struct {
 }
 // DefaultConfig returns sensible defaults for local development.
 //
 //	cfg := DefaultConfig()
 func DefaultConfig() Config {
-	return Config{}.WithDefaults()
+	return Config{
 		LaravelWSURL:         "ws://localhost:9876/ws",
 		WorkspaceRoot:        ".",
 		ReconnectInterval:    2 * time.Second,
 		MaxReconnectInterval: 30 * time.Second,
 	}
 }
-// WithDefaults fills unset fields with the default development values.
+// Option configures the IDE subsystem.
-//
+type Option func(*Config)
-//	cfg := Config{WorkspaceRoot: "/workspace"}.WithDefaults()
+
-func (c Config) WithDefaults() Config {
+// WithLaravelURL sets the Laravel WebSocket endpoint.
-	if c.LaravelWSURL == "" {
+func WithLaravelURL(url string) Option {
-		c.LaravelWSURL = "ws://localhost:9876/ws"
+	return func(c *Config) { c.LaravelWSURL = url }
-	}
+}
-	if c.WorkspaceRoot == "" {
+
-		c.WorkspaceRoot = "."
+// WithWorkspaceRoot sets the workspace root directory.
-	}
+func WithWorkspaceRoot(root string) Option {
-	if c.ReconnectInterval == 0 {
+	return func(c *Config) { c.WorkspaceRoot = root }
-		c.ReconnectInterval = 2 * time.Second
+}
-	}
+
-	if c.MaxReconnectInterval == 0 {
+// WithReconnectInterval sets the base reconnect interval.
-		c.MaxReconnectInterval = 30 * time.Second
+func WithReconnectInterval(d time.Duration) Option {
-	}
+	return func(c *Config) { c.ReconnectInterval = d }
-	return c
+}
 // WithToken sets the Bearer token for WebSocket authentication.
 func WithToken(token string) Option {
 	return func(c *Config) { c.Token = token }
 }
--- a/pkg/mcp/ide/ide.go
+++ b/pkg/mcp/ide/ide.go
@ -1,16 +1,11 @@
 // SPDX-License-Identifier: EUPL-1.2
 package ide
 import (
 	"context"
 	"sync"
 	"time"
-	core "dappco.re/go/core"
+	coreerr "forge.lthn.ai/core/go-log"
-	coremcp "dappco.re/go/mcp/pkg/mcp"
+	"forge.lthn.ai/core/go-ws"
-	coreerr "dappco.re/go/core/log"
+	"github.com/modelcontextprotocol/go-sdk/mcp"
 	"dappco.re/go/core/ws"
 )
 // errBridgeNotAvailable is returned when a tool requires the Laravel bridge
@ -22,59 +17,30 @@ type Subsystem struct {
 	cfg    Config
 	bridge *Bridge
 	hub    *ws.Hub
 	notifier coremcp.Notifier
 	stateMu      sync.Mutex
 	sessionOrder []string
 	sessions     map[string]Session
 	chats        map[string][]ChatMessage
 	buildOrder   []string
 	builds       map[string]BuildInfo
 	buildLogMap  map[string][]string
 	activity     []ActivityEvent
 }
-var (
+// New creates an IDE subsystem. The ws.Hub is used for real-time forwarding;
-	_ coremcp.Subsystem             = (*Subsystem)(nil)
+// pass nil if headless (tools still work but real-time streaming is disabled).
-	_ coremcp.SubsystemWithShutdown = (*Subsystem)(nil)
+func New(hub *ws.Hub, opts ...Option) *Subsystem {
-	_ coremcp.SubsystemWithNotifier = (*Subsystem)(nil)
+	cfg := DefaultConfig()
-)
+	for _, opt := range opts {
-
+		opt(&cfg)
 // New creates an IDE subsystem from a Config DTO.
 //
 //	cfg := DefaultConfig()
 //	ide := New(hub, cfg)
 //
 // The ws.Hub is used for real-time forwarding; pass nil if headless
 // (tools still work but real-time streaming is disabled).
 func New(hub *ws.Hub, cfg Config) *Subsystem {
 	cfg = cfg.WithDefaults()
 	s := &Subsystem{
 		cfg:         cfg,
 		bridge:      nil,
 		hub:         hub,
 		sessions:    make(map[string]Session),
 		chats:       make(map[string][]ChatMessage),
 		builds:      make(map[string]BuildInfo),
 		buildLogMap: make(map[string][]string),
 	}
 	var bridge *Bridge
 	if hub != nil {
-		s.bridge = NewBridge(hub, cfg)
+		bridge = NewBridge(hub, cfg)
 		s.bridge.AddObserver(func(msg BridgeMessage) {
 			s.handleBridgeMessage(msg)
 		})
 	}
-	return s
+	return &Subsystem{cfg: cfg, bridge: bridge, hub: hub}
 }
 // Name implements mcp.Subsystem.
 func (s *Subsystem) Name() string { return "ide" }
 // RegisterTools implements mcp.Subsystem.
-func (s *Subsystem) RegisterTools(svc *coremcp.Service) {
+func (s *Subsystem) RegisterTools(server *mcp.Server) {
-	s.registerChatTools(svc)
+	s.registerChatTools(server)
-	s.registerBuildTools(svc)
+	s.registerBuildTools(server)
-	s.registerDashboardTools(svc)
+	s.registerDashboardTools(server)
 }
 // Shutdown implements mcp.SubsystemWithShutdown.
@ -85,11 +51,6 @@ func (s *Subsystem) Shutdown(_ context.Context) error {
 	return nil
 }
 // SetNotifier wires the shared MCP notifier into the IDE subsystem.
 func (s *Subsystem) SetNotifier(n coremcp.Notifier) {
 	s.notifier = n
 }
 // Bridge returns the Laravel WebSocket bridge (may be nil in headless mode).
 func (s *Subsystem) Bridge() *Bridge { return s.bridge }
@ -99,469 +60,3 @@ func (s *Subsystem) StartBridge(ctx context.Context) {
 		s.bridge.Start(ctx)
 	}
 }
 func (s *Subsystem) addSession(session Session) {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	if s.sessions == nil {
 		s.sessions = make(map[string]Session)
 	}
 	if s.chats == nil {
 		s.chats = make(map[string][]ChatMessage)
 	}
 	if _, exists := s.sessions[session.ID]; !exists {
 		s.sessionOrder = append(s.sessionOrder, session.ID)
 	}
 	s.sessions[session.ID] = session
 }
 func (s *Subsystem) addBuild(build BuildInfo) {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	if s.builds == nil {
 		s.builds = make(map[string]BuildInfo)
 	}
 	if s.buildLogMap == nil {
 		s.buildLogMap = make(map[string][]string)
 	}
 	if _, exists := s.builds[build.ID]; !exists {
 		s.buildOrder = append(s.buildOrder, build.ID)
 	}
 	if build.StartedAt.IsZero() {
 		build.StartedAt = time.Now()
 	}
 	s.builds[build.ID] = build
 }
 func (s *Subsystem) listBuilds(repo string, limit int) []BuildInfo {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	if len(s.buildOrder) == 0 {
 		return []BuildInfo{}
 	}
 	if limit <= 0 {
 		limit = len(s.buildOrder)
 	}
 	builds := make([]BuildInfo, 0, limit)
 	for i := len(s.buildOrder) - 1; i >= 0; i-- {
 		id := s.buildOrder[i]
 		build, ok := s.builds[id]
 		if !ok {
 			continue
 		}
 		if repo != "" && build.Repo != repo {
 			continue
 		}
 		builds = append(builds, build)
 		if len(builds) >= limit {
 			break
 		}
 	}
 	return builds
 }
 func (s *Subsystem) appendBuildLog(buildID, line string) {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	if s.buildLogMap == nil {
 		s.buildLogMap = make(map[string][]string)
 	}
 	s.buildLogMap[buildID] = append(s.buildLogMap[buildID], line)
 }
 func (s *Subsystem) setBuildLogs(buildID string, lines []string) {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	if s.buildLogMap == nil {
 		s.buildLogMap = make(map[string][]string)
 	}
 	if len(lines) == 0 {
 		s.buildLogMap[buildID] = []string{}
 		return
 	}
 	out := make([]string, len(lines))
 	copy(out, lines)
 	s.buildLogMap[buildID] = out
 }
 func (s *Subsystem) buildLogTail(buildID string, tail int) []string {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	lines := s.buildLogMap[buildID]
 	if len(lines) == 0 {
 		return []string{}
 	}
 	if tail <= 0 || tail > len(lines) {
 		tail = len(lines)
 	}
 	start := len(lines) - tail
 	out := make([]string, tail)
 	copy(out, lines[start:])
 	return out
 }
 func (s *Subsystem) buildSnapshot(buildID string) (BuildInfo, bool) {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	build, ok := s.builds[buildID]
 	return build, ok
 }
 func (s *Subsystem) buildRepoCount() int {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	repos := make(map[string]struct{})
 	for _, build := range s.builds {
 		if build.Repo != "" {
 			repos[build.Repo] = struct{}{}
 		}
 	}
 	return len(repos)
 }
 func (s *Subsystem) listSessions() []Session {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	if len(s.sessionOrder) == 0 {
 		return []Session{}
 	}
 	result := make([]Session, 0, len(s.sessionOrder))
 	for _, id := range s.sessionOrder {
 		if session, ok := s.sessions[id]; ok {
 			result = append(result, session)
 		}
 	}
 	return result
 }
 func (s *Subsystem) appendChatMessage(sessionID, role, content string) {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	if s.chats == nil {
 		s.chats = make(map[string][]ChatMessage)
 	}
 	s.chats[sessionID] = append(s.chats[sessionID], ChatMessage{
 		Role:      role,
 		Content:   content,
 		Timestamp: time.Now(),
 	})
 }
 func (s *Subsystem) chatMessages(sessionID string) []ChatMessage {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	history := s.chats[sessionID]
 	if len(history) == 0 {
 		return []ChatMessage{}
 	}
 	out := make([]ChatMessage, len(history))
 	copy(out, history)
 	return out
 }
 func (s *Subsystem) recordActivity(typ, msg string) {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	s.activity = append(s.activity, ActivityEvent{
 		Type:      typ,
 		Message:   msg,
 		Timestamp: time.Now(),
 	})
 }
 func (s *Subsystem) activityFeed(limit int) []ActivityEvent {
 	s.stateMu.Lock()
 	defer s.stateMu.Unlock()
 	if limit <= 0 || limit > len(s.activity) {
 		limit = len(s.activity)
 	}
 	if limit == 0 {
 		return []ActivityEvent{}
 	}
 	start := len(s.activity) - limit
 	out := make([]ActivityEvent, limit)
 	copy(out, s.activity[start:])
 	return out
 }
 func (s *Subsystem) handleBridgeMessage(msg BridgeMessage) {
 	switch msg.Type {
 	case "build_status":
 		if build, ok := buildInfoFromData(msg.Data); ok {
 			s.addBuild(build)
 			s.emitBuildLifecycle(build)
 			if lines := buildLinesFromData(msg.Data); len(lines) > 0 {
 				s.setBuildLogs(build.ID, lines)
 			}
 		}
 	case "build_list":
 		for _, build := range buildInfosFromData(msg.Data) {
 			s.addBuild(build)
 		}
 	case "build_logs":
 		buildID, lines := buildLogsFromData(msg.Data)
 		if buildID != "" {
 			s.setBuildLogs(buildID, lines)
 		}
 	case "session_list":
 		for _, session := range sessionsFromData(msg.Data) {
 			s.addSession(session)
 		}
 	case "session_create":
 		if session, ok := sessionFromData(msg.Data); ok {
 			s.addSession(session)
 		}
 	case "chat_history":
 		if sessionID, messages := chatHistoryFromData(msg.Data); sessionID != "" {
 			for _, message := range messages {
 				s.appendChatMessage(sessionID, message.Role, message.Content)
 			}
 		}
 	}
 }
 func (s *Subsystem) emitBuildLifecycle(build BuildInfo) {
 	if s.notifier == nil {
 		return
 	}
 	channel := ""
 	switch build.Status {
 	case "running", "in_progress", "started":
 		channel = coremcp.ChannelBuildStart
 	case "success", "succeeded", "completed", "passed":
 		channel = coremcp.ChannelBuildComplete
 	case "failed", "error":
 		channel = coremcp.ChannelBuildFailed
 	default:
 		return
 	}
 	payload := map[string]any{
 		"id":        build.ID,
 		"repo":      build.Repo,
 		"branch":    build.Branch,
 		"status":    build.Status,
 		"startedAt": build.StartedAt,
 	}
 	if build.Duration != "" {
 		payload["duration"] = build.Duration
 	}
 	s.notifier.ChannelSend(context.Background(), channel, payload)
 }
 func buildInfoFromData(data any) (BuildInfo, bool) {
 	m, ok := data.(map[string]any)
 	if !ok {
 		return BuildInfo{}, false
 	}
 	id, _ := m["buildId"].(string)
 	if id == "" {
 		id, _ = m["id"].(string)
 	}
 	if id == "" {
 		return BuildInfo{}, false
 	}
 	build := BuildInfo{
 		ID:     id,
 		Repo:   stringFromAny(m["repo"]),
 		Branch: stringFromAny(m["branch"]),
 		Status: stringFromAny(m["status"]),
 	}
 	if build.Status == "" {
 		build.Status = "unknown"
 	}
 	if startedAt, ok := m["startedAt"].(time.Time); ok {
 		build.StartedAt = startedAt
 	}
 	if duration := stringFromAny(m["duration"]); duration != "" {
 		build.Duration = duration
 	}
 	return build, true
 }
 func buildInfosFromData(data any) []BuildInfo {
 	m, ok := data.(map[string]any)
 	if !ok {
 		return []BuildInfo{}
 	}
 	raw, ok := m["builds"].([]any)
 	if !ok {
 		return []BuildInfo{}
 	}
 	builds := make([]BuildInfo, 0, len(raw))
 	for _, item := range raw {
 		build, ok := buildInfoFromData(item)
 		if ok {
 			builds = append(builds, build)
 		}
 	}
 	return builds
 }
 func buildLinesFromData(data any) []string {
 	_, lines := buildLogsFromData(data)
 	return lines
 }
 func buildLogsFromData(data any) (string, []string) {
 	m, ok := data.(map[string]any)
 	if !ok {
 		return "", []string{}
 	}
 	buildID, _ := m["buildId"].(string)
 	if buildID == "" {
 		buildID, _ = m["id"].(string)
 	}
 	switch raw := m["lines"].(type) {
 	case []any:
 		lines := make([]string, 0, len(raw))
 		for _, item := range raw {
 			lines = append(lines, stringFromAny(item))
 		}
 		return buildID, lines
 	case []string:
 		lines := make([]string, len(raw))
 		copy(lines, raw)
 		return buildID, lines
 	}
 	if output := stringFromAny(m["output"]); output != "" {
 		return buildID, []string{output}
 	}
 	return buildID, []string{}
 }
 func sessionsFromData(data any) []Session {
 	m, ok := data.(map[string]any)
 	if !ok {
 		return []Session{}
 	}
 	raw, ok := m["sessions"].([]any)
 	if !ok {
 		return []Session{}
 	}
 	sessions := make([]Session, 0, len(raw))
 	for _, item := range raw {
 		session, ok := sessionFromData(item)
 		if ok {
 			sessions = append(sessions, session)
 		}
 	}
 	return sessions
 }
 func sessionFromData(data any) (Session, bool) {
 	m, ok := data.(map[string]any)
 	if !ok {
 		return Session{}, false
 	}
 	id, _ := m["id"].(string)
 	if id == "" {
 		return Session{}, false
 	}
 	session := Session{
 		ID:        id,
 		Name:      stringFromAny(m["name"]),
 		Status:    stringFromAny(m["status"]),
 		CreatedAt: time.Now(),
 	}
 	if createdAt, ok := m["createdAt"].(time.Time); ok {
 		session.CreatedAt = createdAt
 	}
 	if session.Status == "" {
 		session.Status = "unknown"
 	}
 	return session, true
 }
 func chatHistoryFromData(data any) (string, []ChatMessage) {
 	m, ok := data.(map[string]any)
 	if !ok {
 		return "", []ChatMessage{}
 	}
 	sessionID, _ := m["sessionId"].(string)
 	if sessionID == "" {
 		sessionID, _ = m["session_id"].(string)
 	}
 	raw, ok := m["messages"].([]any)
 	if !ok {
 		return sessionID, []ChatMessage{}
 	}
 	messages := make([]ChatMessage, 0, len(raw))
 	for _, item := range raw {
 		if msg, ok := chatMessageFromData(item); ok {
 			messages = append(messages, msg)
 		}
 	}
 	return sessionID, messages
 }
 func chatMessageFromData(data any) (ChatMessage, bool) {
 	m, ok := data.(map[string]any)
 	if !ok {
 		return ChatMessage{}, false
 	}
 	role := stringFromAny(m["role"])
 	content := stringFromAny(m["content"])
 	if role == "" && content == "" {
 		return ChatMessage{}, false
 	}
 	msg := ChatMessage{
 		Role:      role,
 		Content:   content,
 		Timestamp: time.Now(),
 	}
 	if ts, ok := m["timestamp"].(time.Time); ok {
 		msg.Timestamp = ts
 	}
 	return msg, true
 }
 func stringFromAny(v any) string {
 	switch value := v.(type) {
 	case string:
 		return value
 	case interface{ String() string }:
 		return value.String()
 	default:
 		return ""
 	}
 }
 func newSessionID() string {
 	return core.ID()
 }
--- a/pkg/mcp/ide/tools_build.go
+++ b/pkg/mcp/ide/tools_build.go
@ -1,27 +1,20 @@
 // SPDX-License-Identifier: EUPL-1.2
 package ide
 import (
 	"context"
 	"time"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // Build tool input/output types.
 // BuildStatusInput is the input for ide_build_status.
 //
 //	input := BuildStatusInput{BuildID: "build-123"}
 type BuildStatusInput struct {
 	BuildID string `json:"buildId"`
 }
 // BuildInfo represents a single build.
 //
 //	info := BuildInfo{ID: "build-123", Repo: "go-io", Status: "running"}
 type BuildInfo struct {
 	ID        string    `json:"id"`
 	Repo      string    `json:"repo"`
@ -32,102 +25,90 @@ type BuildInfo struct {
 }
 // BuildStatusOutput is the output for ide_build_status.
 //
 //	// out.Build.Status == "running"
 type BuildStatusOutput struct {
 	Build BuildInfo `json:"build"`
 }
 // BuildListInput is the input for ide_build_list.
 //
 //	input := BuildListInput{Repo: "go-io", Limit: 20}
 type BuildListInput struct {
 	Repo  string `json:"repo,omitempty"`
 	Limit int    `json:"limit,omitempty"`
 }
 // BuildListOutput is the output for ide_build_list.
 //
 //	// out.Builds holds the local build snapshot
 type BuildListOutput struct {
 	Builds []BuildInfo `json:"builds"`
 }
 // BuildLogsInput is the input for ide_build_logs.
 //
 //	input := BuildLogsInput{BuildID: "build-123", Tail: 200}
 type BuildLogsInput struct {
 	BuildID string `json:"buildId"`
 	Tail    int    `json:"tail,omitempty"`
 }
 // BuildLogsOutput is the output for ide_build_logs.
 //
 //	// out.Lines contains the captured build log lines
 type BuildLogsOutput struct {
 	BuildID string   `json:"buildId"`
 	Lines   []string `json:"lines"`
 }
-func (s *Subsystem) registerBuildTools(svc *coremcp.Service) {
+func (s *Subsystem) registerBuildTools(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
 		Name:        "ide_build_status",
 		Description: "Get the status of a specific build",
 	}, s.buildStatus)
-	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ide_build_list",
 		Description: "List recent builds, optionally filtered by repository",
 	}, s.buildList)
-	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ide_build_logs",
 		Description: "Retrieve log output for a build",
 	}, s.buildLogs)
 }
-// buildStatus returns a local best-effort build status and refreshes the
+// buildStatus requests build status from the Laravel backend.
-// Laravel backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns "unknown" status. Awaiting Laravel backend.
 func (s *Subsystem) buildStatus(_ context.Context, _ *mcp.CallToolRequest, input BuildStatusInput) (*mcp.CallToolResult, BuildStatusOutput, error) {
-	if s.bridge != nil {
+	if s.bridge == nil {
 		return nil, BuildStatusOutput{}, errBridgeNotAvailable
 	}
 	_ = s.bridge.Send(BridgeMessage{
 		Type: "build_status",
 		Data: map[string]any{"buildId": input.BuildID},
 	})
-	}
+	return nil, BuildStatusOutput{
-
+		Build: BuildInfo{ID: input.BuildID, Status: "unknown"},
-	build := BuildInfo{ID: input.BuildID, Status: "unknown"}
+	}, nil
 	if cached, ok := s.buildSnapshot(input.BuildID); ok {
 		build = cached
 	}
 	return nil, BuildStatusOutput{Build: build}, nil
 }
-// buildList returns the local build list snapshot and refreshes the Laravel
+// buildList requests a list of builds from the Laravel backend.
-// backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns empty list. Awaiting Laravel backend.
 func (s *Subsystem) buildList(_ context.Context, _ *mcp.CallToolRequest, input BuildListInput) (*mcp.CallToolResult, BuildListOutput, error) {
-	if s.bridge != nil {
+	if s.bridge == nil {
 		return nil, BuildListOutput{}, errBridgeNotAvailable
 	}
 	_ = s.bridge.Send(BridgeMessage{
 		Type: "build_list",
 		Data: map[string]any{"repo": input.Repo, "limit": input.Limit},
 	})
-	}
+	return nil, BuildListOutput{Builds: []BuildInfo{}}, nil
 	return nil, BuildListOutput{Builds: s.listBuilds(input.Repo, input.Limit)}, nil
 }
-// buildLogs returns the local build log snapshot and refreshes the Laravel
+// buildLogs requests build log output from the Laravel backend.
-// backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns empty lines. Awaiting Laravel backend.
 func (s *Subsystem) buildLogs(_ context.Context, _ *mcp.CallToolRequest, input BuildLogsInput) (*mcp.CallToolResult, BuildLogsOutput, error) {
-	if s.bridge != nil {
+	if s.bridge == nil {
 		return nil, BuildLogsOutput{}, errBridgeNotAvailable
 	}
 	_ = s.bridge.Send(BridgeMessage{
 		Type: "build_logs",
 		Data: map[string]any{"buildId": input.BuildID, "tail": input.Tail},
 	})
 	}
 	return nil, BuildLogsOutput{
 		BuildID: input.BuildID,
-		Lines:   s.buildLogTail(input.BuildID, input.Tail),
+		Lines:   []string{},
 	}, nil
 }
--- a/pkg/mcp/ide/tools_chat.go
+++ b/pkg/mcp/ide/tools_chat.go
@ -1,29 +1,22 @@
 // SPDX-License-Identifier: EUPL-1.2
 package ide
 import (
 	"context"
 	"time"
-	coremcp "dappco.re/go/mcp/pkg/mcp"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // Chat tool input/output types.
 // ChatSendInput is the input for ide_chat_send.
 //
 //	input := ChatSendInput{SessionID: "sess-42", Message: "hello"}
 type ChatSendInput struct {
 	SessionID string `json:"sessionId"`
 	Message   string `json:"message"`
 }
 // ChatSendOutput is the output for ide_chat_send.
 //
 //	// out.Sent == true, out.SessionID == "sess-42"
 type ChatSendOutput struct {
 	Sent      bool      `json:"sent"`
 	SessionID string    `json:"sessionId"`
@ -31,16 +24,12 @@ type ChatSendOutput struct {
 }
 // ChatHistoryInput is the input for ide_chat_history.
 //
 //	input := ChatHistoryInput{SessionID: "sess-42", Limit: 50}
 type ChatHistoryInput struct {
 	SessionID string `json:"sessionId"`
 	Limit     int    `json:"limit,omitempty"`
 }
 // ChatMessage represents a single message in history.
 //
 //	msg := ChatMessage{Role: "user", Content: "hello"}
 type ChatMessage struct {
 	Role      string    `json:"role"`
 	Content   string    `json:"content"`
@ -48,21 +37,15 @@ type ChatMessage struct {
 }
 // ChatHistoryOutput is the output for ide_chat_history.
 //
 //	// out.Messages contains the stored chat transcript
 type ChatHistoryOutput struct {
 	SessionID string        `json:"sessionId"`
 	Messages  []ChatMessage `json:"messages"`
 }
 // SessionListInput is the input for ide_session_list.
 //
 //	input := SessionListInput{}
 type SessionListInput struct{}
 // Session represents an agent session.
 //
 //	session := Session{ID: "sess-42", Name: "draft", Status: "running"}
 type Session struct {
 	ID        string    `json:"id"`
 	Name      string    `json:"name"`
@ -71,81 +54,67 @@ type Session struct {
 }
 // SessionListOutput is the output for ide_session_list.
 //
 //	// out.Sessions contains every locally tracked session
 type SessionListOutput struct {
 	Sessions []Session `json:"sessions"`
 }
 // SessionCreateInput is the input for ide_session_create.
 //
 //	input := SessionCreateInput{Name: "draft"}
 type SessionCreateInput struct {
 	Name string `json:"name"`
 }
 // SessionCreateOutput is the output for ide_session_create.
 //
 //	// out.Session.ID is assigned by the backend or local store
 type SessionCreateOutput struct {
 	Session Session `json:"session"`
 }
 // PlanStatusInput is the input for ide_plan_status.
 //
 //	input := PlanStatusInput{SessionID: "sess-42"}
 type PlanStatusInput struct {
 	SessionID string `json:"sessionId"`
 }
 // PlanStep is a single step in an agent plan.
 //
 //	step := PlanStep{Name: "prep", Status: "done"}
 type PlanStep struct {
 	Name   string `json:"name"`
 	Status string `json:"status"`
 }
 // PlanStatusOutput is the output for ide_plan_status.
 //
 //	// out.Steps contains the current plan breakdown
 type PlanStatusOutput struct {
 	SessionID string     `json:"sessionId"`
 	Status    string     `json:"status"`
 	Steps     []PlanStep `json:"steps"`
 }
-func (s *Subsystem) registerChatTools(svc *coremcp.Service) {
+func (s *Subsystem) registerChatTools(server *mcp.Server) {
-	server := svc.Server()
+	mcp.AddTool(server, &mcp.Tool{
 	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
 		Name:        "ide_chat_send",
 		Description: "Send a message to an agent chat session",
 	}, s.chatSend)
-	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ide_chat_history",
 		Description: "Retrieve message history for a chat session",
 	}, s.chatHistory)
-	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ide_session_list",
 		Description: "List active agent sessions",
 	}, s.sessionList)
-	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ide_session_create",
 		Description: "Create a new agent session",
 	}, s.sessionCreate)
-	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ide_plan_status",
 		Description: "Get the current plan status for a session",
 	}, s.planStatus)
 }
 // chatSend forwards a chat message to the Laravel backend via bridge.
-// The subsystem also stores the message locally so history lookups can
+// Stub implementation: delegates to bridge, real response arrives via WebSocket subscription.
 // return something useful before the backend answers.
 func (s *Subsystem) chatSend(_ context.Context, _ *mcp.CallToolRequest, input ChatSendInput) (*mcp.CallToolResult, ChatSendOutput, error) {
 	if s.bridge == nil {
 		return nil, ChatSendOutput{}, errBridgeNotAvailable
@ -159,10 +128,6 @@ func (s *Subsystem) chatSend(_ context.Context, _ *mcp.CallToolRequest, input Ch
 	if err != nil {
 		return nil, ChatSendOutput{}, coreerr.E("ide.chatSend", "failed to send message", err)
 	}
 	s.appendChatMessage(input.SessionID, "user", input.Message)
 	s.recordActivity("chat_send", "forwarded chat message for session "+input.SessionID)
 	return nil, ChatSendOutput{
 		Sent:      true,
 		SessionID: input.SessionID,
@ -170,77 +135,67 @@ func (s *Subsystem) chatSend(_ context.Context, _ *mcp.CallToolRequest, input Ch
 	}, nil
 }
-// chatHistory returns the local message history for a session and refreshes
+// chatHistory requests message history from the Laravel backend.
-// the Laravel backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns empty messages. Real data arrives via WebSocket.
 func (s *Subsystem) chatHistory(_ context.Context, _ *mcp.CallToolRequest, input ChatHistoryInput) (*mcp.CallToolResult, ChatHistoryOutput, error) {
-	if s.bridge != nil {
+	if s.bridge == nil {
-		// Request history via bridge when available; the local cache still
+		return nil, ChatHistoryOutput{}, errBridgeNotAvailable
-		// provides an immediate response in headless mode.
+	}
 	// Request history via bridge; for now return placeholder indicating the
 	// request was forwarded. Real data arrives via WebSocket subscription.
 	_ = s.bridge.Send(BridgeMessage{
 		Type:      "chat_history",
 		SessionID: input.SessionID,
 		Data:      map[string]any{"limit": input.Limit},
 	})
 	}
 	return nil, ChatHistoryOutput{
 		SessionID: input.SessionID,
-		Messages:  s.chatMessages(input.SessionID),
+		Messages:  []ChatMessage{},
 	}, nil
 }
-// sessionList returns the local session cache and refreshes the Laravel
+// sessionList requests the session list from the Laravel backend.
-// backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns empty sessions. Awaiting Laravel backend.
 func (s *Subsystem) sessionList(_ context.Context, _ *mcp.CallToolRequest, _ SessionListInput) (*mcp.CallToolResult, SessionListOutput, error) {
-	if s.bridge != nil {
+	if s.bridge == nil {
-		_ = s.bridge.Send(BridgeMessage{Type: "session_list"})
+		return nil, SessionListOutput{}, errBridgeNotAvailable
 	}
-	return nil, SessionListOutput{Sessions: s.listSessions()}, nil
+	_ = s.bridge.Send(BridgeMessage{Type: "session_list"})
 	return nil, SessionListOutput{Sessions: []Session{}}, nil
 }
-// sessionCreate creates a local session record immediately and forwards the
+// sessionCreate requests a new session from the Laravel backend.
-// request to the Laravel backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns placeholder session. Awaiting Laravel backend.
 func (s *Subsystem) sessionCreate(_ context.Context, _ *mcp.CallToolRequest, input SessionCreateInput) (*mcp.CallToolResult, SessionCreateOutput, error) {
-	if s.bridge != nil {
+	if s.bridge == nil {
-		if err := s.bridge.Send(BridgeMessage{
+		return nil, SessionCreateOutput{}, errBridgeNotAvailable
 	}
 	_ = s.bridge.Send(BridgeMessage{
 		Type: "session_create",
 		Data: map[string]any{"name": input.Name},
-		}); err != nil {
+	})
-			return nil, SessionCreateOutput{}, err
+	return nil, SessionCreateOutput{
-		}
+		Session: Session{
 	}
 	session := Session{
 		ID:        newSessionID(),
 			Name:      input.Name,
 			Status:    "creating",
 			CreatedAt: time.Now(),
-	}
+		},
 	s.addSession(session)
 	s.recordActivity("session_create", "created session "+session.ID)
 	return nil, SessionCreateOutput{
 		Session: session,
 	}, nil
 }
-// planStatus returns the local best-effort session status and refreshes the
+// planStatus requests plan status from the Laravel backend.
-// Laravel backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns "unknown" status. Awaiting Laravel backend.
 func (s *Subsystem) planStatus(_ context.Context, _ *mcp.CallToolRequest, input PlanStatusInput) (*mcp.CallToolResult, PlanStatusOutput, error) {
-	if s.bridge != nil {
+	if s.bridge == nil {
 		return nil, PlanStatusOutput{}, errBridgeNotAvailable
 	}
 	_ = s.bridge.Send(BridgeMessage{
 		Type:      "plan_status",
 		SessionID: input.SessionID,
 	})
 	}
 	s.stateMu.Lock()
 	session, ok := s.sessions[input.SessionID]
 	s.stateMu.Unlock()
 	status := "unknown"
 	if ok && session.Status != "" {
 		status = session.Status
 	}
 	return nil, PlanStatusOutput{
 		SessionID: input.SessionID,
-		Status:    status,
+		Status:    "unknown",
 		Steps:     []PlanStep{},
 	}, nil
 }
--- a/pkg/mcp/ide/tools_dashboard.go
+++ b/pkg/mcp/ide/tools_dashboard.go
@ -1,26 +1,18 @@
 // SPDX-License-Identifier: EUPL-1.2
 package ide
 import (
 	"context"
 	"sync"
 	"time"
 	coremcp "dappco.re/go/mcp/pkg/mcp"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // Dashboard tool input/output types.
 // DashboardOverviewInput is the input for ide_dashboard_overview.
 //
 //	input := DashboardOverviewInput{}
 type DashboardOverviewInput struct{}
 // DashboardOverview contains high-level platform stats.
 //
 //	overview := DashboardOverview{Repos: 12, ActiveSessions: 3}
 type DashboardOverview struct {
 	Repos          int  `json:"repos"`
 	Services       int  `json:"services"`
@ -30,22 +22,16 @@ type DashboardOverview struct {
 }
 // DashboardOverviewOutput is the output for ide_dashboard_overview.
 //
 //	// out.Overview.BridgeOnline reports bridge connectivity
 type DashboardOverviewOutput struct {
 	Overview DashboardOverview `json:"overview"`
 }
 // DashboardActivityInput is the input for ide_dashboard_activity.
 //
 //	input := DashboardActivityInput{Limit: 25}
 type DashboardActivityInput struct {
 	Limit int `json:"limit,omitempty"`
 }
 // ActivityEvent represents a single activity feed item.
 //
 //	event := ActivityEvent{Type: "build", Message: "build finished"}
 type ActivityEvent struct {
 	Type      string    `json:"type"`
 	Message   string    `json:"message"`
@ -53,22 +39,16 @@ type ActivityEvent struct {
 }
 // DashboardActivityOutput is the output for ide_dashboard_activity.
 //
 //	// out.Events contains the recent activity feed
 type DashboardActivityOutput struct {
 	Events []ActivityEvent `json:"events"`
 }
 // DashboardMetricsInput is the input for ide_dashboard_metrics.
 //
 //	input := DashboardMetricsInput{Period: "24h"}
 type DashboardMetricsInput struct {
 	Period string `json:"period,omitempty"` // "1h", "24h", "7d"
 }
 // DashboardMetrics contains aggregate metrics.
 //
 //	metrics := DashboardMetrics{BuildsTotal: 42, SuccessRate: 0.95}
 type DashboardMetrics struct {
 	BuildsTotal   int     `json:"buildsTotal"`
 	BuildsSuccess int     `json:"buildsSuccess"`
@ -80,88 +60,32 @@ type DashboardMetrics struct {
 }
 // DashboardMetricsOutput is the output for ide_dashboard_metrics.
 //
 //	// out.Metrics summarises the selected time window
 type DashboardMetricsOutput struct {
 	Period  string           `json:"period"`
 	Metrics DashboardMetrics `json:"metrics"`
 }
-// DashboardStateInput is the input for ide_dashboard_state.
+func (s *Subsystem) registerDashboardTools(server *mcp.Server) {
-//
+	mcp.AddTool(server, &mcp.Tool{
 //	input := DashboardStateInput{}
 type DashboardStateInput struct{}
 // DashboardStateOutput is the output for ide_dashboard_state.
 //
 //	// out.State["theme"] == "dark"
 type DashboardStateOutput struct {
 	State     map[string]any `json:"state"`     // arbitrary key/value map
 	UpdatedAt time.Time      `json:"updatedAt"` // when the state last changed
 }
 // DashboardUpdateInput is the input for ide_dashboard_update.
 //
 //	input := DashboardUpdateInput{
 //	    State:   map[string]any{"theme": "light", "sidebar": true},
 //	    Replace: false,
 //	}
 type DashboardUpdateInput struct {
 	State   map[string]any `json:"state"`             // partial or full state
 	Replace bool           `json:"replace,omitempty"` // true to overwrite, false to merge (default)
 }
 // DashboardUpdateOutput is the output for ide_dashboard_update.
 //
 //	// out.State reflects the merged/replaced state
 type DashboardUpdateOutput struct {
 	State     map[string]any `json:"state"`     // merged state after the update
 	UpdatedAt time.Time      `json:"updatedAt"` // when the state was applied
 }
 // dashboardStateStore holds the mutable dashboard UI state shared between the
 // IDE frontend and MCP callers. Access is guarded by dashboardStateMu.
 var (
 	dashboardStateMu       sync.RWMutex
 	dashboardStateStore    = map[string]any{}
 	dashboardStateUpdated  time.Time
 )
 func (s *Subsystem) registerDashboardTools(svc *coremcp.Service) {
 	server := svc.Server()
 	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
 		Name:        "ide_dashboard_overview",
 		Description: "Get a high-level overview of the platform (repos, services, sessions, builds)",
 	}, s.dashboardOverview)
-	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ide_dashboard_activity",
 		Description: "Get the recent activity feed",
 	}, s.dashboardActivity)
-	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ide_dashboard_metrics",
 		Description: "Get aggregate build and agent metrics for a time period",
 	}, s.dashboardMetrics)
 	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
 		Name:        "ide_dashboard_state",
 		Description: "Get the current dashboard UI state (arbitrary key/value map shared with the IDE).",
 	}, s.dashboardState)
 	coremcp.AddToolRecorded(svc, server, "ide", &mcp.Tool{
 		Name:        "ide_dashboard_update",
 		Description: "Update the dashboard UI state. Merges into existing state by default; set replace=true to overwrite.",
 	}, s.dashboardUpdate)
 }
-// dashboardOverview returns a platform overview with bridge status and
+// dashboardOverview returns a platform overview with bridge status.
-// locally tracked session counts.
+// Stub implementation: only BridgeOnline is live; other fields return zero values. Awaiting Laravel backend.
 func (s *Subsystem) dashboardOverview(_ context.Context, _ *mcp.CallToolRequest, _ DashboardOverviewInput) (*mcp.CallToolResult, DashboardOverviewOutput, error) {
 	connected := s.bridge != nil && s.bridge.Connected()
 	activeSessions := len(s.listSessions())
 	builds := s.listBuilds("", 0)
 	repos := s.buildRepoCount()
 	if s.bridge != nil {
 		_ = s.bridge.Send(BridgeMessage{Type: "dashboard_overview"})
@ -169,172 +93,40 @@ func (s *Subsystem) dashboardOverview(_ context.Context, _ *mcp.CallToolRequest,
 	return nil, DashboardOverviewOutput{
 		Overview: DashboardOverview{
 			Repos:          repos,
 			Services:       len(builds),
 			ActiveSessions: activeSessions,
 			RecentBuilds:   len(builds),
 			BridgeOnline: connected,
 		},
 	}, nil
 }
-// dashboardActivity returns the local activity feed and refreshes the Laravel
+// dashboardActivity requests the activity feed from the Laravel backend.
-// backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns empty events. Awaiting Laravel backend.
 func (s *Subsystem) dashboardActivity(_ context.Context, _ *mcp.CallToolRequest, input DashboardActivityInput) (*mcp.CallToolResult, DashboardActivityOutput, error) {
-	if s.bridge != nil {
+	if s.bridge == nil {
 		return nil, DashboardActivityOutput{}, errBridgeNotAvailable
 	}
 	_ = s.bridge.Send(BridgeMessage{
 		Type: "dashboard_activity",
 		Data: map[string]any{"limit": input.Limit},
 	})
-	}
+	return nil, DashboardActivityOutput{Events: []ActivityEvent{}}, nil
 	return nil, DashboardActivityOutput{Events: s.activityFeed(input.Limit)}, nil
 }
-// dashboardMetrics returns local session and message counts and refreshes the
+// dashboardMetrics requests aggregate metrics from the Laravel backend.
-// Laravel backend when the bridge is available.
+// Stub implementation: sends request via bridge, returns zero metrics. Awaiting Laravel backend.
 func (s *Subsystem) dashboardMetrics(_ context.Context, _ *mcp.CallToolRequest, input DashboardMetricsInput) (*mcp.CallToolResult, DashboardMetricsOutput, error) {
 	if s.bridge == nil {
 		return nil, DashboardMetricsOutput{}, errBridgeNotAvailable
 	}
 	period := input.Period
 	if period == "" {
 		period = "24h"
 	}
 	if s.bridge != nil {
 	_ = s.bridge.Send(BridgeMessage{
 		Type: "dashboard_metrics",
 		Data: map[string]any{"period": period},
 	})
 	}
 	s.stateMu.Lock()
 	sessions := len(s.sessions)
 	messages := 0
 	builds := make([]BuildInfo, 0, len(s.buildOrder))
 	for _, id := range s.buildOrder {
 		if build, ok := s.builds[id]; ok {
 			builds = append(builds, build)
 		}
 	}
 	for _, history := range s.chats {
 		messages += len(history)
 	}
 	s.stateMu.Unlock()
 	total := len(builds)
 	success := 0
 	failed := 0
 	var durationTotal time.Duration
 	var durationCount int
 	for _, build := range builds {
 		switch build.Status {
 		case "success", "succeeded", "completed", "passed":
 			success++
 		case "failed", "error":
 			failed++
 		}
 		if build.Duration == "" {
 			continue
 		}
 		if d, err := time.ParseDuration(build.Duration); err == nil {
 			durationTotal += d
 			durationCount++
 		}
 	}
 	avgBuildTime := ""
 	if durationCount > 0 {
 		avgBuildTime = (durationTotal / time.Duration(durationCount)).String()
 	}
 	successRate := 0.0
 	if total > 0 {
 		successRate = float64(success) / float64(total)
 	}
 	return nil, DashboardMetricsOutput{
 		Period:  period,
-		Metrics: DashboardMetrics{
+		Metrics: DashboardMetrics{},
 			BuildsTotal:   total,
 			BuildsSuccess: success,
 			BuildsFailed:  failed,
 			AvgBuildTime:  avgBuildTime,
 			AgentSessions: sessions,
 			MessagesTotal: messages,
 			SuccessRate:   successRate,
 		},
 	}, nil
 }
 // dashboardState returns the current dashboard UI state as a snapshot.
 //
 //	out := s.dashboardState(ctx, nil, DashboardStateInput{})
 func (s *Subsystem) dashboardState(_ context.Context, _ *mcp.CallToolRequest, _ DashboardStateInput) (*mcp.CallToolResult, DashboardStateOutput, error) {
 	dashboardStateMu.RLock()
 	defer dashboardStateMu.RUnlock()
 	snapshot := make(map[string]any, len(dashboardStateStore))
 	for k, v := range dashboardStateStore {
 		snapshot[k] = v
 	}
 	return nil, DashboardStateOutput{
 		State:     snapshot,
 		UpdatedAt: dashboardStateUpdated,
 	}, nil
 }
 // dashboardUpdate merges or replaces the dashboard UI state and emits an
 // activity event so the IDE can react to the change.
 //
 //	out := s.dashboardUpdate(ctx, nil, DashboardUpdateInput{State: map[string]any{"theme": "dark"}})
 func (s *Subsystem) dashboardUpdate(ctx context.Context, _ *mcp.CallToolRequest, input DashboardUpdateInput) (*mcp.CallToolResult, DashboardUpdateOutput, error) {
 	now := time.Now()
 	dashboardStateMu.Lock()
 	if input.Replace || dashboardStateStore == nil {
 		dashboardStateStore = make(map[string]any, len(input.State))
 	}
 	for k, v := range input.State {
 		dashboardStateStore[k] = v
 	}
 	dashboardStateUpdated = now
 	snapshot := make(map[string]any, len(dashboardStateStore))
 	for k, v := range dashboardStateStore {
 		snapshot[k] = v
 	}
 	dashboardStateMu.Unlock()
 	// Record the change on the activity feed so ide_dashboard_activity
 	// reflects state transitions alongside build/session events.
 	s.recordActivity("dashboard_state", "dashboard state updated")
 	// Push the update over the Laravel bridge when available so web clients
 	// stay in sync with desktop tooling.
 	if s.bridge != nil {
 		_ = s.bridge.Send(BridgeMessage{
 			Type: "dashboard_update",
 			Data: snapshot,
 		})
 	}
 	// Surface the change on the shared MCP notifier so connected sessions
 	// receive a JSON-RPC notification alongside the tool response.
 	if s.notifier != nil {
 		s.notifier.ChannelSend(ctx, "dashboard.state.updated", map[string]any{
 			"state":     snapshot,
 			"updatedAt": now,
 		})
 	}
 	return nil, DashboardUpdateOutput{
 		State:     snapshot,
 		UpdatedAt: now,
 	}, nil
 }
 // resetDashboardState clears the shared dashboard state. Intended for tests.
 func resetDashboardState() {
 	dashboardStateMu.Lock()
 	defer dashboardStateMu.Unlock()
 	dashboardStateStore = map[string]any{}
 	dashboardStateUpdated = time.Time{}
 }
--- a/pkg/mcp/ide/tools_test.go
+++ b/pkg/mcp/ide/tools_test.go
@ -8,25 +8,14 @@ import (
 	"testing"
 	"time"
-	coremcp "dappco.re/go/mcp/pkg/mcp"
+	"forge.lthn.ai/core/go-ws"
 	"dappco.re/go/core/ws"
 )
 // --- Helpers ---
 // newNilBridgeSubsystem returns a Subsystem with no hub/bridge (headless mode).
 func newNilBridgeSubsystem() *Subsystem {
-	return New(nil, Config{})
+	return New(nil)
 }
 type recordingNotifier struct {
 	channel string
 	data    any
 }
 func (r *recordingNotifier) ChannelSend(_ context.Context, channel string, data any) {
 	r.channel = channel
 	r.data = data
 }
 // newConnectedSubsystem returns a Subsystem with a connected bridge and a
@ -53,10 +42,10 @@ func newConnectedSubsystem(t *testing.T) (*Subsystem, context.CancelFunc, *httpt
 	ctx, cancel := context.WithCancel(context.Background())
 	go hub.Run(ctx)
-	sub := New(hub, Config{
+	sub := New(hub,
-		LaravelWSURL:      wsURL(ts),
+		WithLaravelURL(wsURL(ts)),
-		ReconnectInterval: 50 * time.Millisecond,
+		WithReconnectInterval(50*time.Millisecond),
-	})
+	)
 	sub.StartBridge(ctx)
 	waitConnected(t, sub.Bridge(), 2*time.Second)
@ -101,90 +90,56 @@ func TestChatSend_Good_Connected(t *testing.T) {
 	}
 }
-// TestChatHistory_Good_NilBridge verifies chatHistory returns local cache without a bridge.
+// TestChatHistory_Bad_NilBridge verifies chatHistory returns error without a bridge.
-func TestChatHistory_Good_NilBridge(t *testing.T) {
+func TestChatHistory_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	_, out, err := sub.chatHistory(context.Background(), nil, ChatHistoryInput{
+	_, _, err := sub.chatHistory(context.Background(), nil, ChatHistoryInput{
 		SessionID: "s1",
 	})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("chatHistory failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.SessionID != "s1" {
 		t.Errorf("expected sessionId 's1', got %q", out.SessionID)
 	}
 	if out.Messages == nil {
 		t.Error("expected non-nil messages slice")
 	}
 }
-// TestChatHistory_Good_Connected verifies chatHistory succeeds and returns stored messages.
+// TestChatHistory_Good_Connected verifies chatHistory succeeds and returns empty messages.
 func TestChatHistory_Good_Connected(t *testing.T) {
 	sub, cancel, ts := newConnectedSubsystem(t)
 	defer cancel()
 	defer ts.Close()
 	_, _, err := sub.sessionCreate(context.Background(), nil, SessionCreateInput{
 		Name: "history-test",
 	})
 	if err != nil {
 		t.Fatalf("sessionCreate failed: %v", err)
 	}
 	_, _, err = sub.chatSend(context.Background(), nil, ChatSendInput{
 		SessionID: sub.listSessions()[0].ID,
 		Message:   "hello history",
 	})
 	if err != nil {
 		t.Fatalf("chatSend failed: %v", err)
 	}
 	_, out, err := sub.chatHistory(context.Background(), nil, ChatHistoryInput{
-		SessionID: sub.listSessions()[0].ID,
+		SessionID: "sess-1",
 		Limit:     50,
 	})
 	if err != nil {
 		t.Fatalf("chatHistory failed: %v", err)
 	}
-	if out.SessionID != sub.listSessions()[0].ID {
+	if out.SessionID != "sess-1" {
-		t.Errorf("expected sessionId %q, got %q", sub.listSessions()[0].ID, out.SessionID)
+		t.Errorf("expected sessionId 'sess-1', got %q", out.SessionID)
 	}
 	if out.Messages == nil {
 		t.Error("expected non-nil messages slice")
 	}
-	if len(out.Messages) != 1 {
+	if len(out.Messages) != 0 {
-		t.Errorf("expected 1 stored message, got %d", len(out.Messages))
+		t.Errorf("expected 0 messages (stub), got %d", len(out.Messages))
 	}
 	if out.Messages[0].Content != "hello history" {
 		t.Errorf("expected stored message content %q, got %q", "hello history", out.Messages[0].Content)
 	}
 }
-// TestSessionList_Good_NilBridge verifies sessionList returns local sessions without a bridge.
+// TestSessionList_Bad_NilBridge verifies sessionList returns error without a bridge.
-func TestSessionList_Good_NilBridge(t *testing.T) {
+func TestSessionList_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	_, out, err := sub.sessionList(context.Background(), nil, SessionListInput{})
+	_, _, err := sub.sessionList(context.Background(), nil, SessionListInput{})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("sessionList failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.Sessions == nil {
 		t.Error("expected non-nil sessions slice")
 	}
 }
-// TestSessionList_Good_Connected verifies sessionList returns stored sessions.
+// TestSessionList_Good_Connected verifies sessionList returns empty sessions.
 func TestSessionList_Good_Connected(t *testing.T) {
 	sub, cancel, ts := newConnectedSubsystem(t)
 	defer cancel()
 	defer ts.Close()
 	_, _, err := sub.sessionCreate(context.Background(), nil, SessionCreateInput{
 		Name: "session-list-test",
 	})
 	if err != nil {
 		t.Fatalf("sessionCreate failed: %v", err)
 	}
 	_, out, err := sub.sessionList(context.Background(), nil, SessionListInput{})
 	if err != nil {
 		t.Fatalf("sessionList failed: %v", err)
@ -192,32 +147,23 @@ func TestSessionList_Good_Connected(t *testing.T) {
 	if out.Sessions == nil {
 		t.Error("expected non-nil sessions slice")
 	}
-	if len(out.Sessions) != 1 {
+	if len(out.Sessions) != 0 {
-		t.Errorf("expected 1 stored session, got %d", len(out.Sessions))
+		t.Errorf("expected 0 sessions (stub), got %d", len(out.Sessions))
 	}
 	if out.Sessions[0].ID == "" {
 		t.Error("expected stored session to have an ID")
 	}
 }
-// TestSessionCreate_Good_NilBridge verifies sessionCreate stores a local session without a bridge.
+// TestSessionCreate_Bad_NilBridge verifies sessionCreate returns error without a bridge.
-func TestSessionCreate_Good_NilBridge(t *testing.T) {
+func TestSessionCreate_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	_, out, err := sub.sessionCreate(context.Background(), nil, SessionCreateInput{
+	_, _, err := sub.sessionCreate(context.Background(), nil, SessionCreateInput{
 		Name: "test",
 	})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("sessionCreate failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.Session.Name != "test" {
 		t.Errorf("expected session name 'test', got %q", out.Session.Name)
 	}
 	if out.Session.ID == "" {
 		t.Error("expected non-empty session ID")
 	}
 }
-// TestSessionCreate_Good_Connected verifies sessionCreate returns a stored session.
+// TestSessionCreate_Good_Connected verifies sessionCreate returns a session stub.
 func TestSessionCreate_Good_Connected(t *testing.T) {
 	sub, cancel, ts := newConnectedSubsystem(t)
 	defer cancel()
@ -238,52 +184,36 @@ func TestSessionCreate_Good_Connected(t *testing.T) {
 	if out.Session.CreatedAt.IsZero() {
 		t.Error("expected non-zero CreatedAt")
 	}
 	if out.Session.ID == "" {
 		t.Error("expected non-empty session ID")
 	}
 }
-// TestPlanStatus_Good_NilBridge verifies planStatus returns local status without a bridge.
+// TestPlanStatus_Bad_NilBridge verifies planStatus returns error without a bridge.
-func TestPlanStatus_Good_NilBridge(t *testing.T) {
+func TestPlanStatus_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	_, out, err := sub.planStatus(context.Background(), nil, PlanStatusInput{
+	_, _, err := sub.planStatus(context.Background(), nil, PlanStatusInput{
 		SessionID: "s1",
 	})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("planStatus failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.SessionID != "s1" {
 		t.Errorf("expected sessionId 's1', got %q", out.SessionID)
 	}
 	if out.Status != "unknown" {
 		t.Errorf("expected status 'unknown', got %q", out.Status)
 	}
 }
-// TestPlanStatus_Good_Connected verifies planStatus returns a status for a known session.
+// TestPlanStatus_Good_Connected verifies planStatus returns a stub status.
 func TestPlanStatus_Good_Connected(t *testing.T) {
 	sub, cancel, ts := newConnectedSubsystem(t)
 	defer cancel()
 	defer ts.Close()
 	_, createOut, err := sub.sessionCreate(context.Background(), nil, SessionCreateInput{
 		Name: "plan-status-test",
 	})
 	if err != nil {
 		t.Fatalf("sessionCreate failed: %v", err)
 	}
 	_, out, err := sub.planStatus(context.Background(), nil, PlanStatusInput{
-		SessionID: createOut.Session.ID,
+		SessionID: "sess-7",
 	})
 	if err != nil {
 		t.Fatalf("planStatus failed: %v", err)
 	}
-	if out.SessionID != createOut.Session.ID {
+	if out.SessionID != "sess-7" {
-		t.Errorf("expected sessionId %q, got %q", createOut.Session.ID, out.SessionID)
+		t.Errorf("expected sessionId 'sess-7', got %q", out.SessionID)
 	}
-	if out.Status != "creating" {
+	if out.Status != "unknown" {
-		t.Errorf("expected status 'creating', got %q", out.Status)
+		t.Errorf("expected status 'unknown', got %q", out.Status)
 	}
 	if out.Steps == nil {
 		t.Error("expected non-nil steps slice")
@ -292,20 +222,14 @@ func TestPlanStatus_Good_Connected(t *testing.T) {
 // --- 4.3: Build tool tests ---
-// TestBuildStatus_Good_NilBridge verifies buildStatus returns a local stub without a bridge.
+// TestBuildStatus_Bad_NilBridge verifies buildStatus returns error without a bridge.
-func TestBuildStatus_Good_NilBridge(t *testing.T) {
+func TestBuildStatus_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	_, out, err := sub.buildStatus(context.Background(), nil, BuildStatusInput{
+	_, _, err := sub.buildStatus(context.Background(), nil, BuildStatusInput{
 		BuildID: "b1",
 	})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("buildStatus failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.Build.ID != "b1" {
 		t.Errorf("expected build ID 'b1', got %q", out.Build.ID)
 	}
 	if out.Build.Status != "unknown" {
 		t.Errorf("expected status 'unknown', got %q", out.Build.Status)
 	}
 }
@ -329,74 +253,15 @@ func TestBuildStatus_Good_Connected(t *testing.T) {
 	}
 }
-// TestBuildStatus_Good_EmitsLifecycle verifies bridge updates broadcast build lifecycle events.
+// TestBuildList_Bad_NilBridge verifies buildList returns error without a bridge.
-func TestBuildStatus_Good_EmitsLifecycle(t *testing.T) {
+func TestBuildList_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	notifier := &recordingNotifier{}
+	_, _, err := sub.buildList(context.Background(), nil, BuildListInput{
 	sub.SetNotifier(notifier)
 	sub.handleBridgeMessage(BridgeMessage{
 		Type: "build_status",
 		Data: map[string]any{
 			"buildId": "build-1",
 			"repo":    "core-php",
 			"branch":  "main",
 			"status":  "success",
 		},
 	})
 	if notifier.channel != coremcp.ChannelBuildComplete {
 		t.Fatalf("expected %s channel, got %q", coremcp.ChannelBuildComplete, notifier.channel)
 	}
 	payload, ok := notifier.data.(map[string]any)
 	if !ok {
 		t.Fatalf("expected payload map, got %T", notifier.data)
 	}
 	if payload["id"] != "build-1" {
 		t.Fatalf("expected build id build-1, got %v", payload["id"])
 	}
 }
 // TestBuildStatus_Good_EmitsStartLifecycle verifies running builds broadcast a start event.
 func TestBuildStatus_Good_EmitsStartLifecycle(t *testing.T) {
 	sub := newNilBridgeSubsystem()
 	notifier := &recordingNotifier{}
 	sub.SetNotifier(notifier)
 	sub.handleBridgeMessage(BridgeMessage{
 		Type: "build_status",
 		Data: map[string]any{
 			"buildId": "build-2",
 			"repo":    "core-php",
 			"branch":  "main",
 			"status":  "running",
 		},
 	})
 	if notifier.channel != coremcp.ChannelBuildStart {
 		t.Fatalf("expected %s channel, got %q", coremcp.ChannelBuildStart, notifier.channel)
 	}
 	payload, ok := notifier.data.(map[string]any)
 	if !ok {
 		t.Fatalf("expected payload map, got %T", notifier.data)
 	}
 	if payload["id"] != "build-2" {
 		t.Fatalf("expected build id build-2, got %v", payload["id"])
 	}
 }
 // TestBuildList_Good_NilBridge verifies buildList returns an empty list without a bridge.
 func TestBuildList_Good_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
 	_, out, err := sub.buildList(context.Background(), nil, BuildListInput{
 		Repo:  "core-php",
 		Limit: 10,
 	})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("buildList failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.Builds == nil {
 		t.Error("expected non-nil builds slice")
 	}
 }
@ -421,21 +286,15 @@ func TestBuildList_Good_Connected(t *testing.T) {
 	}
 }
-// TestBuildLogs_Good_NilBridge verifies buildLogs returns empty lines without a bridge.
+// TestBuildLogs_Bad_NilBridge verifies buildLogs returns error without a bridge.
-func TestBuildLogs_Good_NilBridge(t *testing.T) {
+func TestBuildLogs_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	_, out, err := sub.buildLogs(context.Background(), nil, BuildLogsInput{
+	_, _, err := sub.buildLogs(context.Background(), nil, BuildLogsInput{
 		BuildID: "b1",
 		Tail:    100,
 	})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("buildLogs failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.BuildID != "b1" {
 		t.Errorf("expected buildId 'b1', got %q", out.BuildID)
 	}
 	if out.Lines == nil {
 		t.Error("expected non-nil lines slice")
 	}
 }
@ -478,19 +337,12 @@ func TestDashboardOverview_Good_NilBridge(t *testing.T) {
 	}
 }
-// TestDashboardOverview_Good_Connected verifies dashboardOverview reports bridge online and local sessions.
+// TestDashboardOverview_Good_Connected verifies dashboardOverview reports bridge online.
 func TestDashboardOverview_Good_Connected(t *testing.T) {
 	sub, cancel, ts := newConnectedSubsystem(t)
 	defer cancel()
 	defer ts.Close()
 	_, _, err := sub.sessionCreate(context.Background(), nil, SessionCreateInput{
 		Name: "dashboard-test",
 	})
 	if err != nil {
 		t.Fatalf("sessionCreate failed: %v", err)
 	}
 	_, out, err := sub.dashboardOverview(context.Background(), nil, DashboardOverviewInput{})
 	if err != nil {
 		t.Fatalf("dashboardOverview failed: %v", err)
@ -498,38 +350,25 @@ func TestDashboardOverview_Good_Connected(t *testing.T) {
 	if !out.Overview.BridgeOnline {
 		t.Error("expected BridgeOnline=true when bridge is connected")
 	}
 	if out.Overview.ActiveSessions != 1 {
 		t.Errorf("expected 1 active session, got %d", out.Overview.ActiveSessions)
 	}
 }
-// TestDashboardActivity_Good_NilBridge verifies dashboardActivity returns local activity without bridge.
+// TestDashboardActivity_Bad_NilBridge verifies dashboardActivity returns error without bridge.
-func TestDashboardActivity_Good_NilBridge(t *testing.T) {
+func TestDashboardActivity_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	_, out, err := sub.dashboardActivity(context.Background(), nil, DashboardActivityInput{
+	_, _, err := sub.dashboardActivity(context.Background(), nil, DashboardActivityInput{
 		Limit: 10,
 	})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("dashboardActivity failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.Events == nil {
 		t.Error("expected non-nil events slice")
 	}
 }
-// TestDashboardActivity_Good_Connected verifies dashboardActivity returns stored events.
+// TestDashboardActivity_Good_Connected verifies dashboardActivity returns empty events.
 func TestDashboardActivity_Good_Connected(t *testing.T) {
 	sub, cancel, ts := newConnectedSubsystem(t)
 	defer cancel()
 	defer ts.Close()
 	_, _, err := sub.sessionCreate(context.Background(), nil, SessionCreateInput{
 		Name: "activity-test",
 	})
 	if err != nil {
 		t.Fatalf("sessionCreate failed: %v", err)
 	}
 	_, out, err := sub.dashboardActivity(context.Background(), nil, DashboardActivityInput{
 		Limit: 20,
 	})
@ -539,25 +378,19 @@ func TestDashboardActivity_Good_Connected(t *testing.T) {
 	if out.Events == nil {
 		t.Error("expected non-nil events slice")
 	}
-	if len(out.Events) != 1 {
+	if len(out.Events) != 0 {
-		t.Errorf("expected 1 stored event, got %d", len(out.Events))
+		t.Errorf("expected 0 events (stub), got %d", len(out.Events))
 	}
 	if len(out.Events) > 0 && out.Events[0].Type != "session_create" {
 		t.Errorf("expected first event type 'session_create', got %q", out.Events[0].Type)
 	}
 }
-// TestDashboardMetrics_Good_NilBridge verifies dashboardMetrics returns local metrics without bridge.
+// TestDashboardMetrics_Bad_NilBridge verifies dashboardMetrics returns error without bridge.
-func TestDashboardMetrics_Good_NilBridge(t *testing.T) {
+func TestDashboardMetrics_Bad_NilBridge(t *testing.T) {
 	sub := newNilBridgeSubsystem()
-	_, out, err := sub.dashboardMetrics(context.Background(), nil, DashboardMetricsInput{
+	_, _, err := sub.dashboardMetrics(context.Background(), nil, DashboardMetricsInput{
 		Period: "1h",
 	})
-	if err != nil {
+	if err == nil {
-		t.Fatalf("dashboardMetrics failed: %v", err)
+		t.Error("expected error when bridge is nil")
 	}
 	if out.Period != "1h" {
 		t.Errorf("expected period '1h', got %q", out.Period)
 	}
 }
@ -857,7 +690,7 @@ func TestSubsystem_Good_RegisterTools(t *testing.T) {
 	// RegisterTools requires a real mcp.Server which is complex to construct
 	// in isolation. This test verifies the Subsystem can be created and
 	// the Bridge/Shutdown path works end-to-end.
-	sub := New(nil, Config{})
+	sub := New(nil)
 	if sub.Bridge() != nil {
 		t.Error("expected nil bridge with nil hub")
 	}
@ -868,20 +701,20 @@ func TestSubsystem_Good_RegisterTools(t *testing.T) {
 // TestSubsystem_Good_StartBridgeNilHub verifies StartBridge is a no-op with nil hub.
 func TestSubsystem_Good_StartBridgeNilHub(t *testing.T) {
-	sub := New(nil, Config{})
+	sub := New(nil)
 	// Should not panic
 	sub.StartBridge(context.Background())
 }
-// TestSubsystem_Good_WithConfig verifies the Config DTO applies correctly.
+// TestSubsystem_Good_WithOptions verifies all config options apply correctly.
-func TestSubsystem_Good_WithConfig(t *testing.T) {
+func TestSubsystem_Good_WithOptions(t *testing.T) {
 	hub := ws.NewHub()
-	sub := New(hub, Config{
+	sub := New(hub,
-		LaravelWSURL:      "ws://custom:1234/ws",
+		WithLaravelURL("ws://custom:1234/ws"),
-		WorkspaceRoot:     "/tmp/test",
+		WithWorkspaceRoot("/tmp/test"),
-		ReconnectInterval: 5 * time.Second,
+		WithReconnectInterval(5*time.Second),
-		Token:             "secret-123",
+		WithToken("secret-123"),
-	})
+	)
 	if sub.cfg.LaravelWSURL != "ws://custom:1234/ws" {
 		t.Errorf("expected custom URL, got %q", sub.cfg.LaravelWSURL)
@ -928,10 +761,7 @@ func TestChatSend_Good_BridgeMessageType(t *testing.T) {
 	ctx := t.Context()
 	go hub.Run(ctx)
-	sub := New(hub, Config{
+	sub := New(hub, WithLaravelURL(wsURL(ts)), WithReconnectInterval(50*time.Millisecond))
 		LaravelWSURL:      wsURL(ts),
 		ReconnectInterval: 50 * time.Millisecond,
 	})
 	sub.StartBridge(ctx)
 	waitConnected(t, sub.Bridge(), 2*time.Second)
@ -949,76 +779,3 @@ func TestChatSend_Good_BridgeMessageType(t *testing.T) {
 		t.Fatal("timed out waiting for bridge message")
 	}
 }
 // TestToolsDashboard_DashboardState_Good returns an empty state when the
 // store has not been touched.
 func TestToolsDashboard_DashboardState_Good(t *testing.T) {
 	t.Cleanup(resetDashboardState)
 	sub := newNilBridgeSubsystem()
 	_, out, err := sub.dashboardState(context.Background(), nil, DashboardStateInput{})
 	if err != nil {
 		t.Fatalf("dashboardState failed: %v", err)
 	}
 	if len(out.State) != 0 {
 		t.Fatalf("expected empty state, got %v", out.State)
 	}
 }
 // TestToolsDashboard_DashboardUpdate_Good merges the supplied state into the
 // shared store and reflects it back on a subsequent dashboardState call.
 func TestToolsDashboard_DashboardUpdate_Good(t *testing.T) {
 	t.Cleanup(resetDashboardState)
 	sub := newNilBridgeSubsystem()
 	_, updateOut, err := sub.dashboardUpdate(context.Background(), nil, DashboardUpdateInput{
 		State: map[string]any{"theme": "dark"},
 	})
 	if err != nil {
 		t.Fatalf("dashboardUpdate failed: %v", err)
 	}
 	if updateOut.State["theme"] != "dark" {
 		t.Fatalf("expected theme 'dark', got %v", updateOut.State["theme"])
 	}
 	_, readOut, err := sub.dashboardState(context.Background(), nil, DashboardStateInput{})
 	if err != nil {
 		t.Fatalf("dashboardState failed: %v", err)
 	}
 	if readOut.State["theme"] != "dark" {
 		t.Fatalf("expected persisted theme 'dark', got %v", readOut.State["theme"])
 	}
 	if readOut.UpdatedAt.IsZero() {
 		t.Fatal("expected non-zero UpdatedAt after update")
 	}
 }
 // TestToolsDashboard_DashboardUpdate_Ugly replaces (not merges) prior state
 // when Replace=true.
 func TestToolsDashboard_DashboardUpdate_Ugly(t *testing.T) {
 	t.Cleanup(resetDashboardState)
 	sub := newNilBridgeSubsystem()
 	_, _, err := sub.dashboardUpdate(context.Background(), nil, DashboardUpdateInput{
 		State: map[string]any{"theme": "dark", "sidebar": true},
 	})
 	if err != nil {
 		t.Fatalf("seed dashboardUpdate failed: %v", err)
 	}
 	_, out, err := sub.dashboardUpdate(context.Background(), nil, DashboardUpdateInput{
 		State:   map[string]any{"theme": "light"},
 		Replace: true,
 	})
 	if err != nil {
 		t.Fatalf("replace dashboardUpdate failed: %v", err)
 	}
 	if _, ok := out.State["sidebar"]; ok {
 		t.Fatal("expected sidebar to be removed after replace")
 	}
 	if out.State["theme"] != "light" {
 		t.Fatalf("expected theme 'light', got %v", out.State["theme"])
 	}
 }
--- a/pkg/mcp/iter_test.go
+++ b/pkg/mcp/iter_test.go
@ -29,9 +29,9 @@ func TestService_Iterators(t *testing.T) {
 	}
 }
-func TestRegistry_SplitTag(t *testing.T) {
+func TestRegistry_SplitTagSeq(t *testing.T) {
 	tag := "name,omitempty,json"
-	parts := splitTag(tag)
+	parts := slices.Collect(splitTagSeq(tag))
 	expected := []string{"name", "omitempty", "json"}
 	if !slices.Equal(parts, expected) {
--- a/pkg/mcp/mcp.go
+++ b/pkg/mcp/mcp.go
@ -5,44 +5,39 @@
 package mcp
 import (
 	"cmp"
 	"context"
 	"iter"
 	"net/http"
 	"os"
 	"path/filepath"
 	"slices"
 	"strings"
 	"sync"
-	core "dappco.re/go/core"
+	"forge.lthn.ai/core/go-io"
-	"dappco.re/go/core/io"
+	"forge.lthn.ai/core/go-log"
-	"dappco.re/go/core/log"
+	"forge.lthn.ai/core/go-process"
-	"dappco.re/go/core/process"
+	"forge.lthn.ai/core/go-ws"
 	"dappco.re/go/core/ws"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
-// Service provides a lightweight MCP server with file operations and
+// Service provides a lightweight MCP server with file operations only.
 // optional subsystems.
 // For full GUI features, use the core-gui package.
 //
 //	svc, err := mcp.New(mcp.Options{WorkspaceRoot: "/home/user/project"})
 //	defer svc.Shutdown(ctx)
 type Service struct {
 	*core.ServiceRuntime[struct{}] // Core access via s.Core()
 	server         *mcp.Server
-	workspaceRoot  string           // Root directory for file operations (empty = cwd unless Unrestricted)
+	workspaceRoot  string           // Root directory for file operations (empty = unrestricted)
 	medium         io.Medium        // Filesystem medium for sandboxed operations
-	subsystems     []Subsystem      // Additional subsystems registered via Options.Subsystems
+	subsystems     []Subsystem      // Additional subsystems registered via WithSubsystem
 	logger         *log.Logger      // Logger for tool execution auditing
 	processService *process.Service // Process management service (optional)
 	wsHub          *ws.Hub          // WebSocket hub for real-time streaming (optional)
 	wsServer       *http.Server     // WebSocket HTTP server (optional)
 	wsAddr         string           // WebSocket server address
 	wsMu           sync.Mutex       // Protects wsServer and wsAddr
-	processMu      sync.Mutex       // Protects processMeta
+	stdioMode      bool             // True when running via stdio transport
 	processMeta    map[string]processRuntime
 	tools          []ToolRecord     // Parallel tool registry for REST bridge
 }
@ -61,7 +56,7 @@ type Options struct {
 	Subsystems     []Subsystem      // Additional tool groups registered at startup
 }
-// New creates a new MCP service with file operations and optional subsystems.
+// New creates a new MCP service with file operations.
 //
 //	svc, err := mcp.New(mcp.Options{WorkspaceRoot: "."})
 func New(opts Options) (*Service, error) {
@ -72,8 +67,7 @@ func New(opts Options) (*Service, error) {
 	server := mcp.NewServer(impl, &mcp.ServerOptions{
 		Capabilities: &mcp.ServerCapabilities{
-			Resources:    &mcp.ResourceCapabilities{ListChanged: false},
+			Tools:        &mcp.ToolCapabilities{ListChanged: true},
 			Tools:        &mcp.ToolCapabilities{ListChanged: false},
 			Logging:      &mcp.LoggingCapabilities{},
 			Experimental: channelCapability(),
 		},
@ -83,8 +77,8 @@ func New(opts Options) (*Service, error) {
 		server:         server,
 		processService: opts.ProcessService,
 		wsHub:          opts.WSHub,
 		subsystems:     opts.Subsystems,
 		logger:         log.Default(),
 		processMeta:    make(map[string]processRuntime),
 	}
 	// Workspace root: unrestricted, explicit root, or default to cwd
@ -96,41 +90,39 @@ func New(opts Options) (*Service, error) {
 		if root == "" {
 			cwd, err := os.Getwd()
 			if err != nil {
-				return nil, core.E("mcp.New", "failed to get working directory", err)
+				return nil, log.E("mcp.New", "failed to get working directory", err)
 			}
 			root = cwd
 		}
 		abs, err := filepath.Abs(root)
 		if err != nil {
-			return nil, core.E("mcp.New", "failed to resolve workspace root", err)
+			return nil, log.E("mcp.New", "invalid workspace root", err)
 		}
 		s.workspaceRoot = abs
 		m, merr := io.NewSandboxed(abs)
 		if merr != nil {
-			return nil, core.E("mcp.New", "failed to create workspace medium", merr)
+			return nil, log.E("mcp.New", "failed to create workspace medium", merr)
 		}
 		s.workspaceRoot = abs
 		s.medium = m
 	}
 	s.registerTools(s.server)
-	s.subsystems = make([]Subsystem, 0, len(opts.Subsystems))
+	for _, sub := range s.subsystems {
-	for _, sub := range opts.Subsystems {
+		sub.RegisterTools(s.server)
 		if sub == nil {
 			continue
 		}
 		s.subsystems = append(s.subsystems, sub)
 		if sn, ok := sub.(SubsystemWithNotifier); ok {
 			sn.SetNotifier(s)
 		}
-		// Wire channel callback for subsystems that use func-based notification.
+		// Wire channel callback for subsystems that use func-based notification
-		if cw, ok := sub.(SubsystemWithChannelCallback); ok {
+		type channelWirer interface {
 			OnChannel(func(ctx context.Context, channel string, data any))
 		}
 		if cw, ok := sub.(channelWirer); ok {
 			svc := s // capture for closure
 			cw.OnChannel(func(ctx context.Context, channel string, data any) {
 				svc.ChannelSend(ctx, channel, data)
 			})
 		}
 		sub.RegisterTools(s)
 	}
 	return s, nil
@ -142,7 +134,7 @@ func New(opts Options) (*Service, error) {
 //	    fmt.Println(sub.Name())
 //	}
 func (s *Service) Subsystems() []Subsystem {
-	return slices.Clone(s.subsystems)
+	return s.subsystems
 }
 // SubsystemsSeq returns an iterator over the registered subsystems.
@ -151,7 +143,7 @@ func (s *Service) Subsystems() []Subsystem {
 //	    fmt.Println(sub.Name())
 //	}
 func (s *Service) SubsystemsSeq() iter.Seq[Subsystem] {
-	return slices.Values(slices.Clone(s.subsystems))
+	return slices.Values(s.subsystems)
 }
 // Tools returns all recorded tool metadata.
@ -160,7 +152,7 @@ func (s *Service) SubsystemsSeq() iter.Seq[Subsystem] {
 //	    fmt.Printf("%s (%s): %s\n", t.Name, t.Group, t.Description)
 //	}
 func (s *Service) Tools() []ToolRecord {
-	return slices.Clone(s.tools)
+	return s.tools
 }
 // ToolsSeq returns an iterator over all recorded tool metadata.
@ -169,7 +161,7 @@ func (s *Service) Tools() []ToolRecord {
 //	    fmt.Println(rec.Name)
 //	}
 func (s *Service) ToolsSeq() iter.Seq[ToolRecord] {
-	return slices.Values(slices.Clone(s.tools))
+	return slices.Values(s.tools)
 }
 // Shutdown gracefully shuts down all subsystems that support it.
@ -178,42 +170,17 @@ func (s *Service) ToolsSeq() iter.Seq[ToolRecord] {
 //	defer cancel()
 //	if err := svc.Shutdown(ctx); err != nil { log.Fatal(err) }
 func (s *Service) Shutdown(ctx context.Context) error {
 	var shutdownErr error
 	for _, sub := range s.subsystems {
 		if sh, ok := sub.(SubsystemWithShutdown); ok {
 			if err := sh.Shutdown(ctx); err != nil {
-				if shutdownErr == nil {
+				return log.E("mcp.Shutdown", "shutdown "+sub.Name(), err)
 					shutdownErr = log.E("mcp.Shutdown", "shutdown "+sub.Name(), err)
 			}
 		}
 	}
-	}
+	return nil
 	if s.wsServer != nil {
 		s.wsMu.Lock()
 		server := s.wsServer
 		s.wsMu.Unlock()
 		if err := server.Shutdown(ctx); err != nil && shutdownErr == nil {
 			shutdownErr = log.E("mcp.Shutdown", "shutdown websocket server", err)
 		}
 		s.wsMu.Lock()
 		if s.wsServer == server {
 			s.wsServer = nil
 			s.wsAddr = ""
 		}
 		s.wsMu.Unlock()
 	}
 	if err := closeWebviewConnection(); err != nil && shutdownErr == nil {
 		shutdownErr = log.E("mcp.Shutdown", "close webview connection", err)
 	}
 	return shutdownErr
 }
 // WSHub returns the WebSocket hub, or nil if not configured.
 //
 //	if hub := svc.WSHub(); hub != nil {
@ -232,30 +199,7 @@ func (s *Service) ProcessService() *process.Service {
 	return s.processService
 }
-// resolveWorkspacePath converts a tool path into the filesystem path the
+// registerTools adds file operation tools to the MCP server.
 // service actually operates on.
 //
 // Sandboxed services keep paths anchored under workspaceRoot. Unrestricted
 // services preserve absolute paths and clean relative ones against the current
 // working directory.
 func (s *Service) resolveWorkspacePath(path string) string {
 	if path == "" {
 		return ""
 	}
 	if s.workspaceRoot == "" {
 		return core.CleanPath(path, "/")
 	}
 	clean := core.CleanPath(string(filepath.Separator)+path, "/")
 	clean = core.TrimPrefix(clean, string(filepath.Separator))
 	if clean == "." || clean == "" {
 		return s.workspaceRoot
 	}
 	return core.Path(s.workspaceRoot, clean)
 }
 // registerTools adds the built-in tool groups to the MCP server.
 func (s *Service) registerTools(server *mcp.Server) {
 	// File operations
 	addToolRecorded(s, server, "files", &mcp.Tool{
@ -309,14 +253,6 @@ func (s *Service) registerTools(server *mcp.Server) {
 		Name:        "lang_list",
 		Description: "Get list of supported programming languages",
 	}, s.getSupportedLanguages)
 	// Additional built-in tool groups.
 	s.registerMetricsTools(server)
 	s.registerRAGTools(server)
 	s.registerProcessTools(server)
 	s.registerWebviewTools(server)
 	s.registerWSTools(server)
 	s.registerWSClientTools(server)
 }
 // Tool input/output types for MCP file operations.
@ -466,7 +402,7 @@ type GetSupportedLanguagesInput struct{}
 // GetSupportedLanguagesOutput contains the list of supported languages.
 //
-//	// len(out.Languages) == 23
+//	// len(out.Languages) == 15
 //	// out.Languages[0].ID == "typescript"
 type GetSupportedLanguagesOutput struct {
 	Languages []LanguageInfo `json:"languages"` // all recognised languages
@ -507,10 +443,6 @@ type EditDiffOutput struct {
 // Tool handlers
 func (s *Service) readFile(ctx context.Context, req *mcp.CallToolRequest, input ReadFileInput) (*mcp.CallToolResult, ReadFileOutput, error) {
 	if s.medium == nil {
 		return nil, ReadFileOutput{}, log.E("mcp.readFile", "workspace medium unavailable", nil)
 	}
 	content, err := s.medium.Read(input.Path)
 	if err != nil {
 		return nil, ReadFileOutput{}, log.E("mcp.readFile", "failed to read file", err)
@ -523,10 +455,6 @@ func (s *Service) readFile(ctx context.Context, req *mcp.CallToolRequest, input
 }
 func (s *Service) writeFile(ctx context.Context, req *mcp.CallToolRequest, input WriteFileInput) (*mcp.CallToolResult, WriteFileOutput, error) {
 	if s.medium == nil {
 		return nil, WriteFileOutput{}, log.E("mcp.writeFile", "workspace medium unavailable", nil)
 	}
 	// Medium.Write creates parent directories automatically
 	if err := s.medium.Write(input.Path, input.Content); err != nil {
 		return nil, WriteFileOutput{}, log.E("mcp.writeFile", "failed to write file", err)
@ -535,17 +463,10 @@ func (s *Service) writeFile(ctx context.Context, req *mcp.CallToolRequest, input
 }
 func (s *Service) listDirectory(ctx context.Context, req *mcp.CallToolRequest, input ListDirectoryInput) (*mcp.CallToolResult, ListDirectoryOutput, error) {
 	if s.medium == nil {
 		return nil, ListDirectoryOutput{}, log.E("mcp.listDirectory", "workspace medium unavailable", nil)
 	}
 	entries, err := s.medium.List(input.Path)
 	if err != nil {
 		return nil, ListDirectoryOutput{}, log.E("mcp.listDirectory", "failed to list directory", err)
 	}
 	slices.SortFunc(entries, func(a, b os.DirEntry) int {
 		return cmp.Compare(a.Name(), b.Name())
 	})
 	result := make([]DirectoryEntry, 0, len(entries))
 	for _, e := range entries {
 		info, _ := e.Info()
@ -555,7 +476,10 @@ func (s *Service) listDirectory(ctx context.Context, req *mcp.CallToolRequest, i
 		}
 		result = append(result, DirectoryEntry{
 			Name: e.Name(),
-			Path:  directoryEntryPath(input.Path, e.Name()),
+			Path: filepath.Join(input.Path, e.Name()), // Note: This might be relative path, client might expect absolute?
 			// Issue 103 says "Replace ... with local.Medium sandboxing".
 			// Previous code returned `filepath.Join(input.Path, e.Name())`.
 			// If input.Path is relative, this preserves it.
 			IsDir: e.IsDir(),
 			Size:  size,
 		})
@ -563,23 +487,7 @@ func (s *Service) listDirectory(ctx context.Context, req *mcp.CallToolRequest, i
 	return nil, ListDirectoryOutput{Entries: result, Path: input.Path}, nil
 }
 // directoryEntryPath returns the documented display path for a directory entry.
 //
 // Example:
 //
 //	directoryEntryPath("src", "main.go") == "src/main.go"
 func directoryEntryPath(dir, name string) string {
 	if dir == "" {
 		return name
 	}
 	return core.JoinPath(dir, name)
 }
 func (s *Service) createDirectory(ctx context.Context, req *mcp.CallToolRequest, input CreateDirectoryInput) (*mcp.CallToolResult, CreateDirectoryOutput, error) {
 	if s.medium == nil {
 		return nil, CreateDirectoryOutput{}, log.E("mcp.createDirectory", "workspace medium unavailable", nil)
 	}
 	if err := s.medium.EnsureDir(input.Path); err != nil {
 		return nil, CreateDirectoryOutput{}, log.E("mcp.createDirectory", "failed to create directory", err)
 	}
@ -587,10 +495,6 @@ func (s *Service) createDirectory(ctx context.Context, req *mcp.CallToolRequest,
 }
 func (s *Service) deleteFile(ctx context.Context, req *mcp.CallToolRequest, input DeleteFileInput) (*mcp.CallToolResult, DeleteFileOutput, error) {
 	if s.medium == nil {
 		return nil, DeleteFileOutput{}, log.E("mcp.deleteFile", "workspace medium unavailable", nil)
 	}
 	if err := s.medium.Delete(input.Path); err != nil {
 		return nil, DeleteFileOutput{}, log.E("mcp.deleteFile", "failed to delete file", err)
 	}
@ -598,10 +502,6 @@ func (s *Service) deleteFile(ctx context.Context, req *mcp.CallToolRequest, inpu
 }
 func (s *Service) renameFile(ctx context.Context, req *mcp.CallToolRequest, input RenameFileInput) (*mcp.CallToolResult, RenameFileOutput, error) {
 	if s.medium == nil {
 		return nil, RenameFileOutput{}, log.E("mcp.renameFile", "workspace medium unavailable", nil)
 	}
 	if err := s.medium.Rename(input.OldPath, input.NewPath); err != nil {
 		return nil, RenameFileOutput{}, log.E("mcp.renameFile", "failed to rename file", err)
 	}
@ -609,22 +509,21 @@ func (s *Service) renameFile(ctx context.Context, req *mcp.CallToolRequest, inpu
 }
 func (s *Service) fileExists(ctx context.Context, req *mcp.CallToolRequest, input FileExistsInput) (*mcp.CallToolResult, FileExistsOutput, error) {
-	if s.medium == nil {
+	exists := s.medium.IsFile(input.Path)
-		return nil, FileExistsOutput{}, log.E("mcp.fileExists", "workspace medium unavailable", nil)
+	if exists {
 		return nil, FileExistsOutput{Exists: true, IsDir: false, Path: input.Path}, nil
 	}
 	// Check if it's a directory by attempting to list it
 	// List might fail if it's a file too (but we checked IsFile) or if doesn't exist.
 	_, err := s.medium.List(input.Path)
 	isDir := err == nil
-	info, err := s.medium.Stat(input.Path)
+	// If List failed, it might mean it doesn't exist OR it's a special file or permissions.
-	if err != nil {
+	// Assuming if List works, it's a directory.
-		if core.Is(err, os.ErrNotExist) {
+
-			return nil, FileExistsOutput{Exists: false, IsDir: false, Path: input.Path}, nil
+	// Refinement: If it doesn't exist, List returns error.
-		}
+
-		return nil, FileExistsOutput{}, log.E("mcp.fileExists", "failed to stat path", err)
+	return nil, FileExistsOutput{Exists: isDir, IsDir: isDir, Path: input.Path}, nil
 	}
 	return nil, FileExistsOutput{
 		Exists: true,
 		IsDir:  info.IsDir(),
 		Path:   input.Path,
 	}, nil
 }
 func (s *Service) detectLanguage(ctx context.Context, req *mcp.CallToolRequest, input DetectLanguageInput) (*mcp.CallToolResult, DetectLanguageOutput, error) {
@ -633,14 +532,27 @@ func (s *Service) detectLanguage(ctx context.Context, req *mcp.CallToolRequest,
 }
 func (s *Service) getSupportedLanguages(ctx context.Context, req *mcp.CallToolRequest, input GetSupportedLanguagesInput) (*mcp.CallToolResult, GetSupportedLanguagesOutput, error) {
-	return nil, GetSupportedLanguagesOutput{Languages: supportedLanguages()}, nil
+	languages := []LanguageInfo{
 		{ID: "typescript", Name: "TypeScript", Extensions: []string{".ts", ".tsx"}},
 		{ID: "javascript", Name: "JavaScript", Extensions: []string{".js", ".jsx"}},
 		{ID: "go", Name: "Go", Extensions: []string{".go"}},
 		{ID: "python", Name: "Python", Extensions: []string{".py"}},
 		{ID: "rust", Name: "Rust", Extensions: []string{".rs"}},
 		{ID: "java", Name: "Java", Extensions: []string{".java"}},
 		{ID: "php", Name: "PHP", Extensions: []string{".php"}},
 		{ID: "ruby", Name: "Ruby", Extensions: []string{".rb"}},
 		{ID: "html", Name: "HTML", Extensions: []string{".html", ".htm"}},
 		{ID: "css", Name: "CSS", Extensions: []string{".css"}},
 		{ID: "json", Name: "JSON", Extensions: []string{".json"}},
 		{ID: "yaml", Name: "YAML", Extensions: []string{".yaml", ".yml"}},
 		{ID: "markdown", Name: "Markdown", Extensions: []string{".md", ".markdown"}},
 		{ID: "sql", Name: "SQL", Extensions: []string{".sql"}},
 		{ID: "shell", Name: "Shell", Extensions: []string{".sh", ".bash"}},
 	}
 	return nil, GetSupportedLanguagesOutput{Languages: languages}, nil
 }
 func (s *Service) editDiff(ctx context.Context, req *mcp.CallToolRequest, input EditDiffInput) (*mcp.CallToolResult, EditDiffOutput, error) {
 	if s.medium == nil {
 		return nil, EditDiffOutput{}, log.E("mcp.editDiff", "workspace medium unavailable", nil)
 	}
 	if input.OldString == "" {
 		return nil, EditDiffOutput{}, log.E("mcp.editDiff", "old_string cannot be empty", nil)
 	}
@ -653,16 +565,16 @@ func (s *Service) editDiff(ctx context.Context, req *mcp.CallToolRequest, input
 	count := 0
 	if input.ReplaceAll {
-		count = countOccurrences(content, input.OldString)
+		count = strings.Count(content, input.OldString)
 		if count == 0 {
 			return nil, EditDiffOutput{}, log.E("mcp.editDiff", "old_string not found in file", nil)
 		}
-		content = core.Replace(content, input.OldString, input.NewString)
+		content = strings.ReplaceAll(content, input.OldString, input.NewString)
 	} else {
-		if !core.Contains(content, input.OldString) {
+		if !strings.Contains(content, input.OldString) {
 			return nil, EditDiffOutput{}, log.E("mcp.editDiff", "old_string not found in file", nil)
 		}
-		content = replaceFirst(content, input.OldString, input.NewString)
+		content = strings.Replace(content, input.OldString, input.NewString, 1)
 		count = 1
 	}
@ -679,78 +591,57 @@ func (s *Service) editDiff(ctx context.Context, req *mcp.CallToolRequest, input
 // detectLanguageFromPath maps file extensions to language IDs.
 func detectLanguageFromPath(path string) string {
-	if core.PathBase(path) == "Dockerfile" {
+	ext := filepath.Ext(path)
 	switch ext {
 	case ".ts", ".tsx":
 		return "typescript"
 	case ".js", ".jsx":
 		return "javascript"
 	case ".go":
 		return "go"
 	case ".py":
 		return "python"
 	case ".rs":
 		return "rust"
 	case ".rb":
 		return "ruby"
 	case ".java":
 		return "java"
 	case ".php":
 		return "php"
 	case ".c", ".h":
 		return "c"
 	case ".cpp", ".hpp", ".cc", ".cxx":
 		return "cpp"
 	case ".cs":
 		return "csharp"
 	case ".html", ".htm":
 		return "html"
 	case ".css":
 		return "css"
 	case ".scss":
 		return "scss"
 	case ".json":
 		return "json"
 	case ".yaml", ".yml":
 		return "yaml"
 	case ".xml":
 		return "xml"
 	case ".md", ".markdown":
 		return "markdown"
 	case ".sql":
 		return "sql"
 	case ".sh", ".bash":
 		return "shell"
 	case ".swift":
 		return "swift"
 	case ".kt", ".kts":
 		return "kotlin"
 	default:
 		if filepath.Base(path) == "Dockerfile" {
 			return "dockerfile"
 		}
 	ext := core.PathExt(path)
 	if lang, ok := languageByExtension[ext]; ok {
 		return lang
 	}
 		return "plaintext"
 }
 var languageByExtension = map[string]string{
 	".ts":       "typescript",
 	".tsx":      "typescript",
 	".js":       "javascript",
 	".jsx":      "javascript",
 	".go":       "go",
 	".py":       "python",
 	".rs":       "rust",
 	".rb":       "ruby",
 	".java":     "java",
 	".php":      "php",
 	".c":        "c",
 	".h":        "c",
 	".cpp":      "cpp",
 	".hpp":      "cpp",
 	".cc":       "cpp",
 	".cxx":      "cpp",
 	".cs":       "csharp",
 	".html":     "html",
 	".htm":      "html",
 	".css":      "css",
 	".scss":     "scss",
 	".json":     "json",
 	".yaml":     "yaml",
 	".yml":      "yaml",
 	".xml":      "xml",
 	".md":       "markdown",
 	".markdown": "markdown",
 	".sql":      "sql",
 	".sh":       "shell",
 	".bash":     "shell",
 	".swift":    "swift",
 	".kt":       "kotlin",
 	".kts":      "kotlin",
 }
 func supportedLanguages() []LanguageInfo {
 	return []LanguageInfo{
 		{ID: "typescript", Name: "TypeScript", Extensions: []string{".ts", ".tsx"}},
 		{ID: "javascript", Name: "JavaScript", Extensions: []string{".js", ".jsx"}},
 		{ID: "go", Name: "Go", Extensions: []string{".go"}},
 		{ID: "python", Name: "Python", Extensions: []string{".py"}},
 		{ID: "rust", Name: "Rust", Extensions: []string{".rs"}},
 		{ID: "ruby", Name: "Ruby", Extensions: []string{".rb"}},
 		{ID: "java", Name: "Java", Extensions: []string{".java"}},
 		{ID: "php", Name: "PHP", Extensions: []string{".php"}},
 		{ID: "c", Name: "C", Extensions: []string{".c", ".h"}},
 		{ID: "cpp", Name: "C++", Extensions: []string{".cpp", ".hpp", ".cc", ".cxx"}},
 		{ID: "csharp", Name: "C#", Extensions: []string{".cs"}},
 		{ID: "html", Name: "HTML", Extensions: []string{".html", ".htm"}},
 		{ID: "css", Name: "CSS", Extensions: []string{".css"}},
 		{ID: "scss", Name: "SCSS", Extensions: []string{".scss"}},
 		{ID: "json", Name: "JSON", Extensions: []string{".json"}},
 		{ID: "yaml", Name: "YAML", Extensions: []string{".yaml", ".yml"}},
 		{ID: "xml", Name: "XML", Extensions: []string{".xml"}},
 		{ID: "markdown", Name: "Markdown", Extensions: []string{".md", ".markdown"}},
 		{ID: "sql", Name: "SQL", Extensions: []string{".sql"}},
 		{ID: "shell", Name: "Shell", Extensions: []string{".sh", ".bash"}},
 		{ID: "swift", Name: "Swift", Extensions: []string{".swift"}},
 		{ID: "kotlin", Name: "Kotlin", Extensions: []string{".kt", ".kts"}},
 		{ID: "dockerfile", Name: "Dockerfile", Extensions: []string{}},
 	}
 }
@ -763,52 +654,20 @@ func supportedLanguages() []LanguageInfo {
 //	os.Setenv("MCP_ADDR", "127.0.0.1:9100")
 //	svc.Run(ctx)
 //
 //	// Unix socket (set MCP_UNIX_SOCKET):
 //	os.Setenv("MCP_UNIX_SOCKET", "/tmp/core-mcp.sock")
 //	svc.Run(ctx)
 //
 //	// HTTP (set MCP_HTTP_ADDR):
 //	os.Setenv("MCP_HTTP_ADDR", "127.0.0.1:9101")
 //	svc.Run(ctx)
 func (s *Service) Run(ctx context.Context) error {
-	if httpAddr := core.Env("MCP_HTTP_ADDR"); httpAddr != "" {
+	if httpAddr := os.Getenv("MCP_HTTP_ADDR"); httpAddr != "" {
 		return s.ServeHTTP(ctx, httpAddr)
 	}
-	if addr := core.Env("MCP_ADDR"); addr != "" {
+	if addr := os.Getenv("MCP_ADDR"); addr != "" {
 		return s.ServeTCP(ctx, addr)
 	}
-	if socketPath := core.Env("MCP_UNIX_SOCKET"); socketPath != "" {
+	s.stdioMode = true
-		return s.ServeUnix(ctx, socketPath)
+	return s.server.Run(ctx, &mcp.StdioTransport{})
 	}
 	return s.ServeStdio(ctx)
 }
 // countOccurrences counts non-overlapping instances of substr in s.
 func countOccurrences(s, substr string) int {
 	if substr == "" {
 		return 0
 	}
 	count := 0
 	for i := 0; i <= len(s)-len(substr); i++ {
 		if s[i:i+len(substr)] == substr {
 			count++
 			i += len(substr) - 1
 		}
 	}
 	return count
 }
 // replaceFirst replaces the first occurrence of old with new in s.
 func replaceFirst(s, old, new string) string {
 	i := 0
 	for i <= len(s)-len(old) {
 		if s[i:i+len(old)] == old {
 			return core.Concat(s[:i], new, s[i+len(old):])
 		}
 		i++
 	}
 	return s
 }
 // Server returns the underlying MCP server for advanced configuration.
 //
--- a/pkg/mcp/mcp_test.go
+++ b/pkg/mcp/mcp_test.go
@ -55,114 +55,6 @@ func TestNew_Good_NoRestriction(t *testing.T) {
 	}
 }
 func TestNew_Good_RegistersBuiltInTools(t *testing.T) {
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	tools := map[string]bool{}
 	for _, rec := range s.Tools() {
 		tools[rec.Name] = true
 	}
 	for _, name := range []string{
 		"metrics_record",
 		"metrics_query",
 		"rag_query",
 		"rag_ingest",
 		"rag_collections",
 		"webview_connect",
 		"webview_disconnect",
 		"webview_navigate",
 		"webview_click",
 		"webview_type",
 		"webview_query",
 		"webview_console",
 		"webview_eval",
 		"webview_screenshot",
 		"webview_wait",
 	} {
 		if !tools[name] {
 			t.Fatalf("expected tool %q to be registered", name)
 		}
 	}
 	for _, name := range []string{"process_start", "ws_start"} {
 		if tools[name] {
 			t.Fatalf("did not expect tool %q to be registered without dependencies", name)
 		}
 	}
 }
 func TestGetSupportedLanguages_Good_IncludesAllDetectedLanguages(t *testing.T) {
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	_, out, err := s.getSupportedLanguages(nil, nil, GetSupportedLanguagesInput{})
 	if err != nil {
 		t.Fatalf("getSupportedLanguages failed: %v", err)
 	}
 	if got, want := len(out.Languages), 23; got != want {
 		t.Fatalf("expected %d supported languages, got %d", want, got)
 	}
 	got := map[string]bool{}
 	for _, lang := range out.Languages {
 		got[lang.ID] = true
 	}
 	for _, want := range []string{
 		"typescript",
 		"javascript",
 		"go",
 		"python",
 		"rust",
 		"ruby",
 		"java",
 		"php",
 		"c",
 		"cpp",
 		"csharp",
 		"html",
 		"css",
 		"scss",
 		"json",
 		"yaml",
 		"xml",
 		"markdown",
 		"sql",
 		"shell",
 		"swift",
 		"kotlin",
 		"dockerfile",
 	} {
 		if !got[want] {
 			t.Fatalf("expected language %q to be listed", want)
 		}
 	}
 }
 func TestDetectLanguageFromPath_Good_KnownExtensions(t *testing.T) {
 	cases := map[string]string{
 		"main.go":           "go",
 		"index.tsx":         "typescript",
 		"style.scss":        "scss",
 		"Program.cs":        "csharp",
 		"module.kt":         "kotlin",
 		"docker/Dockerfile": "dockerfile",
 	}
 	for path, want := range cases {
 		if got := detectLanguageFromPath(path); got != want {
 			t.Fatalf("detectLanguageFromPath(%q) = %q, want %q", path, got, want)
 		}
 	}
 }
 func TestMedium_Good_ReadWrite(t *testing.T) {
 	tmpDir := t.TempDir()
 	s, err := New(Options{WorkspaceRoot: tmpDir})
@ -216,71 +108,6 @@ func TestMedium_Good_EnsureDir(t *testing.T) {
 	}
 }
 func TestFileExists_Good_FileAndDirectory(t *testing.T) {
 	tmpDir := t.TempDir()
 	s, err := New(Options{WorkspaceRoot: tmpDir})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	if err := s.medium.EnsureDir("nested"); err != nil {
 		t.Fatalf("Failed to create directory: %v", err)
 	}
 	if err := s.medium.Write("nested/file.txt", "content"); err != nil {
 		t.Fatalf("Failed to write file: %v", err)
 	}
 	_, fileOut, err := s.fileExists(nil, nil, FileExistsInput{Path: "nested/file.txt"})
 	if err != nil {
 		t.Fatalf("fileExists(file) failed: %v", err)
 	}
 	if !fileOut.Exists {
 		t.Fatal("expected file to exist")
 	}
 	if fileOut.IsDir {
 		t.Fatal("expected file to not be reported as a directory")
 	}
 	_, dirOut, err := s.fileExists(nil, nil, FileExistsInput{Path: "nested"})
 	if err != nil {
 		t.Fatalf("fileExists(dir) failed: %v", err)
 	}
 	if !dirOut.Exists {
 		t.Fatal("expected directory to exist")
 	}
 	if !dirOut.IsDir {
 		t.Fatal("expected directory to be reported as a directory")
 	}
 }
 func TestListDirectory_Good_ReturnsDocumentedEntryPaths(t *testing.T) {
 	tmpDir := t.TempDir()
 	s, err := New(Options{WorkspaceRoot: tmpDir})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	if err := s.medium.EnsureDir("nested"); err != nil {
 		t.Fatalf("Failed to create directory: %v", err)
 	}
 	if err := s.medium.Write("nested/file.txt", "content"); err != nil {
 		t.Fatalf("Failed to write file: %v", err)
 	}
 	_, out, err := s.listDirectory(nil, nil, ListDirectoryInput{Path: "nested"})
 	if err != nil {
 		t.Fatalf("listDirectory failed: %v", err)
 	}
 	if len(out.Entries) != 1 {
 		t.Fatalf("expected one entry, got %d", len(out.Entries))
 	}
 	want := filepath.Join("nested", "file.txt")
 	if out.Entries[0].Path != want {
 		t.Fatalf("expected entry path %q, got %q", want, out.Entries[0].Path)
 	}
 }
 func TestMedium_Good_IsFile(t *testing.T) {
 	tmpDir := t.TempDir()
 	s, err := New(Options{WorkspaceRoot: tmpDir})
@ -302,40 +129,6 @@ func TestMedium_Good_IsFile(t *testing.T) {
 	}
 }
 func TestResolveWorkspacePath_Good(t *testing.T) {
 	tmpDir := t.TempDir()
 	s, err := New(Options{WorkspaceRoot: tmpDir})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	cases := map[string]string{
 		"docs/readme.md":     filepath.Join(tmpDir, "docs", "readme.md"),
 		"/docs/readme.md":    filepath.Join(tmpDir, "docs", "readme.md"),
 		"../escape/notes.md": filepath.Join(tmpDir, "escape", "notes.md"),
 		"":                   "",
 	}
 	for input, want := range cases {
 		if got := s.resolveWorkspacePath(input); got != want {
 			t.Fatalf("resolveWorkspacePath(%q) = %q, want %q", input, got, want)
 		}
 	}
 }
 func TestResolveWorkspacePath_Good_Unrestricted(t *testing.T) {
 	s, err := New(Options{Unrestricted: true})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	if got, want := s.resolveWorkspacePath("docs/readme.md"), filepath.Clean("docs/readme.md"); got != want {
 		t.Fatalf("resolveWorkspacePath(relative) = %q, want %q", got, want)
 	}
 	if got, want := s.resolveWorkspacePath("/tmp/readme.md"), filepath.Clean("/tmp/readme.md"); got != want {
 		t.Fatalf("resolveWorkspacePath(absolute) = %q, want %q", got, want)
 	}
 }
 func TestSandboxing_Traversal_Sanitized(t *testing.T) {
 	tmpDir := t.TempDir()
 	s, err := New(Options{WorkspaceRoot: tmpDir})
--- a/pkg/mcp/notify.go
+++ b/pkg/mcp/notify.go
@ -7,142 +7,17 @@
 package mcp
 import (
 	"cmp"
 	"context"
-	"io"
+	"encoding/json"
 	"iter"
 	"os"
 	"reflect"
 	"slices"
 	"sync"
 	"unsafe"
 	core "dappco.re/go/core"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
-func normalizeNotificationContext(ctx context.Context) context.Context {
+// stdoutMu protects stdout writes from concurrent goroutines.
-	if ctx == nil {
+var stdoutMu sync.Mutex
 		return context.Background()
 	}
 	return ctx
 }
 // lockedWriter wraps an io.Writer with a mutex.
 // Both the SDK's transport and ChannelSend use this writer,
 // ensuring channel notifications don't interleave with SDK messages.
 type lockedWriter struct {
 	mu sync.Mutex
 	w  io.Writer
 }
 func (lw *lockedWriter) Write(p []byte) (int, error) {
 	lw.mu.Lock()
 	defer lw.mu.Unlock()
 	return lw.w.Write(p)
 }
 func (lw *lockedWriter) Close() error { return nil }
 // sharedStdout is the single writer for all stdio output.
 // Created once when the MCP service enters stdio mode.
 var sharedStdout = &lockedWriter{w: os.Stdout}
 // ChannelNotificationMethod is the JSON-RPC method used for named channel
 // events sent through claude/channel.
 const ChannelNotificationMethod = "notifications/claude/channel"
 // LoggingNotificationMethod is the JSON-RPC method used for log messages sent
 // to connected MCP clients.
 const LoggingNotificationMethod = "notifications/message"
 // ClaudeChannelCapabilityName is the experimental capability key advertised
 // by the MCP server for channel-based client notifications.
 const ClaudeChannelCapabilityName = "claude/channel"
 // Shared channel names. Keeping them central avoids drift between emitters
 // and the advertised claude/channel capability.
 //
 // Use these names when emitting structured events from subsystems:
 //
 //	s.ChannelSend(ctx, ChannelProcessStart, map[string]any{"id": "proc-1"})
 const (
 	ChannelBuildStart        = "build.start"
 	ChannelBuildComplete     = "build.complete"
 	ChannelBuildFailed       = "build.failed"
 	ChannelAgentComplete     = "agent.complete"
 	ChannelAgentBlocked      = "agent.blocked"
 	ChannelAgentStatus       = "agent.status"
 	ChannelBrainForgetDone   = "brain.forget.complete"
 	ChannelBrainListDone     = "brain.list.complete"
 	ChannelBrainRecallDone   = "brain.recall.complete"
 	ChannelBrainRememberDone = "brain.remember.complete"
 	ChannelHarvestComplete   = "harvest.complete"
 	ChannelInboxMessage      = "inbox.message"
 	ChannelProcessExit       = "process.exit"
 	ChannelProcessStart      = "process.start"
 	ChannelProcessOutput     = "process.output"
 	ChannelTestResult        = "test.result"
 )
 var channelCapabilityList = []string{
 	ChannelBuildStart,
 	ChannelAgentComplete,
 	ChannelAgentBlocked,
 	ChannelAgentStatus,
 	ChannelBuildComplete,
 	ChannelBuildFailed,
 	ChannelBrainForgetDone,
 	ChannelBrainListDone,
 	ChannelBrainRecallDone,
 	ChannelBrainRememberDone,
 	ChannelHarvestComplete,
 	ChannelInboxMessage,
 	ChannelProcessExit,
 	ChannelProcessStart,
 	ChannelProcessOutput,
 	ChannelTestResult,
 }
 // ChannelCapabilitySpec describes the experimental claude/channel capability.
 //
 //	spec := ChannelCapabilitySpec{
 //	    Version:     "1",
 //	    Description: "Push events into client sessions via named channels",
 //	    Channels:    ChannelCapabilityChannels(),
 //	}
 type ChannelCapabilitySpec struct {
 	Version     string   `json:"version"`     // e.g. "1"
 	Description string   `json:"description"` // capability summary shown to clients
 	Channels    []string `json:"channels"`    // e.g. []string{"build.complete", "agent.status"}
 }
 // Map converts the typed capability into the wire-format map expected by the SDK.
 //
 //	caps := ChannelCapabilitySpec{
 //	    Version:     "1",
 //	    Description: "Push events into client sessions via named channels",
 //	    Channels:    ChannelCapabilityChannels(),
 //	}.Map()
 func (c ChannelCapabilitySpec) Map() map[string]any {
 	return map[string]any{
 		"version":     c.Version,
 		"description": c.Description,
 		"channels":    slices.Clone(c.Channels),
 	}
 }
 // ChannelNotification is the payload sent through the experimental channel
 // notification method.
 //
 //	n := ChannelNotification{
 //	    Channel: ChannelBuildComplete,
 //	    Data:    map[string]any{"repo": "core/mcp"},
 //	}
 type ChannelNotification struct {
 	Channel string `json:"channel"` // e.g. "build.complete"
 	Data    any    `json:"data"`    // arbitrary payload for the named channel
 }
 // SendNotificationToAllClients broadcasts a log-level notification to every
 // connected MCP session (stdio, HTTP, TCP, and Unix).
@ -150,48 +25,27 @@ type ChannelNotification struct {
 //
 //	s.SendNotificationToAllClients(ctx, "info", "monitor", map[string]any{"event": "build complete"})
 func (s *Service) SendNotificationToAllClients(ctx context.Context, level mcp.LoggingLevel, logger string, data any) {
-	if s == nil || s.server == nil {
+	for session := range s.server.Sessions() {
-		return
+		if err := session.Log(ctx, &mcp.LoggingMessageParams{
 	}
 	ctx = normalizeNotificationContext(ctx)
 	s.broadcastToSessions(func(session *mcp.ServerSession) {
 		s.sendLoggingNotificationToSession(ctx, session, level, logger, data)
 	})
 }
 // SendNotificationToSession sends a log-level notification to one connected
 // MCP session.
 //
 //	s.SendNotificationToSession(ctx, session, "info", "monitor", data)
 func (s *Service) SendNotificationToSession(ctx context.Context, session *mcp.ServerSession, level mcp.LoggingLevel, logger string, data any) {
 	if s == nil || s.server == nil {
 		return
 	}
 	ctx = normalizeNotificationContext(ctx)
 	s.sendLoggingNotificationToSession(ctx, session, level, logger, data)
 }
 // SendNotificationToClient sends a log-level notification to one connected
 // MCP client.
 //
 //	s.SendNotificationToClient(ctx, client, "info", "monitor", data)
 func (s *Service) SendNotificationToClient(ctx context.Context, client *mcp.ServerSession, level mcp.LoggingLevel, logger string, data any) {
 	s.SendNotificationToSession(ctx, client, level, logger, data)
 }
 func (s *Service) sendLoggingNotificationToSession(ctx context.Context, session *mcp.ServerSession, level mcp.LoggingLevel, logger string, data any) {
 	if s == nil || s.server == nil || session == nil {
 		return
 	}
 	ctx = normalizeNotificationContext(ctx)
 	if err := sendSessionNotification(ctx, session, LoggingNotificationMethod, &mcp.LoggingMessageParams{
 			Level:  level,
 			Logger: logger,
 			Data:   data,
 		}); err != nil {
-		s.debugNotify("notify: failed to send to session", "session", session.ID(), "error", err)
+			s.logger.Debug("notify: failed to send to session", "session", session.ID(), "error", err)
 		}
 	}
 }
 // channelNotification is the JSON-RPC notification format for claude/channel.
 type channelNotification struct {
 	JSONRPC string         `json:"jsonrpc"`
 	Method  string         `json:"method"`
 	Params  channelParams  `json:"params"`
 }
 type channelParams struct {
 	Content string            `json:"content"`
 	Meta    map[string]string `json:"meta,omitempty"`
 }
 // ChannelSend pushes a channel event to all connected clients via
@ -200,39 +54,50 @@ func (s *Service) sendLoggingNotificationToSession(ctx context.Context, session
 //	s.ChannelSend(ctx, "agent.complete", map[string]any{"repo": "go-io", "workspace": "go-io-123"})
 //	s.ChannelSend(ctx, "build.failed", map[string]any{"repo": "core", "error": "test timeout"})
 func (s *Service) ChannelSend(ctx context.Context, channel string, data any) {
-	if s == nil || s.server == nil {
+	// Marshal the data payload as the content string
 	contentBytes, err := json.Marshal(data)
 	if err != nil {
 		s.logger.Debug("channel: failed to marshal data", "channel", channel, "error", err)
 		return
 	}
-	if core.Trim(channel) == "" {
+
 	notification := channelNotification{
 		JSONRPC: "2.0",
 		Method:  "notifications/claude/channel",
 		Params: channelParams{
 			Content: string(contentBytes),
 			Meta: map[string]string{
 				"source":  "core-agent",
 				"channel": channel,
 			},
 		},
 	}
 	msg, err := json.Marshal(notification)
 	if err != nil {
 		s.logger.Debug("channel: failed to marshal notification", "channel", channel, "error", err)
 		return
 	}
-	ctx = normalizeNotificationContext(ctx)
+
-	payload := ChannelNotification{Channel: channel, Data: data}
+	// Write directly to stdout (stdio transport) with newline delimiter.
-	s.sendChannelNotificationToAllClients(ctx, payload)
+	// The official SDK doesn't expose a way to send custom notification methods,
 	// so we write the JSON-RPC notification directly to the transport.
 	// Only write when running in stdio mode — HTTP/TCP transports don't use stdout.
 	if !s.stdioMode {
 		return
 	}
 	stdoutMu.Lock()
 	os.Stdout.Write(append(msg, '\n'))
 	stdoutMu.Unlock()
 }
 // ChannelSendToSession pushes a channel event to a specific session.
 // Falls back to stdout for stdio transport.
 //
 //	s.ChannelSendToSession(ctx, session, "agent.progress", progressData)
 func (s *Service) ChannelSendToSession(ctx context.Context, session *mcp.ServerSession, channel string, data any) {
-	if s == nil || s.server == nil || session == nil {
+	// For now, channel events go to all sessions via stdout
-		return
+	s.ChannelSend(ctx, channel, data)
 	}
 	if core.Trim(channel) == "" {
 		return
 	}
 	ctx = normalizeNotificationContext(ctx)
 	payload := ChannelNotification{Channel: channel, Data: data}
 	if err := sendSessionNotification(ctx, session, ChannelNotificationMethod, payload); err != nil {
 		s.debugNotify("channel: failed to send to session", "session", session.ID(), "error", err)
 	}
 }
 // ChannelSendToClient pushes a channel event to one connected MCP client.
 //
 //	s.ChannelSendToClient(ctx, client, "agent.progress", progressData)
 func (s *Service) ChannelSendToClient(ctx context.Context, client *mcp.ServerSession, channel string, data any) {
 	s.ChannelSendToSession(ctx, client, channel, data)
 }
 // Sessions returns an iterator over all connected MCP sessions.
@ -241,180 +106,28 @@ func (s *Service) ChannelSendToClient(ctx context.Context, client *mcp.ServerSes
 //	    s.ChannelSendToSession(ctx, session, "status", data)
 //	}
 func (s *Service) Sessions() iter.Seq[*mcp.ServerSession] {
-	if s == nil || s.server == nil {
+	return s.server.Sessions()
 		return func(yield func(*mcp.ServerSession) bool) {}
 	}
 	return slices.Values(snapshotSessions(s.server))
 }
 func (s *Service) sendChannelNotificationToAllClients(ctx context.Context, payload ChannelNotification) {
 	if s == nil || s.server == nil {
 		return
 	}
 	ctx = normalizeNotificationContext(ctx)
 	s.broadcastToSessions(func(session *mcp.ServerSession) {
 		if err := sendSessionNotification(ctx, session, ChannelNotificationMethod, payload); err != nil {
 			s.debugNotify("channel: failed to send to session", "session", session.ID(), "error", err)
 		}
 	})
 }
 func (s *Service) broadcastToSessions(fn func(*mcp.ServerSession)) {
 	if s == nil || s.server == nil || fn == nil {
 		return
 	}
 	for _, session := range snapshotSessions(s.server) {
 		fn(session)
 	}
 }
 func (s *Service) debugNotify(msg string, args ...any) {
 	if s == nil || s.logger == nil {
 		return
 	}
 	s.logger.Debug(msg, args...)
 }
 // NotifySession sends a raw JSON-RPC notification to a specific MCP session.
 //
 //	coremcp.NotifySession(ctx, session, "notifications/claude/channel", map[string]any{
 //	    "content": "build failed", "meta": map[string]string{"severity": "high"},
 //	})
 func NotifySession(ctx context.Context, session *mcp.ServerSession, method string, payload any) error {
 	return sendSessionNotification(ctx, session, method, payload)
 }
 func sendSessionNotification(ctx context.Context, session *mcp.ServerSession, method string, payload any) error {
 	if session == nil {
 		return nil
 	}
 	ctx = normalizeNotificationContext(ctx)
 	if conn, err := sessionMCPConnection(session); err == nil {
 		if notifier, ok := conn.(interface {
 			Notify(context.Context, string, any) error
 		}); ok {
 			if err := notifier.Notify(ctx, method, payload); err != nil {
 				return err
 			}
 			return nil
 		}
 	}
 	conn, err := sessionJSONRPCConnection(session)
 	if err != nil {
 		return err
 	}
 	notifier, ok := conn.(interface {
 		Notify(context.Context, string, any) error
 	})
 	if !ok {
 		return coreNotifyError("connection Notify method unavailable")
 	}
 	if err := notifier.Notify(ctx, method, payload); err != nil {
 		return err
 	}
 	return nil
 }
 func sessionMCPConnection(session *mcp.ServerSession) (any, error) {
 	value := reflect.ValueOf(session)
 	if value.Kind() != reflect.Ptr || value.IsNil() {
 		return nil, coreNotifyError("invalid session")
 	}
 	field := value.Elem().FieldByName("mcpConn")
 	if !field.IsValid() {
 		return nil, coreNotifyError("session mcp connection field unavailable")
 	}
 	return reflect.NewAt(field.Type(), unsafe.Pointer(field.UnsafeAddr())).Elem().Interface(), nil
 }
 func sessionJSONRPCConnection(session *mcp.ServerSession) (any, error) {
 	value := reflect.ValueOf(session)
 	if value.Kind() != reflect.Ptr || value.IsNil() {
 		return nil, coreNotifyError("invalid session")
 	}
 	field := value.Elem().FieldByName("conn")
 	if !field.IsValid() {
 		return nil, coreNotifyError("session connection field unavailable")
 	}
 	return reflect.NewAt(field.Type(), unsafe.Pointer(field.UnsafeAddr())).Elem().Interface(), nil
 }
 func coreNotifyError(message string) error {
 	return &notificationError{message: message}
 }
 func snapshotSessions(server *mcp.Server) []*mcp.ServerSession {
 	if server == nil {
 		return nil
 	}
 	sessions := make([]*mcp.ServerSession, 0)
 	for session := range server.Sessions() {
 		if session != nil {
 			sessions = append(sessions, session)
 		}
 	}
 	slices.SortFunc(sessions, func(a, b *mcp.ServerSession) int {
 		return cmp.Compare(a.ID(), b.ID())
 	})
 	return sessions
 }
 type notificationError struct {
 	message string
 }
 func (e *notificationError) Error() string {
 	return e.message
 }
 // channelCapability returns the experimental capability descriptor
 // for claude/channel, registered during New().
 func channelCapability() map[string]any {
 	return map[string]any{
-		ClaudeChannelCapabilityName: ClaudeChannelCapability().Map(),
+		"claude/channel": map[string]any{
 			"version":     "1",
 			"description": "Push events into client sessions via named channels",
 			"channels": []string{
 				"agent.complete",
 				"agent.blocked",
 				"agent.status",
 				"build.complete",
 				"build.failed",
 				"brain.recall.complete",
 				"inbox.message",
 				"process.exit",
 				"harvest.complete",
 				"test.result",
 			},
 		},
 	}
 }
 // ClaudeChannelCapability returns the typed experimental capability descriptor.
 //
 //	cap := ClaudeChannelCapability()
 //	caps := cap.Map()
 func ClaudeChannelCapability() ChannelCapabilitySpec {
 	return ChannelCapabilitySpec{
 		Version:     "1",
 		Description: "Push events into client sessions via named channels",
 		Channels:    channelCapabilityChannels(),
 	}
 }
 // ChannelCapability returns the experimental capability descriptor registered
 // during New(). Callers can reuse it when exposing server metadata.
 //
 //	caps := ChannelCapability()
 func ChannelCapability() map[string]any {
 	return channelCapability()
 }
 // channelCapabilityChannels lists the named channel events advertised by the
 // experimental capability.
 func channelCapabilityChannels() []string {
 	return slices.Clone(channelCapabilityList)
 }
 // ChannelCapabilityChannels returns the named channel events advertised by the
 // experimental capability.
 //
 //	channels := ChannelCapabilityChannels()
 func ChannelCapabilityChannels() []string {
 	return channelCapabilityChannels()
 }
--- a/pkg/mcp/notify_test.go
+++ b/pkg/mcp/notify_test.go
@ -1,570 +0,0 @@
 package mcp
 import (
 	"bufio"
 	"context"
 	"encoding/json"
 	"net"
 	"reflect"
 	"slices"
 	"testing"
 	"time"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 type notificationReadResult struct {
 	msg map[string]any
 	err error
 }
 func connectNotificationSession(t *testing.T, svc *Service) (context.CancelFunc, *mcp.ServerSession, net.Conn) {
 	t.Helper()
 	serverConn, clientConn := net.Pipe()
 	ctx, cancel := context.WithCancel(context.Background())
 	session, err := svc.server.Connect(ctx, &connTransport{conn: serverConn}, nil)
 	if err != nil {
 		cancel()
 		clientConn.Close()
 		t.Fatalf("Connect() failed: %v", err)
 	}
 	return cancel, session, clientConn
 }
 func readNotificationMessage(t *testing.T, conn net.Conn) <-chan notificationReadResult {
 	t.Helper()
 	resultCh := make(chan notificationReadResult, 1)
 	go func() {
 		scanner := bufio.NewScanner(conn)
 		scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
 		if !scanner.Scan() {
 			resultCh <- notificationReadResult{err: scanner.Err()}
 			return
 		}
 		var msg map[string]any
 		if err := json.Unmarshal(scanner.Bytes(), &msg); err != nil {
 			resultCh <- notificationReadResult{err: err}
 			return
 		}
 		resultCh <- notificationReadResult{msg: msg}
 	}()
 	return resultCh
 }
 func readNotificationMessageUntil(t *testing.T, conn net.Conn, match func(map[string]any) bool) <-chan notificationReadResult {
 	t.Helper()
 	resultCh := make(chan notificationReadResult, 1)
 	scanner := bufio.NewScanner(conn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
 	go func() {
 		for scanner.Scan() {
 			var msg map[string]any
 			if err := json.Unmarshal(scanner.Bytes(), &msg); err != nil {
 				resultCh <- notificationReadResult{err: err}
 				return
 			}
 			if match(msg) {
 				resultCh <- notificationReadResult{msg: msg}
 				return
 			}
 		}
 		if err := scanner.Err(); err != nil {
 			resultCh <- notificationReadResult{err: err}
 			return
 		}
 		resultCh <- notificationReadResult{err: context.DeadlineExceeded}
 	}()
 	return resultCh
 }
 func TestSendNotificationToAllClients_Good(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	ctx := context.Background()
 	svc.SendNotificationToAllClients(ctx, "info", "test", map[string]any{
 		"event": ChannelBuildComplete,
 	})
 }
 func TestNotificationMethods_Good_NilService(t *testing.T) {
 	var svc *Service
 	ctx := context.Background()
 	svc.SendNotificationToAllClients(ctx, "info", "test", map[string]any{"ok": true})
 	svc.SendNotificationToSession(ctx, nil, "info", "test", map[string]any{"ok": true})
 	svc.ChannelSend(ctx, ChannelBuildComplete, map[string]any{"ok": true})
 	svc.ChannelSendToSession(ctx, nil, ChannelBuildComplete, map[string]any{"ok": true})
 	for range svc.Sessions() {
 		t.Fatal("expected no sessions from nil service")
 	}
 }
 func TestNotificationMethods_Good_NilServer(t *testing.T) {
 	svc := &Service{}
 	ctx := context.Background()
 	svc.SendNotificationToAllClients(ctx, "info", "test", map[string]any{"ok": true})
 	svc.SendNotificationToSession(ctx, nil, "info", "test", map[string]any{"ok": true})
 	svc.ChannelSend(ctx, ChannelBuildComplete, map[string]any{"ok": true})
 	svc.ChannelSendToSession(ctx, nil, ChannelBuildComplete, map[string]any{"ok": true})
 	for range svc.Sessions() {
 		t.Fatal("expected no sessions from service without a server")
 	}
 }
 func TestSessions_Good_ReturnsSnapshot(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	cancel, session, _ := connectNotificationSession(t, svc)
 	snapshot := svc.Sessions()
 	cancel()
 	session.Close()
 	var sessions []*mcp.ServerSession
 	for session := range snapshot {
 		sessions = append(sessions, session)
 	}
 	if len(sessions) != 1 {
 		t.Fatalf("expected snapshot to retain one session, got %d", len(sessions))
 	}
 	if sessions[0] == nil {
 		t.Fatal("expected snapshot session to be non-nil")
 	}
 }
 func TestNotificationMethods_Good_NilContext(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	svc.SendNotificationToAllClients(nil, "info", "test", map[string]any{"ok": true})
 	svc.SendNotificationToSession(nil, nil, "info", "test", map[string]any{"ok": true})
 	svc.ChannelSend(nil, ChannelBuildComplete, map[string]any{"ok": true})
 	svc.ChannelSendToSession(nil, nil, ChannelBuildComplete, map[string]any{"ok": true})
 }
 func TestSendNotificationToAllClients_Good_CustomNotification(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	serverConn, clientConn := net.Pipe()
 	defer clientConn.Close()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	session, err := svc.server.Connect(ctx, &connTransport{conn: serverConn}, nil)
 	if err != nil {
 		t.Fatalf("Connect() failed: %v", err)
 	}
 	defer session.Close()
 	clientConn.SetDeadline(time.Now().Add(5 * time.Second))
 	read := readNotificationMessageUntil(t, clientConn, func(msg map[string]any) bool {
 		return msg["method"] == LoggingNotificationMethod
 	})
 	sent := make(chan struct{})
 	go func() {
 		svc.SendNotificationToAllClients(ctx, "info", "test", map[string]any{
 			"event": ChannelBuildComplete,
 		})
 		close(sent)
 	}()
 	select {
 	case <-sent:
 	case <-time.After(5 * time.Second):
 		t.Fatal("timed out waiting for notification send to complete")
 	}
 	res := <-read
 	if res.err != nil {
 		t.Fatalf("failed to read notification: %v", res.err)
 	}
 	msg := res.msg
 	if msg["method"] != LoggingNotificationMethod {
 		t.Fatalf("expected method %q, got %v", LoggingNotificationMethod, msg["method"])
 	}
 	params, ok := msg["params"].(map[string]any)
 	if !ok {
 		t.Fatalf("expected params object, got %T", msg["params"])
 	}
 	if params["logger"] != "test" {
 		t.Fatalf("expected logger test, got %v", params["logger"])
 	}
 	if params["level"] != "info" {
 		t.Fatalf("expected level info, got %v", params["level"])
 	}
 	data, ok := params["data"].(map[string]any)
 	if !ok {
 		t.Fatalf("expected data object, got %T", params["data"])
 	}
 	if data["event"] != ChannelBuildComplete {
 		t.Fatalf("expected event %s, got %v", ChannelBuildComplete, data["event"])
 	}
 }
 func TestChannelSend_Good(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	ctx := context.Background()
 	svc.ChannelSend(ctx, ChannelBuildComplete, map[string]any{
 		"repo": "go-io",
 	})
 }
 func TestChannelSendToSession_Good_GuardNilSession(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	ctx := context.Background()
 	svc.ChannelSendToSession(ctx, nil, ChannelAgentStatus, map[string]any{
 		"ok": true,
 	})
 }
 func TestSendNotificationToSession_Good_GuardNilSession(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	ctx := context.Background()
 	svc.SendNotificationToSession(ctx, nil, "info", "test", map[string]any{
 		"ok": true,
 	})
 }
 func TestChannelSendToSession_Good_CustomNotification(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	serverConn, clientConn := net.Pipe()
 	defer clientConn.Close()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	session, err := svc.server.Connect(ctx, &connTransport{conn: serverConn}, nil)
 	if err != nil {
 		t.Fatalf("Connect() failed: %v", err)
 	}
 	defer session.Close()
 	clientConn.SetDeadline(time.Now().Add(5 * time.Second))
 	read := readNotificationMessageUntil(t, clientConn, func(msg map[string]any) bool {
 		return msg["method"] == ChannelNotificationMethod
 	})
 	sent := make(chan struct{})
 	go func() {
 		svc.ChannelSendToSession(ctx, session, ChannelBuildComplete, map[string]any{
 			"repo": "go-io",
 		})
 		close(sent)
 	}()
 	select {
 	case <-sent:
 	case <-time.After(5 * time.Second):
 		t.Fatal("timed out waiting for notification send to complete")
 	}
 	res := <-read
 	if res.err != nil {
 		t.Fatalf("failed to read custom notification: %v", res.err)
 	}
 	msg := res.msg
 	if msg["method"] != ChannelNotificationMethod {
 		t.Fatalf("expected method %q, got %v", ChannelNotificationMethod, msg["method"])
 	}
 	params, ok := msg["params"].(map[string]any)
 	if !ok {
 		t.Fatalf("expected params object, got %T", msg["params"])
 	}
 	if params["channel"] != ChannelBuildComplete {
 		t.Fatalf("expected channel %s, got %v", ChannelBuildComplete, params["channel"])
 	}
 	payload, ok := params["data"].(map[string]any)
 	if !ok {
 		t.Fatalf("expected data object, got %T", params["data"])
 	}
 	if payload["repo"] != "go-io" {
 		t.Fatalf("expected repo go-io, got %v", payload["repo"])
 	}
 }
 func TestChannelSendToClient_Good_CustomNotification(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	serverConn, clientConn := net.Pipe()
 	defer clientConn.Close()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	session, err := svc.server.Connect(ctx, &connTransport{conn: serverConn}, nil)
 	if err != nil {
 		t.Fatalf("Connect() failed: %v", err)
 	}
 	defer session.Close()
 	clientConn.SetDeadline(time.Now().Add(5 * time.Second))
 	read := readNotificationMessageUntil(t, clientConn, func(msg map[string]any) bool {
 		return msg["method"] == ChannelNotificationMethod
 	})
 	sent := make(chan struct{})
 	go func() {
 		svc.ChannelSendToClient(ctx, session, ChannelBuildComplete, map[string]any{
 			"repo": "go-io",
 		})
 		close(sent)
 	}()
 	select {
 	case <-sent:
 	case <-time.After(5 * time.Second):
 		t.Fatal("timed out waiting for notification send to complete")
 	}
 	res := <-read
 	if res.err != nil {
 		t.Fatalf("failed to read custom notification: %v", res.err)
 	}
 	msg := res.msg
 	if msg["method"] != ChannelNotificationMethod {
 		t.Fatalf("expected method %q, got %v", ChannelNotificationMethod, msg["method"])
 	}
 }
 func TestSendNotificationToClient_Good_CustomNotification(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	serverConn, clientConn := net.Pipe()
 	defer clientConn.Close()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	session, err := svc.server.Connect(ctx, &connTransport{conn: serverConn}, nil)
 	if err != nil {
 		t.Fatalf("Connect() failed: %v", err)
 	}
 	defer session.Close()
 	clientConn.SetDeadline(time.Now().Add(5 * time.Second))
 	read := readNotificationMessageUntil(t, clientConn, func(msg map[string]any) bool {
 		return msg["method"] == LoggingNotificationMethod
 	})
 	sent := make(chan struct{})
 	go func() {
 		svc.SendNotificationToClient(ctx, session, "info", "test", map[string]any{
 			"event": ChannelBuildComplete,
 		})
 		close(sent)
 	}()
 	select {
 	case <-sent:
 	case <-time.After(5 * time.Second):
 		t.Fatal("timed out waiting for notification send to complete")
 	}
 	res := <-read
 	if res.err != nil {
 		t.Fatalf("failed to read notification: %v", res.err)
 	}
 	msg := res.msg
 	if msg["method"] != LoggingNotificationMethod {
 		t.Fatalf("expected method %q, got %v", LoggingNotificationMethod, msg["method"])
 	}
 }
 func TestChannelCapability_Good(t *testing.T) {
 	caps := channelCapability()
 	raw, ok := caps[ClaudeChannelCapabilityName]
 	if !ok {
 		t.Fatal("expected claude/channel capability entry")
 	}
 	cap, ok := raw.(map[string]any)
 	if !ok {
 		t.Fatalf("expected claude/channel to be a map, got %T", raw)
 	}
 	if cap["version"] == nil || cap["description"] == nil {
 		t.Fatalf("expected capability to include version and description: %#v", cap)
 	}
 	channels, ok := cap["channels"].([]string)
 	if !ok {
 		t.Fatalf("expected channels to be []string, got %T", cap["channels"])
 	}
 	if len(channels) == 0 {
 		t.Fatal("expected at least one channel in capability definition")
 	}
 	want := channelCapabilityChannels()
 	if got, wantLen := len(channels), len(want); got != wantLen {
 		t.Fatalf("expected %d channels, got %d", wantLen, got)
 	}
 	for _, channel := range want {
 		if !slices.Contains(channels, channel) {
 			t.Fatalf("expected channel %q to be advertised in capability definition", channel)
 		}
 	}
 }
 func TestChannelCapability_Good_PublicHelpers(t *testing.T) {
 	got := ChannelCapability()
 	want := channelCapability()
 	if !reflect.DeepEqual(got, want) {
 		t.Fatalf("expected public capability helper to match internal definition")
 	}
 	spec := ClaudeChannelCapability()
 	if spec.Version != "1" {
 		t.Fatalf("expected typed capability version 1, got %q", spec.Version)
 	}
 	if spec.Description == "" {
 		t.Fatal("expected typed capability description to be populated")
 	}
 	if !slices.Equal(spec.Channels, channelCapabilityChannels()) {
 		t.Fatalf("expected typed capability channels to match: got %v want %v", spec.Channels, channelCapabilityChannels())
 	}
 	if !reflect.DeepEqual(spec.Map(), want[ClaudeChannelCapabilityName].(map[string]any)) {
 		t.Fatal("expected typed capability map to match wire-format descriptor")
 	}
 	gotChannels := ChannelCapabilityChannels()
 	wantChannels := channelCapabilityChannels()
 	if !slices.Equal(gotChannels, wantChannels) {
 		t.Fatalf("expected public channel list to match internal definition: got %v want %v", gotChannels, wantChannels)
 	}
 }
 func TestChannelCapabilitySpec_Map_Good_ClonesChannels(t *testing.T) {
 	spec := ClaudeChannelCapability()
 	mapped := spec.Map()
 	channels, ok := mapped["channels"].([]string)
 	if !ok {
 		t.Fatalf("expected channels to be []string, got %T", mapped["channels"])
 	}
 	if len(channels) == 0 {
 		t.Fatal("expected non-empty channels slice")
 	}
 	spec.Channels[0] = "mutated.channel"
 	if channels[0] == "mutated.channel" {
 		t.Fatal("expected Map() to clone the channels slice")
 	}
 }
 func TestSendNotificationToAllClients_Good_BroadcastsToMultipleSessions(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	cancel1, session1, clientConn1 := connectNotificationSession(t, svc)
 	defer cancel1()
 	defer session1.Close()
 	defer clientConn1.Close()
 	cancel2, session2, clientConn2 := connectNotificationSession(t, svc)
 	defer cancel2()
 	defer session2.Close()
 	defer clientConn2.Close()
 	read1 := readNotificationMessage(t, clientConn1)
 	read2 := readNotificationMessage(t, clientConn2)
 	sent := make(chan struct{})
 	go func() {
 		svc.SendNotificationToAllClients(ctx, "info", "test", map[string]any{
 			"event": ChannelBuildComplete,
 		})
 		close(sent)
 	}()
 	select {
 	case <-sent:
 	case <-time.After(5 * time.Second):
 		t.Fatal("timed out waiting for broadcast to complete")
 	}
 	res1 := <-read1
 	if res1.err != nil {
 		t.Fatalf("failed to read notification from session 1: %v", res1.err)
 	}
 	res2 := <-read2
 	if res2.err != nil {
 		t.Fatalf("failed to read notification from session 2: %v", res2.err)
 	}
 	for idx, res := range []notificationReadResult{res1, res2} {
 		if res.msg["method"] != LoggingNotificationMethod {
 			t.Fatalf("session %d: expected method %q, got %v", idx+1, LoggingNotificationMethod, res.msg["method"])
 		}
 		params, ok := res.msg["params"].(map[string]any)
 		if !ok {
 			t.Fatalf("session %d: expected params object, got %T", idx+1, res.msg["params"])
 		}
 		if params["logger"] != "test" {
 			t.Fatalf("session %d: expected logger test, got %v", idx+1, params["logger"])
 		}
 	}
 }
--- a/pkg/mcp/process_notifications.go
+++ b/pkg/mcp/process_notifications.go
@ -1,124 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"time"
 	core "dappco.re/go/core"
 )
 type processRuntime struct {
 	Command   string
 	Args      []string
 	Dir       string
 	StartedAt time.Time
 }
 func (s *Service) recordProcessRuntime(id string, meta processRuntime) {
 	if id == "" {
 		return
 	}
 	s.processMu.Lock()
 	defer s.processMu.Unlock()
 	if s.processMeta == nil {
 		s.processMeta = make(map[string]processRuntime)
 	}
 	s.processMeta[id] = meta
 }
 func (s *Service) processRuntimeFor(id string) (processRuntime, bool) {
 	s.processMu.Lock()
 	defer s.processMu.Unlock()
 	meta, ok := s.processMeta[id]
 	return meta, ok
 }
 func (s *Service) forgetProcessRuntime(id string) {
 	if id == "" {
 		return
 	}
 	s.processMu.Lock()
 	defer s.processMu.Unlock()
 	delete(s.processMeta, id)
 }
 func isTestProcess(command string, args []string) bool {
 	base := core.Lower(core.PathBase(command))
 	if base == "" {
 		return false
 	}
 	switch base {
 	case "go":
 		return len(args) > 0 && core.Lower(args[0]) == "test"
 	case "cargo":
 		return len(args) > 0 && core.Lower(args[0]) == "test"
 	case "npm", "pnpm", "yarn", "bun":
 		for _, arg := range args {
 			lower := core.Lower(arg)
 			if lower == "test" || core.HasPrefix(lower, "test:") {
 				return true
 			}
 		}
 		return false
 	case "pytest", "phpunit", "jest", "vitest", "rspec", "go-test":
 		return true
 	}
 	return false
 }
 func (s *Service) emitTestResult(ctx context.Context, processID string, exitCode int, duration time.Duration, signal string, errText string) {
 	defer s.forgetProcessRuntime(processID)
 	meta, ok := s.processRuntimeFor(processID)
 	if !ok || !isTestProcess(meta.Command, meta.Args) {
 		return
 	}
 	if duration <= 0 && !meta.StartedAt.IsZero() {
 		duration = time.Since(meta.StartedAt)
 	}
 	status := "failed"
 	if signal != "" {
 		status = "aborted"
 	} else if exitCode == 0 {
 		status = "passed"
 	}
 	payload := map[string]any{
 		"id":      processID,
 		"command": meta.Command,
 		"args":    meta.Args,
 		"status":  status,
 		"passed":  status == "passed",
 	}
 	if meta.Dir != "" {
 		payload["dir"] = meta.Dir
 	}
 	if !meta.StartedAt.IsZero() {
 		payload["startedAt"] = meta.StartedAt
 	}
 	if duration > 0 {
 		payload["duration"] = duration
 	}
 	if signal == "" || exitCode != 0 {
 		payload["exitCode"] = exitCode
 	}
 	if signal != "" {
 		payload["signal"] = signal
 	}
 	if errText != "" {
 		payload["error"] = errText
 	}
 	s.ChannelSend(ctx, ChannelTestResult, payload)
 }
--- a/pkg/mcp/register.go
+++ b/pkg/mcp/register.go
@ -1,187 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"time"
 	core "dappco.re/go/core"
 	"dappco.re/go/core/process"
 	"dappco.re/go/core/ws"
 )
 // Register is the service factory for core.WithService.
 // Creates the MCP service, discovers subsystems from other Core services,
 // and wires optional process and WebSocket dependencies when they are
 // already registered in Core.
 //
 //	core.New(
 //	    core.WithService(agentic.Register),
 //	    core.WithService(monitor.Register),
 //	    core.WithService(brain.Register),
 //	    core.WithService(mcp.Register),
 //	)
 func Register(c *core.Core) core.Result {
 	// Collect subsystems from registered services
 	var subsystems []Subsystem
 	var processService *process.Service
 	var wsHub *ws.Hub
 	for _, name := range c.Services() {
 		r := c.Service(name)
 		if !r.OK {
 			continue
 		}
 		if sub, ok := r.Value.(Subsystem); ok {
 			subsystems = append(subsystems, sub)
 			continue
 		}
 		switch v := r.Value.(type) {
 		case *process.Service:
 			processService = v
 		case *ws.Hub:
 			wsHub = v
 		}
 	}
 	svc, err := New(Options{
 		ProcessService: processService,
 		WSHub:          wsHub,
 		Subsystems:     subsystems,
 	})
 	if err != nil {
 		return core.Result{Value: err, OK: false}
 	}
 	svc.ServiceRuntime = core.NewServiceRuntime(c, struct{}{})
 	return core.Result{Value: svc, OK: true}
 }
 // OnStartup implements core.Startable — registers MCP transport commands.
 //
 //	svc.OnStartup(context.Background())
 //
 //	core-agent mcp    — start MCP server on stdio
 //	core-agent serve  — start MCP server on HTTP
 func (s *Service) OnStartup(ctx context.Context) core.Result {
 	c := s.Core()
 	if c == nil {
 		return core.Result{OK: true}
 	}
 	c.Command("mcp", core.Command{
 		Description: "Start the MCP server on stdio",
 		Action: func(opts core.Options) core.Result {
 			s.logger.Info("MCP stdio server starting")
 			if err := s.ServeStdio(ctx); err != nil {
 				return core.Result{Value: err, OK: false}
 			}
 			return core.Result{OK: true}
 		},
 	})
 	c.Command("serve", core.Command{
 		Description: "Start the MCP server with auto-selected transport",
 		Action: func(opts core.Options) core.Result {
 			s.logger.Info("MCP server starting")
 			if err := s.Run(ctx); err != nil {
 				return core.Result{Value: err, OK: false}
 			}
 			return core.Result{OK: true}
 		},
 	})
 	return core.Result{OK: true}
 }
 // HandleIPCEvents implements Core's IPC handler interface.
 //
 //	c.ACTION(mcp.ChannelPush{Channel: "agent.status", Data: statusMap})
 // Catches ChannelPush messages from other services and pushes them to Claude Code sessions.
 func (s *Service) HandleIPCEvents(c *core.Core, msg core.Message) core.Result {
 	ctx := context.Background()
 	if c != nil {
 		if coreCtx := c.Context(); coreCtx != nil {
 			ctx = coreCtx
 		}
 	}
 	switch ev := msg.(type) {
 	case ChannelPush:
 		s.ChannelSend(ctx, ev.Channel, ev.Data)
 	case process.ActionProcessStarted:
 		startedAt := time.Now()
 		s.recordProcessRuntime(ev.ID, processRuntime{
 			Command:   ev.Command,
 			Args:      ev.Args,
 			Dir:       ev.Dir,
 			StartedAt: startedAt,
 		})
 		s.ChannelSend(ctx, ChannelProcessStart, map[string]any{
 			"id":        ev.ID,
 			"command":   ev.Command,
 			"args":      ev.Args,
 			"dir":       ev.Dir,
 			"pid":       ev.PID,
 			"startedAt": startedAt,
 		})
 	case process.ActionProcessOutput:
 		s.ChannelSend(ctx, ChannelProcessOutput, map[string]any{
 			"id":     ev.ID,
 			"line":   ev.Line,
 			"stream": ev.Stream,
 		})
 	case process.ActionProcessExited:
 		meta, ok := s.processRuntimeFor(ev.ID)
 		payload := map[string]any{
 			"id":       ev.ID,
 			"exitCode": ev.ExitCode,
 			"duration": ev.Duration,
 		}
 		if ok {
 			payload["command"] = meta.Command
 			payload["args"] = meta.Args
 			payload["dir"] = meta.Dir
 			if !meta.StartedAt.IsZero() {
 				payload["startedAt"] = meta.StartedAt
 			}
 		}
 		if ev.Error != nil {
 			payload["error"] = ev.Error.Error()
 		}
 		s.ChannelSend(ctx, ChannelProcessExit, payload)
 		errText := ""
 		if ev.Error != nil {
 			errText = ev.Error.Error()
 		}
 		s.emitTestResult(ctx, ev.ID, ev.ExitCode, ev.Duration, "", errText)
 	case process.ActionProcessKilled:
 		meta, ok := s.processRuntimeFor(ev.ID)
 		payload := map[string]any{
 			"id":     ev.ID,
 			"signal": ev.Signal,
 		}
 		if ok {
 			payload["command"] = meta.Command
 			payload["args"] = meta.Args
 			payload["dir"] = meta.Dir
 			if !meta.StartedAt.IsZero() {
 				payload["startedAt"] = meta.StartedAt
 			}
 		}
 		s.ChannelSend(ctx, ChannelProcessExit, payload)
 		s.emitTestResult(ctx, ev.ID, 0, 0, ev.Signal, "")
 	}
 	return core.Result{OK: true}
 }
 // OnShutdown implements core.Stoppable — stops the MCP transport.
 //
 //	svc.OnShutdown(context.Background())
 func (s *Service) OnShutdown(ctx context.Context) core.Result {
 	if err := s.Shutdown(ctx); err != nil {
 		return core.Result{Value: err, OK: false}
 	}
 	return core.Result{OK: true}
 }
--- a/pkg/mcp/register_test.go
+++ b/pkg/mcp/register_test.go
@ -1,334 +0,0 @@
 package mcp
 import (
 	"bufio"
 	"context"
 	"encoding/json"
 	"net"
 	"testing"
 	"time"
 	"dappco.re/go/core"
 	"dappco.re/go/core/process"
 	"dappco.re/go/core/ws"
 )
 func TestRegister_Good_WiresOptionalServices(t *testing.T) {
 	c := core.New()
 	ps := &process.Service{}
 	hub := ws.NewHub()
 	if r := c.RegisterService("process", ps); !r.OK {
 		t.Fatalf("failed to register process service: %v", r.Value)
 	}
 	if r := c.RegisterService("ws", hub); !r.OK {
 		t.Fatalf("failed to register ws hub: %v", r.Value)
 	}
 	result := Register(c)
 	if !result.OK {
 		t.Fatalf("Register() failed: %v", result.Value)
 	}
 	svc, ok := result.Value.(*Service)
 	if !ok {
 		t.Fatalf("expected *Service, got %T", result.Value)
 	}
 	if svc.ProcessService() != ps {
 		t.Fatalf("expected process service to be wired")
 	}
 	if svc.WSHub() != hub {
 		t.Fatalf("expected ws hub to be wired")
 	}
 	tools := map[string]bool{}
 	for _, rec := range svc.Tools() {
 		tools[rec.Name] = true
 	}
 	if !tools["process_start"] {
 		t.Fatal("expected process tools to be registered when process service is available")
 	}
 	if !tools["ws_start"] {
 		t.Fatal("expected ws tools to be registered when ws hub is available")
 	}
 }
 func TestHandleIPCEvents_Good_ForwardsProcessActions(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	serverConn, clientConn := net.Pipe()
 	defer clientConn.Close()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	session, err := svc.server.Connect(ctx, &connTransport{conn: serverConn}, nil)
 	if err != nil {
 		t.Fatalf("Connect() failed: %v", err)
 	}
 	defer session.Close()
 	clientConn.SetDeadline(time.Now().Add(5 * time.Second))
 	scanner := bufio.NewScanner(clientConn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
 	received := make(chan map[string]any, 8)
 	errCh := make(chan error, 1)
 	go func() {
 		for scanner.Scan() {
 			var msg map[string]any
 			if err := json.Unmarshal(scanner.Bytes(), &msg); err != nil {
 				errCh <- err
 				return
 			}
 			received <- msg
 		}
 		if err := scanner.Err(); err != nil {
 			errCh <- err
 			return
 		}
 		close(received)
 	}()
 	result := svc.HandleIPCEvents(nil, process.ActionProcessStarted{
 		ID:      "proc-1",
 		Command: "go",
 		Args:    []string{"test", "./..."},
 		Dir:     "/workspace",
 		PID:     1234,
 	})
 	if !result.OK {
 		t.Fatalf("HandleIPCEvents() returned non-OK result: %#v", result.Value)
 	}
 	deadline := time.NewTimer(5 * time.Second)
 	defer deadline.Stop()
 	for {
 		select {
 		case err := <-errCh:
 			t.Fatalf("failed to read notification: %v", err)
 		case msg, ok := <-received:
 			if !ok {
 				t.Fatal("notification stream closed before expected message arrived")
 			}
 			if msg["method"] != ChannelNotificationMethod {
 				continue
 			}
 			params, ok := msg["params"].(map[string]any)
 			if !ok {
 				t.Fatalf("expected params object, got %T", msg["params"])
 			}
 			if params["channel"] != ChannelProcessStart {
 				continue
 			}
 			payload, ok := params["data"].(map[string]any)
 			if !ok {
 				t.Fatalf("expected data object, got %T", params["data"])
 			}
 			if payload["id"] != "proc-1" || payload["command"] != "go" {
 				t.Fatalf("unexpected payload: %#v", payload)
 			}
 			if payload["dir"] != "/workspace" {
 				t.Fatalf("expected dir /workspace, got %#v", payload["dir"])
 			}
 			if payload["pid"] != float64(1234) {
 				t.Fatalf("expected pid 1234, got %#v", payload["pid"])
 			}
 			if payload["args"] == nil {
 				t.Fatalf("expected args in payload, got %#v", payload)
 			}
 			return
 		case <-deadline.C:
 			t.Fatal("timed out waiting for process start notification")
 		}
 	}
 }
 func TestHandleIPCEvents_Good_ForwardsProcessOutput(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	serverConn, clientConn := net.Pipe()
 	defer clientConn.Close()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	session, err := svc.server.Connect(ctx, &connTransport{conn: serverConn}, nil)
 	if err != nil {
 		t.Fatalf("Connect() failed: %v", err)
 	}
 	defer session.Close()
 	clientConn.SetDeadline(time.Now().Add(5 * time.Second))
 	scanner := bufio.NewScanner(clientConn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
 	received := make(chan map[string]any, 8)
 	errCh := make(chan error, 1)
 	go func() {
 		for scanner.Scan() {
 			var msg map[string]any
 			if err := json.Unmarshal(scanner.Bytes(), &msg); err != nil {
 				errCh <- err
 				return
 			}
 			received <- msg
 		}
 		if err := scanner.Err(); err != nil {
 			errCh <- err
 			return
 		}
 		close(received)
 	}()
 	result := svc.HandleIPCEvents(nil, process.ActionProcessOutput{
 		ID:     "proc-1",
 		Line:   "hello world",
 		Stream: process.StreamStdout,
 	})
 	if !result.OK {
 		t.Fatalf("HandleIPCEvents() returned non-OK result: %#v", result.Value)
 	}
 	deadline := time.NewTimer(5 * time.Second)
 	defer deadline.Stop()
 	for {
 		select {
 		case err := <-errCh:
 			t.Fatalf("failed to read notification: %v", err)
 		case msg, ok := <-received:
 			if !ok {
 				t.Fatal("notification stream closed before expected message arrived")
 			}
 			if msg["method"] != ChannelNotificationMethod {
 				continue
 			}
 			params, ok := msg["params"].(map[string]any)
 			if !ok {
 				t.Fatalf("expected params object, got %T", msg["params"])
 			}
 			if params["channel"] != ChannelProcessOutput {
 				continue
 			}
 			payload, ok := params["data"].(map[string]any)
 			if !ok {
 				t.Fatalf("expected data object, got %T", msg["params"])
 			}
 			if payload["id"] != "proc-1" || payload["line"] != "hello world" || payload["stream"] != string(process.StreamStdout) {
 				t.Fatalf("unexpected payload: %#v", payload)
 			}
 			return
 		case <-deadline.C:
 			t.Fatal("timed out waiting for process output notification")
 		}
 	}
 }
 func TestHandleIPCEvents_Good_ForwardsTestResult(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	serverConn, clientConn := net.Pipe()
 	defer clientConn.Close()
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	session, err := svc.server.Connect(ctx, &connTransport{conn: serverConn}, nil)
 	if err != nil {
 		t.Fatalf("Connect() failed: %v", err)
 	}
 	defer session.Close()
 	svc.recordProcessRuntime("proc-test", processRuntime{
 		Command:   "go",
 		Args:      []string{"test", "./..."},
 		StartedAt: time.Now().Add(-2 * time.Second),
 	})
 	clientConn.SetDeadline(time.Now().Add(5 * time.Second))
 	scanner := bufio.NewScanner(clientConn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
 	received := make(chan map[string]any, 8)
 	errCh := make(chan error, 1)
 	go func() {
 		for scanner.Scan() {
 			var msg map[string]any
 			if err := json.Unmarshal(scanner.Bytes(), &msg); err != nil {
 				errCh <- err
 				return
 			}
 			received <- msg
 		}
 		if err := scanner.Err(); err != nil {
 			errCh <- err
 			return
 		}
 		close(received)
 	}()
 	result := svc.HandleIPCEvents(nil, process.ActionProcessExited{
 		ID:       "proc-test",
 		ExitCode: 0,
 		Duration: 2 * time.Second,
 	})
 	if !result.OK {
 		t.Fatalf("HandleIPCEvents() returned non-OK result: %#v", result.Value)
 	}
 	deadline := time.NewTimer(5 * time.Second)
 	defer deadline.Stop()
 	for {
 		select {
 		case err := <-errCh:
 			t.Fatalf("failed to read notification: %v", err)
 		case msg, ok := <-received:
 			if !ok {
 				t.Fatal("notification stream closed before expected message arrived")
 			}
 			if msg["method"] != ChannelNotificationMethod {
 				continue
 			}
 			params, ok := msg["params"].(map[string]any)
 			if !ok {
 				t.Fatalf("expected params object, got %T", msg["params"])
 			}
 			if params["channel"] != ChannelTestResult {
 				continue
 			}
 			payload, ok := params["data"].(map[string]any)
 			if !ok {
 				t.Fatalf("expected data object, got %T", msg["params"])
 			}
 			if payload["id"] != "proc-test" || payload["command"] != "go" {
 				t.Fatalf("unexpected payload: %#v", payload)
 			}
 			if payload["dir"] != nil {
 				t.Fatalf("expected dir to be absent when not recorded, got %#v", payload["dir"])
 			}
 			if payload["status"] != "passed" || payload["passed"] != true {
 				t.Fatalf("expected passed test result, got %#v", payload)
 			}
 			return
 		case <-deadline.C:
 			t.Fatal("timed out waiting for test result notification")
 		}
 	}
 }
--- a/pkg/mcp/registry.go
+++ b/pkg/mcp/registry.go
@ -4,10 +4,11 @@ package mcp
 import (
 	"context"
 	"encoding/json"
 	"iter"
 	"reflect"
-	"time"
+	"strings"
 	core "dappco.re/go/core"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -21,38 +22,6 @@ import (
 //	}
 type RESTHandler func(ctx context.Context, body []byte) (any, error)
 // errInvalidRESTInput marks malformed JSON bodies for the REST bridge.
 var errInvalidRESTInput = &restInputError{}
 // restInputError preserves invalid-REST-input identity without stdlib
 // error constructors so bridge.go can keep using errors.Is.
 type restInputError struct {
 	cause error
 }
 func (e *restInputError) Error() string {
 	if e == nil || e.cause == nil {
 		return "invalid REST input"
 	}
 	return "invalid REST input: " + e.cause.Error()
 }
 func (e *restInputError) Unwrap() error {
 	if e == nil {
 		return nil
 	}
 	return e.cause
 }
 func (e *restInputError) Is(target error) bool {
 	_, ok := target.(*restInputError)
 	return ok
 }
 func invalidRESTInputError(cause error) error {
 	return &restInputError{cause: cause}
 }
 // ToolRecord captures metadata about a registered MCP tool.
 //
 //	for _, rec := range svc.Tools() {
@ -67,63 +36,18 @@ type ToolRecord struct {
 	RESTHandler  RESTHandler    // REST-callable handler created at registration time
 }
-// AddToolRecorded registers a tool with the MCP server and records its metadata.
+// addToolRecorded registers a tool with the MCP server AND records its metadata.
 // This is a generic function that captures the In/Out types for schema extraction.
 // It also creates a RESTHandler closure that can unmarshal JSON to the correct
 // input type and call the handler directly, enabling the MCP-to-REST bridge.
-//
+func addToolRecorded[In, Out any](s *Service, server *mcp.Server, group string, t *mcp.Tool, h mcp.ToolHandlerFor[In, Out]) {
-//	svc, _ := mcp.New(mcp.Options{})
+	mcp.AddTool(server, t, h)
 //	mcp.AddToolRecorded(svc, svc.Server(), "files", &mcp.Tool{Name: "file_read"},
 //	    func(context.Context, *mcp.CallToolRequest, ReadFileInput) (*mcp.CallToolResult, ReadFileOutput, error) {
 //	        return nil, ReadFileOutput{Path: "src/main.go"}, nil
 //	    })
 func AddToolRecorded[In, Out any](s *Service, server *mcp.Server, group string, t *mcp.Tool, h mcp.ToolHandlerFor[In, Out]) {
 	// Set inputSchema from struct reflection if not already set.
 	// Use server.AddTool (non-generic) to avoid auto-generated outputSchema.
 	// The go-sdk's generic mcp.AddTool generates outputSchema from the Out type,
 	// but Claude Code's protocol (2025-03-26) doesn't support outputSchema.
 	// Removing it reduces tools/list from 214KB to ~74KB.
 	if t.InputSchema == nil {
 		t.InputSchema = structSchema(new(In))
 		if t.InputSchema == nil {
 			t.InputSchema = map[string]any{"type": "object"}
 		}
 	}
 	// Wrap the typed handler into a generic ToolHandler.
 	wrapped := func(ctx context.Context, req *mcp.CallToolRequest) (*mcp.CallToolResult, error) {
 		var input In
 		if req != nil && len(req.Params.Arguments) > 0 {
 			if r := core.JSONUnmarshal(req.Params.Arguments, &input); !r.OK {
 				if err, ok := r.Value.(error); ok {
 					return nil, err
 				}
 			}
 		}
 		if err := s.authorizeToolAccess(ctx, req, t.Name, input); err != nil {
 			return nil, err
 		}
 		result, output, err := h(ctx, req, input)
 		if err != nil {
 			return nil, err
 		}
 		if result != nil {
 			return result, nil
 		}
 		data := core.JSONMarshalString(output)
 		return &mcp.CallToolResult{
 			Content: []mcp.Content{&mcp.TextContent{Text: data}},
 		}, nil
 	}
 	server.AddTool(t, wrapped)
 	restHandler := func(ctx context.Context, body []byte) (any, error) {
 		var input In
 		if len(body) > 0 {
-			if r := core.JSONUnmarshal(body, &input); !r.OK {
+			if err := json.Unmarshal(body, &input); err != nil {
-				if err, ok := r.Value.(error); ok {
+				return nil, err
 					return nil, invalidRESTInputError(err)
 				}
 				return nil, invalidRESTInputError(nil)
 			}
 		}
 		// nil: REST callers have no MCP request context.
@ -142,10 +66,6 @@ func AddToolRecorded[In, Out any](s *Service, server *mcp.Server, group string,
 	})
 }
 func addToolRecorded[In, Out any](s *Service, server *mcp.Server, group string, t *mcp.Tool, h mcp.ToolHandlerFor[In, Out]) {
 	AddToolRecorded(s, server, group, t, h)
 }
 // structSchema builds a simple JSON Schema from a struct's json tags via reflection.
 // Returns nil for non-struct types or empty structs.
 func structSchema(v any) map[string]any {
@ -159,12 +79,62 @@ func structSchema(v any) map[string]any {
 	if t.Kind() != reflect.Struct {
 		return nil
 	}
-	return schemaForType(t, map[reflect.Type]bool{})
+	if t.NumField() == 0 {
 		return map[string]any{"type": "object", "properties": map[string]any{}}
 	}
 	properties := make(map[string]any)
 	required := make([]string, 0)
 	for f := range t.Fields() {
 		f := f
 		if !f.IsExported() {
 			continue
 		}
 		jsonTag := f.Tag.Get("json")
 		if jsonTag == "-" {
 			continue
 		}
 		name := f.Name
 		isOptional := false
 		if jsonTag != "" {
 			parts := splitTag(jsonTag)
 			name = parts[0]
 			for _, p := range parts[1:] {
 				if p == "omitempty" {
 					isOptional = true
 				}
 			}
 		}
 		prop := map[string]any{
 			"type": goTypeToJSONType(f.Type),
 		}
 		properties[name] = prop
 		if !isOptional {
 			required = append(required, name)
 		}
 	}
 	schema := map[string]any{
 		"type":       "object",
 		"properties": properties,
 	}
 	if len(required) > 0 {
 		schema["required"] = required
 	}
 	return schema
 }
 // splitTag splits a struct tag value by commas.
 func splitTag(tag string) []string {
-	return core.Split(tag, ",")
+	return strings.Split(tag, ",")
 }
 // splitTagSeq returns an iterator over the tag parts.
 func splitTagSeq(tag string) iter.Seq[string] {
 	return strings.SplitSeq(tag, ",")
 }
 // goTypeToJSONType maps Go types to JSON Schema types.
@ -187,120 +157,3 @@ func goTypeToJSONType(t reflect.Type) string {
 		return "string"
 	}
 }
 func schemaForType(t reflect.Type, seen map[reflect.Type]bool) map[string]any {
 	if t == nil {
 		return nil
 	}
 	for t.Kind() == reflect.Pointer {
 		t = t.Elem()
 		if t == nil {
 			return nil
 		}
 	}
 	if isTimeType(t) {
 		return map[string]any{
 			"type":   "string",
 			"format": "date-time",
 		}
 	}
 	switch t.Kind() {
 	case reflect.Interface:
 		return map[string]any{}
 	case reflect.Struct:
 		if seen[t] {
 			return map[string]any{"type": "object"}
 		}
 		seen[t] = true
 		properties := make(map[string]any)
 		required := make([]string, 0, t.NumField())
 		for f := range t.Fields() {
 			f := f
 			if !f.IsExported() {
 				continue
 			}
 			jsonTag := f.Tag.Get("json")
 			if jsonTag == "-" {
 				continue
 			}
 			name := f.Name
 			isOptional := false
 			if jsonTag != "" {
 				parts := splitTag(jsonTag)
 				name = parts[0]
 				for _, p := range parts[1:] {
 					if p == "omitempty" {
 						isOptional = true
 					}
 				}
 			}
 			prop := schemaForType(f.Type, cloneSeenSet(seen))
 			if prop == nil {
 				prop = map[string]any{"type": goTypeToJSONType(f.Type)}
 			}
 			properties[name] = prop
 			if !isOptional {
 				required = append(required, name)
 			}
 		}
 		schema := map[string]any{
 			"type":       "object",
 			"properties": properties,
 		}
 		if len(required) > 0 {
 			schema["required"] = required
 		}
 		return schema
 	case reflect.Slice, reflect.Array:
 		schema := map[string]any{
 			"type":  "array",
 			"items": schemaForType(t.Elem(), cloneSeenSet(seen)),
 		}
 		return schema
 	case reflect.Map:
 		schema := map[string]any{
 			"type": "object",
 		}
 		if t.Key().Kind() == reflect.String {
 			if valueSchema := schemaForType(t.Elem(), cloneSeenSet(seen)); valueSchema != nil {
 				schema["additionalProperties"] = valueSchema
 			}
 		}
 		return schema
 	default:
 		if typeName := goTypeToJSONType(t); typeName != "" {
 			return map[string]any{"type": typeName}
 		}
 	}
 	return nil
 }
 func cloneSeenSet(seen map[reflect.Type]bool) map[reflect.Type]bool {
 	if len(seen) == 0 {
 		return map[reflect.Type]bool{}
 	}
 	clone := make(map[reflect.Type]bool, len(seen))
 	for t := range seen {
 		clone[t] = true
 	}
 	return clone
 }
 func isTimeType(t reflect.Type) bool {
 	return t == reflect.TypeOf(time.Time{})
 }
--- a/pkg/mcp/registry_test.go
+++ b/pkg/mcp/registry_test.go
@ -3,11 +3,7 @@
 package mcp
 import (
 	"context"
 	"errors"
 	"testing"
 	"dappco.re/go/core/process"
 )
 func TestToolRegistry_Good_RecordsTools(t *testing.T) {
@ -71,19 +67,9 @@ func TestToolRegistry_Good_ToolCount(t *testing.T) {
 	}
 	tools := svc.Tools()
-	// Built-in tools (no ProcessService / WSHub / Subsystems):
+	// Built-in tools: file_read, file_write, file_delete, file_rename,
-	//   files (8):    file_read, file_write, file_delete, file_rename,
+	// file_exists, file_edit, dir_list, dir_create, lang_detect, lang_list
-	//                 file_exists, file_edit, dir_list, dir_create
+	const expectedCount = 10
 	//   language (2): lang_detect, lang_list
 	//   metrics (2):  metrics_record, metrics_query
 	//   rag (6):      rag_query, rag_search, rag_ingest, rag_index,
 	//                 rag_retrieve, rag_collections
 	//   webview (12): webview_connect, webview_disconnect, webview_navigate,
 	//                 webview_click, webview_type, webview_query,
 	//                 webview_console, webview_eval, webview_screenshot,
 	//                 webview_wait, webview_render, webview_update
 	//   ws (3):       ws_connect, ws_send, ws_close
 	const expectedCount = 33
 	if len(tools) != expectedCount {
 		t.Errorf("expected %d tools, got %d", expectedCount, len(tools))
 		for _, tr := range tools {
@ -100,9 +86,6 @@ func TestToolRegistry_Good_GroupAssignment(t *testing.T) {
 	fileTools := []string{"file_read", "file_write", "file_delete", "file_rename", "file_exists", "file_edit", "dir_list", "dir_create"}
 	langTools := []string{"lang_detect", "lang_list"}
 	metricsTools := []string{"metrics_record", "metrics_query"}
 	ragTools := []string{"rag_query", "rag_search", "rag_ingest", "rag_index", "rag_retrieve", "rag_collections"}
 	webviewTools := []string{"webview_connect", "webview_disconnect", "webview_navigate", "webview_click", "webview_type", "webview_query", "webview_console", "webview_eval", "webview_screenshot", "webview_wait", "webview_render", "webview_update"}
 	byName := make(map[string]ToolRecord)
 	for _, tr := range svc.Tools() {
@ -130,51 +113,6 @@ func TestToolRegistry_Good_GroupAssignment(t *testing.T) {
 			t.Errorf("tool %s: expected group 'language', got %q", name, tr.Group)
 		}
 	}
 	for _, name := range metricsTools {
 		tr, ok := byName[name]
 		if !ok {
 			t.Errorf("tool %s not found in registry", name)
 			continue
 		}
 		if tr.Group != "metrics" {
 			t.Errorf("tool %s: expected group 'metrics', got %q", name, tr.Group)
 		}
 	}
 	for _, name := range ragTools {
 		tr, ok := byName[name]
 		if !ok {
 			t.Errorf("tool %s not found in registry", name)
 			continue
 		}
 		if tr.Group != "rag" {
 			t.Errorf("tool %s: expected group 'rag', got %q", name, tr.Group)
 		}
 	}
 	for _, name := range webviewTools {
 		tr, ok := byName[name]
 		if !ok {
 			t.Errorf("tool %s not found in registry", name)
 			continue
 		}
 		if tr.Group != "webview" {
 			t.Errorf("tool %s: expected group 'webview', got %q", name, tr.Group)
 		}
 	}
 	wsClientTools := []string{"ws_connect", "ws_send", "ws_close"}
 	for _, name := range wsClientTools {
 		tr, ok := byName[name]
 		if !ok {
 			t.Errorf("tool %s not found in registry", name)
 			continue
 		}
 		if tr.Group != "ws" {
 			t.Errorf("tool %s: expected group 'ws', got %q", name, tr.Group)
 		}
 	}
 }
 func TestToolRegistry_Good_ToolRecordFields(t *testing.T) {
@ -210,93 +148,3 @@ func TestToolRegistry_Good_ToolRecordFields(t *testing.T) {
 		t.Error("expected non-nil OutputSchema")
 	}
 }
 func TestToolRegistry_Good_TimeSchemas(t *testing.T) {
 	svc, err := New(Options{
 		WorkspaceRoot:  t.TempDir(),
 		ProcessService: &process.Service{},
 	})
 	if err != nil {
 		t.Fatal(err)
 	}
 	byName := make(map[string]ToolRecord)
 	for _, tr := range svc.Tools() {
 		byName[tr.Name] = tr
 	}
 	metrics, ok := byName["metrics_record"]
 	if !ok {
 		t.Fatal("metrics_record not found in registry")
 	}
 	inputProps, ok := metrics.InputSchema["properties"].(map[string]any)
 	if !ok {
 		t.Fatal("expected metrics_record input properties map")
 	}
 	dataSchema, ok := inputProps["data"].(map[string]any)
 	if !ok {
 		t.Fatal("expected data schema for metrics_record input")
 	}
 	if got := dataSchema["type"]; got != "object" {
 		t.Fatalf("expected metrics_record data type object, got %#v", got)
 	}
 	props, ok := metrics.OutputSchema["properties"].(map[string]any)
 	if !ok {
 		t.Fatal("expected metrics_record output properties map")
 	}
 	timestamp, ok := props["timestamp"].(map[string]any)
 	if !ok {
 		t.Fatal("expected timestamp schema for metrics_record output")
 	}
 	if got := timestamp["type"]; got != "string" {
 		t.Fatalf("expected metrics_record timestamp type string, got %#v", got)
 	}
 	if got := timestamp["format"]; got != "date-time" {
 		t.Fatalf("expected metrics_record timestamp format date-time, got %#v", got)
 	}
 	processStart, ok := byName["process_start"]
 	if !ok {
 		t.Fatal("process_start not found in registry")
 	}
 	props, ok = processStart.OutputSchema["properties"].(map[string]any)
 	if !ok {
 		t.Fatal("expected process_start output properties map")
 	}
 	startedAt, ok := props["startedAt"].(map[string]any)
 	if !ok {
 		t.Fatal("expected startedAt schema for process_start output")
 	}
 	if got := startedAt["type"]; got != "string" {
 		t.Fatalf("expected process_start startedAt type string, got %#v", got)
 	}
 	if got := startedAt["format"]; got != "date-time" {
 		t.Fatalf("expected process_start startedAt format date-time, got %#v", got)
 	}
 }
 func TestToolRegistry_Bad_InvalidRESTInputIsClassified(t *testing.T) {
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	var record ToolRecord
 	for _, tr := range svc.Tools() {
 		if tr.Name == "file_read" {
 			record = tr
 			break
 		}
 	}
 	if record.Name == "" {
 		t.Fatal("file_read not found in registry")
 	}
 	_, err = record.RESTHandler(context.Background(), []byte("{bad json"))
 	if err == nil {
 		t.Fatal("expected REST handler error for malformed JSON")
 	}
 	if !errors.Is(err, errInvalidRESTInput) {
 		t.Fatalf("expected invalid REST input error, got %v", err)
 	}
 }
--- a/pkg/mcp/subsystem.go
+++ b/pkg/mcp/subsystem.go
@ -4,6 +4,8 @@ package mcp
 import (
 	"context"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // Subsystem registers additional MCP tools at startup.
@ -11,10 +13,10 @@ import (
 //
 //	type BrainSubsystem struct{}
 //	func (b *BrainSubsystem) Name() string { return "brain" }
-//	func (b *BrainSubsystem) RegisterTools(svc *Service) { ... }
+//	func (b *BrainSubsystem) RegisterTools(server *mcp.Server) { ... }
 type Subsystem interface {
 	Name() string
-	RegisterTools(svc *Service)
+	RegisterTools(server *mcp.Server)
 }
 // SubsystemWithShutdown extends Subsystem with graceful cleanup.
@ -36,21 +38,6 @@ type Notifier interface {
 	ChannelSend(ctx context.Context, channel string, data any)
 }
 var _ Notifier = (*Service)(nil)
 // ChannelPush is a Core IPC message that any service can send to push
 // a channel event to connected Claude Code sessions.
 // The MCP service catches this in HandleIPCEvents and calls ChannelSend.
 //
 //	c.ACTION(mcp.ChannelPush{
 //	    Channel: "agent.status",
 //	    Data:    map[string]any{"repo": "go-io"},
 //	})
 type ChannelPush struct {
 	Channel string
 	Data    any
 }
 // SubsystemWithNotifier extends Subsystem for those that emit channel events.
 // SetNotifier is called after New() before any tool calls.
 //
@ -61,14 +48,3 @@ type SubsystemWithNotifier interface {
 	Subsystem
 	SetNotifier(n Notifier)
 }
 // SubsystemWithChannelCallback extends Subsystem for implementations that
 // expose an OnChannel callback instead of a Notifier interface.
 //
 //	brain.OnChannel(func(ctx context.Context, channel string, data any) {
 //	    mcpService.ChannelSend(ctx, channel, data)
 //	})
 type SubsystemWithChannelCallback interface {
 	Subsystem
 	OnChannel(func(ctx context.Context, channel string, data any))
 }
--- a/pkg/mcp/subsystem_test.go
+++ b/pkg/mcp/subsystem_test.go
@ -3,6 +3,8 @@ package mcp
 import (
 	"context"
 	"testing"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // stubSubsystem is a minimal Subsystem for testing.
@ -13,23 +15,7 @@ type stubSubsystem struct {
 func (s *stubSubsystem) Name() string { return s.name }
-func (s *stubSubsystem) RegisterTools(svc *Service) {
+func (s *stubSubsystem) RegisterTools(server *mcp.Server) {
 	s.toolsRegistered = true
 }
 // notifierSubsystem verifies notifier wiring happens before tool registration.
 type notifierSubsystem struct {
 	stubSubsystem
 	notifierSet               bool
 	sawNotifierAtRegistration bool
 }
 func (s *notifierSubsystem) SetNotifier(n Notifier) {
 	s.notifierSet = n != nil
 }
 func (s *notifierSubsystem) RegisterTools(svc *Service) {
 	s.sawNotifierAtRegistration = s.notifierSet
 	s.toolsRegistered = true
 }
@ -86,41 +72,6 @@ func TestSubsystem_Good_MultipleSubsystems(t *testing.T) {
 	}
 }
 func TestSubsystem_Good_NilEntriesIgnoredAndSnapshots(t *testing.T) {
 	sub := &stubSubsystem{name: "snap-sub"}
 	svc, err := New(Options{Subsystems: []Subsystem{nil, sub}})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	subs := svc.Subsystems()
 	if len(subs) != 1 {
 		t.Fatalf("expected 1 subsystem after filtering nil entries, got %d", len(subs))
 	}
 	if subs[0].Name() != "snap-sub" {
 		t.Fatalf("expected snap-sub, got %q", subs[0].Name())
 	}
 	subs[0] = nil
 	if svc.Subsystems()[0] == nil {
 		t.Fatal("expected Subsystems() to return a snapshot, not the live slice")
 	}
 }
 func TestSubsystem_Good_NotifierSetBeforeRegistration(t *testing.T) {
 	sub := &notifierSubsystem{stubSubsystem: stubSubsystem{name: "notifier-sub"}}
 	_, err := New(Options{Subsystems: []Subsystem{sub}})
 	if err != nil {
 		t.Fatalf("New() failed: %v", err)
 	}
 	if !sub.notifierSet {
 		t.Fatal("expected notifier to be set")
 	}
 	if !sub.sawNotifierAtRegistration {
 		t.Fatal("expected notifier to be available before RegisterTools ran")
 	}
 }
 func TestSubsystemShutdown_Good(t *testing.T) {
 	sub := &shutdownSubsystem{stubSubsystem: stubSubsystem{name: "shutdown-sub"}}
 	svc, err := New(Options{Subsystems: []Subsystem{sub}})
--- a/pkg/mcp/tools_metrics.go
+++ b/pkg/mcp/tools_metrics.go
@ -1,15 +1,14 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"fmt"
 	"strconv"
 	"strings"
 	"time"
-	core "dappco.re/go/core"
+	"forge.lthn.ai/core/go-ai/ai"
-	"dappco.re/go/core/ai/ai"
+	"forge.lthn.ai/core/go-log"
 	"dappco.re/go/core/log"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -80,12 +79,12 @@ type MetricEventBrief struct {
 // registerMetricsTools adds metrics tools to the MCP server.
 func (s *Service) registerMetricsTools(server *mcp.Server) {
-	addToolRecorded(s, server, "metrics", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "metrics_record",
 		Description: "Record a metrics event for AI/security tracking. Events are stored in daily JSONL files.",
 	}, s.metricsRecord)
-	addToolRecorded(s, server, "metrics", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "metrics_query",
 		Description: "Query metrics events and get aggregated statistics by type, repo, and agent.",
 	}, s.metricsQuery)
@ -200,7 +199,7 @@ func parseDuration(s string) (time.Duration, error) {
 		return 0, log.E("parseDuration", "duration cannot be empty", nil)
 	}
-	s = core.Trim(s)
+	s = strings.TrimSpace(s)
 	if len(s) < 2 {
 		return 0, log.E("parseDuration", "invalid duration format: "+s, nil)
 	}
@ -215,7 +214,7 @@ func parseDuration(s string) (time.Duration, error) {
 	}
 	if num <= 0 {
-		return 0, log.E("parseDuration", core.Sprintf("duration must be positive: %d", num), nil)
+		return 0, log.E("parseDuration", fmt.Sprintf("duration must be positive: %d", num), nil)
 	}
 	switch unit {
--- a/pkg/mcp/tools_process.go
+++ b/pkg/mcp/tools_process.go
@ -1,13 +1,11 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"time"
-	"dappco.re/go/core/log"
+	"forge.lthn.ai/core/go-log"
-	"dappco.re/go/core/process"
+	"forge.lthn.ai/core/go-process"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -29,32 +27,6 @@ type ProcessStartInput struct {
 	Env     []string `json:"env,omitempty"`  // e.g. ["CGO_ENABLED=0"]
 }
 // ProcessRunInput contains parameters for running a command to completion
 // and returning its captured output.
 //
 //	input := ProcessRunInput{
 //	    Command: "go",
 //	    Args:    []string{"test", "./..."},
 //	    Dir:     "/home/user/project",
 //	    Env:     []string{"CGO_ENABLED=0"},
 //	}
 type ProcessRunInput struct {
 	Command string   `json:"command"`        // e.g. "go"
 	Args    []string `json:"args,omitempty"` // e.g. ["test", "./..."]
 	Dir     string   `json:"dir,omitempty"`  // e.g. "/home/user/project"
 	Env     []string `json:"env,omitempty"`  // e.g. ["CGO_ENABLED=0"]
 }
 // ProcessRunOutput contains the result of running a process to completion.
 //
 //	// out.ID == "proc-abc123", out.ExitCode == 0, out.Output == "PASS\n..."
 type ProcessRunOutput struct {
 	ID       string `json:"id"`       // e.g. "proc-abc123"
 	ExitCode int    `json:"exitCode"` // 0 on success
 	Output   string `json:"output"`   // combined stdout/stderr
 	Command  string `json:"command"`  // e.g. "go"
 }
 // ProcessStartOutput contains the result of starting a process.
 //
 //	// out.ID == "proc-abc123", out.PID == 54321, out.Command == "go"
@ -167,37 +139,32 @@ func (s *Service) registerProcessTools(server *mcp.Server) bool {
 		return false
 	}
-	addToolRecorded(s, server, "process", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "process_start",
 		Description: "Start a new external process. Returns process ID for tracking.",
 	}, s.processStart)
-	addToolRecorded(s, server, "process", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "process_run",
 		Description: "Run a command to completion and return the captured output. Blocks until the process exits.",
 	}, s.processRun)
 	addToolRecorded(s, server, "process", &mcp.Tool{
 		Name:        "process_stop",
 		Description: "Gracefully stop a running process by ID.",
 	}, s.processStop)
-	addToolRecorded(s, server, "process", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "process_kill",
 		Description: "Force kill a process by ID. Use when process_stop doesn't work.",
 	}, s.processKill)
-	addToolRecorded(s, server, "process", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "process_list",
 		Description: "List all managed processes. Use running_only=true for only active processes.",
 	}, s.processList)
-	addToolRecorded(s, server, "process", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "process_output",
 		Description: "Get the captured output of a process by ID.",
 	}, s.processOutput)
-	addToolRecorded(s, server, "process", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "process_input",
 		Description: "Send input to a running process stdin.",
 	}, s.processInput)
@ -207,10 +174,6 @@ func (s *Service) registerProcessTools(server *mcp.Server) bool {
 // processStart handles the process_start tool call.
 func (s *Service) processStart(ctx context.Context, req *mcp.CallToolRequest, input ProcessStartInput) (*mcp.CallToolResult, ProcessStartOutput, error) {
 	if s.processService == nil {
 		return nil, ProcessStartOutput{}, log.E("processStart", "process service unavailable", nil)
 	}
 	s.logger.Security("MCP tool execution", "tool", "process_start", "command", input.Command, "args", input.Args, "dir", input.Dir, "user", log.Username())
 	if input.Command == "" {
@ -220,7 +183,7 @@ func (s *Service) processStart(ctx context.Context, req *mcp.CallToolRequest, in
 	opts := process.RunOptions{
 		Command: input.Command,
 		Args:    input.Args,
-		Dir:     s.resolveWorkspacePath(input.Dir),
+		Dir:     input.Dir,
 		Env:     input.Env,
 	}
@ -238,86 +201,14 @@ func (s *Service) processStart(ctx context.Context, req *mcp.CallToolRequest, in
 		Args:      proc.Args,
 		StartedAt: proc.StartedAt,
 	}
-	s.recordProcessRuntime(output.ID, processRuntime{
+	s.ChannelSend(ctx, "process.start", map[string]any{
-		Command:   output.Command,
+		"id": output.ID, "pid": output.PID, "command": output.Command,
 		Args:      output.Args,
 		Dir:       info.Dir,
 		StartedAt: output.StartedAt,
 	})
 	s.ChannelSend(ctx, ChannelProcessStart, map[string]any{
 		"id":        output.ID,
 		"pid":       output.PID,
 		"command":   output.Command,
 		"args":      output.Args,
 		"dir":       info.Dir,
 		"startedAt": output.StartedAt,
 	})
 	return nil, output, nil
 }
 // processRun handles the process_run tool call.
 // Executes the command to completion and returns the captured output.
 func (s *Service) processRun(ctx context.Context, req *mcp.CallToolRequest, input ProcessRunInput) (*mcp.CallToolResult, ProcessRunOutput, error) {
 	if s.processService == nil {
 		return nil, ProcessRunOutput{}, log.E("processRun", "process service unavailable", nil)
 	}
 	s.logger.Security("MCP tool execution", "tool", "process_run", "command", input.Command, "args", input.Args, "dir", input.Dir, "user", log.Username())
 	if input.Command == "" {
 		return nil, ProcessRunOutput{}, log.E("processRun", "command cannot be empty", nil)
 	}
 	opts := process.RunOptions{
 		Command: input.Command,
 		Args:    input.Args,
 		Dir:     s.resolveWorkspacePath(input.Dir),
 		Env:     input.Env,
 	}
 	proc, err := s.processService.StartWithOptions(ctx, opts)
 	if err != nil {
 		log.Error("mcp: process run start failed", "command", input.Command, "err", err)
 		return nil, ProcessRunOutput{}, log.E("processRun", "failed to start process", err)
 	}
 	info := proc.Info()
 	s.recordProcessRuntime(proc.ID, processRuntime{
 		Command:   proc.Command,
 		Args:      proc.Args,
 		Dir:       info.Dir,
 		StartedAt: proc.StartedAt,
 	})
 	s.ChannelSend(ctx, ChannelProcessStart, map[string]any{
 		"id":        proc.ID,
 		"pid":       info.PID,
 		"command":   proc.Command,
 		"args":      proc.Args,
 		"dir":       info.Dir,
 		"startedAt": proc.StartedAt,
 	})
 	// Wait for completion (context-aware).
 	select {
 	case <-ctx.Done():
 		return nil, ProcessRunOutput{}, log.E("processRun", "cancelled", ctx.Err())
 	case <-proc.Done():
 	}
 	return nil, ProcessRunOutput{
 		ID:       proc.ID,
 		ExitCode: proc.ExitCode,
 		Output:   proc.Output(),
 		Command:  proc.Command,
 	}, nil
 }
 // processStop handles the process_stop tool call.
 func (s *Service) processStop(ctx context.Context, req *mcp.CallToolRequest, input ProcessStopInput) (*mcp.CallToolResult, ProcessStopOutput, error) {
 	if s.processService == nil {
 		return nil, ProcessStopOutput{}, log.E("processStop", "process service unavailable", nil)
 	}
 	s.logger.Security("MCP tool execution", "tool", "process_stop", "id", input.ID, "user", log.Username())
 	if input.ID == "" {
@ -330,23 +221,14 @@ func (s *Service) processStop(ctx context.Context, req *mcp.CallToolRequest, inp
 		return nil, ProcessStopOutput{}, log.E("processStop", "process not found", err)
 	}
-	// Use the process service's graceful shutdown path first so callers get
+	// For graceful stop, we use Kill() which sends SIGKILL
-	// a real stop signal before we fall back to a hard kill internally.
+	// A more sophisticated implementation could use SIGTERM first
-	if err := proc.Shutdown(); err != nil {
+	if err := proc.Kill(); err != nil {
-		log.Error("mcp: process stop failed", "id", input.ID, "err", err)
+		log.Error("mcp: process stop kill failed", "id", input.ID, "err", err)
 		return nil, ProcessStopOutput{}, log.E("processStop", "failed to stop process", err)
 	}
-	info := proc.Info()
+	s.ChannelSend(ctx, "process.exit", map[string]any{"id": input.ID, "signal": "stop"})
 	s.ChannelSend(ctx, ChannelProcessExit, map[string]any{
 		"id":        input.ID,
 		"signal":    "stop",
 		"command":   info.Command,
 		"args":      info.Args,
 		"dir":       info.Dir,
 		"startedAt": info.StartedAt,
 	})
 	s.emitTestResult(ctx, input.ID, 0, 0, "stop", "")
 	return nil, ProcessStopOutput{
 		ID:      input.ID,
 		Success: true,
@ -356,37 +238,18 @@ func (s *Service) processStop(ctx context.Context, req *mcp.CallToolRequest, inp
 // processKill handles the process_kill tool call.
 func (s *Service) processKill(ctx context.Context, req *mcp.CallToolRequest, input ProcessKillInput) (*mcp.CallToolResult, ProcessKillOutput, error) {
 	if s.processService == nil {
 		return nil, ProcessKillOutput{}, log.E("processKill", "process service unavailable", nil)
 	}
 	s.logger.Security("MCP tool execution", "tool", "process_kill", "id", input.ID, "user", log.Username())
 	if input.ID == "" {
 		return nil, ProcessKillOutput{}, errIDEmpty
 	}
 	proc, err := s.processService.Get(input.ID)
 	if err != nil {
 		log.Error("mcp: process kill failed", "id", input.ID, "err", err)
 		return nil, ProcessKillOutput{}, log.E("processKill", "process not found", err)
 	}
 	if err := s.processService.Kill(input.ID); err != nil {
 		log.Error("mcp: process kill failed", "id", input.ID, "err", err)
 		return nil, ProcessKillOutput{}, log.E("processKill", "failed to kill process", err)
 	}
-	info := proc.Info()
+	s.ChannelSend(ctx, "process.exit", map[string]any{"id": input.ID, "signal": "kill"})
 	s.ChannelSend(ctx, ChannelProcessExit, map[string]any{
 		"id":        input.ID,
 		"signal":    "kill",
 		"command":   info.Command,
 		"args":      info.Args,
 		"dir":       info.Dir,
 		"startedAt": info.StartedAt,
 	})
 	s.emitTestResult(ctx, input.ID, 0, 0, "kill", "")
 	return nil, ProcessKillOutput{
 		ID:      input.ID,
 		Success: true,
@ -396,10 +259,6 @@ func (s *Service) processKill(ctx context.Context, req *mcp.CallToolRequest, inp
 // processList handles the process_list tool call.
 func (s *Service) processList(ctx context.Context, req *mcp.CallToolRequest, input ProcessListInput) (*mcp.CallToolResult, ProcessListOutput, error) {
 	if s.processService == nil {
 		return nil, ProcessListOutput{}, log.E("processList", "process service unavailable", nil)
 	}
 	s.logger.Info("MCP tool execution", "tool", "process_list", "running_only", input.RunningOnly, "user", log.Username())
 	var procs []*process.Process
@ -433,10 +292,6 @@ func (s *Service) processList(ctx context.Context, req *mcp.CallToolRequest, inp
 // processOutput handles the process_output tool call.
 func (s *Service) processOutput(ctx context.Context, req *mcp.CallToolRequest, input ProcessOutputInput) (*mcp.CallToolResult, ProcessOutputOutput, error) {
 	if s.processService == nil {
 		return nil, ProcessOutputOutput{}, log.E("processOutput", "process service unavailable", nil)
 	}
 	s.logger.Info("MCP tool execution", "tool", "process_output", "id", input.ID, "user", log.Username())
 	if input.ID == "" {
@ -457,10 +312,6 @@ func (s *Service) processOutput(ctx context.Context, req *mcp.CallToolRequest, i
 // processInput handles the process_input tool call.
 func (s *Service) processInput(ctx context.Context, req *mcp.CallToolRequest, input ProcessInputInput) (*mcp.CallToolResult, ProcessInputOutput, error) {
 	if s.processService == nil {
 		return nil, ProcessInputOutput{}, log.E("processInput", "process service unavailable", nil)
 	}
 	s.logger.Security("MCP tool execution", "tool", "process_input", "id", input.ID, "user", log.Username())
 	if input.ID == "" {
--- a/pkg/mcp/tools_process_ci_test.go
+++ b/pkg/mcp/tools_process_ci_test.go
@ -1,5 +1,3 @@
 //go:build ci
 package mcp
 import (
@ -9,7 +7,7 @@ import (
 	"time"
 	"dappco.re/go/core"
-	"dappco.re/go/core/process"
+	"forge.lthn.ai/core/go-process"
 )
 // newTestProcessService creates a real process.Service backed by a core.Core for CI tests.
--- a/pkg/mcp/tools_process_test.go
+++ b/pkg/mcp/tools_process_test.go
@ -275,7 +275,7 @@ func TestProcessInfo_Good(t *testing.T) {
 	}
 }
-// TestWithProcessService_Good verifies Options{ProcessService: ...}.
+// TestWithProcessService_Good verifies the WithProcessService option.
 func TestWithProcessService_Good(t *testing.T) {
 	// Note: We can't easily create a real process.Service here without Core,
 	// so we just verify the option doesn't panic with nil.
@ -288,70 +288,3 @@ func TestWithProcessService_Good(t *testing.T) {
 		t.Error("Expected processService to be nil when passed nil")
 	}
 }
 // TestRegisterProcessTools_Bad_NilService verifies that tools are not registered when process service is nil.
 func TestRegisterProcessTools_Bad_NilService(t *testing.T) {
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	registered := s.registerProcessTools(s.server)
 	if registered {
 		t.Error("Expected registerProcessTools to return false when processService is nil")
 	}
 }
 // TestToolsProcess_ProcessRunInput_Good exercises the process_run input DTO shape.
 func TestToolsProcess_ProcessRunInput_Good(t *testing.T) {
 	input := ProcessRunInput{
 		Command: "echo",
 		Args:    []string{"hello"},
 		Dir:     "/tmp",
 		Env:     []string{"FOO=bar"},
 	}
 	if input.Command != "echo" {
 		t.Errorf("expected command 'echo', got %q", input.Command)
 	}
 	if len(input.Args) != 1 || input.Args[0] != "hello" {
 		t.Errorf("expected args [hello], got %v", input.Args)
 	}
 	if input.Dir != "/tmp" {
 		t.Errorf("expected dir '/tmp', got %q", input.Dir)
 	}
 	if len(input.Env) != 1 {
 		t.Errorf("expected 1 env, got %d", len(input.Env))
 	}
 }
 // TestToolsProcess_ProcessRunOutput_Good exercises the process_run output DTO shape.
 func TestToolsProcess_ProcessRunOutput_Good(t *testing.T) {
 	output := ProcessRunOutput{
 		ID:       "proc-1",
 		ExitCode: 0,
 		Output:   "hello\n",
 		Command:  "echo",
 	}
 	if output.ID != "proc-1" {
 		t.Errorf("expected id 'proc-1', got %q", output.ID)
 	}
 	if output.ExitCode != 0 {
 		t.Errorf("expected exit code 0, got %d", output.ExitCode)
 	}
 	if output.Output != "hello\n" {
 		t.Errorf("expected output 'hello\\n', got %q", output.Output)
 	}
 }
 // TestToolsProcess_ProcessRun_Bad rejects calls without a process service.
 func TestToolsProcess_ProcessRun_Bad(t *testing.T) {
 	svc, err := New(Options{})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, _, err = svc.processRun(t.Context(), nil, ProcessRunInput{Command: "echo", Args: []string{"hi"}})
 	if err == nil {
 		t.Fatal("expected error when process service is unavailable")
 	}
 }
--- a/pkg/mcp/tools_rag.go
+++ b/pkg/mcp/tools_rag.go
@ -1,13 +1,11 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"fmt"
-	core "dappco.re/go/core"
+	"forge.lthn.ai/core/go-log"
-	"dappco.re/go/core/log"
+	"forge.lthn.ai/core/go-rag"
 	"dappco.re/go/core/rag"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -83,30 +81,6 @@ type RAGCollectionsInput struct {
 	ShowStats bool `json:"show_stats,omitempty"` // true to include point counts and status
 }
 // RAGRetrieveInput contains parameters for retrieving chunks from a specific
 // document source (rather than running a semantic query).
 //
 //	input := RAGRetrieveInput{
 //	    Source:     "docs/services.md",
 //	    Collection: "core-docs",
 //	    Limit:      20,
 //	}
 type RAGRetrieveInput struct {
 	Source     string `json:"source"`               // e.g. "docs/services.md"
 	Collection string `json:"collection,omitempty"` // e.g. "core-docs" (default: "hostuk-docs")
 	Limit      int    `json:"limit,omitempty"`      // e.g. 20 (default: 50)
 }
 // RAGRetrieveOutput contains document chunks for a specific source.
 //
 //	// len(out.Chunks) == 12, out.Source == "docs/services.md"
 type RAGRetrieveOutput struct {
 	Source     string           `json:"source"`     // e.g. "docs/services.md"
 	Collection string           `json:"collection"` // collection searched
 	Chunks     []RAGQueryResult `json:"chunks"`     // chunks for the source, ordered by chunkIndex
 	Count      int              `json:"count"`      // number of chunks returned
 }
 // CollectionInfo contains information about a Qdrant collection.
 //
 //	// ci.Name == "core-docs", ci.PointsCount == 1500, ci.Status == "green"
@ -125,34 +99,17 @@ type RAGCollectionsOutput struct {
 // registerRAGTools adds RAG tools to the MCP server.
 func (s *Service) registerRAGTools(server *mcp.Server) {
-	addToolRecorded(s, server, "rag", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "rag_query",
 		Description: "Query the RAG vector database for relevant documentation. Returns semantically similar content based on the query.",
 	}, s.ragQuery)
-	// rag_search is the spec-aligned alias for rag_query.
+	mcp.AddTool(server, &mcp.Tool{
 	addToolRecorded(s, server, "rag", &mcp.Tool{
 		Name:        "rag_search",
 		Description: "Semantic search across documents in the RAG vector database. Returns chunks ranked by similarity.",
 	}, s.ragQuery)
 	addToolRecorded(s, server, "rag", &mcp.Tool{
 		Name:        "rag_ingest",
 		Description: "Ingest documents into the RAG vector database. Supports both single files and directories.",
 	}, s.ragIngest)
-	// rag_index is the spec-aligned alias for rag_ingest.
+	mcp.AddTool(server, &mcp.Tool{
 	addToolRecorded(s, server, "rag", &mcp.Tool{
 		Name:        "rag_index",
 		Description: "Index a document or directory into the RAG vector database.",
 	}, s.ragIngest)
 	addToolRecorded(s, server, "rag", &mcp.Tool{
 		Name:        "rag_retrieve",
 		Description: "Retrieve chunks for a specific document source from the RAG vector database.",
 	}, s.ragRetrieve)
 	addToolRecorded(s, server, "rag", &mcp.Tool{
 		Name:        "rag_collections",
 		Description: "List all available collections in the RAG vector database.",
 	}, s.ragCollections)
@ -226,26 +183,25 @@ func (s *Service) ragIngest(ctx context.Context, req *mcp.CallToolRequest, input
 		log.Error("mcp: rag ingest stat failed", "path", input.Path, "err", err)
 		return nil, RAGIngestOutput{}, log.E("ragIngest", "failed to access path", err)
 	}
 	resolvedPath := s.resolveWorkspacePath(input.Path)
 	var message string
 	var chunks int
 	if info.IsDir() {
 		// Ingest directory
-		err = rag.IngestDirectory(ctx, resolvedPath, collection, input.Recreate)
+		err = rag.IngestDirectory(ctx, input.Path, collection, input.Recreate)
 		if err != nil {
 			log.Error("mcp: rag ingest directory failed", "path", input.Path, "collection", collection, "err", err)
 			return nil, RAGIngestOutput{}, log.E("ragIngest", "failed to ingest directory", err)
 		}
-		message = core.Sprintf("Successfully ingested directory %s into collection %s", input.Path, collection)
+		message = fmt.Sprintf("Successfully ingested directory %s into collection %s", input.Path, collection)
 	} else {
 		// Ingest single file
-		chunks, err = rag.IngestSingleFile(ctx, resolvedPath, collection)
+		chunks, err = rag.IngestSingleFile(ctx, input.Path, collection)
 		if err != nil {
 			log.Error("mcp: rag ingest file failed", "path", input.Path, "collection", collection, "err", err)
 			return nil, RAGIngestOutput{}, log.E("ragIngest", "failed to ingest file", err)
 		}
-		message = core.Sprintf("Successfully ingested file %s (%d chunks) into collection %s", input.Path, chunks, collection)
+		message = fmt.Sprintf("Successfully ingested file %s (%d chunks) into collection %s", input.Path, chunks, collection)
 	}
 	return nil, RAGIngestOutput{
@ -257,86 +213,6 @@ func (s *Service) ragIngest(ctx context.Context, req *mcp.CallToolRequest, input
 	}, nil
 }
 // ragRetrieve handles the rag_retrieve tool call.
 // Returns chunks for a specific source path by querying the collection with
 // the source path as the query text and then filtering results down to the
 // matching source. This preserves the transport abstraction that the rest of
 // the RAG tools use while producing the document-scoped view callers expect.
 func (s *Service) ragRetrieve(ctx context.Context, req *mcp.CallToolRequest, input RAGRetrieveInput) (*mcp.CallToolResult, RAGRetrieveOutput, error) {
 	collection := input.Collection
 	if collection == "" {
 		collection = DefaultRAGCollection
 	}
 	limit := input.Limit
 	if limit <= 0 {
 		limit = 50
 	}
 	s.logger.Info("MCP tool execution", "tool", "rag_retrieve", "source", input.Source, "collection", collection, "limit", limit, "user", log.Username())
 	if input.Source == "" {
 		return nil, RAGRetrieveOutput{}, log.E("ragRetrieve", "source cannot be empty", nil)
 	}
 	// Use the source path as the query text — semantically related chunks
 	// will rank highly, and we then keep only chunks whose Source matches.
 	// Over-fetch by an order of magnitude so document-level limits are met
 	// even when the source appears beyond the top-K of the raw query.
 	overfetch := limit * 10
 	if overfetch < 100 {
 		overfetch = 100
 	}
 	results, err := rag.QueryDocs(ctx, input.Source, collection, overfetch)
 	if err != nil {
 		log.Error("mcp: rag retrieve query failed", "source", input.Source, "collection", collection, "err", err)
 		return nil, RAGRetrieveOutput{}, log.E("ragRetrieve", "failed to retrieve chunks", err)
 	}
 	chunks := make([]RAGQueryResult, 0, limit)
 	for _, r := range results {
 		if r.Source != input.Source {
 			continue
 		}
 		chunks = append(chunks, RAGQueryResult{
 			Content:    r.Text,
 			Source:     r.Source,
 			Section:    r.Section,
 			Category:   r.Category,
 			ChunkIndex: r.ChunkIndex,
 			Score:      r.Score,
 		})
 		if len(chunks) >= limit {
 			break
 		}
 	}
 	sortChunksByIndex(chunks)
 	return nil, RAGRetrieveOutput{
 		Source:     input.Source,
 		Collection: collection,
 		Chunks:     chunks,
 		Count:      len(chunks),
 	}, nil
 }
 // sortChunksByIndex sorts chunks in ascending order of chunk index.
 // Stable ordering keeps ties by their original position.
 func sortChunksByIndex(chunks []RAGQueryResult) {
 	if len(chunks) <= 1 {
 		return
 	}
 	// Insertion sort keeps the code dependency-free and is fast enough
 	// for the small result sets rag_retrieve is designed for.
 	for i := 1; i < len(chunks); i++ {
 		j := i
 		for j > 0 && chunks[j-1].ChunkIndex > chunks[j].ChunkIndex {
 			chunks[j-1], chunks[j] = chunks[j], chunks[j-1]
 			j--
 		}
 	}
 }
 // ragCollections handles the rag_collections tool call.
 func (s *Service) ragCollections(ctx context.Context, req *mcp.CallToolRequest, input RAGCollectionsInput) (*mcp.CallToolResult, RAGCollectionsOutput, error) {
 	s.logger.Info("MCP tool execution", "tool", "rag_collections", "show_stats", input.ShowStats, "user", log.Username())
--- a/pkg/mcp/tools_rag_test.go
+++ b/pkg/mcp/tools_rag_test.go
@ -171,66 +171,3 @@ func TestRAGCollectionsInput_ShowStats(t *testing.T) {
 		t.Error("Expected ShowStats to be true")
 	}
 }
 // TestToolsRag_RAGRetrieveInput_Good exercises the rag_retrieve DTO defaults.
 func TestToolsRag_RAGRetrieveInput_Good(t *testing.T) {
 	input := RAGRetrieveInput{
 		Source:     "docs/index.md",
 		Collection: "core-docs",
 		Limit:      20,
 	}
 	if input.Source != "docs/index.md" {
 		t.Errorf("expected source docs/index.md, got %q", input.Source)
 	}
 	if input.Limit != 20 {
 		t.Errorf("expected limit 20, got %d", input.Limit)
 	}
 }
 // TestToolsRag_RAGRetrieveOutput_Good exercises the rag_retrieve output shape.
 func TestToolsRag_RAGRetrieveOutput_Good(t *testing.T) {
 	output := RAGRetrieveOutput{
 		Source:     "docs/index.md",
 		Collection: "core-docs",
 		Chunks: []RAGQueryResult{
 			{Content: "first", ChunkIndex: 0},
 			{Content: "second", ChunkIndex: 1},
 		},
 		Count: 2,
 	}
 	if output.Count != 2 {
 		t.Fatalf("expected count 2, got %d", output.Count)
 	}
 	if output.Chunks[1].ChunkIndex != 1 {
 		t.Fatalf("expected chunk 1, got %d", output.Chunks[1].ChunkIndex)
 	}
 }
 // TestToolsRag_SortChunksByIndex_Good verifies sort orders by chunk index ascending.
 func TestToolsRag_SortChunksByIndex_Good(t *testing.T) {
 	chunks := []RAGQueryResult{
 		{ChunkIndex: 3},
 		{ChunkIndex: 1},
 		{ChunkIndex: 2},
 	}
 	sortChunksByIndex(chunks)
 	for i, want := range []int{1, 2, 3} {
 		if chunks[i].ChunkIndex != want {
 			t.Fatalf("index %d: expected chunk %d, got %d", i, want, chunks[i].ChunkIndex)
 		}
 	}
 }
 // TestToolsRag_RagRetrieve_Bad rejects empty source paths.
 func TestToolsRag_RagRetrieve_Bad(t *testing.T) {
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, _, err = svc.ragRetrieve(t.Context(), nil, RAGRetrieveInput{})
 	if err == nil {
 		t.Fatal("expected error for empty source")
 	}
 }
--- a/pkg/mcp/tools_webview.go
+++ b/pkg/mcp/tools_webview.go
@ -1,20 +1,14 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"bytes"
 	"context"
 	"encoding/base64"
-	"image"
+	"fmt"
 	"image/jpeg"
 	_ "image/png"
 	"sync"
 	"time"
-	core "dappco.re/go/core"
+	"forge.lthn.ai/core/go-log"
-	"dappco.re/go/core/log"
+	"forge.lthn.ai/core/go-webview"
 	"dappco.re/go/core/webview"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -31,20 +25,6 @@ var (
 	errSelectorRequired = log.E("webview", "selector is required", nil)
 )
 // closeWebviewConnection closes and clears the shared browser connection.
 func closeWebviewConnection() error {
 	webviewMu.Lock()
 	defer webviewMu.Unlock()
 	if webviewInstance == nil {
 		return nil
 	}
 	err := webviewInstance.Close()
 	webviewInstance = nil
 	return err
 }
 // WebviewConnectInput contains parameters for connecting to Chrome DevTools.
 //
 //	input := WebviewConnectInput{DebugURL: "http://localhost:9222", Timeout: 10}
@ -221,67 +201,55 @@ type WebviewDisconnectOutput struct {
 // registerWebviewTools adds webview tools to the MCP server.
 func (s *Service) registerWebviewTools(server *mcp.Server) {
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_connect",
 		Description: "Connect to Chrome DevTools Protocol. Start Chrome with --remote-debugging-port=9222 first.",
 	}, s.webviewConnect)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_disconnect",
 		Description: "Disconnect from Chrome DevTools.",
 	}, s.webviewDisconnect)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_navigate",
 		Description: "Navigate the browser to a URL.",
 	}, s.webviewNavigate)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_click",
 		Description: "Click on an element by CSS selector.",
 	}, s.webviewClick)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_type",
 		Description: "Type text into an element by CSS selector.",
 	}, s.webviewType)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_query",
 		Description: "Query DOM elements by CSS selector.",
 	}, s.webviewQuery)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_console",
 		Description: "Get browser console output.",
 	}, s.webviewConsole)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_eval",
 		Description: "Evaluate JavaScript in the browser context.",
 	}, s.webviewEval)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_screenshot",
 		Description: "Capture a screenshot of the browser window.",
 	}, s.webviewScreenshot)
-	addToolRecorded(s, server, "webview", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "webview_wait",
 		Description: "Wait for an element to appear by CSS selector.",
 	}, s.webviewWait)
 	// Embedded UI rendering — for pushing HTML/state to connected clients
 	// without requiring a Chrome DevTools connection.
 	addToolRecorded(s, server, "webview", &mcp.Tool{
 		Name:        "webview_render",
 		Description: "Render HTML in an embedded webview by ID. Broadcasts to connected clients via the webview.render channel.",
 	}, s.webviewRender)
 	addToolRecorded(s, server, "webview", &mcp.Tool{
 		Name:        "webview_update",
 		Description: "Update the HTML, title, or state of an embedded webview by ID. Broadcasts to connected clients via the webview.update channel.",
 	}, s.webviewUpdate)
 }
 // webviewConnect handles the webview_connect tool call.
@ -321,7 +289,7 @@ func (s *Service) webviewConnect(ctx context.Context, req *mcp.CallToolRequest,
 	return nil, WebviewConnectOutput{
 		Success: true,
-		Message: core.Sprintf("Connected to Chrome DevTools at %s", input.DebugURL),
+		Message: fmt.Sprintf("Connected to Chrome DevTools at %s", input.DebugURL),
 	}, nil
 }
@ -565,7 +533,6 @@ func (s *Service) webviewScreenshot(ctx context.Context, req *mcp.CallToolReques
 	if format == "" {
 		format = "png"
 	}
 	format = core.Lower(format)
 	data, err := webviewInstance.Screenshot()
 	if err != nil {
@ -573,40 +540,13 @@ func (s *Service) webviewScreenshot(ctx context.Context, req *mcp.CallToolReques
 		return nil, WebviewScreenshotOutput{}, log.E("webviewScreenshot", "failed to capture screenshot", err)
 	}
 	encoded, outputFormat, err := normalizeScreenshotData(data, format)
 	if err != nil {
 		return nil, WebviewScreenshotOutput{}, log.E("webviewScreenshot", "failed to encode screenshot", err)
 	}
 	return nil, WebviewScreenshotOutput{
 		Success: true,
-		Data:    base64.StdEncoding.EncodeToString(encoded),
+		Data:    base64.StdEncoding.EncodeToString(data),
-		Format:  outputFormat,
+		Format:  format,
 	}, nil
 }
 // normalizeScreenshotData converts screenshot bytes into the requested format.
 // PNG is preserved as-is. JPEG requests are re-encoded so the output matches
 // the declared format in WebviewScreenshotOutput.
 func normalizeScreenshotData(data []byte, format string) ([]byte, string, error) {
 	switch format {
 	case "", "png":
 		return data, "png", nil
 	case "jpeg", "jpg":
 		img, _, err := image.Decode(bytes.NewReader(data))
 		if err != nil {
 			return nil, "", err
 		}
 		var buf bytes.Buffer
 		if err := jpeg.Encode(&buf, img, &jpeg.Options{Quality: 90}); err != nil {
 			return nil, "", err
 		}
 		return buf.Bytes(), "jpeg", nil
 	default:
 		return nil, "", log.E("webviewScreenshot", "unsupported screenshot format: "+format, nil)
 	}
 }
 // webviewWait handles the webview_wait tool call.
 func (s *Service) webviewWait(ctx context.Context, req *mcp.CallToolRequest, input WebviewWaitInput) (*mcp.CallToolResult, WebviewWaitOutput, error) {
 	webviewMu.Lock()
@ -622,52 +562,13 @@ func (s *Service) webviewWait(ctx context.Context, req *mcp.CallToolRequest, inp
 		return nil, WebviewWaitOutput{}, errSelectorRequired
 	}
-	timeout := time.Duration(input.Timeout) * time.Second
+	if err := webviewInstance.WaitForSelector(input.Selector); err != nil {
 	if timeout <= 0 {
 		timeout = 30 * time.Second
 	}
 	if err := waitForSelector(ctx, timeout, input.Selector, func(selector string) error {
 		_, err := webviewInstance.QuerySelector(selector)
 		return err
 	}); err != nil {
 		log.Error("mcp: webview wait failed", "selector", input.Selector, "err", err)
 		return nil, WebviewWaitOutput{}, log.E("webviewWait", "failed to wait for selector", err)
 	}
 	return nil, WebviewWaitOutput{
 		Success: true,
-		Message: core.Sprintf("Element found: %s", input.Selector),
+		Message: fmt.Sprintf("Element found: %s", input.Selector),
 	}, nil
 }
 // waitForSelector polls until the selector exists or the timeout elapses.
 // Query helpers in go-webview report "element not found" as an error, so we
 // keep retrying until we see the element or hit the deadline.
 func waitForSelector(ctx context.Context, timeout time.Duration, selector string, query func(string) error) error {
 	if timeout <= 0 {
 		timeout = 30 * time.Second
 	}
 	waitCtx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 	ticker := time.NewTicker(10 * time.Millisecond)
 	defer ticker.Stop()
 	for {
 		err := query(selector)
 		if err == nil {
 			return nil
 		}
 		if !core.Contains(err.Error(), "element not found") {
 			return err
 		}
 		select {
 		case <-waitCtx.Done():
 			return log.E("webviewWait", "timed out waiting for selector", waitCtx.Err())
 		case <-ticker.C:
 		}
 	}
 }
--- a/pkg/mcp/tools_webview_embed.go
+++ b/pkg/mcp/tools_webview_embed.go
@ -1,233 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"sync"
 	"time"
 	core "dappco.re/go/core"
 	"dappco.re/go/core/log"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // WebviewRenderInput contains parameters for rendering an embedded
 // HTML view. The named view is stored and broadcast so connected clients
 // (Claude Code sessions, CoreGUI windows, HTTP/SSE subscribers) can
 // display the content.
 //
 //	input := WebviewRenderInput{
 //	    ViewID:  "dashboard",
 //	    HTML:    "<div id='app'>Loading...</div>",
 //	    Title:   "Agent Dashboard",
 //	    Width:   1024,
 //	    Height:  768,
 //	    State:   map[string]any{"theme": "dark"},
 //	}
 type WebviewRenderInput struct {
 	ViewID string         `json:"view_id"`          // e.g. "dashboard"
 	HTML   string         `json:"html"`             // rendered markup
 	Title  string         `json:"title,omitempty"`  // e.g. "Agent Dashboard"
 	Width  int            `json:"width,omitempty"`  // preferred width in pixels
 	Height int            `json:"height,omitempty"` // preferred height in pixels
 	State  map[string]any `json:"state,omitempty"`  // initial view state
 }
 // WebviewRenderOutput reports the result of rendering an embedded view.
 //
 //	// out.Success == true, out.ViewID == "dashboard"
 type WebviewRenderOutput struct {
 	Success   bool      `json:"success"`   // true when the view was stored and broadcast
 	ViewID    string    `json:"view_id"`   // echoed view identifier
 	UpdatedAt time.Time `json:"updatedAt"` // when the view was rendered
 }
 // WebviewUpdateInput contains parameters for updating the state of an
 // existing embedded view. Callers may provide HTML to replace the markup,
 // patch fields in the view state, or do both.
 //
 //	input := WebviewUpdateInput{
 //	    ViewID: "dashboard",
 //	    HTML:   "<div id='app'>Ready</div>",
 //	    State:  map[string]any{"count": 42},
 //	    Merge:  true,
 //	}
 type WebviewUpdateInput struct {
 	ViewID string         `json:"view_id"`         // e.g. "dashboard"
 	HTML   string         `json:"html,omitempty"`  // replacement markup (optional)
 	Title  string         `json:"title,omitempty"` // e.g. "Agent Dashboard"
 	State  map[string]any `json:"state,omitempty"` // partial state update
 	Merge  bool           `json:"merge,omitempty"` // merge state (default) or replace when false
 }
 // WebviewUpdateOutput reports the result of updating an embedded view.
 //
 //	// out.Success == true, out.ViewID == "dashboard"
 type WebviewUpdateOutput struct {
 	Success   bool      `json:"success"`   // true when the view was updated and broadcast
 	ViewID    string    `json:"view_id"`   // echoed view identifier
 	UpdatedAt time.Time `json:"updatedAt"` // when the view was last updated
 }
 // embeddedView captures the live state of a rendered UI view. Instances
 // are kept per ViewID inside embeddedViewRegistry.
 type embeddedView struct {
 	ViewID    string
 	Title     string
 	HTML      string
 	Width     int
 	Height    int
 	State     map[string]any
 	UpdatedAt time.Time
 }
 // embeddedViewRegistry stores the most recent render/update state for each
 // view so new subscribers can pick up the current UI on connection.
 // Operations are guarded by embeddedViewMu.
 var (
 	embeddedViewMu       sync.RWMutex
 	embeddedViewRegistry = map[string]*embeddedView{}
 )
 // ChannelWebviewRender is the channel used to broadcast webview_render events.
 const ChannelWebviewRender = "webview.render"
 // ChannelWebviewUpdate is the channel used to broadcast webview_update events.
 const ChannelWebviewUpdate = "webview.update"
 // webviewRender handles the webview_render tool call.
 func (s *Service) webviewRender(ctx context.Context, req *mcp.CallToolRequest, input WebviewRenderInput) (*mcp.CallToolResult, WebviewRenderOutput, error) {
 	s.logger.Info("MCP tool execution", "tool", "webview_render", "view", input.ViewID, "user", log.Username())
 	if core.Trim(input.ViewID) == "" {
 		return nil, WebviewRenderOutput{}, log.E("webviewRender", "view_id is required", nil)
 	}
 	now := time.Now()
 	view := &embeddedView{
 		ViewID:    input.ViewID,
 		Title:     input.Title,
 		HTML:      input.HTML,
 		Width:     input.Width,
 		Height:    input.Height,
 		State:     cloneStateMap(input.State),
 		UpdatedAt: now,
 	}
 	embeddedViewMu.Lock()
 	embeddedViewRegistry[input.ViewID] = view
 	embeddedViewMu.Unlock()
 	s.ChannelSend(ctx, ChannelWebviewRender, map[string]any{
 		"view_id":   view.ViewID,
 		"title":     view.Title,
 		"html":      view.HTML,
 		"width":     view.Width,
 		"height":    view.Height,
 		"state":     cloneStateMap(view.State),
 		"updatedAt": view.UpdatedAt,
 	})
 	return nil, WebviewRenderOutput{
 		Success:   true,
 		ViewID:    view.ViewID,
 		UpdatedAt: view.UpdatedAt,
 	}, nil
 }
 // webviewUpdate handles the webview_update tool call.
 func (s *Service) webviewUpdate(ctx context.Context, req *mcp.CallToolRequest, input WebviewUpdateInput) (*mcp.CallToolResult, WebviewUpdateOutput, error) {
 	s.logger.Info("MCP tool execution", "tool", "webview_update", "view", input.ViewID, "user", log.Username())
 	if core.Trim(input.ViewID) == "" {
 		return nil, WebviewUpdateOutput{}, log.E("webviewUpdate", "view_id is required", nil)
 	}
 	now := time.Now()
 	embeddedViewMu.Lock()
 	view, ok := embeddedViewRegistry[input.ViewID]
 	if !ok {
 		// Updating a view that was never rendered creates one lazily so
 		// clients that reconnect mid-session get a consistent snapshot.
 		view = &embeddedView{ViewID: input.ViewID, State: map[string]any{}}
 		embeddedViewRegistry[input.ViewID] = view
 	}
 	if input.HTML != "" {
 		view.HTML = input.HTML
 	}
 	if input.Title != "" {
 		view.Title = input.Title
 	}
 	if input.State != nil {
 		merge := input.Merge || len(view.State) == 0
 		if merge {
 			if view.State == nil {
 				view.State = map[string]any{}
 			}
 			for k, v := range input.State {
 				view.State[k] = v
 			}
 		} else {
 			view.State = cloneStateMap(input.State)
 		}
 	}
 	view.UpdatedAt = now
 	snapshot := *view
 	snapshot.State = cloneStateMap(view.State)
 	embeddedViewMu.Unlock()
 	s.ChannelSend(ctx, ChannelWebviewUpdate, map[string]any{
 		"view_id":   snapshot.ViewID,
 		"title":     snapshot.Title,
 		"html":      snapshot.HTML,
 		"width":     snapshot.Width,
 		"height":    snapshot.Height,
 		"state":     snapshot.State,
 		"updatedAt": snapshot.UpdatedAt,
 	})
 	return nil, WebviewUpdateOutput{
 		Success:   true,
 		ViewID:    snapshot.ViewID,
 		UpdatedAt: snapshot.UpdatedAt,
 	}, nil
 }
 // cloneStateMap returns a shallow copy of a state map.
 //
 //	cloned := cloneStateMap(map[string]any{"a": 1}) // cloned["a"] == 1
 func cloneStateMap(in map[string]any) map[string]any {
 	if in == nil {
 		return nil
 	}
 	out := make(map[string]any, len(in))
 	for k, v := range in {
 		out[k] = v
 	}
 	return out
 }
 // lookupEmbeddedView returns the current snapshot of an embedded view, if any.
 //
 //	view, ok := lookupEmbeddedView("dashboard")
 func lookupEmbeddedView(id string) (*embeddedView, bool) {
 	embeddedViewMu.RLock()
 	defer embeddedViewMu.RUnlock()
 	view, ok := embeddedViewRegistry[id]
 	if !ok {
 		return nil, false
 	}
 	snapshot := *view
 	snapshot.State = cloneStateMap(view.State)
 	return &snapshot, true
 }
 // resetEmbeddedViews clears the registry. Intended for tests.
 func resetEmbeddedViews() {
 	embeddedViewMu.Lock()
 	defer embeddedViewMu.Unlock()
 	embeddedViewRegistry = map[string]*embeddedView{}
 }
--- a/pkg/mcp/tools_webview_embed_test.go
+++ b/pkg/mcp/tools_webview_embed_test.go
@ -1,137 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"testing"
 )
 // TestToolsWebviewEmbed_WebviewRender_Good registers a view and verifies the
 // registry keeps the rendered HTML and state.
 func TestToolsWebviewEmbed_WebviewRender_Good(t *testing.T) {
 	t.Cleanup(resetEmbeddedViews)
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, out, err := svc.webviewRender(context.Background(), nil, WebviewRenderInput{
 		ViewID: "dashboard",
 		HTML:   "<p>hello</p>",
 		Title:  "Demo",
 		State:  map[string]any{"count": 1},
 	})
 	if err != nil {
 		t.Fatalf("webviewRender returned error: %v", err)
 	}
 	if !out.Success {
 		t.Fatal("expected Success=true")
 	}
 	if out.ViewID != "dashboard" {
 		t.Fatalf("expected view id 'dashboard', got %q", out.ViewID)
 	}
 	if out.UpdatedAt.IsZero() {
 		t.Fatal("expected non-zero UpdatedAt")
 	}
 	view, ok := lookupEmbeddedView("dashboard")
 	if !ok {
 		t.Fatal("expected view to be stored in registry")
 	}
 	if view.HTML != "<p>hello</p>" {
 		t.Fatalf("expected HTML '<p>hello</p>', got %q", view.HTML)
 	}
 	if view.State["count"] != 1 {
 		t.Fatalf("expected state.count=1, got %v", view.State["count"])
 	}
 }
 // TestToolsWebviewEmbed_WebviewRender_Bad ensures empty view IDs are rejected.
 func TestToolsWebviewEmbed_WebviewRender_Bad(t *testing.T) {
 	t.Cleanup(resetEmbeddedViews)
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, _, err = svc.webviewRender(context.Background(), nil, WebviewRenderInput{})
 	if err == nil {
 		t.Fatal("expected error for empty view_id")
 	}
 }
 // TestToolsWebviewEmbed_WebviewUpdate_Good merges a state patch into the
 // previously rendered view.
 func TestToolsWebviewEmbed_WebviewUpdate_Good(t *testing.T) {
 	t.Cleanup(resetEmbeddedViews)
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, _, err = svc.webviewRender(context.Background(), nil, WebviewRenderInput{
 		ViewID: "dashboard",
 		HTML:   "<p>hello</p>",
 		State:  map[string]any{"count": 1},
 	})
 	if err != nil {
 		t.Fatalf("seed render failed: %v", err)
 	}
 	_, out, err := svc.webviewUpdate(context.Background(), nil, WebviewUpdateInput{
 		ViewID: "dashboard",
 		State:  map[string]any{"theme": "dark"},
 		Merge:  true,
 	})
 	if err != nil {
 		t.Fatalf("webviewUpdate returned error: %v", err)
 	}
 	if !out.Success {
 		t.Fatal("expected Success=true")
 	}
 	view, ok := lookupEmbeddedView("dashboard")
 	if !ok {
 		t.Fatal("expected view to exist after update")
 	}
 	if view.State["count"] != 1 {
 		t.Fatalf("expected count to persist after merge, got %v", view.State["count"])
 	}
 	if view.State["theme"] != "dark" {
 		t.Fatalf("expected theme 'dark' after merge, got %v", view.State["theme"])
 	}
 }
 // TestToolsWebviewEmbed_WebviewUpdate_Ugly updates a view that was never
 // rendered and verifies a fresh registry entry is created.
 func TestToolsWebviewEmbed_WebviewUpdate_Ugly(t *testing.T) {
 	t.Cleanup(resetEmbeddedViews)
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, out, err := svc.webviewUpdate(context.Background(), nil, WebviewUpdateInput{
 		ViewID: "ghost",
 		HTML:   "<p>new</p>",
 	})
 	if err != nil {
 		t.Fatalf("webviewUpdate returned error: %v", err)
 	}
 	if !out.Success {
 		t.Fatal("expected Success=true for lazy-create update")
 	}
 	view, ok := lookupEmbeddedView("ghost")
 	if !ok {
 		t.Fatal("expected ghost view to be created lazily")
 	}
 	if view.HTML != "<p>new</p>" {
 		t.Fatalf("expected HTML '<p>new</p>', got %q", view.HTML)
 	}
 }
--- a/pkg/mcp/tools_webview_test.go
+++ b/pkg/mcp/tools_webview_test.go
@ -1,17 +1,10 @@
 package mcp
 import (
 	"bytes"
 	"context"
 	"errors"
 	"image"
 	"image/color"
 	"image/jpeg"
 	"image/png"
 	"testing"
 	"time"
-	"dappco.re/go/core/webview"
+	"forge.lthn.ai/core/go-webview"
 )
 // skipIfShort skips webview tests in short mode (go test -short).
@ -222,41 +215,6 @@ func TestWebviewWaitInput_Good(t *testing.T) {
 	}
 }
 func TestWaitForSelector_Good(t *testing.T) {
 	ctx := context.Background()
 	attempts := 0
 	err := waitForSelector(ctx, 200*time.Millisecond, "#ready", func(selector string) error {
 		attempts++
 		if attempts < 3 {
 			return errors.New("element not found: " + selector)
 		}
 		return nil
 	})
 	if err != nil {
 		t.Fatalf("waitForSelector failed: %v", err)
 	}
 	if attempts != 3 {
 		t.Fatalf("expected 3 attempts, got %d", attempts)
 	}
 }
 func TestWaitForSelector_Bad_Timeout(t *testing.T) {
 	ctx := context.Background()
 	start := time.Now()
 	err := waitForSelector(ctx, 50*time.Millisecond, "#missing", func(selector string) error {
 		return errors.New("element not found: " + selector)
 	})
 	if err == nil {
 		t.Fatal("expected waitForSelector to time out")
 	}
 	if time.Since(start) < 50*time.Millisecond {
 		t.Fatal("expected waitForSelector to honor timeout")
 	}
 }
 // TestWebviewConnectOutput_Good verifies the WebviewConnectOutput struct has expected fields.
 func TestWebviewConnectOutput_Good(t *testing.T) {
 	output := WebviewConnectOutput{
@ -400,61 +358,6 @@ func TestWebviewScreenshotOutput_Good(t *testing.T) {
 	}
 }
 func TestNormalizeScreenshotData_Good_Png(t *testing.T) {
 	src := mustEncodeTestPNG(t)
 	out, format, err := normalizeScreenshotData(src, "png")
 	if err != nil {
 		t.Fatalf("normalizeScreenshotData failed: %v", err)
 	}
 	if format != "png" {
 		t.Fatalf("expected png format, got %q", format)
 	}
 	if !bytes.Equal(out, src) {
 		t.Fatal("expected png output to preserve the original bytes")
 	}
 }
 func TestNormalizeScreenshotData_Good_Jpeg(t *testing.T) {
 	src := mustEncodeTestPNG(t)
 	out, format, err := normalizeScreenshotData(src, "jpeg")
 	if err != nil {
 		t.Fatalf("normalizeScreenshotData failed: %v", err)
 	}
 	if format != "jpeg" {
 		t.Fatalf("expected jpeg format, got %q", format)
 	}
 	if bytes.Equal(out, src) {
 		t.Fatal("expected jpeg output to differ from png input")
 	}
 	if _, err := jpeg.Decode(bytes.NewReader(out)); err != nil {
 		t.Fatalf("expected output to decode as an image: %v", err)
 	}
 }
 func TestNormalizeScreenshotData_Bad_UnsupportedFormat(t *testing.T) {
 	src := mustEncodeTestPNG(t)
 	if _, _, err := normalizeScreenshotData(src, "gif"); err == nil {
 		t.Fatal("expected unsupported format error")
 	}
 }
 func mustEncodeTestPNG(t *testing.T) []byte {
 	t.Helper()
 	img := image.NewRGBA(image.Rect(0, 0, 1, 1))
 	img.Set(0, 0, color.RGBA{R: 200, G: 80, B: 40, A: 255})
 	var buf bytes.Buffer
 	if err := png.Encode(&buf, img); err != nil {
 		t.Fatalf("png encode failed: %v", err)
 	}
 	return buf.Bytes()
 }
 // TestWebviewElementInfo_Good verifies the WebviewElementInfo struct has expected fields.
 func TestWebviewElementInfo_Good(t *testing.T) {
 	elem := WebviewElementInfo{
@ -547,151 +450,3 @@ func TestWebviewWaitOutput_Good(t *testing.T) {
 		t.Error("Expected message to be set")
 	}
 }
 // --- Handler tests beyond nil-guard ---
 // setStubWebview injects a zero-value Webview stub so handler validation
 // logic beyond the nil-guard can be exercised without a running Chrome.
 // The previous value is restored via t.Cleanup.
 func setStubWebview(t *testing.T) {
 	t.Helper()
 	webviewMu.Lock()
 	old := webviewInstance
 	webviewInstance = &webview.Webview{}
 	webviewMu.Unlock()
 	t.Cleanup(func() {
 		webviewMu.Lock()
 		webviewInstance = old
 		webviewMu.Unlock()
 	})
 }
 // TestWebviewDisconnect_Good_NoConnection verifies disconnect succeeds when not connected.
 func TestWebviewDisconnect_Good_NoConnection(t *testing.T) {
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx := t.Context()
 	_, out, err := s.webviewDisconnect(ctx, nil, WebviewDisconnectInput{})
 	if err != nil {
 		t.Fatalf("Unexpected error: %v", err)
 	}
 	if !out.Success {
 		t.Error("Expected success to be true")
 	}
 	if out.Message != "No active connection" {
 		t.Errorf("Expected message 'No active connection', got %q", out.Message)
 	}
 }
 // TestWebviewConnect_Bad_EmptyURL verifies connect rejects an empty debug URL.
 func TestWebviewConnect_Bad_EmptyURL(t *testing.T) {
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx := t.Context()
 	_, _, err = s.webviewConnect(ctx, nil, WebviewConnectInput{DebugURL: ""})
 	if err == nil {
 		t.Error("Expected error for empty debug URL, got nil")
 	}
 }
 // TestWebviewNavigate_Bad_EmptyURL verifies navigate rejects an empty URL.
 func TestWebviewNavigate_Bad_EmptyURL(t *testing.T) {
 	setStubWebview(t)
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx := t.Context()
 	_, _, err = s.webviewNavigate(ctx, nil, WebviewNavigateInput{URL: ""})
 	if err == nil {
 		t.Error("Expected error for empty URL, got nil")
 	}
 }
 // TestWebviewClick_Bad_EmptySelector verifies click rejects an empty selector.
 func TestWebviewClick_Bad_EmptySelector(t *testing.T) {
 	setStubWebview(t)
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx := t.Context()
 	_, _, err = s.webviewClick(ctx, nil, WebviewClickInput{Selector: ""})
 	if err == nil {
 		t.Error("Expected error for empty selector, got nil")
 	}
 }
 // TestWebviewType_Bad_EmptySelector verifies type rejects an empty selector.
 func TestWebviewType_Bad_EmptySelector(t *testing.T) {
 	setStubWebview(t)
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx := t.Context()
 	_, _, err = s.webviewType(ctx, nil, WebviewTypeInput{Selector: "", Text: "test"})
 	if err == nil {
 		t.Error("Expected error for empty selector, got nil")
 	}
 }
 // TestWebviewQuery_Bad_EmptySelector verifies query rejects an empty selector.
 func TestWebviewQuery_Bad_EmptySelector(t *testing.T) {
 	setStubWebview(t)
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx := t.Context()
 	_, _, err = s.webviewQuery(ctx, nil, WebviewQueryInput{Selector: ""})
 	if err == nil {
 		t.Error("Expected error for empty selector, got nil")
 	}
 }
 // TestWebviewEval_Bad_EmptyScript verifies eval rejects an empty script.
 func TestWebviewEval_Bad_EmptyScript(t *testing.T) {
 	setStubWebview(t)
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx := t.Context()
 	_, _, err = s.webviewEval(ctx, nil, WebviewEvalInput{Script: ""})
 	if err == nil {
 		t.Error("Expected error for empty script, got nil")
 	}
 }
 // TestWebviewWait_Bad_EmptySelector verifies wait rejects an empty selector.
 func TestWebviewWait_Bad_EmptySelector(t *testing.T) {
 	setStubWebview(t)
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx := t.Context()
 	_, _, err = s.webviewWait(ctx, nil, WebviewWaitInput{Selector: ""})
 	if err == nil {
 		t.Error("Expected error for empty selector, got nil")
 	}
 }
--- a/pkg/mcp/tools_ws.go
+++ b/pkg/mcp/tools_ws.go
@ -1,15 +1,13 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"fmt"
 	"net"
 	"net/http"
-	core "dappco.re/go/core"
+	"forge.lthn.ai/core/go-log"
-	"dappco.re/go/core/log"
+	"forge.lthn.ai/core/go-ws"
 	"dappco.re/go/core/ws"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -49,12 +47,12 @@ func (s *Service) registerWSTools(server *mcp.Server) bool {
 		return false
 	}
-	addToolRecorded(s, server, "ws", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ws_start",
 		Description: "Start the WebSocket server for real-time process output streaming.",
 	}, s.wsStart)
-	addToolRecorded(s, server, "ws", &mcp.Tool{
+	mcp.AddTool(server, &mcp.Tool{
 		Name:        "ws_info",
 		Description: "Get WebSocket hub statistics (connected clients and active channels).",
 	}, s.wsInfo)
@ -64,10 +62,6 @@ func (s *Service) registerWSTools(server *mcp.Server) bool {
 // wsStart handles the ws_start tool call.
 func (s *Service) wsStart(ctx context.Context, req *mcp.CallToolRequest, input WSStartInput) (*mcp.CallToolResult, WSStartOutput, error) {
 	if s.wsHub == nil {
 		return nil, WSStartOutput{}, log.E("wsStart", "websocket hub unavailable", nil)
 	}
 	addr := input.Addr
 	if addr == "" {
 		addr = ":8080"
@ -117,16 +111,12 @@ func (s *Service) wsStart(ctx context.Context, req *mcp.CallToolRequest, input W
 	return nil, WSStartOutput{
 		Success: true,
 		Addr:    actualAddr,
-		Message: core.Sprintf("WebSocket server started at ws://%s/ws", actualAddr),
+		Message: fmt.Sprintf("WebSocket server started at ws://%s/ws", actualAddr),
 	}, nil
 }
 // wsInfo handles the ws_info tool call.
 func (s *Service) wsInfo(ctx context.Context, req *mcp.CallToolRequest, input WSInfoInput) (*mcp.CallToolResult, WSInfoOutput, error) {
 	if s.wsHub == nil {
 		return nil, WSInfoOutput{}, log.E("wsInfo", "websocket hub unavailable", nil)
 	}
 	s.logger.Info("MCP tool execution", "tool", "ws_info", "user", log.Username())
 	stats := s.wsHub.Stats()
--- a/pkg/mcp/tools_ws_client.go
+++ b/pkg/mcp/tools_ws_client.go
@ -1,264 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"crypto/rand"
 	"encoding/hex"
 	"net/http"
 	"sync"
 	"time"
 	core "dappco.re/go/core"
 	"dappco.re/go/core/log"
 	"github.com/gorilla/websocket"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 // WSConnectInput contains parameters for opening an outbound WebSocket
 // connection from the MCP server. Each connection is given a stable ID that
 // subsequent ws_send and ws_close calls use to address it.
 //
 //	input := WSConnectInput{URL: "wss://example.com/ws", Timeout: 10}
 type WSConnectInput struct {
 	URL     string            `json:"url"`                // e.g. "wss://example.com/ws"
 	Headers map[string]string `json:"headers,omitempty"`  // custom request headers
 	Timeout int               `json:"timeout,omitempty"`  // handshake timeout in seconds (default: 30)
 }
 // WSConnectOutput contains the result of opening a WebSocket connection.
 //
 //	// out.Success == true, out.ID == "ws-0af3…"
 type WSConnectOutput struct {
 	Success bool   `json:"success"` // true when the handshake completed
 	ID      string `json:"id"`      // e.g. "ws-0af3…"
 	URL     string `json:"url"`     // the URL that was dialled
 }
 // WSSendInput contains parameters for sending a message on an open
 // WebSocket connection.
 //
 //	input := WSSendInput{ID: "ws-0af3…", Message: "ping"}
 type WSSendInput struct {
 	ID      string `json:"id"`                // e.g. "ws-0af3…"
 	Message string `json:"message"`           // payload to send
 	Binary  bool   `json:"binary,omitempty"`  // true to send a binary frame (payload is base64 text)
 }
 // WSSendOutput contains the result of sending a message.
 //
 //	// out.Success == true, out.ID == "ws-0af3…"
 type WSSendOutput struct {
 	Success bool   `json:"success"` // true when the message was written
 	ID      string `json:"id"`      // e.g. "ws-0af3…"
 	Bytes   int    `json:"bytes"`   // number of bytes written
 }
 // WSCloseInput contains parameters for closing a WebSocket connection.
 //
 //	input := WSCloseInput{ID: "ws-0af3…", Reason: "done"}
 type WSCloseInput struct {
 	ID     string `json:"id"`               // e.g. "ws-0af3…"
 	Code   int    `json:"code,omitempty"`   // close code (default: 1000 - normal closure)
 	Reason string `json:"reason,omitempty"` // human-readable reason
 }
 // WSCloseOutput contains the result of closing a WebSocket connection.
 //
 //	// out.Success == true, out.ID == "ws-0af3…"
 type WSCloseOutput struct {
 	Success bool   `json:"success"`           // true when the connection was closed
 	ID      string `json:"id"`                // e.g. "ws-0af3…"
 	Message string `json:"message,omitempty"` // e.g. "connection closed"
 }
 // wsClientConn tracks an outbound WebSocket connection tied to a stable ID.
 type wsClientConn struct {
 	ID        string
 	URL       string
 	conn      *websocket.Conn
 	writeMu   sync.Mutex
 	CreatedAt time.Time
 }
 // wsClientRegistry holds all live outbound WebSocket connections keyed by ID.
 // Access is guarded by wsClientMu.
 var (
 	wsClientMu       sync.Mutex
 	wsClientRegistry = map[string]*wsClientConn{}
 )
 // registerWSClientTools registers the outbound WebSocket client tools.
 func (s *Service) registerWSClientTools(server *mcp.Server) {
 	addToolRecorded(s, server, "ws", &mcp.Tool{
 		Name:        "ws_connect",
 		Description: "Open an outbound WebSocket connection. Returns a connection ID for subsequent ws_send and ws_close calls.",
 	}, s.wsConnect)
 	addToolRecorded(s, server, "ws", &mcp.Tool{
 		Name:        "ws_send",
 		Description: "Send a text or binary message on an open WebSocket connection identified by ID.",
 	}, s.wsSend)
 	addToolRecorded(s, server, "ws", &mcp.Tool{
 		Name:        "ws_close",
 		Description: "Close an open WebSocket connection identified by ID.",
 	}, s.wsClose)
 }
 // wsConnect handles the ws_connect tool call.
 func (s *Service) wsConnect(ctx context.Context, req *mcp.CallToolRequest, input WSConnectInput) (*mcp.CallToolResult, WSConnectOutput, error) {
 	s.logger.Security("MCP tool execution", "tool", "ws_connect", "url", input.URL, "user", log.Username())
 	if core.Trim(input.URL) == "" {
 		return nil, WSConnectOutput{}, log.E("wsConnect", "url is required", nil)
 	}
 	timeout := time.Duration(input.Timeout) * time.Second
 	if timeout <= 0 {
 		timeout = 30 * time.Second
 	}
 	dialer := websocket.Dialer{
 		HandshakeTimeout: timeout,
 	}
 	headers := http.Header{}
 	for k, v := range input.Headers {
 		headers.Set(k, v)
 	}
 	dialCtx, cancel := context.WithTimeout(ctx, timeout)
 	defer cancel()
 	conn, _, err := dialer.DialContext(dialCtx, input.URL, headers)
 	if err != nil {
 		log.Error("mcp: ws connect failed", "url", input.URL, "err", err)
 		return nil, WSConnectOutput{}, log.E("wsConnect", "failed to connect", err)
 	}
 	id := newWSClientID()
 	client := &wsClientConn{
 		ID:        id,
 		URL:       input.URL,
 		conn:      conn,
 		CreatedAt: time.Now(),
 	}
 	wsClientMu.Lock()
 	wsClientRegistry[id] = client
 	wsClientMu.Unlock()
 	return nil, WSConnectOutput{
 		Success: true,
 		ID:      id,
 		URL:     input.URL,
 	}, nil
 }
 // wsSend handles the ws_send tool call.
 func (s *Service) wsSend(ctx context.Context, req *mcp.CallToolRequest, input WSSendInput) (*mcp.CallToolResult, WSSendOutput, error) {
 	s.logger.Info("MCP tool execution", "tool", "ws_send", "id", input.ID, "binary", input.Binary, "user", log.Username())
 	if core.Trim(input.ID) == "" {
 		return nil, WSSendOutput{}, log.E("wsSend", "id is required", nil)
 	}
 	client, ok := getWSClient(input.ID)
 	if !ok {
 		return nil, WSSendOutput{}, log.E("wsSend", "connection not found", nil)
 	}
 	messageType := websocket.TextMessage
 	if input.Binary {
 		messageType = websocket.BinaryMessage
 	}
 	client.writeMu.Lock()
 	err := client.conn.WriteMessage(messageType, []byte(input.Message))
 	client.writeMu.Unlock()
 	if err != nil {
 		log.Error("mcp: ws send failed", "id", input.ID, "err", err)
 		return nil, WSSendOutput{}, log.E("wsSend", "failed to send message", err)
 	}
 	return nil, WSSendOutput{
 		Success: true,
 		ID:      input.ID,
 		Bytes:   len(input.Message),
 	}, nil
 }
 // wsClose handles the ws_close tool call.
 func (s *Service) wsClose(ctx context.Context, req *mcp.CallToolRequest, input WSCloseInput) (*mcp.CallToolResult, WSCloseOutput, error) {
 	s.logger.Info("MCP tool execution", "tool", "ws_close", "id", input.ID, "user", log.Username())
 	if core.Trim(input.ID) == "" {
 		return nil, WSCloseOutput{}, log.E("wsClose", "id is required", nil)
 	}
 	wsClientMu.Lock()
 	client, ok := wsClientRegistry[input.ID]
 	if ok {
 		delete(wsClientRegistry, input.ID)
 	}
 	wsClientMu.Unlock()
 	if !ok {
 		return nil, WSCloseOutput{}, log.E("wsClose", "connection not found", nil)
 	}
 	code := input.Code
 	if code == 0 {
 		code = websocket.CloseNormalClosure
 	}
 	reason := input.Reason
 	if reason == "" {
 		reason = "closed"
 	}
 	client.writeMu.Lock()
 	_ = client.conn.WriteControl(
 		websocket.CloseMessage,
 		websocket.FormatCloseMessage(code, reason),
 		time.Now().Add(5*time.Second),
 	)
 	client.writeMu.Unlock()
 	_ = client.conn.Close()
 	return nil, WSCloseOutput{
 		Success: true,
 		ID:      input.ID,
 		Message: "connection closed",
 	}, nil
 }
 // newWSClientID returns a fresh identifier for an outbound WebSocket client.
 //
 //	id := newWSClientID() // "ws-0af3…"
 func newWSClientID() string {
 	var buf [8]byte
 	_, _ = rand.Read(buf[:])
 	return "ws-" + hex.EncodeToString(buf[:])
 }
 // getWSClient returns a tracked outbound WebSocket client by ID, if any.
 //
 //	client, ok := getWSClient("ws-0af3…")
 func getWSClient(id string) (*wsClientConn, bool) {
 	wsClientMu.Lock()
 	defer wsClientMu.Unlock()
 	client, ok := wsClientRegistry[id]
 	return client, ok
 }
 // resetWSClients drops all tracked outbound WebSocket clients. Intended for tests.
 func resetWSClients() {
 	wsClientMu.Lock()
 	defer wsClientMu.Unlock()
 	for id, client := range wsClientRegistry {
 		_ = client.conn.Close()
 		delete(wsClientRegistry, id)
 	}
 }
--- a/pkg/mcp/tools_ws_client_test.go
+++ b/pkg/mcp/tools_ws_client_test.go
@ -1,169 +0,0 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"net/http"
 	"net/http/httptest"
 	"strings"
 	"testing"
 	"time"
 	"github.com/gorilla/websocket"
 )
 // TestToolsWSClient_WSConnect_Good dials a test WebSocket server and verifies
 // the handshake completes and a client ID is assigned.
 func TestToolsWSClient_WSConnect_Good(t *testing.T) {
 	t.Cleanup(resetWSClients)
 	server := startTestWSServer(t)
 	defer server.Close()
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, out, err := svc.wsConnect(context.Background(), nil, WSConnectInput{
 		URL:     "ws" + strings.TrimPrefix(server.URL, "http") + "/ws",
 		Timeout: 5,
 	})
 	if err != nil {
 		t.Fatalf("wsConnect failed: %v", err)
 	}
 	if !out.Success {
 		t.Fatal("expected Success=true")
 	}
 	if !strings.HasPrefix(out.ID, "ws-") {
 		t.Fatalf("expected ID prefix 'ws-', got %q", out.ID)
 	}
 	_, _, err = svc.wsClose(context.Background(), nil, WSCloseInput{ID: out.ID})
 	if err != nil {
 		t.Fatalf("wsClose failed: %v", err)
 	}
 }
 // TestToolsWSClient_WSConnect_Bad rejects empty URLs.
 func TestToolsWSClient_WSConnect_Bad(t *testing.T) {
 	t.Cleanup(resetWSClients)
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, _, err = svc.wsConnect(context.Background(), nil, WSConnectInput{})
 	if err == nil {
 		t.Fatal("expected error for empty URL")
 	}
 }
 // TestToolsWSClient_WSSendClose_Good sends a message on an open connection
 // and then closes it.
 func TestToolsWSClient_WSSendClose_Good(t *testing.T) {
 	t.Cleanup(resetWSClients)
 	server := startTestWSServer(t)
 	defer server.Close()
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, conn, err := svc.wsConnect(context.Background(), nil, WSConnectInput{
 		URL:     "ws" + strings.TrimPrefix(server.URL, "http") + "/ws",
 		Timeout: 5,
 	})
 	if err != nil {
 		t.Fatalf("wsConnect failed: %v", err)
 	}
 	_, sendOut, err := svc.wsSend(context.Background(), nil, WSSendInput{
 		ID:      conn.ID,
 		Message: "ping",
 	})
 	if err != nil {
 		t.Fatalf("wsSend failed: %v", err)
 	}
 	if !sendOut.Success {
 		t.Fatal("expected Success=true for wsSend")
 	}
 	if sendOut.Bytes != 4 {
 		t.Fatalf("expected 4 bytes written, got %d", sendOut.Bytes)
 	}
 	_, closeOut, err := svc.wsClose(context.Background(), nil, WSCloseInput{ID: conn.ID})
 	if err != nil {
 		t.Fatalf("wsClose failed: %v", err)
 	}
 	if !closeOut.Success {
 		t.Fatal("expected Success=true for wsClose")
 	}
 	if _, ok := getWSClient(conn.ID); ok {
 		t.Fatal("expected connection to be removed after close")
 	}
 }
 // TestToolsWSClient_WSSend_Bad rejects unknown connection IDs.
 func TestToolsWSClient_WSSend_Bad(t *testing.T) {
 	t.Cleanup(resetWSClients)
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, _, err = svc.wsSend(context.Background(), nil, WSSendInput{ID: "ws-missing", Message: "x"})
 	if err == nil {
 		t.Fatal("expected error for unknown connection ID")
 	}
 }
 // TestToolsWSClient_WSClose_Bad rejects closes for unknown connection IDs.
 func TestToolsWSClient_WSClose_Bad(t *testing.T) {
 	t.Cleanup(resetWSClients)
 	svc, err := New(Options{WorkspaceRoot: t.TempDir()})
 	if err != nil {
 		t.Fatal(err)
 	}
 	_, _, err = svc.wsClose(context.Background(), nil, WSCloseInput{ID: "ws-missing"})
 	if err == nil {
 		t.Fatal("expected error for unknown connection ID")
 	}
 }
 // startTestWSServer returns an httptest.Server running a minimal echo WebSocket
 // handler used by the ws_connect/ws_send tests.
 func startTestWSServer(t *testing.T) *httptest.Server {
 	t.Helper()
 	upgrader := websocket.Upgrader{
 		CheckOrigin: func(*http.Request) bool { return true },
 	}
 	mux := http.NewServeMux()
 	mux.HandleFunc("/ws", func(w http.ResponseWriter, r *http.Request) {
 		conn, err := upgrader.Upgrade(w, r, nil)
 		if err != nil {
 			return
 		}
 		defer conn.Close()
 		conn.SetReadDeadline(time.Now().Add(5 * time.Second))
 		for {
 			_, msg, err := conn.ReadMessage()
 			if err != nil {
 				return
 			}
 			if err := conn.WriteMessage(websocket.TextMessage, msg); err != nil {
 				return
 			}
 		}
 	})
 	return httptest.NewServer(mux)
 }
--- a/pkg/mcp/tools_ws_test.go
+++ b/pkg/mcp/tools_ws_test.go
@ -3,7 +3,7 @@ package mcp
 import (
 	"testing"
-	"dappco.re/go/core/ws"
+	"forge.lthn.ai/core/go-ws"
 )
 // TestWSToolsRegistered_Good verifies that WebSocket tools are registered when hub is available.
@ -83,7 +83,7 @@ func TestWSInfoOutput_Good(t *testing.T) {
 	}
 }
-// TestWithWSHub_Good verifies Options{WSHub: ...}.
+// TestWithWSHub_Good verifies the WithWSHub option.
 func TestWithWSHub_Good(t *testing.T) {
 	hub := ws.NewHub()
@ -97,7 +97,7 @@ func TestWithWSHub_Good(t *testing.T) {
 	}
 }
-// TestWithWSHub_Nil verifies Options{WSHub: nil}.
+// TestWithWSHub_Nil verifies the WithWSHub option with nil.
 func TestWithWSHub_Nil(t *testing.T) {
 	s, err := New(Options{WSHub: nil})
 	if err != nil {
--- a/pkg/mcp/transport_e2e_test.go
+++ b/pkg/mcp/transport_e2e_test.go
@ -2,7 +2,6 @@ package mcp
 import (
 	"bufio"
 	"context"
 	"encoding/json"
 	"fmt"
 	"net"
@ -11,6 +10,8 @@ import (
 	"strings"
 	"testing"
 	"time"
 	"context"
 )
 // jsonRPCRequest builds a raw JSON-RPC 2.0 request string with newline delimiter.
@ -147,20 +148,20 @@ func TestTCPTransport_E2E_FullRoundTrip(t *testing.T) {
 	scanner := bufio.NewScanner(conn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
-	// Step 1: Send initialise request
+	// Step 1: Send initialize request
 	initReq := jsonRPCRequest(1, "initialize", map[string]any{
 		"protocolVersion": "2024-11-05",
 		"capabilities":    map[string]any{},
 		"clientInfo":      map[string]any{"name": "TestClient", "version": "1.0.0"},
 	})
 	if _, err := conn.Write([]byte(initReq)); err != nil {
-		t.Fatalf("Failed to send initialise: %v", err)
+		t.Fatalf("Failed to send initialize: %v", err)
 	}
-	// Read initialise response
+	// Read initialize response
 	initResp := readJSONRPCResponse(t, scanner, conn)
 	if initResp["error"] != nil {
-		t.Fatalf("Initialise returned error: %v", initResp["error"])
+		t.Fatalf("Initialize returned error: %v", initResp["error"])
 	}
 	result, ok := initResp["result"].(map[string]any)
 	if !ok {
@ -290,7 +291,7 @@ func TestTCPTransport_E2E_FileWrite(t *testing.T) {
 	scanner := bufio.NewScanner(conn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
-	// Initialise handshake
+	// Initialize handshake
 	conn.Write([]byte(jsonRPCRequest(1, "initialize", map[string]any{
 		"protocolVersion": "2024-11-05",
 		"capabilities":    map[string]any{},
@ -378,7 +379,7 @@ func TestUnixTransport_E2E_FullRoundTrip(t *testing.T) {
 	scanner := bufio.NewScanner(conn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
-	// Step 1: Initialise
+	// Step 1: Initialize
 	conn.Write([]byte(jsonRPCRequest(1, "initialize", map[string]any{
 		"protocolVersion": "2024-11-05",
 		"capabilities":    map[string]any{},
@ -386,10 +387,10 @@ func TestUnixTransport_E2E_FullRoundTrip(t *testing.T) {
 	})))
 	initResp := readJSONRPCResponse(t, scanner, conn)
 	if initResp["error"] != nil {
-		t.Fatalf("Initialise returned error: %v", initResp["error"])
+		t.Fatalf("Initialize returned error: %v", initResp["error"])
 	}
-	// Step 2: Send initialised notification
+	// Step 2: Send initialized notification
 	conn.Write([]byte(jsonRPCNotification("notifications/initialized")))
 	// Step 3: tools/list
@ -487,7 +488,7 @@ func TestUnixTransport_E2E_DirList(t *testing.T) {
 	scanner := bufio.NewScanner(conn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
-	// Initialise
+	// Initialize
 	conn.Write([]byte(jsonRPCRequest(1, "initialize", map[string]any{
 		"protocolVersion": "2024-11-05",
 		"capabilities":    map[string]any{},
@ -609,7 +610,7 @@ func TestTCPTransport_E2E_ToolsDiscovery(t *testing.T) {
 	scanner := bufio.NewScanner(conn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
-	// Initialise
+	// Initialize
 	conn.Write([]byte(jsonRPCRequest(1, "initialize", map[string]any{
 		"protocolVersion": "2024-11-05",
 		"capabilities":    map[string]any{},
@ -685,7 +686,7 @@ func TestTCPTransport_E2E_ErrorHandling(t *testing.T) {
 	scanner := bufio.NewScanner(conn)
 	scanner.Buffer(make([]byte, 64*1024), 10*1024*1024)
-	// Initialise
+	// Initialize
 	conn.Write([]byte(jsonRPCRequest(1, "initialize", map[string]any{
 		"protocolVersion": "2024-11-05",
 		"capabilities":    map[string]any{},
@ -736,3 +737,6 @@ func TestTCPTransport_E2E_ErrorHandling(t *testing.T) {
 	cancel()
 	<-errCh
 }
 // Suppress "unused import" for fmt — used in helpers
 var _ = fmt.Sprintf
--- a/pkg/mcp/transport_http.go
+++ b/pkg/mcp/transport_http.go
@ -4,16 +4,13 @@ package mcp
 import (
 	"context"
-	"encoding/json"
+	"crypto/subtle"
 	"net"
 	"net/http"
-	"strings"
+	"os"
 	"time"
-	core "dappco.re/go/core"
+	coreerr "forge.lthn.ai/core/go-log"
 	coreerr "dappco.re/go/core/log"
 	api "dappco.re/go/core/api"
 	"github.com/gin-gonic/gin"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -34,18 +31,12 @@ const DefaultHTTPAddr = "127.0.0.1:9101"
 //	svc.ServeHTTP(ctx, "0.0.0.0:9101")
 //
 // Endpoint /mcp: GET (SSE stream), POST (JSON-RPC), DELETE (terminate session).
 //
 // Additional endpoints:
 //   - POST /mcp/auth: exchange API token for JWT
 //   - /v1/tools/<tool_name>: auto-mounted REST bridge for MCP tools
 //   - /health: unauthenticated health endpoint
 //   - /.well-known/mcp-servers.json: MCP portal discovery
 func (s *Service) ServeHTTP(ctx context.Context, addr string) error {
 	if addr == "" {
 		addr = DefaultHTTPAddr
 	}
-	authToken := core.Env("MCP_AUTH_TOKEN")
+	authToken := os.Getenv("MCP_AUTH_TOKEN")
 	handler := mcp.NewStreamableHTTPHandler(
 		func(r *http.Request) *mcp.Server {
@ -56,25 +47,13 @@ func (s *Service) ServeHTTP(ctx context.Context, addr string) error {
 		},
 	)
 	toolBridge := api.NewToolBridge("/v1/tools")
 	BridgeToAPI(s, toolBridge)
 	toolEngine := gin.New()
 	toolBridge.RegisterRoutes(toolEngine.Group("/v1/tools"))
 	toolHandler := withAuth(authToken, toolEngine)
 	mux := http.NewServeMux()
 	mux.Handle("/mcp", withAuth(authToken, handler))
 	mux.Handle("/v1/tools", toolHandler)
 	mux.Handle("/v1/tools/", toolHandler)
 	mux.HandleFunc("/mcp/auth", func(w http.ResponseWriter, r *http.Request) {
 		serveMCPAuthExchange(w, r, authToken)
 	})
 	mux.HandleFunc("/.well-known/mcp-servers.json", handleMCPDiscovery)
 	// Health check (no auth)
 	mux.HandleFunc("/health", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
-		_ = json.NewEncoder(w).Encode(map[string]any{"status": "ok"})
+		w.Write([]byte(`{"status":"ok"}`))
 	})
 	listener, err := net.Listen("tcp", addr)
@ -92,7 +71,7 @@ func (s *Service) ServeHTTP(ctx context.Context, addr string) error {
 		<-ctx.Done()
 		shutdownCtx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 		defer cancel()
-		_ = server.Shutdown(shutdownCtx)
+		server.Shutdown(shutdownCtx)
 	}()
 	if err := server.Serve(listener); err != nil && err != http.ErrServerClosed {
@ -101,185 +80,23 @@ func (s *Service) ServeHTTP(ctx context.Context, addr string) error {
 	return nil
 }
 type mcpAuthExchangeRequest struct {
 	Token        string   `json:"token"`
 	Workspace    string   `json:"workspace"`
 	Entitlements []string `json:"entitlements"`
 	Sub          string   `json:"sub"`
 }
 type mcpAuthExchangeResponse struct {
 	AccessToken string `json:"access_token"`
 	TokenType   string `json:"token_type"`
 	ExpiresIn   int64  `json:"expires_in"`
 	ExpiresAt   int64  `json:"expires_at"`
 }
 type mcpDiscoveryResponse struct {
 	Servers []mcpDiscoveryServer `json:"servers"`
 }
 type mcpDiscoveryServer struct {
 	ID             string         `json:"id"`
 	Name           string         `json:"name"`
 	Description    string         `json:"description"`
 	Connection     map[string]any `json:"connection"`
 	Capabilities   []string       `json:"capabilities"`
 	UseWhen        []string       `json:"use_when"`
 	RelatedServers []string       `json:"related_servers"`
 }
 // withAuth wraps an http.Handler with Bearer token authentication.
-// If token is empty, authentication is disabled for local development.
+// If token is empty, authentication is disabled (passthrough).
 func withAuth(token string, next http.Handler) http.Handler {
 	if token == "" {
 		return next
 	}
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if core.Trim(token) == "" {
+		auth := r.Header.Get("Authorization")
-			next.ServeHTTP(w, r)
+		if len(auth) < 7 || auth[:7] != "Bearer " {
 			http.Error(w, `{"error":"missing Bearer token"}`, http.StatusUnauthorized)
 			return
 		}
-
+		provided := auth[7:]
-		claims, err := parseAuthClaims(r.Header.Get("Authorization"), token)
+		if subtle.ConstantTimeCompare([]byte(provided), []byte(token)) != 1 {
 		if err != nil {
 			http.Error(w, `{"error":"invalid token"}`, http.StatusUnauthorized)
 			return
 		}
 		if claims != nil {
 			r = r.WithContext(withAuthClaims(r.Context(), claims))
 		}
 		next.ServeHTTP(w, r)
 	})
 }
 func serveMCPAuthExchange(w http.ResponseWriter, r *http.Request, apiToken string) {
 	if r.Method != http.MethodPost {
 		w.WriteHeader(http.StatusMethodNotAllowed)
 		return
 	}
 	apiToken = core.Trim(apiToken)
 	if apiToken == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusUnauthorized)
 		_ = json.NewEncoder(w).Encode(api.Fail("unauthorized", "authentication is not configured"))
 		return
 	}
 	var req mcpAuthExchangeRequest
 	if err := json.NewDecoder(http.MaxBytesReader(w, r.Body, 10<<20)).Decode(&req); err != nil {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)
 		_ = json.NewEncoder(w).Encode(api.Fail("invalid_request", "invalid JSON payload"))
 		return
 	}
 	providedToken := strings.TrimSpace(extractBearerToken(r.Header.Get("Authorization")))
 	if providedToken == "" {
 		providedToken = strings.TrimSpace(req.Token)
 	}
 	if providedToken == "" {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusBadRequest)
 		_ = json.NewEncoder(w).Encode(api.Fail("invalid_request", "missing token"))
 		return
 	}
 	if _, err := parseAuthClaims("Bearer "+providedToken, apiToken); err != nil {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusUnauthorized)
 		_ = json.NewEncoder(w).Encode(api.Fail("unauthorized", "invalid API token"))
 		return
 	}
 	cfg := currentAuthConfig(apiToken)
 	now := time.Now()
 	claims := authClaims{
 		Workspace:    strings.TrimSpace(req.Workspace),
 		Entitlements: dedupeEntitlements(req.Entitlements),
 		Subject:      core.Trim(req.Sub),
 		IssuedAt:     now.Unix(),
 		ExpiresAt:     now.Unix() + int64(cfg.ttl.Seconds()),
 	}
 	minted, err := mintJWTToken(claims, cfg)
 	if err != nil {
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusInternalServerError)
 		_ = json.NewEncoder(w).Encode(api.Fail("token_error", "failed to mint token"))
 		return
 	}
 	w.Header().Set("Content-Type", "application/json")
 	_ = json.NewEncoder(w).Encode(mcpAuthExchangeResponse{
 		AccessToken: minted,
 		TokenType:   "Bearer",
 		ExpiresIn:   int64(cfg.ttl.Seconds()),
 		ExpiresAt:   claims.ExpiresAt,
 	})
 }
 func dedupeEntitlements(entitlements []string) []string {
 	if len(entitlements) == 0 {
 		return nil
 	}
 	seen := make(map[string]struct{}, len(entitlements))
 	out := make([]string, 0, len(entitlements))
 	for _, ent := range entitlements {
 		e := strings.TrimSpace(ent)
 		if e == "" {
 			continue
 		}
 		if _, ok := seen[e]; ok {
 			continue
 		}
 		seen[e] = struct{}{}
 		out = append(out, e)
 	}
 	return out
 }
 func handleMCPDiscovery(w http.ResponseWriter, r *http.Request) {
 	resp := mcpDiscoveryResponse{
 		Servers: []mcpDiscoveryServer{
 			{
 				ID:          "core-agent",
 				Name:        "Core Agent",
 				Description: "Dispatch agents, manage workspaces, search OpenBrain",
 				Connection: map[string]any{
 					"type":    "stdio",
 					"command": "core-agent",
 					"args":    []string{"mcp"},
 				},
 				Capabilities: []string{"tools", "resources"},
 				UseWhen: []string{
 					"Need to dispatch work to Codex/Claude/Gemini",
 					"Need workspace status",
 					"Need semantic search",
 				},
 				RelatedServers: []string{"core-mcp"},
 			},
 			{
 				ID:          "core-mcp",
 				Name:        "Core MCP",
 				Description: "File ops, process and build tools, RAG search, webview, dashboards — the agent-facing MCP framework.",
 				Connection: map[string]any{
 					"type":    "stdio",
 					"command": "core-mcp",
 				},
 				Capabilities: []string{"tools", "resources", "logging"},
 				UseWhen: []string{
 					"Need to read/write files inside a workspace",
 					"Need to start or monitor processes",
 					"Need to run RAG queries or index documents",
 					"Need to render or update an embedded dashboard view",
 				},
 				RelatedServers: []string{"core-agent"},
 			},
 		},
 	}
 	w.Header().Set("Content-Type", "application/json")
 	if err := json.NewEncoder(w).Encode(resp); err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		_ = json.NewEncoder(w).Encode(api.Fail("server_error", "failed to encode discovery payload"))
 	}
 }
--- a/pkg/mcp/transport_http_test.go
+++ b/pkg/mcp/transport_http_test.go
@ -107,44 +107,6 @@ func TestServeHTTP_Good_AuthRequired(t *testing.T) {
 	<-errCh
 }
 func TestServeHTTP_Good_NoAuthConfigured(t *testing.T) {
 	os.Unsetenv("MCP_AUTH_TOKEN")
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	listener, err := net.Listen("tcp", "127.0.0.1:0")
 	if err != nil {
 		t.Fatalf("Failed to find free port: %v", err)
 	}
 	addr := listener.Addr().String()
 	listener.Close()
 	errCh := make(chan error, 1)
 	go func() {
 		errCh <- s.ServeHTTP(ctx, addr)
 	}()
 	time.Sleep(100 * time.Millisecond)
 	resp, err := http.Get(fmt.Sprintf("http://%s/mcp", addr))
 	if err != nil {
 		t.Fatalf("request failed: %v", err)
 	}
 	resp.Body.Close()
 	if resp.StatusCode == 401 {
 		t.Fatalf("expected /mcp to be open without MCP_AUTH_TOKEN, got %d", resp.StatusCode)
 	}
 	cancel()
 	<-errCh
 }
 func TestWithAuth_Good_ValidToken(t *testing.T) {
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(200)
@ -195,34 +157,19 @@ func TestWithAuth_Bad_MissingToken(t *testing.T) {
 	}
 }
-func TestWithAuth_Good_EmptyConfiguredToken_DisablesAuth(t *testing.T) {
+func TestWithAuth_Good_EmptyTokenPassthrough(t *testing.T) {
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(200)
 	})
 	// Empty token disables auth
 	wrapped := withAuth("", handler)
 	req, _ := http.NewRequest("GET", "/", nil)
 	rr := &fakeResponseWriter{code: 200}
 	wrapped.ServeHTTP(rr, req)
 	if rr.code != 200 {
-		t.Errorf("expected 200 with empty configured token, got %d", rr.code)
+		t.Errorf("expected 200 with auth disabled, got %d", rr.code)
 	}
 }
 func TestWithAuth_Bad_NonBearerToken(t *testing.T) {
 	handler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.WriteHeader(200)
 	})
 	wrapped := withAuth("my-token", handler)
 	req, _ := http.NewRequest("GET", "/", nil)
 	req.Header.Set("Authorization", "Token my-token")
 	rr := &fakeResponseWriter{code: 200}
 	wrapped.ServeHTTP(rr, req)
 	if rr.code != 401 {
 		t.Errorf("expected 401 with non-Bearer auth, got %d", rr.code)
 	}
 }
--- a/pkg/mcp/transport_stdio.go
+++ b/pkg/mcp/transport_stdio.go
@ -1,12 +1,9 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"os"
-	"dappco.re/go/core/log"
+	"forge.lthn.ai/core/go-log"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -18,8 +15,5 @@ import (
 //	}
 func (s *Service) ServeStdio(ctx context.Context) error {
 	s.logger.Info("MCP Stdio server starting", "user", log.Username())
-	return s.server.Run(ctx, &mcp.IOTransport{
+	return s.server.Run(ctx, &mcp.StdioTransport{})
 		Reader: os.Stdin,
 		Writer: sharedStdout,
 	})
 }
--- a/pkg/mcp/transport_tcp.go
+++ b/pkg/mcp/transport_tcp.go
@ -1,16 +1,14 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"bufio"
 	"context"
-	goio "io"
+	"fmt"
 	"io"
 	"net"
 	"os"
 	"sync"
 	core "dappco.re/go/core"
 	"github.com/modelcontextprotocol/go-sdk/jsonrpc"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
@ -25,18 +23,18 @@ var diagMu sync.Mutex
 // diagWriter is the destination for warning and diagnostic messages.
 // Use diagPrintf to write to it safely.
-var diagWriter goio.Writer = os.Stderr
+var diagWriter io.Writer = os.Stderr
 // diagPrintf writes a formatted message to diagWriter under the mutex.
 func diagPrintf(format string, args ...any) {
 	diagMu.Lock()
 	defer diagMu.Unlock()
-	core.Print(diagWriter, format, args...)
+	fmt.Fprintf(diagWriter, format, args...)
 }
 // setDiagWriter swaps the diagnostic writer and returns the previous one.
 // Used by tests to capture output without racing.
-func setDiagWriter(w goio.Writer) goio.Writer {
+func setDiagWriter(w io.Writer) io.Writer {
 	diagMu.Lock()
 	defer diagMu.Unlock()
 	old := diagWriter
@ -57,14 +55,11 @@ type TCPTransport struct {
 // NewTCPTransport creates a new TCP transport listener.
 // Defaults to 127.0.0.1 when the host component is empty (e.g. ":9100").
 // Defaults to DefaultTCPAddr when addr is empty.
 // Emits a security warning when explicitly binding to 0.0.0.0 (all interfaces).
 //
 //	t, err := NewTCPTransport("127.0.0.1:9100")
 //	t, err := NewTCPTransport(":9100") // defaults to 127.0.0.1:9100
 func NewTCPTransport(addr string) (*TCPTransport, error) {
 	addr = normalizeTCPAddr(addr)
 	host, port, _ := net.SplitHostPort(addr)
 	if host == "" {
 		addr = net.JoinHostPort("127.0.0.1", port)
@ -78,23 +73,6 @@ func NewTCPTransport(addr string) (*TCPTransport, error) {
 	return &TCPTransport{addr: addr, listener: listener}, nil
 }
 func normalizeTCPAddr(addr string) string {
 	if addr == "" {
 		return DefaultTCPAddr
 	}
 	host, port, err := net.SplitHostPort(addr)
 	if err != nil {
 		return addr
 	}
 	if host == "" {
 		return net.JoinHostPort("127.0.0.1", port)
 	}
 	return addr
 }
 // ServeTCP starts a TCP server for the MCP service.
 // It accepts connections and spawns a new MCP server session for each connection.
 //
@ -113,7 +91,11 @@ func (s *Service) ServeTCP(ctx context.Context, addr string) error {
 		<-ctx.Done()
 		_ = t.listener.Close()
 	}()
-	diagPrintf("MCP TCP server listening on %s\n", t.listener.Addr().String())
+
 	if addr == "" {
 		addr = t.listener.Addr().String()
 	}
 	diagPrintf("MCP TCP server listening on %s\n", addr)
 	for {
 		conn, err := t.listener.Accept()
@ -141,7 +123,6 @@ func (s *Service) handleConnection(ctx context.Context, conn net.Conn) {
 		conn.Close()
 		return
 	}
 	defer session.Close()
 	// Block until the session ends
 	if err := session.Wait(); err != nil {
 		diagPrintf("Session ended: %v\n", err)
@ -175,7 +156,7 @@ func (c *connConnection) Read(ctx context.Context) (jsonrpc.Message, error) {
 			return nil, err
 		}
 		// EOF - connection closed cleanly
-		return nil, goio.EOF
+		return nil, io.EOF
 	}
 	line := c.scanner.Bytes()
 	return jsonrpc.DecodeMessage(line)
--- a/pkg/mcp/transport_tcp_test.go
+++ b/pkg/mcp/transport_tcp_test.go
@ -31,26 +31,6 @@ func TestNewTCPTransport_Defaults(t *testing.T) {
 	}
 }
 func TestNormalizeTCPAddr_Good_Defaults(t *testing.T) {
 	tests := []struct {
 		name string
 		in   string
 		want string
 	}{
 		{name: "empty", in: "", want: DefaultTCPAddr},
 		{name: "missing host", in: ":9100", want: "127.0.0.1:9100"},
 		{name: "explicit host", in: "127.0.0.1:9100", want: "127.0.0.1:9100"},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			if got := normalizeTCPAddr(tt.in); got != tt.want {
 				t.Fatalf("normalizeTCPAddr(%q) = %q, want %q", tt.in, got, tt.want)
 			}
 		})
 	}
 }
 func TestNewTCPTransport_Warning(t *testing.T) {
 	// Capture warning output via setDiagWriter (mutex-protected, no race).
 	var buf bytes.Buffer
--- a/pkg/mcp/transport_unix.go
+++ b/pkg/mcp/transport_unix.go
@ -1,13 +1,11 @@
 // SPDX-License-Identifier: EUPL-1.2
 package mcp
 import (
 	"context"
 	"net"
-	"dappco.re/go/core/io"
+	"forge.lthn.ai/core/go-io"
-	"dappco.re/go/core/log"
+	"forge.lthn.ai/core/go-log"
 )
 // ServeUnix starts a Unix domain socket server for the MCP service.
--- a/pkg/mcp/transport_unix_test.go
+++ b/pkg/mcp/transport_unix_test.go
@ -1,47 +0,0 @@
 package mcp
 import (
 	"context"
 	"net"
 	"testing"
 	"time"
 )
 func TestRun_Good_UnixTrigger(t *testing.T) {
 	s, err := New(Options{})
 	if err != nil {
 		t.Fatalf("Failed to create service: %v", err)
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	socketPath := shortSocketPath(t, "run")
 	t.Setenv("MCP_UNIX_SOCKET", socketPath)
 	t.Setenv("MCP_HTTP_ADDR", "")
 	t.Setenv("MCP_ADDR", "")
 	errCh := make(chan error, 1)
 	go func() {
 		errCh <- s.Run(ctx)
 	}()
 	var conn net.Conn
 	deadline := time.Now().Add(2 * time.Second)
 	for time.Now().Before(deadline) {
 		conn, err = net.DialTimeout("unix", socketPath, 200*time.Millisecond)
 		if err == nil {
 			break
 		}
 		time.Sleep(50 * time.Millisecond)
 	}
 	if err != nil {
 		t.Fatalf("Failed to connect to Unix socket at %s: %v", socketPath, err)
 	}
 	conn.Close()
 	cancel()
 	if err := <-errCh; err != nil {
 		t.Fatalf("Run failed: %v", err)
 	}
 }
--- a/src/php/docs/tools-reference.md
+++ b/src/php/docs/tools-reference.md
@ -140,75 +140,6 @@ List all database tables in the application.
 ---
 ### describe_table
 Describe a database table, including its columns and indexes.
 **Description:** Describe a database table, including columns and indexes
 **Parameters:**
 | Name | Type | Required | Description |
 |------|------|----------|-------------|
 | `table` | string | Yes | Database table name to inspect |
 **Example Request:**
 ```json
 {
    "tool": "describe_table",
    "arguments": {
        "table": "users"
    }
 }
 ```
 **Success Response:**
 ```json
 {
    "table": "users",
    "columns": [
        {
            "field": "id",
            "type": "bigint unsigned",
            "collation": null,
            "null": "NO",
            "key": "PRI",
            "default": null,
            "extra": "auto_increment",
            "privileges": "select,insert,update,references",
            "comment": "Primary key"
        }
    ],
    "indexes": [
        {
            "name": "PRIMARY",
            "unique": true,
            "type": "BTREE",
            "columns": [
                {
                    "name": "id",
                    "order": 1,
                    "collation": "A",
                    "cardinality": 1,
                    "sub_part": null,
                    "nullable": "",
                    "comment": ""
                }
            ]
        }
    ]
 }
 ```
 **Security Notes:**
 - Table names are validated to allow only letters, numbers, and underscores
 - System tables are blocked
 - Table access may be filtered based on configuration
 ---
 ## Commerce Tools
 ### get_billing_status
@ -759,7 +690,6 @@ curl -X POST https://api.example.com/mcp/tools/call \
 ### Query Tools
 - `query_database` - Execute SQL queries
 - `list_tables` - List database tables
 - `describe_table` - Inspect table columns and indexes
 ### Commerce Tools
 - `get_billing_status` - Get subscription status
--- a/src/php/src/Mcp/Boot.php
+++ b/src/php/src/Mcp/Boot.php
@ -113,8 +113,6 @@ class Boot extends ServiceProvider
                    ->where('id', '[a-z0-9-]+');
                Route::get('servers/{id}/tools', [Controllers\McpApiController::class, 'tools'])->name('servers.tools')
                    ->where('id', '[a-z0-9-]+');
                Route::get('servers/{id}/resources', [Controllers\McpApiController::class, 'resources'])->name('servers.resources')
                    ->where('id', '[a-z0-9-]+');
            })
        );
    }
--- a/src/php/src/Mcp/Controllers/McpApiController.php
+++ b/src/php/src/Mcp/Controllers/McpApiController.php
@ -6,9 +6,6 @@ namespace Core\Mcp\Controllers;
 use Core\Front\Controller;
 use Core\Mcp\Services\McpQuotaService;
 use Core\Mod\Agentic\Models\AgentPlan;
 use Core\Mod\Agentic\Models\AgentSession;
 use Core\Mod\Content\Models\ContentItem;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Cache;
@ -16,7 +13,6 @@ use Core\Api\Models\ApiKey;
 use Core\Mcp\Models\McpApiRequest;
 use Core\Mcp\Models\McpToolCall;
 use Core\Mcp\Services\McpWebhookDispatcher;
 use Core\Tenant\Models\Workspace;
 use Symfony\Component\Yaml\Yaml;
 /**
@ -82,26 +78,6 @@ class McpApiController extends Controller
        ]);
    }
    /**
     * List resources for a specific server.
     *
     * GET /api/v1/mcp/servers/{id}/resources
     */
    public function resources(Request $request, string $id): JsonResponse
    {
        $server = $this->loadServerFull($id);
        if (! $server) {
            return response()->json(['error' => 'Server not found'], 404);
        }
        return response()->json([
            'server' => $id,
            'resources' => array_values($server['resources'] ?? []),
            'count' => count($server['resources'] ?? []),
        ]);
    }
    /**
     * Execute a tool on an MCP server.
     *
@ -199,6 +175,8 @@ class McpApiController extends Controller
     * Read a resource from an MCP server.
     *
     * GET /api/v1/mcp/resources/{uri}
     *
     * NOTE: Resource reading is not yet implemented. Returns 501 Not Implemented.
     */
    public function resource(Request $request, string $uri): JsonResponse
    {
@ -207,289 +185,19 @@ class McpApiController extends Controller
            return response()->json(['error' => 'Invalid resource URI format'], 400);
        }
-        $scheme = $matches[1];
+        $serverId = $matches[1];
        $content = $this->readResourceContent($scheme, $uri);
        if ($content === null) {
            return response()->json([
                'error' => 'not_found',
                'message' => 'Resource not found',
                'uri' => $uri,
            ], 404);
        }
-        return response()->json([
+        $server = $this->loadServerFull($serverId);
            'uri' => $uri,
            'content' => $content,
        ]);
    }
    /**
     * Resolve a supported MCP resource URI into response content.
     */
    protected function readResourceContent(string $scheme, string $uri): ?array
    {
        if (str_starts_with($uri, 'plans://')) {
            return [
                'mimeType' => 'text/markdown',
                'text' => $this->resourcePlanContent($uri),
            ];
        }
        if (str_starts_with($uri, 'sessions://')) {
            return [
                'mimeType' => 'text/markdown',
                'text' => $this->resourceSessionContent($uri),
            ];
        }
        if (str_starts_with($uri, 'content://')) {
            return [
                'mimeType' => 'text/markdown',
                'text' => $this->resourceContentItem($uri),
            ];
        }
        return $this->resourceServerContent($scheme, $uri);
    }
    /**
     * Render plan resources.
     */
    protected function resourcePlanContent(string $uri): string
    {
        if ($uri === 'plans://all') {
            $plans = AgentPlan::with('agentPhases')->notArchived()->orderBy('updated_at', 'desc')->get();
            $md = "# Work Plans\n\n";
            $md .= '**Total:** '.$plans->count()." plan(s)\n\n";
            foreach ($plans->groupBy('status') as $status => $group) {
                $md .= '## '.ucfirst($status).' ('.$group->count().")\n\n";
                foreach ($group as $plan) {
                    $progress = $plan->getProgress();
                    $md .= "- **[{$plan->slug}]** {$plan->title} - {$progress['percentage']}%\n";
                }
                $md .= "\n";
            }
            return $md;
        }
        $path = substr($uri, 9); // Remove "plans://"
        $parts = explode('/', $path);
        $slug = $parts[0];
        $plan = AgentPlan::with('agentPhases')->where('slug', $slug)->first();
        if (! $plan) {
            return "Plan not found: {$slug}";
        }
        if (count($parts) === 3 && $parts[1] === 'phases') {
            $phase = $plan->agentPhases()->where('order', (int) $parts[2])->first();
            if (! $phase) {
                return "Phase not found: {$parts[2]}";
            }
            $md = "# Phase {$phase->order}: {$phase->name}\n\n";
            $md .= "**Status:** {$phase->getStatusIcon()} {$phase->status}\n\n";
            if ($phase->description) {
                $md .= "{$phase->description}\n\n";
            }
            $md .= "## Tasks\n\n";
            foreach ($phase->tasks ?? [] as $task) {
                $status = is_string($task) ? 'pending' : ($task['status'] ?? 'pending');
                $name = is_string($task) ? $task : ($task['name'] ?? 'Unknown');
                $icon = $status === 'completed' ? '✅' : '⬜';
                $md .= "- {$icon} {$name}\n";
            }
            return $md;
        }
        if (count($parts) === 3 && $parts[1] === 'state') {
            $state = $plan->states()->where('key', $parts[2])->first();
            if (! $state) {
                return "State key not found: {$parts[2]}";
            }
            return $state->getFormattedValue();
        }
        return $plan->toMarkdown();
    }
    /**
     * Render session resources.
     */
    protected function resourceSessionContent(string $uri): string
    {
        $path = substr($uri, 11); // Remove "sessions://"
        $parts = explode('/', $path);
        if (count($parts) !== 2 || $parts[1] !== 'context') {
            return "Resource not found: {$uri}";
        }
        $session = AgentSession::where('session_id', $parts[0])->first();
        if (! $session) {
            return "Session not found: {$parts[0]}";
        }
        $md = "# Session: {$session->session_id}\n\n";
        $md .= "**Agent:** {$session->agent_type}\n";
        $md .= "**Status:** {$session->status}\n";
        $md .= "**Duration:** {$session->getDurationFormatted()}\n\n";
        if ($session->plan) {
            $md .= "## Plan\n\n";
            $md .= "**{$session->plan->title}** ({$session->plan->slug})\n\n";
        }
        $context = $session->getHandoffContext();
        if (! empty($context['summary'])) {
            $md .= "## Summary\n\n{$context['summary']}\n\n";
        }
        if (! empty($context['next_steps'])) {
            $md .= "## Next Steps\n\n";
            foreach ((array) $context['next_steps'] as $step) {
                $md .= "- {$step}\n";
            }
            $md .= "\n";
        }
        if (! empty($context['blockers'])) {
            $md .= "## Blockers\n\n";
            foreach ((array) $context['blockers'] as $blocker) {
                $md .= "- {$blocker}\n";
            }
            $md .= "\n";
        }
        return $md;
    }
    /**
     * Render content resources.
     */
    protected function resourceContentItem(string $uri): string
    {
        if (! str_starts_with($uri, 'content://')) {
            return "Resource not found: {$uri}";
        }
        $path = substr($uri, 10); // Remove "content://"
        $parts = explode('/', $path, 2);
        if (count($parts) < 2) {
            return "Invalid URI format. Expected: content://{workspace}/{slug}";
        }
        [$workspaceSlug, $contentSlug] = $parts;
        $workspace = Workspace::where('slug', $workspaceSlug)
            ->orWhere('id', $workspaceSlug)
            ->first();
        if (! $workspace) {
            return "Workspace not found: {$workspaceSlug}";
        }
        $item = ContentItem::forWorkspace($workspace->id)
            ->native()
            ->where('slug', $contentSlug)
            ->first();
        if (! $item && is_numeric($contentSlug)) {
            $item = ContentItem::forWorkspace($workspace->id)
                ->native()
                ->find($contentSlug);
        }
        if (! $item) {
            return "Content not found: {$contentSlug}";
        }
        $item->load(['author', 'taxonomies']);
        $md = "---\n";
        $md .= "title: \"{$item->title}\"\n";
        $md .= "slug: {$item->slug}\n";
        $md .= "workspace: {$workspace->slug}\n";
        $md .= "type: {$item->type}\n";
        $md .= "status: {$item->status}\n";
        if ($item->author) {
            $md .= "author: {$item->author->name}\n";
        }
        $categories = $item->categories->pluck('name')->all();
        if (! empty($categories)) {
            $md .= 'categories: ['.implode(', ', $categories)."]\n";
        }
        $tags = $item->tags->pluck('name')->all();
        if (! empty($tags)) {
            $md .= 'tags: ['.implode(', ', $tags)."]\n";
        }
        if ($item->publish_at) {
            $md .= 'publish_at: '.$item->publish_at->toIso8601String()."\n";
        }
        $md .= 'created_at: '.$item->created_at->toIso8601String()."\n";
        $md .= 'updated_at: '.$item->updated_at->toIso8601String()."\n";
        if ($item->seo_meta) {
            if (isset($item->seo_meta['title'])) {
                $md .= "seo_title: \"{$item->seo_meta['title']}\"\n";
            }
            if (isset($item->seo_meta['description'])) {
                $md .= "seo_description: \"{$item->seo_meta['description']}\"\n";
            }
        }
        $md .= "---\n\n";
        if ($item->excerpt) {
            $md .= "> {$item->excerpt}\n\n";
        }
        $content = $item->content_markdown
            ?? strip_tags($item->content_html_clean ?? $item->content_html_original ?? '');
        $md .= $content;
        return $md;
    }
    /**
     * Render server-defined static resources when available.
     */
    protected function resourceServerContent(string $scheme, string $uri): ?array
    {
        $server = $this->loadServerFull($scheme);
        if (! $server) {
-            return null;
+            return response()->json(['error' => 'Server not found'], 404);
        }
-        foreach ($server['resources'] ?? [] as $resource) {
+        // Resource reading not yet implemented
-            if (($resource['uri'] ?? null) !== $uri) {
+        return response()->json([
-                continue;
+            'error' => 'not_implemented',
-            }
+            'message' => 'MCP resource reading is not yet implemented. Use tool calls instead.',
-
+            'uri' => $uri,
-            $text = $resource['content']['text'] ?? $resource['text'] ?? null;
+        ], 501);
            if ($text === null) {
                return null;
            }
            return [
                'mimeType' => $resource['mimeType'] ?? 'text/plain',
                'text' => $text,
            ];
        }
        return null;
    }
    /**
--- a/src/php/src/Mcp/Services/OpenApiGenerator.php
+++ b/src/php/src/Mcp/Services/OpenApiGenerator.php
@ -197,35 +197,6 @@ class OpenApiGenerator
            ],
        ];
        $paths['/servers/{serverId}/resources'] = [
            'get' => [
                'tags' => ['Discovery'],
                'summary' => 'List resources for a server',
                'operationId' => 'listServerResources',
                'security' => [['bearerAuth' => []], ['apiKeyAuth' => []]],
                'parameters' => [
                    [
                        'name' => 'serverId',
                        'in' => 'path',
                        'required' => true,
                        'schema' => ['type' => 'string'],
                    ],
                ],
                'responses' => [
                    '200' => [
                        'description' => 'List of resources',
                        'content' => [
                            'application/json' => [
                                'schema' => [
                                    '$ref' => '#/components/schemas/ResourceList',
                                ],
                            ],
                        ],
                    ],
                ],
            ],
        ];
        // Execution endpoint
        $paths['/tools/call'] = [
            'post' => [
@ -431,17 +402,6 @@ class OpenApiGenerator
                    ],
                ],
            ],
            'ResourceList' => [
                'type' => 'object',
                'properties' => [
                    'server' => ['type' => 'string'],
                    'resources' => [
                        'type' => 'array',
                        'items' => ['$ref' => '#/components/schemas/Resource'],
                    ],
                    'count' => ['type' => 'integer'],
                ],
            ],
        ];
        return $schemas;
--- a/src/php/src/Mcp/Services/ToolRegistry.php
+++ b/src/php/src/Mcp/Services/ToolRegistry.php
@ -33,9 +33,6 @@ class ToolRegistry
            'query' => 'SELECT id, name FROM users LIMIT 10',
        ],
        'list_tables' => [],
        'describe_table' => [
            'table' => 'users',
        ],
        'list_routes' => [],
        'list_sites' => [],
        'get_stats' => [],
--- a/src/php/src/Mcp/Tools/DescribeTable.php
+++ b/src/php/src/Mcp/Tools/DescribeTable.php
@ -1,151 +0,0 @@
 <?php
 declare(strict_types=1);
 namespace Core\Mcp\Tools;
 use Illuminate\Contracts\JsonSchema\JsonSchema;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 use Laravel\Mcp\Request;
 use Laravel\Mcp\Response;
 use Laravel\Mcp\Server\Tool;
 class DescribeTable extends Tool
 {
    protected string $description = 'Describe a database table, including columns and indexes';
    public function handle(Request $request): Response
    {
        $table = trim((string) $request->input('table', ''));
        if ($table === '') {
            return $this->errorResponse('Table name is required');
        }
        if (! $this->isValidTableName($table)) {
            return $this->errorResponse('Invalid table name. Use only letters, numbers, and underscores.');
        }
        if ($this->isBlockedTable($table)) {
            return $this->errorResponse(sprintf("Access to table '%s' is not permitted", $table));
        }
        try {
            $columns = DB::select("SHOW FULL COLUMNS FROM `{$table}`");
            $indexes = DB::select("SHOW INDEX FROM `{$table}`");
        } catch (\Throwable $e) {
            report($e);
            return $this->errorResponse(sprintf('Unable to describe table "%s"', $table));
        }
        $result = [
            'table' => $table,
            'columns' => array_map(
                fn (object $column): array => $this->normaliseColumn((array) $column),
                $columns
            ),
            'indexes' => $this->normaliseIndexes($indexes),
        ];
        return Response::text(json_encode($result, JSON_PRETTY_PRINT));
    }
    public function schema(JsonSchema $schema): array
    {
        return [
            'table' => $schema->string('Database table name to inspect'),
        ];
    }
    /**
     * Validate the table name before interpolating it into SQL.
     */
    private function isValidTableName(string $table): bool
    {
        return (bool) preg_match('/^[A-Za-z0-9_]+$/', $table);
    }
    /**
     * Check whether the table is blocked by configuration or is a system table.
     */
    private function isBlockedTable(string $table): bool
    {
        $blockedTables = Config::get('mcp.database.blocked_tables', []);
        if (in_array($table, $blockedTables, true)) {
            return true;
        }
        $systemTables = ['information_schema', 'mysql', 'performance_schema', 'sys'];
        return in_array(strtolower($table), $systemTables, true);
    }
    /**
     * Normalise a SHOW FULL COLUMNS row into a predictable array shape.
     *
     * @param  array<string, mixed>  $column
     * @return array<string, mixed>
     */
    private function normaliseColumn(array $column): array
    {
        return [
            'field' => $column['Field'] ?? null,
            'type' => $column['Type'] ?? null,
            'collation' => $column['Collation'] ?? null,
            'null' => $column['Null'] ?? null,
            'key' => $column['Key'] ?? null,
            'default' => $column['Default'] ?? null,
            'extra' => $column['Extra'] ?? null,
            'privileges' => $column['Privileges'] ?? null,
            'comment' => $column['Comment'] ?? null,
        ];
    }
    /**
     * Group SHOW INDEX rows by index name.
     *
     * @param  array<int, object>  $indexes
     * @return array<int, array<string, mixed>>
     */
    private function normaliseIndexes(array $indexes): array
    {
        $grouped = [];
        foreach ($indexes as $index) {
            $row = (array) $index;
            $name = (string) ($row['Key_name'] ?? 'unknown');
            if (! isset($grouped[$name])) {
                $grouped[$name] = [
                    'name' => $name,
                    'unique' => ! (bool) ($row['Non_unique'] ?? 1),
                    'type' => $row['Index_type'] ?? null,
                    'columns' => [],
                ];
            }
            $grouped[$name]['columns'][] = [
                'name' => $row['Column_name'] ?? null,
                'order' => $row['Seq_in_index'] ?? null,
                'collation' => $row['Collation'] ?? null,
                'cardinality' => $row['Cardinality'] ?? null,
                'sub_part' => $row['Sub_part'] ?? null,
                'nullable' => $row['Null'] ?? null,
                'comment' => $row['Comment'] ?? null,
            ];
        }
        return array_values($grouped);
    }
    private function errorResponse(string $message): Response
    {
        return Response::text(json_encode([
            'error' => $message,
            'code' => 'VALIDATION_ERROR',
        ]));
    }
 }
--- a/src/php/tests/Unit/DescribeTableTest.php
+++ b/src/php/tests/Unit/DescribeTableTest.php
@ -1,113 +0,0 @@
 <?php
 declare(strict_types=1);
 namespace Core\Mcp\Tests\Unit;
 use Core\Mcp\Tools\DescribeTable;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\DB;
 use Laravel\Mcp\Request;
 use Mockery;
 use Tests\TestCase;
 class DescribeTableTest extends TestCase
 {
    protected function tearDown(): void
    {
        Mockery::close();
        parent::tearDown();
    }
    public function test_handle_returns_columns_and_indexes_for_a_table(): void
    {
        DB::shouldReceive('select')
            ->once()
            ->with('SHOW FULL COLUMNS FROM `users`')
            ->andReturn([
                (object) [
                    'Field' => 'id',
                    'Type' => 'bigint unsigned',
                    'Null' => 'NO',
                    'Key' => 'PRI',
                    'Default' => null,
                    'Extra' => 'auto_increment',
                    'Privileges' => 'select,insert,update,references',
                    'Comment' => 'Primary key',
                ],
                (object) [
                    'Field' => 'email',
                    'Type' => 'varchar(255)',
                    'Null' => 'NO',
                    'Key' => 'UNI',
                    'Default' => null,
                    'Extra' => '',
                    'Privileges' => 'select,insert,update,references',
                    'Comment' => '',
                ],
            ]);
        DB::shouldReceive('select')
            ->once()
            ->with('SHOW INDEX FROM `users`')
            ->andReturn([
                (object) [
                    'Key_name' => 'PRIMARY',
                    'Non_unique' => 0,
                    'Index_type' => 'BTREE',
                    'Column_name' => 'id',
                    'Seq_in_index' => 1,
                    'Collation' => 'A',
                    'Cardinality' => 1,
                    'Sub_part' => null,
                    'Null' => '',
                    'Comment' => '',
                ],
                (object) [
                    'Key_name' => 'users_email_unique',
                    'Non_unique' => 0,
                    'Index_type' => 'BTREE',
                    'Column_name' => 'email',
                    'Seq_in_index' => 1,
                    'Collation' => 'A',
                    'Cardinality' => 1,
                    'Sub_part' => null,
                    'Null' => '',
                    'Comment' => '',
                ],
            ]);
        $tool = new DescribeTable();
        $response = $tool->handle(new Request(['table' => 'users']));
        $data = json_decode($response->getContent(), true, flags: JSON_THROW_ON_ERROR);
        $this->assertSame('users', $data['table']);
        $this->assertCount(2, $data['columns']);
        $this->assertSame('id', $data['columns'][0]['field']);
        $this->assertSame('bigint unsigned', $data['columns'][0]['type']);
        $this->assertSame('PRIMARY', $data['indexes'][0]['name']);
        $this->assertSame(['id'], array_column($data['indexes'][0]['columns'], 'name'));
    }
    public function test_handle_rejects_invalid_table_names(): void
    {
        $tool = new DescribeTable();
        $response = $tool->handle(new Request(['table' => 'users; DROP TABLE users']));
        $data = json_decode($response->getContent(), true, flags: JSON_THROW_ON_ERROR);
        $this->assertSame('VALIDATION_ERROR', $data['code']);
        $this->assertStringContainsString('Invalid table name', $data['error']);
    }
    public function test_handle_blocks_system_tables(): void
    {
        Config::set('mcp.database.blocked_tables', []);
        $tool = new DescribeTable();
        $response = $tool->handle(new Request(['table' => 'information_schema']));
        $data = json_decode($response->getContent(), true, flags: JSON_THROW_ON_ERROR);
        $this->assertSame('VALIDATION_ERROR', $data['code']);
        $this->assertStringContainsString('not permitted', $data['error']);
    }
 }
--- a/src/php/tests/Unit/McpResourceListTest.php
+++ b/src/php/tests/Unit/McpResourceListTest.php
@ -1,67 +0,0 @@
 <?php
 declare(strict_types=1);
 namespace Core\Mcp\Tests\Unit;
 use Core\Mcp\Controllers\McpApiController;
 use Core\Mcp\Services\OpenApiGenerator;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Tests\TestCase;
 class McpResourceListTest extends TestCase
 {
    public function test_resources_endpoint_returns_server_resources(): void
    {
        $controller = new class extends McpApiController {
            protected function loadServerFull(string $id): ?array
            {
                if ($id !== 'demo-server') {
                    return null;
                }
                return [
                    'id' => 'demo-server',
                    'resources' => [
                        [
                            'uri' => 'content://workspace/article',
                            'name' => 'Article',
                            'description' => 'Published article',
                            'mimeType' => 'text/markdown',
                        ],
                        [
                            'uri' => 'plans://all',
                            'name' => 'Plans',
                            'description' => 'Work plan index',
                            'mimeType' => 'text/markdown',
                        ],
                    ],
                ];
            }
        };
        $response = $controller->resources(Request::create('/api/v1/mcp/servers/demo-server/resources', 'GET'), 'demo-server');
        $this->assertInstanceOf(JsonResponse::class, $response);
        $this->assertSame(200, $response->getStatusCode());
        $data = $response->getData(true);
        $this->assertSame('demo-server', $data['server']);
        $this->assertSame(2, $data['count']);
        $this->assertSame('content://workspace/article', $data['resources'][0]['uri']);
        $this->assertSame('plans://all', $data['resources'][1]['uri']);
    }
    public function test_openapi_includes_resource_list_endpoint(): void
    {
        $schema = (new OpenApiGenerator)->generate();
        $this->assertArrayHasKey('/servers/{serverId}/resources', $schema['paths']);
        $this->assertArrayHasKey('ResourceList', $schema['components']['schemas']);
        $this->assertSame(
            '#/components/schemas/ResourceList',
            $schema['paths']['/servers/{serverId}/resources']['get']['responses']['200']['content']['application/json']['schema']['$ref']
        );
    }
 }