Allow duplicate bundle IDs with different app names

Ariver

2026-06-03 0a7ff41ebc1303f0fc0d6e0f9a61e9d8fe795cce

 Apptag/ContentView.swift

@@ -318,6 +318,7 @@
    var appDragResetToken = 0
    var bubbleDraftNote = ""
    var tagNavigationHoveredGroupName: String? = nil
    var tagNavigationAppDropTargetName: String? = nil
    var tagNavigationLastHoverScrollID: String? = nil
    var tagNavigationLastHoverScrollAt: Date? = nil
}
@@ -730,6 +731,7 @@
        quickSearchErrorMessage = nil
        quickSearchFocusToken &+= 1
        refreshQuickSearchResults()
        refreshApps()
        NotificationCenter.default.post(
            name: .tagLauncherQuickSearchVisibilityChanged,
            object: nil,
@@ -776,7 +778,10 @@

    private func refreshQuickSearchResults() {
        let previousSelection = quickSearchSelectedID
        quickSearchResults = QuickSearchEngine.search(quickSearchQuery, documents: quickSearchDocuments)
        quickSearchResults = QuickSearchEngine.search(
            quickSearchQuery,
            documents: quickSearchDocuments.filter { FileManager.default.fileExists(atPath: $0.app.path.path) }
        )

        if quickSearchResults.isEmpty {
            quickSearchSelectedID = nil
@@ -948,6 +953,7 @@

    private func appKitTagNavigation(orientation: TagNavigationView.Orientation) -> some View {
        let isHorizontal = orientation == .horizontal
        let appDropTargetID = appGridInteraction.tagNavigationAppDropTargetName
        return TagNavigationView(
            items: tagLabels,
            orientation: orientation,
@@ -956,6 +962,8 @@
                : NSEdgeInsets(top: 12, left: 12, bottom: 12, right: 12),
            dragModeActive: tagNavDragModeActive,
            draggingItemID: tagNavDragItem,
            appDragModeActive: appGridInteraction.appDragModeActive,
            appDropTargetID: appDropTargetID,
            onActivate: { tagID in
                activateTagNavigation(tagID)
            },
@@ -965,6 +973,9 @@
            canReorder: { tagID in
                canReorderTag(tagID)
            },
            canAcceptAppDrop: { tagID in
                canAssignDroppedAppToTag(tagID)
            },
            onReorderBegan: { tagID in
                beginTagNavReorder(tagID)
            },
@@ -973,6 +984,12 @@
            },
            onReorderEnded: {
                endTagNavReorder()
            },
            onAppDropHoverChange: { tagID, active in
                handleTagNavigationAppDropHover(tagID, active: active)
            },
            onAppDrop: { path, source, targetTag, copy in
                dropAppOnTagNavigation(path: path, sourceTag: source, targetTag: targetTag, copy: copy)
            }
        )
    }
@@ -1903,6 +1920,13 @@
    }

    private func handleTagNavigationHover(_ id: String, active: Bool) {
        if appGridInteraction.appDragModeActive {
            if !active, appGridInteraction.tagNavigationHoveredGroupName == id {
                appGridInteraction.tagNavigationHoveredGroupName = nil
            }
            return
        }

        guard active else {
            if appGridInteraction.tagNavigationHoveredGroupName == id {
                appGridInteraction.tagNavigationHoveredGroupName = nil
@@ -1913,6 +1937,24 @@
        appGridInteraction.tagNavigationHoveredGroupName = id
        fillColorlessContainer(id)
        scrollToTagFromHover(id)
    }

    private func handleTagNavigationAppDropHover(_ id: String, active: Bool) {
        guard appGridInteraction.appDragModeActive else {
            if appGridInteraction.tagNavigationAppDropTargetName == id {
                appGridInteraction.tagNavigationAppDropTargetName = nil
            }
            return
        }

        guard active, canAssignDroppedAppToTag(id) else {
            if appGridInteraction.tagNavigationAppDropTargetName == id {
                appGridInteraction.tagNavigationAppDropTargetName = nil
            }
            return
        }

        appGridInteraction.tagNavigationAppDropTargetName = id
    }

    private func scrollToTagFromHover(_ id: String) {
@@ -2050,6 +2092,22 @@
        )
        showDropRefresh()
        refreshApps(forceLayoutRefresh: true)
    }

    private func dropAppOnTagNavigation(path: String, sourceTag: String, targetTag: String, copy: Bool) {
        resetTransientDragState()
        guard canAssignDroppedAppToTag(targetTag) else { return }
        guard let app = allApps.first(where: { $0.path.path == path }) else { return }
        guard !appHasTag(app, tagName: targetTag) else { return }
        TagEditor.appendTags([targetTag], to: [path])
        showDropRefresh()
        refreshApps(forceLayoutRefresh: true)
    }

    private func canAssignDroppedAppToTag(_ tagName: String) -> Bool {
        tagColors[tagName] != nil
            && !isAppleBuiltInDropTarget(tagName)
            && !isUncategorizedDropTarget(tagName)
    }

    private func dropAppOutsideGroup(path: String, sourceTag: String, copy: Bool) {
@@ -2263,12 +2321,17 @@
        if active {
            endTagNavReorder()
            clearAppBubbleState()
            appGridInteraction.tagNavigationAppDropTargetName = nil
        }
        appGridInteraction.appDragModeActive = active
        if !active {
            appGridInteraction.tagNavigationAppDropTargetName = nil
        }
        if active {
            DispatchQueue.main.asyncAfter(deadline: .now() + 8) {
                if appGridInteraction.appDragModeActive && !AppDragCoordinator.shared.hasActiveDrag {
                    appGridInteraction.appDragModeActive = false
                    appGridInteraction.tagNavigationAppDropTargetName = nil
                }
            }
        }
@@ -2282,6 +2345,9 @@
        AppDragCoordinator.shared.cancelDrag()
        if appGridInteraction.appDragModeActive {
            appGridInteraction.appDragModeActive = false
        }
        if appGridInteraction.tagNavigationAppDropTargetName != nil {
            appGridInteraction.tagNavigationAppDropTargetName = nil
        }
        if hadAppDragState {
            appGridInteraction.appDragResetToken &+= 1
@@ -2307,7 +2373,7 @@
        }
    }

    func refreshApps(forceLayoutRefresh: Bool = false) {
    func refreshApps(forceLayoutRefresh: Bool = false, useCache: Bool = true) {
        guard !refreshInProgress else {
            if forceLayoutRefresh {
                refreshAgainAfterCurrent = true
@@ -2318,7 +2384,7 @@

        refreshInProgress = true
        DispatchQueue.global(qos: .userInitiated).async {
            let result = AppLibraryController.refresh()
            let result = AppLibraryController.refresh(useCache: useCache)
            DispatchQueue.main.async {
                applyAppLibrarySnapshot(result.snapshot)
                handleSmartStartRunResult(result.smartStartResult)
@@ -2355,6 +2421,20 @@
    ) {
        appGridInteraction.appDragModeActive = false
        endTagNavReorder()
        guard FileManager.default.fileExists(atPath: app.path.path) else {
            AppIndexer.invalidateScanCache()
            refreshApps()
            onFailure?()
            return
        }

        let closeQuickSearchAndOverlayBeforeOpening = closeQuickSearchOnSuccess
            && closeOverlayOnSuccess
            && (quickSearchCloseHidesOverlay || quickSearchOnlySession)
        if closeQuickSearchAndOverlayBeforeOpening {
            closeQuickSearch(hideOverlayIfNeeded: true)
            hideOverlay()
        }
        let configuration = NSWorkspace.OpenConfiguration()
        NSWorkspace.shared.openApplication(at: app.path, configuration: configuration) { _, error in
            DispatchQueue.main.async {
@@ -2366,10 +2446,10 @@
                DispatchQueue.global(qos: .utility).async {
                    TagEditor.recordLauncherOpen(for: app.path.path)
                }
                if closeQuickSearchOnSuccess {
                    closeQuickSearch(hideOverlayIfNeeded: false)
                if closeQuickSearchOnSuccess && !closeQuickSearchAndOverlayBeforeOpening {
                    closeQuickSearch(hideOverlayIfNeeded: closeOverlayOnSuccess)
                }
                if closeOverlayOnSuccess {
                if closeOverlayOnSuccess && !closeQuickSearchAndOverlayBeforeOpening {
                    hideOverlay()
                }
            }