Skip to content

Preserved branch: queue/2916-784-fork-root — decision needed (merge / cherry-pick / drop) #1255

Closed

Description

@dezren39

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

  • Branch: queue/2916-784-fork-root
  • Verified HEAD on origin: 19eec8438cf4638792249275f32ad0041df691ee
  • 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
  2. dezren39 commented on Nov 1, 2026

    @dezren39
    Author

    agent-note:v1 — triage feeder (issue-sweep-rotating), clerical close as already-fixed.

    Evidence (fresh gh reads this run, verified twice):

    • The branch queue/2916-784-fork-root still exists, now at 19eec8438cf4638792249275f32ad0041df691ee (the HEAD recorded in this issue's body, d914d02c…, no longer resolves). Compare vs main: diverged, 2 commits ahead / 484 behind — 826ea6a0 "fix(client,app): follow the fork link in session root walks" plus a lint follow-up.
    • That work is on current main via the normal lane: PR fix(client,app): follow fork links for session roots #807 ("fix(client,app): follow fork links for session roots") MERGED 2026-10-29T10:48:37Z. (PR fix(client,app): follow the fork link in session root walks #809, carrying this branch's exact commit title, was CLOSED unmerged — the duplicate attempt.)
    • Content spot-checks on main (9c99d58ace1b):
      • packages/app/src/shell/routes/session.ts:17 SessionParent includes fork?: { sessionID: string }; :23-33 rootSession follows current.parentID ?? current.fork?.sessionID with the same comment and cycle guard as the branch patch.
      • packages/app/src/shell/routes/session.test.ts:38 test "resolves the root session across a fork link" and :53 "rejects a fork-link cycle" present.
      • packages/client/src/solid/data.ts:643-656 resolveRoot walks parentID ?? fork?.sessionID; packages/client/test/solid-data.test.ts:102 fork family/cost test present.
    • Origin issue fix(client,app): client-side session root walks ignore the fork link — a fork splits its family, cost and titlebar root from the source tree #784 is CLOSED.

    Disposition: drop the branch — its content is superseded by PR #807 on main. Closing as already-fixed; no queue packet enqueued.

  3. dezren39 commented on Nov 1, 2026

    @dezren39
    Author

    agent-note:v1 — CORRECTION to one sentence of my closing evidence (6562815677), same feeder run.

    The closing comment wrongly said the HEAD recorded in this issue's body (d914d02c…) no longer resolves. That SHA came from a faulty tool output. Fresh re-verification (branch API + commits API, twice):

    • This issue's recorded HEAD is 19eec8438cf4638792249275f32ad0041df691ee — "fix(app): satisfy anti-slop lint in session root walk (spacing, fixture types)" — which EXISTS and is exactly the branch's current HEAD.

    Everything else in the closing evidence stands as verified: branch queue/2916-784-fork-root at 19eec84, 2 commits ahead / 484 behind main, content on main via merged PR #807 with the fork tests present, origin #784 CLOSED, disposition drop branch. Sorry for the bad SHA in the first note.

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

Metadata

Metadata

Assignees

No one assigned

    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