Merge remote-tracking branch 'origin/main' into harish/selection-quote-replies-feature

codex-rs/core/config.schema.json

@@ -338,9 +338,6 @@
             "apps": {
               "type": "boolean"
             },
-            "artifact": {
-              "type": "boolean"
-            },
             "child_agents_md": {
               "type": "boolean"
             },
@@ -748,6 +745,21 @@
         }
       ]
     },
+    "McpServerToolConfig": {
+      "additionalProperties": false,
+      "description": "Per-tool approval settings for a single MCP server tool.",
+      "properties": {
+        "approval_mode": {
+          "allOf": [
+            {
+              "$ref": "#/definitions/AppToolApproval"
+            }
+          ],
+          "description": "Approval mode for this tool."
+        }
+      },
+      "type": "object"
+    },
     "MemoriesToml": {
       "additionalProperties": false,
       "description": "Memories settings loaded from config.toml.",
@@ -1249,7 +1261,9 @@
       "type": "object"
     },
     "RawMcpServerConfig": {
-      "additionalProperties": false,
+      "additionalProperties": {
+        "$ref": "#/definitions/McpServerToolConfig"
+      },
       "properties": {
         "args": {
           "default": null,
@@ -1316,6 +1330,11 @@
           },
           "type": "object"
         },
+        "name": {
+          "default": null,
+          "description": "Legacy display-name field accepted for backward compatibility.",
+          "type": "string"
+        },
         "oauth_resource": {
           "default": null,
           "type": "string"
@@ -1347,6 +1366,13 @@
           "format": "double",
           "type": "number"
         },
+        "tools": {
+          "additionalProperties": {
+            "$ref": "#/definitions/McpServerToolConfig"
+          },
+          "default": null,
+          "type": "object"
+        },
         "url": {
           "type": "string"
         }
@@ -1954,9 +1980,6 @@
         "apps": {
           "type": "boolean"
         },
-        "artifact": {
-          "type": "boolean"
-        },
         "child_agents_md": {
           "type": "boolean"
         },