Skip to content

[LUM-498] Fix inferCategory main-thread hang by caching results and offloading computation #24274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tkheyfets merged 2 commits into from
Apr 8, 2026
Merged

[LUM-498] Fix inferCategory main-thread hang by caching results and offloading computation #24274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
560decc
fix: cache inferCategory results and move computation off main thread…
devin-ai-integration[bot] Apr 8, 2026
115258c
fix: invalidate category cache when skill metadata changes
devin-ai-integration[bot] Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions clients/macos/vellum-assistant/Features/MainWindow/Panels/IdentityPanel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,12 +301,15 @@ struct IdentityPanel: View {
let response = await SkillsClient().fetchSkillsList(includeCatalog: false)
if let response {
let enabled = response.skills.filter { $0.status == "enabled" }
let map = await Task.detached {
var m: [String: SkillCategory] = [:]
m.reserveCapacity(enabled.count)
for skill in enabled {
m[skill.id] = inferCategory(skill)
}
return m
}.value
skills = enabled
var map: [String: SkillCategory] = [:]
map.reserveCapacity(enabled.count)
for skill in enabled {
map[skill.id] = inferCategory(skill)
}
skillCategoryLookup = map
}
}
Expand Down
12 changes: 11 additions & 1 deletion clients/macos/vellum-assistant/Features/MainWindow/Panels/SkillsManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ final class SkillsManager {
/// Cached skill-id -> category map, rebuilt whenever `skills` changes.
/// Use `category(for:)` for O(1) lookups instead of calling `inferCategory` in view bodies.
private(set) var categoryMap: [String: SkillCategory] = [:]
@ObservationIgnored private var categoryFingerprints: [String: String] = [:]
var loadedBodies: [String: String] = [:]
var isLoading = false
var uninstallResult: SkillsStore.UninstallResult?
Expand Down Expand Up @@ -122,11 +123,20 @@ final class SkillsManager {

private func rebuildCategoryMap(from skills: [SkillInfo]) {
var map: [String: SkillCategory] = [:]
var fingerprints: [String: String] = [:]
map.reserveCapacity(skills.count)
fingerprints.reserveCapacity(skills.count)
for skill in skills {
map[skill.id] = inferCategory(skill)
let fp = skill.name + "\0" + skill.description
if let cached = categoryMap[skill.id], categoryFingerprints[skill.id] == fp {
map[skill.id] = cached
} else {
map[skill.id] = inferCategory(skill)
}
fingerprints[skill.id] = fp
}
categoryMap = map
categoryFingerprints = fingerprints
}

// MARK: - Recomputation
Expand Down