refactor(workspace): new workspace v3 container architecture (#244)

* feat(mcp): workspace container with bridge architecture Migrate MCP containers to use UDS-based bridge communication instead of TCP gRPC. Containers now mount runtime binaries and Unix domain sockets from the host, eliminating the need for a dedicated MCP Docker image. - Remove Dockerfile.mcp and entrypoint.sh in favor of standard base images - Add toolkit Dockerfile for building MCP binary separately - Containers use bind mounts for /opt/memoh (runtime) and /run/memoh (UDS) - Update all config files with new runtime_path and socket_dir settings - Support custom base images per bot (debian, alpine, ubuntu, etc.) - Legacy container detection and TCP fallback for pre-bridge containers - Frontend: add base image selector in container creation UI * feat(container): SSE progress bar for container creation Add real-time progress feedback during container image pull and creation using Server-Sent Events, without breaking the existing synchronous JSON API (content negotiation via Accept header). Backend: - Add PullProgress/LayerStatus types and OnProgress callback to PullImageOptions (containerd service layer) - DefaultService.PullImage polls ContentStore.ListStatuses every 500ms when OnProgress is set; AppleService ignores it - CreateContainer handler checks Accept: text/event-stream and switches to SSE branch: pulling → pull_progress → creating → complete/error Frontend: - handleCreateContainer/handleRecreateContainer use fetch + SSE instead of the SDK's synchronous postBotsByBotIdContainer - Progress bar shows layer-level pull progress (offset/total) during pulling phase and indeterminate animation during creating phase - i18n keys added for pullingImage and creatingContainer (en/zh) * fix(container): clear stale legacy route and type create SSE * fix(ci): resolve lint errors and arm64 musl node.js download - Fix unused-receiver lint: rename `s` to `_` on stub methods in manager_legacy_test.go - Fix sloglint: use slog.DiscardHandler instead of slog.NewTextHandler(io.Discard, nil) - Handle missing arm64 musl Node.js builds: unofficial-builds.nodejs.org does not provide arm64 musl binaries, fall back to glibc build * fix(lint): address errcheck, staticcheck, and gosec findings - Discard os.Setenv/os.Remove return values explicitly with _ - Use omitted receiver name instead of _ (staticcheck ST1006) - Tighten directory permissions from 0o755 to 0o750 (gosec G301) * fix(lint): sanitize socket path to satisfy gosec G703 filepath.Clean the env-sourced socket path before os.Remove to avoid path-traversal taint warning. * fix(lint): use nolint directive for gosec G703 on socket path filepath.Clean does not satisfy gosec's taint analysis. The socket path comes from MCP_SOCKET_PATH env (operator-configured) or a compiled-in default, not from end-user input. * refactor: rename MCP container/bridge to workspace/bridge Split internal/mcp/ to separate container lifecycle management from Model Context Protocol connections, eliminating naming confusion: - internal/mcp/ (container mgmt) → internal/workspace/ - internal/mcp/mcpclient/ → internal/workspace/bridge/ - internal/mcp/mcpcontainer/ → internal/workspace/bridgepb/ - cmd/mcp/ → cmd/bridge/ - config: MCPConfig → WorkspaceConfig, [mcp] → [workspace] - container prefix: mcp-{id} → workspace-{id} - labels: mcp.bot_id → memoh.bot_id, add memoh.workspace=v1 - socket: mcp.sock → bridge.sock, env BRIDGE_SOCKET_PATH - runtime: /opt/memoh/runtime/mcp → /opt/memoh/runtime/bridge - devenv: mcp-build.sh → bridge-build.sh Legacy containers (mcp- prefix) detected by container name prefix and handled via existing fallback path. * fix(container): use memoh.workspace=v3 label value * refactor(container): drop LegacyBotLabelKey, infer bot ID from container name Legacy containers use mcp-{botID} naming, so bot ID can be derived via TrimPrefix instead of looking up the mcp.bot_id label. * fix(workspace): resolve containers via manager and drop gateway container ID * docs: fix stale mcp references in AGENTS.md and DEPLOYMENT.md * refactor(workspace): move container lifecycle ownership into manager * dev: isolate local devenv from prod config * toolkit: support musl node runtime * containerd: fix fallback resolv.conf permissions * web: preserve container create progress on completion * web: add bot creation wait hint * fix(workspace): preserve image selection across recreate * feat(web): shorten default docker hub image refs * fix(container): address code review findings - Remove synchronous CreateContainer path (SSE-only now) - Move flusher check before WriteHeader to avoid committed 200 on error - Fix legacy container IP not cached via ensureContainerAndTask path - Add atomic guard to prevent stale pull_progress after PullImage returns - Defensive copy for tzEnv slice to avoid mutating shared backing array - Restore network failure severity in restartContainer (return + Error) - Extract duplicate progress bar into ContainerCreateProgress component - Fix codesync comments to use repo-relative paths - Add SaaS image validation note and kernel version comment on reaper * refactor(devenv): extract toolkit install into shared script Unify the Node.js + uv download logic into docker/toolkit/install.sh, used by the production Dockerfile and runnable locally for dev. Dev environment no longer bakes toolkit into the Docker image — it is volume-mounted from .toolkit/ instead, so wrapper script changes take effect immediately without rebuilding. The entrypoint checks for the toolkit directory and prints a clear error if missing. * fix(ci): address go ci failures * chore(docker): remove unused containerd image * refactor(config): rename workspace image key * fix(workspace): fix legacy container data loss on migration and stop swallowing errors Three root causes were identified and fixed: 1. Delete() used hardcoded "workspace-" prefix to look up legacy "mcp-" containers, causing GetContainer to return NotFound. CleanupBotContainer then silently skipped the error and deleted the DB record without ever calling PreserveData. Fix: resolve the actual container ID via ContainerID() (DB → label → scan) before operating. 2. Multiple restore error paths were silently swallowed (logged as Warn but not returned), so the user saw HTTP 200/204 with no data and no error. Fix: all errors in the preserve/restore chain now block the workflow and propagate to the caller. 3. tarGzDir used cached DirEntry.Info() for tar header size, which on overlayfs can differ from the actual file size, causing "archive/tar: write too long". Fix: open the file first, Fstat the fd for a race-free size, and use LimitReader as a safeguard. Also adds a "restoring" SSE phase so the frontend shows a progress indicator ("Restoring data, this may take a while...") during data migration on container recreation. * refactor(workspace): single-point container ID resolution Replace the `containerID func(string) string` field with a single `resolveContainerID(ctx, botID)` method that resolves the actual container ID via DB → label → scan → fallback. All ~16 lookup callsites across manager.go, dataio.go, versioning.go, and manager_lifecycle.go now go through this single resolver, which correctly handles both legacy "mcp-" and new "workspace-" containers. Only `ensureBotWithImage` inlines `ContainerPrefix + botID` for creating brand-new containers — every other path resolves dynamically. * fix(web): show progress during data backup phase of container recreate The recreate flow (delete with preserve_data + create with restore_data) blocked on the DELETE call while backing up /data with no progress indication. Add a 'preserving' phase to the progress component so users see "正在备份数据..." instead of an unexplained hang. * chore: remove [MYDEBUG] debug logging Clean up all 112 temporary debug log statements added during the legacy container migration investigation. Kept only meaningful warn-level logs for non-fatal errors (network teardown, rename failures).
2026-04-25 07:00:48 +09:00 · 2026-03-18 15:19:09 +08:00
parent 3f87a705a6
commit d5b410d7e3
98 changed files with 2979 additions and 1472 deletions
@@ -90,6 +90,7 @@ import (
 	ttspkg "github.com/memohai/memoh/internal/tts"
 	ttsedge "github.com/memohai/memoh/internal/tts/adapter/edge"
 	"github.com/memohai/memoh/internal/version"
+	"github.com/memohai/memoh/internal/workspace"
 )

 func migrationsFS() fs.FS {
@@ -156,8 +157,8 @@ func runServe() {
 			provideDBConn,
 			provideDBQueries,

-			// container & mcp infrastructure
-			provideMCPManager,
+			// container & workspace infrastructure
+			provideWorkspaceManager,

 			// memory pipeline
 			provideMemoryLLM,
@@ -336,8 +337,8 @@ func provideDBQueries(conn *pgxpool.Pool) *dbsqlc.Queries {
 	return dbsqlc.New(conn)
 }

-func provideMCPManager(log *slog.Logger, service ctr.Service, cfg config.Config, conn *pgxpool.Pool) *mcp.Manager {
-	return mcp.NewManager(log, service, cfg.MCP, cfg.Containerd.Namespace, conn)
+func provideWorkspaceManager(log *slog.Logger, service ctr.Service, cfg config.Config, conn *pgxpool.Pool) *workspace.Manager {
+	return workspace.NewManager(log, service, cfg.Workspace, cfg.Containerd.Namespace, conn)
 }

 // ---------------------------------------------------------------------------
@@ -353,7 +354,7 @@ func provideMemoryLLM(modelsService *models.Service, queries *dbsqlc.Queries, lo
 	}
 }

-func provideMemoryProviderRegistry(log *slog.Logger, chatService *conversation.Service, accountService *accounts.Service, manager *mcp.Manager, queries *dbsqlc.Queries, cfg config.Config) *memprovider.Registry {
+func provideMemoryProviderRegistry(log *slog.Logger, chatService *conversation.Service, accountService *accounts.Service, manager *workspace.Manager, queries *dbsqlc.Queries, cfg config.Config) *memprovider.Registry {
 	registry := memprovider.NewRegistry(log)
 	fileRuntime := handlers.NewBuiltinMemoryRuntime(manager)
 	fileStore := storefs.New(log, manager)
@@ -466,7 +467,7 @@ func provideChannelRouter(
 	heartbeatService *heartbeat.Service,
 	queries *dbsqlc.Queries,
 	containerdHandler *handlers.ContainerdHandler,
-	manager *mcp.Manager,
+	manager *workspace.Manager,
 	rc *boot.RuntimeConfig,
 ) *inbound.ChannelInboundProcessor {
 	adapter, ok := registry.Get(qq.Type)
@@ -526,8 +527,8 @@ func provideChannelLifecycleService(channelStore *channel.Store, channelManager
 // containerd handler & tool gateway
 // ---------------------------------------------------------------------------

-func provideContainerdHandler(log *slog.Logger, service ctr.Service, manager *mcp.Manager, cfg config.Config, rc *boot.RuntimeConfig, botService *bots.Service, accountService *accounts.Service, policyService *policy.Service, queries *dbsqlc.Queries) *handlers.ContainerdHandler {
-	return handlers.NewContainerdHandler(log, service, manager, cfg.MCP, cfg.Containerd.Namespace, rc.ContainerBackend, botService, accountService, policyService, queries)
+func provideContainerdHandler(log *slog.Logger, manager *workspace.Manager, cfg config.Config, rc *boot.RuntimeConfig, botService *bots.Service, accountService *accounts.Service, policyService *policy.Service) *handlers.ContainerdHandler {
+	return handlers.NewContainerdHandler(log, manager, cfg.Workspace, rc.ContainerBackend, botService, accountService, policyService)
 }

 func provideFederationGateway(log *slog.Logger, containerdHandler *handlers.ContainerdHandler) *handlers.MCPFederationGateway {
@@ -547,7 +548,7 @@ func provideOAuthService(log *slog.Logger, queries *dbsqlc.Queries, cfg config.C
 	return mcp.NewOAuthService(log, queries, callbackURL)
 }

-func provideToolGatewayService(log *slog.Logger, cfg config.Config, channelManager *channel.Manager, registry *channel.Registry, routeService *route.DBService, scheduleService *schedule.Service, _ *conversation.Service, _ *accounts.Service, settingsService *settings.Service, searchProviderService *searchproviders.Service, manager *mcp.Manager, containerdHandler *handlers.ContainerdHandler, mcpConnService *mcp.ConnectionService, mediaService *media.Service, inboxService *inbox.Service, memoryRegistry *memprovider.Registry, emailService *emailpkg.Service, emailManager *emailpkg.Manager, fedGateway *handlers.MCPFederationGateway, oauthService *mcp.OAuthService, subagentService *subagent.Service, modelsService *models.Service, browserContextService *browsercontexts.Service, queries *dbsqlc.Queries, ttsService *ttspkg.Service) *mcp.ToolGatewayService {
+func provideToolGatewayService(log *slog.Logger, cfg config.Config, channelManager *channel.Manager, registry *channel.Registry, routeService *route.DBService, scheduleService *schedule.Service, _ *conversation.Service, _ *accounts.Service, settingsService *settings.Service, searchProviderService *searchproviders.Service, manager *workspace.Manager, containerdHandler *handlers.ContainerdHandler, mcpConnService *mcp.ConnectionService, mediaService *media.Service, inboxService *inbox.Service, memoryRegistry *memprovider.Registry, emailService *emailpkg.Service, emailManager *emailpkg.Manager, fedGateway *handlers.MCPFederationGateway, oauthService *mcp.OAuthService, subagentService *subagent.Service, modelsService *models.Service, browserContextService *browsercontexts.Service, queries *dbsqlc.Queries, ttsService *ttspkg.Service) *mcp.ToolGatewayService {
 	fedGateway.SetOAuthService(oauthService)
 	var assetResolver mcpmessage.AssetResolver
 	if mediaService != nil {
@@ -581,7 +582,7 @@ func provideToolGatewayService(log *slog.Logger, cfg config.Config, channelManag
 // handler providers (interface adaptation / config extraction)
 // ---------------------------------------------------------------------------

-func provideMemoryHandler(log *slog.Logger, botService *bots.Service, accountService *accounts.Service, _ config.Config, manager *mcp.Manager, memoryRegistry *memprovider.Registry, settingsService *settings.Service, _ *handlers.ContainerdHandler) *handlers.MemoryHandler {
+func provideMemoryHandler(log *slog.Logger, botService *bots.Service, accountService *accounts.Service, _ config.Config, manager *workspace.Manager, memoryRegistry *memprovider.Registry, settingsService *settings.Service, _ *handlers.ContainerdHandler) *handlers.MemoryHandler {
 	h := handlers.NewMemoryHandler(log, botService, accountService)
 	h.SetMemoryRegistry(memoryRegistry)
 	h.SetSettingsService(settingsService)
@@ -599,7 +600,7 @@ func provideMessageHandler(log *slog.Logger, chatService *conversation.Service,
 	return h
 }

-func provideMediaService(log *slog.Logger, manager *mcp.Manager) *media.Service {
+func provideMediaService(log *slog.Logger, manager *workspace.Manager) *media.Service {
 	provider := containerfs.New(manager)
 	return media.NewService(log, provider)
 }
@@ -788,16 +789,16 @@ func startChannelManager(lc fx.Lifecycle, channelManager *channel.Manager) {
 	})
 }

-func startContainerReconciliation(lc fx.Lifecycle, containerdHandler *handlers.ContainerdHandler, _ *mcp.ToolGatewayService) {
+func startContainerReconciliation(lc fx.Lifecycle, manager *workspace.Manager, _ *handlers.ContainerdHandler, _ *mcp.ToolGatewayService) {
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
-			go containerdHandler.ReconcileContainers(ctx)
+			go manager.ReconcileContainers(ctx)
 			return nil
 		},
 	})
 }

-func startServer(lc fx.Lifecycle, logger *slog.Logger, srv *server.Server, shutdowner fx.Shutdowner, cfg config.Config, queries *dbsqlc.Queries, botService *bots.Service, containerdHandler *handlers.ContainerdHandler, manager *mcp.Manager, mcpConnService *mcp.ConnectionService, toolGateway *mcp.ToolGatewayService, channelManager *channel.Manager, modelsService *models.Service) {
+func startServer(lc fx.Lifecycle, logger *slog.Logger, srv *server.Server, shutdowner fx.Shutdowner, cfg config.Config, queries *dbsqlc.Queries, botService *bots.Service, _ *handlers.ContainerdHandler, manager *workspace.Manager, mcpConnService *mcp.ConnectionService, toolGateway *mcp.ToolGatewayService, channelManager *channel.Manager, modelsService *models.Service) {
 	fmt.Printf("Starting Memoh Agent %s\n", version.GetInfo())

 	lc.Append(fx.Hook{
@@ -805,7 +806,7 @@ func startServer(lc fx.Lifecycle, logger *slog.Logger, srv *server.Server, shutd
 			if err := ensureAdminUser(ctx, logger, queries, cfg); err != nil {
 				return err
 			}
-			botService.SetContainerLifecycle(containerdHandler)
+			botService.SetContainerLifecycle(manager)
 			botService.SetContainerReachability(func(ctx context.Context, botID string) error {
 				_, err := manager.MCPClient(ctx, botID)
 				return err
@@ -881,7 +882,7 @@ func ensureAdminUser(ctx context.Context, log *slog.Logger, queries *dbsqlc.Quer
 		emailValue = pgtype.Text{String: email, Valid: true}
 	}
 	displayName := pgtype.Text{String: username, Valid: true}
-	dataRoot := pgtype.Text{String: cfg.MCP.DataRoot, Valid: cfg.MCP.DataRoot != ""}
+	dataRoot := pgtype.Text{String: cfg.Workspace.DataRoot, Valid: cfg.Workspace.DataRoot != ""}

 	_, err = queries.CreateAccount(ctx, dbsqlc.CreateAccountParams{
 		UserID:       user.ID,
@@ -1056,9 +1057,9 @@ func (a *commandSkillLoaderAdapter) LoadSkills(ctx context.Context, botID string
 	return skills, nil
 }

-// commandContainerFSAdapter bridges mcp.Manager to command.ContainerFS.
+// commandContainerFSAdapter bridges workspace.Manager to command.ContainerFS.
 type commandContainerFSAdapter struct {
-	manager *mcp.Manager
+	manager *workspace.Manager
 }

 func (a *commandContainerFSAdapter) ListDir(ctx context.Context, botID, dirPath string) ([]command.FSEntry, error) {
@@ -9,17 +9,18 @@ import (
 	"os/signal"
 	"path/filepath"
 	"syscall"
+	"time"

 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"

 	"github.com/memohai/memoh/internal/logger"
-	pb "github.com/memohai/memoh/internal/mcp/mcpcontainer"
+	pb "github.com/memohai/memoh/internal/workspace/bridgepb"
 )

 const (
-	defaultListenAddr = ":9090"
-	templateDir       = "/opt/mcp-template"
+	defaultSocketPath = "/run/memoh/bridge.sock"
+	templateDir       = "/opt/memoh/templates"
 )

 // initDataDir ensures /data exists and seeds template files on first boot.
@@ -60,14 +61,33 @@ func main() {

 	initDataDir()

-	addr := os.Getenv("MCP_LISTEN_ADDR")
-	if addr == "" {
-		addr = defaultListenAddr
-	}
+	// Append toolkit to PATH so child processes (via /bin/sh -c) can find npx/uvx.
+	// Container-native tools take priority since toolkit is appended at the end.
+	_ = os.Setenv("PATH", os.Getenv("PATH")+":/opt/memoh/toolkit/bin")

-	lis, err := (&net.ListenConfig{}).Listen(ctx, "tcp", addr)
+	// PID 1 zombie reaping: when bridge runs as PID 1 inside a container,
+	// orphaned child processes become zombies unless reaped.
+	// On Linux 5.3+, Go's os/exec uses pidfd_open which avoids races between
+	// this reaper and cmd.Wait(). Kernels below 5.3 may see rare ECHILD errors.
+	go func() {
+		var status syscall.WaitStatus
+		for {
+			if _, err := syscall.Wait4(-1, &status, 0, nil); err != nil {
+				time.Sleep(time.Second)
+			}
+		}
+	}()
+
+	socketPath := os.Getenv("BRIDGE_SOCKET_PATH")
+	if socketPath == "" {
+		socketPath = defaultSocketPath
+	}
+	// Clean up residual socket from a previous run.
+	_ = os.Remove(filepath.Clean(socketPath)) //nolint:gosec // G703: socketPath is from BRIDGE_SOCKET_PATH env or a compiled-in default, not end-user input
+
+	lis, err := (&net.ListenConfig{}).Listen(ctx, "unix", socketPath)
 	if err != nil {
-		logger.Error("failed to listen", slog.String("addr", addr), slog.Any("error", err))
+		logger.Error("failed to listen", slog.String("socket", socketPath), slog.Any("error", err))
 		return
 	}

@@ -81,7 +101,7 @@ func main() {
 		srv.GracefulStop()
 	}()

-	logger.Info("mcp gRPC server listening", slog.String("addr", addr))
+	logger.Info("bridge gRPC server listening", slog.String("socket", socketPath))
 	if err := srv.Serve(lis); err != nil {
 		logger.Error("gRPC server failed", slog.Any("error", err))
 		return
@@ -20,7 +20,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

-	pb "github.com/memohai/memoh/internal/mcp/mcpcontainer"
+	pb "github.com/memohai/memoh/internal/workspace/bridgepb"
 )

 const (
@@ -1,5 +0,0 @@
-#!/bin/sh
-# Copy binary to writable layer so it survives snapshot restores.
-[ -e /app/mcp ] || { mkdir -p /app; [ -f /opt/mcp ] && cp -a /opt/mcp /app/mcp 2>/dev/null || true; }
-if [ -x /app/mcp ]; then exec /app/mcp "$@"; fi
-exec /opt/mcp "$@"
@@ -92,6 +92,7 @@ import (
 	ttspkg "github.com/memohai/memoh/internal/tts"
 	ttsedge "github.com/memohai/memoh/internal/tts/adapter/edge"
 	"github.com/memohai/memoh/internal/version"
+	"github.com/memohai/memoh/internal/workspace"
 )

 func runServe() {
@@ -103,7 +104,7 @@ func runServe() {
 			provideContainerService,
 			provideDBConn,
 			provideDBQueries,
-			provideMCPManager,
+			provideWorkspaceManager,
 			provideAgentRuntimeManager,
 			provideMemoryLLM,
 			memprovider.NewService,
@@ -245,8 +246,8 @@ func provideDBConn(lc fx.Lifecycle, cfg config.Config) (*pgxpool.Pool, error) {
 }

 func provideDBQueries(conn *pgxpool.Pool) *dbsqlc.Queries { return dbsqlc.New(conn) }
-func provideMCPManager(log *slog.Logger, service ctr.Service, cfg config.Config, conn *pgxpool.Pool) *mcp.Manager {
-	return mcp.NewManager(log, service, cfg.MCP, cfg.Containerd.Namespace, conn)
+func provideWorkspaceManager(log *slog.Logger, service ctr.Service, cfg config.Config, conn *pgxpool.Pool) *workspace.Manager {
+	return workspace.NewManager(log, service, cfg.Workspace, cfg.Containerd.Namespace, conn)
 }

 func provideAgentRuntimeManager(log *slog.Logger, cfg config.Config) *agentruntime.Manager {
@@ -257,7 +258,7 @@ func provideMemoryLLM(modelsService *models.Service, queries *dbsqlc.Queries, lo
 	return &lazyLLMClient{modelsService: modelsService, queries: queries, timeout: 30 * time.Second, logger: log}
 }

-func provideMemoryProviderRegistry(log *slog.Logger, chatService *conversation.Service, accountService *accounts.Service, manager *mcp.Manager, queries *dbsqlc.Queries, cfg config.Config) *memprovider.Registry {
+func provideMemoryProviderRegistry(log *slog.Logger, chatService *conversation.Service, accountService *accounts.Service, manager *workspace.Manager, queries *dbsqlc.Queries, cfg config.Config) *memprovider.Registry {
 	registry := memprovider.NewRegistry(log)
 	builtinRuntime := handlers.NewBuiltinMemoryRuntime(manager)
 	fileStore := storefs.New(log, manager)
@@ -342,7 +343,7 @@ func provideChannelRegistry(log *slog.Logger, hub *local.RouteHub, mediaService
 	return registry
 }

-func provideChannelRouter(log *slog.Logger, registry *channel.Registry, hub *local.RouteHub, routeService *route.DBService, msgService *message.DBService, resolver *flow.Resolver, identityService *identities.Service, botService *bots.Service, aclService *acl.Service, policyService *policy.Service, bindService *bind.Service, mediaService *media.Service, inboxService *inbox.Service, ttsService *ttspkg.Service, settingsService *settings.Service, subagentService *subagent.Service, scheduleService *schedule.Service, mcpConnService *mcp.ConnectionService, modelsService *models.Service, providersService *providers.Service, memProvService *memprovider.Service, searchProvService *searchproviders.Service, browserCtxService *browsercontexts.Service, emailService *emailpkg.Service, emailOutboxService *emailpkg.OutboxService, heartbeatService *heartbeat.Service, queries *dbsqlc.Queries, containerdHandler *handlers.ContainerdHandler, manager *mcp.Manager, rc *boot.RuntimeConfig) *inbound.ChannelInboundProcessor {
+func provideChannelRouter(log *slog.Logger, registry *channel.Registry, hub *local.RouteHub, routeService *route.DBService, msgService *message.DBService, resolver *flow.Resolver, identityService *identities.Service, botService *bots.Service, aclService *acl.Service, policyService *policy.Service, bindService *bind.Service, mediaService *media.Service, inboxService *inbox.Service, ttsService *ttspkg.Service, settingsService *settings.Service, subagentService *subagent.Service, scheduleService *schedule.Service, mcpConnService *mcp.ConnectionService, modelsService *models.Service, providersService *providers.Service, memProvService *memprovider.Service, searchProvService *searchproviders.Service, browserCtxService *browsercontexts.Service, emailService *emailpkg.Service, emailOutboxService *emailpkg.OutboxService, heartbeatService *heartbeat.Service, queries *dbsqlc.Queries, containerdHandler *handlers.ContainerdHandler, manager *workspace.Manager, rc *boot.RuntimeConfig) *inbound.ChannelInboundProcessor {
 	adapter, ok := registry.Get(qq.Type)
 	if !ok {
 		panic("qq adapter not registered")
@@ -395,8 +396,8 @@ func provideChannelLifecycleService(channelStore *channel.Store, channelManager
 	return channel.NewLifecycle(channelStore, channelManager)
 }

-func provideContainerdHandler(log *slog.Logger, service ctr.Service, manager *mcp.Manager, cfg config.Config, rc *boot.RuntimeConfig, botService *bots.Service, accountService *accounts.Service, policyService *policy.Service, queries *dbsqlc.Queries) *handlers.ContainerdHandler {
-	return handlers.NewContainerdHandler(log, service, manager, cfg.MCP, cfg.Containerd.Namespace, rc.ContainerBackend, botService, accountService, policyService, queries)
+func provideContainerdHandler(log *slog.Logger, manager *workspace.Manager, cfg config.Config, rc *boot.RuntimeConfig, botService *bots.Service, accountService *accounts.Service, policyService *policy.Service) *handlers.ContainerdHandler {
+	return handlers.NewContainerdHandler(log, manager, cfg.Workspace, rc.ContainerBackend, botService, accountService, policyService)
 }

 func provideFederationGateway(log *slog.Logger, containerdHandler *handlers.ContainerdHandler) *handlers.MCPFederationGateway {
@@ -416,7 +417,7 @@ func provideOAuthService(log *slog.Logger, queries *dbsqlc.Queries, cfg config.C
 	return mcp.NewOAuthService(log, queries, callbackURL)
 }

-func provideToolGatewayService(log *slog.Logger, cfg config.Config, channelManager *channel.Manager, registry *channel.Registry, routeService *route.DBService, scheduleService *schedule.Service, _ *conversation.Service, _ *accounts.Service, settingsService *settings.Service, searchProviderService *searchproviders.Service, manager *mcp.Manager, containerdHandler *handlers.ContainerdHandler, mcpConnService *mcp.ConnectionService, mediaService *media.Service, inboxService *inbox.Service, memoryRegistry *memprovider.Registry, emailService *emailpkg.Service, emailManager *emailpkg.Manager, fedGateway *handlers.MCPFederationGateway, oauthService *mcp.OAuthService, subagentService *subagent.Service, modelsService *models.Service, browserContextService *browsercontexts.Service, queries *dbsqlc.Queries, ttsService *ttspkg.Service) *mcp.ToolGatewayService {
+func provideToolGatewayService(log *slog.Logger, cfg config.Config, channelManager *channel.Manager, registry *channel.Registry, routeService *route.DBService, scheduleService *schedule.Service, _ *conversation.Service, _ *accounts.Service, settingsService *settings.Service, searchProviderService *searchproviders.Service, manager *workspace.Manager, containerdHandler *handlers.ContainerdHandler, mcpConnService *mcp.ConnectionService, mediaService *media.Service, inboxService *inbox.Service, memoryRegistry *memprovider.Registry, emailService *emailpkg.Service, emailManager *emailpkg.Manager, fedGateway *handlers.MCPFederationGateway, oauthService *mcp.OAuthService, subagentService *subagent.Service, modelsService *models.Service, browserContextService *browsercontexts.Service, queries *dbsqlc.Queries, ttsService *ttspkg.Service) *mcp.ToolGatewayService {
 	fedGateway.SetOAuthService(oauthService)
 	var assetResolver mcpmessage.AssetResolver
 	if mediaService != nil {
@@ -441,7 +442,7 @@ func provideToolGatewayService(log *slog.Logger, cfg config.Config, channelManag
 	return svc
 }

-func provideMemoryHandler(log *slog.Logger, botService *bots.Service, accountService *accounts.Service, _ config.Config, manager *mcp.Manager, memoryRegistry *memprovider.Registry, settingsService *settings.Service, _ *handlers.ContainerdHandler) *handlers.MemoryHandler {
+func provideMemoryHandler(log *slog.Logger, botService *bots.Service, accountService *accounts.Service, _ config.Config, manager *workspace.Manager, memoryRegistry *memprovider.Registry, settingsService *settings.Service, _ *handlers.ContainerdHandler) *handlers.MemoryHandler {
 	h := handlers.NewMemoryHandler(log, botService, accountService)
 	h.SetMemoryRegistry(memoryRegistry)
 	h.SetSettingsService(settingsService)
@@ -466,7 +467,7 @@ func (h *memohAuthHandler) Register(e *echo.Echo) {
 	e.POST("/api/auth/refresh", h.inner.Refresh)
 }

-func provideMediaService(log *slog.Logger, manager *mcp.Manager) *media.Service {
+func provideMediaService(log *slog.Logger, manager *workspace.Manager) *media.Service {
 	provider := containerfs.New(manager)
 	return media.NewService(log, provider)
 }
@@ -619,8 +620,8 @@ func startChannelManager(lc fx.Lifecycle, channelManager *channel.Manager) {
 	})
 }

-func startContainerReconciliation(lc fx.Lifecycle, containerdHandler *handlers.ContainerdHandler, _ *mcp.ToolGatewayService) {
-	lc.Append(fx.Hook{OnStart: func(ctx context.Context) error { go containerdHandler.ReconcileContainers(ctx); return nil }})
+func startContainerReconciliation(lc fx.Lifecycle, manager *workspace.Manager, _ *handlers.ContainerdHandler, _ *mcp.ToolGatewayService) {
+	lc.Append(fx.Hook{OnStart: func(ctx context.Context) error { go manager.ReconcileContainers(ctx); return nil }})
 }

 func startAgentRuntime(lc fx.Lifecycle, manager *agentruntime.Manager) {
@@ -630,14 +631,14 @@ func startAgentRuntime(lc fx.Lifecycle, manager *agentruntime.Manager) {
 	})
 }

-func startServer(lc fx.Lifecycle, logger *slog.Logger, srv *memohServer, shutdowner fx.Shutdowner, cfg config.Config, queries *dbsqlc.Queries, botService *bots.Service, containerdHandler *handlers.ContainerdHandler, manager *mcp.Manager, mcpConnService *mcp.ConnectionService, toolGateway *mcp.ToolGatewayService, channelManager *channel.Manager, modelsService *models.Service) {
+func startServer(lc fx.Lifecycle, logger *slog.Logger, srv *memohServer, shutdowner fx.Shutdowner, cfg config.Config, queries *dbsqlc.Queries, botService *bots.Service, _ *handlers.ContainerdHandler, manager *workspace.Manager, mcpConnService *mcp.ConnectionService, toolGateway *mcp.ToolGatewayService, channelManager *channel.Manager, modelsService *models.Service) {
 	fmt.Printf("Starting Memoh Agent %s\n", version.GetInfo())
 	lc.Append(fx.Hook{
 		OnStart: func(ctx context.Context) error {
 			if err := ensureAdminUser(ctx, logger, queries, cfg); err != nil {
 				return err
 			}
-			botService.SetContainerLifecycle(containerdHandler)
+			botService.SetContainerLifecycle(manager)
 			botService.SetContainerReachability(func(ctx context.Context, botID string) error {
 				_, err := manager.MCPClient(ctx, botID)
 				return err
@@ -831,7 +832,7 @@ func ensureAdminUser(ctx context.Context, log *slog.Logger, queries *dbsqlc.Quer
 		emailValue = pgtype.Text{String: email, Valid: true}
 	}
 	displayName := pgtype.Text{String: username, Valid: true}
-	dataRoot := pgtype.Text{String: cfg.MCP.DataRoot, Valid: cfg.MCP.DataRoot != ""}
+	dataRoot := pgtype.Text{String: cfg.Workspace.DataRoot, Valid: cfg.Workspace.DataRoot != ""}
 	_, err = queries.CreateAccount(ctx, dbsqlc.CreateAccountParams{
 		UserID: user.ID, Username: pgtype.Text{String: username, Valid: true}, Email: emailValue,
 		PasswordHash: pgtype.Text{String: string(hashed), Valid: true}, Role: "admin",
@@ -971,9 +972,9 @@ func (a *commandSkillLoaderAdapter) LoadSkills(ctx context.Context, botID string
 	return skills, nil
 }

-// commandContainerFSAdapter bridges mcp.Manager to command.ContainerFS.
+// commandContainerFSAdapter bridges workspace.Manager to command.ContainerFS.
 type commandContainerFSAdapter struct {
-	manager *mcp.Manager
+	manager *workspace.Manager
 }

 func (a *commandContainerFSAdapter) ListDir(ctx context.Context, botID, dirPath string) ([]command.FSEntry, error) {