Public: anyone can read this; the crew can change it.

A trusted source's pull lands by true merge when its checks pass, with no review, credited in the changelog and the live stream #12066

Merged opened this

Check · Review · Land · Live done — Landed and live in production.

Merged

When a trusted source's pull lands, the home stream now says where it came from and who wrote it. A merged pull from a trusted forge reads "merged a pull request: <title> (folded in from jmoran@host, by jay)", next to any "told by" and agent credit it already had.

shipped production is serving it deploy cc205a8

opened this

When a trusted source's pull lands, the home stream now says where it came from and who wrote it. A merged pull from a trusted forge reads "merged a pull request: <title> (folded in from jmoran@host, by jay)", next to any "told by" and agent credit it already had.

The rest of #9015 was already on main before this pull:

  • The merge sweep lands a trusted, unexpired, green pull by true merge with no review (#9003/#9450).
  • That sweep sends a pull back when its check is red or missing, when it touches the walls or a path nobody listed, or when the trust has lapsed or fold-in is stopped.
  • /changelog credits each source through sourcesOfPulls.
  • pull.merged events already carry the source. The one missing piece was showing it in the home stream.

What changed:

  • src/feed/items.ts: the pull.merged post adds "folded in from <source>, by <author>". The author is the pull's original author on the other forge, or, if that isn't recorded, the human who opened it. The source is checked against the account@host shape (with an optional child: prefix) before it is shown, and anything else is ignored.
  • test/trusted-fold.test.ts: the true-merge landing test now also reads the home stream and expects the credit. It fails without the change.

What to look at: whether the author fallback should name an agent's operator. Right now an agent-opened pull shows no author in the "folded in" credit; the existing "by <agent>" part still names the agent.

Not done: no new page work. The changelog already credits sources, and the red, walled and lapsed cases were already covered by tests in the same file.

Checks: scripts/gate.ts and tsc --noEmit are clean. trusted-fold passes, and so do the feed, home-feed, told-by, merge-queue, unused-exports and src-imports suites (68 tests). scripts/fast.ts named 200 files for this diff, so I ran the ones that touch merged-pull wording rather than all of them. The forge's check runs the rest.

To try it: add a trusted source, let its fork's green pull land on the tick, then open /. The landing reads "folded in from <account@host>, by <author>".

🤖 Generated with Claude Code

Closes #9015

commented

When a trusted source's pull lands, the home stream now says where it came from and who wrote it. A merged pull from a trusted forge reads "merged a pull request: <title> (folded in from jmoran@host, by jay)", next to any "told by" and agent credit it already had.

The rest of #9015 was already on main before this pull:

  • The merge sweep lands a trusted, unexpired, green pull by true merge with no review (#9003/#9450).
  • That sweep sends a pull back when its check is red or missing, when it touches the walls or a path nobody listed, or when the trust has lapsed or fold-in is stopped.
  • /changelog credits each source through sourcesOfPulls.
  • pull.merged events already carry the source. The one missing piece was showing it in the home stream.

What changed:

  • src/feed/items.ts: the pull.merged post adds "folded in from <source>, by <author>". The author is the pull's original author on the other forge, or, if that isn't recorded, the human who opened it. The source is checked against the account@host shape (with an optional child: prefix) before it is shown, and anything else is ignored.
  • test/trusted-fold.test.ts: the true-merge landing test now also reads the home stream and expects the credit. It fails without the change.

What to look at: whether the author fallback should name an agent's operator. Right now an agent-opened pull shows no author in the "folded in" credit; the existing "by <agent>" part still names the agent.

Not done: no new page work. The changelog already credits sources, and the red, walled and lapsed cases were already covered by tests in the same file.

Checks: scripts/gate.ts and tsc --noEmit are clean. trusted-fold passes, and so do the feed, home-feed, told-by, merge-queue, unused-exports and src-imports suites (68 tests). scripts/fast.ts named 200 files for this diff, so I ran the ones that touch merged-pull wording rather than all of them. The forge's check runs the rest.

To try it: add a trusted source, let its fork's green pull land on the tick, then open /. The landing reads "folded in from <account@host>, by <author>".

🤖 Generated with Claude Code

commented

When a trusted source's pull lands, the home stream now says where it came from and who wrote it. A merged pull from a trusted forge reads "merged a pull request: <title> (folded in from jmoran@host, by jay)", next to any "told by" and agent credit it already had.

The rest of #9015 was already on main before this pull:

  • The merge sweep lands a trusted, unexpired, green pull by true merge with no review (#9003/#9450).
  • That sweep sends a pull back when its check is red or missing, when it touches the walls or a path nobody listed, or when the trust has lapsed or fold-in is stopped.
  • /changelog credits each source through sourcesOfPulls.
  • pull.merged events already carry the source. The one missing piece was showing it in the home stream.

What changed:

  • src/feed/items.ts: the pull.merged post adds "folded in from <source>, by <author>". The author is the pull's original author on the other forge, or, if that isn't recorded, the human who opened it. The source is checked against the account@host shape (with an optional child: prefix) before it is shown, and anything else is ignored.
  • test/trusted-fold.test.ts: the true-merge landing test now also reads the home stream and expects the credit. It fails without the change.

The first push failed the gate on two rules: a comment line over 100 columns, and no commit message with a "Try:" line. The second commit rewraps the comment and adds that line.

What to look at: whether the author fallback should name an agent's operator. Right now an agent-opened pull shows no author in the "folded in" credit; the existing "by <agent>" part still names the agent.

Not done: no new page work. The changelog already credits sources, and the red, walled and lapsed cases were already covered by tests in the same file.

Checks: tsc --noEmit is clean. trusted-fold passes, and so do the feed, home-feed, told-by, merge-queue, unused-exports and src-imports suites (68 tests). scripts/gate.ts printed nothing locally both times, including before the first push it then failed on, so it is not a reliable check here. The forge's check on this push decides.

To try it: on the preview, let a trusted source's green pull land on the tick, then open /. Its merged post reads "folded in from <account@host>, by <author>".

🤖 Generated with Claude Code

Approved

Small, correct, tested: the home stream now credits a trusted landing with its source and author, and the source is shape-checked before it is shown. The rest of #9015 was already on main. Next, in order: (1) decide whether an agent-opened pull should name its operator in the credit, since it now shows no author; (2) add a short line to the relevant docs/features page saying the home stream credits folded-in landings. I did not exercise the TUI, but the feed items are shared, so I expect it to show the same wording.

Sign in to join this conversation.

↑↓ navigate ↵ open ⌘↵ its app esc close

Keyboard shortcuts

Docs