From a99aa04f2919094e41001acc9b2d9be0d0c538a1 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 12 May 2026 03:52:26 +0000
Subject: [PATCH 1/8] Initial plan


From 1b0bec1dbdba50fb166546d34a09dfea10df5c7a Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 12 May 2026 04:03:49 +0000
Subject: [PATCH 2/8] Implement shared command list and edit dialog behavior
 changes

Agent-Logs-Url: https://github.com/ujiro99/selection-command/sessions/602832e4-7031-485e-b714-13ff9188de16

Co-authored-by: ujiro99 <677231+ujiro99@users.noreply.github.com>
---
 .../public/_locales/de/messages.json          |  3 +
 .../public/_locales/en/messages.json          |  4 ++
 .../public/_locales/es/messages.json          |  3 +
 .../public/_locales/fr/messages.json          |  3 +
 .../public/_locales/hi/messages.json          |  3 +
 .../public/_locales/id/messages.json          |  3 +
 .../public/_locales/it/messages.json          |  3 +
 .../public/_locales/ja/messages.json          |  3 +
 .../public/_locales/ko/messages.json          |  3 +
 .../public/_locales/ms/messages.json          |  3 +
 .../public/_locales/pt_BR/messages.json       |  3 +
 .../public/_locales/pt_PT/messages.json       |  3 +
 .../public/_locales/ru/messages.json          |  3 +
 .../public/_locales/zh_CN/messages.json       |  3 +
 packages/extension/src/background_script.ts   |  1 +
 .../src/components/option/ShareButton.tsx     | 25 +++++++-
 .../option/editor/CommandEditDialog.tsx       | 62 ++++++++++++++-----
 .../components/option/editor/CommandList.tsx  |  9 +++
 .../option/editor/CommandTreeRenderer.tsx     |  3 +
 .../src/hooks/option/useSharedCommandIds.ts   | 44 +++++++++++++
 .../extension/src/services/hub/background.ts  | 40 ++++++++++++
 packages/extension/src/services/hubShare.ts   | 12 ++++
 packages/extension/src/services/ipc.ts        |  1 +
 23 files changed, 220 insertions(+), 20 deletions(-)
 create mode 100644 packages/extension/src/hooks/option/useSharedCommandIds.ts

diff --git a/packages/extension/public/_locales/de/messages.json b/packages/extension/public/_locales/de/messages.json
index 83abb1575..cc136a2c2 100644
--- a/packages/extension/public/_locales/de/messages.json
+++ b/packages/extension/public/_locales/de/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Mit Hub teilen"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Bereits geteilt"
+  },
   "Option_remove_title": {
     "message": "Dies löschen?"
   },
diff --git a/packages/extension/public/_locales/en/messages.json b/packages/extension/public/_locales/en/messages.json
index 8740e0642..798a936d4 100644
--- a/packages/extension/public/_locales/en/messages.json
+++ b/packages/extension/public/_locales/en/messages.json
@@ -753,6 +753,10 @@
     "message": "Share to Hub",
     "description": "Tooltip for the share button in the command list. Opens the new Selection Command Hub in a new tab with the command pre-filled."
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Already shared",
+    "description": "Tooltip for the share button when the command has already been shared to the Hub. Clicking opens the hub dashboard for this command."
+  },
   "Option_remove_title": {
     "message": "Delete this?"
   },
diff --git a/packages/extension/public/_locales/es/messages.json b/packages/extension/public/_locales/es/messages.json
index b745b64d9..e6f01735c 100644
--- a/packages/extension/public/_locales/es/messages.json
+++ b/packages/extension/public/_locales/es/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Compartir en Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Ya compartido"
+  },
   "Option_remove_title": {
     "message": "¿Eliminar esto?"
   },
diff --git a/packages/extension/public/_locales/fr/messages.json b/packages/extension/public/_locales/fr/messages.json
index 415c861ba..09bb2ceef 100644
--- a/packages/extension/public/_locales/fr/messages.json
+++ b/packages/extension/public/_locales/fr/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Partager sur Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Déjà partagé"
+  },
   "Option_remove_title": {
     "message": "Supprimer ceci ?"
   },
diff --git a/packages/extension/public/_locales/hi/messages.json b/packages/extension/public/_locales/hi/messages.json
index 022c7eee4..2954e5aa0 100644
--- a/packages/extension/public/_locales/hi/messages.json
+++ b/packages/extension/public/_locales/hi/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Hub पर साझा करें"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "पहले से साझा किया गया"
+  },
   "Option_remove_title": {
     "message": "क्या आप वाकई इसे हटाना चाहते हैं?"
   },
diff --git a/packages/extension/public/_locales/id/messages.json b/packages/extension/public/_locales/id/messages.json
index fcb0e4357..122719616 100644
--- a/packages/extension/public/_locales/id/messages.json
+++ b/packages/extension/public/_locales/id/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Bagikan ke Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Sudah dibagikan"
+  },
   "Option_remove_title": {
     "message": "Hapus ini?"
   },
diff --git a/packages/extension/public/_locales/it/messages.json b/packages/extension/public/_locales/it/messages.json
index 121a5b8c1..d212e69af 100644
--- a/packages/extension/public/_locales/it/messages.json
+++ b/packages/extension/public/_locales/it/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Condividi su Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Già condiviso"
+  },
   "Option_remove_title": {
     "message": "Sei sicuro di voler eliminare questo?"
   },
diff --git a/packages/extension/public/_locales/ja/messages.json b/packages/extension/public/_locales/ja/messages.json
index b66e6230d..da8f8f60c 100644
--- a/packages/extension/public/_locales/ja/messages.json
+++ b/packages/extension/public/_locales/ja/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Hubに共有"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "共有済み"
+  },
   "Option_remove_title": {
     "message": "削除しますか？"
   },
diff --git a/packages/extension/public/_locales/ko/messages.json b/packages/extension/public/_locales/ko/messages.json
index bb1d3c694..666c297d3 100644
--- a/packages/extension/public/_locales/ko/messages.json
+++ b/packages/extension/public/_locales/ko/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Hub에 공유"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "이미 공유됨"
+  },
   "Option_remove_title": {
     "message": "이것을 삭제하시겠습니까?"
   },
diff --git a/packages/extension/public/_locales/ms/messages.json b/packages/extension/public/_locales/ms/messages.json
index 9a16bd40f..811fdf60b 100644
--- a/packages/extension/public/_locales/ms/messages.json
+++ b/packages/extension/public/_locales/ms/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Kongsi ke Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Sudah dikongsi"
+  },
   "Option_remove_title": {
     "message": "Padam ini?"
   },
diff --git a/packages/extension/public/_locales/pt_BR/messages.json b/packages/extension/public/_locales/pt_BR/messages.json
index 963d13df0..beed63942 100644
--- a/packages/extension/public/_locales/pt_BR/messages.json
+++ b/packages/extension/public/_locales/pt_BR/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Compartilhar no Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Já compartilhado"
+  },
   "Option_remove_title": {
     "message": "Excluir isto?"
   },
diff --git a/packages/extension/public/_locales/pt_PT/messages.json b/packages/extension/public/_locales/pt_PT/messages.json
index aab01ea8e..4b3e8faf5 100644
--- a/packages/extension/public/_locales/pt_PT/messages.json
+++ b/packages/extension/public/_locales/pt_PT/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Partilhar no Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Já partilhado"
+  },
   "Option_remove_title": {
     "message": "Eliminar isto?"
   },
diff --git a/packages/extension/public/_locales/ru/messages.json b/packages/extension/public/_locales/ru/messages.json
index 6efee3cd5..4461e0224 100644
--- a/packages/extension/public/_locales/ru/messages.json
+++ b/packages/extension/public/_locales/ru/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "Поделиться в Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "Уже опубликовано"
+  },
   "Option_remove_title": {
     "message": "Вы уверены, что хотите удалить это?"
   },
diff --git a/packages/extension/public/_locales/zh_CN/messages.json b/packages/extension/public/_locales/zh_CN/messages.json
index 508d52a04..396268a31 100644
--- a/packages/extension/public/_locales/zh_CN/messages.json
+++ b/packages/extension/public/_locales/zh_CN/messages.json
@@ -749,6 +749,9 @@
   "Option_shareButton_tooltip": {
     "message": "分享到 Hub"
   },
+  "Option_shareButton_shared_tooltip": {
+    "message": "已共享"
+  },
   "Option_remove_title": {
     "message": "您确定要删除吗？"
   },
diff --git a/packages/extension/src/background_script.ts b/packages/extension/src/background_script.ts
index e31d4cd98..16cfb0c16 100644
--- a/packages/extension/src/background_script.ts
+++ b/packages/extension/src/background_script.ts
@@ -414,6 +414,7 @@ const commandFuncs = {
   //
   [BgCommand.shareCommandToHub]: HubBackground.shareCommandToHub,
   [BgCommand.editCommandToHub]: HubBackground.editCommandToHub,
+  [BgCommand.getSharedCommandIds]: HubBackground.getSharedCommandIds,
 
   //
   // PageAction
diff --git a/packages/extension/src/components/option/ShareButton.tsx b/packages/extension/src/components/option/ShareButton.tsx
index 3694c9e0c..2e7b67fc1 100644
--- a/packages/extension/src/components/option/ShareButton.tsx
+++ b/packages/extension/src/components/option/ShareButton.tsx
@@ -4,7 +4,12 @@ import { Tooltip } from "@/components/Tooltip"
 import { cn, isUUIDv7, generateId } from "@/lib/utils"
 import { t } from "@/services/i18n"
 import { shareCommandToHub } from "@/services/hubShare"
-import { NEW_HUB_SHAREABLE_OPEN_MODES, COMMAND_SOURCE_TYPE } from "@/const"
+import {
+  NEW_HUB_SHAREABLE_OPEN_MODES,
+  COMMAND_SOURCE_TYPE,
+  NEW_HUB_URL,
+} from "@/const"
+import { getHubLocale } from "@/services/hubShare"
 import type { SelectionCommand } from "@/types"
 
 const VALID_SOURCE_TYPES = new Set([
@@ -16,15 +21,24 @@ const VALID_SOURCE_TYPES = new Set([
 type Props = {
   command: SelectionCommand
   onCommandIdChange?: (newId: string) => void
+  isShared?: boolean
 }
 
-export const ShareButton = ({ command, onCommandIdChange }: Props) => {
+export const ShareButton = ({ command, onCommandIdChange, isShared }: Props) => {
   const buttonRef = useRef<HTMLButtonElement>(null)
   const [status, setStatus] = useState<"idle" | "sent" | "error">("idle")
 
   const handleClick = (e: React.MouseEvent) => {
     e.stopPropagation()
 
+    if (isShared) {
+      // Open the hub dashboard page for the shared command
+      const locale = getHubLocale()
+      const url = `${NEW_HUB_URL}/${locale}/dashboard/commands?id=${encodeURIComponent(command.id)}`
+      chrome.tabs.create({ url })
+      return
+    }
+
     let commandToShare = command
     if (!isUUIDv7(command.id)) {
       const newId = generateId()
@@ -59,6 +73,7 @@ export const ShareButton = ({ command, onCommandIdChange }: Props) => {
         <Share
           className={cn(
             "stroke-gray-500 group-hover/share-btn:stroke-green-600",
+            isShared && "stroke-green-500",
             status === "error" && "stroke-red-500",
           )}
           size={16}
@@ -66,7 +81,11 @@ export const ShareButton = ({ command, onCommandIdChange }: Props) => {
       </button>
       <Tooltip
         positionElm={buttonRef.current}
-        text={t("Option_shareButton_tooltip")}
+        text={
+          isShared
+            ? t("Option_shareButton_shared_tooltip")
+            : t("Option_shareButton_tooltip")
+        }
       />
     </>
   )
diff --git a/packages/extension/src/components/option/editor/CommandEditDialog.tsx b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
index c9a4601b7..61e872669 100644
--- a/packages/extension/src/components/option/editor/CommandEditDialog.tsx
+++ b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
@@ -82,6 +82,7 @@ import { Ipc, BgCommand } from "@/services/ipc"
 import { getScreenSize } from "@/services/screen"
 import { Storage, SESSION_STORAGE_KEY } from "@/services/storage"
 import { ANALYTICS_EVENTS, sendEvent } from "@/services/analytics"
+import { shareCommandToHub } from "@/services/hubShare"
 
 import { isEmpty, e2a, cn, parseGeminiUrl, generateId } from "@/lib/utils"
 import { t as _t } from "@/services/i18n"
@@ -274,6 +275,7 @@ type CommandEditDialogProps = {
   initialCommand?: SelectionCommand
   selectedType: COMMAND_TYPE
   onTypeClick: () => void
+  isShared?: boolean
 }
 
 export const CommandEditDialog = (param: CommandEditDialogProps) => {
@@ -293,6 +295,7 @@ const CommandEditDialogInner = ({
   initialCommand,
   selectedType,
   onTypeClick,
+  isShared,
 }: CommandEditDialogProps) => {
   const [initialized, setInitialized] = useState(false)
   const [assistDialogOpen, setAssistDialogOpen] = useState(false)
@@ -327,6 +330,27 @@ const CommandEditDialogInner = ({
   // Determine if open mode selection should be shown
   const shouldShowOpenModeSelect = selectedType === COMMAND_TYPE.SEARCH
 
+  // Process form data before submit: apply coercions and clean up unused fields.
+  const processFormData = (data: CommandSchemaType): CommandSchemaType => {
+    if (isEmpty(data.id)) data.id = generateId()
+    if (data.revision == null) data.revision = 0
+    if (data.parentFolderId === ROOT_FOLDER) {
+      data.parentFolderId = undefined
+    }
+    if (isSearchType(data)) {
+      if (data.popupOption != null) {
+        data.popupOption = {
+          width: Number(data.popupOption.width),
+          height: Number(data.popupOption.height),
+        }
+      }
+      if (data.openMode !== OPEN_MODE.WINDOW) {
+        delete data.windowState
+      }
+    }
+    return data
+  }
+
   const variableArray = useFieldArray({
     name: "variables",
     control: form.control,
@@ -877,28 +901,32 @@ const CommandEditDialogInner = ({
                 {t("labelCancel")}
               </Button>
             </DialogClose>
+            {isShared && !isHubEdit && (
+              <Button
+                type="button"
+                size="lg"
+                onClick={form.handleSubmit(
+                  (data) => {
+                    const processed = processFormData(data)
+                    onSubmit(processed)
+                    shareCommandToHub(processed as SelectionCommand)
+                    onOpenChange(false)
+                    reset(InitialValues)
+                  },
+                  (err) => console.error(err),
+                )}
+              >
+                <Share />
+                {t("labelShare")}
+              </Button>
+            )}
             <Button
               type="button"
               size="lg"
               onClick={form.handleSubmit(
                 (data) => {
-                  if (isEmpty(data.id)) data.id = generateId()
-                  if (data.revision == null) data.revision = 0
-                  if (data.parentFolderId === ROOT_FOLDER) {
-                    data.parentFolderId = undefined
-                  }
-                  if (isSearchType(data)) {
-                    if (data.popupOption != null) {
-                      data.popupOption = {
-                        width: Number(data.popupOption.width),
-                        height: Number(data.popupOption.height),
-                      }
-                    }
-                    if (data.openMode !== OPEN_MODE.WINDOW) {
-                      delete data.windowState
-                    }
-                  }
-                  onSubmit(data)
+                  const processed = processFormData(data)
+                  onSubmit(processed)
                   onOpenChange(false)
                   reset(InitialValues)
                 },
diff --git a/packages/extension/src/components/option/editor/CommandList.tsx b/packages/extension/src/components/option/editor/CommandList.tsx
index bf3634210..deacec626 100644
--- a/packages/extension/src/components/option/editor/CommandList.tsx
+++ b/packages/extension/src/components/option/editor/CommandList.tsx
@@ -50,6 +50,7 @@ import { isValidDrop } from "@/services/option/dragAndDrop"
 import { editCommandToHub } from "@/services/hubShare"
 import { useCommandActions } from "@/hooks/option/useCommandActions"
 import { useCommandDragDrop } from "@/hooks/option/useCommandDragDrop"
+import { useSharedCommandIds } from "@/hooks/option/useSharedCommandIds"
 import { CommandListMenu } from "./CommandListMenu"
 import { CommandTreeRenderer } from "./CommandTreeRenderer"
 import { generateId } from "@/lib/utils"
@@ -121,6 +122,8 @@ export const CommandList = ({ control }: CommandListProps) => {
   const editDataRef = useRef<Command | CommandFolder | null>(null)
   const editParamHandledRef = useRef(false)
 
+  const sharedCommandIds = useSharedCommandIds()
+
   const { getValues, setValue } = useFormContext()
 
   const commandArray = useFieldArray<CommandsSchemaType, "commands", "_id">({
@@ -375,6 +378,11 @@ export const CommandList = ({ control }: CommandListProps) => {
         initialCommand={editDataRef.current as SelectionCommand}
         selectedType={selectedType ?? COMMAND_TYPE.SEARCH}
         onTypeClick={handleTypeClick}
+        isShared={
+          editDataRef.current != null &&
+          isCommand(editDataRef.current) &&
+          sharedCommandIds.has(editDataRef.current.id)
+        }
       />
       <FolderEditDialog
         open={folderDialogOpen}
@@ -405,6 +413,7 @@ export const CommandList = ({ control }: CommandListProps) => {
                 isDroppable(node, activeNode, folderArray.fields)
               }
               onUpdateCommandId={handleUpdateCommandId}
+              sharedCommandIds={sharedCommandIds}
             />
           </SortableContext>
         </DndContext>
diff --git a/packages/extension/src/components/option/editor/CommandTreeRenderer.tsx b/packages/extension/src/components/option/editor/CommandTreeRenderer.tsx
index 4b6a1f5fd..6f4ce7327 100644
--- a/packages/extension/src/components/option/editor/CommandTreeRenderer.tsx
+++ b/packages/extension/src/components/option/editor/CommandTreeRenderer.tsx
@@ -23,6 +23,7 @@ interface Props {
   onCopy: (index: number, title: string) => void
   isDroppable: (node: FlattenNode, activeNode?: FlattenNode) => boolean
   onUpdateCommandId?: (commandId: string, newId: string) => void
+  sharedCommandIds?: Set<string>
 }
 
 export const CommandTreeRenderer: React.FC<Props> = ({
@@ -34,6 +35,7 @@ export const CommandTreeRenderer: React.FC<Props> = ({
   onCopy,
   isDroppable,
   onUpdateCommandId,
+  sharedCommandIds,
 }) => {
   return (
     <>
@@ -77,6 +79,7 @@ export const CommandTreeRenderer: React.FC<Props> = ({
                   onCommandIdChange={(newId) =>
                     onUpdateCommandId?.(field.content.id, newId)
                   }
+                  isShared={sharedCommandIds?.has(field.content.id)}
                 />
               )}
               {isPageActionCommand(field.content) && (
diff --git a/packages/extension/src/hooks/option/useSharedCommandIds.ts b/packages/extension/src/hooks/option/useSharedCommandIds.ts
new file mode 100644
index 000000000..7373a2b7d
--- /dev/null
+++ b/packages/extension/src/hooks/option/useSharedCommandIds.ts
@@ -0,0 +1,44 @@
+import { useState, useEffect } from "react"
+import { getSharedCommandIds } from "@/services/hubShare"
+import { Storage, LOCAL_STORAGE_KEY } from "@/services/storage"
+import type { HubUser } from "@/types"
+
+/**
+ * Hook to fetch shared command IDs from the Selection Command Hub.
+ * Returns an empty set when the user is not logged in.
+ * Automatically re-fetches when the login state changes.
+ */
+export function useSharedCommandIds(): Set<string> {
+  const [sharedIds, setSharedIds] = useState<Set<string>>(new Set())
+
+  useEffect(() => {
+    let cancelled = false
+
+    const fetchIds = async (hubUser: HubUser | null) => {
+      if (!hubUser) {
+        if (!cancelled) setSharedIds(new Set())
+        return
+      }
+      const ids = await getSharedCommandIds()
+      if (!cancelled) {
+        setSharedIds(new Set(ids))
+      }
+    }
+
+    // Initial fetch
+    Storage.get<HubUser | null>(LOCAL_STORAGE_KEY.HUB_USER).then(fetchIds)
+
+    // Re-fetch on login/logout
+    const unsubscribe = Storage.addListener<HubUser | null>(
+      LOCAL_STORAGE_KEY.HUB_USER,
+      (newVal) => fetchIds(newVal),
+    )
+
+    return () => {
+      cancelled = true
+      unsubscribe()
+    }
+  }, [])
+
+  return sharedIds
+}
diff --git a/packages/extension/src/services/hub/background.ts b/packages/extension/src/services/hub/background.ts
index 7a238f6eb..f934438a8 100644
--- a/packages/extension/src/services/hub/background.ts
+++ b/packages/extension/src/services/hub/background.ts
@@ -389,3 +389,43 @@ function onMessageExternal(
 export function initHubExternalListener(): void {
   chrome.runtime.onMessageExternal.addListener(onMessageExternal)
 }
+
+export const getSharedCommandIds = (
+  _: unknown,
+  __: Sender,
+  response: (res: unknown) => void,
+): boolean => {
+  const fetch = async () => {
+    try {
+      const {
+        data: { session },
+      } = await getSupabase().auth.getSession()
+      if (!session) {
+        response([])
+        return
+      }
+      const res = await globalThis.fetch(`${NEW_HUB_URL}/api/me/commands`, {
+        headers: { Authorization: `Bearer ${session.access_token}` },
+      })
+      if (!res.ok) {
+        response([])
+        return
+      }
+      const raw = (await res.json()) as unknown
+      if (!Array.isArray(raw)) {
+        response([])
+        return
+      }
+      const commands = raw.filter(
+        (c): c is { id: string } =>
+          typeof c === "object" && c !== null && typeof (c as { id?: unknown }).id === "string",
+      )
+      response(commands.map((c) => c.id))
+    } catch (err) {
+      console.error("[getSharedCommandIds] Failed to fetch shared commands:", err)
+      response([])
+    }
+  }
+  fetch()
+  return true
+}
diff --git a/packages/extension/src/services/hubShare.ts b/packages/extension/src/services/hubShare.ts
index 9d580c0ce..ea1a33f66 100644
--- a/packages/extension/src/services/hubShare.ts
+++ b/packages/extension/src/services/hubShare.ts
@@ -91,3 +91,15 @@ export function editCommandToHub(command: SelectionCommand): boolean {
   })
   return true
 }
+
+export async function getSharedCommandIds(): Promise<string[]> {
+  try {
+    const ids = await Ipc.send<undefined, string[]>(
+      BgCommand.getSharedCommandIds,
+    )
+    return Array.isArray(ids) ? ids : []
+  } catch (err) {
+    console.error("[HubShare] Failed to get shared command IDs:", err)
+    return []
+  }
+}
diff --git a/packages/extension/src/services/ipc.ts b/packages/extension/src/services/ipc.ts
index f8da80b8e..8f67eb8be 100644
--- a/packages/extension/src/services/ipc.ts
+++ b/packages/extension/src/services/ipc.ts
@@ -35,6 +35,7 @@ export enum BgCommand {
   // Hub
   shareCommandToHub = "shareCommandToHub",
   editCommandToHub = "editCommandToHub",
+  getSharedCommandIds = "getSharedCommandIds",
   // PageAction
   addPageAction = "addPageAction",
   updatePageAction = "updatePageAction",

From 67101b5bacf89ad0712353c58a709a819a433471 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Tue, 12 May 2026 04:05:54 +0000
Subject: [PATCH 3/8] Address code review: immutable processFormData, cleanup
 fetchIds, remove type cast

Agent-Logs-Url: https://github.com/ujiro99/selection-command/sessions/602832e4-7031-485e-b714-13ff9188de16

Co-authored-by: ujiro99 <677231+ujiro99@users.noreply.github.com>
---
 .../option/editor/CommandEditDialog.tsx       | 27 ++++++++++---------
 .../src/hooks/option/useSharedCommandIds.ts   |  3 ++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/packages/extension/src/components/option/editor/CommandEditDialog.tsx b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
index 61e872669..e6aed5e7b 100644
--- a/packages/extension/src/components/option/editor/CommandEditDialog.tsx
+++ b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
@@ -332,23 +332,24 @@ const CommandEditDialogInner = ({
 
   // Process form data before submit: apply coercions and clean up unused fields.
   const processFormData = (data: CommandSchemaType): CommandSchemaType => {
-    if (isEmpty(data.id)) data.id = generateId()
-    if (data.revision == null) data.revision = 0
-    if (data.parentFolderId === ROOT_FOLDER) {
-      data.parentFolderId = undefined
+    const d = { ...data }
+    if (isEmpty(d.id)) d.id = generateId()
+    if (d.revision == null) d.revision = 0
+    if (d.parentFolderId === ROOT_FOLDER) {
+      d.parentFolderId = undefined
     }
-    if (isSearchType(data)) {
-      if (data.popupOption != null) {
-        data.popupOption = {
-          width: Number(data.popupOption.width),
-          height: Number(data.popupOption.height),
+    if (isSearchType(d)) {
+      if (d.popupOption != null) {
+        d.popupOption = {
+          width: Number(d.popupOption.width),
+          height: Number(d.popupOption.height),
         }
       }
-      if (data.openMode !== OPEN_MODE.WINDOW) {
-        delete data.windowState
+      if (d.openMode !== OPEN_MODE.WINDOW) {
+        delete d.windowState
       }
     }
-    return data
+    return d
   }
 
   const variableArray = useFieldArray({
@@ -909,7 +910,7 @@ const CommandEditDialogInner = ({
                   (data) => {
                     const processed = processFormData(data)
                     onSubmit(processed)
-                    shareCommandToHub(processed as SelectionCommand)
+                    shareCommandToHub(processed)
                     onOpenChange(false)
                     reset(InitialValues)
                   },
diff --git a/packages/extension/src/hooks/option/useSharedCommandIds.ts b/packages/extension/src/hooks/option/useSharedCommandIds.ts
index 7373a2b7d..15a6e43e8 100644
--- a/packages/extension/src/hooks/option/useSharedCommandIds.ts
+++ b/packages/extension/src/hooks/option/useSharedCommandIds.ts
@@ -15,8 +15,9 @@ export function useSharedCommandIds(): Set<string> {
     let cancelled = false
 
     const fetchIds = async (hubUser: HubUser | null) => {
+      if (cancelled) return
       if (!hubUser) {
-        if (!cancelled) setSharedIds(new Set())
+        setSharedIds(new Set())
         return
       }
       const ids = await getSharedCommandIds()

From 7ec1e24751180928214cc3b1acfc071db1569517 Mon Sep 17 00:00:00 2001
From: ujiro99 <siro.cola@gmail.com>
Date: Tue, 12 May 2026 15:18:21 +0900
Subject: [PATCH 4/8] Fix: Fix command download from Hub so it works properly.

---
 .../src/components/option/ShareButton.tsx      |  9 +++++++--
 .../extension/src/services/hub/background.ts   | 17 +++++++++++------
 packages/extension/src/types/index.ts          | 18 ++++++++++++++++++
 3 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/packages/extension/src/components/option/ShareButton.tsx b/packages/extension/src/components/option/ShareButton.tsx
index 2e7b67fc1..81bd877a7 100644
--- a/packages/extension/src/components/option/ShareButton.tsx
+++ b/packages/extension/src/components/option/ShareButton.tsx
@@ -24,7 +24,11 @@ type Props = {
   isShared?: boolean
 }
 
-export const ShareButton = ({ command, onCommandIdChange, isShared }: Props) => {
+export const ShareButton = ({
+  command,
+  onCommandIdChange,
+  isShared,
+}: Props) => {
   const buttonRef = useRef<HTMLButtonElement>(null)
   const [status, setStatus] = useState<"idle" | "sent" | "error">("idle")
 
@@ -66,6 +70,7 @@ export const ShareButton = ({ command, onCommandIdChange, isShared }: Props) =>
         className={cn(
           "outline-gray-200 p-2 rounded-md transition hover:bg-green-100 hover:scale-125 group/share-btn",
           "disabled:opacity-50 disabled:cursor-not-allowed disabled:pointer-events-none",
+          isShared && "bg-green-50",
         )}
         onClick={handleClick}
         ref={buttonRef}
@@ -73,7 +78,7 @@ export const ShareButton = ({ command, onCommandIdChange, isShared }: Props) =>
         <Share
           className={cn(
             "stroke-gray-500 group-hover/share-btn:stroke-green-600",
-            isShared && "stroke-green-500",
+            isShared && "stroke-green-600",
             status === "error" && "stroke-red-500",
           )}
           size={16}
diff --git a/packages/extension/src/services/hub/background.ts b/packages/extension/src/services/hub/background.ts
index f934438a8..ca395ff2c 100644
--- a/packages/extension/src/services/hub/background.ts
+++ b/packages/extension/src/services/hub/background.ts
@@ -5,7 +5,7 @@ import { Ipc, BgCommand } from "@/services/ipc"
 import type { Sender } from "@/services/ipc"
 import { Storage, LOCAL_STORAGE_KEY } from "@/services/storage"
 import type { SubmitCommandInput } from "@/services/hubShare"
-import type { HubUser } from "@/types"
+import type { HubUser, CommandFromHub } from "@/types"
 
 const chromeStorageAdapter: SupportedStorage = {
   getItem: async (key: string) => {
@@ -258,7 +258,7 @@ function onMessageExternal(
       ackTimeout: undefined,
       ackListener: undefined,
       pendingResponse: undefined,
-      cancelConnectWait: () => {},
+      cancelConnectWait: () => { },
     }
     _editSession = newSession
 
@@ -411,18 +411,23 @@ export const getSharedCommandIds = (
         response([])
         return
       }
-      const raw = (await res.json()) as unknown
+      const raw = (await res.json()).commands as CommandFromHub[]
       if (!Array.isArray(raw)) {
         response([])
         return
       }
       const commands = raw.filter(
-        (c): c is { id: string } =>
-          typeof c === "object" && c !== null && typeof (c as { id?: unknown }).id === "string",
+        (c) =>
+          typeof c === "object" &&
+          c !== null &&
+          typeof (c as { id?: unknown }).id === "string",
       )
       response(commands.map((c) => c.id))
     } catch (err) {
-      console.error("[getSharedCommandIds] Failed to fetch shared commands:", err)
+      console.error(
+        "[getSharedCommandIds] Failed to fetch shared commands:",
+        err,
+      )
       response([])
     }
   }
diff --git a/packages/extension/src/types/index.ts b/packages/extension/src/types/index.ts
index ca9c378b7..bedbdaa79 100644
--- a/packages/extension/src/types/index.ts
+++ b/packages/extension/src/types/index.ts
@@ -212,6 +212,24 @@ export type HubUser = {
   image: string
 }
 
+export interface CommandFromHub {
+  id: string
+  userId: string | null
+  title: string
+  description: string
+  releaseNote: string
+  iconUrl: string | null
+  targetUrl: string | null
+  commandType: "search" | "pageAction" | "aiPrompt"
+  commandData: Record<string, unknown>
+  locale: string | null
+  isPublic: boolean | null
+  publishedAt: Date | null
+  createdAt: Date
+  updatedAt: Date
+  deletedAt: Date | null
+}
+
 export type ExecuteCommandParams = {
   command: Command | SelectionCommand
   position: { x: number; y: number } | null

From c0973b126f49207d541384a23d90d1e8af032e3f Mon Sep 17 00:00:00 2001
From: ujiro99 <siro.cola@gmail.com>
Date: Tue, 12 May 2026 15:57:04 +0900
Subject: [PATCH 5/8] Refactoring.

---
 packages/extension/src/background_script.ts   | 156 +----
 .../src/services/hub/background.test.ts       | 657 ++++++++++++------
 .../extension/src/services/hub/background.ts  | 436 ++++++++----
 packages/extension/src/services/ipc.ts        |   2 -
 4 files changed, 763 insertions(+), 488 deletions(-)

diff --git a/packages/extension/src/background_script.ts b/packages/extension/src/background_script.ts
index 16cfb0c16..8bc6e4752 100644
--- a/packages/extension/src/background_script.ts
+++ b/packages/extension/src/background_script.ts
@@ -4,35 +4,24 @@ import {
   SHORTCUT_NO_SELECTION_BEHAVIOR,
   HUB_URL,
   SCREEN,
-  COMMAND_SOURCE_TYPE,
 } from "@/const"
 import { executeActionProps } from "@/services/contextMenus"
 import { Ipc, BgCommand, TabCommand, CONNECTION_APP } from "@/services/ipc"
 import type { IpcCallback } from "@/services/ipc"
 import { Settings } from "@/services/settings/settings"
 import { enhancedSettings } from "@/services/settings/enhancedSettings"
-import { PopupOption } from "@/services/option/defaultSettings"
 import * as PageActionBackground from "@/services/pageAction/background"
 import { BgData } from "@/services/backgroundData"
 import { ContextMenu } from "@/services/contextMenus"
 import { closeWindow, windowExists, getCurrentTab } from "@/services/chrome"
 import { WindowStackManager } from "@/services/windowStackManager"
 import { PopupAutoClose } from "@/services/popupAutoClose"
-import {
-  isSearchCommand,
-  isPageActionCommand,
-  isAiPromptCommand,
-  findMatchingPageRule,
-} from "@/lib/utils"
+import { findMatchingPageRule } from "@/lib/utils"
 import { execute } from "@/action/background"
 import * as ActionHelper from "@/action/helper"
 import type { WindowType } from "@/types"
 import { Storage, SESSION_STORAGE_KEY } from "@/services/storage"
-import {
-  ANALYTICS_EVENTS,
-  sendEvent,
-  getOrCreateClientId,
-} from "@/services/analytics"
+import { ANALYTICS_EVENTS, sendEvent } from "@/services/analytics"
 import * as HubBackground from "@/services/hub/background"
 
 import { importIf } from "@import-if"
@@ -46,10 +35,6 @@ export type addPageRuleProps = {
   url: string
 }
 
-type addCommandProps = {
-  command: string
-}
-
 const getTabId = (
   _: unknown,
   sender: Sender,
@@ -68,7 +53,7 @@ const getActiveTabId = (
   return true
 }
 
-const onConnect = async function (port: chrome.runtime.Port) {
+const onConnect = async function(port: chrome.runtime.Port) {
   if (port.name !== CONNECTION_APP) return
   port.onDisconnect.addListener(() => onDisconnect(port))
   const tabId = port.sender?.tab?.id
@@ -81,7 +66,7 @@ const onConnect = async function (port: chrome.runtime.Port) {
     await PageActionBackground.handleSidePanelConnect(port)
   }
 }
-const onDisconnect = async function (port: chrome.runtime.Port) {
+const onDisconnect = async function(port: chrome.runtime.Port) {
   if (port.name !== CONNECTION_APP) return
   if (chrome.runtime.lastError) {
     if (
@@ -159,117 +144,6 @@ const commandFuncs = {
     return false
   },
 
-  [BgCommand.addCommand]: (
-    param: addCommandProps,
-    _: Sender,
-    response: (res: unknown) => void,
-  ): boolean => {
-    const command = JSON.parse(param.command)
-    const isSearch = isSearchCommand(command)
-    const isPageAction = isPageActionCommand(command)
-    const isAiPrompt = isAiPromptCommand(command)
-    const sourceType = (command as { sourceType?: unknown }).sourceType
-    const sourceId = (command as { sourceId?: unknown }).sourceId
-    const normalizedSourceType = Object.values(COMMAND_SOURCE_TYPE).includes(
-      sourceType as COMMAND_SOURCE_TYPE,
-    )
-      ? (sourceType as COMMAND_SOURCE_TYPE)
-      : undefined
-    const sourceInfo = {
-      sourceType: normalizedSourceType,
-      sourceId: typeof sourceId === "string" ? sourceId : undefined,
-    }
-
-    const cmd = isSearch
-      ? {
-          id: command.id,
-          title: command.title,
-          searchUrl: command.searchUrl,
-          iconUrl: command.iconUrl,
-          ...sourceInfo,
-          openMode: command.openMode,
-          openModeSecondary: command.openModeSecondary,
-          spaceEncoding: command.spaceEncoding,
-          popupOption: PopupOption,
-        }
-      : isAiPrompt
-        ? {
-            id: command.id,
-            title: command.title,
-            iconUrl: command.iconUrl,
-            ...sourceInfo,
-            openMode: command.openMode,
-            aiPromptOption: command.aiPromptOption,
-            popupOption: PopupOption,
-          }
-        : isPageAction
-          ? {
-              id: command.id,
-              title: command.title,
-              iconUrl: command.iconUrl,
-              ...sourceInfo,
-              openMode: command.openMode,
-              pageActionOption: command.pageActionOption,
-              popupOption: PopupOption,
-            }
-          : null
-
-    if (!cmd) {
-      console.error("invalid command", param.command)
-      response({ result: false, error: "Invalid command format" })
-      return true
-    }
-
-    Settings.addCommands([cmd])
-      .then(() => {
-        return sendEvent(
-          ANALYTICS_EVENTS.COMMAND_ADD,
-          {
-            event_label: cmd.openMode,
-            source_type: sourceInfo.sourceType,
-            source_id: sourceInfo.sourceId,
-          },
-          SCREEN.COMMAND_HUB,
-        )
-      })
-      .then(async () => {
-        const clientId = await getOrCreateClientId()
-        response({ result: true, install_id: clientId })
-      })
-      .catch((err) => {
-        console.error("[addCommand] Failed:", err)
-        response({ result: false, error: err?.message ?? "Unknown error" })
-      })
-    return true
-  },
-
-  [BgCommand.removeCommand]: (
-    param: { id: string },
-    _: Sender,
-    response: (res: unknown) => void,
-  ): boolean => {
-    const remove = async () => {
-      const current = await Storage.getCommands()
-      const commandToRemove = current.find((c) => c.id === param.id)
-      if (!commandToRemove) {
-        response({ result: false, error: "Command not found" })
-        return
-      }
-      const newCommands = current.filter((c) => c.id !== param.id)
-      await Storage.setCommands(newCommands)
-      await sendEvent(
-        ANALYTICS_EVENTS.COMMAND_REMOVE,
-        {
-          event_label: commandToRemove.openMode,
-        },
-        SCREEN.COMMAND_HUB,
-      )
-      response({ result: true })
-    }
-    remove()
-    return true
-  },
-
   [BgCommand.canOpenInTab]: (
     _: unknown,
     sender: Sender,
@@ -621,17 +495,17 @@ const checkAndPerformLegacyBackup = async () => {
   }
 }
 
-// Initialize commandIdObj and register listener at top-level
-// to ensure they are available when service worker restarts
-;(async () => {
-  try {
-    await ContextMenu.syncCommandIdObj()
-    chrome.contextMenus.onClicked.addListener(ContextMenu.onClicked)
-  } catch (error) {
-    // Ignore errors during initialization (e.g., in test environment)
-    console.debug("Failed to initialize context menu listener:", error)
-  }
-})()
+  // Initialize commandIdObj and register listener at top-level
+  // to ensure they are available when service worker restarts
+  ; (async () => {
+    try {
+      await ContextMenu.syncCommandIdObj()
+      chrome.contextMenus.onClicked.addListener(ContextMenu.onClicked)
+    } catch (error) {
+      // Ignore errors during initialization (e.g., in test environment)
+      console.debug("Failed to initialize context menu listener:", error)
+    }
+  })()
 
 Settings.addChangedListener(() => ContextMenu.init())
 
diff --git a/packages/extension/src/services/hub/background.test.ts b/packages/extension/src/services/hub/background.test.ts
index 346f502f8..257859108 100644
--- a/packages/extension/src/services/hub/background.test.ts
+++ b/packages/extension/src/services/hub/background.test.ts
@@ -4,25 +4,49 @@ import {
   editCommandToHub,
   initHubExternalListener,
   resetEditSession,
+  handleAddCommand,
+  handleDeleteCommand,
+  handleEditCommand,
+  handleRequestInstalledCommand,
+  handleSetSession,
+  handleClearSession,
 } from "./background"
-import { Ipc, BgCommand } from "@/services/ipc"
 import { Storage, LOCAL_STORAGE_KEY } from "@/services/storage"
-
-vi.mock("@/services/ipc", () => ({
-  Ipc: { callListener: vi.fn() },
-  BgCommand: { addCommand: "addCommand", removeCommand: "removeCommand" },
-}))
+import { Settings } from "@/services/settings/settings"
+import { sendEvent, getOrCreateClientId } from "@/services/analytics"
 
 vi.mock("@/services/storage", () => ({
-  Storage: { getCommands: vi.fn(), set: vi.fn(), updateCommands: vi.fn() },
+  Storage: {
+    getCommands: vi.fn(),
+    setCommands: vi.fn(),
+    set: vi.fn(),
+    updateCommands: vi.fn(),
+  },
   LOCAL_STORAGE_KEY: { HUB_USER: "hubUser" },
 }))
 
-vi.mock("@/const", () => ({
-  NEW_HUB_URL: "https://hub.example.com",
-  OPTION_PAGE_PATH: "src/options_page.html",
+vi.mock("@/services/settings/settings", () => ({
+  Settings: { addCommands: vi.fn() },
+}))
+
+vi.mock("@/services/analytics", () => ({
+  ANALYTICS_EVENTS: {
+    COMMAND_ADD: "command_add",
+    COMMAND_REMOVE: "command_remove",
+  },
+  sendEvent: vi.fn(),
+  getOrCreateClientId: vi.fn(),
 }))
 
+vi.mock("@/const", async (importOriginal) => {
+  const actual = await importOriginal<typeof import("@/const")>()
+  return {
+    ...actual,
+    NEW_HUB_URL: "https://hub.example.com",
+    OPTION_PAGE_PATH: "src/options_page.html",
+  }
+})
+
 const mockSetSession = vi.fn()
 const mockSignOut = vi.fn()
 
@@ -37,6 +61,10 @@ vi.mock("@supabase/supabase-js", () => ({
 
 const HUB_ORIGIN = "https://hub.example.com"
 
+// ---------------------------------------------------------------------------
+// Helpers
+// ---------------------------------------------------------------------------
+
 type MessageListener = (
   message: Record<string, unknown>,
   sender: chrome.runtime.MessageSender,
@@ -50,10 +78,51 @@ function getRegisteredListener(): MessageListener {
   return calls[calls.length - 1][0] as MessageListener
 }
 
+const searchCommandJson = JSON.stringify({
+  id: "cmd-1",
+  title: "Search",
+  searchUrl: "https://google.com?q=%s",
+  iconUrl: "",
+  openMode: "tab",
+  openModeSecondary: "popup",
+  spaceEncoding: "plus",
+  sourceType: "hubCommunity",
+  sourceId: "src-1",
+})
+
+const aiPromptCommandJson = JSON.stringify({
+  id: "cmd-2",
+  title: "AI Prompt",
+  iconUrl: "",
+  openMode: "aiPrompt",
+  aiPromptOption: { serviceId: "chatgpt" },
+  sourceType: "selfCreated",
+  sourceId: "src-2",
+})
+
+const pageActionCommandJson = JSON.stringify({
+  id: "cmd-3",
+  title: "Page Action",
+  iconUrl: "",
+  openMode: "pageAction",
+  pageActionOption: { steps: [] },
+})
+
+const invalidCommandJson = JSON.stringify({
+  id: "cmd-4",
+  title: "Link",
+  openMode: "linkPopup",
+})
+
 beforeEach(() => {
   vi.clearAllMocks()
   resetEditSession()
   vi.mocked(Storage.updateCommands).mockResolvedValue(true)
+  vi.mocked(Settings.addCommands).mockResolvedValue(true)
+  vi.mocked(Storage.setCommands).mockResolvedValue(true)
+  vi.mocked(Storage.set).mockResolvedValue(true)
+  vi.mocked(sendEvent).mockResolvedValue(undefined as any)
+  vi.mocked(getOrCreateClientId).mockResolvedValue("client-id-123")
   ;(chrome.tabs as any).remove = vi.fn()
   ;(chrome.tabs as any).update = vi.fn()
   Object.defineProperty(global.chrome.runtime, "onConnectExternal", {
@@ -97,20 +166,19 @@ describe("onMessageExternal - origin validation", () => {
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
     const result = listener(
-      { action: "AddCommand", command: "{}" },
+      { action: "AddCommand", command: searchCommandJson },
       { origin: "https://evil.example.com" },
       sendResponse,
     )
     expect(result).toBe(false)
     expect(sendResponse).not.toHaveBeenCalled()
-    expect(Ipc.callListener).not.toHaveBeenCalled()
   })
 
   it("ORIGIN-03: returns false when sender.origin is undefined", () => {
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
     const result = listener(
-      { action: "AddCommand", command: "{}" },
+      { action: "AddCommand", command: searchCommandJson },
       {},
       sendResponse,
     )
@@ -120,46 +188,138 @@ describe("onMessageExternal - origin validation", () => {
 })
 
 // ---------------------------------------------------------------------------
-// onMessageExternal — AddCommand
+// handleAddCommand (unit)
 // ---------------------------------------------------------------------------
 
-describe("onMessageExternal - AddCommand", () => {
-  it("AC-01: calls Ipc.callListener and forwards result to sendResponse", async () => {
-    vi.mocked(Ipc.callListener).mockResolvedValue({ result: true } as any)
-    const listener = getRegisteredListener()
+describe("handleAddCommand", () => {
+  it("AC-01: adds a search command and responds with install_id", async () => {
     const sendResponse = vi.fn()
-    const result = listener(
-      { action: "AddCommand", command: '{"id":"1"}' },
-      { origin: HUB_ORIGIN },
-      sendResponse,
+    await handleAddCommand(searchCommandJson, sendResponse)
+
+    expect(Settings.addCommands).toHaveBeenCalledWith([
+      expect.objectContaining({
+        id: "cmd-1",
+        title: "Search",
+        searchUrl: "https://google.com?q=%s",
+        openMode: "tab",
+        sourceType: "hubCommunity",
+        sourceId: "src-1",
+      }),
+    ])
+    expect(sendEvent).toHaveBeenCalled()
+    expect(getOrCreateClientId).toHaveBeenCalled()
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: true,
+      install_id: "client-id-123",
+    })
+  })
+
+  it("AC-02: adds an AI prompt command", async () => {
+    const sendResponse = vi.fn()
+    await handleAddCommand(aiPromptCommandJson, sendResponse)
+
+    expect(Settings.addCommands).toHaveBeenCalledWith([
+      expect.objectContaining({
+        id: "cmd-2",
+        openMode: "aiPrompt",
+        aiPromptOption: { serviceId: "chatgpt" },
+        sourceType: "selfCreated",
+        sourceId: "src-2",
+      }),
+    ])
+    expect(sendResponse).toHaveBeenCalledWith(
+      expect.objectContaining({ result: true }),
     )
-    expect(result).toBe(true)
-    expect(Ipc.callListener).toHaveBeenCalledWith(BgCommand.addCommand, {
-      command: '{"id":"1"}',
+  })
+
+  it("AC-03: adds a page action command", async () => {
+    const sendResponse = vi.fn()
+    await handleAddCommand(pageActionCommandJson, sendResponse)
+
+    expect(Settings.addCommands).toHaveBeenCalledWith([
+      expect.objectContaining({
+        id: "cmd-3",
+        openMode: "pageAction",
+        pageActionOption: { steps: [] },
+      }),
+    ])
+    expect(sendResponse).toHaveBeenCalledWith(
+      expect.objectContaining({ result: true }),
+    )
+  })
+
+  it("AC-04: responds with error when command type is unrecognized", async () => {
+    const sendResponse = vi.fn()
+    await handleAddCommand(invalidCommandJson, sendResponse)
+
+    expect(Settings.addCommands).not.toHaveBeenCalled()
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "Invalid command format",
     })
-    await vi.waitFor(() =>
-      expect(sendResponse).toHaveBeenCalledWith({ result: true }),
+  })
+
+  it("AC-05: responds with error on invalid JSON", async () => {
+    const sendResponse = vi.fn()
+    await handleAddCommand("not-valid-json", sendResponse)
+
+    expect(Settings.addCommands).not.toHaveBeenCalled()
+    expect(sendResponse).toHaveBeenCalledWith(
+      expect.objectContaining({ result: false }),
     )
   })
 
-  it("AC-02: calls sendResponse with result:false when Ipc.callListener rejects", async () => {
-    vi.mocked(Ipc.callListener).mockRejectedValue(new Error("IPC error"))
+  it("AC-06: responds with error when Settings.addCommands rejects", async () => {
+    vi.mocked(Settings.addCommands).mockRejectedValue(new Error("save failed"))
+    const sendResponse = vi.fn()
+    await handleAddCommand(searchCommandJson, sendResponse)
+
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "save failed",
+    })
+  })
+
+  it("AC-07: normalizes unknown sourceType to undefined", async () => {
+    const cmd = JSON.stringify({
+      id: "cmd-x",
+      title: "X",
+      searchUrl: "https://x.com?q=%s",
+      iconUrl: "",
+      openMode: "tab",
+      sourceType: "unknownType",
+    })
+    const sendResponse = vi.fn()
+    await handleAddCommand(cmd, sendResponse)
+
+    expect(Settings.addCommands).toHaveBeenCalledWith([
+      expect.objectContaining({ sourceType: undefined }),
+    ])
+  })
+})
+
+// ---------------------------------------------------------------------------
+// onMessageExternal — AddCommand (routing)
+// ---------------------------------------------------------------------------
+
+describe("onMessageExternal - AddCommand routing", () => {
+  it("AC-R-01: routes to handleAddCommand and returns true", async () => {
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
-    listener(
-      { action: "AddCommand", command: '{"id":"1"}' },
+    const result = listener(
+      { action: "AddCommand", command: searchCommandJson },
       { origin: HUB_ORIGIN },
       sendResponse,
     )
+    expect(result).toBe(true)
     await vi.waitFor(() =>
-      expect(sendResponse).toHaveBeenCalledWith({
-        result: false,
-        error: "IPC error",
-      }),
+      expect(sendResponse).toHaveBeenCalledWith(
+        expect.objectContaining({ result: true }),
+      ),
     )
   })
 
-  it("AC-03: does not handle AddCommand when command is not a string", () => {
+  it("AC-R-02: returns false when command is not a string", () => {
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
     const result = listener(
@@ -168,51 +328,77 @@ describe("onMessageExternal - AddCommand", () => {
       sendResponse,
     )
     expect(result).toBe(false)
-    expect(Ipc.callListener).not.toHaveBeenCalled()
+    expect(Settings.addCommands).not.toHaveBeenCalled()
   })
 })
 
 // ---------------------------------------------------------------------------
-// onMessageExternal — DeleteCommand
+// handleDeleteCommand (unit)
 // ---------------------------------------------------------------------------
 
-describe("onMessageExternal - DeleteCommand", () => {
-  it("DC-01: calls Ipc.callListener and forwards result to sendResponse", async () => {
-    vi.mocked(Ipc.callListener).mockResolvedValue({ result: true } as any)
-    const listener = getRegisteredListener()
+describe("handleDeleteCommand", () => {
+  const mockCommands = [
+    { id: "cmd-1", title: "Search", openMode: "tab" },
+    { id: "cmd-2", title: "AI", openMode: "aiPrompt" },
+  ] as any[]
+
+  it("DC-01: removes the command and responds with result:true", async () => {
+    vi.mocked(Storage.getCommands).mockResolvedValue(mockCommands)
     const sendResponse = vi.fn()
-    const result = listener(
-      { action: "DeleteCommand", id: "cmd-123" },
-      { origin: HUB_ORIGIN },
-      sendResponse,
-    )
-    expect(result).toBe(true)
-    expect(Ipc.callListener).toHaveBeenCalledWith(BgCommand.removeCommand, {
-      id: "cmd-123",
+    await handleDeleteCommand("cmd-1", sendResponse)
+
+    expect(Storage.setCommands).toHaveBeenCalledWith([mockCommands[1]])
+    expect(sendEvent).toHaveBeenCalled()
+    expect(sendResponse).toHaveBeenCalledWith({ result: true })
+  })
+
+  it("DC-02: responds with error when command is not found", async () => {
+    vi.mocked(Storage.getCommands).mockResolvedValue(mockCommands)
+    const sendResponse = vi.fn()
+    await handleDeleteCommand("nonexistent-id", sendResponse)
+
+    expect(Storage.setCommands).not.toHaveBeenCalled()
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "Command not found",
     })
-    await vi.waitFor(() =>
-      expect(sendResponse).toHaveBeenCalledWith({ result: true }),
-    )
   })
 
-  it("DC-02: calls sendResponse with result:false when Ipc.callListener rejects", async () => {
-    vi.mocked(Ipc.callListener).mockRejectedValue(new Error("IPC error"))
+  it("DC-03: responds with error when Storage.getCommands rejects", async () => {
+    vi.mocked(Storage.getCommands).mockRejectedValue(new Error("storage error"))
+    const sendResponse = vi.fn()
+    await handleDeleteCommand("cmd-1", sendResponse)
+
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "storage error",
+    })
+  })
+})
+
+// ---------------------------------------------------------------------------
+// onMessageExternal — DeleteCommand (routing)
+// ---------------------------------------------------------------------------
+
+describe("onMessageExternal - DeleteCommand routing", () => {
+  it("DC-R-01: routes to handleDeleteCommand and returns true", async () => {
+    vi.mocked(Storage.getCommands).mockResolvedValue([
+      { id: "cmd-1", title: "Search", openMode: "tab" } as any,
+    ])
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
-    listener(
-      { action: "DeleteCommand", id: "cmd-123" },
+    const result = listener(
+      { action: "DeleteCommand", id: "cmd-1" },
       { origin: HUB_ORIGIN },
       sendResponse,
     )
+    expect(result).toBe(true)
     await vi.waitFor(() =>
-      expect(sendResponse).toHaveBeenCalledWith({
-        result: false,
-        error: "IPC error",
-      }),
+      expect(sendResponse).toHaveBeenCalledWith({ result: true }),
     )
   })
 
-  it("DC-03: does not handle DeleteCommand when id is not a string", () => {
+  it("DC-R-02: returns false when id is not a string", () => {
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
     const result = listener(
@@ -221,25 +407,34 @@ describe("onMessageExternal - DeleteCommand", () => {
       sendResponse,
     )
     expect(result).toBe(false)
-    expect(Ipc.callListener).not.toHaveBeenCalled()
+    expect(Storage.getCommands).not.toHaveBeenCalled()
   })
 })
 
 // ---------------------------------------------------------------------------
-// onMessageExternal — EditCommand
+// handleEditCommand (unit)
 // ---------------------------------------------------------------------------
 
-describe("onMessageExternal - EditCommand", () => {
-  it("EC-01: opens options page with editCommand and syncHub params", async () => {
+describe("handleEditCommand", () => {
+  it("EC-01: returns false and error response when sender has no tab id", () => {
+    const sendResponse = vi.fn()
+    const result = handleEditCommand("cmd-1", {}, sendResponse)
+    expect(result).toBe(false)
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "Invalid sender tab",
+    })
+  })
+
+  it("EC-02: creates options tab with correct URL and responds with result:true", async () => {
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 42 } as chrome.tabs.Tab)
       return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
     })
-    const listener = getRegisteredListener()
     const sendResponse = vi.fn()
-    const result = listener(
-      { action: "EditCommand", id: "cmd-123" },
-      { origin: HUB_ORIGIN, tab: { id: 10 } as chrome.tabs.Tab },
+    const result = handleEditCommand(
+      "cmd-123",
+      { tab: { id: 10 } as chrome.tabs.Tab },
       sendResponse,
     )
     expect(result).toBe(true)
@@ -256,7 +451,50 @@ describe("onMessageExternal - EditCommand", () => {
     )
   })
 
-  it("EC-02: does not handle EditCommand when id is not a string", () => {
+  it("EC-03: responds with error when tab creation returns no id", async () => {
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({} as chrome.tabs.Tab)
+      return Promise.resolve({} as chrome.tabs.Tab)
+    })
+    const sendResponse = vi.fn()
+    handleEditCommand(
+      "cmd-1",
+      { tab: { id: 10 } as chrome.tabs.Tab },
+      sendResponse,
+    )
+    await vi.waitFor(() =>
+      expect(sendResponse).toHaveBeenCalledWith({
+        result: false,
+        error: "Failed to create edit tab",
+      }),
+    )
+  })
+})
+
+// ---------------------------------------------------------------------------
+// onMessageExternal — EditCommand (routing)
+// ---------------------------------------------------------------------------
+
+describe("onMessageExternal - EditCommand routing", () => {
+  it("EC-R-01: opens options page with editCommand and syncHub params", async () => {
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({ id: 42 } as chrome.tabs.Tab)
+      return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
+    })
+    const listener = getRegisteredListener()
+    const sendResponse = vi.fn()
+    const result = listener(
+      { action: "EditCommand", id: "cmd-123" },
+      { origin: HUB_ORIGIN, tab: { id: 10 } as chrome.tabs.Tab },
+      sendResponse,
+    )
+    expect(result).toBe(true)
+    await vi.waitFor(() =>
+      expect(sendResponse).toHaveBeenCalledWith({ result: true }),
+    )
+  })
+
+  it("EC-R-02: returns false when id is not a string", () => {
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
     const result = listener(
@@ -268,17 +506,16 @@ describe("onMessageExternal - EditCommand", () => {
     expect(chrome.tabs.create).not.toHaveBeenCalled()
   })
 
-  it("EC-03: ignores hub-edit port when sender tab id does not match EditCommand sender", () => {
+  it("EC-R-03: ignores hub-edit port when sender tab id does not match", () => {
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 42 } as chrome.tabs.Tab)
       return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
     })
     const listener = getRegisteredListener()
-    const sendResponse = vi.fn()
     listener(
       { action: "EditCommand", id: "cmd-123" },
       { origin: HUB_ORIGIN, tab: { id: 10 } as chrome.tabs.Tab },
-      sendResponse,
+      vi.fn(),
     )
     const hubEditConnectListener = vi.mocked(
       chrome.runtime.onConnectExternal.addListener,
@@ -295,17 +532,16 @@ describe("onMessageExternal - EditCommand", () => {
     expect(mockPort.onDisconnect.addListener).not.toHaveBeenCalled()
   })
 
-  it("EC-04: ignores hub-edit port when sender origin does not match hub origin", () => {
+  it("EC-R-04: ignores hub-edit port from wrong origin", () => {
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 42 } as chrome.tabs.Tab)
       return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
     })
     const listener = getRegisteredListener()
-    const sendResponse = vi.fn()
     listener(
       { action: "EditCommand", id: "cmd-123" },
       { origin: HUB_ORIGIN, tab: { id: 10 } as chrome.tabs.Tab },
-      sendResponse,
+      vi.fn(),
     )
     const hubEditConnectListener = vi.mocked(
       chrome.runtime.onConnectExternal.addListener,
@@ -319,58 +555,19 @@ describe("onMessageExternal - EditCommand", () => {
     expect(
       chrome.runtime.onConnectExternal.removeListener,
     ).not.toHaveBeenCalled()
-    expect(mockPort.onDisconnect.addListener).not.toHaveBeenCalled()
   })
 
-  it("EC-05: returns false when EditCommand sender has no tab id", () => {
-    const listener = getRegisteredListener()
-    const sendResponse = vi.fn()
-    const result = listener(
-      { action: "EditCommand", id: "cmd-123" },
-      { origin: HUB_ORIGIN },
-      sendResponse,
-    )
-    expect(result).toBe(false)
-    expect(sendResponse).toHaveBeenCalledWith({
-      result: false,
-      error: "Invalid sender tab",
-    })
-    expect(chrome.tabs.create).not.toHaveBeenCalled()
-  })
-
-  it("EC-06: removes hub-edit listener when options tab creation fails", async () => {
-    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
-      cb?.({} as chrome.tabs.Tab)
-      return Promise.resolve({} as chrome.tabs.Tab)
-    })
-    const listener = getRegisteredListener()
-    const sendResponse = vi.fn()
-    listener(
-      { action: "EditCommand", id: "cmd-123" },
-      { origin: HUB_ORIGIN, tab: { id: 10 } as chrome.tabs.Tab },
-      sendResponse,
-    )
-    await vi.waitFor(() => {
-      expect(sendResponse).toHaveBeenCalledWith({
-        result: false,
-        error: "Failed to create edit tab",
-      })
-      expect(chrome.runtime.onConnectExternal.removeListener).toHaveBeenCalled()
-    })
-  })
-
-  it("EC-07: removes hub-edit listener when hub-edit connection timeout passes", () => {
+  it("EC-R-05: hub-edit connect listener times out after EDIT_CONNECT_TIMEOUT_MS", () => {
     vi.useFakeTimers()
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 42 } as chrome.tabs.Tab)
       return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
     })
     const listener = getRegisteredListener()
-    const sendResponse = vi.fn()
     listener(
       { action: "EditCommand", id: "cmd-123" },
       { origin: HUB_ORIGIN, tab: { id: 10 } as chrome.tabs.Tab },
-      sendResponse,
+      vi.fn(),
     )
     vi.advanceTimersByTime(10_001)
     expect(chrome.runtime.onConnectExternal.removeListener).toHaveBeenCalled()
@@ -387,7 +584,7 @@ describe("editCommandToHub", () => {
   const editParam = {
     id: "cmd-1",
     title: "Updated",
-    openMode: "newTab",
+    openMode: "tab",
     locale: "en",
     targetUrl: "https://example.com",
   } as any
@@ -424,7 +621,7 @@ describe("editCommandToHub", () => {
     expect(response).toHaveBeenCalledWith(false)
   })
 
-  it("EH-02: on ack, updates storage excluding locale/targetUrl and clears listener", async () => {
+  it("EH-02: on ack, updates storage excluding locale/targetUrl", async () => {
     const port = setupConnectedHubEditPort()
     let onAckMessage: ((msg: unknown) => void) | undefined
     vi.mocked(port.onMessage.addListener).mockImplementation((fn) => {
@@ -442,7 +639,7 @@ describe("editCommandToHub", () => {
     onAckMessage?.({ type: "edit-command-ack" })
 
     expect(Storage.updateCommands).toHaveBeenCalledWith([
-      { id: "cmd-1", title: "Updated", openMode: "newTab" },
+      { id: "cmd-1", title: "Updated", openMode: "tab" },
     ])
     expect(port.onMessage.removeListener).toHaveBeenCalled()
     await vi.waitFor(() => {
@@ -452,7 +649,7 @@ describe("editCommandToHub", () => {
     })
   })
 
-  it("EH-03: returns response(false) when ack timeout passes", () => {
+  it("EH-03: responds with false when ack timeout passes", () => {
     vi.useFakeTimers()
     const port = setupConnectedHubEditPort()
     const response = vi.fn()
@@ -481,111 +678,156 @@ describe("editCommandToHub", () => {
 })
 
 // ---------------------------------------------------------------------------
-// onMessageExternal — RequestInstalledCommand
+// handleRequestInstalledCommand (unit)
 // ---------------------------------------------------------------------------
 
-describe("onMessageExternal - RequestInstalledCommand", () => {
-  it("RI-01: returns installed command IDs via sendResponse", async () => {
+describe("handleRequestInstalledCommand", () => {
+  it("RI-01: responds with installed command IDs", async () => {
     vi.mocked(Storage.getCommands).mockResolvedValue([
       { id: "a" },
       { id: "b" },
     ] as any)
-    const listener = getRegisteredListener()
     const sendResponse = vi.fn()
-    const result = listener(
-      { action: "RequestInstalledCommand" },
-      { origin: HUB_ORIGIN },
-      sendResponse,
-    )
-    expect(result).toBe(true)
-    await vi.waitFor(() =>
-      expect(sendResponse).toHaveBeenCalledWith({
-        action: "SyncInstalledCommand",
-        installedIds: ["a", "b"],
-      }),
-    )
+    await handleRequestInstalledCommand(sendResponse)
+
+    expect(sendResponse).toHaveBeenCalledWith({
+      action: "SyncInstalledCommand",
+      installedIds: ["a", "b"],
+    })
   })
 
-  it("RI-02: returns empty installedIds when getCommands rejects", async () => {
+  it("RI-02: responds with empty installedIds when getCommands rejects", async () => {
     vi.mocked(Storage.getCommands).mockRejectedValue(new Error("storage error"))
+    const sendResponse = vi.fn()
+    await handleRequestInstalledCommand(sendResponse)
+
+    expect(sendResponse).toHaveBeenCalledWith({
+      action: "SyncInstalledCommand",
+      installedIds: [],
+    })
+  })
+})
+
+// ---------------------------------------------------------------------------
+// onMessageExternal — RequestInstalledCommand (routing)
+// ---------------------------------------------------------------------------
+
+describe("onMessageExternal - RequestInstalledCommand routing", () => {
+  it("RI-R-01: returns installed command IDs via sendResponse", async () => {
+    vi.mocked(Storage.getCommands).mockResolvedValue([
+      { id: "a" },
+      { id: "b" },
+    ] as any)
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
-    listener(
+    const result = listener(
       { action: "RequestInstalledCommand" },
       { origin: HUB_ORIGIN },
       sendResponse,
     )
+    expect(result).toBe(true)
     await vi.waitFor(() =>
       expect(sendResponse).toHaveBeenCalledWith({
         action: "SyncInstalledCommand",
-        installedIds: [],
+        installedIds: ["a", "b"],
       }),
     )
   })
 })
 
 // ---------------------------------------------------------------------------
-// onMessageExternal — SetSession
+// handleSetSession (unit)
 // ---------------------------------------------------------------------------
 
-describe("onMessageExternal - SetSession", () => {
-  it("SS-01: calls setSession, stores HubUser with email, and calls sendResponse with result:true", async () => {
+describe("handleSetSession", () => {
+  it("SS-01: sets session, stores HubUser, and responds with result:true", async () => {
     mockSetSession.mockResolvedValue({
       data: { user: { email: "user@example.com" } },
       error: null,
     })
-    vi.mocked(Storage.set).mockResolvedValue(true)
-    const listener = getRegisteredListener()
     const sendResponse = vi.fn()
-    const result = listener(
-      {
-        action: "SetSession",
-        access_token: "access-tok",
-        refresh_token: "refresh-tok",
-      },
-      { origin: HUB_ORIGIN },
-      sendResponse,
-    )
-    expect(result).toBe(true)
+    await handleSetSession("access-tok", "refresh-tok", sendResponse)
+
     expect(mockSetSession).toHaveBeenCalledWith({
       access_token: "access-tok",
       refresh_token: "refresh-tok",
     })
-    await vi.waitFor(() => {
-      expect(Storage.set).toHaveBeenCalledWith(LOCAL_STORAGE_KEY.HUB_USER, {
-        name: "user@example.com",
-        image: "",
-      })
-      expect(sendResponse).toHaveBeenCalledWith({ result: true })
+    expect(Storage.set).toHaveBeenCalledWith(LOCAL_STORAGE_KEY.HUB_USER, {
+      name: "user@example.com",
+      image: "",
     })
+    expect(sendResponse).toHaveBeenCalledWith({ result: true })
   })
 
-  it("SS-02: calls sendResponse with result:false when setSession returns error", async () => {
+  it("SS-02: responds with error when setSession returns supabase error", async () => {
     mockSetSession.mockResolvedValue({
       data: { user: null },
       error: { message: "invalid token" },
     })
+    const sendResponse = vi.fn()
+    await handleSetSession("bad-tok", "bad-ref", sendResponse)
+
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "invalid token",
+    })
+    expect(Storage.set).not.toHaveBeenCalled()
+  })
+
+  it("SS-03: responds with error when data.user is null", async () => {
+    mockSetSession.mockResolvedValue({
+      data: { user: null },
+      error: null,
+    })
+    const sendResponse = vi.fn()
+    await handleSetSession("tok", "ref", sendResponse)
+
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "Unknown error",
+    })
+  })
+
+  it("SS-04: responds with error when setSession throws", async () => {
+    mockSetSession.mockRejectedValue(new Error("network error"))
+    const sendResponse = vi.fn()
+    await handleSetSession("tok", "ref", sendResponse)
+
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "network error",
+    })
+  })
+})
+
+// ---------------------------------------------------------------------------
+// onMessageExternal — SetSession (routing)
+// ---------------------------------------------------------------------------
+
+describe("onMessageExternal - SetSession routing", () => {
+  it("SS-R-01: routes to handleSetSession and responds with result:true", async () => {
+    mockSetSession.mockResolvedValue({
+      data: { user: { email: "user@example.com" } },
+      error: null,
+    })
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
-    listener(
+    const result = listener(
       {
         action: "SetSession",
-        access_token: "bad-tok",
-        refresh_token: "bad-ref",
+        access_token: "access-tok",
+        refresh_token: "refresh-tok",
       },
       { origin: HUB_ORIGIN },
       sendResponse,
     )
+    expect(result).toBe(true)
     await vi.waitFor(() =>
-      expect(sendResponse).toHaveBeenCalledWith({
-        result: false,
-        error: "invalid token",
-      }),
+      expect(sendResponse).toHaveBeenCalledWith({ result: true }),
     )
-    expect(Storage.set).not.toHaveBeenCalled()
   })
 
-  it("SS-03: returns false when access_token is not a string", () => {
+  it("SS-R-02: returns false when access_token is not a string", () => {
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
     const result = listener(
@@ -597,7 +839,7 @@ describe("onMessageExternal - SetSession", () => {
     expect(mockSetSession).not.toHaveBeenCalled()
   })
 
-  it("SS-04: returns false when tokens are not provided", () => {
+  it("SS-R-03: returns false when tokens are not provided", () => {
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
     const result = listener(
@@ -611,13 +853,40 @@ describe("onMessageExternal - SetSession", () => {
 })
 
 // ---------------------------------------------------------------------------
-// onMessageExternal — ClearSession
+// handleClearSession (unit)
+// ---------------------------------------------------------------------------
+
+describe("handleClearSession", () => {
+  it("CS-01: signs out, clears HUB_USER, and responds with result:true", async () => {
+    mockSignOut.mockResolvedValue({ error: null })
+    const sendResponse = vi.fn()
+    await handleClearSession(sendResponse)
+
+    expect(mockSignOut).toHaveBeenCalled()
+    expect(Storage.set).toHaveBeenCalledWith(LOCAL_STORAGE_KEY.HUB_USER, null)
+    expect(sendResponse).toHaveBeenCalledWith({ result: true })
+  })
+
+  it("CS-02: responds with error when signOut throws", async () => {
+    mockSignOut.mockRejectedValue(new Error("signout error"))
+    const sendResponse = vi.fn()
+    await handleClearSession(sendResponse)
+
+    expect(sendResponse).toHaveBeenCalledWith({
+      result: false,
+      error: "signout error",
+    })
+    expect(Storage.set).not.toHaveBeenCalled()
+  })
+})
+
+// ---------------------------------------------------------------------------
+// onMessageExternal — ClearSession (routing)
 // ---------------------------------------------------------------------------
 
-describe("onMessageExternal - ClearSession", () => {
-  it("CS-01: calls signOut, clears HUB_USER, and calls sendResponse with result:true", async () => {
+describe("onMessageExternal - ClearSession routing", () => {
+  it("CS-R-01: routes to handleClearSession and responds with result:true", async () => {
     mockSignOut.mockResolvedValue({ error: null })
-    vi.mocked(Storage.set).mockResolvedValue(true)
     const listener = getRegisteredListener()
     const sendResponse = vi.fn()
     const result = listener(
@@ -632,20 +901,6 @@ describe("onMessageExternal - ClearSession", () => {
       expect(sendResponse).toHaveBeenCalledWith({ result: true })
     })
   })
-
-  it("CS-02: calls sendResponse with result:false when signOut rejects", async () => {
-    mockSignOut.mockRejectedValue(new Error("signout error"))
-    const listener = getRegisteredListener()
-    const sendResponse = vi.fn()
-    listener({ action: "ClearSession" }, { origin: HUB_ORIGIN }, sendResponse)
-    await vi.waitFor(() =>
-      expect(sendResponse).toHaveBeenCalledWith({
-        result: false,
-        error: "signout error",
-      }),
-    )
-    expect(Storage.set).not.toHaveBeenCalled()
-  })
 })
 
 // ---------------------------------------------------------------------------
@@ -656,7 +911,7 @@ describe("shareCommandToHub", () => {
   const param = { locale: "en", id: "cmd-1" } as any
   const sender = {} as any
 
-  it("SH-07: returns true immediately (async response marker)", () => {
+  it("SH-01: returns true immediately (async response marker)", () => {
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 1 } as chrome.tabs.Tab)
       return Promise.resolve({ id: 1 } as chrome.tabs.Tab)
@@ -666,7 +921,7 @@ describe("shareCommandToHub", () => {
     expect(result).toBe(true)
   })
 
-  it("SH-01: opens hub tab and calls response(true)", async () => {
+  it("SH-02: opens hub tab and calls response(true)", async () => {
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 42 } as chrome.tabs.Tab)
       return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
@@ -679,7 +934,7 @@ describe("shareCommandToHub", () => {
     )
   })
 
-  it("SH-02: calls response(false) when tab.id is undefined", async () => {
+  it("SH-03: calls response(false) when tab.id is undefined", async () => {
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({} as chrome.tabs.Tab)
       return Promise.resolve({} as chrome.tabs.Tab)
@@ -689,7 +944,7 @@ describe("shareCommandToHub", () => {
     await vi.waitFor(() => expect(response).toHaveBeenCalledWith(false))
   })
 
-  it("SH-03: calls response(false) and removes listener when chrome.tabs.create throws", async () => {
+  it("SH-04: calls response(false) when chrome.tabs.create throws", async () => {
     vi.mocked(chrome.tabs.create).mockImplementation(() => {
       throw new Error("tabs.create error")
     })
@@ -699,7 +954,7 @@ describe("shareCommandToHub", () => {
     expect(chrome.runtime.onConnectExternal.removeListener).toHaveBeenCalled()
   })
 
-  it("SH-04: ignores port with wrong name", async () => {
+  it("SH-05: ignores port with wrong name", async () => {
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 42 } as chrome.tabs.Tab)
       return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
@@ -707,7 +962,6 @@ describe("shareCommandToHub", () => {
     const response = vi.fn()
     shareCommandToHub(param, sender, response)
 
-    // Simulate port connect with wrong name
     const portConnectListener = vi.mocked(
       chrome.runtime.onConnectExternal.addListener,
     ).mock.calls[0][0]
@@ -723,7 +977,7 @@ describe("shareCommandToHub", () => {
     expect(mockPort.postMessage).not.toHaveBeenCalled()
   })
 
-  it("SH-05: ignores port from a different tab", async () => {
+  it("SH-06: ignores port from a different tab", async () => {
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 42 } as chrome.tabs.Tab)
       return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
@@ -731,7 +985,6 @@ describe("shareCommandToHub", () => {
     const response = vi.fn()
     shareCommandToHub(param, sender, response)
 
-    // Let the async share() function resume past the await so `tabId` is initialized
     await Promise.resolve()
 
     const portConnectListener = vi.mocked(
@@ -739,7 +992,7 @@ describe("shareCommandToHub", () => {
     ).mock.calls[0][0]
     const mockPort = {
       name: "hub-share",
-      sender: { tab: { id: 99 } }, // different tab ID
+      sender: { tab: { id: 99 } },
       postMessage: vi.fn(),
       onMessage: { addListener: vi.fn(), removeListener: vi.fn() },
     }
@@ -749,7 +1002,7 @@ describe("shareCommandToHub", () => {
     expect(mockPort.postMessage).not.toHaveBeenCalled()
   })
 
-  it("SH-06: valid port connect sends share-command and removes listener on ack", async () => {
+  it("SH-07: valid port sends share-command and removes listener on ack", async () => {
     vi.useFakeTimers()
     vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
       cb?.({ id: 42 } as chrome.tabs.Tab)
@@ -778,7 +1031,6 @@ describe("shareCommandToHub", () => {
     }
     portConnectListener(mockPort as any)
 
-    // Advance timer to trigger first postMessage
     vi.advanceTimersByTime(500)
 
     expect(mockPort.postMessage).toHaveBeenCalledWith({
@@ -787,7 +1039,6 @@ describe("shareCommandToHub", () => {
     })
     expect(chrome.runtime.onConnectExternal.removeListener).toHaveBeenCalled()
 
-    // Simulate ack
     capturedOnMessage?.({ type: "share-command-ack" })
     expect(mockPort.onMessage.removeListener).toHaveBeenCalled()
 
diff --git a/packages/extension/src/services/hub/background.ts b/packages/extension/src/services/hub/background.ts
index ca395ff2c..2beb6b60c 100644
--- a/packages/extension/src/services/hub/background.ts
+++ b/packages/extension/src/services/hub/background.ts
@@ -1,11 +1,27 @@
 import { createClient } from "@supabase/supabase-js"
 import type { SupportedStorage } from "@supabase/supabase-js"
-import { NEW_HUB_URL, OPTION_PAGE_PATH } from "@/const"
-import { Ipc, BgCommand } from "@/services/ipc"
+import {
+  NEW_HUB_URL,
+  OPTION_PAGE_PATH,
+  COMMAND_SOURCE_TYPE,
+  SCREEN,
+} from "@/const"
 import type { Sender } from "@/services/ipc"
 import { Storage, LOCAL_STORAGE_KEY } from "@/services/storage"
 import type { SubmitCommandInput } from "@/services/hubShare"
 import type { HubUser, CommandFromHub } from "@/types"
+import { Settings } from "@/services/settings/settings"
+import {
+  ANALYTICS_EVENTS,
+  sendEvent,
+  getOrCreateClientId,
+} from "@/services/analytics"
+import { PopupOption } from "@/services/option/defaultSettings"
+import {
+  isSearchCommand,
+  isPageActionCommand,
+  isAiPromptCommand,
+} from "@/lib/utils"
 
 const chromeStorageAdapter: SupportedStorage = {
   getItem: async (key: string) => {
@@ -206,6 +222,261 @@ export const editCommandToHub = (
   return true
 }
 
+export async function handleAddCommand(
+  command: string,
+  sendResponse: (response?: unknown) => void,
+): Promise<void> {
+  try {
+    const parsed = JSON.parse(command)
+    const isSearch = isSearchCommand(parsed)
+    const isPageAction = isPageActionCommand(parsed)
+    const isAiPrompt = isAiPromptCommand(parsed)
+    const sourceType = (parsed as { sourceType?: unknown }).sourceType
+    const sourceId = (parsed as { sourceId?: unknown }).sourceId
+    const normalizedSourceType = Object.values(COMMAND_SOURCE_TYPE).includes(
+      sourceType as COMMAND_SOURCE_TYPE,
+    )
+      ? (sourceType as COMMAND_SOURCE_TYPE)
+      : undefined
+    const sourceInfo = {
+      sourceType: normalizedSourceType,
+      sourceId: typeof sourceId === "string" ? sourceId : undefined,
+    }
+
+    const cmd = isSearch
+      ? {
+          id: parsed.id,
+          title: parsed.title,
+          searchUrl: parsed.searchUrl,
+          iconUrl: parsed.iconUrl,
+          ...sourceInfo,
+          openMode: parsed.openMode,
+          openModeSecondary: parsed.openModeSecondary,
+          spaceEncoding: parsed.spaceEncoding,
+          popupOption: PopupOption,
+        }
+      : isAiPrompt
+        ? {
+            id: parsed.id,
+            title: parsed.title,
+            iconUrl: parsed.iconUrl,
+            ...sourceInfo,
+            openMode: parsed.openMode,
+            aiPromptOption: parsed.aiPromptOption,
+            popupOption: PopupOption,
+          }
+        : isPageAction
+          ? {
+              id: parsed.id,
+              title: parsed.title,
+              iconUrl: parsed.iconUrl,
+              ...sourceInfo,
+              openMode: parsed.openMode,
+              pageActionOption: parsed.pageActionOption,
+              popupOption: PopupOption,
+            }
+          : null
+
+    if (!cmd) {
+      console.error("[handleAddCommand] invalid command", command)
+      sendResponse({ result: false, error: "Invalid command format" })
+      return
+    }
+
+    await Settings.addCommands([cmd])
+    await sendEvent(
+      ANALYTICS_EVENTS.COMMAND_ADD,
+      {
+        event_label: cmd.openMode,
+        source_type: sourceInfo.sourceType,
+        source_id: sourceInfo.sourceId,
+      },
+      SCREEN.COMMAND_HUB,
+    )
+    const clientId = await getOrCreateClientId()
+    sendResponse({ result: true, install_id: clientId })
+  } catch (err) {
+    console.error("[handleAddCommand] Failed:", err)
+    sendResponse({
+      result: false,
+      error: (err as Error)?.message ?? "Unknown error",
+    })
+  }
+}
+
+export async function handleDeleteCommand(
+  id: string,
+  sendResponse: (response?: unknown) => void,
+): Promise<void> {
+  try {
+    const current = await Storage.getCommands()
+    const commandToRemove = current.find((c) => c.id === id)
+    if (!commandToRemove) {
+      sendResponse({ result: false, error: "Command not found" })
+      return
+    }
+    const newCommands = current.filter((c) => c.id !== id)
+    await Storage.setCommands(newCommands)
+    await sendEvent(
+      ANALYTICS_EVENTS.COMMAND_REMOVE,
+      { event_label: commandToRemove.openMode },
+      SCREEN.COMMAND_HUB,
+    )
+    sendResponse({ result: true })
+  } catch (err) {
+    console.error("[handleDeleteCommand] Failed:", err)
+    sendResponse({
+      result: false,
+      error: (err as Error)?.message ?? "Unknown error",
+    })
+  }
+}
+
+export function handleEditCommand(
+  id: string,
+  sender: chrome.runtime.MessageSender,
+  sendResponse: (response?: unknown) => void,
+): boolean {
+  if (sender.tab?.id === undefined) {
+    sendResponse({ result: false, error: "Invalid sender tab" })
+    return false
+  }
+
+  // Cancel any in-progress session; the new request takes over (last-write-wins).
+  cancelEditSession()
+
+  const newSession: EditSession = {
+    hubTabId: sender.tab.id,
+    editTabId: undefined,
+    hubEditPort: undefined,
+    ackTimeout: undefined,
+    ackListener: undefined,
+    pendingResponse: undefined,
+    cancelConnectWait: () => {},
+  }
+  _editSession = newSession
+
+  let connectTimeout: ReturnType<typeof setTimeout> | undefined
+  const cleanupHubEditConnectListener = () => {
+    if (connectTimeout) {
+      clearTimeout(connectTimeout)
+      connectTimeout = undefined
+    }
+    chrome.runtime.onConnectExternal.removeListener(onHubEditConnect)
+  }
+  newSession.cancelConnectWait = cleanupHubEditConnectListener
+
+  const onHubEditConnect = (port: chrome.runtime.Port) => {
+    if (port.name !== "hub-edit") return
+    if (port.sender?.tab?.id !== newSession.hubTabId) return
+    if (port.sender?.origin !== hubOrigin) return
+    cleanupHubEditConnectListener()
+    newSession.hubEditPort = port
+    port.onDisconnect.addListener(() => {
+      if (newSession.pendingResponse) {
+        if (newSession.ackTimeout) clearTimeout(newSession.ackTimeout)
+        if (newSession.ackListener) {
+          port.onMessage.removeListener(newSession.ackListener)
+        }
+        newSession.pendingResponse(false)
+        newSession.pendingResponse = undefined
+      }
+      if (_editSession === newSession) _editSession = undefined
+      newSession.hubEditPort = undefined
+    })
+  }
+  chrome.runtime.onConnectExternal.addListener(onHubEditConnect)
+  connectTimeout = setTimeout(() => {
+    cleanupHubEditConnectListener()
+    if (_editSession === newSession) _editSession = undefined
+  }, EDIT_CONNECT_TIMEOUT_MS)
+
+  chrome.tabs.create(
+    {
+      url: `${OPTION_PAGE_PATH}?editCommand=${encodeURIComponent(id)}&syncHub=1#commands`,
+    },
+    (tab) => {
+      if (_editSession !== newSession) {
+        if (tab?.id != null) chrome.tabs.remove(tab.id)
+        sendResponse({ result: false, error: "Edit session timed out" })
+        return
+      }
+      if (tab?.id == null) {
+        cleanupHubEditConnectListener()
+        _editSession = undefined
+        sendResponse({ result: false, error: "Failed to create edit tab" })
+        return
+      }
+      newSession.editTabId = tab.id
+      sendResponse({ result: true })
+    },
+  )
+  return true
+}
+
+export async function handleRequestInstalledCommand(
+  sendResponse: (response?: unknown) => void,
+): Promise<void> {
+  try {
+    const commands = await Storage.getCommands()
+    sendResponse({
+      action: "SyncInstalledCommand",
+      installedIds: commands.map((c) => c.id),
+    })
+  } catch (err) {
+    console.error("[handleRequestInstalledCommand] Failed:", err)
+    sendResponse({ action: "SyncInstalledCommand", installedIds: [] })
+  }
+}
+
+export async function handleSetSession(
+  access_token: string,
+  refresh_token: string,
+  sendResponse: (response?: unknown) => void,
+): Promise<void> {
+  try {
+    const { data, error } = await getSupabase().auth.setSession({
+      access_token,
+      refresh_token,
+    })
+    if (error || !data.user) {
+      sendResponse({
+        result: false,
+        error: error?.message ?? "Unknown error",
+      })
+      return
+    }
+    const hubUser: HubUser = {
+      name: data.user.email ?? "",
+      image: "",
+    }
+    await Storage.set(LOCAL_STORAGE_KEY.HUB_USER, hubUser)
+    sendResponse({ result: true })
+  } catch (err) {
+    console.error("[handleSetSession] Failed:", err)
+    sendResponse({
+      result: false,
+      error: (err as Error)?.message ?? "Unknown error",
+    })
+  }
+}
+
+export async function handleClearSession(
+  sendResponse: (response?: unknown) => void,
+): Promise<void> {
+  try {
+    await getSupabase().auth.signOut()
+    await Storage.set(LOCAL_STORAGE_KEY.HUB_USER, null)
+    sendResponse({ result: true })
+  } catch (err) {
+    console.error("[handleClearSession] Failed:", err)
+    sendResponse({
+      result: false,
+      error: (err as Error)?.message ?? "Unknown error",
+    })
+  }
+}
+
 function onMessageExternal(
   message: Record<string, unknown>,
   sender: chrome.runtime.MessageSender,
@@ -217,126 +488,30 @@ function onMessageExternal(
   console.log("[onMessageExternal] Received message:", message)
 
   if (action === "AddCommand" && typeof command === "string") {
-    Ipc.callListener<
-      { command: string },
-      { result: boolean; error?: string; client_id?: string }
-    >(BgCommand.addCommand, { command })
-      .then(sendResponse)
-      .catch((err) => {
-        console.error("[onMessageExternal] AddCommand failed:", err)
-        sendResponse({ result: false, error: err?.message ?? "Unknown error" })
-      })
+    handleAddCommand(command, sendResponse).catch((err) => {
+      console.error("[onMessageExternal] AddCommand failed:", err)
+      sendResponse({ result: false, error: err?.message ?? "Unknown error" })
+    })
     return true
   }
 
   if (action === "DeleteCommand" && typeof id === "string") {
-    Ipc.callListener<{ id: string }, { result: boolean; error?: string }>(
-      BgCommand.removeCommand,
-      { id },
-    )
-      .then(sendResponse)
-      .catch((err) => {
-        console.error("[onMessageExternal] DeleteCommand failed:", err)
-        sendResponse({ result: false, error: err?.message ?? "Unknown error" })
-      })
+    handleDeleteCommand(id, sendResponse).catch((err) => {
+      console.error("[onMessageExternal] DeleteCommand failed:", err)
+      sendResponse({ result: false, error: err?.message ?? "Unknown error" })
+    })
     return true
   }
 
   if (action === "EditCommand" && typeof id === "string") {
-    if (sender.tab?.id === undefined) {
-      sendResponse({ result: false, error: "Invalid sender tab" })
-      return false
-    }
-
-    // Cancel any in-progress session; the new request takes over (last-write-wins).
-    cancelEditSession()
-
-    const newSession: EditSession = {
-      hubTabId: sender.tab.id,
-      editTabId: undefined,
-      hubEditPort: undefined,
-      ackTimeout: undefined,
-      ackListener: undefined,
-      pendingResponse: undefined,
-      cancelConnectWait: () => { },
-    }
-    _editSession = newSession
-
-    let connectTimeout: ReturnType<typeof setTimeout> | undefined
-    const cleanupHubEditConnectListener = () => {
-      if (connectTimeout) {
-        clearTimeout(connectTimeout)
-        connectTimeout = undefined
-      }
-      chrome.runtime.onConnectExternal.removeListener(onHubEditConnect)
-    }
-    newSession.cancelConnectWait = cleanupHubEditConnectListener
-
-    // Register the hub-edit port listener before creating the tab so Hub can
-    // connect immediately after receiving the response.
-    const onHubEditConnect = (port: chrome.runtime.Port) => {
-      if (port.name !== "hub-edit") return
-      if (port.sender?.tab?.id !== newSession.hubTabId) return
-      if (port.sender?.origin !== hubOrigin) return
-      cleanupHubEditConnectListener()
-      newSession.hubEditPort = port
-      port.onDisconnect.addListener(() => {
-        if (newSession.pendingResponse) {
-          if (newSession.ackTimeout) clearTimeout(newSession.ackTimeout)
-          if (newSession.ackListener) {
-            port.onMessage.removeListener(newSession.ackListener)
-          }
-          newSession.pendingResponse(false)
-          newSession.pendingResponse = undefined
-        }
-        if (_editSession === newSession) _editSession = undefined
-        newSession.hubEditPort = undefined
-      })
-    }
-    chrome.runtime.onConnectExternal.addListener(onHubEditConnect)
-    connectTimeout = setTimeout(() => {
-      cleanupHubEditConnectListener()
-      if (_editSession === newSession) _editSession = undefined
-    }, EDIT_CONNECT_TIMEOUT_MS)
-
-    chrome.tabs.create(
-      {
-        url: `${OPTION_PAGE_PATH}?editCommand=${encodeURIComponent(id)}&syncHub=1#commands`,
-      },
-      (tab) => {
-        if (_editSession !== newSession) {
-          if (tab?.id != null) chrome.tabs.remove(tab.id)
-          sendResponse({ result: false, error: "Edit session timed out" })
-          return
-        }
-        if (tab?.id == null) {
-          cleanupHubEditConnectListener()
-          _editSession = undefined
-          sendResponse({ result: false, error: "Failed to create edit tab" })
-          return
-        }
-        newSession.editTabId = tab.id
-        sendResponse({ result: true })
-      },
-    )
-    return true
+    return handleEditCommand(id, sender, sendResponse)
   }
 
   if (action === "RequestInstalledCommand") {
-    Storage.getCommands()
-      .then((commands) => {
-        sendResponse({
-          action: "SyncInstalledCommand",
-          installedIds: commands.map((c) => c.id),
-        })
-      })
-      .catch((err) => {
-        console.error(
-          "[onMessageExternal] RequestInstalledCommand failed:",
-          err,
-        )
-        sendResponse({ action: "SyncInstalledCommand", installedIds: [] })
-      })
+    handleRequestInstalledCommand(sendResponse).catch((err) => {
+      console.error("[onMessageExternal] RequestInstalledCommand failed:", err)
+      sendResponse({ action: "SyncInstalledCommand", installedIds: [] })
+    })
     return true
   }
 
@@ -345,41 +520,18 @@ function onMessageExternal(
     if (typeof access_token !== "string" || typeof refresh_token !== "string") {
       return false
     }
-    getSupabase()
-      .auth.setSession({ access_token, refresh_token })
-      .then(async ({ data, error }) => {
-        if (error || !data.user) {
-          sendResponse({
-            result: false,
-            error: error?.message ?? "Unknown error",
-          })
-          return
-        }
-        const hubUser: HubUser = {
-          name: data.user.email ?? "",
-          image: "",
-        }
-        await Storage.set(LOCAL_STORAGE_KEY.HUB_USER, hubUser)
-        sendResponse({ result: true })
-      })
-      .catch((err) => {
-        console.error("[onMessageExternal] SetSession failed:", err)
-        sendResponse({ result: false, error: err?.message ?? "Unknown error" })
-      })
+    handleSetSession(access_token, refresh_token, sendResponse).catch((err) => {
+      console.error("[onMessageExternal] SetSession failed:", err)
+      sendResponse({ result: false, error: err?.message ?? "Unknown error" })
+    })
     return true
   }
 
   if (action === "ClearSession") {
-    getSupabase()
-      .auth.signOut()
-      .then(async () => {
-        await Storage.set(LOCAL_STORAGE_KEY.HUB_USER, null)
-        sendResponse({ result: true })
-      })
-      .catch((err) => {
-        console.error("[onMessageExternal] ClearSession failed:", err)
-        sendResponse({ result: false, error: err?.message ?? "Unknown error" })
-      })
+    handleClearSession(sendResponse).catch((err) => {
+      console.error("[onMessageExternal] ClearSession failed:", err)
+      sendResponse({ result: false, error: err?.message ?? "Unknown error" })
+    })
     return true
   }
 
diff --git a/packages/extension/src/services/ipc.ts b/packages/extension/src/services/ipc.ts
index 8f67eb8be..f8178f09f 100644
--- a/packages/extension/src/services/ipc.ts
+++ b/packages/extension/src/services/ipc.ts
@@ -22,8 +22,6 @@ export enum BgCommand {
   openOption = "openOption",
   openShortcuts = "openShortcuts",
   addPageRule = "addPageRule",
-  addCommand = "addCommand",
-  removeCommand = "removeCommand",
   execApi = "execApi",
   canOpenInTab = "canOpenInTab",
   openInTab = "openInTab",

From 0f21c0e7ec0aa8b0ca1e770e092b7f6a1101a8e9 Mon Sep 17 00:00:00 2001
From: ujiro99 <siro.cola@gmail.com>
Date: Tue, 12 May 2026 16:58:30 +0900
Subject: [PATCH 6/8] Update: Make it editable.

---
 packages/extension/src/background_script.ts   |  27 +--
 .../option/editor/CommandEditDialog.tsx       |   4 +-
 .../src/services/hub/background.test.ts       | 178 ++++++++++++++++++
 .../extension/src/services/hub/background.ts  | 122 ++++++++++--
 packages/extension/src/services/hubShare.ts   |  15 ++
 packages/extension/src/services/ipc.ts        |   1 +
 6 files changed, 314 insertions(+), 33 deletions(-)

diff --git a/packages/extension/src/background_script.ts b/packages/extension/src/background_script.ts
index 8bc6e4752..8a55577c3 100644
--- a/packages/extension/src/background_script.ts
+++ b/packages/extension/src/background_script.ts
@@ -53,7 +53,7 @@ const getActiveTabId = (
   return true
 }
 
-const onConnect = async function(port: chrome.runtime.Port) {
+const onConnect = async function (port: chrome.runtime.Port) {
   if (port.name !== CONNECTION_APP) return
   port.onDisconnect.addListener(() => onDisconnect(port))
   const tabId = port.sender?.tab?.id
@@ -66,7 +66,7 @@ const onConnect = async function(port: chrome.runtime.Port) {
     await PageActionBackground.handleSidePanelConnect(port)
   }
 }
-const onDisconnect = async function(port: chrome.runtime.Port) {
+const onDisconnect = async function (port: chrome.runtime.Port) {
   if (port.name !== CONNECTION_APP) return
   if (chrome.runtime.lastError) {
     if (
@@ -288,6 +288,7 @@ const commandFuncs = {
   //
   [BgCommand.shareCommandToHub]: HubBackground.shareCommandToHub,
   [BgCommand.editCommandToHub]: HubBackground.editCommandToHub,
+  [BgCommand.pushEditToHub]: HubBackground.pushEditToHub,
   [BgCommand.getSharedCommandIds]: HubBackground.getSharedCommandIds,
 
   //
@@ -495,17 +496,17 @@ const checkAndPerformLegacyBackup = async () => {
   }
 }
 
-  // Initialize commandIdObj and register listener at top-level
-  // to ensure they are available when service worker restarts
-  ; (async () => {
-    try {
-      await ContextMenu.syncCommandIdObj()
-      chrome.contextMenus.onClicked.addListener(ContextMenu.onClicked)
-    } catch (error) {
-      // Ignore errors during initialization (e.g., in test environment)
-      console.debug("Failed to initialize context menu listener:", error)
-    }
-  })()
+// Initialize commandIdObj and register listener at top-level
+// to ensure they are available when service worker restarts
+;(async () => {
+  try {
+    await ContextMenu.syncCommandIdObj()
+    chrome.contextMenus.onClicked.addListener(ContextMenu.onClicked)
+  } catch (error) {
+    // Ignore errors during initialization (e.g., in test environment)
+    console.debug("Failed to initialize context menu listener:", error)
+  }
+})()
 
 Settings.addChangedListener(() => ContextMenu.init())
 
diff --git a/packages/extension/src/components/option/editor/CommandEditDialog.tsx b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
index e6aed5e7b..943a35d6e 100644
--- a/packages/extension/src/components/option/editor/CommandEditDialog.tsx
+++ b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
@@ -82,7 +82,7 @@ import { Ipc, BgCommand } from "@/services/ipc"
 import { getScreenSize } from "@/services/screen"
 import { Storage, SESSION_STORAGE_KEY } from "@/services/storage"
 import { ANALYTICS_EVENTS, sendEvent } from "@/services/analytics"
-import { shareCommandToHub } from "@/services/hubShare"
+import { pushEditToHub } from "@/services/hubShare"
 
 import { isEmpty, e2a, cn, parseGeminiUrl, generateId } from "@/lib/utils"
 import { t as _t } from "@/services/i18n"
@@ -910,7 +910,7 @@ const CommandEditDialogInner = ({
                   (data) => {
                     const processed = processFormData(data)
                     onSubmit(processed)
-                    shareCommandToHub(processed)
+                    pushEditToHub(processed)
                     onOpenChange(false)
                     reset(InitialValues)
                   },
diff --git a/packages/extension/src/services/hub/background.test.ts b/packages/extension/src/services/hub/background.test.ts
index 257859108..a2367bc32 100644
--- a/packages/extension/src/services/hub/background.test.ts
+++ b/packages/extension/src/services/hub/background.test.ts
@@ -10,6 +10,7 @@ import {
   handleRequestInstalledCommand,
   handleSetSession,
   handleClearSession,
+  pushEditToHub,
 } from "./background"
 import { Storage, LOCAL_STORAGE_KEY } from "@/services/storage"
 import { Settings } from "@/services/settings/settings"
@@ -1045,3 +1046,180 @@ describe("shareCommandToHub", () => {
     vi.useRealTimers()
   })
 })
+
+// ---------------------------------------------------------------------------
+// pushEditToHub (Flow B: Extension-initiated)
+// ---------------------------------------------------------------------------
+
+describe("pushEditToHub", () => {
+  const param = {
+    id: "cmd-1",
+    locale: "en",
+    targetUrl: "https://example.com",
+  } as any
+  const sender = {} as any
+
+  it("PE-01: returns true immediately (async response marker)", () => {
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({ id: 1 } as chrome.tabs.Tab)
+      return Promise.resolve({ id: 1 } as chrome.tabs.Tab)
+    })
+    const response = vi.fn()
+    const result = pushEditToHub(param, sender, response)
+    expect(result).toBe(true)
+  })
+
+  it("PE-02: opens Hub dashboard/commands?id=<commandId> and calls response(true)", async () => {
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({ id: 42 } as chrome.tabs.Tab)
+      return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
+    })
+    const response = vi.fn()
+    pushEditToHub(param, sender, response)
+    await vi.waitFor(() => expect(response).toHaveBeenCalledWith(true))
+    expect(chrome.tabs.create).toHaveBeenCalledWith(
+      {
+        url: expect.stringContaining(
+          "hub.example.com/en/dashboard/commands?id=cmd-1",
+        ),
+      },
+      expect.any(Function),
+    )
+    expect(chrome.runtime.onConnectExternal.addListener).toHaveBeenCalledTimes(
+      1,
+    )
+  })
+
+  it("PE-03: calls response(false) when tab.id is undefined", async () => {
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({} as chrome.tabs.Tab)
+      return Promise.resolve({} as chrome.tabs.Tab)
+    })
+    const response = vi.fn()
+    pushEditToHub(param, sender, response)
+    await vi.waitFor(() => expect(response).toHaveBeenCalledWith(false))
+    expect(chrome.runtime.onConnectExternal.removeListener).toHaveBeenCalled()
+  })
+
+  it("PE-04: calls response(false) when chrome.tabs.create throws", async () => {
+    vi.mocked(chrome.tabs.create).mockImplementation(() => {
+      throw new Error("tabs.create error")
+    })
+    const response = vi.fn()
+    pushEditToHub(param, sender, response)
+    await vi.waitFor(() => expect(response).toHaveBeenCalledWith(false))
+    expect(chrome.runtime.onConnectExternal.removeListener).toHaveBeenCalled()
+  })
+
+  it("PE-05: ignores hub-edit port from a different tab", async () => {
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({ id: 42 } as chrome.tabs.Tab)
+      return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
+    })
+    const response = vi.fn()
+    pushEditToHub(param, sender, response)
+
+    // Let async push() advance past chrome.tabs.create so tabId is set
+    await Promise.resolve()
+
+    const portConnectListener = vi.mocked(
+      chrome.runtime.onConnectExternal.addListener,
+    ).mock.calls[0][0]
+    const mockPort = {
+      name: "hub-edit",
+      sender: { tab: { id: 99 }, origin: HUB_ORIGIN }, // different tab ID
+      postMessage: vi.fn(),
+      onMessage: { addListener: vi.fn(), removeListener: vi.fn() },
+    }
+    portConnectListener(mockPort as any)
+
+    await vi.waitFor(() => expect(response).toHaveBeenCalledWith(true))
+    expect(mockPort.postMessage).not.toHaveBeenCalled()
+  })
+
+  it("PE-06: ignores hub-edit port from wrong origin", async () => {
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({ id: 42 } as chrome.tabs.Tab)
+      return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
+    })
+    const response = vi.fn()
+    pushEditToHub(param, sender, response)
+
+    await Promise.resolve()
+
+    const portConnectListener = vi.mocked(
+      chrome.runtime.onConnectExternal.addListener,
+    ).mock.calls[0][0]
+    const mockPort = {
+      name: "hub-edit",
+      sender: { tab: { id: 42 }, origin: "https://evil.example.com" },
+      postMessage: vi.fn(),
+      onMessage: { addListener: vi.fn(), removeListener: vi.fn() },
+    }
+    portConnectListener(mockPort as any)
+
+    await vi.waitFor(() => expect(response).toHaveBeenCalledWith(true))
+    expect(mockPort.postMessage).not.toHaveBeenCalled()
+  })
+
+  it("PE-07: sends edit-command via hub-edit port (retries) and removes listener on ack", async () => {
+    vi.useFakeTimers()
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({ id: 42 } as chrome.tabs.Tab)
+      return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
+    })
+    const response = vi.fn()
+    pushEditToHub(param, sender, response)
+
+    await Promise.resolve()
+
+    const portConnectListener = vi.mocked(
+      chrome.runtime.onConnectExternal.addListener,
+    ).mock.calls[0][0]
+
+    let capturedOnAck: ((msg: unknown) => void) | undefined
+    const mockPort = {
+      name: "hub-edit",
+      sender: { tab: { id: 42 }, origin: HUB_ORIGIN },
+      postMessage: vi.fn(),
+      onMessage: {
+        addListener: vi.fn((fn) => {
+          capturedOnAck = fn
+        }),
+        removeListener: vi.fn(),
+      },
+    }
+    portConnectListener(mockPort as any)
+
+    expect(chrome.runtime.onConnectExternal.removeListener).toHaveBeenCalled()
+
+    // Advance timer to trigger first retry send
+    vi.advanceTimersByTime(200)
+
+    expect(mockPort.postMessage).toHaveBeenCalledWith({
+      type: "edit-command",
+      command: param,
+    })
+
+    capturedOnAck?.({ type: "edit-command-ack" })
+    expect(mockPort.onMessage.removeListener).toHaveBeenCalled()
+
+    vi.useRealTimers()
+  })
+
+  it("PE-08: removes listener and logs error when connect timeout passes", async () => {
+    vi.useFakeTimers()
+    vi.mocked(chrome.tabs.create).mockImplementation((_opts, cb) => {
+      cb?.({ id: 42 } as chrome.tabs.Tab)
+      return Promise.resolve({ id: 42 } as chrome.tabs.Tab)
+    })
+    const response = vi.fn()
+    pushEditToHub(param, sender, response)
+
+    await Promise.resolve()
+
+    vi.advanceTimersByTime(10_001)
+    expect(chrome.runtime.onConnectExternal.removeListener).toHaveBeenCalled()
+    vi.useRealTimers()
+  })
+})
diff --git a/packages/extension/src/services/hub/background.ts b/packages/extension/src/services/hub/background.ts
index 2beb6b60c..27e9c6983 100644
--- a/packages/extension/src/services/hub/background.ts
+++ b/packages/extension/src/services/hub/background.ts
@@ -60,6 +60,7 @@ const RETRY_INTERVAL_MS = 100
 const MAX_RETRIES = 20 // 2 seconds
 const EDIT_CONNECT_TIMEOUT_MS = 10_000
 const EDIT_COMMAND_ACK_TIMEOUT_MS = 10_000
+const PUSH_EDIT_CONNECT_TIMEOUT_MS = 10_000
 
 const hubOrigin = new URL(NEW_HUB_URL).origin
 
@@ -245,36 +246,36 @@ export async function handleAddCommand(
 
     const cmd = isSearch
       ? {
+        id: parsed.id,
+        title: parsed.title,
+        searchUrl: parsed.searchUrl,
+        iconUrl: parsed.iconUrl,
+        ...sourceInfo,
+        openMode: parsed.openMode,
+        openModeSecondary: parsed.openModeSecondary,
+        spaceEncoding: parsed.spaceEncoding,
+        popupOption: PopupOption,
+      }
+      : isAiPrompt
+        ? {
           id: parsed.id,
           title: parsed.title,
-          searchUrl: parsed.searchUrl,
           iconUrl: parsed.iconUrl,
           ...sourceInfo,
           openMode: parsed.openMode,
-          openModeSecondary: parsed.openModeSecondary,
-          spaceEncoding: parsed.spaceEncoding,
+          aiPromptOption: parsed.aiPromptOption,
           popupOption: PopupOption,
         }
-      : isAiPrompt
-        ? {
+        : isPageAction
+          ? {
             id: parsed.id,
             title: parsed.title,
             iconUrl: parsed.iconUrl,
             ...sourceInfo,
             openMode: parsed.openMode,
-            aiPromptOption: parsed.aiPromptOption,
+            pageActionOption: parsed.pageActionOption,
             popupOption: PopupOption,
           }
-        : isPageAction
-          ? {
-              id: parsed.id,
-              title: parsed.title,
-              iconUrl: parsed.iconUrl,
-              ...sourceInfo,
-              openMode: parsed.openMode,
-              pageActionOption: parsed.pageActionOption,
-              popupOption: PopupOption,
-            }
           : null
 
     if (!cmd) {
@@ -352,7 +353,7 @@ export function handleEditCommand(
     ackTimeout: undefined,
     ackListener: undefined,
     pendingResponse: undefined,
-    cancelConnectWait: () => {},
+    cancelConnectWait: () => { },
   }
   _editSession = newSession
 
@@ -485,7 +486,7 @@ function onMessageExternal(
   if (!sender.origin || sender.origin !== hubOrigin) return false
 
   const { action, command, id } = message ?? {}
-  console.log("[onMessageExternal] Received message:", message)
+  console.debug("[onMessageExternal] Received message:", message)
 
   if (action === "AddCommand" && typeof command === "string") {
     handleAddCommand(command, sendResponse).catch((err) => {
@@ -542,6 +543,91 @@ export function initHubExternalListener(): void {
   chrome.runtime.onMessageExternal.addListener(onMessageExternal)
 }
 
+export const pushEditToHub = (
+  param: SubmitCommandInput,
+  _: Sender,
+  response: (res: unknown) => void,
+): boolean => {
+  let tabId: number | undefined
+  let connectTimeout: ReturnType<typeof setTimeout> | undefined
+  let onPortConnect: ((port: chrome.runtime.Port) => void) | undefined
+
+  const cleanup = () => {
+    if (connectTimeout) clearTimeout(connectTimeout)
+    if (onPortConnect)
+      chrome.runtime.onConnectExternal.removeListener(onPortConnect)
+  }
+
+  const push = async () => {
+    try {
+      onPortConnect = function portConnect(port: chrome.runtime.Port) {
+        if (port.name !== "hub-edit") return
+        if (port.sender?.tab?.id !== tabId) return
+        if (port.sender?.origin !== hubOrigin) return
+
+        cleanup()
+
+        let retries = 0
+
+        const cleanupPort = () => {
+          clearInterval(timer)
+          port.onMessage.removeListener(onAck)
+        }
+
+        const onAck = (msg: unknown) => {
+          if ((msg as { type?: string })?.type === "edit-command-ack") {
+            cleanupPort()
+          }
+        }
+        port.onMessage.addListener(onAck)
+
+        // Post the command repeatedly until ack is received or max retries exceeded
+        const timer = setInterval(() => {
+          retries++
+          if (retries > MAX_RETRIES) {
+            cleanupPort()
+            console.error(
+              "[pushEditToHub] Hub did not respond to edit-command in time.",
+            )
+            return
+          }
+          port.postMessage({ type: "edit-command", command: param })
+        }, RETRY_INTERVAL_MS)
+      }
+
+      chrome.runtime.onConnectExternal.addListener(onPortConnect)
+      connectTimeout = setTimeout(() => {
+        cleanup()
+        console.error("[pushEditToHub] Hub did not connect in time.")
+      }, PUSH_EDIT_CONNECT_TIMEOUT_MS)
+
+      const tab = await new Promise<chrome.tabs.Tab>((resolve) =>
+        chrome.tabs.create(
+          {
+            url: `${NEW_HUB_URL}/${param.locale}/dashboard/commands?id=${encodeURIComponent(param.id)}`,
+          },
+          resolve,
+        ),
+      )
+
+      if (!tab?.id) {
+        cleanup()
+        response(false)
+        return
+      }
+      tabId = tab.id
+      response(true)
+    } catch (err) {
+      cleanup()
+      console.error("[pushEditToHub] Failed:", err)
+      response(false)
+    }
+  }
+
+  push()
+  return true
+}
+
 export const getSharedCommandIds = (
   _: unknown,
   __: Sender,
diff --git a/packages/extension/src/services/hubShare.ts b/packages/extension/src/services/hubShare.ts
index ea1a33f66..7265ba812 100644
--- a/packages/extension/src/services/hubShare.ts
+++ b/packages/extension/src/services/hubShare.ts
@@ -92,6 +92,21 @@ export function editCommandToHub(command: SelectionCommand): boolean {
   return true
 }
 
+export function pushEditToHub(command: SelectionCommand): boolean {
+  const input = toSubmitCommandInput(command)
+  if (!input) {
+    console.warn(
+      "Unsupported command type or missing data. Cannot push edit to Hub.",
+    )
+    return false
+  }
+
+  void Ipc.send(BgCommand.pushEditToHub, input).catch((err) => {
+    console.error("[HubShare] Failed to push edit to Hub:", err)
+  })
+  return true
+}
+
 export async function getSharedCommandIds(): Promise<string[]> {
   try {
     const ids = await Ipc.send<undefined, string[]>(
diff --git a/packages/extension/src/services/ipc.ts b/packages/extension/src/services/ipc.ts
index f8178f09f..30d0b6de0 100644
--- a/packages/extension/src/services/ipc.ts
+++ b/packages/extension/src/services/ipc.ts
@@ -33,6 +33,7 @@ export enum BgCommand {
   // Hub
   shareCommandToHub = "shareCommandToHub",
   editCommandToHub = "editCommandToHub",
+  pushEditToHub = "pushEditToHub",
   getSharedCommandIds = "getSharedCommandIds",
   // PageAction
   addPageAction = "addPageAction",

From 29622ca029801ba847d79f9e33d59da8e883452d Mon Sep 17 00:00:00 2001
From: ujiro99 <siro.cola@gmail.com>
Date: Tue, 12 May 2026 20:37:49 +0900
Subject: [PATCH 7/8] Update: Change sourceType when installing My Command from
 Hub.

---
 .../src/components/option/ShareButton.tsx     |  1 +
 packages/extension/src/const.ts               |  2 +
 .../extension/src/services/hub/background.ts  | 78 ++++++++++---------
 3 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/packages/extension/src/components/option/ShareButton.tsx b/packages/extension/src/components/option/ShareButton.tsx
index 81bd877a7..54d201e78 100644
--- a/packages/extension/src/components/option/ShareButton.tsx
+++ b/packages/extension/src/components/option/ShareButton.tsx
@@ -15,6 +15,7 @@ import type { SelectionCommand } from "@/types"
 const VALID_SOURCE_TYPES = new Set([
   COMMAND_SOURCE_TYPE.SELF_CREATED,
   COMMAND_SOURCE_TYPE.SELF_UPDATED,
+  COMMAND_SOURCE_TYPE.SELF_REINSTALL,
   COMMAND_SOURCE_TYPE.UNKNOWN,
 ])
 
diff --git a/packages/extension/src/const.ts b/packages/extension/src/const.ts
index 3f1570772..41837af41 100644
--- a/packages/extension/src/const.ts
+++ b/packages/extension/src/const.ts
@@ -373,6 +373,7 @@ export enum COMMAND_SOURCE_TYPE {
   DEFAULT = "default",
   SELF_CREATED = "selfCreated",
   SELF_UPDATED = "selfUpdated",
+  SELF_REINSTALL = "selfReinstall",
   HUB_COMMUNITY = "hubCommunity",
   UNKNOWN = "unknown",
 }
@@ -381,6 +382,7 @@ export const COMMAND_SOURCE_ID = {
   DEFAULT: "019db873-cc03-7484-86f1-2d349389ea2b",
   SELF_CREATED: "019db8a1-4021-7ae7-8a5d-474bf132e8ff",
   SELF_UPDATED: "019de776-d3ea-76af-99fe-340ae9bab54d",
+  SELF_REINSTALL: "019e1b54-bc00-7be7-afdf-6d723b2847f1",
 }
 
 export const SHORTCUT_PLACEHOLDER = "_placeholder_"
diff --git a/packages/extension/src/services/hub/background.ts b/packages/extension/src/services/hub/background.ts
index 27e9c6983..de4715a8e 100644
--- a/packages/extension/src/services/hub/background.ts
+++ b/packages/extension/src/services/hub/background.ts
@@ -4,6 +4,7 @@ import {
   NEW_HUB_URL,
   OPTION_PAGE_PATH,
   COMMAND_SOURCE_TYPE,
+  COMMAND_SOURCE_ID,
   SCREEN,
 } from "@/const"
 import type { Sender } from "@/services/ipc"
@@ -232,8 +233,17 @@ export async function handleAddCommand(
     const isSearch = isSearchCommand(parsed)
     const isPageAction = isPageActionCommand(parsed)
     const isAiPrompt = isAiPromptCommand(parsed)
-    const sourceType = (parsed as { sourceType?: unknown }).sourceType
-    const sourceId = (parsed as { sourceId?: unknown }).sourceId
+
+    const sharedIds = await fetchMyCommandIds()
+    const isMyCommand =
+      typeof parsed.id === "string" && sharedIds.includes(parsed.id)
+
+    let sourceType = (parsed as { sourceType?: unknown }).sourceType
+    let sourceId = (parsed as { sourceId?: unknown }).sourceId
+    if (isMyCommand) {
+      sourceType = COMMAND_SOURCE_TYPE.SELF_REINSTALL
+      sourceId = COMMAND_SOURCE_ID.SELF_REINSTALL
+    }
     const normalizedSourceType = Object.values(COMMAND_SOURCE_TYPE).includes(
       sourceType as COMMAND_SOURCE_TYPE,
     )
@@ -628,47 +638,39 @@ export const pushEditToHub = (
   return true
 }
 
-export const getSharedCommandIds = (
-  _: unknown,
-  __: Sender,
-  response: (res: unknown) => void,
-): boolean => {
-  const fetch = async () => {
-    try {
-      const {
-        data: { session },
-      } = await getSupabase().auth.getSession()
-      if (!session) {
-        response([])
-        return
-      }
-      const res = await globalThis.fetch(`${NEW_HUB_URL}/api/me/commands`, {
-        headers: { Authorization: `Bearer ${session.access_token}` },
-      })
-      if (!res.ok) {
-        response([])
-        return
-      }
-      const raw = (await res.json()).commands as CommandFromHub[]
-      if (!Array.isArray(raw)) {
-        response([])
-        return
-      }
-      const commands = raw.filter(
+async function fetchMyCommandIds(): Promise<string[]> {
+  try {
+    const {
+      data: { session },
+    } = await getSupabase().auth.getSession()
+    if (!session) return []
+    const res = await globalThis.fetch(`${NEW_HUB_URL}/api/me/commands`, {
+      headers: { Authorization: `Bearer ${session.access_token}` },
+    })
+    if (!res.ok) return []
+    const raw = (await res.json()).commands as CommandFromHub[]
+    if (!Array.isArray(raw)) return []
+    return raw
+      .filter(
         (c) =>
           typeof c === "object" &&
           c !== null &&
           typeof (c as { id?: unknown }).id === "string",
       )
-      response(commands.map((c) => c.id))
-    } catch (err) {
-      console.error(
-        "[getSharedCommandIds] Failed to fetch shared commands:",
-        err,
-      )
-      response([])
-    }
+      .map((c) => c.id)
+  } catch (err) {
+    console.error("[fetchMyCommandIds] Failed:", err)
+    return []
   }
-  fetch()
+}
+
+export const getSharedCommandIds = (
+  _: unknown,
+  __: Sender,
+  response: (res: unknown) => void,
+): boolean => {
+  fetchMyCommandIds()
+    .then((ids) => response(ids))
+    .catch(() => response([]))
   return true
 }

From 861dd7cafec6b7b9cebac60100850d52bd4edf23 Mon Sep 17 00:00:00 2001
From: ujiro99 <siro.cola@gmail.com>
Date: Thu, 14 May 2026 22:24:06 +0900
Subject: [PATCH 8/8] Update: Centralize the logic for deriving sourceType/Id
 on the Hub side.

---
 .../option/editor/CommandEditDialog.tsx       | 14 +++---
 .../extension/src/services/hub/background.ts  | 47 ++++++++-----------
 2 files changed, 27 insertions(+), 34 deletions(-)

diff --git a/packages/extension/src/components/option/editor/CommandEditDialog.tsx b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
index 943a35d6e..61e4395b0 100644
--- a/packages/extension/src/components/option/editor/CommandEditDialog.tsx
+++ b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
@@ -119,13 +119,13 @@ const getDefault = (
 ) => {
   const sourceDefaults = isEmpty(base?.id)
     ? {
-        sourceType: base?.sourceType ?? COMMAND_SOURCE_TYPE.SELF_CREATED,
-        sourceId: base?.sourceId ?? COMMAND_SOURCE_ID.SELF_CREATED,
-      }
+      sourceType: base?.sourceType ?? COMMAND_SOURCE_TYPE.SELF_CREATED,
+      sourceId: base?.sourceId ?? COMMAND_SOURCE_ID.SELF_CREATED,
+    }
     : {
-        sourceType: base?.sourceType,
-        sourceId: base?.sourceId,
-      }
+      sourceType: base?.sourceType,
+      sourceId: base?.sourceId,
+    }
 
   if (isSearchOpenMode(openMode)) {
     if (isSearchOpenMode(preOpenMode)) {
@@ -906,6 +906,7 @@ const CommandEditDialogInner = ({
               <Button
                 type="button"
                 size="lg"
+                className="px-5"
                 onClick={form.handleSubmit(
                   (data) => {
                     const processed = processFormData(data)
@@ -924,6 +925,7 @@ const CommandEditDialogInner = ({
             <Button
               type="button"
               size="lg"
+              className="px-5"
               onClick={form.handleSubmit(
                 (data) => {
                   const processed = processFormData(data)
diff --git a/packages/extension/src/services/hub/background.ts b/packages/extension/src/services/hub/background.ts
index de4715a8e..108551a7b 100644
--- a/packages/extension/src/services/hub/background.ts
+++ b/packages/extension/src/services/hub/background.ts
@@ -4,7 +4,6 @@ import {
   NEW_HUB_URL,
   OPTION_PAGE_PATH,
   COMMAND_SOURCE_TYPE,
-  COMMAND_SOURCE_ID,
   SCREEN,
 } from "@/const"
 import type { Sender } from "@/services/ipc"
@@ -234,16 +233,8 @@ export async function handleAddCommand(
     const isPageAction = isPageActionCommand(parsed)
     const isAiPrompt = isAiPromptCommand(parsed)
 
-    const sharedIds = await fetchMyCommandIds()
-    const isMyCommand =
-      typeof parsed.id === "string" && sharedIds.includes(parsed.id)
-
-    let sourceType = (parsed as { sourceType?: unknown }).sourceType
-    let sourceId = (parsed as { sourceId?: unknown }).sourceId
-    if (isMyCommand) {
-      sourceType = COMMAND_SOURCE_TYPE.SELF_REINSTALL
-      sourceId = COMMAND_SOURCE_ID.SELF_REINSTALL
-    }
+    const sourceType = (parsed as { sourceType?: unknown }).sourceType
+    const sourceId = (parsed as { sourceId?: unknown }).sourceId
     const normalizedSourceType = Object.values(COMMAND_SOURCE_TYPE).includes(
       sourceType as COMMAND_SOURCE_TYPE,
     )
@@ -256,36 +247,36 @@ export async function handleAddCommand(
 
     const cmd = isSearch
       ? {
-        id: parsed.id,
-        title: parsed.title,
-        searchUrl: parsed.searchUrl,
-        iconUrl: parsed.iconUrl,
-        ...sourceInfo,
-        openMode: parsed.openMode,
-        openModeSecondary: parsed.openModeSecondary,
-        spaceEncoding: parsed.spaceEncoding,
-        popupOption: PopupOption,
-      }
-      : isAiPrompt
-        ? {
           id: parsed.id,
           title: parsed.title,
+          searchUrl: parsed.searchUrl,
           iconUrl: parsed.iconUrl,
           ...sourceInfo,
           openMode: parsed.openMode,
-          aiPromptOption: parsed.aiPromptOption,
+          openModeSecondary: parsed.openModeSecondary,
+          spaceEncoding: parsed.spaceEncoding,
           popupOption: PopupOption,
         }
-        : isPageAction
-          ? {
+      : isAiPrompt
+        ? {
             id: parsed.id,
             title: parsed.title,
             iconUrl: parsed.iconUrl,
             ...sourceInfo,
             openMode: parsed.openMode,
-            pageActionOption: parsed.pageActionOption,
+            aiPromptOption: parsed.aiPromptOption,
             popupOption: PopupOption,
           }
+        : isPageAction
+          ? {
+              id: parsed.id,
+              title: parsed.title,
+              iconUrl: parsed.iconUrl,
+              ...sourceInfo,
+              openMode: parsed.openMode,
+              pageActionOption: parsed.pageActionOption,
+              popupOption: PopupOption,
+            }
           : null
 
     if (!cmd) {
@@ -363,7 +354,7 @@ export function handleEditCommand(
     ackTimeout: undefined,
     ackListener: undefined,
     pendingResponse: undefined,
-    cancelConnectWait: () => { },
+    cancelConnectWait: () => {},
   }
   _editSession = newSession