diff --git a/backend/apps/agents/agent_manager.py b/backend/apps/agents/agent_manager.py
index d5d3d17c..a7f35f4b 100644
--- a/backend/apps/agents/agent_manager.py
+++ b/backend/apps/agents/agent_manager.py
@@ -33,28 +33,28 @@ from backend.apps.agents.core.error_classify import (
     _is_long_context_error,
     _is_transient_capacity_error,
 )
-from backend.apps.agents.session_store import (
+from backend.apps.agents.manager.session.session_store import (
     _delete_session_file,
     _load_all_session_data,
     _load_session_data,
     _save_session,
     build_search_text,
 )
-from backend.apps.agents.cloud_sync import _sync_session_close
-from backend.apps.agents.workspace_git import _detect_git_identity, _ensure_cwd_git_repo
-from backend.apps.agents.tool_catalog import (
+from backend.apps.agents.manager.session.cloud_sync import _sync_session_close
+from backend.apps.agents.manager.session.workspace_git import _detect_git_identity, _ensure_cwd_git_repo
+from backend.apps.agents.manager.prompt.tool_catalog import (
     FULL_TOOLS,
     _get_all_known_tool_names,
     _get_denied_tool_names,
     _is_fully_denied,
 )
 from backend.apps.agents.core.aux_llm import _safe_resp_text
-from backend.apps.agents.history_compaction import (
+from backend.apps.agents.manager.session.history_compaction import (
     _build_history_prefix,
     _get_branch_messages,
     _truncate_large_tool_result,
 )
-from backend.apps.agents.prompt_context import (
+from backend.apps.agents.manager.prompt.prompt_context import (
     _build_browser_context,
     _build_connected_tools_context,
     _build_mcp_registry_summary,
@@ -64,7 +64,7 @@ from backend.apps.agents.prompt_context import (
     _resolve_forced_tools,
     _resolve_mode,
 )
-from backend.apps.agents.attachments import (
+from backend.apps.agents.manager.prompt.attachments import (
     _build_dir_tree,
     _build_prompt_content,
     _resolve_attachments,
diff --git a/backend/apps/agents/manager/__init__.py b/backend/apps/agents/manager/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/agents/manager/prompt/__init__.py b/backend/apps/agents/manager/prompt/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/agents/attachments.py b/backend/apps/agents/manager/prompt/attachments.py
similarity index 99%
rename from backend/apps/agents/attachments.py
rename to backend/apps/agents/manager/prompt/attachments.py
index f86fb4a7..93ec9008 100644
--- a/backend/apps/agents/attachments.py
+++ b/backend/apps/agents/manager/prompt/attachments.py
@@ -1,6 +1,6 @@
 import os
 
-from backend.apps.agents.prompt_context import _resolve_attached_skills, _resolve_forced_tools
+from backend.apps.agents.manager.prompt.prompt_context import _resolve_attached_skills, _resolve_forced_tools
 
 
 def _build_dir_tree(root: str, max_depth: int = 4, prefix: str = "") -> list[str]:
diff --git a/backend/apps/agents/prompt_context.py b/backend/apps/agents/manager/prompt/prompt_context.py
similarity index 99%
rename from backend/apps/agents/prompt_context.py
rename to backend/apps/agents/manager/prompt/prompt_context.py
index 606ed4e1..1328160f 100644
--- a/backend/apps/agents/prompt_context.py
+++ b/backend/apps/agents/manager/prompt/prompt_context.py
@@ -5,7 +5,7 @@ from backend.apps.tools_lib.tools_lib import (
     _load_all as load_all_tools,
     _sanitize_server_name,
 )
-from backend.apps.agents.tool_catalog import _get_denied_tool_names, _is_fully_denied
+from backend.apps.agents.manager.prompt.tool_catalog import _get_denied_tool_names, _is_fully_denied
 
 
 def _resolve_mode(mode_id: str, get_all_tool_names: Callable[[], list[str]]) -> tuple[list[str], str | None, str | None]:
diff --git a/backend/apps/agents/tool_catalog.py b/backend/apps/agents/manager/prompt/tool_catalog.py
similarity index 100%
rename from backend/apps/agents/tool_catalog.py
rename to backend/apps/agents/manager/prompt/tool_catalog.py
diff --git a/backend/apps/agents/manager/session/__init__.py b/backend/apps/agents/manager/session/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/backend/apps/agents/cloud_sync.py b/backend/apps/agents/manager/session/cloud_sync.py
similarity index 100%
rename from backend/apps/agents/cloud_sync.py
rename to backend/apps/agents/manager/session/cloud_sync.py
diff --git a/backend/apps/agents/history_compaction.py b/backend/apps/agents/manager/session/history_compaction.py
similarity index 100%
rename from backend/apps/agents/history_compaction.py
rename to backend/apps/agents/manager/session/history_compaction.py
diff --git a/backend/apps/agents/session_store.py b/backend/apps/agents/manager/session/session_store.py
similarity index 100%
rename from backend/apps/agents/session_store.py
rename to backend/apps/agents/manager/session/session_store.py
diff --git a/backend/apps/agents/workspace_git.py b/backend/apps/agents/manager/session/workspace_git.py
similarity index 100%
rename from backend/apps/agents/workspace_git.py
rename to backend/apps/agents/manager/session/workspace_git.py