From f5c4853569efd81e992659e2481f1f889be942ae Mon Sep 17 00:00:00 2001
From: CoffeePatch <coffeepatch@duck.com>
Date: Tue, 15 Sep 2026 09:12:34 +0530
Subject: [PATCH 1/4] feat(pageAction): add dedicated prompt field with
 two-stage non-recursive resolution

---
 .../public/_locales/de/messages.json          |  18 ++
 .../public/_locales/en/messages.json          |  24 +++
 .../public/_locales/es/messages.json          |  18 ++
 .../public/_locales/fr/messages.json          |  18 ++
 .../public/_locales/hi/messages.json          |  18 ++
 .../public/_locales/id/messages.json          |  18 ++
 .../public/_locales/it/messages.json          |  18 ++
 .../public/_locales/ja/messages.json          |  18 ++
 .../public/_locales/ko/messages.json          |  18 ++
 .../public/_locales/ms/messages.json          |  18 ++
 .../public/_locales/pt_BR/messages.json       |  18 ++
 .../public/_locales/pt_PT/messages.json       |  18 ++
 .../public/_locales/ru/messages.json          |  18 ++
 .../public/_locales/zh_CN/messages.json       |  18 ++
 .../extension/src/action/pageAction.test.ts   | 173 ++++++++++++++++++
 packages/extension/src/action/pageAction.ts   |  26 ++-
 .../option/editor/CommandEditDialog.tsx       |   2 +
 .../option/editor/PageActionSection.tsx       |  58 +++++-
 .../editor/commandChangedDetector.test.ts     |  38 ++++
 .../option/editor/commandChangedDetector.ts   |  10 +-
 .../src/components/pageAction/InputEditor.tsx |   1 +
 .../src/components/pageAction/InputPopup.tsx  |   9 +
 .../hooks/pageAction/usePageActionRunner.ts   |   2 +
 packages/extension/src/services/ipc.ts        |   3 +
 .../pageAction/background-sidePanel.ts        |   3 +
 .../src/services/pageAction/background.ts     |  18 +-
 .../pageAction/backgroundDispatcher.test.ts   |   2 +
 .../pageAction/backgroundDispatcher.ts        |  31 ++--
 .../services/pageAction/dispatcher.test.ts    |  37 ++++
 .../src/services/pageAction/dispatcher.ts     |  27 +--
 .../src/services/pageAction/helper.test.ts    | 115 +++++++++++-
 .../src/services/pageAction/helper.ts         |  61 ++++++
 .../src/services/pageAction/insertSymbols.ts  |   2 +
 .../services/pageAction/pageActionTypes.ts    |   1 +
 packages/extension/src/types/index.ts         |   1 +
 packages/extension/src/types/schema.test.ts   |  87 +++++++++
 packages/extension/src/types/schema.ts        |   1 +
 packages/hub/src/types/pageAction.ts          |   1 +
 38 files changed, 916 insertions(+), 51 deletions(-)
 create mode 100644 packages/extension/src/action/pageAction.test.ts

diff --git a/packages/extension/public/_locales/de/messages.json b/packages/extension/public/_locales/de/messages.json
index 10e205480..4138bd480 100644
--- a/packages/extension/public/_locales/de/messages.json
+++ b/packages/extension/public/_locales/de/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Verzögerungszeit"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prompt"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Vorlage für den einzufügenden Prompt. Sie können Variablen aus dem Menü hinzufügen."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Fügen Sie dynamische Variablen wie markierten Text ein und verweisen Sie in Schritten mit {{Prompt}} darauf."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "z. B.: Fassen Sie folgenden Text zusammen:\n{{Ausgewählter Text}}"
+  },
   "Option_aiPrompt_service": {
     "message": "KI-Dienst"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "Das HTML des ausgewählten Bereichs wird als Datei angehängt"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "Prompt wird eingefügt"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Text einfügen"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Ausgewählter Text"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prompt"
+  },
   "PageAction_InputMenu_url": {
     "message": "Original-URL"
   },
diff --git a/packages/extension/public/_locales/en/messages.json b/packages/extension/public/_locales/en/messages.json
index 77b80e6d8..42108d974 100644
--- a/packages/extension/public/_locales/en/messages.json
+++ b/packages/extension/public/_locales/en/messages.json
@@ -494,6 +494,22 @@
   "Option_pageAction_delay": {
     "message": "Delay time"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prompt",
+    "description": "Label for prompt input field in Page Action"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Prompt template to be inserted. You can add variables from the menu.",
+    "description": "Description for prompt input field in Page Action"
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Insert dynamic variables like selected text, and reference them in steps with {{Prompt}}.",
+    "description": "Detailed description for prompt usage"
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "e.g., Summarize the following text:\n{{Selected text}}",
+    "description": "Placeholder for prompt input field in Page Action"
+  },
   "Option_aiPrompt_service": {
     "message": "AI Service"
   },
@@ -865,6 +881,10 @@
     "message": "The HTML of the selected range will be attached as a file",
     "description": "for INSERT.SELECTION_HTML — placeholder {{SelectionHtml}} in prompt templates"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "Prompt will be inserted",
+    "description": "for INSERT.PROMPT"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Insert Text"
   },
@@ -875,6 +895,10 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Selected text"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prompt",
+    "description": "Menu item for inserting prompt variable"
+  },
   "PageAction_InputMenu_url": {
     "message": "Origin URL"
   },
diff --git a/packages/extension/public/_locales/es/messages.json b/packages/extension/public/_locales/es/messages.json
index 4dc78aefc..a5ff384d9 100644
--- a/packages/extension/public/_locales/es/messages.json
+++ b/packages/extension/public/_locales/es/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Tiempo de retraso"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prompt"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Plantilla del prompt que se insertará. Puede agregar variables desde el menú."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Inserte variables dinámicas como texto seleccionado y referéncielas en los pasos con {{Prompt}}."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "ej.: Resume el siguiente texto:\n{{Texto seleccionado}}"
+  },
   "Option_aiPrompt_service": {
     "message": "Servicio IA"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "Se adjuntará el HTML del rango seleccionado como archivo"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "Se insertará el prompt"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Insertar Texto"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Texto seleccionado"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prompt"
+  },
   "PageAction_InputMenu_url": {
     "message": "URL de origen"
   },
diff --git a/packages/extension/public/_locales/fr/messages.json b/packages/extension/public/_locales/fr/messages.json
index cd7168273..88267021c 100644
--- a/packages/extension/public/_locales/fr/messages.json
+++ b/packages/extension/public/_locales/fr/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Temps de délai"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prompt"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Modèle de prompt à insérer. Vous pouvez ajouter des variables depuis le menu."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Insérez des variables dynamiques comme le texte sélectionné et référencez-les dans les étapes avec {{Prompt}}."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "ex. : Résumez le texte suivant :\n{{Texte sélectionné}}"
+  },
   "Option_aiPrompt_service": {
     "message": "Service IA"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "Le HTML de la plage sélectionnée sera joint en fichier"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "Le prompt sera inséré"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Insérer du Texte"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Texte sélectionné"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prompt"
+  },
   "PageAction_InputMenu_url": {
     "message": "URL d'origine"
   },
diff --git a/packages/extension/public/_locales/hi/messages.json b/packages/extension/public/_locales/hi/messages.json
index 2ec54606d..57b7135b8 100644
--- a/packages/extension/public/_locales/hi/messages.json
+++ b/packages/extension/public/_locales/hi/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "प्रतीक्षा समय"
   },
+  "Option_pageAction_prompt": {
+    "message": "प्रॉम्प्ट"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "सम्मिलित किए जाने वाले प्रॉम्प्ट का टेम्पलेट। आप मेनू से चर जोड़ सकते हैं।"
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "चयनित टेक्स्ट जैसे गतिशील चर डालें, और चरणों में {{प्रॉम्प्ट}} के साथ उनका संदर्भ लें।"
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "उदा.: निम्नलिखित पाठ का सारांश प्रस्तुत करें:\n{{चयनित पाठ}}"
+  },
   "Option_aiPrompt_service": {
     "message": "AI सेवा"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "चुने गए भाग का HTML फ़ाइल के रूप में संलग्न किया जाएगा"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "प्रॉम्प्ट डाला जाएगा"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "टेक्स्ट डालें"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "चयनित टेक्स्ट"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "प्रॉम्प्ट"
+  },
   "PageAction_InputMenu_url": {
     "message": "मूल URL"
   },
diff --git a/packages/extension/public/_locales/id/messages.json b/packages/extension/public/_locales/id/messages.json
index 6cd360745..0c06b148f 100644
--- a/packages/extension/public/_locales/id/messages.json
+++ b/packages/extension/public/_locales/id/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Waktu tunda"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prompt"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Templat prompt yang akan dimasukkan. Anda dapat menambahkan variabel dari menu."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Sisipkan variabel dinamis seperti teks yang dipilih, dan rujuk dalam langkah dengan {{Prompt}}."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "cth., Ringkas teks berikut:\n{{Teks yang dipilih}}"
+  },
   "Option_aiPrompt_service": {
     "message": "Layanan AI"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "HTML dari rentang yang dipilih akan dilampirkan sebagai file"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "Prompt akan dimasukkan"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Masukkan Teks"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Teks yang dipilih"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prompt"
+  },
   "PageAction_InputMenu_url": {
     "message": "URL Asal"
   },
diff --git a/packages/extension/public/_locales/it/messages.json b/packages/extension/public/_locales/it/messages.json
index f5baeccad..ed65723d4 100644
--- a/packages/extension/public/_locales/it/messages.json
+++ b/packages/extension/public/_locales/it/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Tempo di attesa"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prompt"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Modello di prompt da inserire. Puoi aggiungere variabili dal menu."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Inserisci variabili dinamiche come il testo selezionato e fai riferimento ad esse nei passaggi con {{Prompt}}."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "es., Riassumi il seguente testo:\n{{Testo selezionato}}"
+  },
   "Option_aiPrompt_service": {
     "message": "Servizio AI"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "Verrà allegato come file l'HTML dell'intervallo selezionato"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "Verrà inserito il prompt"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Inserisci testo"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Testo selezionato"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prompt"
+  },
   "PageAction_InputMenu_url": {
     "message": "URL originale"
   },
diff --git a/packages/extension/public/_locales/ja/messages.json b/packages/extension/public/_locales/ja/messages.json
index ad47d4c21..9dd9f05a9 100644
--- a/packages/extension/public/_locales/ja/messages.json
+++ b/packages/extension/public/_locales/ja/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "遅延時間"
   },
+  "Option_pageAction_prompt": {
+    "message": "プロンプト"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "入力するプロンプトのテンプレートです。メニューから変数を追加できます。"
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "選択テキストなどの動的変数を挿入し、ステップ内で {{プロンプトが挿入されます}} で参照できます。"
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "例：以下のテキストを要約してください。\n{{選択テキストが挿入されます}}"
+  },
   "Option_aiPrompt_service": {
     "message": "AIサービス"
   },
@@ -852,6 +864,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "選択範囲のHTMLを添付します"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "プロンプトが挿入されます"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "テキスト挿入"
   },
@@ -861,6 +876,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "選択テキスト"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "プロンプト"
+  },
   "PageAction_InputMenu_url": {
     "message": "表示元URL"
   },
diff --git a/packages/extension/public/_locales/ko/messages.json b/packages/extension/public/_locales/ko/messages.json
index bbd9cd83f..9680f5f57 100644
--- a/packages/extension/public/_locales/ko/messages.json
+++ b/packages/extension/public/_locales/ko/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "지연 시간"
   },
+  "Option_pageAction_prompt": {
+    "message": "프롬프트"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "입력할 프롬프트 템플릿입니다. 메뉴에서 변수를 추가할 수 있습니다."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "선택한 텍스트와 같은 동적 변수를 삽입하고 단계에서 {{프롬프트}}로 참조할 수 있습니다."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "예: 다음 텍스트 요약:\n{{선택한 텍스트}}"
+  },
   "Option_aiPrompt_service": {
     "message": "AI 서비스"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "선택한 범위의 HTML이 파일로 첨부됩니다"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "프롬프트가 삽입됩니다"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "텍스트 삽입"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "선택한 텍스트"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "프롬프트"
+  },
   "PageAction_InputMenu_url": {
     "message": "원본 URL"
   },
diff --git a/packages/extension/public/_locales/ms/messages.json b/packages/extension/public/_locales/ms/messages.json
index fc1bc9224..681c91ae8 100644
--- a/packages/extension/public/_locales/ms/messages.json
+++ b/packages/extension/public/_locales/ms/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Masa kelewatan"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prom"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Templat prom yang akan dimasukkan. Anda boleh menambah pemboleh ubah daripada menu."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Sisipkan pemboleh ubah dinamik seperti teks yang dipilih, dan rujuk dalam langkah dengan {{Prom}}."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "cth., Ringkaskan teks berikut:\n{{Teks yang dipilih}}"
+  },
   "Option_aiPrompt_service": {
     "message": "Perkhidmatan AI"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "HTML julat yang dipilih akan dilampirkan sebagai fail"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "Prom akan dimasukkan"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Masukkan Teks"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Teks yang dipilih"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prom"
+  },
   "PageAction_InputMenu_url": {
     "message": "URL Asal"
   },
diff --git a/packages/extension/public/_locales/pt_BR/messages.json b/packages/extension/public/_locales/pt_BR/messages.json
index 8768173a8..cd33b6442 100644
--- a/packages/extension/public/_locales/pt_BR/messages.json
+++ b/packages/extension/public/_locales/pt_BR/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Tempo de atraso"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prompt"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Modelo de prompt a ser inserido. Você pode adicionar variáveis pelo menu."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Insira variáveis dinâmicas como o texto selecionado e faça referência a elas nas etapas com {{Prompt}}."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "ex.: Resuma o seguinte texto:\n{{Texto selecionado}}"
+  },
   "Option_aiPrompt_service": {
     "message": "Serviço de IA"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "O HTML do intervalo selecionado será anexado como arquivo"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "O prompt será inserido"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Inserir Texto"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Texto selecionado"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prompt"
+  },
   "PageAction_InputMenu_url": {
     "message": "URL de origem"
   },
diff --git a/packages/extension/public/_locales/pt_PT/messages.json b/packages/extension/public/_locales/pt_PT/messages.json
index 0f45b75f8..b5c6dda60 100644
--- a/packages/extension/public/_locales/pt_PT/messages.json
+++ b/packages/extension/public/_locales/pt_PT/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Tempo de atraso"
   },
+  "Option_pageAction_prompt": {
+    "message": "Prompt"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Modelo de prompt a ser inserido. Pode adicionar variáveis a partir do menu."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Insira variáveis dinâmicas como o texto selecionado e faça referência a elas nos passos com {{Prompt}}."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "ex.: Resuma o seguinte texto:\n{{Texto selecionado}}"
+  },
   "Option_aiPrompt_service": {
     "message": "Serviço de IA"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "O HTML do intervalo selecionado será anexado como ficheiro"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "O prompt será inserido"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Inserir Texto"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Texto selecionado"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Prompt"
+  },
   "PageAction_InputMenu_url": {
     "message": "URL de origem"
   },
diff --git a/packages/extension/public/_locales/ru/messages.json b/packages/extension/public/_locales/ru/messages.json
index 742199b4c..0fa98855f 100644
--- a/packages/extension/public/_locales/ru/messages.json
+++ b/packages/extension/public/_locales/ru/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "Время ожидания"
   },
+  "Option_pageAction_prompt": {
+    "message": "Промпт"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "Шаблон промпта для ввода. Вы можете добавлять переменные из меню."
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "Вставляйте динамические переменные, такие как выбранный текст, и ссылайтесь на них в шагах с помощью {{Промпт}}."
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "напр.: Сократите следующий текст:\n{{Выбранный текст}}"
+  },
   "Option_aiPrompt_service": {
     "message": "Сервис ИИ"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "HTML выбранного диапазона будет прикреплён в виде файла"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "Будет вставлен промпт"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "Вставить текст"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "Выбранный текст"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "Промпт"
+  },
   "PageAction_InputMenu_url": {
     "message": "Оригинальный URL"
   },
diff --git a/packages/extension/public/_locales/zh_CN/messages.json b/packages/extension/public/_locales/zh_CN/messages.json
index b0a416613..477b38972 100644
--- a/packages/extension/public/_locales/zh_CN/messages.json
+++ b/packages/extension/public/_locales/zh_CN/messages.json
@@ -491,6 +491,18 @@
   "Option_pageAction_delay": {
     "message": "等待时间"
   },
+  "Option_pageAction_prompt": {
+    "message": "提示词"
+  },
+  "Option_pageAction_prompt_desc": {
+    "message": "这是要输入的提示词模板。可以从菜单中添加变量。"
+  },
+  "Option_pageAction_prompt_desc_2": {
+    "message": "可以插入选中文本等动态变量，并在步骤中通过 {{提示词}} 引用。"
+  },
+  "Option_pageAction_prompt_placeholder": {
+    "message": "例：请概括以下文本：\n{{将插入选中的文本}}"
+  },
   "Option_aiPrompt_service": {
     "message": "AI服务"
   },
@@ -855,6 +867,9 @@
   "PageAction_InputMenu_mark_selectionHtml": {
     "message": "将以文件形式附加所选范围的HTML"
   },
+  "PageAction_InputMenu_mark_prompt": {
+    "message": "将插入提示词"
+  },
   "PageAction_InputMenu_insertText": {
     "message": "插入文本"
   },
@@ -864,6 +879,9 @@
   "PageAction_InputMenu_selectedText": {
     "message": "选中的文本"
   },
+  "PageAction_InputMenu_prompt": {
+    "message": "提示词"
+  },
   "PageAction_InputMenu_url": {
     "message": "原始URL"
   },
diff --git a/packages/extension/src/action/pageAction.test.ts b/packages/extension/src/action/pageAction.test.ts
new file mode 100644
index 000000000..f401ad049
--- /dev/null
+++ b/packages/extension/src/action/pageAction.test.ts
@@ -0,0 +1,173 @@
+import { describe, it, expect, vi, beforeEach } from "vitest"
+import { OPEN_MODE, PAGE_ACTION_OPEN_MODE, PAGE_ACTION_EVENT } from "@/const"
+import { PageAction } from "./pageAction"
+import { Ipc, BgCommand } from "@/services/ipc"
+
+vi.mock("@/services/ipc", () => ({
+  Ipc: {
+    send: vi.fn(),
+  },
+  BgCommand: {
+    openAndRunPageAction: "openAndRunPageAction",
+  },
+}))
+
+vi.mock("@/services/screen", () => ({
+  getWindowPosition: vi.fn().mockResolvedValue({ top: 100, left: 100 }),
+}))
+
+describe("PageAction.execute", () => {
+  beforeEach(() => {
+    vi.clearAllMocks()
+  })
+
+  const baseCommand = {
+    id: "pa-cmd-1",
+    title: "Test Page Action",
+    iconUrl: "https://example.com/icon.png",
+    openMode: OPEN_MODE.PAGE_ACTION,
+    pageActionOption: {
+      startUrl: "https://ai.example.com",
+      openMode: PAGE_ACTION_OPEN_MODE.POPUP,
+      steps: [
+        {
+          id: "step-1",
+          param: {
+            type: PAGE_ACTION_EVENT.input,
+            label: "Input prompt",
+            selector: "#input",
+            value: "{{Prompt}}",
+          },
+        },
+      ],
+      prompt: "Summarize: {{SelectedText}}",
+    },
+  }
+
+  it("PA-01: sends prompt in openAndRunPageAction payload", async () => {
+    await PageAction.execute({
+      command: baseCommand as any,
+      selectionText: "Selected content",
+      position: { x: 50, y: 50 },
+    })
+
+    expect(Ipc.send).toHaveBeenCalledWith(
+      BgCommand.openAndRunPageAction,
+      expect.objectContaining({
+        commandId: "pa-cmd-1",
+        selectedText: "Selected content",
+        prompt: "Summarize: {{SelectedText}}",
+        url: expect.objectContaining({
+          searchUrl: "https://ai.example.com",
+          selectionText: "Selected content",
+          useClipboard: false,
+        }),
+      }),
+    )
+  })
+
+  it("PA-02: detects indirect clipboard usage when step has {{Prompt}} and prompt has {{Clipboard}}", async () => {
+    const commandWithClipboardPrompt = {
+      ...baseCommand,
+      pageActionOption: {
+        ...baseCommand.pageActionOption,
+        prompt: "Translate clipboard: {{Clipboard}}",
+      },
+    }
+
+    await PageAction.execute({
+      command: commandWithClipboardPrompt as any,
+      selectionText: "",
+      position: { x: 50, y: 50 },
+    })
+
+    expect(Ipc.send).toHaveBeenCalledWith(
+      BgCommand.openAndRunPageAction,
+      expect.objectContaining({
+        url: expect.objectContaining({
+          useClipboard: true,
+        }),
+      }),
+    )
+  })
+
+  it("PA-03: does not request clipboard if prompt has {{Clipboard}} but no step uses {{Prompt}}", async () => {
+    const commandWithoutPromptStep = {
+      ...baseCommand,
+      pageActionOption: {
+        ...baseCommand.pageActionOption,
+        steps: [
+          {
+            id: "step-1",
+            param: {
+              type: PAGE_ACTION_EVENT.input,
+              label: "Input",
+              selector: "#input",
+              value: "{{SelectedText}}",
+            },
+          },
+        ],
+        prompt: "Translate clipboard: {{Clipboard}}",
+      },
+    }
+
+    await PageAction.execute({
+      command: commandWithoutPromptStep as any,
+      selectionText: "hello",
+      position: { x: 50, y: 50 },
+    })
+
+    expect(Ipc.send).toHaveBeenCalledWith(
+      BgCommand.openAndRunPageAction,
+      expect.objectContaining({
+        url: expect.objectContaining({
+          useClipboard: false,
+        }),
+      }),
+    )
+  })
+
+  it("PA-04: works with legacy Page Action commands without prompt field", async () => {
+    const legacyCommand = {
+      id: "legacy-cmd",
+      title: "Legacy Page Action",
+      iconUrl: "https://example.com/icon.png",
+      openMode: OPEN_MODE.PAGE_ACTION,
+      pageActionOption: {
+        startUrl: "https://example.com",
+        openMode: PAGE_ACTION_OPEN_MODE.TAB,
+        steps: [
+          {
+            id: "step-1",
+            param: {
+              type: PAGE_ACTION_EVENT.input,
+              label: "Direct input",
+              selector: "#input",
+              value: "{{SelectedText}}",
+            },
+          },
+        ],
+      },
+    }
+
+    await PageAction.execute({
+      command: legacyCommand as any,
+      selectionText: "sample",
+      position: { x: 10, y: 10 },
+    })
+
+    expect(Ipc.send).toHaveBeenCalledWith(
+      BgCommand.openAndRunPageAction,
+      expect.objectContaining({
+        commandId: "legacy-cmd",
+        prompt: undefined,
+        url: expect.objectContaining({
+          searchUrl: "https://example.com",
+          selectionText: "sample",
+          useClipboard: false,
+        }),
+      }),
+    )
+  })
+})
+
diff --git a/packages/extension/src/action/pageAction.ts b/packages/extension/src/action/pageAction.ts
index 9c92ec152..f6f043ed5 100644
--- a/packages/extension/src/action/pageAction.ts
+++ b/packages/extension/src/action/pageAction.ts
@@ -35,13 +35,26 @@ export const PageAction = {
       return
     }
 
-    // Checks if any step requires clipboard data
-    const needClipboard = command.pageActionOption.steps.some((step) => {
-      return (
+    // Checks if any step directly or indirectly requires clipboard data
+    const hasPromptStep = command.pageActionOption.steps.some(
+      (step) =>
         step.param.type === PAGE_ACTION_EVENT.input &&
-        step.param.value.includes(toInsertTemplate(INSERT.CLIPBOARD))
-      )
-    })
+        step.param.value.includes(toInsertTemplate(INSERT.PROMPT)),
+    )
+    const promptNeedsClipboard =
+      hasPromptStep &&
+      (command.pageActionOption.prompt?.includes(
+        toInsertTemplate(INSERT.CLIPBOARD),
+      ) ?? false)
+
+    const needClipboard =
+      promptNeedsClipboard ||
+      command.pageActionOption.steps.some((step) => {
+        return (
+          step.param.type === PAGE_ACTION_EVENT.input &&
+          step.param.value.includes(toInsertTemplate(INSERT.CLIPBOARD))
+        )
+      })
 
     const url: UrlParam = {
       searchUrl: command.pageActionOption.startUrl,
@@ -73,6 +86,7 @@ export const PageAction = {
       srcUrl: pageUrl ?? "",
       openMode,
       userVariables: userVariables ?? command.pageActionOption.userVariables,
+      prompt: command.pageActionOption.prompt,
     })
   },
 }
diff --git a/packages/extension/src/components/option/editor/CommandEditDialog.tsx b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
index 52d0d8b91..4f956220a 100644
--- a/packages/extension/src/components/option/editor/CommandEditDialog.tsx
+++ b/packages/extension/src/components/option/editor/CommandEditDialog.tsx
@@ -194,6 +194,7 @@ const getDefault = (
         pageUrl: "",
         openMode: PAGE_ACTION_OPEN_MODE.POPUP,
         steps: [],
+        prompt: "",
       },
     }
   }
@@ -412,6 +413,7 @@ const CommandEditDialogInner = ({
         openMode: getValues("pageActionOption.openMode"),
         size: getValues("popupOption") ?? POPUP_OPTION,
         steps: getValues("pageActionOption.steps"),
+        prompt: getValues("pageActionOption.prompt"),
       },
     )
     await Ipc.send(BgCommand.startPageActionRecorder, {
diff --git a/packages/extension/src/components/option/editor/PageActionSection.tsx b/packages/extension/src/components/option/editor/PageActionSection.tsx
index a8ce3148d..c145c819a 100644
--- a/packages/extension/src/components/option/editor/PageActionSection.tsx
+++ b/packages/extension/src/components/option/editor/PageActionSection.tsx
@@ -1,8 +1,20 @@
 import { useState, useEffect } from "react"
 import { useFieldArray } from "react-hook-form"
 import { Disc3 } from "lucide-react"
-import { FormLabel, FormDescription } from "@/components/ui/form"
+import {
+  FormControl,
+  FormField,
+  FormItem,
+  FormLabel,
+  FormDescription,
+  FormMessage,
+} from "@/components/ui/form"
+import { Textarea } from "@/components/ui/textarea"
 import type { PageAction } from "@/services/pageAction"
+import {
+  convSymbolsToReadableKeys,
+  convReadableKeysToSymbols,
+} from "@/services/pageAction"
 import { t as _t } from "@/services/i18n"
 const t = (key: string, p?: string[]) => _t(`Option_${key}`, p)
 import { cn, isEmpty, capitalize } from "@/lib/utils"
@@ -15,6 +27,7 @@ import { PAGE_ACTION_OPEN_MODE } from "@/const"
 import { TEST_IDS } from "@/testIds"
 import { InputField } from "@/components/option/field/InputField"
 import { OpenModeToggleField } from "@/components/option/field/OpenModeToggleField"
+import { InputMenu } from "@/components/pageAction/InputPopup"
 import { StepList } from "@/components/pageAction/StepList"
 import { InputEditor } from "@/components/pageAction/InputEditor"
 import { RemoveDialog } from "@/components/option/RemoveDialog"
@@ -30,6 +43,8 @@ export const PageActionSection = ({
   form,
   openRecorder,
 }: PageActionSectionProps) => {
+  const [promptTextarea, setPromptTextarea] =
+    useState<HTMLTextAreaElement | null>(null)
   const { register, getValues, watch, setValue } = form
   const openMode = watch("pageActionOption.openMode")
 
@@ -147,6 +162,47 @@ export const PageActionSection = ({
         type="pageAction"
       />
 
+      <FormField
+        control={form.control}
+        name="pageActionOption.prompt"
+        render={({ field }) => (
+          <FormItem className="flex items-start gap-1 pt-10">
+            <div className="w-2/6">
+              <FormLabel>{t("pageAction_prompt")}</FormLabel>
+              <FormDescription>{t("pageAction_prompt_desc")}</FormDescription>
+              <FormDescription className="mt-1">
+                {t("pageAction_prompt_desc_2")}
+              </FormDescription>
+            </div>
+            <div className="w-4/6 relative">
+              <InputMenu
+                targetElm={promptTextarea}
+                className="w-fit absolute -top-10 right-0"
+                hideFilePaste
+              />
+              <FormControl>
+                <Textarea
+                  value={convSymbolsToReadableKeys(field.value)}
+                  onChange={(e) =>
+                    field.onChange(convReadableKeysToSymbols(e.target.value))
+                  }
+                  onBlur={field.onBlur}
+                  name={field.name}
+                  ref={(el) => {
+                    setPromptTextarea(el)
+                    field.ref(el)
+                  }}
+                  rows={6}
+                  placeholder={t("pageAction_prompt_placeholder")}
+                  className="max-h-80"
+                />
+              </FormControl>
+              <FormMessage className="mt-1" />
+            </div>
+          </FormItem>
+        )}
+      />
+
       {/*
       <UserVariablesField
         control={form.control}
diff --git a/packages/extension/src/components/option/editor/commandChangedDetector.test.ts b/packages/extension/src/components/option/editor/commandChangedDetector.test.ts
index 66d118376..f088fdef2 100644
--- a/packages/extension/src/components/option/editor/commandChangedDetector.test.ts
+++ b/packages/extension/src/components/option/editor/commandChangedDetector.test.ts
@@ -118,6 +118,44 @@ describe("hasCommandChanged", () => {
       ).toBe(false)
     })
 
+    it("returns false when prompt is unchanged or empty/undefined equivalent", () => {
+      const cmd = makePageActionCommand()
+      expect(
+        hasCommandChanged(
+          cmd,
+          "",
+          { ...cmd.pageActionOption, prompt: "" },
+          "",
+        ),
+      ).toBe(false)
+
+      const cmdWithPrompt = makePageActionCommand({
+        pageActionOption: { prompt: "Summarize" },
+      })
+      expect(
+        hasCommandChanged(
+          cmdWithPrompt,
+          "",
+          { ...cmdWithPrompt.pageActionOption, prompt: "Summarize" },
+          "",
+        ),
+      ).toBe(false)
+    })
+
+    it("returns true when prompt is changed", () => {
+      const cmd = makePageActionCommand({
+        pageActionOption: { prompt: "Original prompt" },
+      })
+      expect(
+        hasCommandChanged(
+          cmd,
+          "",
+          { ...cmd.pageActionOption, prompt: "Updated prompt" },
+          "",
+        ),
+      ).toBe(true)
+    })
+
     it("does not throw when currentPageActionOption is null, returns true (differs from saved)", () => {
       const cmd = makePageActionCommand()
       expect(hasCommandChanged(cmd, "", null, "")).toBe(true)
diff --git a/packages/extension/src/components/option/editor/commandChangedDetector.ts b/packages/extension/src/components/option/editor/commandChangedDetector.ts
index 1f5354cc7..1db47b25c 100644
--- a/packages/extension/src/components/option/editor/commandChangedDetector.ts
+++ b/packages/extension/src/components/option/editor/commandChangedDetector.ts
@@ -18,7 +18,15 @@ export function hasCommandChanged(
   if (isPageActionType(command)) {
     const { openMode: _a, ...pao } = currentPageActionOption ?? {}
     const { openMode: _b, ...cmdPao } = command.pageActionOption
-    return JSON.stringify(pao) !== JSON.stringify(cmdPao)
+    const normalizedPao = {
+      ...pao,
+      prompt: pao.prompt || undefined,
+    }
+    const normalizedCmdPao = {
+      ...cmdPao,
+      prompt: cmdPao.prompt || undefined,
+    }
+    return JSON.stringify(normalizedPao) !== JSON.stringify(normalizedCmdPao)
   }
   if (isAiPromptType(command)) {
     return currentAiPromptPrompt !== command.aiPromptOption.prompt
diff --git a/packages/extension/src/components/pageAction/InputEditor.tsx b/packages/extension/src/components/pageAction/InputEditor.tsx
index 81735701a..82223e2dc 100644
--- a/packages/extension/src/components/pageAction/InputEditor.tsx
+++ b/packages/extension/src/components/pageAction/InputEditor.tsx
@@ -53,6 +53,7 @@ export function InputEditor(props: InputEditorProps) {
               targetElm={textarea}
               className="w-fit relative left-[100%] -translate-x-[100%] -top-1"
               hideFilePaste
+              showPrompt
             />
             <Textarea
               id="input-action"
diff --git a/packages/extension/src/components/pageAction/InputPopup.tsx b/packages/extension/src/components/pageAction/InputPopup.tsx
index 54d594593..f3c69aed7 100644
--- a/packages/extension/src/components/pageAction/InputPopup.tsx
+++ b/packages/extension/src/components/pageAction/InputPopup.tsx
@@ -8,6 +8,7 @@ import {
   Code,
   ChevronDown,
   ChevronUp,
+  Sparkles,
 } from "lucide-react"
 import { Popover, PopoverContent, PopoverAnchor } from "@/components/ui/popover"
 import {
@@ -240,6 +241,7 @@ export function InputPopup(): JSX.Element {
               targetElm={targetElm}
               disabled={disabled}
               hideFilePaste
+              showPrompt
             />
           </PopoverContent>
         )}
@@ -254,6 +256,7 @@ type MenuProps = {
   disabled?: boolean
   hideFilePaste?: boolean
   fileAttachDisabled?: boolean
+  showPrompt?: boolean
 }
 
 export function InputMenu(props: MenuProps): JSX.Element {
@@ -319,6 +322,12 @@ export function InputMenu(props: MenuProps): JSX.Element {
             <TextCursorInput size={16} className="mr-2 stroke-gray-600" />
             {t("PageAction_InputMenu_selectedText")}
           </InputMenuItem>
+          {props.showPrompt && (
+            <InputMenuItem onClick={onClickItem} value={INSERT.PROMPT}>
+              <Sparkles size={16} className="mr-2 stroke-gray-600" />
+              {t("PageAction_InputMenu_prompt")}
+            </InputMenuItem>
+          )}
           <InputMenuItem onClick={onClickItem} value={INSERT.URL}>
             <Link2 size={16} className="mr-2 stroke-gray-600" />
             {t("PageAction_InputMenu_url")}
diff --git a/packages/extension/src/hooks/pageAction/usePageActionRunner.ts b/packages/extension/src/hooks/pageAction/usePageActionRunner.ts
index 3a97f6ea8..4900a93cd 100644
--- a/packages/extension/src/hooks/pageAction/usePageActionRunner.ts
+++ b/packages/extension/src/hooks/pageAction/usePageActionRunner.ts
@@ -48,6 +48,7 @@ export function usePageActionRunner() {
       userVariables,
       pageHtml,
       selectionHtml,
+      prompt,
     } = message
     const type = step.param.type
 
@@ -101,6 +102,7 @@ export function usePageActionRunner() {
             selectedText,
             clipboardText,
             userVariables,
+            prompt,
           } as PageAction.InputExec)
           break
         case "filePaste":
diff --git a/packages/extension/src/services/ipc.ts b/packages/extension/src/services/ipc.ts
index ea8d3c9fd..9fdb46150 100644
--- a/packages/extension/src/services/ipc.ts
+++ b/packages/extension/src/services/ipc.ts
@@ -86,6 +86,7 @@ export type RunPageAction = {
   userVariables?: Array<UserVariable>
   pageHtml?: string
   selectionHtml?: string
+  prompt?: string
 }
 
 /**
@@ -102,6 +103,7 @@ export type SidePanelPendingAction = {
   useClipboard?: boolean
   pageHtml?: string
   selectionHtml?: string
+  prompt?: string
 }
 
 export namespace ExecPageAction {
@@ -114,6 +116,7 @@ export namespace ExecPageAction {
     userVariables?: Array<UserVariable>
     pageHtml?: string
     selectionHtml?: string
+    prompt?: string
   }
   export type Return = {
     result: boolean
diff --git a/packages/extension/src/services/pageAction/background-sidePanel.ts b/packages/extension/src/services/pageAction/background-sidePanel.ts
index 2c4dc7614..e7aa82200 100644
--- a/packages/extension/src/services/pageAction/background-sidePanel.ts
+++ b/packages/extension/src/services/pageAction/background-sidePanel.ts
@@ -32,6 +32,7 @@ export const runViaPort = (
     clipboardText,
     pageHtml,
     selectionHtml,
+    prompt,
   } = param
 
   const executeStep = (
@@ -61,6 +62,7 @@ export const runViaPort = (
             userVariables: [],
             pageHtml: stepPageHtml,
             selectionHtml: stepSelectionHtml,
+            prompt,
           },
         })
         resolve({ result: true })
@@ -96,6 +98,7 @@ export const runViaPort = (
           userVariables: [],
           pageHtml: stepPageHtml,
           selectionHtml: stepSelectionHtml,
+          prompt,
         },
       })
     })
diff --git a/packages/extension/src/services/pageAction/background.ts b/packages/extension/src/services/pageAction/background.ts
index 5b19f5520..b1f8d8fcd 100644
--- a/packages/extension/src/services/pageAction/background.ts
+++ b/packages/extension/src/services/pageAction/background.ts
@@ -429,7 +429,15 @@ export const openAndRun = (
     const steps = param.steps
     const userVariables = param.userVariables || []
     run(
-      { ...param, tabId, steps, selectedText, clipboardText, userVariables },
+      {
+        ...param,
+        tabId,
+        steps,
+        selectedText,
+        clipboardText,
+        userVariables,
+        prompt: param.prompt,
+      },
       sender,
       response,
     )
@@ -462,7 +470,11 @@ export const preview = (
       await chrome.tabs.update(tabId, { url: option.startUrl })
     }
 
-    run(param, sender, response)
+    run(
+      { ...param, prompt: param.prompt ?? option?.prompt },
+      sender,
+      response,
+    )
   }
 
   func()
@@ -483,6 +495,7 @@ const run = (
     userVariables,
     pageHtml,
     selectionHtml,
+    prompt,
   } = param
   const tabId = param.tabId || sender.tab?.id
   if (tabId == null) {
@@ -527,6 +540,7 @@ const run = (
         userVariables,
         pageHtml: isFilePaste ? pageHtml : undefined,
         selectionHtml: isFilePaste ? selectionHtml : undefined,
+        prompt,
       })
       if (ret == null) {
         if (retryCount >= RETRY_MAX) {
diff --git a/packages/extension/src/services/pageAction/backgroundDispatcher.test.ts b/packages/extension/src/services/pageAction/backgroundDispatcher.test.ts
index 9d993ca49..b9d4f9eaf 100644
--- a/packages/extension/src/services/pageAction/backgroundDispatcher.test.ts
+++ b/packages/extension/src/services/pageAction/backgroundDispatcher.test.ts
@@ -25,12 +25,14 @@ vi.mock("@/services/pageAction", () => ({
     URL: "url",
     CLIPBOARD: "clipboard",
     LANG: "lang",
+    PROMPT: "prompt",
   },
   InsertSymbol: {
     selectedText: "{{selectedText}}",
     url: "{{url}}",
     clipboard: "{{clipboard}}",
     lang: "{{lang}}",
+    prompt: "{{prompt}}",
   },
 }))
 
diff --git a/packages/extension/src/services/pageAction/backgroundDispatcher.ts b/packages/extension/src/services/pageAction/backgroundDispatcher.ts
index 3a927cdfb..a81367a2f 100644
--- a/packages/extension/src/services/pageAction/backgroundDispatcher.ts
+++ b/packages/extension/src/services/pageAction/backgroundDispatcher.ts
@@ -1,11 +1,10 @@
 import { inputContentEditable } from "@/services/dom"
-import { safeInterpolate, isMac, isEmpty } from "@/lib/utils"
-import { INSERT, InsertSymbol } from "@/services/pageAction"
+import { isMac, isEmpty } from "@/lib/utils"
 import { PageAction, ActionReturn } from "./dispatcher"
 import { queryElement } from "./queryElement"
 import { SelectorType, PAGE_ACTION_TIMEOUT as TIMEOUT } from "@/const"
-import { getUILanguage } from "@/services/i18n"
 import { resolveClickCondition, BACKGROUND_POLL } from "./elementWait"
+import { resolveActionVariables } from "./helper"
 
 /**
  * Wait for an element to appear in the DOM for background tab execution.
@@ -181,27 +180,19 @@ export const BackgroundPageActionDispatcher = {
       selectedText,
       clipboardText,
       userVariables,
+      prompt,
     } = param
 
     const element = await waitForElementBackground(selector, selectorType)
     if (element) {
-      // Insert variables (same as original)
-      const variables = {
-        [InsertSymbol[INSERT.SELECTED_TEXT]]: selectedText,
-        [InsertSymbol[INSERT.URL]]: srcUrl,
-        [InsertSymbol[INSERT.CLIPBOARD]]: clipboardText,
-        [InsertSymbol[INSERT.LANG]]: getUILanguage(),
-        // Add user variables
-        ...(userVariables?.reduce(
-          (acc, variable) => {
-            acc[variable.name] = variable.value
-            return acc
-          },
-          {} as Record<string, string>,
-        ) || {}),
-      }
-
-      const value = safeInterpolate(param.value, variables)
+      const value = resolveActionVariables({
+        value: param.value,
+        selectedText,
+        srcUrl,
+        clipboardText,
+        userVariables,
+        prompt,
+      })
 
       if (!isEmpty(value)) {
         // Direct value assignment for background tabs
diff --git a/packages/extension/src/services/pageAction/dispatcher.test.ts b/packages/extension/src/services/pageAction/dispatcher.test.ts
index 23685ded5..1b9015008 100644
--- a/packages/extension/src/services/pageAction/dispatcher.test.ts
+++ b/packages/extension/src/services/pageAction/dispatcher.test.ts
@@ -28,6 +28,7 @@ vi.mock("@/services/pageAction", () => ({
     LANG: "lang",
     PAGE_HTML: "pageHtml",
     SELECTION_HTML: "selectionHtml",
+    PROMPT: "prompt",
   },
   InsertSymbol: {
     selectedText: "{{selectedText}}",
@@ -36,6 +37,7 @@ vi.mock("@/services/pageAction", () => ({
     lang: "{{lang}}",
     pageHtml: "{{pageHtml}}",
     selectionHtml: "{{selectionHtml}}",
+    prompt: "{{prompt}}",
   },
 }))
 
@@ -779,6 +781,41 @@ describe("PageActionDispatcher", () => {
         }),
       )
     })
+
+    it("PDI-12: Should resolve prompt variable in input step", async () => {
+      const mockElement = mockElements.input
+      mockDocument.querySelector.mockReturnValue(mockElement)
+      mockIsEditable.mockReturnValue(false)
+
+      const param = {
+        type: PAGE_ACTION_EVENT.input,
+        selector: ".input",
+        selectorType: SelectorType.css,
+        label: "Input",
+        value: "{{prompt}}",
+        srcUrl: "https://example.com",
+        selectedText: "test selection",
+        clipboardText: "",
+        prompt: "Summarize: {{selectedText}}",
+      }
+
+      await PageActionDispatcher.input(param as any)
+
+      // First safeInterpolate call resolves prompt template
+      expect(mockSafeInterpolate).toHaveBeenCalledWith(
+        "Summarize: {{selectedText}}",
+        expect.objectContaining({
+          "{{selectedText}}": "test selection",
+        }),
+      )
+      // Second safeInterpolate call resolves input step value
+      expect(mockSafeInterpolate).toHaveBeenCalledWith(
+        "{{prompt}}",
+        expect.objectContaining({
+          "{{prompt}}": expect.any(String),
+        }),
+      )
+    })
   })
 
   describe("PageActionDispatcher.filePaste", () => {
diff --git a/packages/extension/src/services/pageAction/dispatcher.ts b/packages/extension/src/services/pageAction/dispatcher.ts
index ba75cd9ef..6d2ccaa9d 100644
--- a/packages/extension/src/services/pageAction/dispatcher.ts
+++ b/packages/extension/src/services/pageAction/dispatcher.ts
@@ -2,8 +2,8 @@ import userEvent from "@testing-library/user-event"
 import { isEditable, inputContentEditable } from "@/services/dom"
 import { safeInterpolate, isMac, isEmpty } from "@/lib/utils"
 import { INSERT, InsertSymbol } from "@/services/pageAction"
-import { getUILanguage } from "@/services/i18n"
 import { waitForElement, resolveClickCondition } from "./elementWait"
+import { resolveActionVariables } from "./helper"
 
 export type { PageAction, ActionReturn } from "./pageActionTypes"
 import type { PageAction, ActionReturn } from "./pageActionTypes"
@@ -95,27 +95,20 @@ export const PageActionDispatcher = {
       selectedText,
       clipboardText,
       userVariables,
+      prompt,
     } = param
     const user = userEvent.setup()
 
     const element = await waitForElement(selector, selectorType)
     if (element) {
-      // Inserts variables.
-      const variables = {
-        [InsertSymbol[INSERT.SELECTED_TEXT]]: selectedText,
-        [InsertSymbol[INSERT.URL]]: srcUrl,
-        [InsertSymbol[INSERT.CLIPBOARD]]: clipboardText,
-        [InsertSymbol[INSERT.LANG]]: getUILanguage(),
-        // Add user variables
-        ...(userVariables?.reduce(
-          (acc, variable) => {
-            acc[variable.name] = variable.value
-            return acc
-          },
-          {} as Record<string, string>,
-        ) || {}),
-      }
-      let value = safeInterpolate(param.value, variables)
+      let value = resolveActionVariables({
+        value: param.value,
+        selectedText,
+        srcUrl,
+        clipboardText,
+        userVariables,
+        prompt,
+      })
       if (!isEmpty(value)) {
         // For select elements: set value directly and dispatch change event
         if (element instanceof HTMLSelectElement) {
diff --git a/packages/extension/src/services/pageAction/helper.test.ts b/packages/extension/src/services/pageAction/helper.test.ts
index 5054b176d..f4f0e3253 100644
--- a/packages/extension/src/services/pageAction/helper.test.ts
+++ b/packages/extension/src/services/pageAction/helper.test.ts
@@ -3,6 +3,7 @@ import { INSERT, InsertSymbol } from "@/services/pageAction"
 
 vi.mock("@/services/i18n", () => ({
   t: (key: string) => key,
+  getUILanguage: () => "en",
 }))
 
 vi.mock("@/services/pageAction/listener", () => ({
@@ -13,6 +14,7 @@ import {
   LocaleKey,
   convReadableKeysToSymbols,
   convSymbolsToReadableKeys,
+  resolveActionVariables,
 } from "./helper"
 
 describe("pageAction helper conversion", () => {
@@ -24,16 +26,121 @@ describe("pageAction helper conversion", () => {
   })
 
   it("converts symbols to readable keys", () => {
-    const value = `A ${InsertSymbol[INSERT.SELECTED_TEXT]} B ${InsertSymbol[INSERT.URL]}`
+    const value = `A ${InsertSymbol[INSERT.SELECTED_TEXT]} B ${InsertSymbol[INSERT.URL]} C ${InsertSymbol[INSERT.PROMPT]}`
     expect(convSymbolsToReadableKeys(value)).toBe(
-      `A ${LocaleKey}${INSERT.SELECTED_TEXT} B ${LocaleKey}${INSERT.URL}`,
+      `A ${LocaleKey}${INSERT.SELECTED_TEXT} B ${LocaleKey}${INSERT.URL} C ${LocaleKey}${INSERT.PROMPT}`,
     )
   })
 
   it("converts readable keys to symbols", () => {
-    const value = `A ${LocaleKey}${INSERT.CLIPBOARD} B ${LocaleKey}${INSERT.LANG}`
+    const value = `A ${LocaleKey}${INSERT.CLIPBOARD} B ${LocaleKey}${INSERT.LANG} C ${LocaleKey}${INSERT.PROMPT}`
     expect(convReadableKeysToSymbols(value)).toBe(
-      `A ${InsertSymbol[INSERT.CLIPBOARD]} B ${InsertSymbol[INSERT.LANG]}`,
+      `A ${InsertSymbol[INSERT.CLIPBOARD]} B ${InsertSymbol[INSERT.LANG]} C ${InsertSymbol[INSERT.PROMPT]}`,
     )
   })
 })
+
+describe("resolveActionVariables", () => {
+  it("resolves basic variables in input value without prompt", () => {
+    const result = resolveActionVariables({
+      value: "Selected: {{SelectedText}}, URL: {{Url}}, Lang: {{Lang}}",
+      selectedText: "Hello",
+      srcUrl: "https://example.com",
+    })
+    expect(result).toBe("Selected: Hello, URL: https://example.com, Lang: en")
+  })
+
+  it("resolves {{Prompt}} to the configured prompt", () => {
+    const result = resolveActionVariables({
+      value: "{{Prompt}}",
+      prompt: "Summarize the text",
+    })
+    expect(result).toBe("Summarize the text")
+  })
+
+  it("resolves nested variables inside the prompt template (Stage 1) then substitutes {{Prompt}} (Stage 2)", () => {
+    const result = resolveActionVariables({
+      value: "Prompt: {{Prompt}}\nOrigin: {{Url}}",
+      prompt: "Summarize: {{SelectedText}} from {{Clipboard}}",
+      selectedText: "Important article",
+      clipboardText: "Extra context",
+      srcUrl: "https://news.example.com",
+    })
+    expect(result).toBe(
+      "Prompt: Summarize: Important article from Extra context\nOrigin: https://news.example.com",
+    )
+  })
+
+  it("resolves userVariables in prompt and in value", () => {
+    const result = resolveActionVariables({
+      value: "{{Prompt}} and {{myVar}}",
+      prompt: "Custom: {{myVar}} with {{SelectedText}}",
+      selectedText: "Target",
+      userVariables: [{ name: "myVar", value: "CustomVal" }],
+    })
+    expect(result).toBe("Custom: CustomVal with Target and CustomVal")
+  })
+
+  it("does not recursively evaluate literal placeholders inside selected text", () => {
+    const prompt = "Explain this text:\n\n{{SelectedText}}"
+    const selectedText = "The literal text {{Prompt}} must remain unchanged."
+
+    const result = resolveActionVariables({
+      value: "{{Prompt}}",
+      prompt,
+      selectedText,
+    })
+
+    expect(result).toBe(
+      "Explain this text:\n\nThe literal text {{Prompt}} must remain unchanged.",
+    )
+  })
+
+  it("does not recursively evaluate nested placeholder-like text in clipboard or variables", () => {
+    const prompt = "Data: {{Clipboard}}"
+    const clipboardText = "{{SelectedText}} and {{Prompt}}"
+
+    const result = resolveActionVariables({
+      value: "{{Prompt}}",
+      prompt,
+      clipboardText,
+    })
+
+    expect(result).toBe("Data: {{SelectedText}} and {{Prompt}}")
+  })
+
+  it("does not expand {{Prompt}} if literally written inside prompt template itself", () => {
+    const prompt = "Template with literal {{Prompt}} and {{SelectedText}}"
+    const result = resolveActionVariables({
+      value: "Result: {{Prompt}}",
+      prompt,
+      selectedText: "Sample",
+    })
+
+    expect(result).toBe("Result: Template with literal {{Prompt}} and Sample")
+  })
+
+  it("safely resolves {{Prompt}} to empty string when prompt is undefined", () => {
+    const result = resolveActionVariables({
+      value: "Before [{{Prompt}}] After",
+      prompt: undefined,
+    })
+    expect(result).toBe("Before [] After")
+  })
+
+  it("safely resolves {{Prompt}} to empty string when prompt is empty string", () => {
+    const result = resolveActionVariables({
+      value: "Before [{{Prompt}}] After",
+      prompt: "",
+    })
+    expect(result).toBe("Before [] After")
+  })
+
+  it("preserves unresolved unknown placeholders", () => {
+    const result = resolveActionVariables({
+      value: "{{UnknownVariable}} and {{Prompt}}",
+      prompt: "Ready",
+    })
+    expect(result).toBe("{{UnknownVariable}} and Ready")
+  })
+})
diff --git a/packages/extension/src/services/pageAction/helper.ts b/packages/extension/src/services/pageAction/helper.ts
index f0e30ec32..0bd6c6ea8 100644
--- a/packages/extension/src/services/pageAction/helper.ts
+++ b/packages/extension/src/services/pageAction/helper.ts
@@ -8,6 +8,10 @@ import {
 import { PAGE_ACTION_EVENT, PAGE_ACTION_CONTROL } from "@/const"
 import { getKeyLabel } from "@/services/pageAction/listener"
 
+import { safeInterpolate } from "@/lib/utils"
+import { getUILanguage } from "@/services/i18n"
+import type { UserVariable } from "@/types"
+
 export const LocaleKey = "PageAction_InputMenu_mark_"
 
 /** Counts the total occurrences of HTML attachment placeholders (PageHtml + SelectionHtml) in a prompt. */
@@ -28,6 +32,7 @@ export function convReadableKeysToSymbols(value?: string | null): string {
     [t(LocaleKey + INSERT.LANG)]: InsertSymbol[INSERT.LANG],
     [t(LocaleKey + INSERT.PAGE_HTML)]: InsertSymbol[INSERT.PAGE_HTML],
     [t(LocaleKey + INSERT.SELECTION_HTML)]: InsertSymbol[INSERT.SELECTION_HTML],
+    [t(LocaleKey + INSERT.PROMPT)]: InsertSymbol[INSERT.PROMPT],
   }
   Object.entries(symbols).forEach(([key, val]) => {
     normalizedValue = normalizedValue.replace(new RegExp(key, "g"), val)
@@ -44,6 +49,7 @@ export function convSymbolsToReadableKeys(value?: string | null): string {
     [InsertSymbol[INSERT.LANG]]: t(LocaleKey + INSERT.LANG),
     [InsertSymbol[INSERT.PAGE_HTML]]: t(LocaleKey + INSERT.PAGE_HTML),
     [InsertSymbol[INSERT.SELECTION_HTML]]: t(LocaleKey + INSERT.SELECTION_HTML),
+    [InsertSymbol[INSERT.PROMPT]]: t(LocaleKey + INSERT.PROMPT),
   }
   Object.entries(symbols).forEach(([key, val]) => {
     normalizedValue = normalizedValue.replace(new RegExp(key, "g"), val)
@@ -51,6 +57,61 @@ export function convSymbolsToReadableKeys(value?: string | null): string {
   return normalizedValue
 }
 
+export type ResolveActionVariablesParams = {
+  value: string
+  selectedText?: string
+  srcUrl?: string
+  clipboardText?: string
+  userVariables?: Array<UserVariable>
+  prompt?: string
+}
+
+/**
+ * Two-stage, non-recursive variable resolution for Page Action inputs.
+ * Stage 1: Resolves the saved prompt template using base variables.
+ * Stage 2: Resolves the input step value using base variables and the resolved prompt ({{Prompt}}).
+ * Literal placeholders in the substituted text are never re-evaluated.
+ */
+export function resolveActionVariables(
+  params: ResolveActionVariablesParams,
+): string {
+  const {
+    value,
+    selectedText = "",
+    srcUrl = "",
+    clipboardText = "",
+    userVariables,
+    prompt,
+  } = params
+
+  // Stage 1: Build base variables map (intentionally excludes Prompt)
+  const baseVariables: Record<string, string> = {
+    [InsertSymbol[INSERT.SELECTED_TEXT]]: selectedText,
+    [InsertSymbol[INSERT.URL]]: srcUrl,
+    [InsertSymbol[INSERT.CLIPBOARD]]: clipboardText,
+    [InsertSymbol[INSERT.LANG]]: getUILanguage(),
+    ...(userVariables?.reduce(
+      (acc, variable) => {
+        acc[variable.name] = variable.value
+        return acc
+      },
+      {} as Record<string, string>,
+    ) || {}),
+  }
+
+  // Resolve prompt template with base variables if provided; safely handle missing/empty prompt
+  const resolvedPrompt = prompt ? safeInterpolate(prompt, baseVariables) : ""
+
+  // Stage 2: Combine base variables with the resolved prompt
+  const stepVariables: Record<string, string> = {
+    ...baseVariables,
+    [InsertSymbol[INSERT.PROMPT]]: resolvedPrompt,
+  }
+
+  // Single-pass replacement over value prevents recursive evaluation of substituted text
+  return safeInterpolate(value, stepVariables)
+}
+
 export const paramToStr = (param: PageAction.Parameter): string => {
   switch (param.type) {
     case PAGE_ACTION_CONTROL.start:
diff --git a/packages/extension/src/services/pageAction/insertSymbols.ts b/packages/extension/src/services/pageAction/insertSymbols.ts
index eeb45c5ff..3902cd477 100644
--- a/packages/extension/src/services/pageAction/insertSymbols.ts
+++ b/packages/extension/src/services/pageAction/insertSymbols.ts
@@ -10,6 +10,7 @@ export enum INSERT {
   LANG = "lang",
   PAGE_HTML = "pageHtml",
   SELECTION_HTML = "selectionHtml",
+  PROMPT = "prompt",
 }
 
 export const InsertSymbol = {
@@ -19,6 +20,7 @@ export const InsertSymbol = {
   [INSERT.LANG]: "Lang",
   [INSERT.PAGE_HTML]: "PageHtml",
   [INSERT.SELECTION_HTML]: "SelectionHtml",
+  [INSERT.PROMPT]: "Prompt",
 }
 
 /** Returns the template placeholder string for a given INSERT key, e.g. "{{Clipboard}}" */
diff --git a/packages/extension/src/services/pageAction/pageActionTypes.ts b/packages/extension/src/services/pageAction/pageActionTypes.ts
index adb571308..c4d9f4bb7 100644
--- a/packages/extension/src/services/pageAction/pageActionTypes.ts
+++ b/packages/extension/src/services/pageAction/pageActionTypes.ts
@@ -73,6 +73,7 @@ export namespace PageAction {
     userVariables?: UserVariable[]
     pageHtml?: string
     selectionHtml?: string
+    prompt?: string
   }
 
   export type Keyboard = {
diff --git a/packages/extension/src/types/index.ts b/packages/extension/src/types/index.ts
index d325766a9..873289623 100644
--- a/packages/extension/src/types/index.ts
+++ b/packages/extension/src/types/index.ts
@@ -265,6 +265,7 @@ export type PageActionOption = {
   openMode: PAGE_ACTION_OPEN_MODE
   steps: Array<PageActionStep>
   userVariables?: Array<UserVariable>
+  prompt?: string
 }
 
 export type PageActionRecorderOption = {
diff --git a/packages/extension/src/types/schema.test.ts b/packages/extension/src/types/schema.test.ts
index 62ab6d1a9..988845416 100644
--- a/packages/extension/src/types/schema.test.ts
+++ b/packages/extension/src/types/schema.test.ts
@@ -55,3 +55,90 @@ describe("AiPromptOptionSchema", () => {
     }
   })
 })
+
+describe("overrideGlobalIconColor in schemas", () => {
+  it("SC-06: accepts command with overrideGlobalIconColor true and false", () => {
+    const validSearchCmd = {
+      id: "test-cmd",
+      openMode: OPEN_MODE.POPUP,
+      title: "Test Search",
+      iconUrl: "https://example.com/icon.png",
+      searchUrl: "https://example.com/search?q=%s",
+      openModeSecondary: OPEN_MODE.TAB,
+      spaceEncoding: SPACE_ENCODING.PLUS,
+      overrideGlobalIconColor: true,
+    }
+    const res = commandSchema.safeParse(validSearchCmd)
+    expect(res.success).toBe(true)
+    if (res.success) {
+      expect(res.data.overrideGlobalIconColor).toBe(true)
+    }
+
+    const withoutOverride = {
+      ...validSearchCmd,
+      overrideGlobalIconColor: undefined,
+    }
+    const res2 = commandSchema.safeParse(withoutOverride)
+    expect(res2.success).toBe(true)
+  })
+
+  it("SC-07: accepts folder with overrideGlobalIconColor", () => {
+    const validFolder = {
+      id: "test-folder",
+      title: "Test Folder",
+      iconUrl: "https://example.com/folder.png",
+      overrideGlobalIconColor: true,
+    }
+    const res = folderSchema.safeParse(validFolder)
+    expect(res.success).toBe(true)
+    if (res.success) {
+      expect(res.data.overrideGlobalIconColor).toBe(true)
+    }
+  })
+})
+
+describe("PageActionOption in schemas", () => {
+  const basePageActionCmd = {
+    id: "test-pa-cmd",
+    openMode: OPEN_MODE.PAGE_ACTION,
+    title: "Test Page Action",
+    iconUrl: "https://example.com/icon.png",
+    pageActionOption: {
+      startUrl: "https://example.com",
+      openMode: "popup",
+      steps: [],
+    },
+  }
+
+  it("SC-08: accepts PageAction command without prompt field (backward compatibility)", () => {
+    const res = commandSchema.safeParse(basePageActionCmd)
+    expect(res.success).toBe(true)
+  })
+
+  it("SC-09: accepts PageAction command with empty prompt", () => {
+    const res = commandSchema.safeParse({
+      ...basePageActionCmd,
+      pageActionOption: {
+        ...basePageActionCmd.pageActionOption,
+        prompt: "",
+      },
+    })
+    expect(res.success).toBe(true)
+  })
+
+  it("SC-10: accepts PageAction command with configured prompt", () => {
+    const res = commandSchema.safeParse({
+      ...basePageActionCmd,
+      pageActionOption: {
+        ...basePageActionCmd.pageActionOption,
+        prompt: "Summarize: {{SelectedText}}",
+      },
+    })
+    expect(res.success).toBe(true)
+    if (res.success && "pageActionOption" in res.data) {
+      expect((res.data.pageActionOption as any).prompt).toBe(
+        "Summarize: {{SelectedText}}",
+      )
+    }
+  })
+})
diff --git a/packages/extension/src/types/schema.ts b/packages/extension/src/types/schema.ts
index 5ca981696..ab5bdced8 100644
--- a/packages/extension/src/types/schema.ts
+++ b/packages/extension/src/types/schema.ts
@@ -265,6 +265,7 @@ export const PageActionOption = z
     openMode: z.nativeEnum(PAGE_ACTION_OPEN_MODE),
     steps: z.array(PageActionStepSchema),
     userVariables: z.array(userVariableSchema).max(5).optional(),
+    prompt: z.string().optional(),
   })
   .superRefine((data, ctx) => {
     if (data.openMode === PAGE_ACTION_OPEN_MODE.CURRENT_TAB && !data.pageUrl) {
diff --git a/packages/hub/src/types/pageAction.ts b/packages/hub/src/types/pageAction.ts
index 923b43801..cb3dfcf1c 100644
--- a/packages/hub/src/types/pageAction.ts
+++ b/packages/hub/src/types/pageAction.ts
@@ -90,4 +90,5 @@ export type PageActionOption = {
   openMode: PAGE_ACTION_OPEN_MODE
   steps: Array<PageActionStep>
   userVariables?: Array<UserVariable>
+  prompt?: string
 }

From ca6089ead75d90a7d4c59fc80f120973a1af77e1 Mon Sep 17 00:00:00 2001
From: CoffeePatch <coffeepatch@duck.com>
Date: Tue, 15 Sep 2026 09:12:34 +0530
Subject: [PATCH 2/4] feat(pageAction): add Side Panel display mode support to
 Page Action

---
 .../extension/src/action/pageAction.test.ts   | 139 ++++++++++++++++++
 packages/extension/src/action/pageAction.ts   |  46 +++++-
 .../editor/commandChangedDetector.test.ts     |  11 ++
 .../option/field/OpenModeToggleField.test.tsx |  37 +++++
 .../option/field/OpenModeToggleField.tsx      |  23 ++-
 packages/extension/src/services/ipc.ts        |   1 +
 .../pageAction/background-sidePanel.test.ts   |  24 +++
 .../pageAction/background-sidePanel.ts        |   7 +-
 packages/extension/src/types/schema.test.ts   |  38 ++++-
 packages/shared/src/constants/open-mode.ts    |   1 +
 10 files changed, 312 insertions(+), 15 deletions(-)
 create mode 100644 packages/extension/src/components/option/field/OpenModeToggleField.test.tsx

diff --git a/packages/extension/src/action/pageAction.test.ts b/packages/extension/src/action/pageAction.test.ts
index f401ad049..0276f9ea5 100644
--- a/packages/extension/src/action/pageAction.test.ts
+++ b/packages/extension/src/action/pageAction.test.ts
@@ -2,6 +2,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest"
 import { OPEN_MODE, PAGE_ACTION_OPEN_MODE, PAGE_ACTION_EVENT } from "@/const"
 import { PageAction } from "./pageAction"
 import { Ipc, BgCommand } from "@/services/ipc"
+import { Storage, SESSION_STORAGE_KEY } from "@/services/storage"
 
 vi.mock("@/services/ipc", () => ({
   Ipc: {
@@ -9,6 +10,16 @@ vi.mock("@/services/ipc", () => ({
   },
   BgCommand: {
     openAndRunPageAction: "openAndRunPageAction",
+    openSidePanel: "openSidePanel",
+  },
+}))
+
+vi.mock("@/services/storage", () => ({
+  Storage: {
+    set: vi.fn().mockResolvedValue(undefined),
+  },
+  SESSION_STORAGE_KEY: {
+    PA_SIDE_PANEL_PENDING: "PA_SIDE_PANEL_PENDING",
   },
 }))
 
@@ -169,5 +180,133 @@ describe("PageAction.execute", () => {
       }),
     )
   })
+
+  it("PA-05: executes in side panel mode, stores pending action in session storage, and sends openSidePanel IPC", async () => {
+    const sidePanelCommand = {
+      ...baseCommand,
+      pageActionOption: {
+        ...baseCommand.pageActionOption,
+        openMode: PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+      },
+    }
+
+    await PageAction.execute({
+      command: sidePanelCommand as any,
+      selectionText: "side panel content",
+      position: { x: 50, y: 50 },
+      pageUrl: "https://origin.example.com",
+    })
+
+    expect(Storage.set).toHaveBeenCalledWith(
+      SESSION_STORAGE_KEY.PA_SIDE_PANEL_PENDING,
+      expect.objectContaining({
+        url: "https://ai.example.com",
+        steps: sidePanelCommand.pageActionOption.steps,
+        selectedText: "side panel content",
+        srcUrl: "https://origin.example.com",
+        clipboardText: "",
+        useClipboard: false,
+        prompt: "Summarize: {{SelectedText}}",
+      }),
+    )
+
+    expect(Ipc.send).toHaveBeenCalledWith(BgCommand.openSidePanel, {
+      url: "https://ai.example.com",
+    })
+    expect(Ipc.send).not.toHaveBeenCalledWith(
+      BgCommand.openAndRunPageAction,
+      expect.anything(),
+    )
+  })
+
+  it("PA-06: executes in side panel mode even when position is null", async () => {
+    const sidePanelCommand = {
+      ...baseCommand,
+      pageActionOption: {
+        ...baseCommand.pageActionOption,
+        openMode: PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+      },
+    }
+
+    await PageAction.execute({
+      command: sidePanelCommand as any,
+      selectionText: "context menu invocation",
+      position: null,
+    })
+
+    expect(Storage.set).toHaveBeenCalledWith(
+      SESSION_STORAGE_KEY.PA_SIDE_PANEL_PENDING,
+      expect.objectContaining({
+        selectedText: "context menu invocation",
+      }),
+    )
+    expect(Ipc.send).toHaveBeenCalledWith(BgCommand.openSidePanel, {
+      url: "https://ai.example.com",
+    })
+  })
+
+  it("PA-07: executes in side panel mode and detects indirect clipboard usage", async () => {
+    const sidePanelCommand = {
+      ...baseCommand,
+      pageActionOption: {
+        ...baseCommand.pageActionOption,
+        openMode: PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+        prompt: "Translate clipboard: {{Clipboard}}",
+      },
+    }
+
+    await PageAction.execute({
+      command: sidePanelCommand as any,
+      selectionText: "",
+      position: { x: 50, y: 50 },
+    })
+
+    expect(Storage.set).toHaveBeenCalledWith(
+      SESSION_STORAGE_KEY.PA_SIDE_PANEL_PENDING,
+      expect.objectContaining({
+        useClipboard: true,
+        prompt: "Translate clipboard: {{Clipboard}}",
+      }),
+    )
+  })
+
+  it("PA-08: executes in side panel mode without prompt (backward compatibility)", async () => {
+    const sidePanelLegacyCommand = {
+      ...baseCommand,
+      pageActionOption: {
+        startUrl: "https://ai.example.com",
+        openMode: PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+        steps: [
+          {
+            id: "step-1",
+            param: {
+              type: PAGE_ACTION_EVENT.input,
+              label: "Input",
+              selector: "#input",
+              value: "{{SelectedText}}",
+            },
+          },
+        ],
+      },
+    }
+
+    await PageAction.execute({
+      command: sidePanelLegacyCommand as any,
+      selectionText: "legacy text",
+      position: null,
+    })
+
+    expect(Storage.set).toHaveBeenCalledWith(
+      SESSION_STORAGE_KEY.PA_SIDE_PANEL_PENDING,
+      expect.objectContaining({
+        url: "https://ai.example.com",
+        selectedText: "legacy text",
+        prompt: undefined,
+      }),
+    )
+    expect(Ipc.send).toHaveBeenCalledWith(BgCommand.openSidePanel, {
+      url: "https://ai.example.com",
+    })
+  })
 })
 
diff --git a/packages/extension/src/action/pageAction.ts b/packages/extension/src/action/pageAction.ts
index f6f043ed5..e11a80c6c 100644
--- a/packages/extension/src/action/pageAction.ts
+++ b/packages/extension/src/action/pageAction.ts
@@ -1,4 +1,10 @@
-import { Ipc, BgCommand } from "@/services/ipc"
+import {
+  Ipc,
+  BgCommand,
+  SidePanelPendingAction,
+} from "@/services/ipc"
+import type { OpenSidePanelProps } from "@/services/chrome"
+import { Storage, SESSION_STORAGE_KEY } from "@/services/storage"
 import { getWindowPosition } from "@/services/screen"
 import { isValidString, isPageActionCommand } from "@/lib/utils"
 import { PAGE_ACTION_OPEN_MODE, PAGE_ACTION_EVENT } from "@/const"
@@ -30,10 +36,6 @@ export const PageAction = {
       console.error("searchUrl is not valid.")
       return
     }
-    if (position === null) {
-      console.error("position is null.")
-      return
-    }
 
     // Checks if any step directly or indirectly requires clipboard data
     const hasPromptStep = command.pageActionOption.steps.some(
@@ -56,6 +58,40 @@ export const PageAction = {
         )
       })
 
+    // Handle side panel mode: store pending steps in session storage, then open
+    // the side panel. The background onConnect handler will pick up the pending
+    // steps when the side panel content script establishes a port connection.
+    if (command.pageActionOption.openMode === PAGE_ACTION_OPEN_MODE.SIDE_PANEL) {
+      const pending: SidePanelPendingAction = {
+        url: command.pageActionOption.startUrl,
+        steps: command.pageActionOption.steps,
+        selectedText: selectionText,
+        srcUrl: pageUrl ?? "",
+        clipboardText: "",
+        useClipboard: needClipboard || (useClipboard ?? false),
+        prompt: command.pageActionOption.prompt,
+        userVariables: userVariables ?? command.pageActionOption.userVariables,
+      }
+      try {
+        await Storage.set<SidePanelPendingAction>(
+          SESSION_STORAGE_KEY.PA_SIDE_PANEL_PENDING,
+          pending,
+        )
+      } catch (e) {
+        console.error("Failed to store pending side panel action:", e)
+        return
+      }
+      Ipc.send<OpenSidePanelProps>(BgCommand.openSidePanel, {
+        url: command.pageActionOption.startUrl,
+      })
+      return
+    }
+
+    if (position === null) {
+      console.error("position is null.")
+      return
+    }
+
     const url: UrlParam = {
       searchUrl: command.pageActionOption.startUrl,
       selectionText,
diff --git a/packages/extension/src/components/option/editor/commandChangedDetector.test.ts b/packages/extension/src/components/option/editor/commandChangedDetector.test.ts
index f088fdef2..f1660864e 100644
--- a/packages/extension/src/components/option/editor/commandChangedDetector.test.ts
+++ b/packages/extension/src/components/option/editor/commandChangedDetector.test.ts
@@ -116,6 +116,17 @@ describe("hasCommandChanged", () => {
           "",
         ),
       ).toBe(false)
+      expect(
+        hasCommandChanged(
+          cmd,
+          "",
+          {
+            ...cmd.pageActionOption,
+            openMode: PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+          },
+          "",
+        ),
+      ).toBe(false)
     })
 
     it("returns false when prompt is unchanged or empty/undefined equivalent", () => {
diff --git a/packages/extension/src/components/option/field/OpenModeToggleField.test.tsx b/packages/extension/src/components/option/field/OpenModeToggleField.test.tsx
new file mode 100644
index 000000000..076d0372a
--- /dev/null
+++ b/packages/extension/src/components/option/field/OpenModeToggleField.test.tsx
@@ -0,0 +1,37 @@
+import { describe, it, expect } from "vitest"
+import { OPEN_MODE, PAGE_ACTION_OPEN_MODE } from "@/const"
+import {
+  PAGE_ACTION_MODES,
+  SEARCH_MODES,
+} from "./OpenModeToggleField"
+
+describe("OpenModeToggleField modes", () => {
+  it("OM-01: PAGE_ACTION_MODES includes SIDE_PANEL in non-Edge environment", () => {
+    expect(PAGE_ACTION_MODES).toContain(PAGE_ACTION_OPEN_MODE.SIDE_PANEL)
+    expect(PAGE_ACTION_MODES).toEqual([
+      PAGE_ACTION_OPEN_MODE.POPUP,
+      PAGE_ACTION_OPEN_MODE.WINDOW,
+      PAGE_ACTION_OPEN_MODE.TAB,
+      PAGE_ACTION_OPEN_MODE.BACKGROUND_TAB,
+      PAGE_ACTION_OPEN_MODE.CURRENT_TAB,
+      PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+    ])
+  })
+
+  it("OM-02: SEARCH_MODES includes SIDE_PANEL in non-Edge environment", () => {
+    expect(SEARCH_MODES).toContain(OPEN_MODE.SIDE_PANEL)
+    expect(SEARCH_MODES).toEqual([
+      OPEN_MODE.POPUP,
+      OPEN_MODE.WINDOW,
+      OPEN_MODE.TAB,
+      OPEN_MODE.BACKGROUND_TAB,
+      OPEN_MODE.SIDE_PANEL,
+    ])
+  })
+
+  it("OM-03: PAGE_ACTION_OPEN_MODE.SIDE_PANEL equals OPEN_MODE.SIDE_PANEL", () => {
+    expect(PAGE_ACTION_OPEN_MODE.SIDE_PANEL).toBe(OPEN_MODE.SIDE_PANEL)
+    expect(PAGE_ACTION_OPEN_MODE.SIDE_PANEL).toBe("sidePanel")
+  })
+})
+
diff --git a/packages/extension/src/components/option/field/OpenModeToggleField.tsx b/packages/extension/src/components/option/field/OpenModeToggleField.tsx
index 953ed6d43..cbb0a5131 100644
--- a/packages/extension/src/components/option/field/OpenModeToggleField.tsx
+++ b/packages/extension/src/components/option/field/OpenModeToggleField.tsx
@@ -15,8 +15,10 @@ import { cn } from "@/lib/utils"
 import { t as _t } from "@/services/i18n"
 
 const isEdge =
-  Bowser.getParser(window.navigator.userAgent).getBrowserName() ===
-  "Microsoft Edge"
+  typeof window !== "undefined" && Boolean(window.navigator?.userAgent)
+    ? Bowser.getParser(window.navigator.userAgent).getBrowserName() ===
+      "Microsoft Edge"
+    : false
 
 const t = (key: string, p?: string[]) => _t(`Option_${key}`, p)
 
@@ -40,14 +42,17 @@ const getIconForMode = (mode: string) => {
   if (mode === PAGE_ACTION_OPEN_MODE.CURRENT_TAB) {
     return "/setting/open_mode/currentTab.png"
   }
-  if (mode === OPEN_MODE.SIDE_PANEL) {
+  if (
+    mode === OPEN_MODE.SIDE_PANEL ||
+    mode === PAGE_ACTION_OPEN_MODE.SIDE_PANEL
+  ) {
     return "/setting/open_mode/side_panel.png"
   }
   return "/setting/open_mode/popup.png"
 }
 
 // Order of options (SidePanel is not supported on Microsoft Edge)
-const SEARCH_MODES = [
+export const SEARCH_MODES = [
   OPEN_MODE.POPUP,
   OPEN_MODE.WINDOW,
   OPEN_MODE.TAB,
@@ -55,13 +60,14 @@ const SEARCH_MODES = [
   ...(isEdge ? [] : [OPEN_MODE.SIDE_PANEL]),
 ]
 
-const PAGE_ACTION_MODES = [
+export const PAGE_ACTION_MODES = [
   PAGE_ACTION_OPEN_MODE.POPUP,
   PAGE_ACTION_OPEN_MODE.WINDOW,
   PAGE_ACTION_OPEN_MODE.TAB,
   PAGE_ACTION_OPEN_MODE.BACKGROUND_TAB,
   PAGE_ACTION_OPEN_MODE.CURRENT_TAB,
-] as const
+  ...(isEdge ? [] : [PAGE_ACTION_OPEN_MODE.SIDE_PANEL]),
+]
 
 type OpenModeToggleFieldProps = {
   control: any
@@ -105,7 +111,10 @@ export const OpenModeToggleField = ({
                 onValueChange={(val) => {
                   if (val) field.onChange(val)
                 }}
-                className="grid grid-cols-5 gap-2 py-1"
+                className={cn(
+                  "grid gap-2 py-1",
+                  modes.length >= 6 ? "grid-cols-6" : "grid-cols-5",
+                )}
               >
                 {modes.map((mode) => {
                   const iconSrc = getIconForMode(mode)
diff --git a/packages/extension/src/services/ipc.ts b/packages/extension/src/services/ipc.ts
index 9fdb46150..26e561399 100644
--- a/packages/extension/src/services/ipc.ts
+++ b/packages/extension/src/services/ipc.ts
@@ -104,6 +104,7 @@ export type SidePanelPendingAction = {
   pageHtml?: string
   selectionHtml?: string
   prompt?: string
+  userVariables?: Array<UserVariable>
 }
 
 export namespace ExecPageAction {
diff --git a/packages/extension/src/services/pageAction/background-sidePanel.test.ts b/packages/extension/src/services/pageAction/background-sidePanel.test.ts
index 3c17fa6a0..a75d1b9e5 100644
--- a/packages/extension/src/services/pageAction/background-sidePanel.test.ts
+++ b/packages/extension/src/services/pageAction/background-sidePanel.test.ts
@@ -245,6 +245,30 @@ describe("background.ts - Side Panel Connection", () => {
       )
     })
 
+    it("SP-08d: Includes prompt and userVariables in the message when provided in pending action", async () => {
+      const port = createMockPort("https://chatgpt.com")
+      const pending = {
+        ...createPendingAction(),
+        prompt: "Summarize this: {{SelectedText}}",
+        userVariables: [{ name: "myVar", value: "myVal" }],
+      }
+      mockStorage.get.mockResolvedValue(pending)
+      mockStorage.set.mockResolvedValue(undefined)
+
+      await handleSidePanelConnect(port as any)
+
+      expect(port.postMessage).toHaveBeenCalledWith(
+        expect.objectContaining({
+          command: "execPageAction",
+          param: expect.objectContaining({
+            step: pending.steps[0],
+            prompt: "Summarize this: {{SelectedText}}",
+            userVariables: [{ name: "myVar", value: "myVal" }],
+          }),
+        }),
+      )
+    })
+
     it("SP-12: Does not call readClipboard when useClipboard is false", async () => {
       const port = createMockPort("https://chatgpt.com")
       const pending = { ...createPendingAction(), useClipboard: false }
diff --git a/packages/extension/src/services/pageAction/background-sidePanel.ts b/packages/extension/src/services/pageAction/background-sidePanel.ts
index e7aa82200..3a8e37054 100644
--- a/packages/extension/src/services/pageAction/background-sidePanel.ts
+++ b/packages/extension/src/services/pageAction/background-sidePanel.ts
@@ -33,6 +33,7 @@ export const runViaPort = (
     pageHtml,
     selectionHtml,
     prompt,
+    userVariables,
   } = param
 
   const executeStep = (
@@ -59,7 +60,7 @@ export const runViaPort = (
             selectedText,
             clipboardText,
             openMode: PAGE_ACTION_OPEN_MODE.TAB,
-            userVariables: [],
+            userVariables: userVariables || [],
             pageHtml: stepPageHtml,
             selectionHtml: stepSelectionHtml,
             prompt,
@@ -95,7 +96,7 @@ export const runViaPort = (
           selectedText,
           clipboardText,
           openMode: PAGE_ACTION_OPEN_MODE.TAB,
-          userVariables: [],
+          userVariables: userVariables || [],
           pageHtml: stepPageHtml,
           selectionHtml: stepSelectionHtml,
           prompt,
@@ -278,5 +279,7 @@ export const handleSidePanelOpened = async (): Promise<void> => {
     selectedText: pending.selectedText,
     srcUrl: pending.srcUrl,
     clipboardText: pending.clipboardText,
+    prompt: pending.prompt,
+    userVariables: pending.userVariables,
   })
 }
diff --git a/packages/extension/src/types/schema.test.ts b/packages/extension/src/types/schema.test.ts
index 988845416..7e4f80c65 100644
--- a/packages/extension/src/types/schema.test.ts
+++ b/packages/extension/src/types/schema.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest"
 import { AiPromptOptionSchema } from "./schema"
 import { INSERT, toInsertTemplate } from "@/services/pageAction"
-import { OPEN_MODE } from "@shared/constants/open-mode"
+import { OPEN_MODE, PAGE_ACTION_OPEN_MODE, SPACE_ENCODING } from "@/const"
 
 const baseOption = {
   serviceId: "chatgpt",
@@ -141,4 +141,40 @@ describe("PageActionOption in schemas", () => {
       )
     }
   })
+
+  it("SC-11: accepts PageAction command with openMode SIDE_PANEL", () => {
+    const res = commandSchema.safeParse({
+      ...basePageActionCmd,
+      pageActionOption: {
+        ...basePageActionCmd.pageActionOption,
+        openMode: PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+      },
+    })
+    expect(res.success).toBe(true)
+    if (res.success && "pageActionOption" in res.data) {
+      expect((res.data.pageActionOption as any).openMode).toBe(
+        PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+      )
+    }
+  })
+
+  it("SC-12: accepts PageAction command with openMode SIDE_PANEL and configured prompt", () => {
+    const res = commandSchema.safeParse({
+      ...basePageActionCmd,
+      pageActionOption: {
+        ...basePageActionCmd.pageActionOption,
+        openMode: PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+        prompt: "Explain {{SelectedText}} in detail",
+      },
+    })
+    expect(res.success).toBe(true)
+    if (res.success && "pageActionOption" in res.data) {
+      expect((res.data.pageActionOption as any).openMode).toBe(
+        PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+      )
+      expect((res.data.pageActionOption as any).prompt).toBe(
+        "Explain {{SelectedText}} in detail",
+      )
+    }
+  })
 })
diff --git a/packages/shared/src/constants/open-mode.ts b/packages/shared/src/constants/open-mode.ts
index b7ca873c6..6cb11913f 100644
--- a/packages/shared/src/constants/open-mode.ts
+++ b/packages/shared/src/constants/open-mode.ts
@@ -40,4 +40,5 @@ export enum PAGE_ACTION_OPEN_MODE {
   BACKGROUND_TAB = OPEN_MODE.BACKGROUND_TAB,
   WINDOW = OPEN_MODE.WINDOW,
   CURRENT_TAB = "currentTab",
+  SIDE_PANEL = OPEN_MODE.SIDE_PANEL,
 }

From 34b3583106606dd84614e871b04462b1b4bd3cda Mon Sep 17 00:00:00 2001
From: CoffeePatch <coffeepatch@duck.com>
Date: Tue, 15 Sep 2026 09:12:34 +0530
Subject: [PATCH 3/4] feat: add side panel support to page actions

---
 .../pageAction/background-sidePanel.test.ts   | 30 +++++++++++++++++++
 .../services/storage/commandStorage.test.ts   | 27 ++++++++++++++++-
 2 files changed, 56 insertions(+), 1 deletion(-)

diff --git a/packages/extension/src/services/pageAction/background-sidePanel.test.ts b/packages/extension/src/services/pageAction/background-sidePanel.test.ts
index a75d1b9e5..2d661e7ec 100644
--- a/packages/extension/src/services/pageAction/background-sidePanel.test.ts
+++ b/packages/extension/src/services/pageAction/background-sidePanel.test.ts
@@ -398,5 +398,35 @@ describe("background.ts - Side Panel Connection", () => {
         }),
       )
     })
+
+    it("SP-15: Passes prompt and userVariables when handleSidePanelOpened navigates", async () => {
+      const port = createMockPort("https://chatgpt.com")
+      const tabId = 42
+      registerSidePanelTab(tabId, "https://chatgpt.com")
+      await handleSidePanelConnect(port as any)
+
+      const targetUrl = "https://gemini.google.com"
+      mockStorage.get.mockResolvedValue({
+        url: targetUrl,
+        steps: [{ id: "s", param: { type: "click" }, delayMs: 0 }],
+        selectedText: "test selection",
+        srcUrl: "https://src.example.com",
+        clipboardText: "test clipboard",
+        prompt: "Explain: {{SelectedText}}",
+        userVariables: [{ name: "var1", value: "val1" }],
+      })
+
+      await handleSidePanelOpened()
+
+      expect(port.postMessage).toHaveBeenCalledWith(
+        expect.objectContaining({
+          command: "execPageAction",
+          param: expect.objectContaining({
+            prompt: "Explain: {{SelectedText}}",
+            userVariables: [{ name: "var1", value: "val1" }],
+          }),
+        }),
+      )
+    })
   })
 })
diff --git a/packages/extension/src/services/storage/commandStorage.test.ts b/packages/extension/src/services/storage/commandStorage.test.ts
index b5c38aae9..64376f243 100644
--- a/packages/extension/src/services/storage/commandStorage.test.ts
+++ b/packages/extension/src/services/storage/commandStorage.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect, vi, beforeEach } from "vitest"
 import { Command } from "@/types"
 import { CommandMetadata, GlobalCommandMetadata } from "@/types/command"
-import { OPEN_MODE } from "@/const"
+import { OPEN_MODE, PAGE_ACTION_OPEN_MODE } from "@/const"
 import {
   CMD_PREFIX,
   STORAGE_KEY,
@@ -262,6 +262,31 @@ describe("CommandStorage actual implementation tests", () => {
         expect(afterCommandKeys.length).toBe(2)
       })
 
+      it("CS-01-b: should save and restore PageAction command with Side Panel openMode", async () => {
+        const pageActionCommand: Command = {
+          id: "pa-side-panel",
+          title: "Page Action Side Panel",
+          openMode: OPEN_MODE.PAGE_ACTION,
+          pageActionOption: {
+            startUrl: "https://chatgpt.com",
+            openMode: PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+            steps: [],
+            prompt: "Summarize: {{SelectedText}}",
+          },
+        } as any
+
+        await commandStorge.saveCommands([pageActionCommand])
+        const loaded = await commandStorge.loadCommands()
+        expect(loaded).toHaveLength(1)
+        expect(loaded[0].id).toBe("pa-side-panel")
+        expect((loaded[0] as any).pageActionOption.openMode).toBe(
+          PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
+        )
+        expect((loaded[0] as any).pageActionOption.prompt).toBe(
+          "Summarize: {{SelectedText}}",
+        )
+      })
+
       it("CS-02: should handle save errors", async () => {
         const commands = [createCommand("1")]
 

From b5cafa3fbc7e9c7f03c7444b0615d73df18c1974 Mon Sep 17 00:00:00 2001
From: CoffeePatch <coffeepatch@duck.com>
Date: Tue, 15 Sep 2026 09:12:34 +0530
Subject: [PATCH 4/4] test: align schema tests with page action changes

---
 packages/extension/src/types/schema.test.ts | 59 ++++-----------------
 1 file changed, 9 insertions(+), 50 deletions(-)

diff --git a/packages/extension/src/types/schema.test.ts b/packages/extension/src/types/schema.test.ts
index 7e4f80c65..77536cab1 100644
--- a/packages/extension/src/types/schema.test.ts
+++ b/packages/extension/src/types/schema.test.ts
@@ -1,7 +1,7 @@
 import { describe, it, expect } from "vitest"
-import { AiPromptOptionSchema } from "./schema"
+import { AiPromptOptionSchema, commandSchema } from "./schema"
 import { INSERT, toInsertTemplate } from "@/services/pageAction"
-import { OPEN_MODE, PAGE_ACTION_OPEN_MODE, SPACE_ENCODING } from "@/const"
+import { OPEN_MODE, PAGE_ACTION_OPEN_MODE } from "@/const"
 
 const baseOption = {
   serviceId: "chatgpt",
@@ -56,47 +56,6 @@ describe("AiPromptOptionSchema", () => {
   })
 })
 
-describe("overrideGlobalIconColor in schemas", () => {
-  it("SC-06: accepts command with overrideGlobalIconColor true and false", () => {
-    const validSearchCmd = {
-      id: "test-cmd",
-      openMode: OPEN_MODE.POPUP,
-      title: "Test Search",
-      iconUrl: "https://example.com/icon.png",
-      searchUrl: "https://example.com/search?q=%s",
-      openModeSecondary: OPEN_MODE.TAB,
-      spaceEncoding: SPACE_ENCODING.PLUS,
-      overrideGlobalIconColor: true,
-    }
-    const res = commandSchema.safeParse(validSearchCmd)
-    expect(res.success).toBe(true)
-    if (res.success) {
-      expect(res.data.overrideGlobalIconColor).toBe(true)
-    }
-
-    const withoutOverride = {
-      ...validSearchCmd,
-      overrideGlobalIconColor: undefined,
-    }
-    const res2 = commandSchema.safeParse(withoutOverride)
-    expect(res2.success).toBe(true)
-  })
-
-  it("SC-07: accepts folder with overrideGlobalIconColor", () => {
-    const validFolder = {
-      id: "test-folder",
-      title: "Test Folder",
-      iconUrl: "https://example.com/folder.png",
-      overrideGlobalIconColor: true,
-    }
-    const res = folderSchema.safeParse(validFolder)
-    expect(res.success).toBe(true)
-    if (res.success) {
-      expect(res.data.overrideGlobalIconColor).toBe(true)
-    }
-  })
-})
-
 describe("PageActionOption in schemas", () => {
   const basePageActionCmd = {
     id: "test-pa-cmd",
@@ -135,8 +94,8 @@ describe("PageActionOption in schemas", () => {
       },
     })
     expect(res.success).toBe(true)
-    if (res.success && "pageActionOption" in res.data) {
-      expect((res.data.pageActionOption as any).prompt).toBe(
+    if (res.success && res.data.openMode === OPEN_MODE.PAGE_ACTION) {
+      expect(res.data.pageActionOption.prompt).toBe(
         "Summarize: {{SelectedText}}",
       )
     }
@@ -151,8 +110,8 @@ describe("PageActionOption in schemas", () => {
       },
     })
     expect(res.success).toBe(true)
-    if (res.success && "pageActionOption" in res.data) {
-      expect((res.data.pageActionOption as any).openMode).toBe(
+    if (res.success && res.data.openMode === OPEN_MODE.PAGE_ACTION) {
+      expect(res.data.pageActionOption.openMode).toBe(
         PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
       )
     }
@@ -168,11 +127,11 @@ describe("PageActionOption in schemas", () => {
       },
     })
     expect(res.success).toBe(true)
-    if (res.success && "pageActionOption" in res.data) {
-      expect((res.data.pageActionOption as any).openMode).toBe(
+    if (res.success && res.data.openMode === OPEN_MODE.PAGE_ACTION) {
+      expect(res.data.pageActionOption.openMode).toBe(
         PAGE_ACTION_OPEN_MODE.SIDE_PANEL,
       )
-      expect((res.data.pageActionOption as any).prompt).toBe(
+      expect(res.data.pageActionOption.prompt).toBe(
         "Explain {{SelectedText}} in detail",
       )
     }