chore: update watcher starting

Author: Darius Nguyen

README.md

@@ -87,22 +87,48 @@ cd claude-code-nvim
 
 ## 🎯 Quick Start
 
+### 🚀 **Method 1: Automatic (Recommended)**
+1. **Open Neovim** in your project directory
+2. **Press `<leader>Cs`** or run `:ClaudeCodeStart`
+3. **Done!** The plugin will guide you if the watcher isn't running
+
+### 🛠️ **Method 2: Manual Control**
 1. **Start the file watcher:**
    ```bash
+   # In your project directory
    claude-code-watch
    ```
-
-2. **In Neovim, connect to the watcher:**
-   ```vim
+   
+2. **In Neovim, connect:**
+   ```bash
+   # Press <leader>Cs or run:
    :ClaudeCodeStart
    ```
 
-3. **Use Claude Code as normal** - changes will appear instantly in Neovim!
+3. **Use Claude Code as normal** - changes appear instantly in Neovim!
 
-4. **Review and accept/reject changes:**
-   ```vim
-   :ClaudeCodeReview
-   ```
+### 📋 **Common Commands**
+- `<leader>Cr` - Review pending changes
+- `<leader>Ca` - Accept all changes  
+- `<leader>Ct` - Check connection status
+- `<leader>ww` - Quick start (alternative binding)
+
+### 🔧 **Auto-start Options**
+
+**Option A: System Service (Set-and-forget)**
+```bash
+# Enable auto-start on login
+systemctl --user enable claude-code-watcher
+systemctl --user start claude-code-watcher
+```
+
+**Option B: Plugin Auto-start**
+```lua
+require("claude-code-nvim").setup({
+  auto_start_watcher = true,  -- Plugin tries to start watcher
+  auto_start = true,          -- Auto-connect when Neovim opens
+})
+```
 
 ## 📋 Commands
 

install.sh

@@ -159,13 +159,52 @@ fi
 echo ""
 echo "Creating helper scripts..."
 
-# Start script
+# Create start script in user's PATH
+mkdir -p "$HOME/.local/bin"
 cat > "$HOME/.local/bin/claude-code-watch" << EOF
 #!/bin/bash
-exec "$WATCHER_INSTALL_DIR/venv/bin/python" "$WATCHER_INSTALL_DIR/watcher.py"
+# Claude Code + Neovim Integration File Watcher
+# This script starts the file watcher service that monitors Claude Code changes
+
+WATCHER_DIR="$WATCHER_INSTALL_DIR"
+PYTHON_BIN="\$WATCHER_DIR/venv/bin/python"
+WATCHER_SCRIPT="\$WATCHER_DIR/watcher.py"
+
+if [ ! -f "\$PYTHON_BIN" ]; then
+    echo "❌ Error: Python virtual environment not found at \$PYTHON_BIN"
+    echo "Please run the installation script again: ./install.sh"
+    exit 1
+fi
+
+if [ ! -f "\$WATCHER_SCRIPT" ]; then
+    echo "❌ Error: Watcher script not found at \$WATCHER_SCRIPT"
+    echo "Please run the installation script again: ./install.sh"
+    exit 1
+fi
+
+echo "🚀 Starting Claude Code file watcher..."
+echo "📁 Watching: \$(pwd)"
+echo "🔌 Socket: /tmp/claude-code-nvim.sock"
+echo ""
+echo "💡 In Neovim, use :ClaudeCodeStart to connect"
+echo "   Or press <leader>Cs to start the connection"
+echo ""
+echo "Press Ctrl+C to stop the watcher"
+echo ""
+
+exec "\$PYTHON_BIN" "\$WATCHER_SCRIPT"
 EOF
 chmod +x "$HOME/.local/bin/claude-code-watch"
 
+# Also create a desktop shortcut script
+cat > "$HOME/.local/bin/claude-code-watch-here" << EOF
+#!/bin/bash
+# Start Claude Code watcher in current directory
+cd "\$(pwd)"
+claude-code-watch
+EOF
+chmod +x "$HOME/.local/bin/claude-code-watch-here"
+
 # Systemd service (Linux)
 if [ "$(uname)" = "Linux" ] && command -v systemctl &> /dev/null; then
     SERVICE_FILE="$HOME/.config/systemd/user/claude-code-watcher.service"

nvim-plugin/lua/claude-code-nvim/config.lua

@@ -4,6 +4,7 @@ local defaults = {
     -- Connection settings
     socket_path = '/tmp/claude-code-nvim.sock',
     auto_start = true,
+    auto_start_watcher = false,  -- Try to start watcher automatically
     auto_reconnect = true,
     reconnect_delay = 5000,  -- ms
 

nvim-plugin/lua/claude-code-nvim/init.lua

@@ -44,17 +44,45 @@ function M.start()
         return
     end
 
+    -- Check if watcher might be startable
+    local socket_exists = vim.fn.filereadable(M.state.config.socket_path) == 1
+    if not socket_exists and M.state.config.auto_start_watcher then
+        M._try_start_watcher()
+    end
+    
     ipc.connect(function(success)
         if success then
             M.state.connected = true
             ui.update_statusline("connected")
-            vim.notify("Connected to Claude Code watcher", vim.log.levels.INFO)
-        else
-            vim.notify("Failed to connect to Claude Code watcher", vim.log.levels.ERROR)
+            vim.notify("✅ Connected to Claude Code watcher", vim.log.levels.INFO, { title = "Claude Code" })
         end
     end)
 end
 
+-- Try to start the watcher automatically
+function M._try_start_watcher()
+    vim.notify("🚀 Attempting to start Claude Code watcher...", vim.log.levels.INFO, { title = "Claude Code" })
+    
+    -- Try to start using the installed command
+    local handle = vim.fn.jobstart("claude-code-watch", {
+        detach = true,
+        on_exit = function(_, code)
+            if code ~= 0 then
+                vim.schedule(function()
+                    vim.notify("Failed to auto-start watcher. Please run 'claude-code-watch' manually.", vim.log.levels.WARN)
+                end)
+            end
+        end
+    })
+    
+    if handle > 0 then
+        -- Give it a moment to start
+        vim.defer_fn(function()
+            vim.notify("Watcher started! Connecting...", vim.log.levels.INFO)
+        end, 1000)
+    end
+end
+
 function M.stop()
     if not M.state.connected then
         vim.notify("Not connected to Claude Code watcher", vim.log.levels.WARN)

nvim-plugin/lua/claude-code-nvim/ipc.lua

@@ -18,7 +18,15 @@ function M.connect(callback)
     socket:connect(socket_path, function(err)
         if err then
             vim.schedule(function()
-                vim.notify("Failed to connect: " .. err, vim.log.levels.ERROR)
+                -- Show helpful error message
+                local error_msg = "❌ Failed to connect to Claude Code watcher!\n\n" ..
+                                "🔧 To fix this:\n" ..
+                "   1. Start the watcher: claude-code-watch\n" ..
+                "   2. Or run: systemctl --user start claude-code-watcher\n" ..
+                "   3. Then try :ClaudeCodeStart again\n\n" ..
+                "💡 Tip: Run 'claude-code-watch' in your terminal first!"
+                
+                vim.notify(error_msg, vim.log.levels.WARN, { title = "Claude Code" })
                 if callback then callback(false) end
             end)
             return