Skip to content

build(deps): bump aw-watcher-window to fix macOS startup crash - #1554

Merged
ErikBjare merged 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:bump/aw-watcher-window-macos-startup-fix
Nov 6, 2026
Merged

ErikBjare merged 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:bump/aw-watcher-window-macos-startup-fix

Conversation

@TimeToBuildBob

Copy link
Copy Markdown
Contributor

Bump the aw-watcher-window submodule so a v0.14.2 tag from master does not ship a macOS window watcher that crashes on start.

The bug

10638b2 (#168) is one commit past the regression introduced by ActivityWatch/aw-watcher-window#162. #162 declares heartbeatSender after the Swift helper's top-level start() / RunLoop.main.run(), so the first heartbeat reaches an uninitialized sender and the helper exits 139 (SIGSEGV in HeartbeatSender.enqueue).

Reported by @andreivince on #162 on 2026-10-25 and confirmed against master the same day. v0.14.1 pins c8814e4978 (pre-#162) and is unaffected.

The fix

Both candidate repairs merged upstream on 2026-11-04:

New pin: 12000f58d16b8fc1376af42755c688b3d7157280 (aw-watcher-window master).

Verification

  • gh api repos/ActivityWatch/aw-watcher-window/compare/86c5203...12000f58 → status: ahead, ahead_by: 2, behind_by: 0 — Log as AFK when suspending computer #172 is contained
  • git merge-base --is-ancestor 86c5203 HEAD in the submodule → true
  • git merge-base --is-ancestor 10638b2 HEAD → true (the bump is a fast-forward of the current pin)
  • git diff is exactly one gitlink line

This is a plain Python-watcher submodule bump, so the aw-tauri Cargo.lock ordering rule (which applies to aw-server-rust) does not apply.

Not done here

No macOS build or runtime check — the crash needs a macOS runner and a real window-tracking session, neither of which was exercised. The ancestry and fast-forward checks above are what establish that the pinned tree contains the reviewed fix.

Release note implication: once this lands, the v0.14.2 notes can drop the macOS startup-crash caveat.

Refs ActivityWatch/aw-watcher-window#172, ActivityWatch/aw-watcher-window#146.

The pinned aw-watcher-window (10638b2, ActivityWatch#168) is one commit past the
regression introduced by ActivityWatch/aw-watcher-window#162: the Swift
helper declares `heartbeatSender` after the top-level `start()` /
`RunLoop.main.run()`, so the first heartbeat hits an uninitialized sender
and the helper exits 139 (SIGSEGV in HeartbeatSender.enqueue).

Both candidate repairs merged on 2026-11-04:

- ActivityWatch/aw-watcher-window#172 (86c5203) - move startup to the end
  of macos.swift
- ActivityWatch/aw-watcher-window#146 (12000f5) - keep foreground tracking
  when the browser context fails; fixes the same ordering

12000f5 is aw-watcher-window master, contains 86c5203 (compare: ahead 2,
behind 0), and is a fast-forward of the current pin. v0.14.1 pins
c8814e4978 (pre-ActivityWatch#162) and is unaffected.

A v0.14.2 tag at the current pin ships a macOS window watcher that crashes
on start, so this needs to land before the tag.

Git-Session-Id: 91c15f3b-345b-4a65-8679-c98b93dddbac
@greptile-apps

greptile-apps Bot commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor

RetriggerView in GreptileConfidence Score: 5/5

[Medium impact] No blocking issue was established in the supplied submodule update.

Summary

Updates aw-watcher-window from 10638b2 to 12000f58 to include the upstream macOS startup fix.

  • The bundled window watcher starts without crashing on macOS.

Reviews (1) · Last reviewed commit: "build(deps): bump aw-watcher-window to f..." · Reviewed by Greptile

@TimeToBuildBob

TimeToBuildBob commented Nov 4, 2026 •

Copy link
Copy Markdown
Contributor Author

🤖 AI code review

Not reviewed

Confidence N/A

Not scored — this diff moves a submodule pointer and contains no source to assess. Treat it as not reviewed, not as approved.

ℹ️ Submodule pointer change only — not reviewed.

This diff moves a submodule SHA and contains no source changes, so there is nothing here for me to assess. Whether the bump is safe depends on the submodule's commit range, which this diff does not include. Treat this as not reviewed, not as approved.

Reviewed 6a8d222377bd · panel: codex:gpt-6.1-sol · subscription engine · 9s · about this reviewer

Maintainer commands

@TimeToBuildBob review (own line) — fresh review · @TimeToBuildBob fix — a worker acts on the findings. Once per comment; 👀 = received.

@ErikBjare
ErikBjare merged commit e32e3a9 into ActivityWatch:master Nov 6, 2026
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants