From 550f9eb89c0c8ce1de72cf936b27d512e0d3ff57 Mon Sep 17 00:00:00 2001
From: Prad Nukala <prad@sonr.io>
Date: Tue, 11 Nov 2025 12:41:38 -0500
Subject: [PATCH] refactor(lua): migrate claudecode.nvim configuration to
 built-in config

---
 lua/plugins/astrocore.lua |  8 ++++----
 lua/plugins/claude.lua    | 25 +------------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

diff --git a/lua/plugins/astrocore.lua b/lua/plugins/astrocore.lua
index 7b3b2c2..77e03e9 100644
--- a/lua/plugins/astrocore.lua
+++ b/lua/plugins/astrocore.lua
@@ -510,10 +510,10 @@ return {
         ["<C-j><C-j>"] = { function() terminals.scratch_toggle() end, desc = "Open Scratch Terminal" },
         -- AI/Assistant mappings (Claude Code)
         ["<C-a>"] = { nil, desc = "AI/Claude Code" },
-        ["<C-a><C-a>"] = { function() _G.claude_at_root "ClaudeCode"() end, desc = "Toggle Claude" },
-        ["<C-a>f"] = { function() _G.claude_at_root "ClaudeCodeFocus"() end, desc = "Focus Claude" },
-        ["<C-a>C"] = { function() _G.claude_at_root "ClaudeCode --resume"() end, desc = "Resume Claude" },
-        ["<C-a>c"] = { function() _G.claude_at_root "ClaudeCode --continue"() end, desc = "Continue Claude" },
+        ["<C-a><C-a>"] = { "<cmd>ClaudeCode<cr>", desc = "Toggle Claude" },
+        ["<C-a>f"] = { "<cmd>ClaudeCodeFocus<cr>", desc = "Focus Claude" },
+        ["<C-a>C"] = { "<cmd>ClaudeCode --resume<cr>", desc = "Resume Claude" },
+        ["<C-a>c"] = { "<cmd>ClaudeCode --continue<cr>", desc = "Continue Claude" },
         ["<C-a>m"] = { "<cmd>ClaudeCodeSelectModel<cr>", desc = "Select Claude model" },
         ["<C-a>b"] = { "<cmd>ClaudeCodeAdd %<cr>", desc = "Add current buffer" },
         ["<C-a>y"] = { "<cmd>ClaudeCodeDiffAccept<cr>", desc = "Accept diff" },
diff --git a/lua/plugins/claude.lua b/lua/plugins/claude.lua
index 442aaf2..07d1654 100644
--- a/lua/plugins/claude.lua
+++ b/lua/plugins/claude.lua
@@ -6,30 +6,7 @@
 return {
   "coder/claudecode.nvim",
   dependencies = { "folke/snacks.nvim" },
-  config = function()
-    require("claudecode").setup()
-
-    -- Helper function to get git root and change directory
-    local function ensure_git_root()
-      local git_root = vim.fn.systemlist("git rev-parse --show-toplevel")[1]
-      if git_root and vim.v.shell_error == 0 then vim.api.nvim_set_current_dir(git_root) end
-    end
-
-    -- Wrapper function to run commands at git root
-    _G.claude_at_root = function(cmd)
-      return function()
-        ensure_git_root()
-        vim.cmd(cmd)
-      end
-    end
-
-    -- Create autocommand to ensure we're at git root when opening Claude Code
-    vim.api.nvim_create_autocmd("User", {
-      pattern = "ClaudeCodeOpen",
-      callback = ensure_git_root,
-      desc = "Change to git root when opening Claude Code",
-    })
-  end,
+  config = true,
   -- Filetype-specific keybindings (kept here since they require ft detection)
   keys = {
     {