From 543e5c5ff7021a6aa059bdcaf69446f74b257396 Mon Sep 17 00:00:00 2001
From: Mayursinh Sarvaiya <marvinduff97@gmail.com>
Date: Tue, 18 Aug 2026 16:45:27 +0530
Subject: [PATCH 1/8] feat: add name field in creation wizard

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
---
 .../features/common/subscription-name-tag.tsx | 34 +++++++++++++++++++
 .../create-warehouse-wizard.tsx               |  6 ++--
 .../create-warehouse/subscription-wizard.tsx  | 26 ++++++++++----
 3 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 ui/src/features/common/subscription-name-tag.tsx

diff --git a/ui/src/features/common/subscription-name-tag.tsx b/ui/src/features/common/subscription-name-tag.tsx
new file mode 100644
index 0000000000..a2010bd89d
--- /dev/null
+++ b/ui/src/features/common/subscription-name-tag.tsx
@@ -0,0 +1,34 @@
+import { faTag } from '@fortawesome/free-solid-svg-icons';
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
+import { Tag } from 'antd';
+import classNames from 'classnames';
+
+// SubscriptionNameTag renders the optional name of a Warehouse subscription. A
+// subscription carries its name onto everything it produces -- discovered
+// artifacts and Freight -- so the same name surfaces in many unrelated views.
+// Rendering it through this one component keeps it recognizable as a
+// subscription name wherever it appears. Renders nothing when there is no name,
+// so callers can drop it in without guarding.
+export const SubscriptionNameTag = ({
+  name,
+  className
+}: {
+  name?: string;
+  className?: string;
+}) => {
+  if (!name) {
+    return null;
+  }
+
+  return (
+    <Tag
+      bordered={false}
+      color='blue'
+      title={`subscription: ${name}`}
+      className={classNames('font-mono', className)}
+    >
+      <FontAwesomeIcon icon={faTag} className='mr-1' />
+      {name}
+    </Tag>
+  );
+};
diff --git a/ui/src/features/stage/create-warehouse/create-warehouse-wizard.tsx b/ui/src/features/stage/create-warehouse/create-warehouse-wizard.tsx
index 419d427516..a046198177 100644
--- a/ui/src/features/stage/create-warehouse/create-warehouse-wizard.tsx
+++ b/ui/src/features/stage/create-warehouse/create-warehouse-wizard.tsx
@@ -93,15 +93,15 @@ export const CreateWarehouseWizard = (props: CreateWarehouseWizardProps) => {
 
         <SubscriptionWizard
           subscriptions={subscriptions}
-          onChange={(subscriptions) =>
+          onChange={(subscriptions) => {
             setFormState({
               ...formState,
               spec: {
                 ...(formState?.spec || {}),
                 subscriptions
               }
-            })
-          }
+            });
+          }}
         />
       </div>
     </RjsfConfigContext.Provider>
diff --git a/ui/src/features/stage/create-warehouse/subscription-wizard.tsx b/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
index e546a481b3..ad77d445a0 100644
--- a/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
+++ b/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
@@ -3,7 +3,7 @@ import { faEye, faTrash, IconDefinition } from '@fortawesome/free-solid-svg-icon
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import Form from '@rjsf/antd';
 import validator from '@rjsf/validator-ajv8';
-import { Button, Card, Collapse, Modal, Select, Tag, Typography } from 'antd';
+import { Button, Card, Collapse, Input, Modal, Select, Tag, Typography } from 'antd';
 import AntdFormLabel from 'antd/es/form/FormItemLabel';
 import classNames from 'classnames';
 import { JSONSchema7 } from 'json-schema';
@@ -31,6 +31,8 @@ export const SubscriptionWizard = (props: {
     subscriptionTypes[2] /* image as default and common subscription */
   );
 
+  const [name, setName] = useState('');
+
   return (
     <>
       <AntdFormLabel prefixCls='' label='Subscriptions' />
@@ -61,6 +63,16 @@ export const SubscriptionWizard = (props: {
             value={selectedNewSubscription}
             onChange={(newSubscription) => setSelectedNewSubscription(newSubscription)}
           />
+          <div>
+            <AntdFormLabel prefixCls='' label='Name' htmlFor='subscription-name' />
+            <Input
+              id='subscription-name'
+              className='mt-2'
+              value={name}
+              onChange={(e) => setName(e.target.value)}
+              placeholder='Optional'
+            />
+          </div>
           <Collapse
             items={[
               {
@@ -85,14 +97,16 @@ export const SubscriptionWizard = (props: {
                         norender: true
                       }
                     }}
-                    onSubmit={(data) =>
+                    onSubmit={(data) => {
                       props.onChange([
                         ...props.subscriptions,
                         {
+                          ...(name ? { name } : {}),
                           [selectedNewSubscription]: data.formData
                         }
-                      ])
-                    }
+                      ]);
+                      setName('');
+                    }}
                   >
                     <Button htmlType='submit' icon={<IconSetByKargoTerminology.subscription />}>
                       Add Subscription
@@ -116,8 +130,8 @@ SubscriptionWizard.Subscription = (props: {
   let icon: IconDefinition | null = null;
 
   // one of git, image or chart
-  const subscriptionType = (Object.keys(props.subscription)[0] || '') as
-    keyof RepoSubscription | '';
+  const subscriptionType = (Object.keys(props.subscription).filter((k) => k !== 'name')[0] ||
+    '') as keyof RepoSubscription | '';
 
   if (subscriptionType === '') {
     return <Tag color='red'>Corrupt Subscription! Please Check YAML</Tag>;

From a207675dc9566bfa33673f073353c655d8887b31 Mon Sep 17 00:00:00 2001
From: Mayursinh Sarvaiya <marvinduff97@gmail.com>
Date: Fri, 21 Aug 2026 12:58:55 +0530
Subject: [PATCH 2/8] base

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
---
 ui/src/features/common/subscription-name-tag.tsx          | 8 +-------
 .../stage/create-warehouse/subscription-wizard.tsx        | 8 +++++++-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ui/src/features/common/subscription-name-tag.tsx b/ui/src/features/common/subscription-name-tag.tsx
index a2010bd89d..b60f0c6c1a 100644
--- a/ui/src/features/common/subscription-name-tag.tsx
+++ b/ui/src/features/common/subscription-name-tag.tsx
@@ -9,13 +9,7 @@ import classNames from 'classnames';
 // Rendering it through this one component keeps it recognizable as a
 // subscription name wherever it appears. Renders nothing when there is no name,
 // so callers can drop it in without guarding.
-export const SubscriptionNameTag = ({
-  name,
-  className
-}: {
-  name?: string;
-  className?: string;
-}) => {
+export const SubscriptionNameTag = ({ name, className }: { name?: string; className?: string }) => {
   if (!name) {
     return null;
   }
diff --git a/ui/src/features/stage/create-warehouse/subscription-wizard.tsx b/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
index ad77d445a0..fb09f8824f 100644
--- a/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
+++ b/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
@@ -15,6 +15,7 @@ import { FieldTemplate } from '@ui/features/common/form/rjsf/field-template';
 import { ObjectFieldTemplate } from '@ui/features/common/form/rjsf/object-field-template';
 import { IconSetByKargoTerminology } from '@ui/features/common/icons';
 import { ObjectDescription } from '@ui/features/common/object-description';
+import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
 
 import { warehouseCreateFormJSONSchema } from './schema';
 
@@ -180,7 +181,12 @@ SubscriptionWizard.Subscription = (props: {
       <Card.Meta
         avatar={icon && <FontAwesomeIcon icon={icon} />}
         title={subscriptionType}
-        description={subscriptionSource}
+        description={
+          <div className='flex items-center gap-2'>
+            <SubscriptionNameTag name={props.subscription.name} />
+            {subscriptionSource}
+          </div>
+        }
       />
     </Card>
   );

From 1346c8b0c69dc37a2f0a73347c3cb5cba582cf17 Mon Sep 17 00:00:00 2001
From: Mayursinh Sarvaiya <marvinduff97@gmail.com>
Date: Mon, 24 Aug 2026 17:55:02 +0530
Subject: [PATCH 3/8] feat: add subscription name to stage node

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
---
 .../project/pipelines/nodes/subscription-node.tsx     | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/ui/src/features/project/pipelines/nodes/subscription-node.tsx b/ui/src/features/project/pipelines/nodes/subscription-node.tsx
index 9b40ccab67..602bcbf2f3 100644
--- a/ui/src/features/project/pipelines/nodes/subscription-node.tsx
+++ b/ui/src/features/project/pipelines/nodes/subscription-node.tsx
@@ -7,6 +7,7 @@ import Link from 'antd/es/typography/Link';
 import { useMemo } from 'react';
 
 import { RepoSubscription } from '@ui/extend/types';
+import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
 
 import {
   artifactBase,
@@ -47,9 +48,15 @@ export const SubscriptionNode = (props: { subscription: RepoSubscription }) => {
       size='small'
       className={styles['subscription-node-size']}
       title={
-        <Flex align='center' gap={16}>
+        <Flex align='center' gap={8}>
           {icon && <FontAwesomeIcon icon={icon} />}
-          <span className='text-xs'>{title}</span>
+          <span className='text-xs truncate'>{title}</span>
+          {!!props.subscription.name && (
+            <SubscriptionNameTag
+              name={props.subscription.name}
+              className='ml-auto mr-0 max-w-[45%] shrink-0 truncate text-[9px]'
+            />
+          )}
         </Flex>
       }
       variant='borderless'

From 5f8c81f46703c823d12470cc1e9d1156178adb5c Mon Sep 17 00:00:00 2001
From: Mayursinh Sarvaiya <marvinduff97@gmail.com>
Date: Mon, 24 Aug 2026 18:02:24 +0530
Subject: [PATCH 4/8] feat: add subscription name tag to warehouse
 subscriptions and freight assembly

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
---
 .../assemble-freight/artifact-menu-item.tsx   | 17 ++++++++++++++++-
 .../unique-subscription-key.ts                |  6 ++++++
 .../features/common/subscription-name-tag.tsx | 11 +----------
 .../warehouse/repo-subscriptions.tsx          | 19 ++++++++++++++-----
 4 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/ui/src/features/assemble-freight/artifact-menu-item.tsx b/ui/src/features/assemble-freight/artifact-menu-item.tsx
index b13004d957..964ed9c2ac 100644
--- a/ui/src/features/assemble-freight/artifact-menu-item.tsx
+++ b/ui/src/features/assemble-freight/artifact-menu-item.tsx
@@ -1,7 +1,13 @@
 import classNames from 'classnames';
 
+import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
+
 import { DiscoveryResult } from './types';
-import { getSubscriptionKey, isEqualSubscriptions } from './unique-subscription-key';
+import {
+  getSubscriptionKey,
+  getSubscriptionName,
+  isEqualSubscriptions
+} from './unique-subscription-key';
 
 export interface ArtifactMenuItemProps {
   onClick: () => void;
@@ -34,10 +40,19 @@ export const ArtifactMenuItems = ({
     {items.map((item) => {
       const isSelected = !!selected && isEqualSubscriptions(selected, item);
       const key = getSubscriptionKey(item);
+      const subscriptionName = getSubscriptionName(item);
 
       return (
         <ArtifactMenuItem key={key} onClick={() => onClick(item)} selected={isSelected}>
           {key}
+          {!!subscriptionName && (
+            <div className='mt-1'>
+              <SubscriptionNameTag
+                name={subscriptionName}
+                className='mr-0 max-w-full truncate text-[10px]'
+              />
+            </div>
+          )}
         </ArtifactMenuItem>
       );
     })}
diff --git a/ui/src/features/assemble-freight/unique-subscription-key.ts b/ui/src/features/assemble-freight/unique-subscription-key.ts
index bf77dd82f8..fdd56eb02e 100644
--- a/ui/src/features/assemble-freight/unique-subscription-key.ts
+++ b/ui/src/features/assemble-freight/unique-subscription-key.ts
@@ -22,5 +22,11 @@ export const getSubscriptionKeyFreight = (res: Image | Chart | GitCommit) => {
   return getSubscriptionKey(res);
 };
 
+// getSubscriptionName returns the optional name of the Warehouse subscription
+// that produced a discovery result. The generic DiscoveryResult is excluded on
+// purpose: its name IS the subscription name and already serves as its key.
+export const getSubscriptionName = (res: DiscoveryResult) =>
+  'subscriptionName' in res ? res.subscriptionName : undefined;
+
 export const isEqualSubscriptions = (a: DiscoveryResult, b: DiscoveryResult) =>
   getSubscriptionKey(a) === getSubscriptionKey(b);
diff --git a/ui/src/features/common/subscription-name-tag.tsx b/ui/src/features/common/subscription-name-tag.tsx
index b60f0c6c1a..ee971f4ec0 100644
--- a/ui/src/features/common/subscription-name-tag.tsx
+++ b/ui/src/features/common/subscription-name-tag.tsx
@@ -1,14 +1,6 @@
-import { faTag } from '@fortawesome/free-solid-svg-icons';
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Tag } from 'antd';
 import classNames from 'classnames';
 
-// SubscriptionNameTag renders the optional name of a Warehouse subscription. A
-// subscription carries its name onto everything it produces -- discovered
-// artifacts and Freight -- so the same name surfaces in many unrelated views.
-// Rendering it through this one component keeps it recognizable as a
-// subscription name wherever it appears. Renders nothing when there is no name,
-// so callers can drop it in without guarding.
 export const SubscriptionNameTag = ({ name, className }: { name?: string; className?: string }) => {
   if (!name) {
     return null;
@@ -19,9 +11,8 @@ export const SubscriptionNameTag = ({ name, className }: { name?: string; classN
       bordered={false}
       color='blue'
       title={`subscription: ${name}`}
-      className={classNames('font-mono', className)}
+      className={classNames(className)}
     >
-      <FontAwesomeIcon icon={faTag} className='mr-1' />
       {name}
     </Tag>
   );
diff --git a/ui/src/features/project/pipelines/warehouse/repo-subscriptions.tsx b/ui/src/features/project/pipelines/warehouse/repo-subscriptions.tsx
index cef27e5e70..fcd9cd37a8 100644
--- a/ui/src/features/project/pipelines/warehouse/repo-subscriptions.tsx
+++ b/ui/src/features/project/pipelines/warehouse/repo-subscriptions.tsx
@@ -1,6 +1,7 @@
 import { Descriptions, Typography } from 'antd';
 
 import { RepoSubscription } from '@ui/extend/types';
+import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
 import { urlForImage } from '@ui/utils/url';
 
 type Props = {
@@ -12,6 +13,15 @@ const DescriptionsLabelStyle: React.CSSProperties = {
   width: '40%'
 };
 
+// subscriptionTitle pairs the kind of a subscription with its optional name,
+// which is what identifies one subscription among several of the same kind.
+const subscriptionTitle = (kind: string, name?: string) => (
+  <span className='flex items-center gap-2'>
+    {kind}
+    <SubscriptionNameTag name={name} className='mr-0' />
+  </span>
+);
+
 export const RepoSubscriptions = ({ subscriptions }: Props) => {
   if (!subscriptions) {
     return null;
@@ -23,7 +33,7 @@ export const RepoSubscriptions = ({ subscriptions }: Props) => {
         <>
           {subscription.chart && (
             <Descriptions
-              title='Chart'
+              title={subscriptionTitle('Chart', subscription.name)}
               bordered
               size='small'
               column={1}
@@ -58,7 +68,7 @@ export const RepoSubscriptions = ({ subscriptions }: Props) => {
 
           {subscription.git && (
             <Descriptions
-              title='Git'
+              title={subscriptionTitle('Git', subscription.name)}
               bordered
               size='small'
               column={1}
@@ -104,7 +114,7 @@ export const RepoSubscriptions = ({ subscriptions }: Props) => {
 
           {subscription.image && (
             <Descriptions
-              title='Image'
+              title={subscriptionTitle('Image', subscription.name)}
               bordered
               size='small'
               column={1}
@@ -148,13 +158,12 @@ export const RepoSubscriptions = ({ subscriptions }: Props) => {
 
           {subscription.subscription && (
             <Descriptions
-              title='Other'
+              title={subscriptionTitle('Other', subscription.name)}
               bordered
               size='small'
               column={1}
               style={{ width: '40%', minWidth: 500 }}
             >
-              <Descriptions.Item label='Name'>{subscription.name}</Descriptions.Item>
               <Descriptions.Item label='Type'>
                 {subscription.subscription.subscriptionType}
               </Descriptions.Item>

From b58046c24d0bafcdce8305bbc5dd69df6eb01f23 Mon Sep 17 00:00:00 2001
From: Mayursinh Sarvaiya <marvinduff97@gmail.com>
Date: Mon, 24 Aug 2026 18:28:26 +0530
Subject: [PATCH 5/8] feat: surface subscription name across freight artifact
 views

Threads subscriptionName through flattenFreightOrigin so the freight
details table and the promotion drawer's comparison table can show which
subscription produced an artifact. Also keys artifact pairing and freight
timeline chips on the subscription name, so two named subscriptions to
the same repository no longer collapse into one row or share a React key.

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
---
 ui/src/features/common/commit-info.tsx        |  6 ++++
 .../freight-timeline/freight-content-item.tsx | 26 ++++++++++++--
 .../freight-timeline/freight-contents.tsx     | 10 ++++--
 .../freight/flatten-freight-origin-utils.ts   | 12 +++++--
 .../pipelines/freight/freight-table.tsx       |  8 ++++-
 .../project/pipelines/nodes/stage-freight.tsx | 35 ++++++++++++++++---
 .../promotion/freight-comparison-table.tsx    | 21 ++++++++---
 .../promotion/freight-comparison-utils.ts     |  3 ++
 .../pipelines/promotion/pair-artifacts.ts     |  7 ++--
 9 files changed, 108 insertions(+), 20 deletions(-)

diff --git a/ui/src/features/common/commit-info.tsx b/ui/src/features/common/commit-info.tsx
index e7b35f8b57..1e12619e85 100644
--- a/ui/src/features/common/commit-info.tsx
+++ b/ui/src/features/common/commit-info.tsx
@@ -6,6 +6,12 @@ export const CommitInfo = ({ commit }: { commit: GitCommit }) => (
     <div>
       <a href={commit.repoURL}>{commit.repoURL}</a>
     </div>
+    {commit.subscriptionName && (
+      <>
+        <div>Subscription:</div>
+        <div>{commit.subscriptionName}</div>
+      </>
+    )}
     {commit.branch ? (
       <>
         <div>Branch:</div>
diff --git a/ui/src/features/freight-timeline/freight-content-item.tsx b/ui/src/features/freight-timeline/freight-content-item.tsx
index 6de5f5e671..2c5728fc83 100644
--- a/ui/src/features/freight-timeline/freight-content-item.tsx
+++ b/ui/src/features/freight-timeline/freight-content-item.tsx
@@ -5,6 +5,7 @@ import Link from 'antd/es/typography/Link';
 import classNames from 'classnames';
 import { useMemo } from 'react';
 
+import { SubscriptionNameTag } from '../common/subscription-name-tag';
 import { TruncateMiddle } from '../common/truncate-middle';
 
 export const FreightContentItem = (props: {
@@ -23,6 +24,8 @@ export const FreightContentItem = (props: {
   artifactSource?: string;
   // build date of image
   artifactBuildDate?: string;
+  // name of the subscription that discovered the artifact, if it has one
+  subscriptionName?: string;
 }) => {
   const {
     horizontal,
@@ -34,9 +37,22 @@ export const FreightContentItem = (props: {
     href,
     children,
     linkClass,
-    fullContentVisibility
+    fullContentVisibility,
+    subscriptionName
   } = props;
 
+  // The chips are too cramped to always carry the name, so it rides along in
+  // the tooltip and only becomes a visible tag where there is room for it.
+  const _title = useMemo(() => {
+    if (!subscriptionName) {
+      return title;
+    }
+
+    return title
+      ? `${title} (subscription: ${subscriptionName})`
+      : `subscription: ${subscriptionName}`;
+  }, [title, subscriptionName]);
+
   const _children = useMemo(() => {
     if (fullContentVisibility) {
       return children;
@@ -57,7 +73,7 @@ export const FreightContentItem = (props: {
         'bg-gray-200': !dark && horizontal
       })}
       overlay={overlay}
-      title={title}
+      title={_title}
     >
       <Flex align='center' gap={8}>
         {!!icon && (
@@ -107,6 +123,12 @@ export const FreightContentItem = (props: {
             {props.artifactBuildDate}
           </span>
         )}
+        {fullContentVisibility && (
+          <SubscriptionNameTag
+            name={subscriptionName}
+            className='mr-0 max-w-full truncate text-[10px]'
+          />
+        )}
       </div>
     </Tooltip>
   );
diff --git a/ui/src/features/freight-timeline/freight-contents.tsx b/ui/src/features/freight-timeline/freight-contents.tsx
index 4a690dc552..698887e7f2 100644
--- a/ui/src/features/freight-timeline/freight-contents.tsx
+++ b/ui/src/features/freight-timeline/freight-contents.tsx
@@ -38,8 +38,9 @@ export const FreightContents = (props: {
           horizontal={horizontal}
           linkClass={linkClass}
           highlighted={highlighted}
-          key={c.id}
+          key={`${c.subscriptionName || ''}:${c.id}`}
           overlay={<CommitInfo commit={c} />}
+          subscriptionName={c.subscriptionName}
           icon={faGitAlt}
           href={`${c.repoURL?.replace('.git', '')}/commit/${c.id}`}
           fullContentVisibility={props.fullContentVisibility}
@@ -55,8 +56,9 @@ export const FreightContents = (props: {
           horizontal={horizontal}
           linkClass={linkClass}
           highlighted={highlighted}
-          key={`${i.repoURL}:${i.tag}`}
+          key={`${i.subscriptionName || ''}:${i.repoURL}:${i.tag}`}
           title={`${i.repoURL}:${i.tag}`}
+          subscriptionName={i.subscriptionName}
           icon={faDocker}
           href={urlForImage(i.repoURL || '')}
           fullContentVisibility={props.fullContentVisibility}
@@ -72,8 +74,9 @@ export const FreightContents = (props: {
           horizontal={horizontal}
           linkClass={linkClass}
           highlighted={highlighted}
-          key={`${c.repoURL}:${c.version}`}
+          key={`${c.subscriptionName || ''}:${c.repoURL}:${c.version}`}
           title={`${c.repoURL}${c.name ? `/${c.name}` : ''}:${c.version}`}
+          subscriptionName={c.subscriptionName}
           fullContentVisibility={props.fullContentVisibility}
           icon={faAnchor}
         >
@@ -84,6 +87,7 @@ export const FreightContents = (props: {
         <FreightContentItem
           key={(g.subscriptionName || '') + g.artifactType}
           highlighted={highlighted}
+          subscriptionName={g.subscriptionName}
           linkClass={linkClass}
           fullContentVisibility={props.fullContentVisibility}
           horizontal={horizontal}
diff --git a/ui/src/features/freight/flatten-freight-origin-utils.ts b/ui/src/features/freight/flatten-freight-origin-utils.ts
index 56f135fc26..7510477734 100644
--- a/ui/src/features/freight/flatten-freight-origin-utils.ts
+++ b/ui/src/features/freight/flatten-freight-origin-utils.ts
@@ -6,6 +6,7 @@ export type TableSource =
       repoURL: string;
       tag?: string;
       annotations?: Record<string, string>;
+      subscriptionName?: string;
     }
   | {
       type: 'git';
@@ -16,12 +17,14 @@ export type TableSource =
       author: string;
       committer: string;
       tag?: string;
+      subscriptionName?: string;
     }
   | {
       type: 'helm';
       repoURL: string;
       name: string;
       version: string;
+      subscriptionName?: string;
     }
   | ({
       type: 'other';
@@ -35,7 +38,8 @@ export const flattenFreightOrigin = (
       type: 'image',
       repoURL: image?.repoURL || '',
       tag: image?.tag || '',
-      annotations: image?.annotations || {}
+      annotations: image?.annotations || {},
+      subscriptionName: image?.subscriptionName
     })) || [];
 
   const git: TableSource[] =
@@ -47,7 +51,8 @@ export const flattenFreightOrigin = (
       committer: commit?.committer || '',
       id: commit?.id || '',
       message: commit?.message || '',
-      tag: commit?.tag || ''
+      tag: commit?.tag || '',
+      subscriptionName: commit?.subscriptionName
     })) || [];
 
   const helm: TableSource[] =
@@ -55,7 +60,8 @@ export const flattenFreightOrigin = (
       type: 'helm',
       repoURL: chart?.repoURL || '',
       name: chart?.name || '',
-      version: chart?.version || ''
+      version: chart?.version || '',
+      subscriptionName: chart?.subscriptionName
     })) || [];
 
   const other: TableSource[] =
diff --git a/ui/src/features/project/pipelines/freight/freight-table.tsx b/ui/src/features/project/pipelines/freight/freight-table.tsx
index 2fff4ec770..63d1057efe 100644
--- a/ui/src/features/project/pipelines/freight/freight-table.tsx
+++ b/ui/src/features/project/pipelines/freight/freight-table.tsx
@@ -6,6 +6,7 @@ import { Table } from 'antd';
 import classNames from 'classnames';
 import { useMemo } from 'react';
 
+import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
 import { ArtifactMetadata } from '@ui/features/freight/artifact-metadata';
 import { flattenFreightOrigin } from '@ui/features/freight/flatten-freight-origin-utils';
 import { Freight } from '@ui/gen/api/v2/models';
@@ -58,7 +59,12 @@ export const FreightTable = (props: FreightTableProps) => {
                   return record.subscriptionName || '-';
                 }
 
-                return record.repoURL;
+                return (
+                  <div className='flex items-center gap-2'>
+                    <span className='min-w-0 break-all'>{record.repoURL}</span>
+                    <SubscriptionNameTag name={record.subscriptionName} className='mr-0 shrink-0' />
+                  </div>
+                );
               }
             },
             {
diff --git a/ui/src/features/project/pipelines/nodes/stage-freight.tsx b/ui/src/features/project/pipelines/nodes/stage-freight.tsx
index 1ae286f9b6..a578aadd55 100644
--- a/ui/src/features/project/pipelines/nodes/stage-freight.tsx
+++ b/ui/src/features/project/pipelines/nodes/stage-freight.tsx
@@ -212,6 +212,9 @@ export const StageFreight = (props: { stage: Stage }) => {
   );
 };
 
+const subscriptionTitle = (base: string | undefined, subscriptionName: string | undefined) =>
+  subscriptionName ? `${base} (subscription: ${subscriptionName})` : base;
+
 const Artifact = (props: { artifact: string | GitCommit | Chart | Image | ArtifactReference }) => {
   if (typeof props.artifact === 'string') {
     return (
@@ -221,10 +224,22 @@ const Artifact = (props: { artifact: string | GitCommit | Chart | Image | Artifa
     );
   }
 
+  // A generic artifact has no repository to name it, so its subscription name
+  // is all the carousel can show alongside the version.
   if (isArtifactGeneric(props.artifact)) {
     return (
-      <Tag bordered={false} color='geekblue'>
-        {props.artifact.version}
+      <Tag
+        bordered={false}
+        color='geekblue'
+        title={subscriptionTitle(props.artifact.version, props.artifact.subscriptionName)}
+      >
+        <Flex justify='center' align='center' wrap>
+          <div>{props.artifact.version}</div>
+
+          {!!props.artifact.subscriptionName && (
+            <span className='text-[10px] ml-1'>{props.artifact.subscriptionName}</span>
+          )}
+        </Flex>
       </Tag>
     );
   }
@@ -237,7 +252,11 @@ const Artifact = (props: { artifact: string | GitCommit | Chart | Image | Artifa
     const url = getGitCommitURL(props.artifact.repoURL || '', props.artifact.id || '');
 
     let TagComponent = (
-      <Tag title={props.artifact.repoURL} bordered={false} color='geekblue'>
+      <Tag
+        title={subscriptionTitle(props.artifact.repoURL, props.artifact.subscriptionName)}
+        bordered={false}
+        color='geekblue'
+      >
         <Flex justify='center' align='center' wrap>
           <div>{props.artifact.id?.slice(0, 7)}</div>
 
@@ -273,7 +292,10 @@ const Artifact = (props: { artifact: string | GitCommit | Chart | Image | Artifa
   if (isArtifactChart(props.artifact)) {
     return (
       <Tag
-        title={`${props.artifact.repoURL}:${props.artifact.version}`}
+        title={subscriptionTitle(
+          `${props.artifact.repoURL}:${props.artifact.version}`,
+          props.artifact.subscriptionName
+        )}
         bordered={false}
         color='geekblue'
       >
@@ -297,7 +319,10 @@ const Artifact = (props: { artifact: string | GitCommit | Chart | Image | Artifa
 
     let TagComponent = (
       <Tag
-        title={`${props.artifact.repoURL}:${props.artifact.tag}`}
+        title={subscriptionTitle(
+          `${props.artifact.repoURL}:${props.artifact.tag}`,
+          props.artifact.subscriptionName
+        )}
         bordered={false}
         color='geekblue'
       >
diff --git a/ui/src/features/project/pipelines/promotion/freight-comparison-table.tsx b/ui/src/features/project/pipelines/promotion/freight-comparison-table.tsx
index 67c6125b44..be48636810 100644
--- a/ui/src/features/project/pipelines/promotion/freight-comparison-table.tsx
+++ b/ui/src/features/project/pipelines/promotion/freight-comparison-table.tsx
@@ -2,10 +2,17 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Col, Flex, Row, Space, Table, Tag, theme, Typography } from 'antd';
 import { useMemo } from 'react';
 
+import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
 import { ArtifactMetadata } from '@ui/features/freight/artifact-metadata';
 import { Freight, FreightReference } from '@ui/gen/api/v2/models';
 
-import { repoLabel, typeIcon, typeLabel, versionLabel } from './freight-comparison-utils';
+import {
+  repoLabel,
+  subscriptionName,
+  typeIcon,
+  typeLabel,
+  versionLabel
+} from './freight-comparison-utils';
 import { PairedRow, pairArtifacts, PairStatus } from './pair-artifacts';
 
 const statusTag = (status: PairStatus) => {
@@ -114,9 +121,15 @@ export const FreightComparisonTable = ({
               />
               <div>
                 <div className='font-mono'>{repoLabel(source)}</div>
-                <Typography.Text type='secondary' className='text-xs'>
-                  {typeLabel(source)}
-                </Typography.Text>
+                <Flex align='center' gap={8} wrap>
+                  <Typography.Text type='secondary' className='text-xs'>
+                    {typeLabel(source)}
+                  </Typography.Text>
+                  <SubscriptionNameTag
+                    name={subscriptionName(source)}
+                    className='mr-0 text-[10px]'
+                  />
+                </Flex>
               </div>
             </Flex>
           );
diff --git a/ui/src/features/project/pipelines/promotion/freight-comparison-utils.ts b/ui/src/features/project/pipelines/promotion/freight-comparison-utils.ts
index 7c7d169df7..3a9d2b7f5b 100644
--- a/ui/src/features/project/pipelines/promotion/freight-comparison-utils.ts
+++ b/ui/src/features/project/pipelines/promotion/freight-comparison-utils.ts
@@ -37,6 +37,9 @@ export const repoLabel = (source: TableSource): string => {
   return source.repoURL || '-';
 };
 
+export const subscriptionName = (source: TableSource): string | undefined =>
+  source.type === 'other' ? undefined : source.subscriptionName;
+
 export const versionLabel = (source: TableSource): string => {
   switch (source.type) {
     case 'git':
diff --git a/ui/src/features/project/pipelines/promotion/pair-artifacts.ts b/ui/src/features/project/pipelines/promotion/pair-artifacts.ts
index 5468e8cdb8..76e8e7427b 100644
--- a/ui/src/features/project/pipelines/promotion/pair-artifacts.ts
+++ b/ui/src/features/project/pipelines/promotion/pair-artifacts.ts
@@ -13,14 +13,17 @@ export type PairedRow = {
   incoming?: TableSource;
 };
 
+const withSubscription = (key: string, subscriptionName?: string) =>
+  subscriptionName ? `${key}#${subscriptionName}` : key;
+
 const pairKey = (s: TableSource): string => {
   switch (s.type) {
     case 'other':
       return `other:${s.subscriptionName || ''}`;
     case 'helm':
-      return `helm:${s.repoURL || ''}/${s.name || ''}`;
+      return withSubscription(`helm:${s.repoURL || ''}/${s.name || ''}`, s.subscriptionName);
     default:
-      return `${s.type}:${s.repoURL || ''}`;
+      return withSubscription(`${s.type}:${s.repoURL || ''}`, s.subscriptionName);
   }
 };
 

From 399837ef3d3dc16f91d16e109bd635c9b5b3371e Mon Sep 17 00:00:00 2001
From: Mayursinh Sarvaiya <marvinduff97@gmail.com>
Date: Tue, 25 Aug 2026 10:19:18 +0530
Subject: [PATCH 6/8] chore: remove slop comments

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
---
 ui/src/features/assemble-freight/unique-subscription-key.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ui/src/features/assemble-freight/unique-subscription-key.ts b/ui/src/features/assemble-freight/unique-subscription-key.ts
index fdd56eb02e..b221605701 100644
--- a/ui/src/features/assemble-freight/unique-subscription-key.ts
+++ b/ui/src/features/assemble-freight/unique-subscription-key.ts
@@ -22,9 +22,6 @@ export const getSubscriptionKeyFreight = (res: Image | Chart | GitCommit) => {
   return getSubscriptionKey(res);
 };
 
-// getSubscriptionName returns the optional name of the Warehouse subscription
-// that produced a discovery result. The generic DiscoveryResult is excluded on
-// purpose: its name IS the subscription name and already serves as its key.
 export const getSubscriptionName = (res: DiscoveryResult) =>
   'subscriptionName' in res ? res.subscriptionName : undefined;
 

From d1dd77b3423fb83c56bf4e284cfce6b92c8c6a83 Mon Sep 17 00:00:00 2001
From: Mayursinh Sarvaiya <marvinduff97@gmail.com>
Date: Tue, 25 Aug 2026 15:43:03 +0530
Subject: [PATCH 7/8] refactor(ui): render subscription name as text, not a tag

A blue Tag reads as a link everywhere else in the UI, but a subscription
name is not navigable. Render it as Typography.Text instead, and give it
its own place in each view rather than crowding an existing label:

- pipeline subscription node: the name becomes the header title, and the
  link below carries the whole repo URL instead of just its base
- warehouse Subscriptions tab: out of the Descriptions title, into a
  Name row
- freight table and promotion comparison table: its own Name column

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
---
 .../assemble-freight/artifact-menu-item.tsx   |  7 +---
 .../features/common/subscription-name-tag.tsx | 19 ---------
 ui/src/features/common/subscription-name.tsx  | 18 +++++++++
 .../freight-timeline/freight-content-item.tsx |  7 +---
 .../pipelines/freight/freight-table.tsx       | 17 ++++----
 .../pipelines/nodes/subscription-node.tsx     | 16 +++-----
 .../promotion/freight-comparison-table.tsx    | 36 ++++++++++++-----
 .../promotion/freight-comparison-utils.ts     |  4 +-
 .../warehouse/repo-subscriptions.tsx          | 40 ++++++++++++-------
 .../create-warehouse/subscription-wizard.tsx  |  4 +-
 10 files changed, 92 insertions(+), 76 deletions(-)
 delete mode 100644 ui/src/features/common/subscription-name-tag.tsx
 create mode 100644 ui/src/features/common/subscription-name.tsx

diff --git a/ui/src/features/assemble-freight/artifact-menu-item.tsx b/ui/src/features/assemble-freight/artifact-menu-item.tsx
index 964ed9c2ac..74624ee619 100644
--- a/ui/src/features/assemble-freight/artifact-menu-item.tsx
+++ b/ui/src/features/assemble-freight/artifact-menu-item.tsx
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
 
-import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
+import { SubscriptionName } from '@ui/features/common/subscription-name';
 
 import { DiscoveryResult } from './types';
 import {
@@ -47,10 +47,7 @@ export const ArtifactMenuItems = ({
           {key}
           {!!subscriptionName && (
             <div className='mt-1'>
-              <SubscriptionNameTag
-                name={subscriptionName}
-                className='mr-0 max-w-full truncate text-[10px]'
-              />
+              <SubscriptionName name={subscriptionName} />
             </div>
           )}
         </ArtifactMenuItem>
diff --git a/ui/src/features/common/subscription-name-tag.tsx b/ui/src/features/common/subscription-name-tag.tsx
deleted file mode 100644
index ee971f4ec0..0000000000
--- a/ui/src/features/common/subscription-name-tag.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { Tag } from 'antd';
-import classNames from 'classnames';
-
-export const SubscriptionNameTag = ({ name, className }: { name?: string; className?: string }) => {
-  if (!name) {
-    return null;
-  }
-
-  return (
-    <Tag
-      bordered={false}
-      color='blue'
-      title={`subscription: ${name}`}
-      className={classNames(className)}
-    >
-      {name}
-    </Tag>
-  );
-};
diff --git a/ui/src/features/common/subscription-name.tsx b/ui/src/features/common/subscription-name.tsx
new file mode 100644
index 0000000000..fb8e6f97b2
--- /dev/null
+++ b/ui/src/features/common/subscription-name.tsx
@@ -0,0 +1,18 @@
+import { Typography } from 'antd';
+import classNames from 'classnames';
+
+export const SubscriptionName = ({ name, className }: { name?: string; className?: string }) => {
+  if (!name) {
+    return null;
+  }
+
+  return (
+    <Typography.Text
+      type='secondary'
+      title={`subscription: ${name}`}
+      className={classNames(className)}
+    >
+      {name}
+    </Typography.Text>
+  );
+};
diff --git a/ui/src/features/freight-timeline/freight-content-item.tsx b/ui/src/features/freight-timeline/freight-content-item.tsx
index 2c5728fc83..c8b3d88374 100644
--- a/ui/src/features/freight-timeline/freight-content-item.tsx
+++ b/ui/src/features/freight-timeline/freight-content-item.tsx
@@ -5,7 +5,7 @@ import Link from 'antd/es/typography/Link';
 import classNames from 'classnames';
 import { useMemo } from 'react';
 
-import { SubscriptionNameTag } from '../common/subscription-name-tag';
+import { SubscriptionName } from '../common/subscription-name';
 import { TruncateMiddle } from '../common/truncate-middle';
 
 export const FreightContentItem = (props: {
@@ -124,10 +124,7 @@ export const FreightContentItem = (props: {
           </span>
         )}
         {fullContentVisibility && (
-          <SubscriptionNameTag
-            name={subscriptionName}
-            className='mr-0 max-w-full truncate text-[10px]'
-          />
+          <SubscriptionName name={subscriptionName} className='text-[10px]' />
         )}
       </div>
     </Tooltip>
diff --git a/ui/src/features/project/pipelines/freight/freight-table.tsx b/ui/src/features/project/pipelines/freight/freight-table.tsx
index 63d1057efe..99982f8eda 100644
--- a/ui/src/features/project/pipelines/freight/freight-table.tsx
+++ b/ui/src/features/project/pipelines/freight/freight-table.tsx
@@ -6,7 +6,7 @@ import { Table } from 'antd';
 import classNames from 'classnames';
 import { useMemo } from 'react';
 
-import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
+import { SubscriptionName } from '@ui/features/common/subscription-name';
 import { ArtifactMetadata } from '@ui/features/freight/artifact-metadata';
 import { flattenFreightOrigin } from '@ui/features/freight/flatten-freight-origin-utils';
 import { Freight } from '@ui/gen/api/v2/models';
@@ -56,17 +56,18 @@ export const FreightTable = (props: FreightTableProps) => {
               width: '30%',
               render: (_, record) => {
                 if (record.type === 'other') {
-                  return record.subscriptionName || '-';
+                  return '-';
                 }
 
-                return (
-                  <div className='flex items-center gap-2'>
-                    <span className='min-w-0 break-all'>{record.repoURL}</span>
-                    <SubscriptionNameTag name={record.subscriptionName} className='mr-0 shrink-0' />
-                  </div>
-                );
+                return <span className='break-all'>{record.repoURL}</span>;
               }
             },
+            {
+              title: 'Subscription Name',
+              width: '15%',
+              render: (_, record) =>
+                record.subscriptionName ? <SubscriptionName name={record.subscriptionName} /> : '-'
+            },
             {
               title: 'Version',
               render: (_, record) => {
diff --git a/ui/src/features/project/pipelines/nodes/subscription-node.tsx b/ui/src/features/project/pipelines/nodes/subscription-node.tsx
index 602bcbf2f3..4874159f20 100644
--- a/ui/src/features/project/pipelines/nodes/subscription-node.tsx
+++ b/ui/src/features/project/pipelines/nodes/subscription-node.tsx
@@ -7,7 +7,6 @@ import Link from 'antd/es/typography/Link';
 import { useMemo } from 'react';
 
 import { RepoSubscription } from '@ui/extend/types';
-import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
 
 import {
   artifactBase,
@@ -24,8 +23,9 @@ export const SubscriptionNode = (props: { subscription: RepoSubscription }) => {
       props.subscription?.chart?.repoURL ||
       props.subscription?.image?.repoURL ||
       '';
-    const title = humanComprehendableArtifact({ repoURL }) || props.subscription.name;
-    const base = artifactBase(repoURL) || repoURL;
+    const name = props.subscription.name;
+    const title = name || humanComprehendableArtifact({ repoURL }) || repoURL;
+    const base = name ? repoURL : artifactBase(repoURL) || repoURL;
     const link = artifactURL(repoURL);
 
     return { title, repoURL, base, link };
@@ -50,13 +50,9 @@ export const SubscriptionNode = (props: { subscription: RepoSubscription }) => {
       title={
         <Flex align='center' gap={8}>
           {icon && <FontAwesomeIcon icon={icon} />}
-          <span className='text-xs truncate'>{title}</span>
-          {!!props.subscription.name && (
-            <SubscriptionNameTag
-              name={props.subscription.name}
-              className='ml-auto mr-0 max-w-[45%] shrink-0 truncate text-[9px]'
-            />
-          )}
+          <span className='text-xs truncate' title={title}>
+            {title}
+          </span>
         </Flex>
       }
       variant='borderless'
diff --git a/ui/src/features/project/pipelines/promotion/freight-comparison-table.tsx b/ui/src/features/project/pipelines/promotion/freight-comparison-table.tsx
index be48636810..d4c5d13bd8 100644
--- a/ui/src/features/project/pipelines/promotion/freight-comparison-table.tsx
+++ b/ui/src/features/project/pipelines/promotion/freight-comparison-table.tsx
@@ -2,7 +2,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { Col, Flex, Row, Space, Table, Tag, theme, Typography } from 'antd';
 import { useMemo } from 'react';
 
-import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
+import { SubscriptionName } from '@ui/features/common/subscription-name';
 import { ArtifactMetadata } from '@ui/features/freight/artifact-metadata';
 import { Freight, FreightReference } from '@ui/gen/api/v2/models';
 
@@ -50,6 +50,11 @@ export const FreightComparisonTable = ({
 
   const hasCurrent = !!currentFreight;
 
+  const hasSubscriptionNames = useMemo(
+    () => rows.some((row) => !!subscriptionName(row.incoming || row.current)),
+    [rows]
+  );
+
   return (
     <Table<PairedRow>
       className={className}
@@ -104,7 +109,7 @@ export const FreightComparisonTable = ({
     >
       <Table.Column<PairedRow>
         title='Repo / Name'
-        width='57%'
+        width={hasSubscriptionNames ? '42%' : '57%'}
         render={(_, row) => {
           const source = row.incoming || row.current;
           if (!source) {
@@ -121,20 +126,29 @@ export const FreightComparisonTable = ({
               />
               <div>
                 <div className='font-mono'>{repoLabel(source)}</div>
-                <Flex align='center' gap={8} wrap>
-                  <Typography.Text type='secondary' className='text-xs'>
-                    {typeLabel(source)}
-                  </Typography.Text>
-                  <SubscriptionNameTag
-                    name={subscriptionName(source)}
-                    className='mr-0 text-[10px]'
-                  />
-                </Flex>
+                <Typography.Text type='secondary' className='text-xs'>
+                  {typeLabel(source)}
+                </Typography.Text>
               </div>
             </Flex>
           );
         }}
       />
+      {hasSubscriptionNames && (
+        <Table.Column<PairedRow>
+          title='Name'
+          width='15%'
+          render={(_, row) => {
+            const name = subscriptionName(row.incoming || row.current);
+
+            if (!name) {
+              return <Typography.Text type='secondary'>—</Typography.Text>;
+            }
+
+            return <SubscriptionName name={name} className='text-xs' />;
+          }}
+        />
+      )}
       <Table.Column<PairedRow>
         title='Current'
         width='15%'
diff --git a/ui/src/features/project/pipelines/promotion/freight-comparison-utils.ts b/ui/src/features/project/pipelines/promotion/freight-comparison-utils.ts
index 3a9d2b7f5b..ffd92641f0 100644
--- a/ui/src/features/project/pipelines/promotion/freight-comparison-utils.ts
+++ b/ui/src/features/project/pipelines/promotion/freight-comparison-utils.ts
@@ -37,8 +37,8 @@ export const repoLabel = (source: TableSource): string => {
   return source.repoURL || '-';
 };
 
-export const subscriptionName = (source: TableSource): string | undefined =>
-  source.type === 'other' ? undefined : source.subscriptionName;
+export const subscriptionName = (source?: TableSource): string | undefined =>
+  !source || source.type === 'other' ? undefined : source.subscriptionName;
 
 export const versionLabel = (source: TableSource): string => {
   switch (source.type) {
diff --git a/ui/src/features/project/pipelines/warehouse/repo-subscriptions.tsx b/ui/src/features/project/pipelines/warehouse/repo-subscriptions.tsx
index fcd9cd37a8..cdff3ef74f 100644
--- a/ui/src/features/project/pipelines/warehouse/repo-subscriptions.tsx
+++ b/ui/src/features/project/pipelines/warehouse/repo-subscriptions.tsx
@@ -1,7 +1,6 @@
 import { Descriptions, Typography } from 'antd';
 
 import { RepoSubscription } from '@ui/extend/types';
-import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
 import { urlForImage } from '@ui/utils/url';
 
 type Props = {
@@ -13,15 +12,6 @@ const DescriptionsLabelStyle: React.CSSProperties = {
   width: '40%'
 };
 
-// subscriptionTitle pairs the kind of a subscription with its optional name,
-// which is what identifies one subscription among several of the same kind.
-const subscriptionTitle = (kind: string, name?: string) => (
-  <span className='flex items-center gap-2'>
-    {kind}
-    <SubscriptionNameTag name={name} className='mr-0' />
-  </span>
-);
-
 export const RepoSubscriptions = ({ subscriptions }: Props) => {
   if (!subscriptions) {
     return null;
@@ -33,12 +23,18 @@ export const RepoSubscriptions = ({ subscriptions }: Props) => {
         <>
           {subscription.chart && (
             <Descriptions
-              title={subscriptionTitle('Chart', subscription.name)}
+              title='Chart'
               bordered
               size='small'
               column={1}
               style={{ width: '40%', minWidth: 500 }}
             >
+              {!!subscription.name && (
+                <Descriptions.Item label='Name' styles={{ label: DescriptionsLabelStyle }}>
+                  {subscription.name}
+                </Descriptions.Item>
+              )}
+
               <Descriptions.Item label='repo URL' styles={{ label: DescriptionsLabelStyle }}>
                 <Typography.Link
                   href={`${subscription.chart?.repoURL}/${subscription?.chart?.name}`}
@@ -68,12 +64,18 @@ export const RepoSubscriptions = ({ subscriptions }: Props) => {
 
           {subscription.git && (
             <Descriptions
-              title={subscriptionTitle('Git', subscription.name)}
+              title='Git'
               bordered
               size='small'
               column={1}
               style={{ width: '40%', minWidth: 500 }}
             >
+              {!!subscription.name && (
+                <Descriptions.Item label='Name' styles={{ label: DescriptionsLabelStyle }}>
+                  {subscription.name}
+                </Descriptions.Item>
+              )}
+
               <Descriptions.Item label='repo URL' styles={{ label: DescriptionsLabelStyle }}>
                 <Typography.Link href={subscription.git?.repoURL} target='_blank' rel='noreferrer'>
                   {subscription.git?.repoURL}
@@ -114,12 +116,18 @@ export const RepoSubscriptions = ({ subscriptions }: Props) => {
 
           {subscription.image && (
             <Descriptions
-              title={subscriptionTitle('Image', subscription.name)}
+              title='Image'
               bordered
               size='small'
               column={1}
               style={{ width: '40%', minWidth: 500 }}
             >
+              {!!subscription.name && (
+                <Descriptions.Item label='Name' styles={{ label: DescriptionsLabelStyle }}>
+                  {subscription.name}
+                </Descriptions.Item>
+              )}
+
               <Descriptions.Item label='repo URL' styles={{ label: DescriptionsLabelStyle }}>
                 <Typography.Link
                   href={urlForImage(subscription.image?.repoURL)}
@@ -158,12 +166,16 @@ export const RepoSubscriptions = ({ subscriptions }: Props) => {
 
           {subscription.subscription && (
             <Descriptions
-              title={subscriptionTitle('Other', subscription.name)}
+              title='Other'
               bordered
               size='small'
               column={1}
               style={{ width: '40%', minWidth: 500 }}
             >
+              {!!subscription.name && (
+                <Descriptions.Item label='Name'>{subscription.name}</Descriptions.Item>
+              )}
+
               <Descriptions.Item label='Type'>
                 {subscription.subscription.subscriptionType}
               </Descriptions.Item>
diff --git a/ui/src/features/stage/create-warehouse/subscription-wizard.tsx b/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
index fb09f8824f..7404b5723c 100644
--- a/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
+++ b/ui/src/features/stage/create-warehouse/subscription-wizard.tsx
@@ -15,7 +15,7 @@ import { FieldTemplate } from '@ui/features/common/form/rjsf/field-template';
 import { ObjectFieldTemplate } from '@ui/features/common/form/rjsf/object-field-template';
 import { IconSetByKargoTerminology } from '@ui/features/common/icons';
 import { ObjectDescription } from '@ui/features/common/object-description';
-import { SubscriptionNameTag } from '@ui/features/common/subscription-name-tag';
+import { SubscriptionName } from '@ui/features/common/subscription-name';
 
 import { warehouseCreateFormJSONSchema } from './schema';
 
@@ -183,7 +183,7 @@ SubscriptionWizard.Subscription = (props: {
         title={subscriptionType}
         description={
           <div className='flex items-center gap-2'>
-            <SubscriptionNameTag name={props.subscription.name} />
+            <SubscriptionName name={props.subscription.name} />
             {subscriptionSource}
           </div>
         }

From f855bbb3115df79066a80bb5b475cf55f7e7adc1 Mon Sep 17 00:00:00 2001
From: Mayursinh Sarvaiya <marvinduff97@gmail.com>
Date: Tue, 25 Aug 2026 18:34:25 +0530
Subject: [PATCH 8/8] chore: remove unnecessary uniqueness check

Signed-off-by: Mayursinh Sarvaiya <marvinduff97@gmail.com>
---
 .../features/project/pipelines/promotion/pair-artifacts.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/ui/src/features/project/pipelines/promotion/pair-artifacts.ts b/ui/src/features/project/pipelines/promotion/pair-artifacts.ts
index 76e8e7427b..5468e8cdb8 100644
--- a/ui/src/features/project/pipelines/promotion/pair-artifacts.ts
+++ b/ui/src/features/project/pipelines/promotion/pair-artifacts.ts
@@ -13,17 +13,14 @@ export type PairedRow = {
   incoming?: TableSource;
 };
 
-const withSubscription = (key: string, subscriptionName?: string) =>
-  subscriptionName ? `${key}#${subscriptionName}` : key;
-
 const pairKey = (s: TableSource): string => {
   switch (s.type) {
     case 'other':
       return `other:${s.subscriptionName || ''}`;
     case 'helm':
-      return withSubscription(`helm:${s.repoURL || ''}/${s.name || ''}`, s.subscriptionName);
+      return `helm:${s.repoURL || ''}/${s.name || ''}`;
     default:
-      return withSubscription(`${s.type}:${s.repoURL || ''}`, s.subscriptionName);
+      return `${s.type}:${s.repoURL || ''}`;
   }
 };