diff --git a/neovim/plugin/agents.lua b/neovim/plugin/agents.lua
new file mode 100644
index 00000000..4645b106
--- /dev/null
+++ b/neovim/plugin/agents.lua
@@ -0,0 +1,26 @@
+local function reset_registers()
+	vim.fn.setreg("t", "TODO(agent): ")
+	vim.fn.setreg("f", "FIXME(agent): ")
+end
+
+reset_registers()
+
+vim.api.nvim_create_user_command(
+	"AgentCommentsReset",
+	reset_registers,
+	{ desc = "Reset agent comment registers" }
+)
+
+-- Raw template insertion without commenting.
+vim.keymap.set(
+	"n",
+	"<leader>ct",
+	'"tp',
+	{ desc = "Insert TODO(agent) template", silent = true }
+)
+vim.keymap.set(
+	"n",
+	"<leader>cf",
+	'"fp',
+	{ desc = "Insert FIXME(agent) template", silent = true }
+)
diff --git a/vim/plugin/agents.vim b/vim/plugin/agents.vim
new file mode 100644
index 00000000..6dc2f29a
--- /dev/null
+++ b/vim/plugin/agents.vim
@@ -0,0 +1,12 @@
+function! s:ResetRegisters() abort
+	call setreg('t', 'TODO(agent): ')
+	call setreg('f', 'FIXME(agent): ')
+endfunction
+
+call s:ResetRegisters()
+
+command! AgentCommentsReset call <SID>ResetRegisters()
+
+" Raw template insertion without commenting.
+nnoremap <silent> <leader>ct "tp
+nnoremap <silent> <leader>cf "fp