feat(composer): clickable PR pill next to branch selector - #3065

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill
Jun 19, 2026
Merged

feat(composer): clickable PR pill next to branch selector#3065
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill

Conversation

@TheIcarusWings

@TheIcarusWingsTheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

What

Adds a small clickable PR pill next to the branch selector in the bottom composer bar. When the active branch has a pull request, the pill shows the PR icon + #<number>, colored by state:

  • open → emerald
  • merged → violet
  • closed → zinc

Clicking the pill opens the PR in the system browser. It sits to the left of the branch selector and does not open the branch dropdown (click is stopped/prevented).

Details

  • Reuses prStatusIndicator / ChangeRequestStatusIcon / resolveThreadPr from ThreadStatusIndicators.tsx, and the readLocalApi()?.shell.openExternal pattern for opening links.
  • Data comes from the existing useVcsStatus({ environmentId, cwd: branchCwd }) query already in BranchToolbarBranchSelector.tsx — no backend changes.
  • The pill renders as a sibling of the ComboboxTrigger inside a flex row; the toolbar layout classes were moved onto that wrapper so the branch group stays right-aligned.
  • Tooltip is action-oriented ("Open pull request #N (state) in browser") using the provider's terminology, distinct from the sidebar's state-description tooltip.
  • Works with cross-repo fork PRs (head TheIcarusWings, base pingdotgg/t3code) via the existing GitManager.findLatestPr detection.

Test

Switch the bottom-bar branch to one with an open PR and confirm the pill appears with the right color and opens the correct GitHub URL.


Note

Low Risk
UI-only composer/sidebar change that reuses existing VCS status and external-link behavior; no auth, data, or backend impact.

Overview
Adds a clickable PR pill to the left of the composer branch selector when the active branch has an associated change request. The pill shows the status icon and #number, uses existing state-based coloring from prStatusIndicator, and opens the PR in the system browser via a new shared hook.

useOpenPrLink centralizes opening external PR URLs: it stops click propagation/default (so the pill does not open the branch dropdown) and shows toasts when the local API is missing or openExternal fails. Sidebar thread-row PR clicks now use this hook instead of a duplicated inline handler.

Branch toolbar layout wraps the pill and ComboboxTrigger in a flex row; toolbar className moves to that wrapper. PR data still comes from the existing vcsEnvironment.status query—no API changes.

Reviewed by Cursor Bugbot for commit 7a8a619. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add clickable PR status pill next to branch selector in toolbar

  • Adds a PR status pill (button) next to the branch selector in BranchToolbarBranchSelector.tsx that appears when the active branch has an associated PR; clicking it opens the PR URL externally.
  • Extracts the PR link-opening logic into a shared useOpenPrLink hook used by both the toolbar and Sidebar.tsx.
  • The pill shows the PR number, a status icon, and an action-oriented tooltip; errors surface as toasts when the local shell API is unavailable.
  • Behavioral Change: the className prop on BranchToolbarBranchSelector now applies to a new wrapper div rather than directly to ComboboxTrigger, which may affect styling if callers rely on that specificity.

Macroscope summarized 7a8a619.

@coderabbitai

coderabbitaiBot commented Jun 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a285a3e9-f8f9-426f-9600-e27bb7a3bed2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 12, 2026
@macroscopeapp

macroscopeappBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Small UI feature adding a clickable PR indicator pill next to the branch selector. Changes are self-contained: extracts existing link-opening logic into a shared hook (refactor) and adds conditional UI rendering using existing utilities. No security, schema, or significant runtime behavior changes.

You can customize Macroscope's approvability policy. Learn more.

Comment on lines +526 to +557
const branchPr = resolveThreadPr(resolvedActiveBranch, branchStatusQuery.data ?? null);
const branchPrStatus = prStatusIndicator(
branchPr,
branchStatusQuery.data?.sourceControlProvider,
);
// Action-oriented tooltip (the pill opens the PR), distinct from the sidebar's
// state-description tooltip.
const branchPrTooltip = branchPr
? `Open ${sourceControlPresentation.terminology.singular} #${branchPr.number} (${branchPr.state}) in browser`
: "";
const openPrLink = useCallback((event: MouseEvent<HTMLElement>, prUrl: string) => {
event.preventDefault();
event.stopPropagation();

const api = readLocalApi();
if (!api) {
toastManager.add({
type: "error",
title: "Link opening is unavailable.",
});
return;
}

void api.shell.openExternal(prUrl).catch((error) => {
toastManager.add(
stackedThreadToast({
type: "error",
title: "Unable to open pull request link",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all duplicated from sidebar? should be extracted to some shared hook/module

@TheIcarusWingsTheIcarusWingsJun 14, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Extracted into a shared useOpenPrLink hook (apps/web/src/lib/openPullRequestLink.ts) and updated both the sidebar and the composer branch selector to use it. Pushed in 91f6d6a7e.

@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 14, 2026 19:50

Dismissing prior approval to re-evaluate 91f6d6a

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 14, 2026
@TheIcarusWings
TheIcarusWingsforce-pushed the composer-bar-pr-pill branch 2 times, most recently from 81cf5c8 to 7c713b9CompareJune 14, 2026 21:23
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 14, 2026
TheIcarusWingsand others added 2 commits June 18, 2026 22:50
Render a small PR pill (icon + #number) to the left of the branch
selector in the bottom composer bar when the active branch has a pull
request. The pill is colored by PR state (open=emerald, merged=violet,
closed=zinc) via the shared prStatusIndicator, and clicking it opens the
PR in the system browser without opening the branch dropdown.
The tooltip is action-oriented ("Open pull request #N (state) in
browser") and uses the provider's terminology, distinct from the
sidebar's state-description tooltip.
Co-authored-by: codex <codex@users.noreply.github.com>
Address review feedback: the openPrLink handler was duplicated verbatim
between Sidebar and the composer branch selector. Extract it into a
shared lib/openPullRequestLink hook and use it from both call sites.
Co-authored-by: codex <codex@users.noreply.github.com>
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 19, 2026 05:56

Dismissing prior approval to re-evaluate 7a8a619

@juliusmarminge
juliusmarminge merged commit 494350c into pingdotgg:mainJun 19, 2026
15 checks passed
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@TheIcarusWings@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

feat(composer): clickable PR pill next to branch selector - #3065

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill
Jun 19, 2026
Merged

feat(composer): clickable PR pill next to branch selector#3065
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill

Conversation

@TheIcarusWings

@TheIcarusWingsTheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

What

Adds a small clickable PR pill next to the branch selector in the bottom composer bar. When the active branch has a pull request, the pill shows the PR icon + #<number>, colored by state:

  • open → emerald
  • merged → violet
  • closed → zinc

Clicking the pill opens the PR in the system browser. It sits to the left of the branch selector and does not open the branch dropdown (click is stopped/prevented).

Details

  • Reuses prStatusIndicator / ChangeRequestStatusIcon / resolveThreadPr from ThreadStatusIndicators.tsx, and the readLocalApi()?.shell.openExternal pattern for opening links.
  • Data comes from the existing useVcsStatus({ environmentId, cwd: branchCwd }) query already in BranchToolbarBranchSelector.tsx — no backend changes.
  • The pill renders as a sibling of the ComboboxTrigger inside a flex row; the toolbar layout classes were moved onto that wrapper so the branch group stays right-aligned.
  • Tooltip is action-oriented ("Open pull request #N (state) in browser") using the provider's terminology, distinct from the sidebar's state-description tooltip.
  • Works with cross-repo fork PRs (head TheIcarusWings, base pingdotgg/t3code) via the existing GitManager.findLatestPr detection.

Test

Switch the bottom-bar branch to one with an open PR and confirm the pill appears with the right color and opens the correct GitHub URL.


Note

Low Risk
UI-only composer/sidebar change that reuses existing VCS status and external-link behavior; no auth, data, or backend impact.

Overview
Adds a clickable PR pill to the left of the composer branch selector when the active branch has an associated change request. The pill shows the status icon and #number, uses existing state-based coloring from prStatusIndicator, and opens the PR in the system browser via a new shared hook.

useOpenPrLink centralizes opening external PR URLs: it stops click propagation/default (so the pill does not open the branch dropdown) and shows toasts when the local API is missing or openExternal fails. Sidebar thread-row PR clicks now use this hook instead of a duplicated inline handler.

Branch toolbar layout wraps the pill and ComboboxTrigger in a flex row; toolbar className moves to that wrapper. PR data still comes from the existing vcsEnvironment.status query—no API changes.

Reviewed by Cursor Bugbot for commit 7a8a619. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add clickable PR status pill next to branch selector in toolbar

  • Adds a PR status pill (button) next to the branch selector in BranchToolbarBranchSelector.tsx that appears when the active branch has an associated PR; clicking it opens the PR URL externally.
  • Extracts the PR link-opening logic into a shared useOpenPrLink hook used by both the toolbar and Sidebar.tsx.
  • The pill shows the PR number, a status icon, and an action-oriented tooltip; errors surface as toasts when the local shell API is unavailable.
  • Behavioral Change: the className prop on BranchToolbarBranchSelector now applies to a new wrapper div rather than directly to ComboboxTrigger, which may affect styling if callers rely on that specificity.

Macroscope summarized 7a8a619.

@coderabbitai

coderabbitaiBot commented Jun 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a285a3e9-f8f9-426f-9600-e27bb7a3bed2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 12, 2026
@macroscopeapp

macroscopeappBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Small UI feature adding a clickable PR indicator pill next to the branch selector. Changes are self-contained: extracts existing link-opening logic into a shared hook (refactor) and adds conditional UI rendering using existing utilities. No security, schema, or significant runtime behavior changes.

You can customize Macroscope's approvability policy. Learn more.

Comment on lines +526 to +557
const branchPr = resolveThreadPr(resolvedActiveBranch, branchStatusQuery.data ?? null);
const branchPrStatus = prStatusIndicator(
branchPr,
branchStatusQuery.data?.sourceControlProvider,
);
// Action-oriented tooltip (the pill opens the PR), distinct from the sidebar's
// state-description tooltip.
const branchPrTooltip = branchPr
? `Open ${sourceControlPresentation.terminology.singular} #${branchPr.number} (${branchPr.state}) in browser`
: "";
const openPrLink = useCallback((event: MouseEvent<HTMLElement>, prUrl: string) => {
event.preventDefault();
event.stopPropagation();

const api = readLocalApi();
if (!api) {
toastManager.add({
type: "error",
title: "Link opening is unavailable.",
});
return;
}

void api.shell.openExternal(prUrl).catch((error) => {
toastManager.add(
stackedThreadToast({
type: "error",
title: "Unable to open pull request link",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all duplicated from sidebar? should be extracted to some shared hook/module

@TheIcarusWingsTheIcarusWingsJun 14, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Extracted into a shared useOpenPrLink hook (apps/web/src/lib/openPullRequestLink.ts) and updated both the sidebar and the composer branch selector to use it. Pushed in 91f6d6a7e.

@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 14, 2026 19:50

Dismissing prior approval to re-evaluate 91f6d6a

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 14, 2026
@TheIcarusWings
TheIcarusWingsforce-pushed the composer-bar-pr-pill branch 2 times, most recently from 81cf5c8 to 7c713b9CompareJune 14, 2026 21:23
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 14, 2026
TheIcarusWingsand others added 2 commits June 18, 2026 22:50
Render a small PR pill (icon + #number) to the left of the branch
selector in the bottom composer bar when the active branch has a pull
request. The pill is colored by PR state (open=emerald, merged=violet,
closed=zinc) via the shared prStatusIndicator, and clicking it opens the
PR in the system browser without opening the branch dropdown.
The tooltip is action-oriented ("Open pull request #N (state) in
browser") and uses the provider's terminology, distinct from the
sidebar's state-description tooltip.
Co-authored-by: codex <codex@users.noreply.github.com>
Address review feedback: the openPrLink handler was duplicated verbatim
between Sidebar and the composer branch selector. Extract it into a
shared lib/openPullRequestLink hook and use it from both call sites.
Co-authored-by: codex <codex@users.noreply.github.com>
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 19, 2026 05:56

Dismissing prior approval to re-evaluate 7a8a619

@juliusmarminge
juliusmarminge merged commit 494350c into pingdotgg:mainJun 19, 2026
15 checks passed
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@TheIcarusWings@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(composer): clickable PR pill next to branch selector - #3065

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill
Jun 19, 2026
Merged

feat(composer): clickable PR pill next to branch selector#3065
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill

Conversation

@TheIcarusWings

@TheIcarusWingsTheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

What

Adds a small clickable PR pill next to the branch selector in the bottom composer bar. When the active branch has a pull request, the pill shows the PR icon + #<number>, colored by state:

  • open → emerald
  • merged → violet
  • closed → zinc

Clicking the pill opens the PR in the system browser. It sits to the left of the branch selector and does not open the branch dropdown (click is stopped/prevented).

Details

  • Reuses prStatusIndicator / ChangeRequestStatusIcon / resolveThreadPr from ThreadStatusIndicators.tsx, and the readLocalApi()?.shell.openExternal pattern for opening links.
  • Data comes from the existing useVcsStatus({ environmentId, cwd: branchCwd }) query already in BranchToolbarBranchSelector.tsx — no backend changes.
  • The pill renders as a sibling of the ComboboxTrigger inside a flex row; the toolbar layout classes were moved onto that wrapper so the branch group stays right-aligned.
  • Tooltip is action-oriented ("Open pull request #N (state) in browser") using the provider's terminology, distinct from the sidebar's state-description tooltip.
  • Works with cross-repo fork PRs (head TheIcarusWings, base pingdotgg/t3code) via the existing GitManager.findLatestPr detection.

Test

Switch the bottom-bar branch to one with an open PR and confirm the pill appears with the right color and opens the correct GitHub URL.


Note

Low Risk
UI-only composer/sidebar change that reuses existing VCS status and external-link behavior; no auth, data, or backend impact.

Overview
Adds a clickable PR pill to the left of the composer branch selector when the active branch has an associated change request. The pill shows the status icon and #number, uses existing state-based coloring from prStatusIndicator, and opens the PR in the system browser via a new shared hook.

useOpenPrLink centralizes opening external PR URLs: it stops click propagation/default (so the pill does not open the branch dropdown) and shows toasts when the local API is missing or openExternal fails. Sidebar thread-row PR clicks now use this hook instead of a duplicated inline handler.

Branch toolbar layout wraps the pill and ComboboxTrigger in a flex row; toolbar className moves to that wrapper. PR data still comes from the existing vcsEnvironment.status query—no API changes.

Reviewed by Cursor Bugbot for commit 7a8a619. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add clickable PR status pill next to branch selector in toolbar

  • Adds a PR status pill (button) next to the branch selector in BranchToolbarBranchSelector.tsx that appears when the active branch has an associated PR; clicking it opens the PR URL externally.
  • Extracts the PR link-opening logic into a shared useOpenPrLink hook used by both the toolbar and Sidebar.tsx.
  • The pill shows the PR number, a status icon, and an action-oriented tooltip; errors surface as toasts when the local shell API is unavailable.
  • Behavioral Change: the className prop on BranchToolbarBranchSelector now applies to a new wrapper div rather than directly to ComboboxTrigger, which may affect styling if callers rely on that specificity.

Macroscope summarized 7a8a619.

@coderabbitai

coderabbitaiBot commented Jun 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a285a3e9-f8f9-426f-9600-e27bb7a3bed2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 12, 2026
@macroscopeapp

macroscopeappBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Small UI feature adding a clickable PR indicator pill next to the branch selector. Changes are self-contained: extracts existing link-opening logic into a shared hook (refactor) and adds conditional UI rendering using existing utilities. No security, schema, or significant runtime behavior changes.

You can customize Macroscope's approvability policy. Learn more.

Comment on lines +526 to +557
const branchPr = resolveThreadPr(resolvedActiveBranch, branchStatusQuery.data ?? null);
const branchPrStatus = prStatusIndicator(
branchPr,
branchStatusQuery.data?.sourceControlProvider,
);
// Action-oriented tooltip (the pill opens the PR), distinct from the sidebar's
// state-description tooltip.
const branchPrTooltip = branchPr
? `Open ${sourceControlPresentation.terminology.singular} #${branchPr.number} (${branchPr.state}) in browser`
: "";
const openPrLink = useCallback((event: MouseEvent<HTMLElement>, prUrl: string) => {
event.preventDefault();
event.stopPropagation();

const api = readLocalApi();
if (!api) {
toastManager.add({
type: "error",
title: "Link opening is unavailable.",
});
return;
}

void api.shell.openExternal(prUrl).catch((error) => {
toastManager.add(
stackedThreadToast({
type: "error",
title: "Unable to open pull request link",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all duplicated from sidebar? should be extracted to some shared hook/module

@TheIcarusWingsTheIcarusWingsJun 14, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Extracted into a shared useOpenPrLink hook (apps/web/src/lib/openPullRequestLink.ts) and updated both the sidebar and the composer branch selector to use it. Pushed in 91f6d6a7e.

@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 14, 2026 19:50

Dismissing prior approval to re-evaluate 91f6d6a

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 14, 2026
@TheIcarusWings
TheIcarusWingsforce-pushed the composer-bar-pr-pill branch 2 times, most recently from 81cf5c8 to 7c713b9CompareJune 14, 2026 21:23
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 14, 2026
TheIcarusWingsand others added 2 commits June 18, 2026 22:50
Render a small PR pill (icon + #number) to the left of the branch
selector in the bottom composer bar when the active branch has a pull
request. The pill is colored by PR state (open=emerald, merged=violet,
closed=zinc) via the shared prStatusIndicator, and clicking it opens the
PR in the system browser without opening the branch dropdown.
The tooltip is action-oriented ("Open pull request #N (state) in
browser") and uses the provider's terminology, distinct from the
sidebar's state-description tooltip.
Co-authored-by: codex <codex@users.noreply.github.com>
Address review feedback: the openPrLink handler was duplicated verbatim
between Sidebar and the composer branch selector. Extract it into a
shared lib/openPullRequestLink hook and use it from both call sites.
Co-authored-by: codex <codex@users.noreply.github.com>
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 19, 2026 05:56

Dismissing prior approval to re-evaluate 7a8a619

@juliusmarminge
juliusmarminge merged commit 494350c into pingdotgg:mainJun 19, 2026
15 checks passed
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@TheIcarusWings@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(composer): clickable PR pill next to branch selector - #3065

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill
Jun 19, 2026
Merged

feat(composer): clickable PR pill next to branch selector#3065
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill

Conversation

@TheIcarusWings

@TheIcarusWingsTheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

What

Adds a small clickable PR pill next to the branch selector in the bottom composer bar. When the active branch has a pull request, the pill shows the PR icon + #<number>, colored by state:

  • open → emerald
  • merged → violet
  • closed → zinc

Clicking the pill opens the PR in the system browser. It sits to the left of the branch selector and does not open the branch dropdown (click is stopped/prevented).

Details

  • Reuses prStatusIndicator / ChangeRequestStatusIcon / resolveThreadPr from ThreadStatusIndicators.tsx, and the readLocalApi()?.shell.openExternal pattern for opening links.
  • Data comes from the existing useVcsStatus({ environmentId, cwd: branchCwd }) query already in BranchToolbarBranchSelector.tsx — no backend changes.
  • The pill renders as a sibling of the ComboboxTrigger inside a flex row; the toolbar layout classes were moved onto that wrapper so the branch group stays right-aligned.
  • Tooltip is action-oriented ("Open pull request #N (state) in browser") using the provider's terminology, distinct from the sidebar's state-description tooltip.
  • Works with cross-repo fork PRs (head TheIcarusWings, base pingdotgg/t3code) via the existing GitManager.findLatestPr detection.

Test

Switch the bottom-bar branch to one with an open PR and confirm the pill appears with the right color and opens the correct GitHub URL.


Note

Low Risk
UI-only composer/sidebar change that reuses existing VCS status and external-link behavior; no auth, data, or backend impact.

Overview
Adds a clickable PR pill to the left of the composer branch selector when the active branch has an associated change request. The pill shows the status icon and #number, uses existing state-based coloring from prStatusIndicator, and opens the PR in the system browser via a new shared hook.

useOpenPrLink centralizes opening external PR URLs: it stops click propagation/default (so the pill does not open the branch dropdown) and shows toasts when the local API is missing or openExternal fails. Sidebar thread-row PR clicks now use this hook instead of a duplicated inline handler.

Branch toolbar layout wraps the pill and ComboboxTrigger in a flex row; toolbar className moves to that wrapper. PR data still comes from the existing vcsEnvironment.status query—no API changes.

Reviewed by Cursor Bugbot for commit 7a8a619. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add clickable PR status pill next to branch selector in toolbar

  • Adds a PR status pill (button) next to the branch selector in BranchToolbarBranchSelector.tsx that appears when the active branch has an associated PR; clicking it opens the PR URL externally.
  • Extracts the PR link-opening logic into a shared useOpenPrLink hook used by both the toolbar and Sidebar.tsx.
  • The pill shows the PR number, a status icon, and an action-oriented tooltip; errors surface as toasts when the local shell API is unavailable.
  • Behavioral Change: the className prop on BranchToolbarBranchSelector now applies to a new wrapper div rather than directly to ComboboxTrigger, which may affect styling if callers rely on that specificity.

Macroscope summarized 7a8a619.

@coderabbitai

coderabbitaiBot commented Jun 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a285a3e9-f8f9-426f-9600-e27bb7a3bed2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 12, 2026
@macroscopeapp

macroscopeappBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Small UI feature adding a clickable PR indicator pill next to the branch selector. Changes are self-contained: extracts existing link-opening logic into a shared hook (refactor) and adds conditional UI rendering using existing utilities. No security, schema, or significant runtime behavior changes.

You can customize Macroscope's approvability policy. Learn more.

Comment on lines +526 to +557
const branchPr = resolveThreadPr(resolvedActiveBranch, branchStatusQuery.data ?? null);
const branchPrStatus = prStatusIndicator(
branchPr,
branchStatusQuery.data?.sourceControlProvider,
);
// Action-oriented tooltip (the pill opens the PR), distinct from the sidebar's
// state-description tooltip.
const branchPrTooltip = branchPr
? `Open ${sourceControlPresentation.terminology.singular} #${branchPr.number} (${branchPr.state}) in browser`
: "";
const openPrLink = useCallback((event: MouseEvent<HTMLElement>, prUrl: string) => {
event.preventDefault();
event.stopPropagation();

const api = readLocalApi();
if (!api) {
toastManager.add({
type: "error",
title: "Link opening is unavailable.",
});
return;
}

void api.shell.openExternal(prUrl).catch((error) => {
toastManager.add(
stackedThreadToast({
type: "error",
title: "Unable to open pull request link",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all duplicated from sidebar? should be extracted to some shared hook/module

@TheIcarusWingsTheIcarusWingsJun 14, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Extracted into a shared useOpenPrLink hook (apps/web/src/lib/openPullRequestLink.ts) and updated both the sidebar and the composer branch selector to use it. Pushed in 91f6d6a7e.

@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 14, 2026 19:50

Dismissing prior approval to re-evaluate 91f6d6a

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 14, 2026
@TheIcarusWings
TheIcarusWingsforce-pushed the composer-bar-pr-pill branch 2 times, most recently from 81cf5c8 to 7c713b9CompareJune 14, 2026 21:23
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 14, 2026
TheIcarusWingsand others added 2 commits June 18, 2026 22:50
Render a small PR pill (icon + #number) to the left of the branch
selector in the bottom composer bar when the active branch has a pull
request. The pill is colored by PR state (open=emerald, merged=violet,
closed=zinc) via the shared prStatusIndicator, and clicking it opens the
PR in the system browser without opening the branch dropdown.
The tooltip is action-oriented ("Open pull request #N (state) in
browser") and uses the provider's terminology, distinct from the
sidebar's state-description tooltip.
Co-authored-by: codex <codex@users.noreply.github.com>
Address review feedback: the openPrLink handler was duplicated verbatim
between Sidebar and the composer branch selector. Extract it into a
shared lib/openPullRequestLink hook and use it from both call sites.
Co-authored-by: codex <codex@users.noreply.github.com>
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 19, 2026 05:56

Dismissing prior approval to re-evaluate 7a8a619

@juliusmarminge
juliusmarminge merged commit 494350c into pingdotgg:mainJun 19, 2026
15 checks passed
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@TheIcarusWings@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

feat(composer): clickable PR pill next to branch selector - #3065

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill
Jun 19, 2026
Merged

feat(composer): clickable PR pill next to branch selector#3065
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill

Conversation

@TheIcarusWings

@TheIcarusWingsTheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

What

Adds a small clickable PR pill next to the branch selector in the bottom composer bar. When the active branch has a pull request, the pill shows the PR icon + #<number>, colored by state:

  • open → emerald
  • merged → violet
  • closed → zinc

Clicking the pill opens the PR in the system browser. It sits to the left of the branch selector and does not open the branch dropdown (click is stopped/prevented).

Details

  • Reuses prStatusIndicator / ChangeRequestStatusIcon / resolveThreadPr from ThreadStatusIndicators.tsx, and the readLocalApi()?.shell.openExternal pattern for opening links.
  • Data comes from the existing useVcsStatus({ environmentId, cwd: branchCwd }) query already in BranchToolbarBranchSelector.tsx — no backend changes.
  • The pill renders as a sibling of the ComboboxTrigger inside a flex row; the toolbar layout classes were moved onto that wrapper so the branch group stays right-aligned.
  • Tooltip is action-oriented ("Open pull request #N (state) in browser") using the provider's terminology, distinct from the sidebar's state-description tooltip.
  • Works with cross-repo fork PRs (head TheIcarusWings, base pingdotgg/t3code) via the existing GitManager.findLatestPr detection.

Test

Switch the bottom-bar branch to one with an open PR and confirm the pill appears with the right color and opens the correct GitHub URL.


Note

Low Risk
UI-only composer/sidebar change that reuses existing VCS status and external-link behavior; no auth, data, or backend impact.

Overview
Adds a clickable PR pill to the left of the composer branch selector when the active branch has an associated change request. The pill shows the status icon and #number, uses existing state-based coloring from prStatusIndicator, and opens the PR in the system browser via a new shared hook.

useOpenPrLink centralizes opening external PR URLs: it stops click propagation/default (so the pill does not open the branch dropdown) and shows toasts when the local API is missing or openExternal fails. Sidebar thread-row PR clicks now use this hook instead of a duplicated inline handler.

Branch toolbar layout wraps the pill and ComboboxTrigger in a flex row; toolbar className moves to that wrapper. PR data still comes from the existing vcsEnvironment.status query—no API changes.

Reviewed by Cursor Bugbot for commit 7a8a619. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add clickable PR status pill next to branch selector in toolbar

  • Adds a PR status pill (button) next to the branch selector in BranchToolbarBranchSelector.tsx that appears when the active branch has an associated PR; clicking it opens the PR URL externally.
  • Extracts the PR link-opening logic into a shared useOpenPrLink hook used by both the toolbar and Sidebar.tsx.
  • The pill shows the PR number, a status icon, and an action-oriented tooltip; errors surface as toasts when the local shell API is unavailable.
  • Behavioral Change: the className prop on BranchToolbarBranchSelector now applies to a new wrapper div rather than directly to ComboboxTrigger, which may affect styling if callers rely on that specificity.

Macroscope summarized 7a8a619.

@coderabbitai

coderabbitaiBot commented Jun 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a285a3e9-f8f9-426f-9600-e27bb7a3bed2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 12, 2026
@macroscopeapp

macroscopeappBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Small UI feature adding a clickable PR indicator pill next to the branch selector. Changes are self-contained: extracts existing link-opening logic into a shared hook (refactor) and adds conditional UI rendering using existing utilities. No security, schema, or significant runtime behavior changes.

You can customize Macroscope's approvability policy. Learn more.

Comment on lines +526 to +557
const branchPr = resolveThreadPr(resolvedActiveBranch, branchStatusQuery.data ?? null);
const branchPrStatus = prStatusIndicator(
branchPr,
branchStatusQuery.data?.sourceControlProvider,
);
// Action-oriented tooltip (the pill opens the PR), distinct from the sidebar's
// state-description tooltip.
const branchPrTooltip = branchPr
? `Open ${sourceControlPresentation.terminology.singular} #${branchPr.number} (${branchPr.state}) in browser`
: "";
const openPrLink = useCallback((event: MouseEvent<HTMLElement>, prUrl: string) => {
event.preventDefault();
event.stopPropagation();

const api = readLocalApi();
if (!api) {
toastManager.add({
type: "error",
title: "Link opening is unavailable.",
});
return;
}

void api.shell.openExternal(prUrl).catch((error) => {
toastManager.add(
stackedThreadToast({
type: "error",
title: "Unable to open pull request link",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all duplicated from sidebar? should be extracted to some shared hook/module

@TheIcarusWingsTheIcarusWingsJun 14, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Extracted into a shared useOpenPrLink hook (apps/web/src/lib/openPullRequestLink.ts) and updated both the sidebar and the composer branch selector to use it. Pushed in 91f6d6a7e.

@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 14, 2026 19:50

Dismissing prior approval to re-evaluate 91f6d6a

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 14, 2026
@TheIcarusWings
TheIcarusWingsforce-pushed the composer-bar-pr-pill branch 2 times, most recently from 81cf5c8 to 7c713b9CompareJune 14, 2026 21:23
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 14, 2026
TheIcarusWingsand others added 2 commits June 18, 2026 22:50
Render a small PR pill (icon + #number) to the left of the branch
selector in the bottom composer bar when the active branch has a pull
request. The pill is colored by PR state (open=emerald, merged=violet,
closed=zinc) via the shared prStatusIndicator, and clicking it opens the
PR in the system browser without opening the branch dropdown.
The tooltip is action-oriented ("Open pull request #N (state) in
browser") and uses the provider's terminology, distinct from the
sidebar's state-description tooltip.
Co-authored-by: codex <codex@users.noreply.github.com>
Address review feedback: the openPrLink handler was duplicated verbatim
between Sidebar and the composer branch selector. Extract it into a
shared lib/openPullRequestLink hook and use it from both call sites.
Co-authored-by: codex <codex@users.noreply.github.com>
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 19, 2026 05:56

Dismissing prior approval to re-evaluate 7a8a619

@juliusmarminge
juliusmarminge merged commit 494350c into pingdotgg:mainJun 19, 2026
15 checks passed
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@TheIcarusWings@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(composer): clickable PR pill next to branch selector - #3065

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill
Jun 19, 2026
Merged

feat(composer): clickable PR pill next to branch selector#3065
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill

Conversation

@TheIcarusWings

@TheIcarusWingsTheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

What

Adds a small clickable PR pill next to the branch selector in the bottom composer bar. When the active branch has a pull request, the pill shows the PR icon + #<number>, colored by state:

  • open → emerald
  • merged → violet
  • closed → zinc

Clicking the pill opens the PR in the system browser. It sits to the left of the branch selector and does not open the branch dropdown (click is stopped/prevented).

Details

  • Reuses prStatusIndicator / ChangeRequestStatusIcon / resolveThreadPr from ThreadStatusIndicators.tsx, and the readLocalApi()?.shell.openExternal pattern for opening links.
  • Data comes from the existing useVcsStatus({ environmentId, cwd: branchCwd }) query already in BranchToolbarBranchSelector.tsx — no backend changes.
  • The pill renders as a sibling of the ComboboxTrigger inside a flex row; the toolbar layout classes were moved onto that wrapper so the branch group stays right-aligned.
  • Tooltip is action-oriented ("Open pull request #N (state) in browser") using the provider's terminology, distinct from the sidebar's state-description tooltip.
  • Works with cross-repo fork PRs (head TheIcarusWings, base pingdotgg/t3code) via the existing GitManager.findLatestPr detection.

Test

Switch the bottom-bar branch to one with an open PR and confirm the pill appears with the right color and opens the correct GitHub URL.


Note

Low Risk
UI-only composer/sidebar change that reuses existing VCS status and external-link behavior; no auth, data, or backend impact.

Overview
Adds a clickable PR pill to the left of the composer branch selector when the active branch has an associated change request. The pill shows the status icon and #number, uses existing state-based coloring from prStatusIndicator, and opens the PR in the system browser via a new shared hook.

useOpenPrLink centralizes opening external PR URLs: it stops click propagation/default (so the pill does not open the branch dropdown) and shows toasts when the local API is missing or openExternal fails. Sidebar thread-row PR clicks now use this hook instead of a duplicated inline handler.

Branch toolbar layout wraps the pill and ComboboxTrigger in a flex row; toolbar className moves to that wrapper. PR data still comes from the existing vcsEnvironment.status query—no API changes.

Reviewed by Cursor Bugbot for commit 7a8a619. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add clickable PR status pill next to branch selector in toolbar

  • Adds a PR status pill (button) next to the branch selector in BranchToolbarBranchSelector.tsx that appears when the active branch has an associated PR; clicking it opens the PR URL externally.
  • Extracts the PR link-opening logic into a shared useOpenPrLink hook used by both the toolbar and Sidebar.tsx.
  • The pill shows the PR number, a status icon, and an action-oriented tooltip; errors surface as toasts when the local shell API is unavailable.
  • Behavioral Change: the className prop on BranchToolbarBranchSelector now applies to a new wrapper div rather than directly to ComboboxTrigger, which may affect styling if callers rely on that specificity.

Macroscope summarized 7a8a619.

@coderabbitai

coderabbitaiBot commented Jun 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a285a3e9-f8f9-426f-9600-e27bb7a3bed2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 12, 2026
@macroscopeapp

macroscopeappBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Small UI feature adding a clickable PR indicator pill next to the branch selector. Changes are self-contained: extracts existing link-opening logic into a shared hook (refactor) and adds conditional UI rendering using existing utilities. No security, schema, or significant runtime behavior changes.

You can customize Macroscope's approvability policy. Learn more.

Comment on lines +526 to +557
const branchPr = resolveThreadPr(resolvedActiveBranch, branchStatusQuery.data ?? null);
const branchPrStatus = prStatusIndicator(
branchPr,
branchStatusQuery.data?.sourceControlProvider,
);
// Action-oriented tooltip (the pill opens the PR), distinct from the sidebar's
// state-description tooltip.
const branchPrTooltip = branchPr
? `Open ${sourceControlPresentation.terminology.singular} #${branchPr.number} (${branchPr.state}) in browser`
: "";
const openPrLink = useCallback((event: MouseEvent<HTMLElement>, prUrl: string) => {
event.preventDefault();
event.stopPropagation();

const api = readLocalApi();
if (!api) {
toastManager.add({
type: "error",
title: "Link opening is unavailable.",
});
return;
}

void api.shell.openExternal(prUrl).catch((error) => {
toastManager.add(
stackedThreadToast({
type: "error",
title: "Unable to open pull request link",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all duplicated from sidebar? should be extracted to some shared hook/module

@TheIcarusWingsTheIcarusWingsJun 14, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Extracted into a shared useOpenPrLink hook (apps/web/src/lib/openPullRequestLink.ts) and updated both the sidebar and the composer branch selector to use it. Pushed in 91f6d6a7e.

@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 14, 2026 19:50

Dismissing prior approval to re-evaluate 91f6d6a

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 14, 2026
@TheIcarusWings
TheIcarusWingsforce-pushed the composer-bar-pr-pill branch 2 times, most recently from 81cf5c8 to 7c713b9CompareJune 14, 2026 21:23
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 14, 2026
TheIcarusWingsand others added 2 commits June 18, 2026 22:50
Render a small PR pill (icon + #number) to the left of the branch
selector in the bottom composer bar when the active branch has a pull
request. The pill is colored by PR state (open=emerald, merged=violet,
closed=zinc) via the shared prStatusIndicator, and clicking it opens the
PR in the system browser without opening the branch dropdown.
The tooltip is action-oriented ("Open pull request #N (state) in
browser") and uses the provider's terminology, distinct from the
sidebar's state-description tooltip.
Co-authored-by: codex <codex@users.noreply.github.com>
Address review feedback: the openPrLink handler was duplicated verbatim
between Sidebar and the composer branch selector. Extract it into a
shared lib/openPullRequestLink hook and use it from both call sites.
Co-authored-by: codex <codex@users.noreply.github.com>
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 19, 2026 05:56

Dismissing prior approval to re-evaluate 7a8a619

@juliusmarminge
juliusmarminge merged commit 494350c into pingdotgg:mainJun 19, 2026
15 checks passed
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@TheIcarusWings@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

feat(composer): clickable PR pill next to branch selector - #3065

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill
Jun 19, 2026
Merged

feat(composer): clickable PR pill next to branch selector#3065
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill

Conversation

@TheIcarusWings

@TheIcarusWingsTheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

What

Adds a small clickable PR pill next to the branch selector in the bottom composer bar. When the active branch has a pull request, the pill shows the PR icon + #<number>, colored by state:

  • open → emerald
  • merged → violet
  • closed → zinc

Clicking the pill opens the PR in the system browser. It sits to the left of the branch selector and does not open the branch dropdown (click is stopped/prevented).

Details

  • Reuses prStatusIndicator / ChangeRequestStatusIcon / resolveThreadPr from ThreadStatusIndicators.tsx, and the readLocalApi()?.shell.openExternal pattern for opening links.
  • Data comes from the existing useVcsStatus({ environmentId, cwd: branchCwd }) query already in BranchToolbarBranchSelector.tsx — no backend changes.
  • The pill renders as a sibling of the ComboboxTrigger inside a flex row; the toolbar layout classes were moved onto that wrapper so the branch group stays right-aligned.
  • Tooltip is action-oriented ("Open pull request #N (state) in browser") using the provider's terminology, distinct from the sidebar's state-description tooltip.
  • Works with cross-repo fork PRs (head TheIcarusWings, base pingdotgg/t3code) via the existing GitManager.findLatestPr detection.

Test

Switch the bottom-bar branch to one with an open PR and confirm the pill appears with the right color and opens the correct GitHub URL.


Note

Low Risk
UI-only composer/sidebar change that reuses existing VCS status and external-link behavior; no auth, data, or backend impact.

Overview
Adds a clickable PR pill to the left of the composer branch selector when the active branch has an associated change request. The pill shows the status icon and #number, uses existing state-based coloring from prStatusIndicator, and opens the PR in the system browser via a new shared hook.

useOpenPrLink centralizes opening external PR URLs: it stops click propagation/default (so the pill does not open the branch dropdown) and shows toasts when the local API is missing or openExternal fails. Sidebar thread-row PR clicks now use this hook instead of a duplicated inline handler.

Branch toolbar layout wraps the pill and ComboboxTrigger in a flex row; toolbar className moves to that wrapper. PR data still comes from the existing vcsEnvironment.status query—no API changes.

Reviewed by Cursor Bugbot for commit 7a8a619. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add clickable PR status pill next to branch selector in toolbar

  • Adds a PR status pill (button) next to the branch selector in BranchToolbarBranchSelector.tsx that appears when the active branch has an associated PR; clicking it opens the PR URL externally.
  • Extracts the PR link-opening logic into a shared useOpenPrLink hook used by both the toolbar and Sidebar.tsx.
  • The pill shows the PR number, a status icon, and an action-oriented tooltip; errors surface as toasts when the local shell API is unavailable.
  • Behavioral Change: the className prop on BranchToolbarBranchSelector now applies to a new wrapper div rather than directly to ComboboxTrigger, which may affect styling if callers rely on that specificity.

Macroscope summarized 7a8a619.

@coderabbitai

coderabbitaiBot commented Jun 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a285a3e9-f8f9-426f-9600-e27bb7a3bed2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 12, 2026
@macroscopeapp

macroscopeappBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Small UI feature adding a clickable PR indicator pill next to the branch selector. Changes are self-contained: extracts existing link-opening logic into a shared hook (refactor) and adds conditional UI rendering using existing utilities. No security, schema, or significant runtime behavior changes.

You can customize Macroscope's approvability policy. Learn more.

Comment on lines +526 to +557
const branchPr = resolveThreadPr(resolvedActiveBranch, branchStatusQuery.data ?? null);
const branchPrStatus = prStatusIndicator(
branchPr,
branchStatusQuery.data?.sourceControlProvider,
);
// Action-oriented tooltip (the pill opens the PR), distinct from the sidebar's
// state-description tooltip.
const branchPrTooltip = branchPr
? `Open ${sourceControlPresentation.terminology.singular} #${branchPr.number} (${branchPr.state}) in browser`
: "";
const openPrLink = useCallback((event: MouseEvent<HTMLElement>, prUrl: string) => {
event.preventDefault();
event.stopPropagation();

const api = readLocalApi();
if (!api) {
toastManager.add({
type: "error",
title: "Link opening is unavailable.",
});
return;
}

void api.shell.openExternal(prUrl).catch((error) => {
toastManager.add(
stackedThreadToast({
type: "error",
title: "Unable to open pull request link",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all duplicated from sidebar? should be extracted to some shared hook/module

@TheIcarusWingsTheIcarusWingsJun 14, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Extracted into a shared useOpenPrLink hook (apps/web/src/lib/openPullRequestLink.ts) and updated both the sidebar and the composer branch selector to use it. Pushed in 91f6d6a7e.

@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 14, 2026 19:50

Dismissing prior approval to re-evaluate 91f6d6a

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 14, 2026
@TheIcarusWings
TheIcarusWingsforce-pushed the composer-bar-pr-pill branch 2 times, most recently from 81cf5c8 to 7c713b9CompareJune 14, 2026 21:23
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 14, 2026
TheIcarusWingsand others added 2 commits June 18, 2026 22:50
Render a small PR pill (icon + #number) to the left of the branch
selector in the bottom composer bar when the active branch has a pull
request. The pill is colored by PR state (open=emerald, merged=violet,
closed=zinc) via the shared prStatusIndicator, and clicking it opens the
PR in the system browser without opening the branch dropdown.
The tooltip is action-oriented ("Open pull request #N (state) in
browser") and uses the provider's terminology, distinct from the
sidebar's state-description tooltip.
Co-authored-by: codex <codex@users.noreply.github.com>
Address review feedback: the openPrLink handler was duplicated verbatim
between Sidebar and the composer branch selector. Extract it into a
shared lib/openPullRequestLink hook and use it from both call sites.
Co-authored-by: codex <codex@users.noreply.github.com>
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 19, 2026 05:56

Dismissing prior approval to re-evaluate 7a8a619

@juliusmarminge
juliusmarminge merged commit 494350c into pingdotgg:mainJun 19, 2026
15 checks passed
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@TheIcarusWings@juliusmarminge
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

feat(composer): clickable PR pill next to branch selector - #3065

Merged
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill
Jun 19, 2026
Merged

feat(composer): clickable PR pill next to branch selector#3065
juliusmarminge merged 2 commits into
pingdotgg:mainfrom
TheIcarusWings:composer-bar-pr-pill

Conversation

@TheIcarusWings

@TheIcarusWingsTheIcarusWings commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

What

Adds a small clickable PR pill next to the branch selector in the bottom composer bar. When the active branch has a pull request, the pill shows the PR icon + #<number>, colored by state:

  • open → emerald
  • merged → violet
  • closed → zinc

Clicking the pill opens the PR in the system browser. It sits to the left of the branch selector and does not open the branch dropdown (click is stopped/prevented).

Details

  • Reuses prStatusIndicator / ChangeRequestStatusIcon / resolveThreadPr from ThreadStatusIndicators.tsx, and the readLocalApi()?.shell.openExternal pattern for opening links.
  • Data comes from the existing useVcsStatus({ environmentId, cwd: branchCwd }) query already in BranchToolbarBranchSelector.tsx — no backend changes.
  • The pill renders as a sibling of the ComboboxTrigger inside a flex row; the toolbar layout classes were moved onto that wrapper so the branch group stays right-aligned.
  • Tooltip is action-oriented ("Open pull request #N (state) in browser") using the provider's terminology, distinct from the sidebar's state-description tooltip.
  • Works with cross-repo fork PRs (head TheIcarusWings, base pingdotgg/t3code) via the existing GitManager.findLatestPr detection.

Test

Switch the bottom-bar branch to one with an open PR and confirm the pill appears with the right color and opens the correct GitHub URL.


Note

Low Risk
UI-only composer/sidebar change that reuses existing VCS status and external-link behavior; no auth, data, or backend impact.

Overview
Adds a clickable PR pill to the left of the composer branch selector when the active branch has an associated change request. The pill shows the status icon and #number, uses existing state-based coloring from prStatusIndicator, and opens the PR in the system browser via a new shared hook.

useOpenPrLink centralizes opening external PR URLs: it stops click propagation/default (so the pill does not open the branch dropdown) and shows toasts when the local API is missing or openExternal fails. Sidebar thread-row PR clicks now use this hook instead of a duplicated inline handler.

Branch toolbar layout wraps the pill and ComboboxTrigger in a flex row; toolbar className moves to that wrapper. PR data still comes from the existing vcsEnvironment.status query—no API changes.

Reviewed by Cursor Bugbot for commit 7a8a619. Bugbot is set up for automated code reviews on this repo. Configure here.

Note

Add clickable PR status pill next to branch selector in toolbar

  • Adds a PR status pill (button) next to the branch selector in BranchToolbarBranchSelector.tsx that appears when the active branch has an associated PR; clicking it opens the PR URL externally.
  • Extracts the PR link-opening logic into a shared useOpenPrLink hook used by both the toolbar and Sidebar.tsx.
  • The pill shows the PR number, a status icon, and an action-oriented tooltip; errors surface as toasts when the local shell API is unavailable.
  • Behavioral Change: the className prop on BranchToolbarBranchSelector now applies to a new wrapper div rather than directly to ComboboxTrigger, which may affect styling if callers rely on that specificity.

Macroscope summarized 7a8a619.

@coderabbitai

coderabbitaiBot commented Jun 12, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: a285a3e9-f8f9-426f-9600-e27bb7a3bed2

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@github-actionsgithub-actionsBot added vouch:unvouched PR author is not yet trusted in the VOUCHED list. size:M 30-99 changed lines (additions + deletions). labels Jun 12, 2026
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 12, 2026
@macroscopeapp

macroscopeappBot commented Jun 12, 2026

Copy link
Copy Markdown
Contributor

Approvability

Verdict: Approved

Small UI feature adding a clickable PR indicator pill next to the branch selector. Changes are self-contained: extracts existing link-opening logic into a shared hook (refactor) and adds conditional UI rendering using existing utilities. No security, schema, or significant runtime behavior changes.

You can customize Macroscope's approvability policy. Learn more.

Comment on lines +526 to +557
const branchPr = resolveThreadPr(resolvedActiveBranch, branchStatusQuery.data ?? null);
const branchPrStatus = prStatusIndicator(
branchPr,
branchStatusQuery.data?.sourceControlProvider,
);
// Action-oriented tooltip (the pill opens the PR), distinct from the sidebar's
// state-description tooltip.
const branchPrTooltip = branchPr
? `Open ${sourceControlPresentation.terminology.singular} #${branchPr.number} (${branchPr.state}) in browser`
: "";
const openPrLink = useCallback((event: MouseEvent<HTMLElement>, prUrl: string) => {
event.preventDefault();
event.stopPropagation();

const api = readLocalApi();
if (!api) {
toastManager.add({
type: "error",
title: "Link opening is unavailable.",
});
return;
}

void api.shell.openExternal(prUrl).catch((error) => {
toastManager.add(
stackedThreadToast({
type: "error",
title: "Unable to open pull request link",
description: error instanceof Error ? error.message : "An error occurred.",
}),
);
});

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is all duplicated from sidebar? should be extracted to some shared hook/module

@TheIcarusWingsTheIcarusWingsJun 14, 2026

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. Extracted into a shared useOpenPrLink hook (apps/web/src/lib/openPullRequestLink.ts) and updated both the sidebar and the composer branch selector to use it. Pushed in 91f6d6a7e.

@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 14, 2026 19:50

Dismissing prior approval to re-evaluate 91f6d6a

@github-actionsgithub-actionsBot added size:L 100-499 changed lines (additions + deletions). and removed size:M 30-99 changed lines (additions + deletions). labels Jun 14, 2026
@TheIcarusWings
TheIcarusWingsforce-pushed the composer-bar-pr-pill branch 2 times, most recently from 81cf5c8 to 7c713b9CompareJune 14, 2026 21:23
macroscopeapp[bot]
macroscopeappBot previously approved these changes Jun 14, 2026
TheIcarusWingsand others added 2 commits June 18, 2026 22:50
Render a small PR pill (icon + #number) to the left of the branch
selector in the bottom composer bar when the active branch has a pull
request. The pill is colored by PR state (open=emerald, merged=violet,
closed=zinc) via the shared prStatusIndicator, and clicking it opens the
PR in the system browser without opening the branch dropdown.
The tooltip is action-oriented ("Open pull request #N (state) in
browser") and uses the provider's terminology, distinct from the
sidebar's state-description tooltip.
Co-authored-by: codex <codex@users.noreply.github.com>
Address review feedback: the openPrLink handler was duplicated verbatim
between Sidebar and the composer branch selector. Extract it into a
shared lib/openPullRequestLink hook and use it from both call sites.
Co-authored-by: codex <codex@users.noreply.github.com>
@macroscopeapp
macroscopeappBot dismissed their stale reviewJune 19, 2026 05:56

Dismissing prior approval to re-evaluate 7a8a619

@juliusmarminge
juliusmarminge merged commit 494350c into pingdotgg:mainJun 19, 2026
15 checks passed
NeilTheFisher pushed a commit to NeilTheFisher/t3code that referenced this pull request Aug 18, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
darjss pushed a commit to darjss/t3code that referenced this pull request Aug 26, 2026
…3065)
Co-authored-by: codex <codex@users.noreply.github.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L100-499 changed lines (additions + deletions).vouch:unvouchedPR author is not yet trusted in the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@TheIcarusWings@juliusmarminge