merge: resolve dev branch conflicts, add compose_template guard

Incorporate remote bug fixes into slimmed instance_service.py:
- Add tool_type.compose_template guard before render_compose_template

Quality gates: py_compile pass

apps/api/src/services/tool/instance_service.py

@@ -1103,6 +1103,8 @@ async def create_tool_instance(
         write_compose_file(instance_dir, compose_content)
 
     else:
+        if not tool_type.compose_template:
+            raise ValueError("Tool type has no compose template configured")
         variables = {
             "REPO_PATH": repo_path,
             "INSTANCE_NAME": instance_name,