Skip to content

fix: terminate CLI process and cleanup buffer on close #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Murari007 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: terminate CLI process and cleanup buffer on close #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6a2eca
fix: terminate CLI process and cleanup buffer on close
Murari007 Dec 4, 2025
84352a7
Add keybindings to focus to gemini chat window and imporved user inte…
Murari007 Dec 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
100 changes: 78 additions & 22 deletions lua/gemini/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ local function close_gemini_window()
if state.winnr and vim.api.nvim_win_is_valid(state.winnr) then
vim.api.nvim_win_close(state.winnr, true)
end
if state.chan_id then
vim.fn.jobstop(state.chan_id)
end
if state.bufnr and vim.api.nvim_buf_is_valid(state.bufnr) then
vim.api.nvim_buf_delete(state.bufnr, { force = true })
end
state.winnr = nil
state.bufnr = nil
state.chan_id = nil
Expand All @@ -35,27 +41,37 @@ local function open_gemini_window()
else
vim.cmd("vsplit")
end
vim.cmd("enew")
vim.cmd("setlocal buftype=nofile bufhidden=hide noswapfile")

state.winnr = vim.api.nvim_get_current_win()
state.bufnr = vim.api.nvim_get_current_buf()
vim.api.nvim_buf_set_name(state.bufnr, "gemini_cli")

state.chan_id = vim.fn.termopen("gemini", {
env = { ["EDITOR"] = "nvim" },
on_exit = function()
-- Check if the window is still valid before trying to close it
if state.winnr and vim.api.nvim_win_is_valid(state.winnr) then
local buf_in_win = vim.api.nvim_win_get_buf(state.winnr)
if buf_in_win == state.bufnr then
vim.api.nvim_win_close(state.winnr, true)

-- Reuse existing buffer if valid and process is alive
if state.bufnr and vim.api.nvim_buf_is_valid(state.bufnr) and state.chan_id then
vim.api.nvim_win_set_buf(state.winnr, state.bufnr)
else
vim.cmd("enew")
vim.cmd("setlocal buftype=nofile bufhidden=hide noswapfile")
state.bufnr = vim.api.nvim_get_current_buf()
vim.api.nvim_buf_set_name(state.bufnr, "gemini_cli")

-- Map Esc to exit terminal mode in the Gemini buffer
vim.api.nvim_buf_set_keymap(state.bufnr, "t", "<Esc>", "<C-\\><C-n>", { noremap = true, silent = true })

state.chan_id = vim.fn.termopen("gemini", {
env = { ["EDITOR"] = "nvim" },
on_exit = function()
-- Check if the window is still valid before trying to close it
if state.winnr and vim.api.nvim_win_is_valid(state.winnr) then
local buf_in_win = vim.api.nvim_win_get_buf(state.winnr)
if buf_in_win == state.bufnr then
vim.api.nvim_win_close(state.winnr, true)
end
end
end
state.bufnr = nil
state.winnr = nil
state.chan_id = nil
end,
})
state.bufnr = nil
state.winnr = nil
state.chan_id = nil
end,
})
end
end

function M.toggle_gemini_cli()
Expand Down Expand Up @@ -135,11 +151,40 @@ function M.send_to_gemini()
end
end

function M.gemini_chat_focus(mode)
if state.winnr and vim.api.nvim_win_is_valid(state.winnr) then
local current_win = vim.api.nvim_get_current_win()
local win_tab = vim.api.nvim_win_get_tabpage(state.winnr)
local current_tab = vim.api.nvim_get_current_tabpage()

if win_tab ~= current_tab then
vim.api.nvim_set_current_tabpage(win_tab)
vim.api.nvim_set_current_win(state.winnr)
pcall(vim.cmd, "startinsert")
return
end

if current_win == state.winnr then
if mode == "t" then
vim.cmd("wincmd p")
else
pcall(vim.cmd, "startinsert")
end
else
vim.api.nvim_set_current_win(state.winnr)
pcall(vim.cmd, "startinsert")
end
else
open_gemini_window()
end
end

function M.setup(opts)
-- Merge user config with defaults
config = vim.tbl_deep_extend("force", default_config, opts or {})

if vim.fn.executable("gemini") == 1 then
vim.cmd('command! GeminiChatFocus lua require("gemini").gemini_chat_focus()')
vim.api.nvim_set_keymap(
"n",
"<leader>og",
Expand All @@ -152,6 +197,18 @@ function M.setup(opts)
':<C-U>lua require("gemini").send_to_gemini()<CR>',
{ noremap = true, silent = true, desc = "Send selection to Gemini" }
)
vim.api.nvim_set_keymap(
"n",
"<leader>gc",
'<cmd>lua require("gemini").gemini_chat_focus("n")<CR>',
{ noremap = true, silent = true, desc = "Focus Gemini Chat" }
)
vim.api.nvim_set_keymap(
"t",
"<leader>gc",
'<C-\\><C-n><cmd>lua require("gemini").gemini_chat_focus("t")<CR>',
{ noremap = true, silent = true, desc = "Focus Gemini Chat" }
)
else
local answer = vim.fn.input("Gemini CLI not found. Install it now? (y/n): ")
if answer:lower() == "y" then
Expand All @@ -166,5 +223,4 @@ function M.setup(opts)
end
end
end

return M
return M