diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua
index bb81b62..728e2d9 100644
--- a/nvim/lua/plugins.lua
+++ b/nvim/lua/plugins.lua
@@ -207,9 +207,11 @@ require("lazy").setup({
 		config = function()
 			vim.g.opencode_opts = {
 				-- Your configuration, if any — see `lua/opencode/config.lua`
-				terminal = {
-					win = {
-						enter = true,
+				provider = {
+					snacks = {
+						win = {
+							enter = true,
+						},
 					},
 				},
 			}
@@ -217,45 +219,26 @@ require("lazy").setup({
 			-- Required for `opts.auto_reload`
 			vim.opt.autoread = true
 
-			-- Recommended keymaps
-			vim.keymap.set("n", "<leader>at", function()
-				require("opencode").toggle()
-			end, { desc = "Toggle" })
-			vim.keymap.set("n", "<leader>aA", function()
-				require("opencode").ask()
-			end, { desc = "Ask" })
-			vim.keymap.set("n", "<leader>aa", function()
-				require("opencode").ask("@cursor: ")
-			end, { desc = "Ask about this" })
-			vim.keymap.set("v", "<leader>aa", function()
-				require("opencode").ask("@selection: ")
-			end, { desc = "Ask about selection" })
-			vim.keymap.set("n", "<leader>a+", function()
-				require("opencode").append_prompt("@buffer")
-			end, { desc = "Add buffer to prompt" })
-			vim.keymap.set("v", "<leader>a+", function()
-				require("opencode").append_prompt("@selection")
-			end, { desc = "Add selection to prompt" })
-			vim.keymap.set("n", "<leader>an", function()
-				require("opencode").command("session_new")
-			end, { desc = "New session" })
-			vim.keymap.set("n", "<leader>ay", function()
-				require("opencode").command("messages_copy")
-			end, { desc = "Copy last response" })
-			vim.keymap.set("n", "<S-C-u>", function()
-				require("opencode").command("messages_half_page_up")
-			end, { desc = "Messages half page up" })
-			vim.keymap.set("n", "<S-C-d>", function()
-				require("opencode").command("messages_half_page_down")
-			end, { desc = "Messages half page down" })
-			vim.keymap.set({ "n", "v" }, "<leader>as", function()
-				require("opencode").select()
-			end, { desc = "Select prompt" })
-
 			-- Toggle with Ctrl + ,
 			vim.keymap.set({ "n", "v", "i", "t" }, "<C-,>", function()
 				require("opencode").toggle()
 			end, { desc = "Toggle" })
+
+			-- Ask inline with <leader>aa
+			vim.keymap.set("n", "<leader>aa", function()
+				require("opencode").ask("@this: ", { submit = true })
+			end, { desc = "Ask about this" })
+			vim.keymap.set("v", "<leader>aa", function()
+				require("opencode").ask("@this: ", { submit = true })
+			end, { desc = "Ask about selection" })
+
+			-- Add to context with <leader>a+
+			vim.keymap.set("n", "<leader>a+", function()
+				require("opencode").prompt("@buffer")
+			end, { desc = "Add buffer to prompt" })
+			vim.keymap.set("v", "<leader>a+", function()
+				require("opencode").prompt("@this")
+			end, { desc = "Add selection to prompt" })
 		end,
 	},
 
@@ -273,7 +256,7 @@ require("lazy").setup({
 	-- File explorer sidebar
 	{
 		"kyazdani42/nvim-tree.lua",
-		commit = "e14989c", -- newer versions break auto-session
+		-- commit = "e14989c", -- newer versions break auto-session
 		dependencies = {
 			"kyazdani42/nvim-web-devicons",
 		},
@@ -289,11 +272,11 @@ require("lazy").setup({
 			view = {
 				signcolumn = "auto",
 				adaptive_size = true,
-				mappings = {
-					list = {
-						{ key = "+", action = "cd" },
-					},
-				},
+				-- mappings = {
+				-- 	list = {
+				-- 		{ key = "+", action = "cd" },
+				-- 	},
+				-- },
 			},
 		},
 		init = function()