Skip to content

fix(macos): avoid O(n) hashing of tool output for NSCache key #25048

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
siddseethepalli merged 1 commit into from
Apr 12, 2026
Merged

fix(macos): avoid O(n) hashing of tool output for NSCache key #25048

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 11 additions & 7 deletions clients/macos/vellum-assistant/Features/Chat/AssistantProgressView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,11 @@ private struct StepDetailRow: View {
/// Render-time memoization that stays off SwiftUI-owned state.
private var cachedColoredResult: AttributedString? {
guard let result = toolCall.result, !result.isEmpty else { return nil }
let key = Self.coloredOutputCacheKey(for: result, isError: toolCall.isError)
let key = Self.coloredOutputCacheKey(
toolCallID: toolCall.id,
resultCount: result.utf8.count,
isError: toolCall.isError
)
if let cached = Self.coloredOutputCache.object(forKey: key) {
return cached.value
}
Expand Down Expand Up @@ -947,12 +951,12 @@ private struct StepDetailRow: View {

// MARK: - Helpers

private static func coloredOutputCacheKey(for result: String, isError: Bool) -> NSString {
var hasher = Hasher()
hasher.combine(result)
hasher.combine(result.utf8.count)
hasher.combine(isError)
return "output:\(result.utf8.count):\(hasher.finalize())" as NSString
private static func coloredOutputCacheKey(
toolCallID: String,
resultCount: Int,
isError: Bool
) -> NSString {
return "\(toolCallID)|\(resultCount)|\(isError ? "err" : "ok")" as NSString
Comment thread
siddseethepalli marked this conversation as resolved.
}

private func coloredOutput(_ result: String, isError: Bool) -> AttributedString {
Expand Down