Compatibility patch for aw-import-screentime#740
Open
Guracc wants to merge 2 commits intoActivityWatch:masterfrom
Open
Compatibility patch for aw-import-screentime#740Guracc wants to merge 2 commits intoActivityWatch:masterfrom
Guracc wants to merge 2 commits intoActivityWatch:masterfrom
Conversation
- buckets: detect 'aw-import-screentime' as android-compatible buckets - queries: preserve 'title' attribute during android event merging - activity: add post-processing to support iOS attributes (mapping 'title' to 'app' for readability) - visualization: add 'Bundle IDs' view for technical detail while keeping 'Top Apps' human-readable
![ellipsis-dev[bot]](https://avatars.githubusercontent.com/in/64358?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Important
Looks good to me! 👍
Reviewed everything up to d18d09f in 53 seconds. Click for details.
- Reviewed
125lines of code in4files - Skipped
0files when reviewing. - Skipped posting
6draft comments. View those below. - Modify your settings and rules to customize what types of comments Ellipsis leaves. And don't forget to react with 👍 or 👎 to teach Ellipsis.
1. src/components/SelectableVisualization.vue:36
- Draft comment:
New 'Bundle IDs' view uses window.top_titles as its data source. Confirm that reusing top_titles for iOS bundle IDs is intentional. - Reason this comment was not posted:
Confidence changes required:33%<= threshold50%None
2. src/queries.ts:121
- Draft comment:
Updated merge key for Android events now includes 'title'. Verify that this consistently preserves the human‐readable name in all cases. - Reason this comment was not posted:
Confidence changes required:33%<= threshold50%None
3. src/queries.ts:203
- Draft comment:
In appQuery, merging with keys ['app', 'classname', 'title'] ensures iOS titles are retained. Confirm that dropping other fields is acceptable for later processing. - Reason this comment was not posted:
Confidence changes required:33%<= threshold50%None
4. src/stores/activity.ts:321
- Draft comment:
iOS bucket detection is based on 'aw-import-screentime' prefix. Ensure that bucket naming remains consistent across data sources. - Reason this comment was not posted:
Confidence changes required:33%<= threshold50%None
5. src/stores/activity.ts:325
- Draft comment:
Swapping 'app' and 'title' for iOS events and re-aggregating app_events ensures standardized structure. Note that only 'app' and '$category' are retained—verify if additional fields are needed later. - Reason this comment was not posted:
Confidence changes required:33%<= threshold50%None
6. src/stores/buckets.ts:100
- Draft comment:
The bucketsAndroid getter now combines Android and iOS buckets by filtering on prefixes. Ensure that the chosen prefixes ('aw-watcher-android' and 'aw-import-screentime') cover all expected cases. - Reason this comment was not posted:
Confidence changes required:33%<= threshold50%None
Workflow ID: wflow_rj1I21YyKP0WmBzS
You can customize 
Contributor
Greptile SummaryThis PR adds iOS compatibility for ActivityWatch WebUI by supporting data imported via the Key Changes:
Issues Found:
Confidence Score: 3/5
Important Files Changed
Sequence DiagramsequenceDiagram
participant User
participant WebUI
participant BucketsStore
participant ActivityStore
participant QueryEngine
participant Server
User->>WebUI: View Activity Dashboard
WebUI->>BucketsStore: Load buckets
BucketsStore->>Server: getBuckets()
Server-->>BucketsStore: Return all buckets
BucketsStore->>BucketsStore: bucketsAndroid(host)
Note over BucketsStore: Filter 'currentwindow' buckets<br/>starting with 'aw-watcher-android'
Note over BucketsStore: Filter 'app' buckets<br/>starting with 'aw-import-screentime'
BucketsStore->>BucketsStore: Merge Android + iOS buckets
BucketsStore-->>WebUI: Return combined bucket list
WebUI->>ActivityStore: query_android(options)
ActivityStore->>QueryEngine: Generate appQuery
Note over QueryEngine: canonicalEvents merges by<br/>["app", "title"]
Note over QueryEngine: title_events merge by<br/>["app", "classname", "title"]
Note over QueryEngine: app_events merge by ["app"]
ActivityStore->>Server: Execute query
Server-->>ActivityStore: Return aggregated events
alt iOS Bucket Detected
ActivityStore->>ActivityStore: Post-process iOS events
Note over ActivityStore: For each title_event:<br/>1. classname = original app (Bundle ID)<br/>2. app = title (Human Name)<br/>3. title = title (unchanged)
ActivityStore->>ActivityStore: Re-aggregate app_events
Note over ActivityStore: Group modified title_events by app<br/>Sum durations per app<br/>Keep only app and $category
end
ActivityStore-->>WebUI: query_window_completed(data)
WebUI->>WebUI: Render visualizations
Note over WebUI: Top Applications shows<br/>human-readable names
Note over WebUI: Bundle IDs shows<br/>raw bundle identifiers
|
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
| // Clone event to avoid reference issues | ||
| new_app_events_map[app] = { ...e, duration: 0, data: { ...e.data } }; | ||
| // Ensure we only keep the 'app' key for app_events to match standard structure | ||
| new_app_events_map[app].data = { app: app, $category: e.data.$category }; |
Contributor
There was a problem hiding this comment.
logic: Only preserving app and $category in re-aggregated events discards classname and title which may be needed elsewhere
Suggested change
| new_app_events_map[app].data = { app: app, $category: e.data.$category }; | |
| new_app_events_map[app].data = { app: app, classname: e.data.classname, $category: e.data.$category }; |
Prompt To Fix With AI
This is a comment left during a code review.
Path: src/stores/activity.ts
Line: 344:344
Comment:
**logic:** Only preserving `app` and `$category` in re-aggregated events discards `classname` and `title` which may be needed elsewhere
```suggestion
new_app_events_map[app].data = { app: app, classname: e.data.classname, $category: e.data.$category };
```
How can I resolve this? If you propose a fix, please make it concise.
Comment on lines
+329
to
+333
| if (e.data.title) { | ||
| const originalApp = e.data.app; | ||
| e.data.classname = originalApp; // Bundle ID (e.g. com.google.ios.youtube) | ||
| e.data.app = e.data.title; // Human Name (e.g. YouTube) | ||
| } |
Contributor
There was a problem hiding this comment.
logic: Events without title are skipped but still contribute to aggregated durations from server-side query. This creates mismatch between title_events and app_events returned from query vs post-processed versions. Are there iOS events that legitimately don't have a title field, and if so should they be handled differently?
Prompt To Fix With AI
This is a comment left during a code review.
Path: src/stores/activity.ts
Line: 329:333
Comment:
**logic:** Events without `title` are skipped but still contribute to aggregated durations from server-side query. This creates mismatch between `title_events` and `app_events` returned from query vs post-processed versions. Are there iOS events that legitimately don't have a title field, and if so should they be handled differently?
How can I resolve this? If you propose a fix, please make it concise.
Comment on lines
+105
to
+107
| const ios = this.bucketsByType(host, 'app').filter((id: string) => | ||
| id.startsWith('aw-import-screentime') | ||
| ); |
Contributor
There was a problem hiding this comment.
logic: Filtering by generic type 'app' could match unintended buckets. Consider using a more specific filter or adding additional validation.
The PR description mentions these are from aw-import-screentime which should have a specific bucket type. Check actual bucket type from iOS imports to ensure correct filtering. What is the actual bucket type created by aw-import-screentime - is it truly just 'app' or something more specific?
Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!
Prompt To Fix With AI
This is a comment left during a code review.
Path: src/stores/buckets.ts
Line: 105:107
Comment:
**logic:** Filtering by generic type `'app'` could match unintended buckets. Consider using a more specific filter or adding additional validation.
The PR description mentions these are from `aw-import-screentime` which should have a specific bucket type. Check actual bucket type from iOS imports to ensure correct filtering. What is the actual bucket type created by aw-import-screentime - is it truly just 'app' or something more specific?
<sub>Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!</sub>
How can I resolve this? If you propose a fix, please make it concise.
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #740 +/- ##
==========================================
- Coverage 26.30% 25.92% -0.39%
==========================================
Files 29 29
Lines 1684 1709 +25
Branches 288 302 +14
==========================================
Hits 443 443
+ Misses 1219 1203 -16
- Partials 22 63 +41 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
ErikBjare
reviewed
Jan 24, 2026
Member
|
Hi @Guracc thanks for the changes, could you address the AI reviewer comments? Thanks :) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Feature:
I modified the codebase to enable better compatibility out of the box with IOS imports using the aw-import-screentime utility. I also added a new visualization called BundleIDs to view the "app" attribute of the bucket.
Changes
src/stores/buckets.ts
)
Updated
bucketsAndroid
getter to recognize buckets starting with aw-import-screentime.
src/queries.ts
)
Fix: Modified
canonicalEvents
to merge Android events by ["app", "title"] instead of just ["app"].
Reason: Previous logic stripped the title attribute during the initial query, preventing us from accessing the Human Readable Name present in iOS exports.
src/stores/activity.ts
)
Added post-processing in
query_android
.
Detects iOS buckets and maps attributes to align with WebUI expectations:
App Name (
app
): Set to the Human Readable Name (from title).
Bundle ID (classname): Set to the Bundle ID (from original
app
).
Original Title (title): Kept as Human Readable Name.
src/components/SelectableVisualization.vue
)
Enabled top_titles ("Top Window Titles") for Android sources.
New Visualization: Added "Bundle IDs" (top_bundle_ids).
Displays the raw Bundle ID (classname) for technical detail.
Added to the configuration menu (gear icon).
Verification
Import iPhone data.
Top Applications: Should show readable names (e.g., "YouTube") instead of bundle IDs.
Top Window Titles: Should show readable titles.
Bundle IDs: Select this new view to see the underlying com.google.ios.youtube style IDs.
Important
Enhance iOS import compatibility and add Bundle IDs visualization in
SelectableVisualization.vue.bucketsAndroidgetter inbuckets.tsto recognize iOS buckets starting withaw-import-screentime.canonicalEventsinqueries.tsto merge Android events by['app', 'title'].appQueryinqueries.tsto merge events by['app', 'classname', 'title'].query_androidinactivity.tsto swapappandtitlefor iOS buckets.SelectableVisualization.vueto display raw Bundle IDs.top_titlesfor Android sources inSelectableVisualization.vue.This description was created by
for d18d09f. You can customize this summary. It will automatically update as commits are pushed.