From 86fab8abb1f3948d0888f60df5ac4b378901fd96 Mon Sep 17 00:00:00 2001
From: Riz Ashraf <reazul.ashraf@inseinc.com>
Date: Sat, 12 Sep 2026 23:15:04 +0100
Subject: [PATCH] feat: Merge V2 WebSocket telemetry push into existing
 gemini-integration.lua

---
 gemini-integration.lua | 24 ++++++++++++++++++------
 gemini_telemetry.lua   | 28 ----------------------------
 2 files changed, 18 insertions(+), 34 deletions(-)
 delete mode 100644 gemini_telemetry.lua

diff --git a/gemini-integration.lua b/gemini-integration.lua
index b047a51..5a60248 100644
--- a/gemini-integration.lua
+++ b/gemini-integration.lua
@@ -1,15 +1,13 @@
 -- gemini-integration.lua
 -- Registers the active Neovim instance for the Antigravity MCP Server
-vim.api.nvim_create_autocmd({"VimEnter", "FocusGained"}, {
-    callback = function()
+vim.api.nvim_create_autocmd({"VimEnter", "FocusGained", "BufEnter"}, {
+    callback = function(ev)
         -- Only register if Neovim has an active UI attached (ignore headless/embedded instances)
         if #vim.api.nvim_list_uis() > 0 then
             local server_name = vim.v.servername
             if server_name then
-                local home = os.getenv("HOME")
-                if not home then
-                    home = os.getenv("USERPROFILE")
-                end
+                -- 1. Legacy Disk Write (Fallback)
+                local home = os.getenv("HOME") or os.getenv("USERPROFILE")
                 if home then
                     os.execute("mkdir -p " .. home .. "/.gemini")
                     local path = home .. "/.gemini/active_nvim.txt"
@@ -19,6 +17,20 @@ vim.api.nvim_create_autocmd({"VimEnter", "FocusGained"}, {
                         f:close()
                     end
                 end
+                
+                -- 2. V2 Telemetry Push (WebSockets & Cross-OS Sync via Rust Server)
+                local file = vim.api.nvim_buf_get_name(0)
+                local cursor = vim.api.nvim_win_get_cursor(0)
+                local row, col = cursor[1], cursor[2]
+                local payload = string.format(
+                    '{"session_id": "%s", "event": "%s", "file": "%s", "line": %d, "col": %d}',
+                    server_name:gsub("\\", "\\\\"), ev.event, file:gsub("\\", "\\\\"), row, col
+                )
+                vim.fn.jobstart({
+                    "curl", "-s", "-X", "POST", "http://127.0.0.1:3000/nvim/telemetry",
+                    "-H", "Content-Type: application/json",
+                    "-d", payload
+                }, { detach = true })
             end
         end
     end,
diff --git a/gemini_telemetry.lua b/gemini_telemetry.lua
deleted file mode 100644
index 64e0044..0000000
--- a/gemini_telemetry.lua
+++ /dev/null
@@ -1,28 +0,0 @@
-local function send_telemetry(event)
-    local session_id = vim.v.servername
-    if not session_id or session_id == '' then return end
-    
-    local file = vim.api.nvim_buf_get_name(0)
-    local row, col = unpack(vim.api.nvim_win_get_cursor(0))
-    
-    local payload = string.format(
-        '{"session_id": "%s", "event": "%s", "file": "%s", "line": %d, "col": %d}',
-        session_id:gsub("\\", "\\\\"), event, file:gsub("\\", "\\\\"), row, col
-    )
-    
-    vim.fn.jobstart({
-        "curl", "-s", "-X", "POST", "http://127.0.0.1:3000/nvim/telemetry",
-        "-H", "Content-Type: application/json",
-        "-d", payload
-    }, { detach = true })
-end
-
-local group = vim.api.nvim_create_augroup("GeminiTelemetry", { clear = true })
-
-local events = { "FocusGained", "BufEnter", "VimEnter" }
-for _, event in ipairs(events) do
-    vim.api.nvim_create_autocmd(event, {
-        group = group,
-        callback = function() send_telemetry(event) end
-    })
-end