claude-dock 1.1.0 → 1.3.0

package/README.md

@@ -1,17 +1,19 @@
 # Claude Dock
 
-A lightweight, expandable terminal dock for macOS built with [Hammerspoon](https://www.hammerspoon.org/). Designed for managing multiple Claude Code terminal sessions.
+A lightweight, expandable terminal dock for macOS built with [Hammerspoon](https://www.hammerspoon.org/). Manage multiple AI coding agent sessions - **Claude Code**, **Amp**, and **Codex**.
 
 ![Claude Dock](https://img.shields.io/badge/macOS-Hammerspoon-blue)
 [![npm version](https://img.shields.io/npm/v/claude-dock.svg)](https://www.npmjs.com/package/claude-dock)
 
 ## Features
 
+- **Multi-agent support** - Works with Claude Code, Sourcegraph Amp, and OpenAI Codex
 - **Expandable dock** - Start with 3 slots, add more with "+" button or hotkey
 - **Terminal management** - Each slot tracks a specific terminal window
-- **Auto-launch Claude** - New terminals automatically run `claude` command
+- **Auto-launch** - New terminals automatically run your configured agent
 - **Custom naming** - Name your terminals for easy identification
-- **Visual status** - See which terminals are active, minimized, or empty
+- **Visual status** - See which terminals are active, minimized, or on other spaces
+- **Notification badges** - Red dot appears when a terminal has activity while unfocused
 - **Quick access** - Click to focus/unminimize terminals
 - **Keyboard shortcuts** - Full hotkey support
 
@@ -61,6 +63,7 @@ System Settings → Privacy & Security → Accessibility → Enable Hammerspoon
 |----------|--------|
 | `Cmd+Option+T` | Toggle dock visibility |
 | `Cmd+Option+N` | Add new slot + launch terminal |
+| `Cmd+Option+M` | Minimize all terminals |
 | `Cmd+Option+R` | Reload configuration |
 | `Option+Click` | Rename a slot |
 
@@ -70,11 +73,12 @@ System Settings → Privacy & Security → Accessibility → Enable Hammerspoon
 |-------|--------|
 | Gray | Empty - click to open new terminal |
 | Green | Active terminal |
-| Blue | Minimized terminal |
+| Blue | Minimized or on other space |
+| Red dot | Terminal has new activity |
 
 ### Click Actions
 
-- **Click empty slot** - Prompts for name, opens terminal, runs `claude`
+- **Click empty slot** - Prompts for name, opens terminal, runs agent
 - **Click active slot** - Focuses that terminal window
 - **Click minimized slot** - Unminimizes and focuses
 - **Click "+" button** - Adds new slot and launches terminal
@@ -82,38 +86,37 @@ System Settings → Privacy & Security → Accessibility → Enable Hammerspoon
 
 ## Configuration
 
-Edit `init.lua` to customize:
+Edit `~/.hammerspoon/init.lua` to customize.
+
+### Changing the Agent
+
+By default, claude-dock launches `claude`. To use a different agent:
 
 ```lua
--- Configuration
-local slotWidth = 140      -- Width of each slot
-local slotHeight = 60      -- Height of each slot
-local gap = 8              -- Gap between slots
-local margin = 10          -- Dock padding
-local bottomOffset = 5     -- Distance from screen bottom
-local slotCount = 3        -- Initial number of slots
+local config = {
+    -- Agent to launch: "claude", "amp", or "codex"
+    agent = "amp",  -- Change to your preferred agent
+    ...
+}
 ```
 
-### Using a Different Terminal
+Supported agents:
+- `"claude"` - [Claude Code](https://claude.ai/code) (default)
+- `"amp"` - [Sourcegraph Amp](https://ampcode.com/)
+- `"codex"` - [OpenAI Codex](https://openai.com/codex/)
 
-To use iTerm instead of Terminal.app, modify the `onSlotClick` function:
+### Other Options
 
 ```lua
--- Change this:
-hs.applescript([[
-    tell application "Terminal"
-        do script "claude"
-        activate
-    end tell
-]])
-
--- To this:
-hs.applescript([[
-    tell application "iTerm"
-        create window with default profile command "claude"
-        activate
-    end tell
-]])
+local config = {
+    agent = "claude",      -- Which AI agent to launch
+    slotWidth = 140,       -- Width of each slot
+    slotHeight = 60,       -- Height of each slot
+    gap = 8,               -- Gap between slots
+    margin = 10,           -- Dock padding
+    bottomOffset = 5,      -- Distance from screen bottom
+    initialSlots = 3,      -- Starting number of slots
+}
 ```
 
 ## Running Tests

package/init.lua

@@ -1,10 +1,12 @@
--- Claude Dock: Terminal dock for managing Claude Code sessions
+-- Claude Dock: Terminal dock for managing AI coding agent sessions (Claude, Amp, Codex)
 -- https://github.com/YOUR_USERNAME/claude-dock
 
 require("hs.ipc")
 
 -- Configuration
 local config = {
+    -- Agent to launch: "claude", "amp", or "codex"
+    agent = "claude",
     slotWidth = 140,
     slotHeight = 60,
     gap = 8,
@@ -13,8 +15,8 @@ local config = {
     addButtonWidth = 40,
     utilityButtonWidth = 28,
     initialSlots = 3,
-    elementsPerSlot = 4,  -- bg, border, title, status
-    baseElements = 6,     -- dock bg + border + help btn + help text + minimize btn + minimize text
+    elementsPerSlot = 7,  -- bg, border, title, status, badge glow outer, badge glow inner, badge
+    baseElements = 12,    -- dock bg + border + 6 tab elements + 4 utility btn elements
     windowCaptureDelay = 0.3,
     windowCaptureRetries = 5,
     colors = {
@@ -32,9 +34,40 @@ local config = {
         minBtnText = { red = 0.6, green = 0.6, blue = 0.9, alpha = 1 },
         helpBtnBg = { red = 0.2, green = 0.18, blue = 0.12, alpha = 1 },
         helpBtnText = { red = 0.9, green = 0.8, blue = 0.5, alpha = 1 },
-    }
+        notificationBadge = { red = 1, green = 0.3, blue = 0.3, alpha = 1 },
+    },
+    notificationBadgeSize = 12,
+    tabHeight = 28,
+    tabWidth = 60,
+}
+
+-- Supported agents (order matters for tab display)
+local agentOrder = { "claude", "amp", "codex" }
+local agents = {
+    claude = {
+        command = "claude",
+        name = "Claude",
+        shortName = "Claude",
+        color = { red = 0.76, green = 0.37, blue = 0.24, alpha = 1 },  -- #C15F3C
+    },
+    amp = {
+        command = "amp",
+        name = "Amp",
+        shortName = "Amp",
+        color = { red = 0.6, green = 0.2, blue = 0.8, alpha = 1 },  -- Purple
+    },
+    codex = {
+        command = "codex",
+        name = "Codex",
+        shortName = "Codex",
+        color = { red = 0.0, green = 0.65, blue = 0.52, alpha = 1 },  -- OpenAI teal #00A67E
+    },
 }
 
+local function getAgent()
+    return agents[config.agent] or agents.claude
+end
+
 -- State
 local slotCount = config.initialSlots
 local slots = {}
@@ -42,6 +75,8 @@ local dock = nil
 local tooltip = nil
 local helpPanel = nil
 local macOSDockAtBottom = false
+local pulseTimer = nil
+local pulsePhase = 0
 
 -- Check macOS dock position
 local function getMacOSDockPosition()
@@ -78,6 +113,10 @@ local function cleanup()
         updateTimer:stop()
         updateTimer = nil
     end
+    if pulseTimer then
+        pulseTimer:stop()
+        pulseTimer = nil
+    end
     if screenWatcher then
         screenWatcher:stop()
         screenWatcher = nil
@@ -100,7 +139,7 @@ cleanup()  -- Clean up any previous instance
 local function initSlots()
     for i = 1, slotCount do
         if not slots[i] then
-            slots[i] = { windowId = nil, customName = nil, pending = false }
+            slots[i] = { windowId = nil, customName = nil, pending = false, hasNotification = false }
         end
     end
 end
@@ -108,14 +147,12 @@ initSlots()
 
 -- Calculate dock dimensions
 local function getDockWidth()
-    -- Left: small utility button (minimize), Right: add button
-    local leftButtonWidth = config.utilityButtonWidth + config.gap
     local rightButtonWidth = config.addButtonWidth
-    return leftButtonWidth + (config.slotWidth * slotCount) + (config.gap * (slotCount - 1)) + config.gap + rightButtonWidth + (config.margin * 2)
+    return (config.slotWidth * slotCount) + (config.gap * (slotCount - 1)) + config.gap + rightButtonWidth + (config.margin * 2)
 end
 
 local function getDockHeight()
-    return config.slotHeight + (config.margin * 2)
+    return config.tabHeight + config.slotHeight + (config.margin * 2)
 end
 
 local function getDockFrame()
@@ -152,6 +189,37 @@ local function getWindowTitle(win)
     return title
 end
 
+-- Find slot index by window ID
+local function findSlotByWindowId(windowId)
+    if not windowId then return nil end
+    for i, slot in ipairs(slots) do
+        if slot.windowId == windowId then
+            return i
+        end
+    end
+    return nil
+end
+
+-- Forward declaration for pulse animation
+local startPulseAnimation
+
+-- Set notification for a slot (only if window is not focused)
+local function setSlotNotification(slotIndex)
+    local slot = slots[slotIndex]
+    if not slot then return end
+
+    local win = getWindow(slot.windowId)
+    if win then
+        local focusedWin = hs.window.focusedWindow()
+        -- Only show notification if window is not currently focused
+        if not focusedWin or focusedWin:id() ~= slot.windowId then
+            slot.hasNotification = true
+            updateSlotDisplay(slotIndex)
+            if startPulseAnimation then startPulseAnimation() end
+        end
+    end
+end
+
 -- Tooltip helpers
 local function showTooltipAt(text, x, y)
     if tooltip then tooltip:delete() end
@@ -187,14 +255,23 @@ local function showButtonTooltip(text, buttonId)
     local tipWidth = 50
     local tipHeight = 24
     local btnX, btnWidth
-
-    if buttonId == "minBtn" or buttonId == "helpBtn" then
-        -- Left side utility buttons
-        btnX = dockFrame.x + config.margin
-        btnWidth = config.utilityButtonWidth
+    local dockWidth = getDockWidth()
+    local utilBtnSize = config.tabHeight - 8
+
+    if buttonId == "minBtn" then
+        -- Top right minimize button
+        local minBtnWidth = 32
+        btnX = dockFrame.x + dockWidth - config.margin - minBtnWidth
+        btnWidth = minBtnWidth
+    elseif buttonId == "helpBtn" then
+        -- Top right help button (left of minimize)
+        local minBtnWidth = 32
+        local helpBtnWidth = 36
+        btnX = dockFrame.x + dockWidth - config.margin - minBtnWidth - 4 - helpBtnWidth
+        btnWidth = helpBtnWidth
     elseif buttonId == "addBtn" then
-        -- Right side add button
-        btnX = dockFrame.x + config.margin + config.utilityButtonWidth + config.gap + (slotCount * config.slotWidth) + (slotCount * config.gap)
+        -- Bottom right add button
+        btnX = dockFrame.x + config.margin + (slotCount * config.slotWidth) + (slotCount * config.gap)
         btnWidth = config.addButtonWidth
     end
 
@@ -349,8 +426,9 @@ local function updateSlotDisplay(slotIndex)
     local title, status, bgColor
     local win = getWindow(slot.windowId)
 
+    local agent = getAgent()
     if win then
-        title = slot.customName or getWindowTitle(win) or "Terminal"
+        title = slot.customName or getWindowTitle(win) or agent.name
         if win:isMinimized() then
             status = "(minimized)"
             bgColor = config.colors.slotMinimized
@@ -358,16 +436,19 @@ local function updateSlotDisplay(slotIndex)
             status = "active"
             bgColor = config.colors.slotActive
         end
+    elseif slot.windowId then
+        -- Window exists but not visible (probably on another space)
+        title = slot.customName or agent.name
+        status = "(other space)"
+        bgColor = config.colors.slotMinimized
     else
-        -- Don't clear customName if we're waiting for a window to spawn
-        if not slot.pending then
-            slot.windowId = nil
-            slot.customName = nil
-            title = "Empty"
-            status = "click to open"
-        else
+        -- No window assigned
+        if slot.pending then
             title = slot.customName or "Opening..."
             status = "launching"
+        else
+            title = "Empty"
+            status = "click to open"
         end
         bgColor = config.colors.slotEmpty
     end
@@ -381,6 +462,28 @@ local function updateSlotDisplay(slotIndex)
     if dock[baseIdx + 3] then
         dock[baseIdx + 3].text = status
     end
+    -- Update notification badge with glow
+    local badgeColor = config.colors.notificationBadge
+    local hidden = { red = 0, green = 0, blue = 0, alpha = 0 }
+
+    -- Outer glow (baseIdx + 4)
+    if dock[baseIdx + 4] then
+        dock[baseIdx + 4].fillColor = slot.hasNotification
+            and { red = badgeColor.red, green = badgeColor.green, blue = badgeColor.blue, alpha = 0.2 }
+            or hidden
+    end
+    -- Inner glow (baseIdx + 5)
+    if dock[baseIdx + 5] then
+        dock[baseIdx + 5].fillColor = slot.hasNotification
+            and { red = badgeColor.red, green = badgeColor.green, blue = badgeColor.blue, alpha = 0.4 }
+            or hidden
+    end
+    -- Main badge (baseIdx + 6)
+    if dock[baseIdx + 6] then
+        dock[baseIdx + 6].fillColor = slot.hasNotification
+            and badgeColor
+            or hidden
+    end
 end
 
 updateAllSlots = function()
@@ -389,6 +492,69 @@ updateAllSlots = function()
     end
 end
 
+-- Pulse animation for notification badges
+local function updatePulse()
+    if not dock then return end
+
+    pulsePhase = pulsePhase + 0.15
+    if pulsePhase > math.pi * 2 then
+        pulsePhase = 0
+    end
+
+    -- Pulsing multiplier: oscillates between 0.5 and 1.0
+    local pulse = 0.75 + 0.25 * math.sin(pulsePhase)
+
+    local badgeColor = config.colors.notificationBadge
+    local hidden = { red = 0, green = 0, blue = 0, alpha = 0 }
+
+    local hasAnyNotification = false
+    for i = 1, slotCount do
+        local slot = slots[i]
+        if slot and slot.hasNotification then
+            hasAnyNotification = true
+            local baseIdx = config.baseElements + 1 + ((i - 1) * config.elementsPerSlot)
+
+            -- Outer glow pulses
+            if dock[baseIdx + 4] then
+                dock[baseIdx + 4].fillColor = {
+                    red = badgeColor.red,
+                    green = badgeColor.green,
+                    blue = badgeColor.blue,
+                    alpha = 0.2 * pulse
+                }
+            end
+            -- Inner glow pulses
+            if dock[baseIdx + 5] then
+                dock[baseIdx + 5].fillColor = {
+                    red = badgeColor.red,
+                    green = badgeColor.green,
+                    blue = badgeColor.blue,
+                    alpha = 0.5 * pulse
+                }
+            end
+        end
+    end
+
+    -- Stop timer if no notifications
+    if not hasAnyNotification and pulseTimer then
+        pulseTimer:stop()
+        pulseTimer = nil
+    end
+end
+
+startPulseAnimation = function()
+    if not pulseTimer then
+        pulseTimer = hs.timer.doEvery(0.05, updatePulse)
+    end
+end
+
+local function stopPulseAnimation()
+    if pulseTimer then
+        pulseTimer:stop()
+        pulseTimer = nil
+    end
+end
+
 -- Rename a slot
 local function renameSlot(slotIndex)
     local slot = slots[slotIndex]
@@ -454,6 +620,9 @@ local function onSlotClick(slotIndex, isOptionClick)
         return
     end
 
+    -- Clear notification when clicked
+    slot.hasNotification = false
+
     local win = getWindow(slot.windowId)
     if win then
         if win:isMinimized() then
@@ -461,10 +630,11 @@ local function onSlotClick(slotIndex, isOptionClick)
         end
         win:focus()
     else
+        local agent = getAgent()
         local button, newName = hs.dialog.textPrompt(
-            "New Claude Terminal",
+            "New " .. agent.name .. " Terminal",
             "Enter a name for this terminal:",
-            "Claude " .. slotIndex,
+            agent.shortName .. " " .. slotIndex,
             "Create", "Cancel"
         )
 
@@ -472,12 +642,12 @@ local function onSlotClick(slotIndex, isOptionClick)
             return
         end
 
-        slot.customName = (newName and newName ~= "") and newName or ("Claude " .. slotIndex)
+        slot.customName = (newName and newName ~= "") and newName or (agent.shortName .. " " .. slotIndex)
         slot.pending = true
 
         hs.applescript([[
             tell application "Terminal"
-                do script "claude"
+                do script "]] .. agent.command .. [["
                 activate
             end tell
         ]])
@@ -491,7 +661,7 @@ end
 -- Add a new slot and launch terminal
 local function addSlot()
     slotCount = slotCount + 1
-    slots[slotCount] = { windowId = nil, customName = nil, pending = false }
+    slots[slotCount] = { windowId = nil, customName = nil, pending = false, hasNotification = false }
 
     if dock then
         dock:delete()
@@ -529,68 +699,109 @@ createDock = function()
         frame = { x = 0, y = 0, w = "100%", h = "100%" },
     })
 
-    -- Utility buttons (left side, stacked: help on top, minimize on bottom)
-    local utilBtnX = config.margin
-    local btnGap = 4
-    local btnHeight = (config.slotHeight - btnGap) / 2
+    -- Agent tabs (top left)
+    local tabY = 6
+    local tabStartX = config.margin
+    for i, agentKey in ipairs(agentOrder) do
+        local agent = agents[agentKey]
+        local tabX = tabStartX + ((i - 1) * (config.tabWidth + 4))
+        local isSelected = (config.agent == agentKey)
+
+        -- Tab background
+        dock:appendElements({
+            type = "rectangle",
+            action = "fill",
+            frame = { x = tabX, y = tabY, w = config.tabWidth, h = config.tabHeight - 8 },
+            roundedRectRadii = { xRadius = 6, yRadius = 6 },
+            fillColor = isSelected and agent.color or { red = 0.15, green = 0.15, blue = 0.15, alpha = 1 },
+            trackMouseUp = true,
+            id = "tab_" .. agentKey,
+        })
 
-    -- Help button (top)
-    local helpBtnY = config.margin
+        -- Tab text
+        dock:appendElements({
+            type = "text",
+            frame = { x = tabX, y = tabY + 2, w = config.tabWidth, h = config.tabHeight - 8 },
+            text = agent.name,
+            textAlignment = "center",
+            textColor = isSelected
+                and { red = 1, green = 1, blue = 1, alpha = 1 }
+                or { red = 0.5, green = 0.5, blue = 0.5, alpha = 1 },
+            textSize = 12,
+            textFont = isSelected and ".AppleSystemUIFontBold" or ".AppleSystemUIFont",
+            trackMouseUp = true,
+            id = "tab_" .. agentKey,
+        })
+    end
+
+    -- Content area starts below tabs
+    local contentY = config.tabHeight
+
+    -- Utility buttons (top right, in tab bar area - same Y as tabs)
+    local utilBtnSize = config.tabHeight - 8
+    local utilBtnY = 6
+    local dockWidth = getDockWidth()
+
+    -- Minimize button (rightmost)
+    local minBtnWidth = 32
+    local minBtnX = dockWidth - config.margin - minBtnWidth
     dock:appendElements({
         type = "rectangle",
         action = "fill",
-        frame = { x = utilBtnX, y = helpBtnY, w = config.utilityButtonWidth, h = btnHeight },
+        frame = { x = minBtnX, y = utilBtnY, w = minBtnWidth, h = utilBtnSize },
         roundedRectRadii = { xRadius = 6, yRadius = 6 },
-        fillColor = config.colors.helpBtnBg,
+        fillColor = config.colors.minBtnBg,
         trackMouseUp = true,
         trackMouseEnterExit = true,
-        id = "helpBtn",
+        id = "minBtn",
     })
     dock:appendElements({
         type = "text",
-        frame = { x = utilBtnX, y = helpBtnY + 4, w = config.utilityButtonWidth, h = btnHeight },
-        text = "?",
+        frame = { x = minBtnX, y = utilBtnY + 2, w = minBtnWidth, h = utilBtnSize },
+        text = "Hide",
         textAlignment = "center",
-        textColor = config.colors.helpBtnText,
-        textSize = 16,
+        textColor = config.colors.minBtnText,
+        textSize = 11,
         textFont = ".AppleSystemUIFontBold",
         trackMouseUp = true,
-        id = "helpBtn",
+        id = "minBtn",
     })
 
-    -- Minimize button (bottom)
-    local minBtnY = config.margin + btnHeight + btnGap
+    -- Help button (left of minimize)
+    local helpBtnWidth = 36
+    local helpBtnX = minBtnX - helpBtnWidth - 4
     dock:appendElements({
         type = "rectangle",
         action = "fill",
-        frame = { x = utilBtnX, y = minBtnY, w = config.utilityButtonWidth, h = btnHeight },
+        frame = { x = helpBtnX, y = utilBtnY, w = helpBtnWidth, h = utilBtnSize },
         roundedRectRadii = { xRadius = 6, yRadius = 6 },
-        fillColor = config.colors.minBtnBg,
+        fillColor = config.colors.helpBtnBg,
         trackMouseUp = true,
         trackMouseEnterExit = true,
-        id = "minBtn",
+        id = "helpBtn",
     })
     dock:appendElements({
         type = "text",
-        frame = { x = utilBtnX, y = minBtnY + 4, w = config.utilityButtonWidth, h = btnHeight },
-        text = "⌄",
+        frame = { x = helpBtnX, y = utilBtnY + 2, w = helpBtnWidth, h = utilBtnSize },
+        text = "Help",
         textAlignment = "center",
-        textColor = config.colors.minBtnText,
-        textSize = 16,
-        textFont = ".AppleSystemUIFont",
+        textColor = config.colors.helpBtnText,
+        textSize = 11,
+        textFont = ".AppleSystemUIFontBold",
         trackMouseUp = true,
-        id = "minBtn",
+        id = "helpBtn",
     })
 
-    -- Slots (offset by utility button)
-    local slotsStartX = config.margin + config.utilityButtonWidth + config.gap
+    -- Slots
+    local slotsStartX = config.margin
+    local slotY = contentY + config.margin
     for i = 1, slotCount do
         local slotX = slotsStartX + ((i - 1) * (config.slotWidth + config.gap))
 
         dock:appendElements({
             type = "rectangle",
             action = "fill",
-            frame = { x = slotX, y = config.margin, w = config.slotWidth, h = config.slotHeight },
+            frame = { x = slotX, y = slotY, w = config.slotWidth, h = config.slotHeight },
             roundedRectRadii = { xRadius = 10, yRadius = 10 },
             fillColor = config.colors.slotEmpty,
             trackMouseUp = true,
@@ -600,7 +811,7 @@ createDock = function()
         dock:appendElements({
             type = "rectangle",
             action = "stroke",
-            frame = { x = slotX, y = config.margin, w = config.slotWidth, h = config.slotHeight },
+            frame = { x = slotX, y = slotY, w = config.slotWidth, h = config.slotHeight },
             roundedRectRadii = { xRadius = 10, yRadius = 10 },
             strokeColor = config.colors.slotBorder,
             strokeWidth = 1,
@@ -608,7 +819,7 @@ createDock = function()
 
         dock:appendElements({
             type = "text",
-            frame = { x = slotX + 6, y = config.margin + 8, w = config.slotWidth - 12, h = 24 },
+            frame = { x = slotX + 6, y = slotY + 8, w = config.slotWidth - 12, h = 24 },
             text = "Empty",
             textAlignment = "center",
             textColor = config.colors.textPrimary,
@@ -618,13 +829,45 @@ createDock = function()
 
         dock:appendElements({
             type = "text",
-            frame = { x = slotX + 6, y = config.margin + 32, w = config.slotWidth - 12, h = 20 },
+            frame = { x = slotX + 6, y = slotY + 32, w = config.slotWidth - 12, h = 20 },
             text = "click to open",
             textAlignment = "center",
             textColor = config.colors.textSecondary,
             textSize = 10,
             textFont = ".AppleSystemUIFont",
         })
+
+        -- Notification badge with glow (top-right corner, true corner position)
+        local badgeSize = config.notificationBadgeSize
+        local badgeCenterX = slotX + config.slotWidth - 4
+        local badgeCenterY = slotY + 4
+
+        -- Outer glow
+        dock:appendElements({
+            type = "circle",
+            action = "fill",
+            center = { x = badgeCenterX, y = badgeCenterY },
+            radius = badgeSize,
+            fillColor = { red = 0, green = 0, blue = 0, alpha = 0 },  -- Hidden by default
+        })
+
+        -- Inner glow
+        dock:appendElements({
+            type = "circle",
+            action = "fill",
+            center = { x = badgeCenterX, y = badgeCenterY },
+            radius = badgeSize * 0.75,
+            fillColor = { red = 0, green = 0, blue = 0, alpha = 0 },  -- Hidden by default
+        })
+
+        -- Main badge
+        dock:appendElements({
+            type = "circle",
+            action = "fill",
+            center = { x = badgeCenterX, y = badgeCenterY },
+            radius = badgeSize / 2,
+            fillColor = { red = 0, green = 0, blue = 0, alpha = 0 },  -- Hidden by default
+        })
     end
 
     -- Add button (right side)
@@ -632,19 +875,19 @@ createDock = function()
     dock:appendElements({
         type = "rectangle",
         action = "fill",
-        frame = { x = addBtnX, y = config.margin, w = config.addButtonWidth, h = config.slotHeight },
+        frame = { x = addBtnX, y = slotY, w = config.addButtonWidth, h = config.slotHeight },
         roundedRectRadii = { xRadius = 10, yRadius = 10 },
-        fillColor = config.colors.addBtnBg,
+        fillColor = { red = 0.95, green = 0.95, blue = 0.95, alpha = 1 },
         trackMouseUp = true,
         trackMouseEnterExit = true,
         id = "addBtn",
     })
     dock:appendElements({
         type = "text",
-        frame = { x = addBtnX, y = config.margin + 13, w = config.addButtonWidth, h = 30 },
+        frame = { x = addBtnX, y = slotY + 13, w = config.addButtonWidth, h = 30 },
         text = "+",
         textAlignment = "center",
-        textColor = config.colors.addBtnText,
+        textColor = { red = 0.3, green = 0.3, blue = 0.3, alpha = 1 },
         textSize = 28,
         textFont = ".AppleSystemUIFont",
         trackMouseUp = true,
@@ -659,6 +902,14 @@ createDock = function()
                 minimizeAllTerminals()
             elseif id == "helpBtn" then
                 showHelpPanel()
+            elseif id and id:match("^tab_") then
+                local agentKey = id:match("^tab_(.+)$")
+                if agentKey and agents[agentKey] then
+                    config.agent = agentKey
+                    -- Recreate dock to update tab visuals
+                    dock:delete()
+                    createDock()
+                end
             elseif id and id:match("^slot") then
                 local idx = tonumber(id:match("%d+"))
                 if idx then
@@ -710,12 +961,65 @@ end
 -- Window event watcher for immediate updates
 windowFilter = hs.window.filter.new("Terminal")
 windowFilter:subscribe({
-    hs.window.filter.windowDestroyed,
     hs.window.filter.windowMinimized,
     hs.window.filter.windowUnminimized,
-    hs.window.filter.windowFocused,
 }, updateAllSlots)
 
+-- Handle window destruction - clear the slot
+windowFilter:subscribe(hs.window.filter.windowDestroyed, function(win, appName, event)
+    -- win may be nil at this point, so we need to check all slots
+    for i, slot in ipairs(slots) do
+        if slot.windowId then
+            local existingWin = getWindow(slot.windowId)
+            if not existingWin then
+                -- Try to verify window is truly gone (not just on another space)
+                -- by checking all Terminal windows
+                local allTerminals = hs.window.filter.new("Terminal"):getWindows()
+                local found = false
+                for _, w in ipairs(allTerminals) do
+                    if w:id() == slot.windowId then
+                        found = true
+                        break
+                    end
+                end
+                if not found then
+                    slot.windowId = nil
+                    slot.customName = nil
+                    slot.hasNotification = false
+                end
+            end
+        end
+    end
+    updateAllSlots()
+end)
+
+-- Clear notification when window is focused
+windowFilter:subscribe(hs.window.filter.windowFocused, function(win)
+    if win then
+        local slotIndex = findSlotByWindowId(win:id())
+        if slotIndex then
+            slots[slotIndex].hasNotification = false
+        end
+    end
+    updateAllSlots()
+end)
+
+-- Watch for window title changes (indicates terminal activity)
+windowFilter:subscribe(hs.window.filter.windowTitleChanged, function(win)
+    if win then
+        local slotIndex = findSlotByWindowId(win:id())
+        if slotIndex then
+            local focusedWin = hs.window.focusedWindow()
+            -- Only show notification if this window isn't focused
+            if not focusedWin or focusedWin:id() ~= win:id() then
+                slots[slotIndex].hasNotification = true
+                updateSlotDisplay(slotIndex)
+                startPulseAnimation()
+            end
+        end
+    end
+end)
+
 -- Periodic refresh as fallback
 updateTimer = hs.timer.doEvery(2, function()
     if dock and dock:isShowing() then
@@ -798,6 +1102,26 @@ if showRepositionedMsg then
     end)
 end
 
+-- Global function to trigger notification on a slot (for testing or external use)
+-- Usage: triggerNotification(1) to trigger on slot 1
+function triggerNotification(slotIndex)
+    if slotIndex and slots[slotIndex] then
+        setSlotNotification(slotIndex)
+        return true
+    end
+    return false
+end
+
+-- Global function to clear notification on a slot
+function clearNotification(slotIndex)
+    if slotIndex and slots[slotIndex] then
+        slots[slotIndex].hasNotification = false
+        updateSlotDisplay(slotIndex)
+        return true
+    end
+    return false
+end
+
 -- ===================
 -- TESTS (run with: hs -c "runTests()")
 -- ===================
@@ -974,6 +1298,78 @@ function runTests()
         assert(type(hideHelpPanel) == "function", "hideHelpPanel should be a function")
     end)
 
+    -- Notification badge tests
+    test("config has notification badge color", function()
+        assert(config.colors.notificationBadge, "notificationBadge color should exist")
+        assert(config.notificationBadgeSize, "notificationBadgeSize should exist")
+    end)
+
+    test("slots have hasNotification field", function()
+        slots = {}
+        slotCount = 2
+        initSlots()
+        assert(slots[1].hasNotification == false, "slot should have hasNotification = false")
+        restore()
+    end)
+
+    test("findSlotByWindowId returns nil for unknown window", function()
+        assertEqual(findSlotByWindowId(999999999), nil)
+    end)
+
+    test("findSlotByWindowId returns nil for nil input", function()
+        assertEqual(findSlotByWindowId(nil), nil)
+    end)
+
+    test("triggerNotification is a function", function()
+        assert(type(triggerNotification) == "function", "triggerNotification should be a function")
+    end)
+
+    test("clearNotification is a function", function()
+        assert(type(clearNotification) == "function", "clearNotification should be a function")
+    end)
+
+    test("triggerNotification returns false for invalid slot", function()
+        assertEqual(triggerNotification(9999), false)
+    end)
+
+    test("clearNotification returns false for invalid slot", function()
+        assertEqual(clearNotification(9999), false)
+    end)
+
+    -- Agent configuration tests
+    test("config has agent field", function()
+        assert(config.agent, "config.agent should exist")
+    end)
+
+    test("agents table has claude, amp, codex", function()
+        assert(agents.claude, "agents.claude should exist")
+        assert(agents.amp, "agents.amp should exist")
+        assert(agents.codex, "agents.codex should exist")
+    end)
+
+    test("each agent has command and name", function()
+        for name, agent in pairs(agents) do
+            assert(agent.command, name .. " should have command")
+            assert(agent.name, name .. " should have name")
+            assert(agent.shortName, name .. " should have shortName")
+        end
+    end)
+
+    test("getAgent returns valid agent", function()
+        local agent = getAgent()
+        assert(agent, "getAgent should return an agent")
+        assert(agent.command, "agent should have command")
+        assert(agent.name, "agent should have name")
+    end)
+
+    test("getAgent falls back to claude for invalid config", function()
+        local originalAgent = config.agent
+        config.agent = "invalid"
+        local agent = getAgent()
+        assertEqual(agent.command, "claude")
+        config.agent = originalAgent
+    end)
+
     print("\n=== Results: " .. passed .. " passed, " .. failed .. " failed ===\n")
     return failed == 0
 end

package/package.json

@@ -1,12 +1,18 @@
 {
   "name": "claude-dock",
-  "version": "1.1.0",
-  "description": "A lightweight terminal dock for macOS to manage Claude Code sessions",
+  "version": "1.3.0",
+  "description": "A lightweight terminal dock for macOS to manage AI coding agent sessions - Claude Code, Amp, and Codex",
   "bin": {
     "claude-dock": "bin/cli.js"
   },
   "keywords": [
     "claude",
+    "claude-code",
+    "amp",
+    "codex",
+    "openai",
+    "sourcegraph",
+    "ai-coding",
     "hammerspoon",
     "macos",
     "terminal",