From 9aaf95715c8f0eda712047465c64d160ef7f0ae5 Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <asaharan@onemindservices.com>
Date: Tue, 10 Feb 2026 15:05:32 +0530
Subject: [PATCH] refactor: reorganize imports and enhance module exports in
 lifecycle services

---
 backend/app/services/openclaw/__init__.py | 91 +++++++++++++++++++++--
 backend/app/services/openclaw/services.py | 42 -----------
 2 files changed, 86 insertions(+), 47 deletions(-)
 delete mode 100644 backend/app/services/openclaw/services.py

diff --git a/backend/app/services/openclaw/__init__.py b/backend/app/services/openclaw/__init__.py
index 0d8c3597..ac20f0fd 100644
--- a/backend/app/services/openclaw/__init__.py
+++ b/backend/app/services/openclaw/__init__.py
@@ -1,7 +1,88 @@
 """OpenClaw lifecycle services package."""
 
-from .constants import *  # noqa: F401,F403
-from .exceptions import *  # noqa: F401,F403
-from .provisioning import *  # noqa: F401,F403
-from .services import *  # noqa: F401,F403
-from .shared import *  # noqa: F401,F403
+from .admin_service import (
+    AbstractGatewayMainAgentManager,
+    DefaultGatewayMainAgentManager,
+    GatewayAdminLifecycleService,
+)
+from .agent_service import (
+    AbstractProvisionExecution,
+    ActorContextLike,
+    AgentLifecycleService,
+    AgentUpdateOptions,
+    AgentUpdateProvisionRequest,
+    AgentUpdateProvisionTarget,
+    BoardAgentProvisionExecution,
+    MainAgentProvisionExecution,
+)
+from .constants import DEFAULT_CHANNEL_HEARTBEAT_VISIBILITY, DEFAULT_HEARTBEAT_CONFIG
+from .coordination_service import AbstractGatewayMessagingService, GatewayCoordinationService
+from .exceptions import (
+    GatewayErrorPolicy,
+    GatewayOperation,
+    map_gateway_error_message,
+    map_gateway_error_to_http_exception,
+)
+from .onboarding_service import BoardOnboardingMessagingService
+from .provisioning import (
+    AgentProvisionRequest,
+    LeadAgentOptions,
+    LeadAgentRequest,
+    MainAgentProvisionRequest,
+    ProvisionOptions,
+    cleanup_agent,
+    ensure_board_lead_agent,
+    patch_gateway_agent_heartbeats,
+    provision_agent,
+    provision_main_agent,
+    sync_gateway_agent_heartbeats,
+)
+from .session_service import GatewaySessionService, GatewayTemplateSyncQuery
+from .shared import (
+    GatewayAgentIdentity,
+    optional_gateway_config_for_board,
+    require_gateway_config_for_board,
+    resolve_trace_id,
+    send_gateway_agent_message,
+)
+
+__all__ = [
+    "AbstractGatewayMainAgentManager",
+    "DefaultGatewayMainAgentManager",
+    "GatewayAdminLifecycleService",
+    "AbstractProvisionExecution",
+    "ActorContextLike",
+    "AgentLifecycleService",
+    "AgentUpdateOptions",
+    "AgentUpdateProvisionRequest",
+    "AgentUpdateProvisionTarget",
+    "BoardAgentProvisionExecution",
+    "MainAgentProvisionExecution",
+    "DEFAULT_CHANNEL_HEARTBEAT_VISIBILITY",
+    "DEFAULT_HEARTBEAT_CONFIG",
+    "AbstractGatewayMessagingService",
+    "GatewayCoordinationService",
+    "GatewayErrorPolicy",
+    "GatewayOperation",
+    "map_gateway_error_message",
+    "map_gateway_error_to_http_exception",
+    "BoardOnboardingMessagingService",
+    "AgentProvisionRequest",
+    "LeadAgentOptions",
+    "LeadAgentRequest",
+    "MainAgentProvisionRequest",
+    "ProvisionOptions",
+    "cleanup_agent",
+    "ensure_board_lead_agent",
+    "patch_gateway_agent_heartbeats",
+    "provision_agent",
+    "provision_main_agent",
+    "sync_gateway_agent_heartbeats",
+    "GatewaySessionService",
+    "GatewayTemplateSyncQuery",
+    "GatewayAgentIdentity",
+    "optional_gateway_config_for_board",
+    "require_gateway_config_for_board",
+    "resolve_trace_id",
+    "send_gateway_agent_message",
+]
diff --git a/backend/app/services/openclaw/services.py b/backend/app/services/openclaw/services.py
deleted file mode 100644
index bc8b7da6..00000000
--- a/backend/app/services/openclaw/services.py
+++ /dev/null
@@ -1,42 +0,0 @@
-"""Compatibility re-export for split OpenClaw service modules."""
-
-from app.services.openclaw.admin_service import (
-    AbstractGatewayMainAgentManager,
-    DefaultGatewayMainAgentManager,
-    GatewayAdminLifecycleService,
-)
-from app.services.openclaw.agent_service import (
-    AbstractProvisionExecution,
-    ActorContextLike,
-    AgentLifecycleService,
-    AgentUpdateOptions,
-    AgentUpdateProvisionRequest,
-    AgentUpdateProvisionTarget,
-    BoardAgentProvisionExecution,
-    MainAgentProvisionExecution,
-)
-from app.services.openclaw.coordination_service import (
-    AbstractGatewayMessagingService,
-    GatewayCoordinationService,
-)
-from app.services.openclaw.onboarding_service import BoardOnboardingMessagingService
-from app.services.openclaw.session_service import GatewaySessionService, GatewayTemplateSyncQuery
-
-__all__ = [
-    "AbstractGatewayMainAgentManager",
-    "DefaultGatewayMainAgentManager",
-    "GatewayAdminLifecycleService",
-    "AbstractProvisionExecution",
-    "ActorContextLike",
-    "AgentLifecycleService",
-    "AgentUpdateOptions",
-    "AgentUpdateProvisionRequest",
-    "AgentUpdateProvisionTarget",
-    "BoardAgentProvisionExecution",
-    "MainAgentProvisionExecution",
-    "AbstractGatewayMessagingService",
-    "GatewayCoordinationService",
-    "BoardOnboardingMessagingService",
-    "GatewaySessionService",
-    "GatewayTemplateSyncQuery",
-]