From ff2905a366635d8df27aef378aeda74ea4087ab4 Mon Sep 17 00:00:00 2001
From: andig <andi@evcc.io>
Date: Thu, 23 Jul 2026 15:36:37 +0200
Subject: [PATCH] chore: remove result envelope reintroduced in #31530 (#32088)

---
 server/mcp/openapi.json | 77 +++++++++--------------------------------
 server/openapi.yaml     | 59 +++++++++----------------------
 2 files changed, 32 insertions(+), 104 deletions(-)

diff --git a/server/mcp/openapi.json b/server/mcp/openapi.json
index 1903503b7..b22b6c04b 100644
--- a/server/mcp/openapi.json
+++ b/server/mcp/openapi.json
@@ -5288,12 +5288,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "type": "integer"
-                }
-              }
+              "type": "integer"
             }
           }
         }
@@ -5303,12 +5298,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "type": "number"
-                }
-              }
+              "type": "number"
             }
           }
         }
@@ -5318,12 +5308,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "type": "integer"
-                }
-              }
+              "type": "integer"
             }
           }
         }
@@ -5335,13 +5320,8 @@
             "schema": {
               "type": "object",
               "properties": {
-                "result": {
-                  "type": "object",
-                  "properties": {
-                    "soc": {
-                      "$ref": "#/components/schemas/Soc"
-                    }
-                  }
+                "soc": {
+                  "$ref": "#/components/schemas/Soc"
                 }
               }
             }
@@ -5353,12 +5333,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "$ref": "#/components/schemas/PlanRates"
-                }
-              }
+              "$ref": "#/components/schemas/PlanRates"
             }
           }
         }
@@ -5368,12 +5343,7 @@
         "content": {
           "application/json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "type": "boolean"
-                }
-              }
+              "type": "boolean"
             }
           }
         }
@@ -5383,14 +5353,9 @@
         "content": {
           "application/json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "description": "Value is always null",
-                  "nullable": true,
-                  "type": "object"
-                }
-              }
+              "description": "Value is always null",
+              "nullable": true,
+              "type": "object"
             }
           }
         }
@@ -5403,13 +5368,8 @@
         "content": {
           "application/json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "type": "string",
-                  "example": "OK"
-                }
-              }
+              "type": "string",
+              "example": "OK"
             }
           }
         }
@@ -5442,15 +5402,10 @@
         "content": {
           "application/json": {
             "schema": {
-              "type": "object",
-              "properties": {
-                "result": {
-                  "type": "integer",
-                  "description": "Battery mode. 0: unknown, 1: normal, 2: hold, 3: charge, 4: holdcharge",
-                  "minimum": 0,
-                  "maximum": 4
-                }
-              }
+              "type": "integer",
+              "description": "Battery mode. 0: unknown, 1: normal, 2: hold, 3: charge, 4: holdcharge",
+              "minimum": 0,
+              "maximum": 4
             }
           }
         }
diff --git a/server/openapi.yaml b/server/openapi.yaml
index 2954b8c08..5981cf5ad 100644
--- a/server/openapi.yaml
+++ b/server/openapi.yaml
@@ -1809,28 +1809,19 @@ components:
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: integer
+            type: integer
     NumberResult:
       description: Success - Number result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: number
+            type: number
     IntegerResult:
       description: Success - Integer result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: integer
+            type: integer
     SocResult:
       description: Success - Soc result
       content:
@@ -1838,40 +1829,28 @@ components:
           schema:
             type: object
             properties:
-              result:
-                type: object
-                properties:
-                  soc:
-                    $ref: "#/components/schemas/Soc"
+              soc:
+                $ref: "#/components/schemas/Soc"
     PlanRatesResult:
       description: Success - PlanRates result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                $ref: "#/components/schemas/PlanRates"
+            $ref: "#/components/schemas/PlanRates"
     BooleanResult:
       description: Success - Boolean result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: boolean
+            type: boolean
     NullResult:
       description: Success - Null result
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                description: Value is always null
-                nullable: true
-                type: "object"
+            description: Value is always null
+            nullable: true
+            type: "object"
     BlankResponse:
       description: Success - Blank response
     SuccessResult:
@@ -1879,11 +1858,8 @@ components:
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: string
-                example: "OK"
+            type: string
+            example: "OK"
     EmptyResult:
       description: Success - Empty result
       content:
@@ -1903,13 +1879,10 @@ components:
       content:
         application/json:
           schema:
-            type: object
-            properties:
-              result:
-                type: integer
-                description: "Battery mode. 0: unknown, 1: normal, 2: hold, 3: charge, 4: holdcharge"
-                minimum: 0
-                maximum: 4
+            type: integer
+            description: "Battery mode. 0: unknown, 1: normal, 2: hold, 3: charge, 4: holdcharge"
+            minimum: 0
+            maximum: 4
   securitySchemes:
     cookieAuth:
       type: apiKey