Skip to content

docs(merge-queue): document Chrome Extension 0.8.0 (terminal states + row hiding)#208

Merged
samgutentag merged 3 commits into
mainfrom
sam-gutentag/docs-extension-0-8-0
Jun 5, 2026
Merged

docs(merge-queue): document Chrome Extension 0.8.0 (terminal states + row hiding)#208
samgutentag merged 3 commits into
mainfrom
sam-gutentag/docs-extension-0-8-0

Conversation

@samgutentag
Copy link
Copy Markdown
Member

Consolidates the Chrome Extension 0.8.0 reference docs into one change to merge-queue/chrome-extension.mdx. This is the docs half of the 0.8.0 changelog work (TRUNK-18467); a separate changelog PR will follow and link to these sections, so this should merge first.

What changed

  • Track testing progress: added Waiting to Batch and expanded Merged / Failed / Cancelled with the detail the panel now shows (failed-check list with run-log links, who cancelled).
  • New "Resubmit after failure or cancellation" section covering the one-click Resubmit button and the most-recent-attempt caveat.
  • Replaced "Automatic bot comment hiding" with "Configuring row hiding" documenting the three Hide rows toggles (Merging is blocked, Branch out of date, Trunk bot comments), all opt-out.
  • Updated the settings FAQ to the in-popup Settings cards (Hide rows, Verbose logging, Keyboard shortcuts), with Celebration Mode moved to the full-page Options view.

Supersedes

This replaces three overlapping open PRs, which should be closed once this lands:

Source: trunk2 #4042 (terminal states), #4075 (row hiding). Extension shipped as 0.8.0 to the Chrome Web Store on 2026-06-04.

🤖 Generated with Claude Code

… row hiding)

Consolidates the extension 0.8.0 reference updates into one change to
merge-queue/chrome-extension.mdx, superseding the split/duplicate PRs
#201 (row hiding), #204 and #180 (terminal states):

- Track testing progress: add Waiting to Batch and expand Merged / Failed /
  Cancelled with the per-state detail the panel now shows.
- New "Resubmit after failure or cancellation" section for the one-click
  resubmit flow and the most-recent-attempt caveat.
- Replace "Automatic bot comment hiding" with "Configuring row hiding"
  documenting the three Hide rows toggles (Merging is blocked, Branch out
  of date, Trunk bot comments).
- Update the settings FAQ to the in-popup Settings cards.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@mintlify
Copy link
Copy Markdown
Contributor

mintlify Bot commented Jun 5, 2026

Preview deployment for your docs. Learn more about Mintlify Previews.

Project Status Preview Updated (UTC)
trunk 🟢 Ready View Preview Jun 5, 2026, 4:52 AM

💡 Tip: Enable Workflows to automatically generate PRs for you.

@samgutentag
Copy link
Copy Markdown
Member Author

Verification status (2026-06-04): live

Verified: customers can use this. Ready to publish.

  • Flag state: none. The 0.8.0 extension features ship in the published Chrome Web Store build, not behind a LaunchDarkly flag (the row-hiding toggles persist in chrome.storage.local).
  • Eng PR: trunk-io/trunk2#4042 (terminal states, merged 2026-06-02), trunk-io/trunk2#4075 (row hiding, merged 2026-06-03). Both merge commits are on main and shipped in deploy v195.
  • Flag: none (ungated)
  • Signals: extension published as 0.8.0 to the Chrome Web Store on 2026-06-04 (announced in #team-merge-queue); no LaunchDarkly flag in either eng diff (no useFlag / flags.ts / LD URL).

Ready to publish. Merge this (#208) before #209 so the changelog deep-links resolve.

@samgutentag samgutentag added the ready to merge Verify docs PR: customers can use this. Ready to publish. label Jun 5, 2026
…nts"

Code verification against trunk2 popupHideableRows: the third Hide rows
toggle is labeled "Trunk (bot) GitHub Comments", not "Trunk bot comments".
Matches the on-screen label per the nav/UI standard.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@samgutentag
Copy link
Copy Markdown
Member Author

Code verification (2026-06-04): 8 confirmed / 0 contradicted / 0 ambiguous / 0 unverifiable

Verified the extension UI claims in this docs PR against the extension source in trunk-io/trunk2 (ts/apps/browser-extension).

Claim Verdict Source
Failed/Cancelled show a Resubmit button confirmed prPageMqNotInQueueView.ts:133
Cancelled shows who cancelled ("Cancelled by alice") confirmed mergeItemTerminalDetail.vitest.ts:76
"Waiting to Batch" state exists confirmed mergeItemPendingDetail.vitest.ts:35
Failed lists failed checks with run-log links confirmed mergeItemFailedCheck.vitest.ts:87
Hide rows toggle labels (incl. "Trunk (bot) GitHub Comments") confirmed popupHideableRows.vitest.ts:47
Actionable conflict rows ("must be resolved" / Resolve conflicts) stay visible confirmed prMergeRowHeuristics.ts:280
Toggles default on, persist in chrome.storage.local confirmed constants.ts:18
Settings cards: Hide rows / Verbose logging (byte size) / Keyboard shortcuts confirmed popupSettingsSections.vitest.ts:16

One label was wrong in the first draft and is now fixed in this PR (92333da): the third Hide rows toggle is "Trunk (bot) GitHub Comments", not "Trunk bot comments". Everything else matches source as written.


Toggle label correction (confirmed after fix)

File: popupHideableRows.vitest.ts#L47-L51

expect(mergingBlocked?.name).toBe("Merging is blocked");
expect(branchOutOfDate?.name).toBe("Branch out of date");
expect(botComments?.name).toBe("Trunk (bot) GitHub Comments");

Reasoning: The first draft labeled the third toggle "Trunk bot comments". The on-screen label is "Trunk (bot) GitHub Comments". Corrected in the docs PR so the bold label matches the UI exactly, per the nav/UI standard. The other two toggle labels already matched source.

"Cancelled by <actor>" format (confirmed)

File: mergeItemTerminalDetail.vitest.ts#L76-L123

).toBe("Cancelled by eli");
// ...
it("falls back to cancelled by user when no actor is available", () => {
).toBe("Cancelled by user");

Reasoning: The panel renders "Cancelled by <actor>" using the cancelling user when available, falling back to "Cancelled by user". The docs example "Cancelled by alice" matches the format.

Conflict-row exception (confirmed)

File: prMergeRowHeuristics.ts#L280-L281

"this branch has conflicts that must be resolved";
const RESOLVE_CONFLICTS_CONTROL_SNIPPET = "resolve conflicts";

Reasoning: The "Branch out of date" toggle hides only the informational conflicts row. Rows with "must be resolved" copy or a "Resolve conflicts" control are kept visible, exactly as the docs state.

@samgutentag samgutentag added the code-verified verify-docs-against-code: all factual claims confirmed in source. label Jun 5, 2026
…aveat

- Rewrite the section intro to define GitHub's merge box and note that two
  toggles hide merge-box rows while the third hides Trunk's bot comments
  (a comment is not a "row").
- Restore the "what is not affected" caveat dropped when the old Automatic
  bot comment hiding section was folded in: only trunk-io merge-queue prompt
  comments are hidden; other bots and non-merge-queue comments are left alone.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
@samgutentag samgutentag merged commit 41e547b into main Jun 5, 2026
2 checks passed
@samgutentag samgutentag deleted the sam-gutentag/docs-extension-0-8-0 branch June 5, 2026 06:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

code-verified verify-docs-against-code: all factual claims confirmed in source. ready to merge Verify docs PR: customers can use this. Ready to publish.

Development

Successfully merging this pull request may close these issues.

1 participant