chore: Resolve merge conflicts with main

- Merge latest changes from origin/main
- Keep HiOutlineX import for unclaim functionality
- Keep email/password auth imports from main
- Resolve import conflicts in admin/nodes and AuthUI

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: snomiao

README.md

@@ -1,6 +1,6 @@
 # Comfy Registry Frontend
 
-The frontend React App for [Comfy Registry](https://comfyregistry.org).
+The frontend React App for [Comfy Registry](https://registry.comfy.org/).
 
 Registry React Frontend [Github](https://github.com/Comfy-Org/registry-web)
 
@@ -65,6 +65,7 @@ See [docs/chromatic-setup.md](docs/chromatic-setup.md) for more details on our C
 #### Update PR Branches
 
 We provide a GitHub Actions workflow to automatically update open PR branches with the latest changes from `main`. This is useful for:
+
 - Keeping long-running PRs up-to-date
 - Reducing merge conflicts
 - Repository maintenance

app/admin/nodes/page.tsx

@@ -14,18 +14,20 @@ import Link from 'next/link'
 import { useRouter, useSearchParams } from 'next/navigation'
 import { omit } from 'rambda'
 import React, { useState, useEffect } from 'react'
-import { HiHome, HiPencil } from 'react-icons/hi'
+import { HiHome, HiOutlineX, HiPencil } from 'react-icons/hi'
 import { MdOpenInNew } from 'react-icons/md'
 import { toast } from 'react-toastify'
 import { CustomPagination } from '@/components/common/CustomPagination'
 import withAdmin from '@/components/common/HOC/authAdmin'
 import {
   Node,
   NodeStatus,
+  useAdminUpdateNode,
   useGetUser,
   useListAllNodes,
   useUpdateNode,
 } from '@/src/api/generated'
+import { UNCLAIMED_ADMIN_PUBLISHER_ID } from '@/src/constants'
 import { useNextTranslation } from '@/src/hooks/i18n'
 
 function NodeList() {
@@ -38,6 +40,7 @@ function NodeList() {
     tags: '',
     category: '',
   })
+  const [unclaimingNode, setUnclaimingNode] = useState<Node | null>(null)
   const queryClient = useQueryClient()
   const { data: user } = useGetUser()
 
@@ -121,6 +124,7 @@ function NodeList() {
   })
 
   const updateNodeMutation = useUpdateNode()
+  const adminUpdateNodeMutation = useAdminUpdateNode()
 
   React.useEffect(() => {
     if (getAllNodesQuery.isError) {
@@ -217,6 +221,32 @@ function NodeList() {
     }
   }
 
+  const handleUnclaim = async () => {
+    if (!unclaimingNode || !unclaimingNode.id) {
+      toast.error(t('Unable to unclaim: missing node information'))
+      return
+    }
+
+    try {
+      await adminUpdateNodeMutation.mutateAsync({
+        nodeId: unclaimingNode.id,
+        data: {
+          ...unclaimingNode,
+          publisher: {
+            id: UNCLAIMED_ADMIN_PUBLISHER_ID,
+          },
+        },
+      })
+
+      toast.success(t('Node successfully unclaimed'))
+      setUnclaimingNode(null)
+      queryClient.invalidateQueries({ queryKey: ['/nodes'] })
+    } catch (error) {
+      console.error('Error unclaiming node:', error)
+      toast.error(t('Error unclaiming node'))
+    }
+  }
+
   if (getAllNodesQuery.isLoading) {
     return (
       <div className="flex items-center justify-center h-screen">
@@ -400,18 +430,30 @@ function NodeList() {
                   </span>
                 </Table.Cell>
                 <Table.Cell className="dark">
-                  <Button
-                    size="sm"
-                    onClick={() => openEditModal(node)}
-                    disabled={!node.publisher?.id}
-                    title={
-                      !node.publisher?.id
-                        ? t('No publisher information available')
-                        : t('Edit node')
-                    }
-                  >
-                    <HiPencil className="w-4 h-4" />
-                  </Button>
+                  <div className="flex gap-2">
+                    <Button
+                      size="sm"
+                      onClick={() => openEditModal(node)}
+                      disabled={!node.publisher?.id}
+                      title={
+                        !node.publisher?.id
+                          ? t('No publisher information available')
+                          : t('Edit node')
+                      }
+                    >
+                      <HiPencil className="w-4 h-4" />
+                    </Button>
+                    {node.publisher?.id && (
+                      <Button
+                        size="sm"
+                        color="warning"
+                        onClick={() => setUnclaimingNode(node)}
+                        title={t('Unclaim node')}
+                      >
+                        <HiOutlineX className="w-4 h-4" />
+                      </Button>
+                    )}
+                  </div>
                 </Table.Cell>
               </Table.Row>
             ))}
@@ -555,6 +597,58 @@ function NodeList() {
           </Button>
         </Modal.Footer>
       </Modal>
+
+      {/* Unclaim Confirmation Modal */}
+      <Modal
+        show={!!unclaimingNode}
+        onClose={() => setUnclaimingNode(null)}
+        size="md"
+        className="dark"
+      >
+        <Modal.Header className="dark">
+          {t('Confirm Unclaim Node')}
+        </Modal.Header>
+        <Modal.Body className="dark">
+          <div className="space-y-4">
+            <p className="text-gray-300">
+              {t(
+                'Are you sure you want to unclaim this node? This will remove the publisher association, allowing the original author to claim it under a different publisher.'
+              )}
+            </p>
+            <div className="bg-gray-700 p-4 rounded">
+              <div className="font-semibold text-white">
+                {unclaimingNode?.name}
+              </div>
+              <div className="text-sm text-gray-400">@{unclaimingNode?.id}</div>
+              {unclaimingNode?.publisher && (
+                <div className="text-sm text-gray-400 mt-2">
+                  {t('Current Publisher')}: {unclaimingNode.publisher.name} (
+                  {unclaimingNode.publisher.id})
+                </div>
+              )}
+            </div>
+            <div className="text-yellow-500 text-sm">
+              ⚠️ {t('This action cannot be undone automatically.')}
+            </div>
+          </div>
+        </Modal.Body>
+        <Modal.Footer className="dark">
+          <Button
+            color="warning"
+            onClick={handleUnclaim}
+            disabled={adminUpdateNodeMutation.isPending}
+          >
+            {adminUpdateNodeMutation.isPending ? (
+              <Spinner size="sm" />
+            ) : (
+              t('Unclaim Node')
+            )}
+          </Button>
+          <Button color="gray" onClick={() => setUnclaimingNode(null)}>
+            {t('Cancel')}
+          </Button>
+        </Modal.Footer>
+      </Modal>
     </div>
   )
 }

app/publishers/create/page.tsx

@@ -18,7 +18,6 @@ const CreatePublisher = () => {
   const handleCancel = () => {
     router.back()
   }
-
   return (
     <div className="p-4">
       <div className="py-4">