claude-dock 1.0.1 → 1.1.0

package/bin/cli.js

@@ -159,6 +159,11 @@ async function main() {
   log(`  ${colors.dim}⌘⌥T${colors.reset}  Toggle dock`);
   log(`  ${colors.dim}⌘⌥N${colors.reset}  Add new terminal`);
   log(`  ${colors.dim}⌘⌥R${colors.reset}  Reload config`);
+  log(`  ${colors.dim}⌘⌥L${colors.reset}  Move macOS Dock to left`);
+  log(`  ${colors.dim}⌘⌥B${colors.reset}  Move macOS Dock to bottom`);
+  log('');
+  log(`${colors.yellow}Tip:${colors.reset} If your macOS Dock is at the bottom, you'll be prompted to move it.`);
+  log(`  You can change this anytime with ${colors.dim}⌘⌥L${colors.reset} (left) or ${colors.dim}⌘⌥B${colors.reset} (bottom).`);
   log('');
 }
 

package/init.lua

@@ -11,9 +11,10 @@ local config = {
     margin = 10,
     bottomOffset = 5,
     addButtonWidth = 40,
+    utilityButtonWidth = 28,
     initialSlots = 3,
     elementsPerSlot = 4,  -- bg, border, title, status
-    baseElements = 2,     -- dock bg + border
+    baseElements = 6,     -- dock bg + border + help btn + help text + minimize btn + minimize text
     windowCaptureDelay = 0.3,
     windowCaptureRetries = 5,
     colors = {
@@ -27,6 +28,10 @@ local config = {
         textSecondary = { red = 0.5, green = 0.5, blue = 0.5, alpha = 1 },
         addBtnBg = { red = 0.2, green = 0.25, blue = 0.2, alpha = 1 },
         addBtnText = { red = 0.6, green = 0.8, blue = 0.6, alpha = 1 },
+        minBtnBg = { red = 0.18, green = 0.18, blue = 0.25, alpha = 1 },
+        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 },
     }
 }
 
@@ -35,6 +40,28 @@ local slotCount = config.initialSlots
 local slots = {}
 local dock = nil
 local tooltip = nil
+local helpPanel = nil
+local macOSDockAtBottom = false
+
+-- Check macOS dock position
+local function getMacOSDockPosition()
+    local output, status = hs.execute("defaults read com.apple.dock orientation 2>/dev/null")
+    if status and output then
+        output = output:gsub("%s+", "")
+        if output == "left" or output == "right" then
+            return output
+        end
+    end
+    return "bottom"  -- default
+end
+
+-- Get macOS dock size (tile size + magnification consideration)
+local function getMacOSDockHeight()
+    local tileSize = hs.execute("defaults read com.apple.dock tilesize 2>/dev/null")
+    tileSize = tonumber(tileSize) or 48
+    -- Add padding for dock chrome and gaps
+    return tileSize + 20
+end
 
 -- Resource handles (for cleanup on reload)
 local windowFilter = nil
@@ -63,6 +90,10 @@ local function cleanup()
         tooltip:delete()
         tooltip = nil
     end
+    if helpPanel then
+        helpPanel:delete()
+        helpPanel = nil
+    end
 end
 cleanup()  -- Clean up any previous instance
 
@@ -77,7 +108,10 @@ initSlots()
 
 -- Calculate dock dimensions
 local function getDockWidth()
-    return (config.slotWidth * slotCount) + (config.gap * slotCount) + (config.margin * 2) + config.addButtonWidth
+    -- 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)
 end
 
 local function getDockHeight()
@@ -90,9 +124,14 @@ local function getDockFrame()
     local frame = screen:fullFrame()
     local dockWidth = getDockWidth()
     local dockHeight = getDockHeight()
+    local bottomOffset = config.bottomOffset
+    -- Add extra offset if macOS dock is at bottom
+    if macOSDockAtBottom then
+        bottomOffset = bottomOffset + getMacOSDockHeight()
+    end
     return {
         x = (frame.w - dockWidth) / 2,
-        y = frame.h - dockHeight - config.bottomOffset,
+        y = frame.h - dockHeight - bottomOffset,
         w = dockWidth,
         h = dockHeight
     }
@@ -114,18 +153,13 @@ local function getWindowTitle(win)
 end
 
 -- Tooltip helpers
-local function showTooltip(text)
+local function showTooltipAt(text, x, y)
     if tooltip then tooltip:delete() end
-    local dockFrame = getDockFrame()
-    if not dockFrame then return end
 
     local tipWidth = 50
     local tipHeight = 24
-    local addBtnX = dockFrame.x + config.margin + (slotCount * (config.slotWidth + config.gap))
-    local tipX = addBtnX + (config.addButtonWidth - tipWidth) / 2
-    local tipY = dockFrame.y - tipHeight - 5
 
-    tooltip = hs.canvas.new({ x = tipX, y = tipY, w = tipWidth, h = tipHeight })
+    tooltip = hs.canvas.new({ x = x, y = y, w = tipWidth, h = tipHeight })
     tooltip:appendElements({
         type = "rectangle",
         action = "fill",
@@ -146,6 +180,30 @@ local function showTooltip(text)
     tooltip:show()
 end
 
+local function showButtonTooltip(text, buttonId)
+    local dockFrame = getDockFrame()
+    if not dockFrame then return end
+
+    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
+    elseif buttonId == "addBtn" then
+        -- Right side add button
+        btnX = dockFrame.x + config.margin + config.utilityButtonWidth + config.gap + (slotCount * config.slotWidth) + (slotCount * config.gap)
+        btnWidth = config.addButtonWidth
+    end
+
+    local tipX = btnX + (btnWidth - tipWidth) / 2
+    local tipY = dockFrame.y - tipHeight - 5
+
+    showTooltipAt(text, tipX, tipY)
+end
+
 local function hideTooltip()
     if tooltip then
         tooltip:delete()
@@ -153,9 +211,132 @@ local function hideTooltip()
     end
 end
 
+-- Help panel
+local function hideHelpPanel()
+    if helpPanel then
+        helpPanel:delete()
+        helpPanel = nil
+    end
+end
+
+local function showHelpPanel()
+    if helpPanel then
+        hideHelpPanel()
+        return
+    end
+
+    local screen = hs.screen.mainScreen()
+    if not screen then return end
+    local screenFrame = screen:fullFrame()
+
+    local panelWidth = 280
+    local panelHeight = 260
+    local panelX = (screenFrame.w - panelWidth) / 2
+    local panelY = (screenFrame.h - panelHeight) / 2
+
+    helpPanel = hs.canvas.new({ x = panelX, y = panelY, w = panelWidth, h = panelHeight })
+
+    -- Background
+    helpPanel:appendElements({
+        type = "rectangle",
+        action = "fill",
+        roundedRectRadii = { xRadius = 12, yRadius = 12 },
+        fillColor = { red = 0.1, green = 0.1, blue = 0.1, alpha = 0.95 },
+        frame = { x = 0, y = 0, w = "100%", h = "100%" },
+    })
+
+    -- Border
+    helpPanel:appendElements({
+        type = "rectangle",
+        action = "stroke",
+        roundedRectRadii = { xRadius = 12, yRadius = 12 },
+        strokeColor = { red = 1, green = 1, blue = 1, alpha = 0.2 },
+        strokeWidth = 1,
+        frame = { x = 0, y = 0, w = "100%", h = "100%" },
+    })
+
+    -- Title
+    helpPanel:appendElements({
+        type = "text",
+        frame = { x = 0, y = 15, w = panelWidth, h = 24 },
+        text = "Claude Dock Shortcuts",
+        textAlignment = "center",
+        textColor = { red = 1, green = 1, blue = 1, alpha = 1 },
+        textSize = 16,
+        textFont = ".AppleSystemUIFontBold",
+    })
+
+    -- Shortcuts list
+    local shortcuts = {
+        { key = "⌘⌥T", desc = "Toggle dock" },
+        { key = "⌘⌥N", desc = "Add new terminal" },
+        { key = "⌘⌥M", desc = "Minimize all terminals" },
+        { key = "⌘⌥R", desc = "Reload config" },
+        { key = "⌘⌥L", desc = "Move macOS Dock left" },
+        { key = "⌘⌥B", desc = "Move macOS Dock bottom" },
+        { key = "⌥+Click", desc = "Rename slot" },
+    }
+
+    local startY = 50
+    for i, shortcut in ipairs(shortcuts) do
+        local y = startY + ((i - 1) * 24)
+        helpPanel:appendElements({
+            type = "text",
+            frame = { x = 20, y = y, w = 70, h = 20 },
+            text = shortcut.key,
+            textAlignment = "left",
+            textColor = { red = 0.6, green = 0.8, blue = 1, alpha = 1 },
+            textSize = 13,
+            textFont = ".AppleSystemUIFont",
+        })
+        helpPanel:appendElements({
+            type = "text",
+            frame = { x = 95, y = y, w = 170, h = 20 },
+            text = shortcut.desc,
+            textAlignment = "left",
+            textColor = { red = 0.8, green = 0.8, blue = 0.8, alpha = 1 },
+            textSize = 13,
+            textFont = ".AppleSystemUIFont",
+        })
+    end
+
+    -- Close button
+    local closeBtnY = panelHeight - 45
+    helpPanel:appendElements({
+        type = "rectangle",
+        action = "fill",
+        frame = { x = (panelWidth - 80) / 2, y = closeBtnY, w = 80, h = 30 },
+        roundedRectRadii = { xRadius = 6, yRadius = 6 },
+        fillColor = { red = 0.25, green = 0.25, blue = 0.25, alpha = 1 },
+        trackMouseUp = true,
+        id = "closeBtn",
+    })
+    helpPanel:appendElements({
+        type = "text",
+        frame = { x = (panelWidth - 80) / 2, y = closeBtnY + 6, w = 80, h = 20 },
+        text = "Close",
+        textAlignment = "center",
+        textColor = { red = 0.9, green = 0.9, blue = 0.9, alpha = 1 },
+        textSize = 13,
+        textFont = ".AppleSystemUIFont",
+        trackMouseUp = true,
+        id = "closeBtn",
+    })
+
+    helpPanel:mouseCallback(function(_, event, id)
+        if event == "mouseUp" and id == "closeBtn" then
+            hideHelpPanel()
+        end
+    end)
+
+    helpPanel:level(hs.canvas.windowLevels.modalPanel)
+    helpPanel:show()
+end
+
 -- Forward declarations
 local createDock
 local updateAllSlots
+local minimizeAllTerminals
 
 -- Update slot display
 local function updateSlotDisplay(slotIndex)
@@ -348,9 +529,63 @@ createDock = function()
         frame = { x = 0, y = 0, w = "100%", h = "100%" },
     })
 
-    -- Slots
+    -- Utility buttons (left side, stacked: help on top, minimize on bottom)
+    local utilBtnX = config.margin
+    local btnGap = 4
+    local btnHeight = (config.slotHeight - btnGap) / 2
+
+    -- Help button (top)
+    local helpBtnY = config.margin
+    dock:appendElements({
+        type = "rectangle",
+        action = "fill",
+        frame = { x = utilBtnX, y = helpBtnY, w = config.utilityButtonWidth, h = btnHeight },
+        roundedRectRadii = { xRadius = 6, yRadius = 6 },
+        fillColor = config.colors.helpBtnBg,
+        trackMouseUp = true,
+        trackMouseEnterExit = true,
+        id = "helpBtn",
+    })
+    dock:appendElements({
+        type = "text",
+        frame = { x = utilBtnX, y = helpBtnY + 4, w = config.utilityButtonWidth, h = btnHeight },
+        text = "?",
+        textAlignment = "center",
+        textColor = config.colors.helpBtnText,
+        textSize = 16,
+        textFont = ".AppleSystemUIFontBold",
+        trackMouseUp = true,
+        id = "helpBtn",
+    })
+
+    -- Minimize button (bottom)
+    local minBtnY = config.margin + btnHeight + btnGap
+    dock:appendElements({
+        type = "rectangle",
+        action = "fill",
+        frame = { x = utilBtnX, y = minBtnY, w = config.utilityButtonWidth, h = btnHeight },
+        roundedRectRadii = { xRadius = 6, yRadius = 6 },
+        fillColor = config.colors.minBtnBg,
+        trackMouseUp = true,
+        trackMouseEnterExit = true,
+        id = "minBtn",
+    })
+    dock:appendElements({
+        type = "text",
+        frame = { x = utilBtnX, y = minBtnY + 4, w = config.utilityButtonWidth, h = btnHeight },
+        text = "⌄",
+        textAlignment = "center",
+        textColor = config.colors.minBtnText,
+        textSize = 16,
+        textFont = ".AppleSystemUIFont",
+        trackMouseUp = true,
+        id = "minBtn",
+    })
+
+    -- Slots (offset by utility button)
+    local slotsStartX = config.margin + config.utilityButtonWidth + config.gap
     for i = 1, slotCount do
-        local slotX = config.margin + ((i - 1) * (config.slotWidth + config.gap))
+        local slotX = slotsStartX + ((i - 1) * (config.slotWidth + config.gap))
 
         dock:appendElements({
             type = "rectangle",
@@ -392,8 +627,8 @@ createDock = function()
         })
     end
 
-    -- Add button
-    local addBtnX = config.margin + (slotCount * (config.slotWidth + config.gap))
+    -- Add button (right side)
+    local addBtnX = slotsStartX + (slotCount * (config.slotWidth + config.gap))
     dock:appendElements({
         type = "rectangle",
         action = "fill",
@@ -412,12 +647,18 @@ createDock = function()
         textColor = config.colors.addBtnText,
         textSize = 28,
         textFont = ".AppleSystemUIFont",
+        trackMouseUp = true,
+        id = "addBtn",
     })
 
     dock:mouseCallback(function(_, event, id)
         if event == "mouseUp" then
             if id == "addBtn" then
                 addSlot()
+            elseif id == "minBtn" then
+                minimizeAllTerminals()
+            elseif id == "helpBtn" then
+                showHelpPanel()
             elseif id and id:match("^slot") then
                 local idx = tonumber(id:match("%d+"))
                 if idx then
@@ -425,9 +666,15 @@ createDock = function()
                     onSlotClick(idx, mods.alt)
                 end
             end
-        elseif event == "mouseEnter" and id == "addBtn" then
-            showTooltip("⌘⌥N")
-        elseif event == "mouseExit" and id == "addBtn" then
+        elseif event == "mouseEnter" then
+            if id == "addBtn" then
+                showButtonTooltip("⌘⌥N", "addBtn")
+            elseif id == "minBtn" then
+                showButtonTooltip("⌘⌥M", "minBtn")
+            elseif id == "helpBtn" then
+                showButtonTooltip("Help", "helpBtn")
+            end
+        elseif event == "mouseExit" and (id == "addBtn" or id == "minBtn" or id == "helpBtn") then
             hideTooltip()
         end
     end)
@@ -444,6 +691,22 @@ local function toggleDock()
     end
 end
 
+-- Minimize all terminal windows
+minimizeAllTerminals = function()
+    local minimizedCount = 0
+    for _, slot in ipairs(slots) do
+        local win = getWindow(slot.windowId)
+        if win and not win:isMinimized() then
+            win:minimize()
+            minimizedCount = minimizedCount + 1
+        end
+    end
+    if minimizedCount > 0 then
+        hs.alert.show("Minimized " .. minimizedCount .. " terminal" .. (minimizedCount > 1 and "s" or ""))
+    end
+    updateAllSlots()
+end
+
 -- Window event watcher for immediate updates
 windowFilter = hs.window.filter.new("Terminal")
 windowFilter:subscribe({
@@ -471,15 +734,69 @@ screenWatcher = hs.screen.watcher.new(function()
 end)
 screenWatcher:start()
 
+-- Move macOS dock position
+local function moveMacOSDockLeft()
+    hs.execute("defaults write com.apple.dock orientation left && killall Dock")
+    macOSDockAtBottom = false
+    hs.alert.show("macOS Dock moved to left")
+    -- Reposition Claude Dock
+    if dock then
+        local frame = getDockFrame()
+        if frame then dock:frame(frame) end
+    end
+end
+
+local function moveMacOSDockBottom()
+    hs.execute("defaults write com.apple.dock orientation bottom && killall Dock")
+    macOSDockAtBottom = true
+    hs.alert.show("macOS Dock moved to bottom")
+    -- Reposition Claude Dock
+    if dock then
+        local frame = getDockFrame()
+        if frame then dock:frame(frame) end
+    end
+end
+
+-- Check macOS dock and prompt user if at bottom
+-- Returns true if user chose to keep dock at bottom
+local function checkMacOSDockOnStartup()
+    local position = getMacOSDockPosition()
+    if position == "bottom" then
+        local button = hs.dialog.blockAlert(
+            "macOS Dock Position",
+            "Your macOS Dock is at the bottom of the screen, which may overlap with Claude Dock.\n\nWould you like to move it to the left side?",
+            "Move to Left",
+            "Keep at Bottom"
+        )
+        if button == "Move to Left" then
+            moveMacOSDockLeft()
+            return false
+        else
+            macOSDockAtBottom = true
+            return true
+        end
+    end
+    return false
+end
+
 -- Initialize
+local showRepositionedMsg = checkMacOSDockOnStartup()
 createDock()
 
 -- Hotkeys
 hs.hotkey.bind({"cmd", "alt"}, "T", toggleDock)
 hs.hotkey.bind({"cmd", "alt"}, "N", addSlot)
+hs.hotkey.bind({"cmd", "alt"}, "M", minimizeAllTerminals)
 hs.hotkey.bind({"cmd", "alt"}, "R", hs.reload)
+hs.hotkey.bind({"cmd", "alt"}, "L", moveMacOSDockLeft)
+hs.hotkey.bind({"cmd", "alt"}, "B", moveMacOSDockBottom)
 
 hs.alert.show("Claude Dock Ready")
+if showRepositionedMsg then
+    hs.timer.doAfter(1.5, function()
+        hs.alert.show("Positioned above macOS Dock")
+    end)
+end
 
 -- ===================
 -- TESTS (run with: hs -c "runTests()")
@@ -487,7 +804,11 @@ hs.alert.show("Claude Dock Ready")
 
 function runTests()
     local passed, failed = 0, 0
-    local savedSlotCount, savedSlots = slotCount, slots
+    local savedSlotCount = slotCount
+    local savedSlots = {}
+    for i, s in ipairs(slots) do
+        savedSlots[i] = { windowId = s.windowId, customName = s.customName, pending = s.pending }
+    end
 
     local function test(name, fn)
         local ok, err = pcall(fn)
@@ -507,7 +828,11 @@ function runTests()
     end
 
     local function restore()
-        slotCount, slots = savedSlotCount, savedSlots
+        slotCount = savedSlotCount
+        slots = {}
+        for i, s in ipairs(savedSlots) do
+            slots[i] = { windowId = s.windowId, customName = s.customName, pending = s.pending }
+        end
     end
 
     print("\n=== Claude Dock Tests ===\n")
@@ -598,6 +923,57 @@ function runTests()
         assert(frame.x and frame.y and frame.w and frame.h, "frame should have x,y,w,h")
     end)
 
+    test("minimizeAllTerminals is a function", function()
+        assert(type(minimizeAllTerminals) == "function", "minimizeAllTerminals should be a function")
+    end)
+
+    test("minimizeAllTerminals handles empty slots", function()
+        slots = {{ windowId = nil }, { windowId = nil }}
+        slotCount = 2
+        local ok = pcall(minimizeAllTerminals)
+        restore()
+        assert(ok, "should not error with empty slots")
+    end)
+
+    test("minimizeAllTerminals handles invalid windowIds", function()
+        slots = {{ windowId = 999999999 }, { windowId = 888888888 }}
+        slotCount = 2
+        local ok = pcall(minimizeAllTerminals)
+        restore()
+        assert(ok, "should not error with invalid windowIds")
+    end)
+
+    test("moveMacOSDockLeft is a function", function()
+        assert(type(moveMacOSDockLeft) == "function", "moveMacOSDockLeft should be a function")
+    end)
+
+    test("moveMacOSDockBottom is a function", function()
+        assert(type(moveMacOSDockBottom) == "function", "moveMacOSDockBottom should be a function")
+    end)
+
+    test("getMacOSDockPosition returns valid position", function()
+        local pos = getMacOSDockPosition()
+        assert(pos == "left" or pos == "right" or pos == "bottom", "position should be left, right, or bottom")
+    end)
+
+    test("getMacOSDockHeight returns number", function()
+        local height = getMacOSDockHeight()
+        assert(type(height) == "number", "height should be a number")
+        assert(height > 0, "height should be positive")
+    end)
+
+    test("checkMacOSDockOnStartup is a function", function()
+        assert(type(checkMacOSDockOnStartup) == "function", "checkMacOSDockOnStartup should be a function")
+    end)
+
+    test("showHelpPanel is a function", function()
+        assert(type(showHelpPanel) == "function", "showHelpPanel should be a function")
+    end)
+
+    test("hideHelpPanel is a function", function()
+        assert(type(hideHelpPanel) == "function", "hideHelpPanel should be a function")
+    end)
+
     print("\n=== Results: " .. passed .. " passed, " .. failed .. " failed ===\n")
     return failed == 0
 end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "claude-dock",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "A lightweight terminal dock for macOS to manage Claude Code sessions",
   "bin": {
     "claude-dock": "bin/cli.js"