refac

backend/open_webui/utils/automations.py

@@ -36,6 +36,7 @@ from open_webui.models.users import Users
 from open_webui.utils.auth import create_token
 from open_webui.utils.misc import parse_duration
 from open_webui.utils.task import prompt_template
+from open_webui.utils.terminals import get_terminal_server_url
 from starlette.datastructures import Headers
 
 log = logging.getLogger(__name__)
@@ -323,16 +324,11 @@ async def _set_terminal_cwd(app, server_id: str, user, cwd: str, chat_id: str) -
         log.warning(f'Terminal server {server_id} not found for CWD set')
         return
 
-    base_url = (connection.get('url') or '').rstrip('/')
+    base_url = get_terminal_server_url(connection)
     if not base_url:
         return
 
-    # Build target URL — route through orchestrator policy if configured
-    policy_id = connection.get('policy_id')
-    if connection.get('server_type') == 'orchestrator' and policy_id:
-        target_url = f'{base_url}/p/{policy_id}/files/cwd'
-    else:
-        target_url = f'{base_url}/files/cwd'
+    target_url = f'{base_url}/files/cwd'
 
     headers = {'Content-Type': 'application/json', 'X-User-Id': user.id}
     if chat_id:

backend/open_webui/utils/terminals.py

@@ -0,0 +1,17 @@
+"""Shared routing helpers for admin-configured terminal servers."""
+
+from urllib.parse import quote
+
+
+def get_terminal_server_url(connection: dict) -> str:
+    """Return the upstream base URL for a terminal connection.
+
+    Only orchestrator connections with an explicit policy use the named-policy
+    route. Direct Open Terminal connections and legacy unscoped orchestrator
+    connections keep their existing root route.
+    """
+    base_url = str(connection.get('url') or '').rstrip('/')
+    policy_id = str(connection.get('policy_id') or '').strip()
+    if connection.get('server_type') == 'orchestrator' and policy_id:
+        return f'{base_url}/p/{quote(policy_id, safe="")}'
+    return base_url