Skip to content

chore(submodule): bump aw-server-rust to 70ba50d — stop per-push boundary duplicate - #295

Merged
ErikBjare merged 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:bump/aw-server-rust-70ba50d
Sep 18, 2026
Merged

ErikBjare merged 1 commit into
ActivityWatch:masterfrom
TimeToBuildBob:bump/aw-server-rust-70ba50d

Conversation

@TimeToBuildBob

Copy link
Copy Markdown
Contributor

Bumps the aw-server-rust submodule from b0fab73 to 70ba50d.

Fixes the b2 duplicate bug: on v0.14.2b2 the phone's push re-inserted its
finished stopwatch event into the staging db on every 5-minute pass (293
copies by 14:15 today, 286 the morning before). ActivityWatch/aw-server-rust#713
stops resume from re-importing the boundary event, which fixes this.

Also picks up along the way:

The already-accumulated duplicate copies in the staging db are a separate
cleanup item on aw-server-rust (dedupe / reset staging) — this bump only
stops new ones from being created.

Closes #294

Erik: 293 duplicate stopwatch copies accumulated by 14:15 today on b2 —
resume was re-importing the boundary event on every 5-minute push pass.
70ba50d includes ActivityWatch/aw-server-rust#713, which dedups the
boundary event on resume and stops the re-import.

Also picks up #710/#712 (daemon 3-level discovery, irrelevant on Android —
the JNI path already uses pull_all) and #716 (daemon pull opt-in via
config.toml, cfg(not(target_os = "android")) so the app build is
unaffected).

The already-accumulated duplicates in the staging db are a separate
cleanup item on aw-server-rust; a fresh desktop importing this phone
still pulls them once until that lands.

Git-Session-Id: 2297380a-d87a-5bca-9584-e549e30e09ce
@greptile-apps

greptile-apps Bot commented Sep 18, 2026

Copy link
Copy Markdown

RetriggerConfidence Score: 5/5

The PR appears safe to merge, with no concrete Android integration or synchronization regression identified.

Summary

This PR advances the bundled aw-server-rust revision to incorporate the resume-boundary synchronization fix that prevents a completed boundary event from being re-imported on every Android push.

  • Updates the native server and synchronization implementation through a submodule pointer bump.
  • Includes upstream daemon discovery and configuration changes described as inactive or irrelevant on Android.
  • Does not remove duplicate records already accumulated in staging storage.

Reviews (1) · Last reviewed commit: "chore(submodule): bump aw-server-rust to..."

@TimeToBuildBob

TimeToBuildBob commented Sep 18, 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 8d369190a3be · openrouter/deepseek/deepseek-v4-flash-0731 · llm engine · 83s · about this reviewer

Maintainer commands

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

@TimeToBuildBob

Copy link
Copy Markdown
Contributor Author

CI-green and mergeable (Greptile 5/5) — waiting only on a maintainer click.

This PR is ready to merge, but the bot has pull-only access to this repo and can't self-merge — surfacing it here so it isn't lost. The monitoring loop will stop re-flagging it now that this note is posted.

@ErikBjare
ErikBjare merged commit 6123052 into ActivityWatch:master Sep 18, 2026
8 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.

Bump aw-server-rust to 70ba50d: stop the per-push boundary duplicate (#713) — the phone adds a stopwatch copy every 5 minutes on b2

2 participants