increase the lease time from 30sec to 20min

Author: ray-x

lua/copilot_agent/config.lua

@@ -39,6 +39,7 @@ local defaults = {
     healthcheck_path = '/healthz',
     startup_timeout_ms = 15000,
     startup_poll_interval_ms = 250,
+    client_heartbeat_interval_ms = 10000,
   },
   chat = {
     split = 'botright vnew',
@@ -185,6 +186,7 @@ local state = {
   service_process_pid = nil,
   client_id = nil,
   client_registered_base_url = nil,
+  client_heartbeat_timer = nil,
   client_lease_registered = false,
   service_launch_info = nil, -- human-readable launch mode/command shown in chat header
   service_starting = false,

lua/copilot_agent/init.lua

@@ -147,6 +147,13 @@ function M.setup(opts)
   state.service_job_id = nil
   state.service_process_pid = nil
   state.client_registered_base_url = nil
+  if state.client_heartbeat_timer then
+    pcall(function()
+      state.client_heartbeat_timer:stop()
+      state.client_heartbeat_timer:close()
+    end)
+  end
+  state.client_heartbeat_timer = nil
   state.service_starting = false
   state.service_addr_known = false
   state.pending_service_callbacks = {}

lua/copilot_agent/service.lua

@@ -21,6 +21,7 @@ local SERVICE_OUTPUT_HISTORY_LIMIT = 20 -- Keep only the most recent startup lin
 local CONTROL_REQUEST_TIMEOUT_SECONDS = '2' -- Bound local control-socket curl calls so stale sockets cannot hang startup or exit indefinitely.
 local SAVED_ADDR_PROBE_TIMEOUT_SECONDS = '1' -- Quick probe timeout when validating persisted service addresses.
 local STALE_ADDR_FAILURE_THRESHOLD = 3 -- After this many consecutive health-check failures on the same discovered address, force a fresh restart.
+local DEFAULT_CLIENT_HEARTBEAT_INTERVAL_MS = 10000 -- Refresh client registration periodically so detached idle shutdown never races active chat use.
 local DEFAULT_SERVICE_LOG_PATH = vim.fn.stdpath('state') .. '/copilot-agent-service.log'
 local DEFAULT_CLIENT_ID_LENGTH = 32
 
@@ -648,6 +649,63 @@ local function interval_settings()
   return timeout_ms, interval_ms
 end
 
+local function client_heartbeat_interval_ms()
+  local interval = tonumber(state.config.service.client_heartbeat_interval_ms)
+  if interval == nil then
+    interval = DEFAULT_CLIENT_HEARTBEAT_INTERVAL_MS
+  end
+  return math.max(0, interval)
+end
+
+local function close_client_heartbeat_timer()
+  local timer = state.client_heartbeat_timer
+  if timer == nil then
+    return
+  end
+  pcall(function()
+    timer:stop()
+    timer:close()
+  end)
+  state.client_heartbeat_timer = nil
+end
+
+local function start_client_heartbeat_timer()
+  if state.shutting_down then
+    return
+  end
+
+  local interval_ms = client_heartbeat_interval_ms()
+  if interval_ms <= 0 then
+    return
+  end
+
+  if state.client_heartbeat_timer == nil then
+    state.client_heartbeat_timer = uv.new_timer()
+  end
+  local timer = state.client_heartbeat_timer
+  if timer == nil then
+    return
+  end
+
+  timer:stop()
+  timer:start(
+    interval_ms,
+    interval_ms,
+    vim.schedule_wrap(function()
+      if state.shutting_down then
+        return
+      end
+      if type(state.client_registered_base_url) ~= 'string' or state.client_registered_base_url == '' then
+        return
+      end
+      local registered, register_err = M.register_client()
+      if not registered and register_err then
+        log('client heartbeat renewal failed: ' .. tostring(register_err), vim.log.levels.DEBUG)
+      end
+    end)
+  )
+end
+
 write_text_file = function(path, content)
   local ok, err = pcall(function()
     local f = assert(io.open(path, 'w'))
@@ -958,6 +1016,7 @@ function M.register_client()
 
   if state.client_registered_base_url == base_url then
     log(string.format('client already registered client_id=%s base_url=%s', M.client_id(), base_url), vim.log.levels.DEBUG)
+    start_client_heartbeat_timer()
     return true
   end
 
@@ -990,11 +1049,13 @@ function M.register_client()
   end
 
   state.client_registered_base_url = base_url
+  start_client_heartbeat_timer()
   log(string.format('registering client succeeded client_id=%s base_url=%s', M.client_id(), base_url), vim.log.levels.DEBUG)
   return true
 end
 
 function M.unregister_client()
+  close_client_heartbeat_timer()
   local base_url = type(state.client_registered_base_url) == 'string' and state.client_registered_base_url or current_service_base_url()
   if base_url == '' then
     log('unregister_client skipped: no registered base_url', vim.log.levels.DEBUG)

server/README.md

@@ -51,8 +51,8 @@ Service log lines are prefixed with `[INFO]`, `[WARN]`, or `[ERROR]` when
 
 When `-client-lease-dir` is configured, detached-service shutdown is delayed by
 the lease watcher grace window. Current defaults (from `server/main.go`) are:
-`clientLeasePollInterval = 500ms` and `clientLeaseEmptyGrace = 30s` (i.e. the
-lease directory must stay empty for 30 seconds before shutdown).
+`clientLeasePollInterval = 500ms` and `clientLeaseEmptyGrace = 5m` (i.e. the
+lease directory must stay empty for five minutes before shutdown).
 
 ---
 

server/main.go

@@ -45,7 +45,7 @@ const (
 	httpShutdownTimeout        = 5 * time.Second  // Allow in-flight HTTP requests a brief grace period during service shutdown.
 	sseKeepAliveInterval       = 15 * time.Second // Keep reverse proxies and clients from treating idle event streams as dead.
 	clientLeasePollInterval    = 500 * time.Millisecond
-	clientLeaseEmptyGrace      = 30 * time.Second
+	clientLeaseEmptyGrace      = 10 * time.Minute
 	sseSubscriberBufferSize    = 256 // Absorb bursts of session events (tool calls can produce 100+ events rapidly).
 	asyncResultChannelSize     = 1   // Each pending prompt/permission only needs to hold a single terminal response.
 	permissionRequestIDPrefix  = "perm"

tests/integration/setup_spec.lua

@@ -10400,6 +10400,7 @@ describe('chat input behavior', function()
 
   it('opens an apply_patch hover preview for multi-file activity changes', function()
     local events = require('copilot_agent.events')
+    local render = require('copilot_agent.render')
     agent.state.session_id = 'session-123'
     agent.state.entries = {}
     agent.state.entry_row_index = {}
@@ -10494,10 +10495,57 @@ describe('chat input behavior', function()
     assert_true(joined:find('*** Update File: lua/copilot_agent/activity_diff.lua', 1, true) ~= nil)
     assert_true(joined:find('*** Update File: lua/copilot_agent/chat.lua', 1, true) ~= nil)
     assert_true(joined:find('@@', 1, true) ~= nil)
+    local focused = render.focus_activity_hover_preview(agent.state.chat_winid)
+    assert_true(focused)
+    assert_true(vim.api.nvim_win_is_valid(vim.api.nvim_get_current_win()))
+    preview_winid = agent.state.activity_hover_winid
+    vim.wait(250)
+    assert_true(vim.api.nvim_win_is_valid(preview_winid))
+
+    vim.api.nvim_set_current_win(agent.state.chat_winid)
+    vim.wait(250)
+    assert_true(preview_winid == nil or not vim.api.nvim_win_is_valid(preview_winid))
     vim.wait(180)
     assert_true(preview_winid == nil or not vim.api.nvim_win_is_valid(preview_winid))
   end)
 
+  it('keeps the hover preview open while it has focus', function()
+    local render = require('copilot_agent.render')
+    agent.state.config.chat.activity_view = 'hover'
+    agent.state.config.chat.activity_hover_timeout_ms = 1000
+    agent.state.entries = {
+      {
+        kind = 'activity',
+        content = 'Used edit',
+        activity_items = {
+          {
+            kind = 'tool',
+            tool_name = 'bash',
+            summary = 'Used bash',
+          },
+        },
+      },
+    }
+    agent.open_chat()
+    agent.state.entry_row_index = { [0] = 1 }
+    vim.api.nvim_win_set_cursor(agent.state.chat_winid, { 1, 0 })
+
+    local opened = render.refresh_activity_hover_preview(agent.state.chat_winid)
+    assert_true(opened)
+    local hover_winid = agent.state.activity_hover_winid
+    assert_true(hover_winid ~= nil and vim.api.nvim_win_is_valid(hover_winid))
+
+    local focused = render.focus_activity_hover_preview(agent.state.chat_winid)
+    assert_true(focused)
+    hover_winid = agent.state.activity_hover_winid
+    vim.wait(250)
+    assert_true(vim.api.nvim_win_is_valid(hover_winid))
+
+    vim.api.nvim_set_current_win(agent.state.chat_winid)
+    vim.wait(1250)
+    assert_true(hover_winid == nil or not vim.api.nvim_win_is_valid(hover_winid))
+  end)
+
   it('opens a hover diff preview for single-file activity changes', function()
     local events = require('copilot_agent.events')
     agent.state.session_id = 'session-123'