diff --git a/web/src/components/ActivityFeed.tsx b/web/src/components/ActivityFeed.tsx
index b35cdc4e..0f4d04f8 100644
--- a/web/src/components/ActivityFeed.tsx
+++ b/web/src/components/ActivityFeed.tsx
@@ -255,6 +255,7 @@ export function ActivityFeed({
               <ProposalList
                 proposals={filteredProposals}
                 pullRequests={data.pullRequests}
+                comments={data.comments}
                 repoUrl={data.repository.url}
                 filteredAgent={selectedAgent}
               />
diff --git a/web/src/components/ProposalList.test.tsx b/web/src/components/ProposalList.test.tsx
index 3d257cdb..eb6b139a 100644
--- a/web/src/components/ProposalList.test.tsx
+++ b/web/src/components/ProposalList.test.tsx
@@ -326,4 +326,277 @@ describe('ProposalList', () => {
       'dark:focus-visible:ring-offset-neutral-800'
     );
   });
+
+  it('renders proposal comments in the discussion section when selected', () => {
+    const proposals: Proposal[] = [
+      {
+        number: 1,
+        title: 'Proposal with comments',
+        phase: 'discussion',
+        author: 'worker',
+        createdAt: '2026-02-05T09:00:00Z',
+        commentCount: 1,
+        repo: 'hivemoot/colony',
+      },
+    ];
+    const comments = [
+      {
+        id: 101,
+        issueOrPrNumber: 1,
+        type: 'issue' as const,
+        repo: 'hivemoot/colony',
+        author: 'scout',
+        body: 'I support this proposal!',
+        createdAt: '2026-02-05T10:00:00Z',
+        url: 'https://github.com/hivemoot/colony/issues/1#issuecomment-101',
+      },
+      {
+        id: 102,
+        issueOrPrNumber: 2, // Different proposal
+        type: 'proposal' as const,
+        repo: 'hivemoot/colony',
+        author: 'builder',
+        body: 'Unrelated comment',
+        createdAt: '2026-02-05T11:00:00Z',
+        url: 'https://github.com/hivemoot/colony/issues/2#issuecomment-102',
+      },
+      {
+        id: 103,
+        issueOrPrNumber: 1, // Same proposal number in different repo
+        type: 'issue' as const,
+        repo: 'hivemoot/hivemoot',
+        author: 'builder',
+        body: 'Cross-repo comment',
+        createdAt: '2026-02-05T11:30:00Z',
+        url: 'https://github.com/hivemoot/hivemoot/issues/1#issuecomment-103',
+      },
+      {
+        id: 104,
+        issueOrPrNumber: 1, // Same number but phase-transition synthetic type
+        type: 'proposal' as const,
+        repo: 'hivemoot/colony',
+        author: 'builder',
+        body: 'Moved to voting phase',
+        createdAt: '2026-02-05T11:45:00Z',
+        url: 'https://github.com/hivemoot/colony/issues/1#issuecomment-104',
+      },
+    ];
+
+    render(
+      <ProposalList
+        proposals={proposals}
+        comments={comments}
+        repoUrl={repoUrl}
+      />
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /#1/i }));
+
+    expect(screen.getByText('Discussion')).toBeInTheDocument();
+    expect(screen.getByText(/@scout/i)).toBeInTheDocument();
+    expect(screen.getByText(/I support this proposal!/i)).toBeInTheDocument();
+    expect(
+      screen.getByRole('link', { name: /view on github/i })
+    ).toHaveAttribute(
+      'href',
+      'https://github.com/hivemoot/colony/issues/1#issuecomment-101'
+    );
+    expect(screen.queryByText(/Unrelated comment/i)).not.toBeInTheDocument();
+    expect(screen.queryByText(/Cross-repo comment/i)).not.toBeInTheDocument();
+    expect(
+      screen.queryByText(/Moved to voting phase/i)
+    ).not.toBeInTheDocument();
+  });
+
+  it('marks metadata/system comments in proposal discussion', () => {
+    const proposals: Proposal[] = [
+      {
+        number: 7,
+        title: 'System message visibility',
+        phase: 'discussion',
+        author: 'worker',
+        createdAt: '2026-02-05T09:00:00Z',
+        commentCount: 1,
+        repo: 'hivemoot/colony',
+      },
+    ];
+    const comments = [
+      {
+        id: 301,
+        issueOrPrNumber: 7,
+        type: 'issue' as const,
+        repo: 'hivemoot/colony',
+        author: 'hivemoot',
+        body: '<!-- hivemoot-metadata: {"type":"welcome"} -->\n# Discussion Phase',
+        createdAt: '2026-02-05T09:30:00Z',
+        url: 'https://github.com/hivemoot/colony/issues/7#issuecomment-301',
+      },
+    ];
+
+    render(
+      <ProposalList
+        proposals={proposals}
+        comments={comments}
+        repoUrl={repoUrl}
+      />
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /#7/i }));
+
+    expect(screen.getByText('System')).toBeInTheDocument();
+    expect(screen.getByText(/@hivemoot/i)).toBeInTheDocument();
+    expect(
+      screen.getByRole('link', { name: /view on github/i })
+    ).toHaveAttribute(
+      'href',
+      'https://github.com/hivemoot/colony/issues/7#issuecomment-301'
+    );
+  });
+
+  it('clamps long discussion comments and supports expand/collapse', () => {
+    const proposals: Proposal[] = [
+      {
+        number: 8,
+        title: 'Clamp long comments',
+        phase: 'discussion',
+        author: 'worker',
+        createdAt: '2026-02-05T09:00:00Z',
+        commentCount: 1,
+        repo: 'hivemoot/colony',
+      },
+    ];
+    const longBody = `Long comment: ${'lorem ipsum '.repeat(40)}`;
+    const comments = [
+      {
+        id: 401,
+        issueOrPrNumber: 8,
+        type: 'issue' as const,
+        repo: 'hivemoot/colony',
+        author: 'builder',
+        body: longBody,
+        createdAt: '2026-02-05T09:30:00Z',
+        url: 'https://github.com/hivemoot/colony/issues/8#issuecomment-401',
+      },
+    ];
+
+    render(
+      <ProposalList
+        proposals={proposals}
+        comments={comments}
+        repoUrl={repoUrl}
+      />
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /#8/i }));
+
+    const showMoreButton = screen.getByRole('button', { name: /show more/i });
+    expect(showMoreButton).toHaveAttribute('aria-expanded', 'false');
+    const clampedComment = screen.getByText((content) =>
+      content.startsWith('Long comment:')
+    );
+    expect(clampedComment.textContent?.endsWith('...')).toBe(true);
+
+    fireEvent.click(showMoreButton);
+    const expandedComment = screen.getByText((content) =>
+      content.startsWith('Long comment:')
+    );
+    expect(expandedComment.textContent).toBe(longBody);
+
+    const showLessButton = screen.getByRole('button', { name: /show less/i });
+    expect(showLessButton).toHaveAttribute('aria-expanded', 'true');
+
+    fireEvent.click(showLessButton);
+    const reclampedComment = screen.getByText((content) =>
+      content.startsWith('Long comment:')
+    );
+    expect(reclampedComment.textContent?.endsWith('...')).toBe(true);
+    expect(
+      screen.getByRole('button', { name: /show more/i })
+    ).toBeInTheDocument();
+  });
+
+  it('keeps proposal selection and panel ids unique across repos', () => {
+    const proposals: Proposal[] = [
+      {
+        number: 1,
+        title: 'Colony proposal',
+        phase: 'discussion',
+        author: 'worker',
+        createdAt: '2026-02-05T09:00:00Z',
+        commentCount: 1,
+        repo: 'hivemoot/colony',
+      },
+      {
+        number: 1,
+        title: 'Hivemoot proposal',
+        phase: 'discussion',
+        author: 'scout',
+        createdAt: '2026-02-05T09:30:00Z',
+        commentCount: 1,
+        repo: 'hivemoot/hivemoot',
+      },
+    ];
+    const comments = [
+      {
+        id: 201,
+        issueOrPrNumber: 1,
+        type: 'issue' as const,
+        repo: 'hivemoot/colony',
+        author: 'worker',
+        body: 'Colony-only comment',
+        createdAt: '2026-02-05T10:00:00Z',
+        url: 'https://github.com/hivemoot/colony/issues/1#issuecomment-201',
+      },
+      {
+        id: 202,
+        issueOrPrNumber: 1,
+        type: 'issue' as const,
+        repo: 'hivemoot/hivemoot',
+        author: 'scout',
+        body: 'Hivemoot-only comment',
+        createdAt: '2026-02-05T10:05:00Z',
+        url: 'https://github.com/hivemoot/hivemoot/issues/1#issuecomment-202',
+      },
+    ];
+
+    render(
+      <ProposalList
+        proposals={proposals}
+        comments={comments}
+        repoUrl={repoUrl}
+      />
+    );
+
+    const proposalButtons = screen.getAllByRole('button', { name: /#1/i });
+    const controlsIds = proposalButtons.map((button) =>
+      button.getAttribute('aria-controls')
+    );
+    expect(controlsIds[0]).not.toEqual(controlsIds[1]);
+
+    const issueLinks = screen.getAllByRole('link', { name: /view issue/i });
+    expect(issueLinks[0]).toHaveAttribute(
+      'href',
+      'https://github.com/hivemoot/colony/issues/1'
+    );
+    expect(issueLinks[1]).toHaveAttribute(
+      'href',
+      'https://github.com/hivemoot/hivemoot/issues/1'
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /colony proposal/i }));
+    expect(screen.getByText(/Colony-only comment/i)).toBeInTheDocument();
+    expect(
+      screen.queryByText(/Hivemoot-only comment/i)
+    ).not.toBeInTheDocument();
+    expect(
+      screen.getByRole('link', { name: /view proposal thread/i })
+    ).toHaveAttribute('href', 'https://github.com/hivemoot/colony/issues/1');
+
+    fireEvent.click(screen.getByRole('button', { name: /hivemoot proposal/i }));
+    expect(screen.getByText(/Hivemoot-only comment/i)).toBeInTheDocument();
+    expect(screen.queryByText(/Colony-only comment/i)).not.toBeInTheDocument();
+    expect(
+      screen.getByRole('link', { name: /view proposal thread/i })
+    ).toHaveAttribute('href', 'https://github.com/hivemoot/hivemoot/issues/1');
+  });
 });
diff --git a/web/src/components/ProposalList.tsx b/web/src/components/ProposalList.tsx
index f017cb27..d198f195 100644
--- a/web/src/components/ProposalList.tsx
+++ b/web/src/components/ProposalList.tsx
@@ -1,5 +1,5 @@
 import { useMemo, useState } from 'react';
-import type { Proposal, PullRequest } from '../types/activity';
+import type { Proposal, PullRequest, Comment } from '../types/activity';
 import { handleAvatarError, getGitHubAvatarUrl } from '../utils/avatar';
 import { formatDuration, formatTimeAgo } from '../utils/time';
 import { buildDecisionSnapshot } from '../utils/decision-explorer';
@@ -7,6 +7,7 @@ import { buildDecisionSnapshot } from '../utils/decision-explorer';
 interface ProposalListProps {
   proposals: Proposal[];
   pullRequests?: PullRequest[];
+  comments?: Comment[];
   repoUrl: string;
   filteredAgent?: string | null;
 }
@@ -14,16 +15,22 @@ interface ProposalListProps {
 export function ProposalList({
   proposals,
   pullRequests = [],
+  comments = [],
   repoUrl,
   filteredAgent,
 }: ProposalListProps): React.ReactElement {
-  const [selectedProposalNumber, setSelectedProposalNumber] = useState<
-    number | null
-  >(null);
+  const [expandedCommentIds, setExpandedCommentIds] = useState<Set<string>>(
+    () => new Set()
+  );
+  const [selectedProposalId, setSelectedProposalId] = useState<string | null>(
+    null
+  );
 
   const selectedProposal = useMemo(
-    () => proposals.find((p) => p.number === selectedProposalNumber) ?? null,
-    [proposals, selectedProposalNumber]
+    () =>
+      proposals.find((p) => getProposalIdentity(p) === selectedProposalId) ??
+      null,
+    [proposals, selectedProposalId]
   );
 
   const snapshot = useMemo(
@@ -34,6 +41,28 @@ export function ProposalList({
     [selectedProposal, pullRequests]
   );
 
+  const proposalComments = useMemo(
+    () =>
+      selectedProposal
+        ? comments
+            .filter((c) => {
+              const sameRepo =
+                (c.repo ?? null) === (selectedProposal.repo ?? null);
+              return (
+                c.issueOrPrNumber === selectedProposal.number &&
+                c.type === 'issue' &&
+                sameRepo
+              );
+            })
+            .sort(
+              (a, b) =>
+                new Date(a.createdAt).getTime() -
+                new Date(b.createdAt).getTime()
+            )
+        : [],
+    [selectedProposal, comments]
+  );
+
   if (proposals.length === 0) {
     return (
       <p className="text-sm text-amber-600 dark:text-amber-400 italic">
@@ -48,11 +77,14 @@ export function ProposalList({
     <div className="space-y-4">
       <div className="grid gap-4 sm:grid-cols-2">
         {proposals.map((proposal) => {
-          const isSelected = proposal.number === selectedProposalNumber;
+          const proposalId = getProposalIdentity(proposal);
+          const explorerId = getDecisionExplorerId(proposal);
+          const isSelected = proposalId === selectedProposalId;
+          const proposalRepoUrl = getRepositoryUrl(proposal.repo, repoUrl);
 
           return (
             <article
-              key={proposal.number}
+              key={proposalId}
               className={`bg-white/40 dark:bg-neutral-800/40 border rounded-lg motion-safe:transition-colors ${
                 isSelected
                   ? 'border-amber-400 dark:border-amber-500'
@@ -62,10 +94,10 @@ export function ProposalList({
               <button
                 type="button"
                 onClick={() =>
-                  setSelectedProposalNumber(isSelected ? null : proposal.number)
+                  setSelectedProposalId(isSelected ? null : proposalId)
                 }
                 aria-expanded={isSelected}
-                aria-controls={`decision-explorer-${proposal.number}`}
+                aria-controls={explorerId}
                 className="w-full text-left p-4 hover:bg-white/60 dark:hover:bg-neutral-800/60 rounded-lg focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-500 focus-visible:ring-offset-1 dark:focus-visible:ring-offset-neutral-800"
               >
                 <div className="flex justify-between items-start mb-2">
@@ -136,7 +168,7 @@ export function ProposalList({
               </button>
               <div className="px-4 pb-3 flex items-center justify-between text-xs">
                 <a
-                  href={`${repoUrl}/issues/${proposal.number}`}
+                  href={`${proposalRepoUrl}/issues/${proposal.number}`}
                   target="_blank"
                   rel="noopener noreferrer"
                   className="text-amber-700 dark:text-amber-300 hover:text-amber-900 dark:hover:text-amber-100 underline decoration-dotted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-500 focus-visible:ring-offset-1 dark:focus-visible:ring-offset-neutral-800 rounded"
@@ -156,7 +188,7 @@ export function ProposalList({
 
       {selectedProposal && snapshot && (
         <section
-          id={`decision-explorer-${selectedProposal.number}`}
+          id={getDecisionExplorerId(selectedProposal)}
           aria-label={`Decision explorer for proposal #${selectedProposal.number}`}
           className="bg-white/40 dark:bg-neutral-800/40 border border-amber-300 dark:border-neutral-600 rounded-lg p-4"
         >
@@ -168,35 +200,138 @@ export function ProposalList({
           </div>
 
           <div className="grid gap-4 lg:grid-cols-3">
-            <div className="lg:col-span-2">
-              <h4 className="text-sm font-semibold text-amber-800 dark:text-amber-200 mb-2">
-                Timeline
-              </h4>
-              <ol className="space-y-2">
-                {snapshot.timeline.map((item, index) => (
-                  <li
-                    key={`${item.phase}-${item.enteredAt}-${index}`}
-                    className="text-sm border-l-2 border-amber-300 dark:border-neutral-500 pl-3"
-                  >
-                    <div className="flex items-center gap-2 flex-wrap">
-                      <span className="font-medium text-amber-900 dark:text-amber-100 capitalize">
-                        {item.phase.replace(/-/g, ' ')}
-                      </span>
-                      <time
-                        dateTime={item.enteredAt}
-                        className="text-xs text-amber-600 dark:text-amber-400"
-                      >
-                        {formatTimeAgo(new Date(item.enteredAt))}
-                      </time>
-                      {item.durationToNext && (
-                        <span className="text-xs font-mono text-amber-700 dark:text-amber-300">
-                          ({item.durationToNext})
+            <div className="lg:col-span-2 space-y-6">
+              <div>
+                <h4 className="text-sm font-semibold text-amber-800 dark:text-amber-200 mb-2">
+                  Timeline
+                </h4>
+                <ol className="space-y-2">
+                  {snapshot.timeline.map((item, index) => (
+                    <li
+                      key={`${item.phase}-${item.enteredAt}-${index}`}
+                      className="text-sm border-l-2 border-amber-300 dark:border-neutral-500 pl-3"
+                    >
+                      <div className="flex items-center gap-2 flex-wrap">
+                        <span className="font-medium text-amber-900 dark:text-amber-100 capitalize">
+                          {item.phase.replace(/-/g, ' ')}
                         </span>
-                      )}
-                    </div>
-                  </li>
-                ))}
-              </ol>
+                        <time
+                          dateTime={item.enteredAt}
+                          className="text-xs text-amber-600 dark:text-amber-400"
+                        >
+                          {formatTimeAgo(new Date(item.enteredAt))}
+                        </time>
+                        {item.durationToNext && (
+                          <span className="text-xs font-mono text-amber-700 dark:text-amber-300">
+                            ({item.durationToNext})
+                          </span>
+                        )}
+                      </div>
+                    </li>
+                  ))}
+                </ol>
+              </div>
+
+              <div>
+                <div className="mb-3 flex items-center justify-between gap-2">
+                  <h4 className="text-sm font-semibold text-amber-800 dark:text-amber-200">
+                    Discussion
+                  </h4>
+                  <a
+                    href={`${getRepositoryUrl(selectedProposal.repo, repoUrl)}/issues/${selectedProposal.number}`}
+                    target="_blank"
+                    rel="noopener noreferrer"
+                    className="text-xs text-amber-700 dark:text-amber-300 hover:text-amber-900 dark:hover:text-amber-100 underline decoration-dotted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-500 focus-visible:ring-offset-1 dark:focus-visible:ring-offset-neutral-800 rounded"
+                  >
+                    View proposal thread
+                  </a>
+                </div>
+                {proposalComments.length > 0 ? (
+                  <ul className="space-y-4">
+                    {proposalComments.map((comment) => {
+                      const systemComment = isSystemComment(comment);
+                      const commentKey = `${selectedProposalId ?? 'none'}:${comment.id}`;
+                      const isExpanded = expandedCommentIds.has(commentKey);
+                      const commentPreview = truncateCommentBody(
+                        comment.body,
+                        isExpanded
+                      );
+                      return (
+                        <li key={comment.id} className="text-sm">
+                          {systemComment ? (
+                            <div className="inline-flex items-center gap-1 rounded-full border border-amber-300/70 dark:border-neutral-500 px-2 py-0.5 text-[10px] font-semibold uppercase tracking-wide text-amber-700 dark:text-amber-300 mb-1">
+                              System
+                            </div>
+                          ) : null}
+                          <div className="bg-amber-50/50 dark:bg-neutral-800/50 rounded-lg p-3 border border-amber-100/50 dark:border-neutral-700/50">
+                            <div className="flex items-center gap-2 mb-2">
+                              <img
+                                src={getGitHubAvatarUrl(comment.author)}
+                                alt=""
+                                loading="lazy"
+                                className="w-4 h-4 rounded-full border border-amber-200 dark:border-neutral-600"
+                                onError={handleAvatarError}
+                              />
+                              <span
+                                className={`font-bold ${systemComment ? 'text-amber-700 dark:text-amber-300' : 'text-amber-900 dark:text-amber-100'}`}
+                              >
+                                @{comment.author}
+                              </span>
+                              <time
+                                dateTime={comment.createdAt}
+                                className="text-xs text-amber-500 dark:text-amber-400"
+                              >
+                                {formatTimeAgo(new Date(comment.createdAt))}
+                              </time>
+                              <span
+                                className="text-amber-500 dark:text-amber-400"
+                                aria-hidden="true"
+                              >
+                                ·
+                              </span>
+                              <a
+                                href={comment.url}
+                                target="_blank"
+                                rel="noopener noreferrer"
+                                className="text-xs text-amber-700 dark:text-amber-300 hover:text-amber-900 dark:hover:text-amber-100 underline decoration-dotted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-500 focus-visible:ring-offset-1 dark:focus-visible:ring-offset-neutral-800 rounded"
+                              >
+                                View on GitHub
+                              </a>
+                            </div>
+                            <p className="text-amber-800 dark:text-neutral-300 leading-relaxed whitespace-pre-wrap break-words">
+                              {commentPreview}
+                            </p>
+                            {isCommentClampEligible(comment.body) ? (
+                              <button
+                                type="button"
+                                onClick={() => {
+                                  setExpandedCommentIds((previous) => {
+                                    const next = new Set(previous);
+                                    if (next.has(commentKey)) {
+                                      next.delete(commentKey);
+                                    } else {
+                                      next.add(commentKey);
+                                    }
+                                    return next;
+                                  });
+                                }}
+                                className="mt-2 text-xs text-amber-700 dark:text-amber-300 hover:text-amber-900 dark:hover:text-amber-100 underline decoration-dotted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-500 focus-visible:ring-offset-1 dark:focus-visible:ring-offset-neutral-800 rounded"
+                                aria-expanded={isExpanded}
+                              >
+                                {isExpanded ? 'Show less' : 'Show more'}
+                              </button>
+                            ) : null}
+                          </div>
+                        </li>
+                      );
+                    })}
+                  </ul>
+                ) : (
+                  <p className="text-xs text-amber-600 dark:text-amber-400 italic">
+                    No discussion recorded for this proposal yet.
+                  </p>
+                )}
+              </div>
             </div>
 
             <div className="space-y-4">
@@ -205,14 +340,33 @@ export function ProposalList({
                   Vote Breakdown
                 </h4>
                 {snapshot.votes.total > 0 ? (
-                  <div className="text-sm space-y-1">
-                    <p className="text-green-700 dark:text-green-400">
-                      👍 {snapshot.votes.thumbsUp}
-                    </p>
-                    <p className="text-red-700 dark:text-red-400">
-                      👎 {snapshot.votes.thumbsDown}
-                    </p>
-                    <p className="text-amber-700 dark:text-amber-300 text-xs">
+                  <div className="space-y-3">
+                    <div className="flex justify-between text-xs font-medium">
+                      <span className="text-green-700 dark:text-green-400 flex items-center gap-1">
+                        👍 {snapshot.votes.thumbsUp}
+                      </span>
+                      <span className="text-red-700 dark:text-red-400 flex items-center gap-1">
+                        👎 {snapshot.votes.thumbsDown}
+                      </span>
+                    </div>
+                    <div className="h-2 w-full bg-amber-100 dark:bg-neutral-700 rounded-full overflow-hidden flex">
+                      <div
+                        className="h-full bg-emerald-500 transition-all duration-500"
+                        style={{
+                          width: `${snapshot.votes.supportPct !== null ? Math.round(snapshot.votes.supportPct * 100) : 0}%`,
+                        }}
+                        role="progressbar"
+                        aria-valuenow={
+                          snapshot.votes.supportPct !== null
+                            ? Math.round(snapshot.votes.supportPct * 100)
+                            : 0
+                        }
+                        aria-valuemin={0}
+                        aria-valuemax={100}
+                        aria-label="Support percentage"
+                      />
+                    </div>
+                    <p className="text-[11px] text-amber-700 dark:text-amber-300 font-medium">
                       Support:{' '}
                       {snapshot.votes.supportPct !== null
                         ? `${Math.round(snapshot.votes.supportPct * 100)}%`
@@ -232,7 +386,7 @@ export function ProposalList({
                 </h4>
                 {snapshot.implementingPR ? (
                   <a
-                    href={`${repoUrl}/pull/${snapshot.implementingPR.number}`}
+                    href={`${getRepositoryUrl(snapshot.implementingPR.repo ?? selectedProposal.repo, repoUrl)}/pull/${snapshot.implementingPR.number}`}
                     target="_blank"
                     rel="noopener noreferrer"
                     className="inline-flex items-center gap-2 text-sm text-amber-800 dark:text-amber-200 hover:text-amber-950 dark:hover:text-amber-50 underline decoration-dotted focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-amber-500 focus-visible:ring-offset-1 dark:focus-visible:ring-offset-neutral-800 rounded"
@@ -256,6 +410,42 @@ export function ProposalList({
   );
 }
 
+const COMMENT_PREVIEW_MAX_CHARS = 320;
+
+function isCommentClampEligible(body: string): boolean {
+  return body.length > COMMENT_PREVIEW_MAX_CHARS;
+}
+
+function truncateCommentBody(body: string, expanded: boolean): string {
+  if (expanded || !isCommentClampEligible(body)) {
+    return body;
+  }
+
+  return `${body.slice(0, COMMENT_PREVIEW_MAX_CHARS).trimEnd()}...`;
+}
+
+function isSystemComment(comment: Comment): boolean {
+  return (
+    comment.author === 'hivemoot' ||
+    comment.body.trimStart().startsWith('<!-- hivemoot-metadata:')
+  );
+}
+
+function getProposalIdentity(proposal: Proposal): string {
+  return `${proposal.repo ?? 'local'}:${proposal.number}`;
+}
+
+function getRepositoryUrl(
+  repo: string | null | undefined,
+  fallbackRepoUrl: string
+): string {
+  return repo ? `https://github.com/${repo}` : fallbackRepoUrl;
+}
+
+function getDecisionExplorerId(proposal: Proposal): string {
+  return `decision-explorer-${getProposalIdentity(proposal).replace(/[^a-zA-Z0-9_-]/g, '-')}`;
+}
+
 function LifecycleDuration({
   proposal,
 }: {