selection.lua add code selection to /ask

Author: ray-x

lua/copilot_agent/chat.lua

@@ -114,6 +114,13 @@ local function help_lines()
   }
 end
 
+local function is_session_not_attached_error(err)
+  if type(err) ~= 'string' then
+    return false
+  end
+  return err:lower():find('session is not attached to this service', 1, true) ~= nil
+end
+
 local function show_help_popup()
   local lines = help_lines()
   local max_w = 0
@@ -1256,6 +1263,60 @@ function M.ask(prompt, opts)
     local function dispatch_prompt()
       local prompt_body = text
       local included_restore_context = false
+      local body = { prompt = prompt_body }
+
+      local function cleanup_temp_files()
+        for _, p in ipairs(temp_files) do
+          pcall(os.remove, p)
+        end
+      end
+
+      local function finalize_failure(request_err)
+        state.pending_checkpoint_turn = nil
+        state.active_turn_assistant_index = nil
+        state.live_assistant_entry_index = nil
+        state.active_turn_assistant_message_id = nil
+        state.active_assistant_merge_group = nil
+        state.active_tool = nil
+        state.active_tool_run_id = nil
+        state.active_tool_detail = nil
+        state.pending_tool_detail = nil
+        state.overlay_tool_display = nil
+        state.overlay_tool_queue = {}
+        state.overlay_tool_schedule_token = (tonumber(state.overlay_tool_schedule_token) or 0) + 1
+        state.post_tool_use_hooks = {}
+        state.recent_activity_lines = {}
+        state.recent_activity_items = {}
+        state.recent_activity_tool_calls = {}
+        state.current_intent = nil
+        state.chat_busy = false
+        refresh_statuslines()
+        refresh_reasoning_overlay(true)
+        append_entry('error', 'Failed to send prompt: ' .. request_err)
+      end
+
+      local function send_once()
+        request('POST', string.format('/sessions/%s/messages', session_id), body, function(_, request_err)
+          if request_err and is_session_not_attached_error(request_err) then
+            -- Recover the session so the next user prompt will succeed, but do
+            -- NOT retry automatically — retrying risks sending the prompt twice.
+            require('copilot_agent.session').recover_after_service_restart(session_id, function() end)
+            cleanup_temp_files()
+            finalize_failure(request_err .. ' (session recovered — please resend)')
+            return
+          end
+
+          cleanup_temp_files()
+          if request_err then
+            finalize_failure(request_err)
+            return
+          end
+          if included_restore_context then
+            state.pending_session_context = nil
+          end
+        end)
+      end
+
       local pending_context = state.pending_session_context
       if type(pending_context) == 'table' and type(pending_context.text) == 'string' and pending_context.text ~= '' then
         if pending_context.session_id == nil or pending_context.session_id == session_id then
@@ -1271,6 +1332,8 @@ function M.ask(prompt, opts)
         end
       end
 
+      body.prompt = prompt_body
+
       require('copilot_agent').open_chat({
         activate_input_on_session_ready = false,
         replace_current = opts.replace_current,
@@ -1286,44 +1349,11 @@ function M.ask(prompt, opts)
       refresh_statuslines()
       schedule_render()
 
-      local body = { prompt = prompt_body }
       body.clientId = service.client_id()
       if #api_attachments > 0 then
         body.attachments = api_attachments
       end
-      request('POST', string.format('/sessions/%s/messages', session_id), body, function(_, request_err)
-        -- Clean up any clipboard temp PNGs — the HTTP request has been delivered.
-        for _, p in ipairs(temp_files) do
-          pcall(os.remove, p)
-        end
-        if request_err then
-          state.pending_checkpoint_turn = nil
-          state.active_turn_assistant_index = nil
-          state.live_assistant_entry_index = nil
-          state.active_turn_assistant_message_id = nil
-          state.active_assistant_merge_group = nil
-          state.active_tool = nil
-          state.active_tool_run_id = nil
-          state.active_tool_detail = nil
-          state.pending_tool_detail = nil
-          state.overlay_tool_display = nil
-          state.overlay_tool_queue = {}
-          state.overlay_tool_schedule_token = (tonumber(state.overlay_tool_schedule_token) or 0) + 1
-          state.post_tool_use_hooks = {}
-          state.recent_activity_lines = {}
-          state.recent_activity_items = {}
-          state.recent_activity_tool_calls = {}
-          state.current_intent = nil
-          state.chat_busy = false
-          refresh_statuslines()
-          refresh_reasoning_overlay(true)
-          append_entry('error', 'Failed to send prompt: ' .. request_err)
-          return
-        end
-        if included_restore_context then
-          state.pending_session_context = nil
-        end
-      end)
+      send_once()
     end
 
     dispatch_prompt()

lua/copilot_agent/selection.lua

@@ -0,0 +1,97 @@
+-- Copyright 2026 ray-x. All rights reserved.
+-- Use of this source code is governed by an Apache 2.0
+-- license that can be found in the LICENSE file.
+
+local M = {}
+
+local function display_name(path)
+  if type(path) ~= 'string' or path == '' then
+    return '[No Name]'
+  end
+  local name = vim.fn.fnamemodify(path, ':t')
+  if type(name) == 'string' and name ~= '' then
+    return name
+  end
+  return '[No Name]'
+end
+
+local function swap_range(start_row, start_col, end_row, end_col)
+  if start_row > end_row or (start_row == end_row and start_col > end_col) then
+    return end_row, end_col, start_row, start_col
+  end
+  return start_row, start_col, end_row, end_col
+end
+
+local function clamp(value, min_value, max_value)
+  if value < min_value then
+    return min_value
+  end
+  if value > max_value then
+    return max_value
+  end
+  return value
+end
+
+local function extract_block_text(bufnr, start_row, start_col, end_row, end_col)
+  local lines = {}
+  for row = start_row, end_row do
+    local line = vim.api.nvim_buf_get_lines(bufnr, row, row + 1, false)[1] or ''
+    local from_col = clamp(start_col, 0, #line)
+    local to_col = clamp(end_col + 1, 0, #line)
+    if to_col < from_col then
+      to_col = from_col
+    end
+    lines[#lines + 1] = line:sub(from_col + 1, to_col)
+  end
+  return table.concat(lines, '\n')
+end
+
+local function extract_text(bufnr, start_row, start_col, end_row, end_col, visual_mode)
+  if visual_mode == '\022' then
+    return extract_block_text(bufnr, start_row, start_col, end_row, end_col)
+  end
+  local ok, lines = pcall(vim.api.nvim_buf_get_text, bufnr, start_row, start_col, end_row, end_col + 1, {})
+  if ok and type(lines) == 'table' then
+    return table.concat(lines, '\n')
+  end
+  return extract_block_text(bufnr, start_row, start_col, end_row, end_col)
+end
+
+function M.current_buffer_selection(opts)
+  opts = opts or {}
+  local bufnr = opts.bufnr or vim.api.nvim_get_current_buf()
+  if not bufnr or not vim.api.nvim_buf_is_valid(bufnr) then
+    return nil
+  end
+
+  local start_mark = vim.api.nvim_buf_get_mark(bufnr, '<')
+  local end_mark = vim.api.nvim_buf_get_mark(bufnr, '>')
+  if not start_mark or not end_mark or start_mark[1] == 0 or end_mark[1] == 0 then
+    return nil
+  end
+
+  local start_row = start_mark[1] - 1
+  local start_col = math.max(0, start_mark[2])
+  local end_row = end_mark[1] - 1
+  local end_col = math.max(0, end_mark[2])
+  start_row, start_col, end_row, end_col = swap_range(start_row, start_col, end_row, end_col)
+
+  local text = extract_text(bufnr, start_row, start_col, end_row, end_col, opts.visual_mode)
+  text = type(text) == 'string' and text or ''
+  if vim.trim(text) == '' then
+    return nil
+  end
+
+  local path = vim.api.nvim_buf_get_name(bufnr)
+  local attachment = {
+    type = 'selection',
+    path = path,
+    text = text,
+    start_line = start_row,
+    end_line = end_row,
+    display = string.format('selection:%s:%d-%d', display_name(path), start_row + 1, end_row + 1),
+  }
+  return attachment
+end
+
+return M

tests/integration/setup_spec.lua

@@ -8309,6 +8309,60 @@ describe('chat session activation', function()
     assert_eq(false, captured_opts.activate_input_on_session_ready)
   end)
 
+  it('recovers session on stale attachment error without retrying', function()
+    local original_open_chat = agent.open_chat
+    local original_with_session = session.with_session
+    local http = require('copilot_agent.http')
+    local original_request = http.request
+    local original_recover = session.recover_after_service_restart
+    local request_count = 0
+    local recovered_session_id
+
+    agent.open_chat = function() end
+    session.with_session = function(callback)
+      callback('session-123', nil)
+    end
+    session.recover_after_service_restart = function(session_id, callback)
+      recovered_session_id = session_id
+      if callback then
+        callback(session_id, nil)
+      end
+    end
+    http.request = function(method, path, _body, callback)
+      if method == 'POST' and path == '/sessions/session-123/messages' then
+        request_count = request_count + 1
+        if request_count == 1 then
+          callback(nil, 'session is not attached to this service')
+        else
+          callback({}, nil)
+        end
+        return
+      end
+      error('unexpected request ' .. method .. ' ' .. path)
+    end
+
+    package.loaded['copilot_agent.chat'] = nil
+    local chat = require('copilot_agent.chat')
+    chat.ask('hello')
+
+    agent.open_chat = original_open_chat
+    session.with_session = original_with_session
+    http.request = original_request
+    session.recover_after_service_restart = original_recover
+
+    -- Should NOT retry — only 1 request sent
+    assert_eq(1, request_count)
+    assert_eq('session-123', recovered_session_id)
+    -- Error entry should be appended (prompt failed)
+    local has_error = false
+    for _, entry in ipairs(agent.state.entries) do
+      if entry.kind == 'error' then
+        has_error = true
+      end
+    end
+    assert_true(has_error)
+  end)
+
   it('opens input immediately when a session is already active', function()
     local input = require('copilot_agent.input')
     local original_open_input_window = input.open_input_window