fix: visual selection on send

Author: yaadata

lua/codex/init.lua

@@ -8,6 +8,7 @@ local send_dispatch_mod = require("codex.runtime.send_dispatch")
 local mention_mod = require("codex.context.mention")
 local prompt_submit = require("codex.context.prompt_submit")
 
+local CTRL_V = string.char(22)
 local SAVED_PROMPT_NOTIFY_MSG = "Saved current prompt to unnamed register"
 local COULD_NOT_SAVE_PROMPT_NOTIFY_MSG = "Could not save existing prompt before clearing"
 
@@ -377,6 +378,104 @@ local function log_selection_failure(deps, subject, err)
   deps.logger.error("failed to collect %s: %s", target, err or "unknown error")
 end
 
+---Check whether a value is an integer >= 1.
+---@param value any
+---@return boolean
+local function is_positive_integer(value)
+  return type(value) == "number" and value >= 1 and math.floor(value) == value
+end
+
+---Check whether a value is an integer >= 0.
+---@param value any
+---@return boolean
+local function is_non_negative_integer(value)
+  return type(value) == "number" and value >= 0 and math.floor(value) == value
+end
+
+---Return a shallow copy of a possibly nil table.
+---@param opts table|nil
+---@return table
+local function copy_opts(opts)
+  local copied = {}
+  for key, value in pairs(opts or {}) do
+    copied[key] = value
+  end
+  return copied
+end
+
+---Resolve active visual selection metadata when explicit range opts are missing.
+---This supports first-use lazy-key visual mappings where visual marks may be unset.
+---@param deps table
+---@param opts? codex.SelectionOpts
+---@return codex.SelectionOpts
+local function resolve_selection_opts(deps, opts)
+  local resolved = copy_opts(opts)
+  if is_positive_integer(resolved.line1) and is_positive_integer(resolved.line2) then
+    return resolved
+  end
+
+  local fn = deps.vim.fn or {}
+  if type(fn.mode) ~= "function" then
+    return resolved
+  end
+
+  local ok_mode, visual_mode = pcall(fn.mode, 1)
+  if not ok_mode then
+    return resolved
+  end
+  if visual_mode ~= "v" and visual_mode ~= "V" and visual_mode ~= CTRL_V then
+    return resolved
+  end
+
+  if resolved.visual_mode == nil then
+    resolved.visual_mode = visual_mode
+  end
+
+  if type(fn.getpos) ~= "function" then
+    return resolved
+  end
+  local api = deps.vim.api or {}
+  if type(api.nvim_win_get_cursor) ~= "function" then
+    return resolved
+  end
+
+  local ok_anchor, anchor = pcall(fn.getpos, "v")
+  local ok_cursor, cursor = pcall(api.nvim_win_get_cursor, 0)
+  if not ok_anchor or type(anchor) ~= "table" then
+    return resolved
+  end
+  if not ok_cursor or type(cursor) ~= "table" then
+    return resolved
+  end
+
+  local anchor_line = anchor[2]
+  local anchor_col = anchor[3]
+  local cursor_line = cursor[1]
+  local cursor_col = cursor[2]
+
+  if not is_positive_integer(anchor_line) or not is_positive_integer(cursor_line) then
+    return resolved
+  end
+  if not is_positive_integer(anchor_col) or not is_non_negative_integer(cursor_col) then
+    return resolved
+  end
+
+  if not is_positive_integer(resolved.line1) then
+    resolved.line1 = anchor_line
+  end
+  if not is_positive_integer(resolved.line2) then
+    resolved.line2 = cursor_line
+  end
+  if not is_non_negative_integer(resolved.start_col) then
+    resolved.start_col = anchor_col - 1
+  end
+  if not is_non_negative_integer(resolved.end_col) then
+    resolved.end_col = cursor_col
+  end
+
+  return resolved
+end
+
 ---Formats current buffer reference and sends it as bracketed paste.
 ---@param opts? codex.SelectionOpts Buffer override via `opts.bufnr`.
 ---@return codex.SendResult ok True when buffer payload is sent.
@@ -404,7 +503,8 @@ end
 function M.send_selection(opts)
   ensure_setup()
   local deps = get_deps()
-  local spec, err = deps.selection.get_visual_selection(deps.vim, opts)
+  local spec, err =
+    deps.selection.get_visual_selection(deps.vim, resolve_selection_opts(deps, opts))
   if not spec then
     log_selection_failure(deps, "selection", err)
     return false, err

tests/unit/init_send_selection_spec.lua

@@ -1,6 +1,7 @@
 local helpers = require("tests.unit.helpers.init_spec_helpers")
 local setup_with_deps = helpers.setup_with_deps
 local run_deferred = helpers.run_deferred
+local CTRL_V = string.char(22)
 
 describe("codex.init public api send_selection", function()
   before_each(function()
@@ -125,9 +126,58 @@ describe("codex.init public api send_selection", function()
 
   it("send_selection forwards explicit range options to selection extractor", function()
     local env = setup_with_deps()
+    env.fake_vim.fn.mode = function()
+      return "v"
+    end
+    env.fake_vim.fn.getpos = function()
+      return { 0, 8, 6, 0 }
+    end
+    env.fake_vim._set_buf_cursor(1, 0, 10, 4)
 
     env.codex.send_selection({ line1 = 3, line2 = 5 })
 
     assert.same({ line1 = 3, line2 = 5 }, env.selection.calls[1].opts)
   end)
+
+  it("send_selection derives visual range when called in visual mode without opts", function()
+    local env = setup_with_deps()
+    env.fake_vim.fn.mode = function()
+      return "v"
+    end
+    env.fake_vim.fn.getpos = function()
+      return { 0, 4, 3, 0 }
+    end
+    env.fake_vim._set_buf_cursor(1, 0, 7, 9)
+
+    env.codex.send_selection()
+
+    assert.same({
+      line1 = 4,
+      line2 = 7,
+      start_col = 2,
+      end_col = 9,
+      visual_mode = "v",
+    }, env.selection.calls[1].opts)
+  end)
+
+  it("send_selection derives blockwise mode for visual fallback", function()
+    local env = setup_with_deps()
+    env.fake_vim.fn.mode = function()
+      return CTRL_V
+    end
+    env.fake_vim.fn.getpos = function()
+      return { 0, 6, 4, 0 }
+    end
+    env.fake_vim._set_buf_cursor(1, 0, 9, 12)
+
+    env.codex.send_selection()
+
+    assert.same({
+      line1 = 6,
+      line2 = 9,
+      start_col = 3,
+      end_col = 12,
+      visual_mode = CTRL_V,
+    }, env.selection.calls[1].opts)
+  end)
 end)