Fix deployment alias for orchestrated chat

contextual_orchestrator/server.py

@@ -2118,6 +2118,10 @@ def _require_pool_model(
     answering with a different pool agent hides capacity/routing mismatches.
     """
     agents = getattr(orchestrator, "agents", None) or []
+    if model_name == "contextual-orchestrator" and required_capability is None:
+        if any(not getattr(agent, "disabled", False) for agent in agents):
+            return model_name
+        raise RequestError(400, "invalid_model", "no enabled orchestration agent is available")
     if model_name in {TaskOrchestrator.AUTO_MODEL, TaskOrchestrator.FREE_MODEL}:
         if required_capability is None:
             if model_name == TaskOrchestrator.AUTO_MODEL or any(

tests/test_chat_orchestration_mode_http_honesty.py

@@ -27,9 +27,14 @@ def build() -> TaskOrchestrator:
     )
 
 
-def _post(port: int, payload: dict) -> tuple[int, dict]:
+def _post(
+    port: int,
+    payload: dict,
+    *,
+    endpoint: str = "/v1/chat/completions",
+) -> tuple[int, dict]:
     request = urllib.request.Request(
-        f"http://127.0.0.1:{port}/v1/chat/completions",
+        f"http://127.0.0.1:{port}{endpoint}",
         data=json.dumps(payload).encode("utf-8"),
         headers={
             "content-type": "application/json",
@@ -86,6 +91,54 @@ def test_http_chat_accepts_orchestration_mode_auto() -> None:
         thread.join(timeout=5)
 
 
+def test_http_chat_conduct_accepts_advertised_deployment_alias() -> None:
+    """The listed deployment alias must reach the multi-agent conduct path."""
+    server = build_server(build(), port=0, security=SecurityConfig(auth_token=_TEST_AUTH_TOKEN))
+    thread = threading.Thread(target=server.serve_forever, daemon=True)
+    thread.start()
+    port = server.server_address[1]
+    try:
+        status, body = _post(
+            port,
+            {
+                "model": "contextual-orchestrator",
+                "messages": [{"role": "user", "content": "analyze and verify this synthetic task"}],
+                "orchestration_mode": "conduct",
+                "include_orchestration_trace": True,
+            },
+        )
+        assert status == 200, body
+        assert body["model"] == "contextual-orchestrator"
+        assert body["orchestration"]["mode"] == "conduct"
+        assert len(body["orchestration"]["trace"]) > 1
+    finally:
+        server.shutdown()
+        thread.join(timeout=5)
+
+
+def test_http_legacy_completions_accepts_advertised_deployment_alias() -> None:
+    """The provider-neutral deployment alias also serves legacy text completions."""
+    server = build_server(build(), port=0, security=SecurityConfig(auth_token=_TEST_AUTH_TOKEN))
+    thread = threading.Thread(target=server.serve_forever, daemon=True)
+    thread.start()
+    port = server.server_address[1]
+    try:
+        status, body = _post(
+            port,
+            {
+                "model": "contextual-orchestrator",
+                "prompt": "summarize this synthetic task",
+            },
+            endpoint="/v1/completions",
+        )
+        assert status == 200, body
+        assert body["object"] == "text_completion"
+        assert body["model"] == "contextual-orchestrator"
+    finally:
+        server.shutdown()
+        thread.join(timeout=5)
+
+
 def test_http_chat_rejects_invalid_mode() -> None:
     server = build_server(build(), port=0, security=SecurityConfig(auth_token=_TEST_AUTH_TOKEN))
     thread = threading.Thread(target=server.serve_forever, daemon=True)
@@ -131,6 +184,8 @@ def test_http_chat_rejects_mode_non_string() -> None:
 if __name__ == "__main__":
     test_http_chat_accepts_mode_route()
     test_http_chat_accepts_orchestration_mode_auto()
+    test_http_chat_conduct_accepts_advertised_deployment_alias()
+    test_http_legacy_completions_accepts_advertised_deployment_alias()
     test_http_chat_rejects_invalid_mode()
     test_http_chat_rejects_mode_non_string()
     print("ok")