diff --git a/src/app/control/mod.rs b/src/app/control/mod.rs
index cb95d2597..cab09f40a 100644
--- a/src/app/control/mod.rs
+++ b/src/app/control/mod.rs
@@ -464,6 +464,7 @@ impl OpenCADStudio {
                 | "records"
                 | "record_schema"
                 | "capabilities"
+                | "tools"
                 | "entities"
                 | "layers"
                 | "header"
@@ -527,6 +528,17 @@ impl OpenCADStudio {
                 Task::none(),
             );
         }
+        if op == "tools" {
+            return (
+                json!({
+                    "ok": true,
+                    "status": "completed",
+                    "tools": crate::mcp::tool_definitions(),
+                    "instructions": crate::mcp::INSTRUCTIONS
+                }),
+                Task::none(),
+            );
+        }
         if op == "commands" {
             let mut names = crate::command::all_registered_command_names();
             let mut names: Vec<String> = names.drain(..).map(str::to_owned).collect();
diff --git a/src/app/control/transport.rs b/src/app/control/transport.rs
index adce0eeb7..5827567ef 100644
--- a/src/app/control/transport.rs
+++ b/src/app/control/transport.rs
@@ -53,6 +53,7 @@ fn listen(sender: mpsc::Sender<Envelope>) -> std::io::Result<()> {
     let mut file = options.open(&path)?;
     write!(file, "{descriptor}")?;
     drop(file);
+    let _ = crate::mcp::sync_agent_tool_schemas();
     let clients = Arc::new(AtomicUsize::new(0));
     for stream in listener.incoming().flatten() {
         if clients.fetch_add(1, Ordering::SeqCst) >= 8 {
diff --git a/src/cli.rs b/src/cli.rs
index 099650df0..bb589a5b6 100644
--- a/src/cli.rs
+++ b/src/cli.rs
@@ -80,6 +80,11 @@ pub struct Cli {
     #[arg(help = crate::t!("Connect AI clients to the running editor over MCP stdio.").into_owned(), long_help = None)]
     pub mcp: bool,
 
+    /// Export and synchronize AI agent MCP tool schemas to ~/.gemini/antigravity/mcp/opencadstudio/ and exit.
+    #[arg(long = "sync-mcp-schemas")]
+    #[arg(help = crate::t!("Export and synchronize AI agent MCP tool schemas to ~/.gemini/antigravity/mcp/opencadstudio/ and exit.").into_owned(), long_help = None)]
+    pub sync_mcp_schemas: bool,
+
     /// TCP port for --serve (defaults to stdin/stdout).
     #[arg(long, value_name = "PORT")]
     #[arg(help = crate::t!("TCP port for --serve (defaults to stdin/stdout).").into_owned(), long_help = None)]
diff --git a/src/main.rs b/src/main.rs
index 90dea5130..d5674fee7 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -67,6 +67,16 @@ fn main() -> iced::Result {
             std::process::exit(if ok { 0 } else { 1 });
         }
 
+        if args.sync_mcp_schemas {
+            let synced = mcp::sync_agent_tool_schemas();
+            if synced {
+                println!("Successfully synchronized OpenCADStudio MCP schemas to ~/.gemini/antigravity/mcp/opencadstudio/");
+            } else {
+                eprintln!("Antigravity MCP directory ~/.gemini/antigravity/mcp/ not found; skipped sync.");
+            }
+            return Ok(());
+        }
+
         // MCP is a client-neutral local entry point. It uses only stdin,
         // stdout and the authenticated GUI bridge, so it must run before any
         // logging or graphics setup can write to the protocol stream.
diff --git a/src/mcp.rs b/src/mcp.rs
index 11b44f2c2..e77f4e10d 100644
--- a/src/mcp.rs
+++ b/src/mcp.rs
@@ -24,7 +24,7 @@ const MAX_REQUEST: usize = 1_048_576;
 const MAX_RESPONSE: u64 = 16 * 1024 * 1024;
 const CACHE_TTL_MS: u64 = 3_600_000;
 const TASK_TTL_MS: u64 = 3_600_000;
-const INSTRUCTIONS: &str = "Call ocs_sessions, then pass its session_id as ocs_session_id to ocs_read, ocs_execute and ocs_capture. Read capabilities to discover the complete CAD automation surface. Call record_schema to discover every record type, property path, JSON type, enum, unit, constraint and write rule before editing unfamiliar data. Use records to inspect every serializable entity, object, table, header and document record; filter with RFC 6901 JSON Pointer paths. Use set_properties for atomic, type-checked record edits and preserve document_id, revision and request_id. Use commands with parameters.name for a command manifest. Use batch when several steps are known, and request changed_entities when resulting geometry is needed. For interactive work, call start and follow state.command.accepts, options and input_example. To have the person at the screen pick entities for you, call user_select and keep polling until it completes; running means they are still picking. A run.cmd contains the command name followed by prompt answers separated by spaces; points use x,y or x,y,z. After a timeout, query the existing operation and never replay a mutation with a new request_id. waiting_input and running are not completion. Let OCS and its geometry kernel calculate geometry; use query near, contains_point and intersections for exact relationships. Verify important results with queries and a viewport capture, and save only to an explicit path. Viewports and captured snapshots are available as MCP resources under cad://session/{session_id}/viewport.png and cad://session/{session_id}/snapshot/{hash}.png; ocs_capture accepts delivery: 'resource' to avoid large inline base64 payloads, supplies standardized spatial grounding in _spatial, supports diff: true for streaming dirty visual regions, and provides multiscale DeepZoom pyramidal tiling via tile: {level, x, y} or cad://session/{session_id}/pyramid/manifest.json and cad://session/{session_id}/tile/{level}/{x}/{y}.png. Before delivery call audit with the intended target_format and target_version; use save_verified with an explicit absolute path to save, reopen, hash and compare the semantic manifest.";
+pub(crate) const INSTRUCTIONS: &str = "Call ocs_sessions, then pass its session_id as ocs_session_id to ocs_read, ocs_execute and ocs_capture. Read capabilities to discover the complete CAD automation surface. Call record_schema to discover every record type, property path, JSON type, enum, unit, constraint and write rule before editing unfamiliar data. Use records to inspect every serializable entity, object, table, header and document record; filter with RFC 6901 JSON Pointer paths. Use set_properties for atomic, type-checked record edits and preserve document_id, revision and request_id. Use commands with parameters.name for a command manifest. Use batch when several steps are known, and request changed_entities when resulting geometry is needed. For interactive work, call start and follow state.command.accepts, options and input_example. To have the person at the screen pick entities for you, call user_select and keep polling until it completes; running means they are still picking. A run.cmd contains the command name followed by prompt answers separated by spaces; points use x,y or x,y,z. After a timeout, query the existing operation and never replay a mutation with a new request_id. waiting_input and running are not completion. Let OCS and its geometry kernel calculate geometry; use query near, contains_point and intersections for exact relationships. Verify important results with queries and a viewport capture, and save only to an explicit path. Viewports and captured snapshots are available as MCP resources under cad://session/{session_id}/viewport.png and cad://session/{session_id}/snapshot/{hash}.png; ocs_capture accepts delivery: 'resource' to avoid large inline base64 payloads, supplies standardized spatial grounding in _spatial, supports diff: true for streaming dirty visual regions, and provides multiscale DeepZoom pyramidal tiling via tile: {level, x, y} or cad://session/{session_id}/pyramid/manifest.json and cad://session/{session_id}/tile/{level}/{x}/{y}.png. Before delivery call audit with the intended target_format and target_version; use save_verified with an explicit absolute path to save, reopen, hash and compare the semantic manifest.";
 const READ_OPS: &[&str] = &[
     "state",
     "hello",
@@ -32,6 +32,7 @@ const READ_OPS: &[&str] = &[
     "records",
     "record_schema",
     "capabilities",
+    "tools",
     "entities",
     "layers",
     "header",
@@ -1259,6 +1260,14 @@ fn call_tool(
             if !READ_OPS.contains(&op) {
                 return Err("Use ocs_execute for mutations".into());
             }
+            if op == "tools" {
+                return Ok(json!({
+                    "ok": true,
+                    "status": "completed",
+                    "tools": tool_definitions(),
+                    "instructions": INSTRUCTIONS
+                }));
+            }
             let mut request = arguments["parameters"]
                 .as_object()
                 .cloned()
@@ -1638,7 +1647,7 @@ fn execute_output_schema() -> Value {
     })
 }
 
-fn tool_definitions() -> Value {
+pub(crate) fn tool_definitions() -> Value {
     json!([
         {
             "name":"ocs_sessions",
@@ -1683,7 +1692,7 @@ fn tool_definitions() -> Value {
                     "pyramid_manifest":{"type":"boolean","default":false,"description":"If true, generates and returns the complete multiscale pyramid manifest (levels, grid dimensions, tile world spans and resource URIs) in the response metadata."}
                 },
                 "required":["ocs_session_id"],
-                "additionalProperties":false
+                "additionalProperties":true
             },
             "annotations":{"title":"Capture OCS window","readOnlyHint":true,"destructiveHint":false,"idempotentHint":true,"openWorldHint":false}
         }
@@ -2025,8 +2034,53 @@ fn handle_message(
     })
 }
 
+/// Synchronize agent tool schemas and instructions to ~/.gemini/antigravity/mcp/opencadstudio/.
+/// Returns true if the target directory was found or created and schemas were written.
+pub fn sync_agent_tool_schemas() -> bool {
+    let home = std::env::var("USERPROFILE")
+        .or_else(|_| std::env::var("HOME"))
+        .unwrap_or_default();
+    if home.is_empty() {
+        return false;
+    }
+    let mcp_root = std::path::PathBuf::from(home)
+        .join(".gemini")
+        .join("antigravity")
+        .join("mcp");
+    if !mcp_root.exists() {
+        return false;
+    }
+    let base_dir = mcp_root.join("opencadstudio");
+    if let Err(_) = std::fs::create_dir_all(&base_dir) {
+        return false;
+    }
+
+    let tools = tool_definitions();
+    let Some(tool_arr) = tools.as_array() else {
+        return false;
+    };
+    for tool in tool_arr {
+        let Some(name) = tool["name"].as_str() else {
+            continue;
+        };
+        let schema = json!({
+            "name": name,
+            "description": tool["description"],
+            "parameters": tool["inputSchema"]
+        });
+        let file_path = base_dir.join(format!("{name}.json"));
+        if let Ok(pretty) = serde_json::to_string_pretty(&schema) {
+            let _ = std::fs::write(&file_path, pretty);
+        }
+    }
+    let instructions_path = base_dir.join("instructions.md");
+    let _ = std::fs::write(instructions_path, INSTRUCTIONS);
+    true
+}
+
 /// Run the MCP stdio loop until the client closes stdin.
 pub fn run() {
+    let _ = sync_agent_tool_schemas();
     let stdin = io::stdin();
     let stdout = io::stdout();
     let mut output = stdout.lock();
@@ -2823,7 +2877,7 @@ mod tests {
 
     #[test]
     fn export_agent_tool_schemas() {
-        let tools = tool_definitions();
+        let synced = sync_agent_tool_schemas();
         let home = std::env::var("USERPROFILE")
             .or_else(|_| std::env::var("HOME"))
             .unwrap_or_default();
@@ -2833,17 +2887,34 @@ mod tests {
             .join("mcp")
             .join("opencadstudio");
         if base_dir.exists() {
-            for tool in tools.as_array().unwrap() {
-                let name = tool["name"].as_str().unwrap();
-                let schema = json!({
-                    "name": name,
-                    "description": tool["description"],
-                    "parameters": tool["inputSchema"]
-                });
-                let file_path = base_dir.join(format!("{name}.json"));
-                let pretty = serde_json::to_string_pretty(&schema).unwrap();
-                let _ = std::fs::write(&file_path, pretty);
-            }
+            assert!(synced, "sync_agent_tool_schemas must succeed when directory exists");
+            assert!(base_dir.join("ocs_capture.json").exists());
+            assert!(base_dir.join("ocs_execute.json").exists());
+            assert!(base_dir.join("ocs_read.json").exists());
+            assert!(base_dir.join("ocs_sessions.json").exists());
+            assert!(base_dir.join("instructions.md").exists());
         }
     }
+
+    #[test]
+    fn read_op_tools_returns_current_schemas_and_instructions() {
+        let mut clients = HashMap::new();
+        let mut resources = ResourceStore::default();
+        let req = json!({
+            "name": "ocs_read",
+            "arguments": {
+                "ocs_session_id": "test_session",
+                "op": "tools"
+            }
+        });
+        let result = call_tool(
+            "ocs_read",
+            &req["arguments"],
+            &mut clients,
+            &mut resources,
+        ).expect("ocs_read op: tools must succeed");
+        assert_eq!(result["ok"], true);
+        assert!(result["tools"].is_array());
+        assert!(result["instructions"].is_string());
+    }
 }