From 984c837ca5e7f1a7e2190ae098e0f8ecb2d4dc03 Mon Sep 17 00:00:00 2001
From: Nikolay Alafuzov <alafuzov_nn@rusklimat.ru>
Date: Thu, 2 Jul 2026 10:27:33 +0300
Subject: [PATCH 1/2] feat(agy): support Antigravity project ID settings

---
 .../components/modals/EditConnectionModal.tsx |  8 +--
 tests/unit/agy-projectid-ui.test.ts           | 51 +++++++++++++++++++
 2 files changed, 56 insertions(+), 3 deletions(-)
 create mode 100644 tests/unit/agy-projectid-ui.test.ts

diff --git a/src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx b/src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx
index bb58cc06e71d..da611e8563af 100644
--- a/src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx
+++ b/src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx
@@ -165,7 +165,9 @@ export default function EditConnectionModal({
   const isCodex = provider === "codex";
   const isClaude = provider === "claude";
   const isAntigravity = provider === "antigravity";
-  const supportsGoogleProjectId = isAntigravity;
+  const isAgy = provider === "agy";
+  const isAntigravityFamily = isAntigravity || isAgy;
+  const supportsGoogleProjectId = isAntigravityFamily;
   const localProviderMetadata = getLocalProviderMetadata(provider);
   const isLocalSelfHostedProvider = !!localProviderMetadata;
   const isGooglePse = provider === "google-pse-search";
@@ -534,7 +536,7 @@ export default function EditConnectionModal({
           updates.providerSpecificData.projectId = trimmedCloudCodeProjectId || null;
         }
       }
-      if (isAntigravity) {
+      if (isAntigravityFamily) {
         updates.providerSpecificData = {
           ...(connection.providerSpecificData || {}),
           ...(updates.providerSpecificData || {}),
@@ -687,7 +689,7 @@ export default function EditConnectionModal({
         />
         {supportsGoogleProjectId && (
           <div className="flex flex-col gap-4 rounded-lg border border-border/50 bg-surface/20 p-4">
-            {isAntigravity && (
+            {isAntigravityFamily && (
               <Select
                 label={t("antigravityClientProfileLabel")}
                 value={formData.antigravityClientProfile}
diff --git a/tests/unit/agy-projectid-ui.test.ts b/tests/unit/agy-projectid-ui.test.ts
new file mode 100644
index 000000000000..57de34088691
--- /dev/null
+++ b/tests/unit/agy-projectid-ui.test.ts
@@ -0,0 +1,51 @@
+import { describe, it } from "node:test";
+import assert from "node:assert";
+import { readFileSync } from "node:fs";
+
+const modalPath =
+  "src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx";
+const source = readFileSync(modalPath, "utf8");
+
+describe("agy Project ID UI support", () => {
+  it("declares isAgy from provider", () => {
+    assert.ok(
+      source.includes('const isAgy = provider === "agy"'),
+      "isAgy must be declared via provider === 'agy'"
+    );
+  });
+
+  it("declares isAntigravityFamily = isAntigravity || isAgy", () => {
+    assert.ok(
+      source.includes("const isAntigravityFamily = isAntigravity || isAgy;"),
+      "isAntigravityFamily must combine antigravity and agy"
+    );
+  });
+
+  it("uses isAntigravityFamily as the Google Project ID gate", () => {
+    assert.ok(
+      /const supportsGoogleProjectId = isAntigravityFamily;/.test(source),
+      "supportsGoogleProjectId must be gated by isAntigravityFamily"
+    );
+  });
+
+  it("uses antigravityProjectIdLabel for Antigravity-family providers", () => {
+    assert.ok(
+      source.includes('label={t("antigravityProjectIdLabel")}'),
+      "projectId label must use Antigravity-family copy"
+    );
+  });
+
+  it("uses isAntigravityFamily for antigravityClientProfile UI", () => {
+    assert.ok(
+      source.includes("{isAntigravityFamily && (\n              <Select"),
+      "client profile Select must render for isAntigravityFamily"
+    );
+  });
+
+  it("uses isAntigravityFamily for client profile save", () => {
+    assert.ok(
+      source.includes("if (isAntigravityFamily) {"),
+      "client profile save must use isAntigravityFamily"
+    );
+  });
+});

From 67b59017e238aa9cc2766fe6fc3bcf00f855ca81 Mon Sep 17 00:00:00 2001
From: Nikolay Alafuzov <alafuzov_nn@rusklimat.ru>
Date: Thu, 2 Jul 2026 10:28:49 +0300
Subject: [PATCH 2/2] refactor(agy): collapse Antigravity family project gate

---
 .../components/modals/EditConnectionModal.tsx | 39 ++++++++-----------
 .../modals/connectionProviderSpecificData.ts  |  4 +-
 tests/unit/agy-projectid-ui.test.ts           | 25 +++++-------
 3 files changed, 28 insertions(+), 40 deletions(-)

diff --git a/src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx b/src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx
index da611e8563af..d4a7d3ea6c41 100644
--- a/src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx
+++ b/src/app/(dashboard)/dashboard/providers/[id]/components/modals/EditConnectionModal.tsx
@@ -164,10 +164,7 @@ export default function EditConnectionModal({
   const setOpenRouterPreset = openRouterPreset.setValue;
   const isCodex = provider === "codex";
   const isClaude = provider === "claude";
-  const isAntigravity = provider === "antigravity";
-  const isAgy = provider === "agy";
-  const isAntigravityFamily = isAntigravity || isAgy;
-  const supportsGoogleProjectId = isAntigravityFamily;
+  const isAntigravityFamily = provider === "antigravity" || provider === "agy";
   const localProviderMetadata = getLocalProviderMetadata(provider);
   const isLocalSelfHostedProvider = !!localProviderMetadata;
   const isGooglePse = provider === "google-pse-search";
@@ -433,7 +430,7 @@ export default function EditConnectionModal({
         overrides.maxConcurrent = Number(formData.rateLimitMaxConcurrent);
       updates.rateLimitOverrides = Object.keys(overrides).length > 0 ? overrides : null;
 
-      if (supportsGoogleProjectId) {
+      if (isAntigravityFamily) {
         updates.projectId = trimmedCloudCodeProjectId || null;
       }
 
@@ -507,7 +504,7 @@ export default function EditConnectionModal({
           defaultRegion,
           isGlm,
           isCloudflare,
-          supportsGoogleProjectId,
+          isAntigravityFamily,
           trimmedCloudCodeProjectId,
           isGooglePse,
           isCcCompatible,
@@ -532,7 +529,7 @@ export default function EditConnectionModal({
           updates.providerSpecificData.openaiStoreEnabled =
             formData.codexOpenaiStoreEnabled === true;
         }
-        if (supportsGoogleProjectId) {
+        if (isAntigravityFamily) {
           updates.providerSpecificData.projectId = trimmedCloudCodeProjectId || null;
         }
       }
@@ -687,22 +684,20 @@ export default function EditConnectionModal({
           t={t}
           editMode
         />
-        {supportsGoogleProjectId && (
+        {isAntigravityFamily && (
           <div className="flex flex-col gap-4 rounded-lg border border-border/50 bg-surface/20 p-4">
-            {isAntigravityFamily && (
-              <Select
-                label={t("antigravityClientProfileLabel")}
-                value={formData.antigravityClientProfile}
-                options={ANTIGRAVITY_CLIENT_PROFILE_OPTIONS.map((option) => ({
-                  value: option.value,
-                  label: t(option.labelKey),
-                }))}
-                onChange={(e) =>
-                  setFormData({ ...formData, antigravityClientProfile: e.target.value })
-                }
-                hint={t("antigravityClientProfileHint")}
-              />
-            )}
+            <Select
+              label={t("antigravityClientProfileLabel")}
+              value={formData.antigravityClientProfile}
+              options={ANTIGRAVITY_CLIENT_PROFILE_OPTIONS.map((option) => ({
+                value: option.value,
+                label: t(option.labelKey),
+              }))}
+              onChange={(e) =>
+                setFormData({ ...formData, antigravityClientProfile: e.target.value })
+              }
+              hint={t("antigravityClientProfileHint")}
+            />
             <Input
               label={t("antigravityProjectIdLabel")}
               value={formData.cloudCodeProjectId}
diff --git a/src/app/(dashboard)/dashboard/providers/[id]/components/modals/connectionProviderSpecificData.ts b/src/app/(dashboard)/dashboard/providers/[id]/components/modals/connectionProviderSpecificData.ts
index 654593ed6c08..53ea1b7947c9 100644
--- a/src/app/(dashboard)/dashboard/providers/[id]/components/modals/connectionProviderSpecificData.ts
+++ b/src/app/(dashboard)/dashboard/providers/[id]/components/modals/connectionProviderSpecificData.ts
@@ -89,7 +89,7 @@ export function assignEditApiKeyProviderSpecificData(options: {
   defaultRegion: string;
   isGlm: boolean;
   isCloudflare: boolean;
-  supportsGoogleProjectId: boolean;
+  isAntigravityFamily: boolean;
   trimmedCloudCodeProjectId: string;
   isGooglePse: boolean;
   isCcCompatible: boolean;
@@ -116,7 +116,7 @@ export function assignEditApiKeyProviderSpecificData(options: {
   else if (o.isCloudflare && o.formData.accountId.trim()) {
     o.target.accountId = o.formData.accountId.trim();
   }
-  if (o.supportsGoogleProjectId) o.target.projectId = o.trimmedCloudCodeProjectId || null;
+  if (o.isAntigravityFamily) o.target.projectId = o.trimmedCloudCodeProjectId || null;
   if (o.isCcCompatible) {
     o.target.requestDefaults = mergeCcCompatibleRequestDefaults(
       o.target.requestDefaults,
diff --git a/tests/unit/agy-projectid-ui.test.ts b/tests/unit/agy-projectid-ui.test.ts
index 57de34088691..de0c0578197f 100644
--- a/tests/unit/agy-projectid-ui.test.ts
+++ b/tests/unit/agy-projectid-ui.test.ts
@@ -7,25 +7,17 @@ const modalPath =
 const source = readFileSync(modalPath, "utf8");
 
 describe("agy Project ID UI support", () => {
-  it("declares isAgy from provider", () => {
+  it("declares a single Antigravity-family provider gate", () => {
     assert.ok(
-      source.includes('const isAgy = provider === "agy"'),
-      "isAgy must be declared via provider === 'agy'"
+      source.includes(
+        'const isAntigravityFamily = provider === "antigravity" || provider === "agy";'
+      ),
+      "isAntigravityFamily must include antigravity and agy without a separate Google Project ID gate"
     );
   });
 
-  it("declares isAntigravityFamily = isAntigravity || isAgy", () => {
-    assert.ok(
-      source.includes("const isAntigravityFamily = isAntigravity || isAgy;"),
-      "isAntigravityFamily must combine antigravity and agy"
-    );
-  });
-
-  it("uses isAntigravityFamily as the Google Project ID gate", () => {
-    assert.ok(
-      /const supportsGoogleProjectId = isAntigravityFamily;/.test(source),
-      "supportsGoogleProjectId must be gated by isAntigravityFamily"
-    );
+  it("does not keep the old supportsGoogleProjectId alias", () => {
+    assert.equal(source.includes("supportsGoogleProjectId"), false);
   });
 
   it("uses antigravityProjectIdLabel for Antigravity-family providers", () => {
@@ -37,7 +29,8 @@ describe("agy Project ID UI support", () => {
 
   it("uses isAntigravityFamily for antigravityClientProfile UI", () => {
     assert.ok(
-      source.includes("{isAntigravityFamily && (\n              <Select"),
+      source.includes("{isAntigravityFamily && (\n          <div") &&
+        source.includes('label={t("antigravityClientProfileLabel")}'),
       "client profile Select must render for isAntigravityFamily"
     );
   });