From bb3db28ff7d1484b0a660c6283b1279275aefc1e Mon Sep 17 00:00:00 2001
From: Moha Abdi <mohaa6052@gmail.com>
Date: Thu, 19 Feb 2026 14:32:52 +0300
Subject: [PATCH] fix: use ensureProjectContext for google_search project ID
 resolution

---
 src/plugin.ts | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/plugin.ts b/src/plugin.ts
index cad8209..8dd74ad 100644
--- a/src/plugin.ts
+++ b/src/plugin.ts
@@ -1348,23 +1348,27 @@ export const createAntigravityPlugin = (providerId: string) => async (
         return "Error: Not authenticated with Antigravity. Please run `opencode auth login` to authenticate.";
       }
 
-      // Get access token and project ID
-      const parts = parseRefreshParts(auth.refresh);
-      const projectId = parts.managedProjectId || parts.projectId || "unknown";
+      let projectContext: ProjectContextResult
+      try {
+        projectContext = await ensureProjectContext(auth)
+      } catch (error) {
+        return `Error: Failed to resolve project context: ${error instanceof Error ? error.message : String(error)}`
+      }
+
+      const projectId = projectContext.effectiveProjectId
+      let accessToken = projectContext.auth.access || auth.access
 
-      // Ensure we have a valid access token
-      let accessToken = auth.access;
-      if (!accessToken || accessTokenExpired(auth)) {
+      if (!accessToken || accessTokenExpired(projectContext.auth)) {
         try {
-          const refreshed = await refreshAccessToken(auth, client, providerId);
-          accessToken = refreshed?.access;
+          const refreshed = await refreshAccessToken(projectContext.auth, client, providerId)
+          accessToken = refreshed?.access
         } catch (error) {
-          return `Error: Failed to refresh access token: ${error instanceof Error ? error.message : String(error)}`;
+          return `Error: Failed to refresh access token: ${error instanceof Error ? error.message : String(error)}`
         }
       }
 
       if (!accessToken) {
-        return "Error: No valid access token available. Please run `opencode auth login` to re-authenticate.";
+        return "Error: No valid access token available. Please run `opencode auth login` to re-authenticate."
       }
 
       return executeSearch(