Skip to content

Protect assistant uploads with Rewind exclusions #7191

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

Open
kodjima33 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Protect assistant uploads with Rewind exclusions #7191

Show file tree
Hide file tree
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
6 changes: 4 additions & 2 deletions desktop/Desktop/Sources/ProactiveAssistants/Assistants/Focus/FocusAssistantSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,11 @@ class FocusAssistantSettings {
}
}

/// Check if an app is excluded (built-in or user-added)
/// Check if an app is excluded (Rewind privacy, built-in, or user-added)
func isAppExcluded(_ appName: String) -> Bool {
TaskAssistantSettings.builtInExcludedApps.contains(appName) || excludedApps.contains(appName)
RewindSettings.shared.isAppExcluded(appName)
|| TaskAssistantSettings.builtInExcludedApps.contains(appName)
|| excludedApps.contains(appName)
}

/// Add an app to the exclusion list
Expand Down
6 changes: 4 additions & 2 deletions ...top/Desktop/Sources/ProactiveAssistants/Assistants/Insight/InsightAssistantSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,11 @@ class InsightAssistantSettings {
}
}

/// Check if an app is excluded from insight extraction (built-in list + user's custom list)
/// Check if an app is excluded from insight extraction (Rewind privacy, built-in list, or user's custom list)
func isAppExcluded(_ appName: String) -> Bool {
TaskAssistantSettings.builtInExcludedApps.contains(appName) || excludedApps.contains(appName)
RewindSettings.shared.isAppExcluded(appName)
|| TaskAssistantSettings.builtInExcludedApps.contains(appName)
|| excludedApps.contains(appName)
}

/// Add an app to the insight extraction exclusion list
Expand Down
6 changes: 4 additions & 2 deletions ...top/Sources/ProactiveAssistants/Assistants/MemoryExtraction/MemoryAssistantSettings.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,9 +245,11 @@ class MemoryAssistantSettings {
}
}

/// Check if an app is excluded from memory extraction (built-in list + user's custom list)
/// Check if an app is excluded from memory extraction (Rewind privacy, built-in list, or user's custom list)
func isAppExcluded(_ appName: String) -> Bool {
TaskAssistantSettings.builtInExcludedApps.contains(appName) || excludedApps.contains(appName)
RewindSettings.shared.isAppExcluded(appName)
|| TaskAssistantSettings.builtInExcludedApps.contains(appName)
|| excludedApps.contains(appName)
}

/// Add an app to the memory extraction exclusion list
Expand Down
34 changes: 19 additions & 15 deletions desktop/Desktop/Sources/ProactiveAssistants/ProactiveAssistantsPlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,14 +788,16 @@ public class ProactiveAssistantsPlugin: NSObject {
captureTime: captureTime
)

// Always track the frame for context switch detection (even during delay)
AssistantCoordinator.shared.trackFrame(frame)

if !isInDelayPeriod {
distributeFrameIfChanged(frame)
} else {
// During delay, still distribute to assistants that need it (e.g. refocus detection)
AssistantCoordinator.shared.distributeFrameDuringDelay(frame)
if !isRewindExcluded {
// Track and distribute only frames that pass the shared screen privacy gate.
AssistantCoordinator.shared.trackFrame(frame)

if !isInDelayPeriod {
distributeFrameIfChanged(frame)
} else {
// During delay, still distribute to assistants that need it (e.g. refocus detection)
AssistantCoordinator.shared.distributeFrameDuringDelay(frame)
}
}
Comment on lines +791 to 801
Copy link
Copy Markdown
Contributor

@greptile-apps greptile-apps Bot May 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P1 Stale departingFrame when leaving an excluded app

checkContextSwitch is called unconditionally (line 706) and reads lastTrackedFrame as the departing frame before calling trackFrame. Because trackFrame is now gated on !isRewindExcluded, lastTrackedFrame is never updated while the user is in an excluded app. When the user later switches away from that excluded app, onContextSwitch fires with a departingFrame holding a frame from before they entered the excluded app — potentially minutes stale. Assistants that rely on departingFrame to represent "what the user was just doing" (e.g. memory/focus extraction on context leave) will act on incorrect data. The intent in the comment at line 704 ("departing frame is from the previous context") is broken for excluded apps. Clearing lastTrackedFrame to nil inside AssistantCoordinator when the excluded gate is hit, or passing nil explicitly when isRewindExcluded, would fix this.

}

Expand Down Expand Up @@ -856,14 +858,16 @@ public class ProactiveAssistantsPlugin: NSObject {
frameNumber: frameCount
)

// Always track the frame for context switch detection (even during delay)
AssistantCoordinator.shared.trackFrame(frame)
if !isRewindExcluded {
// Track and distribute only frames that pass the shared screen privacy gate.
AssistantCoordinator.shared.trackFrame(frame)

if !isInDelayPeriod {
distributeFrameIfChanged(frame)
} else {
// During delay, still distribute to assistants that need it (e.g. refocus detection)
AssistantCoordinator.shared.distributeFrameDuringDelay(frame)
if !isInDelayPeriod {
distributeFrameIfChanged(frame)
} else {
// During delay, still distribute to assistants that need it (e.g. refocus detection)
AssistantCoordinator.shared.distributeFrameDuringDelay(frame)
}
}

if !isRewindExcluded {
Expand Down
Loading