diff --git a/ui/goose2/justfile b/ui/goose2/justfile
index dad2fb35ef..fe69dbec06 100644
--- a/ui/goose2/justfile
+++ b/ui/goose2/justfile
@@ -71,11 +71,65 @@ test-e2e-all:
 
 # Start the desktop app in dev mode
 dev:
-    pnpm tauri dev
+    #!/usr/bin/env bash
+    set -euo pipefail
+
+    # Derive a stable port from the working directory so the same worktree
+    # always gets the same port. This avoids changing TAURI_CONFIG between
+    # runs, which would invalidate Cargo's build cache and trigger a full
+    # Rust rebuild every time.
+    VITE_PORT=$(python3 -c "import hashlib,os; h=int(hashlib.sha256(os.getcwd().encode()).hexdigest(),16); print(10000 + h % 55000)")
+    export VITE_PORT
+    TAURI_CONFIG="{\"build\":{\"devUrl\":\"http://localhost:${VITE_PORT}\",\"beforeDevCommand\":{\"script\":\"exec ./node_modules/.bin/vite --port ${VITE_PORT} --strictPort\",\"cwd\":\"..\",\"wait\":false}}}"
+
+    # In worktrees, generate a labeled icon so you can tell instances apart
+    if git rev-parse --is-inside-work-tree &>/dev/null; then
+        GIT_DIR=$(git rev-parse --git-dir)
+        if [[ "$GIT_DIR" == *".git/worktrees/"* ]]; then
+            BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+            WORKTREE_LABEL="${BRANCH_NAME##*/}"
+
+            ICON_DIR="$(pwd)/src-tauri/target/dev-icons"
+            mkdir -p "$ICON_DIR"
+            DEV_ICON="$ICON_DIR/icon.icns"
+
+            if swift scripts/generate-dev-icon.swift src-tauri/icons/icon.icns "$DEV_ICON" "$WORKTREE_LABEL"; then
+                echo "🌳 Worktree: ${WORKTREE_LABEL}"
+                TAURI_CONFIG=$(python3 -c "import json,sys; a=json.loads(sys.argv[1]); a['bundle']={'icon':['$DEV_ICON']}; print(json.dumps(a))" "$TAURI_CONFIG")
+            fi
+        fi
+    fi
+
+    pnpm tauri dev --config "$TAURI_CONFIG"
 
 # Start the desktop app with dev config
 dev-debug:
-    pnpm tauri dev --config src-tauri/tauri.dev.conf.json
+    #!/usr/bin/env bash
+    set -euo pipefail
+
+    VITE_PORT=$(python3 -c "import hashlib,os; h=int(hashlib.sha256(os.getcwd().encode()).hexdigest(),16); print(10000 + h % 55000)")
+    export VITE_PORT
+    EXTRA_CONFIG="--config {\"build\":{\"devUrl\":\"http://localhost:${VITE_PORT}\",\"beforeDevCommand\":{\"script\":\"exec ./node_modules/.bin/vite --port ${VITE_PORT} --strictPort\",\"cwd\":\"..\",\"wait\":false}}}"
+
+    # In worktrees, generate a labeled icon so you can tell instances apart
+    if git rev-parse --is-inside-work-tree &>/dev/null; then
+        GIT_DIR=$(git rev-parse --git-dir)
+        if [[ "$GIT_DIR" == *".git/worktrees/"* ]]; then
+            BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+            WORKTREE_LABEL="${BRANCH_NAME##*/}"
+
+            ICON_DIR="$(pwd)/src-tauri/target/dev-icons"
+            mkdir -p "$ICON_DIR"
+            DEV_ICON="$ICON_DIR/icon.icns"
+
+            if swift scripts/generate-dev-icon.swift src-tauri/icons/icon.icns "$DEV_ICON" "$WORKTREE_LABEL"; then
+                echo "🌳 Worktree: ${WORKTREE_LABEL}"
+                EXTRA_CONFIG="$EXTRA_CONFIG --config {\"bundle\":{\"icon\":[\"$DEV_ICON\"]}}"
+            fi
+        fi
+    fi
+
+    pnpm tauri dev --config src-tauri/tauri.dev.conf.json $EXTRA_CONFIG
 
 # Start only the frontend dev server
 dev-frontend:
diff --git a/ui/goose2/scripts/generate-dev-icon.swift b/ui/goose2/scripts/generate-dev-icon.swift
new file mode 100755
index 0000000000..bca8c60b73
--- /dev/null
+++ b/ui/goose2/scripts/generate-dev-icon.swift
@@ -0,0 +1,197 @@
+#!/usr/bin/env swift
+
+import AppKit
+import Foundation
+
+// Generate a dev icon with worktree name badge
+// Usage: generate-dev-icon.swift <input-icns> <output-icns> <label>
+
+guard CommandLine.arguments.count == 4 else {
+    fputs("Usage: \(CommandLine.arguments[0]) <input-icns> <output-icns> <label>\n", stderr)
+    exit(1)
+}
+
+let inputPath = CommandLine.arguments[1]
+let outputPath = CommandLine.arguments[2]
+let label = CommandLine.arguments[3]
+
+// Load the icns file
+guard let iconImage = NSImage(contentsOfFile: inputPath) else {
+    fputs("Failed to load image: \(inputPath)\n", stderr)
+    exit(1)
+}
+
+// Get the largest representation for best quality
+guard let rep = iconImage.representations.max(by: { $0.pixelsWide < $1.pixelsWide }) else {
+    fputs("No image representations found\n", stderr)
+    exit(1)
+}
+
+let size = NSSize(width: rep.pixelsWide, height: rep.pixelsHigh)
+
+// Create a new image with the badge
+let newImage = NSImage(size: size)
+newImage.lockFocus()
+
+// Draw the original icon
+iconImage.draw(in: NSRect(origin: .zero, size: size))
+
+// Configure badge
+let singleLineHeight = size.height * 0.22
+let padding = size.width * 0.03
+let maxBadgeWidth = size.width * 0.9
+
+// Text attributes - calculate font size to fit
+let maxFontSize = singleLineHeight * 0.65
+var fontSize = maxFontSize
+var attributes: [NSAttributedString.Key: Any]
+
+// Helper to wrap text on `-` characters
+func wrapText(_ text: String, maxWidth: CGFloat, attributes: [NSAttributedString.Key: Any]) -> [String] {
+    let singleLineSize = (text as NSString).size(withAttributes: attributes)
+    if singleLineSize.width <= maxWidth {
+        return [text]
+    }
+    
+    // Split on `-` and try to form lines
+    let parts = text.components(separatedBy: "-")
+    if parts.count == 1 {
+        return [text]  // No `-` to wrap on
+    }
+    
+    var lines: [String] = []
+    var currentLine = ""
+    
+    for (index, part) in parts.enumerated() {
+        let separator = index == 0 ? "" : "-"
+        let testLine = currentLine.isEmpty ? part : currentLine + separator + part
+        let testSize = (testLine as NSString).size(withAttributes: attributes)
+        
+        if testSize.width <= maxWidth || currentLine.isEmpty {
+            currentLine = testLine
+        } else {
+            lines.append(currentLine)
+            currentLine = part
+        }
+    }
+    if !currentLine.isEmpty {
+        lines.append(currentLine)
+    }
+    
+    return lines
+}
+
+// Find font size that fits (allowing up to 2 lines)
+var lines: [String] = []
+repeat {
+    attributes = [
+        .font: NSFont.systemFont(ofSize: fontSize, weight: .bold),
+        .foregroundColor: NSColor.white
+    ]
+    lines = wrapText(label, maxWidth: maxBadgeWidth - padding * 4, attributes: attributes)
+    fontSize -= 1
+} while lines.count > 2 && fontSize > 8
+
+// Calculate text dimensions using typographic metrics
+let lineHeight = (lines.first! as NSString).size(withAttributes: attributes).height
+let textHeight = lineHeight * CGFloat(lines.count)
+let maxLineWidth = lines.map { ($0 as NSString).size(withAttributes: attributes).width }.max() ?? 0
+
+// Badge dimensions based on text
+let badgeHeight = textHeight + padding * 2
+let cornerRadius = badgeHeight * 0.2
+let badgeWidth = maxLineWidth + padding * 4
+let badgeX = (size.width - badgeWidth) / 2
+let badgeY = size.height - badgeHeight - padding - size.height * 0.05
+
+// Draw badge background (light blue semi-transparent)
+let badgePath = NSBezierPath(roundedRect: NSRect(x: badgeX, y: badgeY, width: badgeWidth, height: badgeHeight),
+                              xRadius: cornerRadius, yRadius: cornerRadius)
+NSColor(calibratedRed: 0.4, green: 0.7, blue: 1.0, alpha: 0.85).setFill()
+badgePath.fill()
+
+// Draw text centered in badge (multiple lines, bottom to top)
+for (index, line) in lines.reversed().enumerated() {
+    let lineSize = (line as NSString).size(withAttributes: attributes)
+    let textX = badgeX + (badgeWidth - lineSize.width) / 2
+    let textY = badgeY + padding + lineHeight * CGFloat(index)
+    (line as NSString).draw(at: NSPoint(x: textX, y: textY), withAttributes: attributes)
+}
+
+newImage.unlockFocus()
+
+// Convert to icns format
+// First, create PNG data at multiple sizes for icns
+guard let tiffData = newImage.tiffRepresentation,
+      let bitmapRep = NSBitmapImageRep(data: tiffData) else {
+    fputs("Failed to create bitmap representation\n", stderr)
+    exit(1)
+}
+
+// For simplicity, we'll create a PNG and then use iconutil if available,
+// or just save as PNG for the icon (Tauri can use PNG)
+guard let pngData = bitmapRep.representation(using: .png, properties: [:]) else {
+    fputs("Failed to create PNG data\n", stderr)
+    exit(1)
+}
+
+// If output is .icns, we need to create an iconset and use iconutil
+if outputPath.hasSuffix(".icns") {
+    let tempDir = FileManager.default.temporaryDirectory
+    let iconsetPath = tempDir.appendingPathComponent("goose-dev.iconset")
+    
+    // Remove existing iconset if present
+    try? FileManager.default.removeItem(at: iconsetPath)
+    try! FileManager.default.createDirectory(at: iconsetPath, withIntermediateDirectories: true)
+    
+    // Generate all required sizes for iconset
+    let sizes: [(name: String, size: Int)] = [
+        ("icon_16x16", 16),
+        ("icon_16x16@2x", 32),
+        ("icon_32x32", 32),
+        ("icon_32x32@2x", 64),
+        ("icon_128x128", 128),
+        ("icon_128x128@2x", 256),
+        ("icon_256x256", 256),
+        ("icon_256x256@2x", 512),
+        ("icon_512x512", 512),
+        ("icon_512x512@2x", 1024)
+    ]
+    
+    for (name, targetSize) in sizes {
+        let resizedImage = NSImage(size: NSSize(width: targetSize, height: targetSize))
+        resizedImage.lockFocus()
+        NSGraphicsContext.current?.imageInterpolation = .high
+        newImage.draw(in: NSRect(x: 0, y: 0, width: targetSize, height: targetSize))
+        resizedImage.unlockFocus()
+        
+        guard let resizedTiff = resizedImage.tiffRepresentation,
+              let resizedBitmap = NSBitmapImageRep(data: resizedTiff),
+              let resizedPng = resizedBitmap.representation(using: .png, properties: [:]) else {
+            continue
+        }
+        
+        let filePath = iconsetPath.appendingPathComponent("\(name).png")
+        try! resizedPng.write(to: filePath)
+    }
+    
+    // Use iconutil to create icns
+    let process = Process()
+    process.executableURL = URL(fileURLWithPath: "/usr/bin/iconutil")
+    process.arguments = ["-c", "icns", iconsetPath.path, "-o", outputPath]
+    try! process.run()
+    process.waitUntilExit()
+    
+    // Cleanup
+    try? FileManager.default.removeItem(at: iconsetPath)
+    
+    if process.terminationStatus != 0 {
+        fputs("iconutil failed\n", stderr)
+        exit(1)
+    }
+} else {
+    // Just save as PNG
+    try! pngData.write(to: URL(fileURLWithPath: outputPath))
+}
+
+print("Generated: \(outputPath)")
diff --git a/ui/goose2/vite.config.ts b/ui/goose2/vite.config.ts
index defd75fde3..882ecd3f24 100644
--- a/ui/goose2/vite.config.ts
+++ b/ui/goose2/vite.config.ts
@@ -13,14 +13,14 @@ export default defineConfig(async () => ({
   },
   clearScreen: false,
   server: {
-    port: 1520,
+    port: parseInt(process.env.VITE_PORT || "1520", 10),
     strictPort: true,
     host: host || false,
     hmr: host
       ? {
           protocol: "ws",
           host,
-          port: 1521,
+          port: parseInt(process.env.VITE_PORT || "1520", 10) + 1,
         }
       : undefined,
     watch: {