diff --git a/assets/oh-my-opencode.schema.json b/assets/oh-my-opencode.schema.json
index 71a556396..2cef6e620 100644
--- a/assets/oh-my-opencode.schema.json
+++ b/assets/oh-my-opencode.schema.json
@@ -5273,6 +5273,28 @@
                 "members"
               ],
               "additionalProperties": false
+            },
+            "non_interactive_mode": {
+              "default": "delegation",
+              "type": "string",
+              "enum": [
+                "delegation",
+                "solo"
+              ]
+            },
+            "non_interactive_members": {
+              "default": "all",
+              "type": "string",
+              "enum": [
+                "all",
+                "custom"
+              ]
+            },
+            "non_interactive_member_list": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
             }
           },
           "additionalProperties": false
diff --git a/src/config/schema/agent-overrides.ts b/src/config/schema/agent-overrides.ts
index d52d85024..9a5b3a3ea 100644
--- a/src/config/schema/agent-overrides.ts
+++ b/src/config/schema/agent-overrides.ts
@@ -58,6 +58,9 @@ export const AgentOverrideConfigSchema = z.object({
 
 export const AthenaOverrideConfigSchema = AgentOverrideConfigSchema.extend({
   council: AthenaConfigSchema.shape.council.optional(),
+  non_interactive_mode: AthenaConfigSchema.shape.non_interactive_mode,
+  non_interactive_members: AthenaConfigSchema.shape.non_interactive_members,
+  non_interactive_member_list: AthenaConfigSchema.shape.non_interactive_member_list,
 })
 
 export const AgentOverridesSchema = z.object({