From 133119bb87196e19d26a0825391cf6498995965e Mon Sep 17 00:00:00 2001
From: Keerti Parthasarathy <keertip@google.com>
Date: Tue, 15 Sep 2026 14:14:50 -0700
Subject: [PATCH 1/4] Add env variable for plugin names to mcp configuration

---
 .claude-plugin/plugin.json | 17 ++++++++++++++---
 .codex-plugin/plugin.json  | 16 +++++++++++++---
 .cursor-plugin/plugin.json | 16 +++++++++++++---
 .mcp.json                  | 11 -----------
 4 files changed, 40 insertions(+), 20 deletions(-)
 delete mode 100644 .mcp.json

diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
index fd761445..e33e6e15 100644
--- a/.claude-plugin/plugin.json
+++ b/.claude-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "dart-flutter",
   "displayName": "Dart and Flutter",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Official Claude plugin for Dart and Flutter that installs Flutter/Dart Skills and Dart MCP server for building natively compiled, visually stunning applications for mobile, web, desktop, and embedded devices from a single codebase",
   "author": {
     "name": "Dart and Flutter",
@@ -14,5 +14,16 @@
     "flutter",
     "dart",
     "mobile"
-  ]
-}
+  ],
+  "mcpServers": {
+    "dart-mcp-server": {
+      "command": "dart",
+      "args": [
+        "mcp-server"
+      ],
+      "env": {
+        "AGENT_PLUGIN": "claude-code"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/.codex-plugin/plugin.json b/.codex-plugin/plugin.json
index a2e0eb8c..bd2d0230 100644
--- a/.codex-plugin/plugin.json
+++ b/.codex-plugin/plugin.json
@@ -1,6 +1,6 @@
 {
   "name": "dart-flutter",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Official Codex plugin for Dart and Flutter that installs Flutter/Dart Skills and Dart MCP server for building natively compiled, visually stunning applications for mobile, web, desktop, and embedded devices from a single codebase.",
   "author": {
     "name": "Dart and Flutter",
@@ -18,7 +18,17 @@
     "mcp"
   ],
   "skills": "./skills/",
-  "mcpServers": "./.mcp.json",
+  "mcpServers": {
+    "dart-mcp-server": {
+      "command": "dart",
+      "args": [
+        "mcp-server"
+      ],
+      "env": {
+        "AGENT_PLUGIN": "codex"
+      }
+    }
+  },
   "interface": {
     "displayName": "Dart and Flutter",
     "shortDescription": "Build and manage Dart and Flutter apps from Codex.",
@@ -31,4 +41,4 @@
     ],
     "websiteURL": "https://flutter.dev"
   }
-}
+}
\ No newline at end of file
diff --git a/.cursor-plugin/plugin.json b/.cursor-plugin/plugin.json
index e5b1fe71..9594a6c9 100644
--- a/.cursor-plugin/plugin.json
+++ b/.cursor-plugin/plugin.json
@@ -1,7 +1,7 @@
 {
   "name": "dart-flutter",
   "displayName": "Dart and Flutter",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Official Cursor plugin for Dart and Flutter that installs Flutter/Dart Skills and Dart MCP server for building natively compiled, visually stunning applications for mobile, web, desktop, and embedded devices from a single codebase.",
   "author": {
     "name": "Dart and Flutter Team",
@@ -15,6 +15,16 @@
     "dart",
     "mobile"
   ],
-  "mcpServers": "./.mcp.json",
+  "mcpServers": {
+    "dart-mcp-server": {
+      "command": "dart",
+      "args": [
+        "mcp-server"
+      ],
+      "env": {
+        "AGENT_PLUGIN": "cursor"
+      }
+    }
+  },
   "skills": "./skills/"
-}
+}
\ No newline at end of file
diff --git a/.mcp.json b/.mcp.json
deleted file mode 100644
index c6487d71..00000000
--- a/.mcp.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "mcpServers": {
-    "dart-mcp-server": {
-      "command": "dart",
-      "args": [
-        "mcp-server"
-      ],
-      "env": {}
-    }
-  }
-}

From a7f5a709cdf4b41e5c943a2ca10326d79ecf6405 Mon Sep 17 00:00:00 2001
From: Keerti Parthasarathy <keertip@users.noreply.github.com>
Date: Thu, 17 Sep 2026 09:25:05 -0700
Subject: [PATCH 2/4] Update .claude-plugin/plugin.json

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>
---
 .claude-plugin/plugin.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.claude-plugin/plugin.json b/.claude-plugin/plugin.json
index e33e6e15..394d55c5 100644
--- a/.claude-plugin/plugin.json
+++ b/.claude-plugin/plugin.json
@@ -26,4 +26,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}

From c729847135af52d7c27ccea19b9715621d99cabf Mon Sep 17 00:00:00 2001
From: Keerti Parthasarathy <keertip@users.noreply.github.com>
Date: Thu, 17 Sep 2026 09:28:15 -0700
Subject: [PATCH 3/4] Update plugin.json

---
 .cursor-plugin/plugin.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.cursor-plugin/plugin.json b/.cursor-plugin/plugin.json
index 9594a6c9..75c0050e 100644
--- a/.cursor-plugin/plugin.json
+++ b/.cursor-plugin/plugin.json
@@ -27,4 +27,4 @@
     }
   },
   "skills": "./skills/"
-}
\ No newline at end of file
+}

From e7f9b325f2cb61fba97e46fcd42ee225b34e3e87 Mon Sep 17 00:00:00 2001
From: Keerti Parthasarathy <keertip@users.noreply.github.com>
Date: Thu, 17 Sep 2026 09:28:45 -0700
Subject: [PATCH 4/4] Update plugin.json

---
 .codex-plugin/plugin.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.codex-plugin/plugin.json b/.codex-plugin/plugin.json
index bd2d0230..e1bb1feb 100644
--- a/.codex-plugin/plugin.json
+++ b/.codex-plugin/plugin.json
@@ -41,4 +41,4 @@
     ],
     "websiteURL": "https://flutter.dev"
   }
-}
\ No newline at end of file
+}