format + lint

Author: marcinjahn

.devcontainer/Dockerfile

@@ -0,0 +1,29 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu
+
+# Install Nix
+RUN apt-get update && apt-get install -y \
+  curl \
+  xz-utils \
+  sudo \
+  && rm -rf /var/lib/apt/lists/*
+
+# Create vscode user if it doesn't exist
+RUN if ! id -u vscode > /dev/null 2>&1; then \
+  useradd -m -s /bin/bash vscode && \
+  echo "vscode ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers; \
+  fi
+
+# Switch to vscode user for Nix installation
+USER vscode
+WORKDIR /home/vscode
+
+# Install Nix in single-user mode
+RUN curl -L https://nixos.org/nix/install | sh -s -- --no-daemon
+
+# Add Nix to PATH and configure for the shell
+RUN echo '. /home/vscode/.nix-profile/etc/profile.d/nix.sh' >> /home/vscode/.bashrc && \
+  mkdir -p /home/vscode/.config/nix && \
+  echo 'experimental-features = nix-command flakes' >> /home/vscode/.config/nix/nix.conf
+
+# Keep container running
+CMD ["sleep", "infinity"]

.devcontainer/devcontainer.json

@@ -0,0 +1,19 @@
+{
+  "name": "claudecode.nvim Development",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/git:1": {}
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "terminal.integrated.defaultProfile.linux": "bash"
+      },
+      "extensions": ["jnoortheen.nix-ide"]
+    }
+  },
+  "postCreateCommand": "bash .devcontainer/post-create.sh",
+  "remoteUser": "vscode"
+}

.devcontainer/post-create.sh

@@ -0,0 +1,31 @@
+#!/bin/bash
+
+# Source Nix environment
+. /home/vscode/.nix-profile/etc/profile.d/nix.sh
+
+# Verify Nix is available
+if ! command -v nix &>/dev/null; then
+  echo "Error: Nix is not installed properly"
+  exit 1
+fi
+
+echo "✅ Nix is installed and available"
+echo ""
+echo "📦 claudecode.nvim Development Container Ready!"
+echo ""
+echo "To enter the development shell with all dependencies, run:"
+echo "  nix develop"
+echo ""
+echo "This will provide:"
+echo "  - Neovim"
+echo "  - Lua and LuaJIT"
+echo "  - busted (test framework)"
+echo "  - luacheck (linter)"
+echo "  - stylua (formatter)"
+echo "  - All other development tools"
+echo ""
+echo "You can also run development commands directly:"
+echo "  - make        # Run full validation (format, lint, test)"
+echo "  - make test   # Run tests"
+echo "  - make check  # Run linter"
+echo "  - make format # Format code"

CLAUDE.md

@@ -362,11 +362,13 @@ When updating the version number for a new release, you must update **ALL** of t
    ```
 
 2. **`scripts/claude_interactive.sh`** - Multiple client version references:
+
    - Line ~52: `"version": "0.2.0"` (handshake)
    - Line ~223: `"version": "0.2.0"` (initialize)
    - Line ~309: `"version": "0.2.0"` (reconnect)
 
 3. **`scripts/lib_claude.sh`** - ClaudeCodeNvim version:
+
    - Line ~120: `"version": "0.2.0"` (init message)
 
 4. **`CHANGELOG.md`** - Add new release section with:

README.md

@@ -260,7 +260,7 @@ For deep technical details, see [ARCHITECTURE.md](./ARCHITECTURE.md).
       provider = "auto", -- "auto", "snacks", "native", "external", or custom provider table
       auto_close = true,
       snacks_win_opts = {}, -- Opts to pass to `Snacks.terminal.open()` - see Floating Window section below
-      
+
       -- Provider-specific options
       provider_opts = {
         external_terminal_cmd = nil, -- Command template for external terminal provider (e.g., "alacritty -e %s")

lua/claudecode/config.lua

@@ -26,8 +26,9 @@ M.defaults = {
     keep_terminal_focus = false, -- If true, moves focus back to terminal after diff opens
   },
   models = {
-    { name = "Claude Opus 4 (Latest)", value = "opus" },
+    { name = "Claude Opus 4.1 (Latest)", value = "opus" },
     { name = "Claude Sonnet 4 (Latest)", value = "sonnet" },
+    { name = "Claude Haiku 3.5 (Latest)", value = "haiku" },
   },
   terminal = nil, -- Will be lazy-loaded to avoid circular dependency
 }

lua/claudecode/diff.lua

@@ -6,10 +6,11 @@ local logger = require("claudecode.logger")
 
 -- Global state management for active diffs
 
-local active_diffs = {}
-local autocmd_group
+---@type ClaudeCodeConfig
 local config
 
+---@type number
+local autocmd_group
 ---Get or create the autocmd group
 local function get_autocmd_group()
   if not autocmd_group then
@@ -112,7 +113,7 @@ local function is_buffer_dirty(file_path)
 end
 
 ---Setup the diff module
----@param user_config table? The configuration passed from init.lua
+---@param user_config ClaudeCodeConfig? The configuration passed from init.lua
 function M.setup(user_config)
   -- Store the configuration for later use
   config = user_config or {}
@@ -336,6 +337,9 @@ function M._open_native_diff(old_file_path, new_file_path, new_file_contents, ta
   }
 end
 
+---@type table<string, table>
+local active_diffs = {}
+
 ---Register diff state for tracking
 ---@param tab_name string Unique identifier for the diff
 ---@param diff_data table Diff state data
@@ -638,7 +642,7 @@ function M._create_diff_view_from_window(target_window, old_file_path, new_buffe
       if terminal_win then
         vim.api.nvim_set_current_win(terminal_win)
       end
-    end, 0)
+    end)
   end
 
   -- Return window information for later storage

lua/claudecode/server/init.lua

@@ -25,7 +25,7 @@ M.state = {
 }
 
 ---Initialize the WebSocket server
----@param config table Configuration options
+---@param config ClaudeCodeConfig Configuration options
 ---@param auth_token string|nil The authentication token for validating connections
 ---@return boolean success Whether server started successfully
 ---@return number|string port_or_error Port number or error message

lua/claudecode/server/tcp.lua

@@ -49,7 +49,7 @@ function M.find_available_port(min_port, max_port)
 end
 
 ---Create and start a TCP server
----@param config table Server configuration
+---@param config ClaudeCodeConfig Server configuration
 ---@param callbacks table Callback functions
 ---@param auth_token string|nil Authentication token for validating connections
 ---@return TCPServer|nil server The server object, or nil on error

lua/claudecode/terminal.lua

@@ -321,6 +321,7 @@ function M.setup(user_term_config, p_terminal_cmd, p_env)
   for k, v in pairs(user_term_config) do
     if k == "terminal_cmd" then
       -- terminal_cmd is handled above, skip
+      break
     elseif k == "provider_opts" then
       -- Handle nested provider options
       if type(v) == "table" then