Skip to content

Preserved branch: queue/4588-3122-charges-delivery — decision needed (merge / cherry-pick / drop) #3549

Closed

Description

@dezren39

Preserved branch from the laptop worktree cleanup of 2026-11-01.

  • Branch: queue/4588-3122-charges-delivery
  • Verified HEAD on origin: 5aaea6aa0e0fd29e295cf2818ef1fe585b2b41c4
  • Provenance: this branch holds work that existed only in a local worktree on the laptop (unique commits and/or a rescue commit of uncommitted work: "rescue: preserve uncommitted work from worktree cleanup 2026-11-01"). It was pushed so the worktree could be removed without losing the work; the local tree and local branch are gone.
  • Decision needed: merge it, cherry-pick from it, or drop the branch. Nothing else references it; this issue is the record of what it holds.

Activity

  1. developing-today commented on Nov 1, 2026

    @developing-today
    Contributor
  2. dezren39 commented on Nov 3, 2026

    @dezren39
    MemberAuthor

    🤖 Agent note · picked up

  3. dezren39 commented on Nov 3, 2026

    @dezren39
    MemberAuthor

    🤖 Agent note · done

    Evidence (all verified fresh this shift via the GitHub REST API):

    • PR fix(aggregator): confirm surfaced charges after delivery #3167 ("fix(aggregator): confirm surfaced charges after delivery") has head branch queue/4588-3122-charges-delivery — this exact branch — and is MERGED (2026-10-31T18:19:58Z, merge commit fd7ef4526a1e35a6d3d95267553636ee5998b68d). The branch ref's current 404 is the normal post-merge deletion, not lost work.
    • Compare main...5aaea6aa0e0fd29e295cf2818ef1fe585b2b41c4 (the recorded branch HEAD): diverged, ahead_by 3 — exactly the three work commits dbf6354 (fix: confirm surfaced charges after delivery), b098933 (test: resolve real python3 / preserve host PATH), 5aaea6a (test: explicit 30s timeout), touching 4 files.
    • Every one of those changes is present on current main, verified by content markers: push-fleet-feed.sh holds the flock/$STATE.lock serialization block, the mktemp per-push feed, and the confirm-charges-surfaced invocation; scripts/confirm-charges-surfaced.ts exists on main (evolved, 3133 bytes vs the branch's 1744); test/charges-push.test.ts on main contains the Bun.which(...) python resolution and the }, 30000); timeout; collect-fleet-feed.ts on main has const { fresh } = filterNewUnmatched(...) with the premature surfaced-state write removed.
    • Later main evolution of these files (they have kept changing since the merge) is why whole-file diffs against the branch versions are nonzero — the branch's own changes are all in.

    Decision: landed — close. No cherry-pick: the branch is fully contained in main's history via PR #3167.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

Labels

priority/lowNice to have; do when convenient

Type

No type

Projects

No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions