[BMMach]

Stacked on #1153, so it needs that merged first. Only the last commit (816765e) is new; I'll rebase the first four away once #1153 lands. Draft until then.

Problem

#1153 merges browser url/$domain into the window events that categorize() sees. But the rule editor's match fields still offer only app and title (CANONICAL_SELECT_KEYS). The only way to use the URL is a rule with blank match fields, and that matches every string field at once. There's no way to write a rule from the editor that matches only the URL or only the domain.

Change

• src/util/classes.ts: add BROWSER_SELECT_KEYS = ['url', '$domain'].
• src/components/CategoryEditModal.vue: offer those keys next to app/title only when the startup probe from feat(queries): enrich window events with browser url/$domain via merge_subwatcher_fields #1153 found merge_subwatcher_fields.
  • In feat: more categorization and support for select_keys #286, ErikBjare asked for a select_keys UI before the default categories use it. This extends that UI to the browser fields.
  • On macOS, aw-watcher-window records url itself for some browsers, so a url rule could match there even on older servers. I didn't special-case that.
• A key already stored on a rule is still shown either way, as before.
• The $domain value is the hostname without a leading www., as computed by split_url_events.

There are no query, server or i18n changes, so query performance is unchanged. Field names render as-is, like app/title today.

Known limitations

• Single-device only. canonicalEvents() merges browser fields only when the caller passes browser buckets.
  • Today that means the single-device Activity view (including the category history that Report's chart also reads) and AI Summary.
  • Report's event list, Trends, Alerts, Graph, the Timeline category row, the category builder and the all-devices view don't pass them. There, a rule scoped only to url/$domain matches nothing, except url on macOS, where aw-watcher-window records it.
  • Passing browser buckets in those views changes query cost and how blank-field rules behave, so I'd rather do it as a separate PR.
• Stored keys on older servers. A rule that already stores url/$domain (for example from an imported preset) still shows them on older servers, where they won't match.
• No browser bucket. The keys are offered whenever the server supports the merge, even without an aw-watcher-web bucket.
• Timeline coloring. The Timeline colors and filters raw bucket events in the browser. Raw window events have no url (except on macOS), and raw web events have no $domain, so $domain rules don't color Timeline rows, and url rules only match browser rows.

Tests

• CategoryEditModal tests check three things: url/$domain are offered only when supportsMergeSubwatcherFields() is true, a stored url stays visible when it isn't, and with the flag on a stored url is listed once.
• The new cases in browserRegexServer.test.node.ts use a minute of Edge, then a minute of Code.exe with the same tab still reported active, and a Code.exe title that a blank-field rule would match. With the merge, a url- or $domain-scoped rule claims only the Edge minute. Without it, everything stays Uncategorized.
• The suite's probe now fails loudly unless the server's error names the missing function, so a broken probe can't turn these cases into no-ops.
• These cases pass against aw-server-rust master (1d101d4) and against Python aw-server with aw-core master (28c3acf). They fail if the scoping or feat(queries): enrich window events with browser url/$domain via merge_subwatcher_fields #1153's merge line is removed.
• make lint, npm run check:locales, npm run typecheck:test and npx jest (with a local server) pass after merging current master.

Out of scope

• The points I raised on feat(queries): enrich window events with browser url/$domain via merge_subwatcher_fields #1153: merge order, incognito tabs, conflict policy and existing blank-field rules.
• src/features/categorization.rst in ActivityWatch/docs still says URLs can't be matched. That's a separate docs PR once this lands.

Refs ActivityWatch/activitywatch#352

🤖 Generated with Claude Code

[greptile-apps]

Confidence Score: 4/5

[Medium impact] The change affects category matching in a bounded set of browser-aware activity views.

The PR appears safe to merge, with a non-blocking startup feedback issue.

Findings

1.  Startup shows a blank page ▶

Summary

Adds url and $domain to the category rule editor when the server supports copying browser fields onto window events.

• Category rules can match browser URLs and domains.

BMMach explicitly acknowledges single-device coverage, stored fields on older servers, offering fields without browser buckets, and Timeline coloring as known limitations. BMMach also leaves merge order, incognito behavior, conflict policy, blank-field rules, and the external documentation update out of scope.

Diagram

%%{init: {'theme': 'neutral'}}%%
flowchart TD
  A[Load settings] --> B[Fetch server info]
  B --> C[Probe browser-field merge support]
  C --> D[Render views]
  D --> E[Offer supported rule fields]
  D --> F[Build activity query]
  F --> G{Supported and browser buckets supplied?}
  G -->|Yes| H[Copy URL and domain onto window events]
  G -->|No| I[Keep window events unchanged]
  H --> J[Apply category rules]
  I --> J

Loading

_{Reviews (1) · Last reviewed commit: "feat(categories): offer url and $domain ..." · Reviewed by Greptile}

[greptile-apps]

Startup shows a blank page

Waiting for getInfo() now hides the entire page, including navigation and the error boundary. If the server stalls after settings load, the info request and capability probe run sequentially and can each take the default 30-second timeout. Users see a blank page for up to another minute.

Keep views gated until the probe finishes, but show a loading message while they wait.