@@ -5,7 +5,7 @@
 // asserted here is the one a reader would click.
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { linkifyBareUrls } from '../components/V2MessageRow';
+import { linkifyBareUrls, prUrlsToRefLinks } from '../components/V2MessageRow';
 import V2GithubPrCard from '../components/V2GithubPrCard';
 
 const RealReactMarkdown = jest.requireActual('../../../node_modules/react-markdown/index.js').default;
@@ -55,4 +55,40 @@ describe('bare URL linkification through the real react-markdown', () => {
       global.fetch = previousFetch;
     }
   });
+
+  // TASK-382. A PR URL that gets a card is replaced by a short owner/repo#N link,
+  // so the sentence keeps its punctuation and words. Checked through the real renderer.
+  // TASK-382 review: a PR URL already inside `[label](url)` must not be nested into a second link.
+  it('a PR URL that is already a markdown link keeps its label and href', () => {
+    const { container, unmount } = render(
+      <RealReactMarkdown>{prUrlsToRefLinks('see [the PR](https://github.com/Team-Commonly/commonly/pull/12) now')}</RealReactMarkdown>,
+    );
+    const links = Array.from(container.querySelectorAll('a'));
+    const text = container.textContent;
+    unmount();
+    expect(links).toHaveLength(1);
+    expect(links[0].textContent).toBe('the PR');
+    expect(links[0]).toHaveAttribute('href', 'https://github.com/Team-Commonly/commonly/pull/12');
+    expect(text).toBe('see the PR now');
+  });
+
+  it('a PR URL in a sentence reads as a short ref, with its punctuation intact', () => {
+    const { container, unmount } = render(
+      <RealReactMarkdown>{prUrlsToRefLinks('Review: https://github.com/Team-Commonly/commonly/pull/12. Then merge.')}</RealReactMarkdown>,
+    );
+    const text = container.textContent;
+    const href = container.querySelector('a')?.getAttribute('href');
+    unmount();
+    expect(text).toBe('Review: Team-Commonly/commonly#12. Then merge.');
+    expect(href).toBe('https://github.com/Team-Commonly/commonly/pull/12');
+  });
+
+  it('a PR URL mid-sentence keeps the words around it', () => {
+    const { container, unmount } = render(
+      <RealReactMarkdown>{prUrlsToRefLinks('see https://github.com/Team-Commonly/commonly/pull/13 for the fix')}</RealReactMarkdown>,
+    );
+    const text = container.textContent;
+    unmount();
+    expect(text).toBe('see Team-Commonly/commonly#13 for the fix');
+  });
 });
@@ -68,7 +68,8 @@ describe('V2MessageRow', () => {
       );
       expect(await screen.findByRole('link', { name: 'Pull request #374101: Card loads' })).toBeInTheDocument();
       const text = container.querySelector('[data-testid="react-markdown"]').textContent;
-      expect(text).not.toContain('github.com/Team-Commonly/commonly/pull/374101');
+      // TASK-382: the sentence keeps a short ref (anchor asserted in realMarkdown); the card is the only anchor here.
+      expect(text).toContain('[Team-Commonly/commonly#374101](https://github.com/Team-Commonly/commonly/pull/374101)');
       expect(container.querySelectorAll('a[href*="pull/374101"]')).toHaveLength(1);
     } finally {
       global.fetch = previousFetch;
 
@@ -201,6 +201,18 @@ const MARKDOWN_IMAGE_RE = /^!\[[^\]]*\]\(([^)]+)\)$/;
 // so does a closing paren the URL does not open. Brackets are escaped in the link
 // text and percent-encoded in the destination, so a `]` or `(` in a URL cannot
 // close the markdown link early and leave the URL as plain text.
+// A PR URL that gets a card is replaced in the sentence by a short owner/repo#N
+// link, so the sentence keeps its words and punctuation ("Review: o/r#12.") and
+// the card below carries the detail. Removing the URL instead left stray
+// separators behind ("Review: ." and "see  for it").
+export const prUrlsToRefLinks = (text: string): string => text.replace(
+  // A URL already inside link syntax (`[label](url)`, `<url>`, `[url]`) is left alone.
+  /(?<![(<[])https?:\/\/github\.com\/([\w.-]+)\/([\w.-]+)\/pull\/(\d+)(?=\b|$)/g,
+  (_match, owner: string, repo: string, num: string) => (
+    `[${owner}/${repo}#${num}](https://github.com/${owner}/${repo}/pull/${num})`
+  ),
+);
+
 const LINK_DEST_ENCODE: Record<string, string> = { '(': '%28', ')': '%29', '[': '%5B', ']': '%5D', '\\': '%5C' };
 export const linkifyBareUrls = (text: string): string => text.replace(
   /(?<![(<[])https?:\/\/[^\s<>"]+/g,
@@ -540,7 +552,7 @@ const V2MessageRow: React.FC<V2MessageRowProps> = ({ message, sourceMessageId, d
   const prRefs = imageUrl ? [] : parseGithubPrUrls(afterFiles);
   let stripped = afterFiles;
   if (prRefs.length > 0) {
-    stripped = afterFiles.replace(/https?:\/\/github\.com\/[\w.-]+\/[\w.-]+\/pull\/\d+(?=\b|$)/g, '').trim();
+    stripped = prUrlsToRefLinks(afterFiles).trim();
   }
   // Auto-linkify bare http(s) URLs that aren't already inside markdown link
   // syntax. Without this, agents posting raw URLs render as plain text and