ujiro99 · ujiro99 · Sep 23, 2026 · Sep 13, 2026 · Sep 13, 2026 · Sep 13, 2026
diff --git a/AGENTS.md b/AGENTS.md
@@ -118,7 +118,8 @@ yarn dev                   # watch モード
 
 1. **型システム共有**: SharedパッケージでBaseCommandなどの基本型を定義し、ExtensionとHubで拡張
 2. **AIサービス定義**: `packages/hub/public/data/ai-services.json` を Extension がビルド時/実行時の両方で参照
-3. **e2eテスト**: `packages/hub` がデプロイする `/en/test` ページを Extension の Playwright テストが利用
+3. **ABテスト配分設定**: `packages/hub/public/data/experiments.json` を Extension が実行時に参照し、オンボーディング等のABテストの配分比率を制御
+4. **e2eテスト**: `packages/hub` がデプロイする `/en/test` ページを Extension の Playwright テストが利用
 
 ### Chrome拡張機能の構造 (packages/extension)
 
@@ -188,7 +189,7 @@ interface PageActionOption {
 **Hub開発:**
 
 - Hub は縮小版のため新機能は追加しない。コマンド共有プラットフォームとしての機能拡張は新リポジトリ（selection-command-hub）側で行う
-- `ai-services.json` とテストページの変更時は Extension 側への影響を確認すること
+- `ai-services.json` / `experiments.json` とテストページの変更時は Extension 側への影響を確認すること
 
 **テスト:**
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "selection-command-monorepo",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": true,
   "description": "Selection Command - Monorepo for Chrome Extension and Hub",
   "author": "ujiro99",

diff --git a/packages/extension/e2e/data/test-settings.json b/packages/extension/e2e/data/test-settings.json
@@ -442,6 +442,110 @@
         ]
       },
       "revision": 0
+    },
+    {
+      "id": "cmd-test-pa-user-variable-builtins",
+      "title": "User Variable with Built-ins",
+      "openMode": "pageAction",
+      "parentFolderId": "0f2167ab-2e1b-4972-954c-71eec058ab14",
+      "pageActionOption": {
+        "openMode": "tab",
+        "startUrl": "https://ujiro99.github.io/selection-command/en/test",
+        "userVariables": [
+          {
+            "name": "Prompt",
+            "value": "Selected: {{SelectedText}} / Source: {{Url}}"
+          }
+        ],
+        "steps": [
+          {
+            "delayMs": 0,
+            "id": "pa-user-builtins-s1",
+            "param": {
+              "label": "Start",
+              "type": "start",
+              "url": "https://ujiro99.github.io/selection-command/en/test"
+            },
+            "skipRenderWait": false
+          },
+          {
+            "delayMs": 500,
+            "id": "pa-user-builtins-s2",
+            "param": {
+              "label": "Text input",
+              "selector": "//input[@placeholder='text input']",
+              "selectorType": "xpath",
+              "type": "input",
+              "value": "{{Prompt}}"
+            },
+            "skipRenderWait": false
+          },
+          {
+            "delayMs": 0,
+            "id": "pa-user-builtins-s3",
+            "param": {
+              "label": "End",
+              "type": "end"
+            },
+            "skipRenderWait": false
+          }
+        ]
+      },
+      "revision": 0
+    },
+    {
+      "id": "cmd-test-pa-nested-user-variables",
+      "title": "Nested User Variables",
+      "openMode": "pageAction",
+      "parentFolderId": "0f2167ab-2e1b-4972-954c-71eec058ab14",
+      "pageActionOption": {
+        "openMode": "tab",
+        "startUrl": "https://ujiro99.github.io/selection-command/en/test",
+        "userVariables": [
+          {
+            "name": "Topic",
+            "value": "Topic: {{SelectedText}}"
+          },
+          {
+            "name": "Prompt",
+            "value": "Explain {{Topic}}"
+          }
+        ],
+        "steps": [
+          {
+            "delayMs": 0,
+            "id": "pa-nested-user-variables-s1",
+            "param": {
+              "label": "Start",
+              "type": "start",
+              "url": "https://ujiro99.github.io/selection-command/en/test"
+            },
+            "skipRenderWait": false
+          },
+          {
+            "delayMs": 500,
+            "id": "pa-nested-user-variables-s2",
+            "param": {
+              "label": "Text input",
+              "selector": "//input[@placeholder='text input']",
+              "selectorType": "xpath",
+              "type": "input",
+              "value": "{{Prompt}}"
+            },
+            "skipRenderWait": false
+          },
+          {
+            "delayMs": 0,
+            "id": "pa-nested-user-variables-s3",
+            "param": {
+              "label": "End",
+              "type": "end"
+            },
+            "skipRenderWait": false
+          }
+        ]
+      },
+      "revision": 0
     }
   ],
   "folders": [

diff --git a/packages/extension/e2e/generated-command-urls.ts b/packages/extension/e2e/generated-command-urls.ts
@@ -12,35 +12,35 @@ export const COMMAND_URLS: UrlEntry[] = [
   { title: "Netflix", locale: "en", searchUrl: "https://www.netflix.com/search?q=%s" },
   { title: "Pinterest", locale: "en", searchUrl: "https://www.pinterest.com/search/pins/?q=%s" },
   { title: "Drive", locale: "en", searchUrl: "https://drive.google.com/drive/search?q=%s" },
-  { title: "Search Commands on Hub", locale: "en", searchUrl: "https://selection-command.com/en?q=%pageUrl" },
+  { title: "Search Commands on Hub", locale: "en", searchUrl: "https://selection-command.com/en/commands?q=%pageUrl" },
   { title: "Amazon", locale: "ja", searchUrl: "https://www.amazon.co.jp/s?k=%s" },
   { title: "Yahoo! Japan", locale: "ja", searchUrl: "https://search.yahoo.co.jp/search?p=%s" },
   { title: "en to ja", locale: "ja", searchUrl: "https://translate.google.co.jp/?hl=ja&sl=auto&text=%s&op=translate" },
-  { title: "コマンドをHubで検索", locale: "ja", searchUrl: "https://selection-command.com/ja?q=%pageUrl" },
+  { title: "コマンドをHubで検索", locale: "ja", searchUrl: "https://selection-command.com/ja/commands?q=%pageUrl" },
   { title: "百度", locale: "zh", searchUrl: "https://www.baidu.com/s?wd=%s" },
   { title: "京东", locale: "zh", searchUrl: "https://search.jd.com/Search?keyword=%s" },
   { title: "哔哩哔哩", locale: "zh", searchUrl: "https://search.bilibili.com/all?keyword=%s" },
-  { title: "在 Hub 中搜索命令", locale: "zh", searchUrl: "https://selection-command.com/zh-CN?q=%pageUrl" },
+  { title: "在 Hub 中搜索命令", locale: "zh", searchUrl: "https://selection-command.com/zh-CN/commands?q=%pageUrl" },
   { title: "네이버", locale: "ko", searchUrl: "https://search.naver.com/search.naver?query=%s" },
-  { title: "Hub에서 명령어 검색", locale: "ko", searchUrl: "https://selection-command.com/ko?q=%pageUrl" },
+  { title: "Hub에서 명령어 검색", locale: "ko", searchUrl: "https://selection-command.com/ko/commands?q=%pageUrl" },
   { title: "Яндекс", locale: "ru", searchUrl: "https://yandex.ru/search/?text=%s" },
   { title: "ВКонтакте", locale: "ru", searchUrl: "https://vk.com/search?c%5Bq%5D=%s" },
-  { title: "Поиск команд в Hub", locale: "ru", searchUrl: "https://selection-command.com/ru?q=%pageUrl" },
-  { title: "Befehle im Hub suchen", locale: "de", searchUrl: "https://selection-command.com/de?q=%pageUrl" },
-  { title: "Rechercher des commandes sur Hub", locale: "fr", searchUrl: "https://selection-command.com/fr?q=%pageUrl" },
+  { title: "Поиск команд в Hub", locale: "ru", searchUrl: "https://selection-command.com/ru/commands?q=%pageUrl" },
+  { title: "Befehle im Hub suchen", locale: "de", searchUrl: "https://selection-command.com/de/commands?q=%pageUrl" },
+  { title: "Rechercher des commandes sur Hub", locale: "fr", searchUrl: "https://selection-command.com/fr/commands?q=%pageUrl" },
   { title: "Amazon", locale: "es", searchUrl: "https://www.amazon.es/s?k=%s" },
   { title: "El Corte Inglés", locale: "es", searchUrl: "https://www.elcorteingles.es/search-nwx/?s=%s" },
   { title: "AliExpress", locale: "es", searchUrl: "https://es.aliexpress.com/w/wholesale-%s.html" },
-  { title: "Buscar comandos en Hub", locale: "es", searchUrl: "https://selection-command.com/es?q=%pageUrl" },
-  { title: "Pesquisar comandos no Hub", locale: "pt-br", searchUrl: "https://selection-command.com/pt-BR?q=%pageUrl" },
-  { title: "Pesquisar comandos no Hub", locale: "pt", searchUrl: "https://selection-command.com/pt-PT?q=%pageUrl" },
-  { title: "Hub पर कमांड खोजें", locale: "hi", searchUrl: "https://selection-command.com/hi?q=%pageUrl" },
+  { title: "Buscar comandos en Hub", locale: "es", searchUrl: "https://selection-command.com/es/commands?q=%pageUrl" },
+  { title: "Pesquisar comandos no Hub", locale: "pt-br", searchUrl: "https://selection-command.com/pt-BR/commands?q=%pageUrl" },
+  { title: "Pesquisar comandos no Hub", locale: "pt", searchUrl: "https://selection-command.com/pt-PT/commands?q=%pageUrl" },
+  { title: "Hub पर कमांड खोजें", locale: "hi", searchUrl: "https://selection-command.com/hi/commands?q=%pageUrl" },
   { title: "Tokopedia", locale: "id", searchUrl: "https://www.tokopedia.com/search?st=product&q=%s" },
   { title: "Shopee", locale: "id", searchUrl: "https://shopee.co.id/search?keyword=%s" },
-  { title: "Cari Perintah di Hub", locale: "id", searchUrl: "https://selection-command.com/id?q=%pageUrl" },
+  { title: "Cari Perintah di Hub", locale: "id", searchUrl: "https://selection-command.com/id/commands?q=%pageUrl" },
   { title: "Shopee", locale: "ms", searchUrl: "https://shopee.com.my/search?keyword=%s" },
   { title: "Lazada", locale: "ms", searchUrl: "https://www.lazada.com.my/catalog/?q=%s" },
-  { title: "Cari Perintah di Hub", locale: "ms", searchUrl: "https://selection-command.com/ms?q=%pageUrl" },
+  { title: "Cari Perintah di Hub", locale: "ms", searchUrl: "https://selection-command.com/ms/commands?q=%pageUrl" },
   { title: "Zalando.it", locale: "it", searchUrl: "https://www.zalando.it/catalogo/?q=%s" },
-  { title: "Cerca comandi su Hub", locale: "it", searchUrl: "https://selection-command.com/it?q=%pageUrl" },
+  { title: "Cerca comandi su Hub", locale: "it", searchUrl: "https://selection-command.com/it/commands?q=%pageUrl" },
 ]
diff --git a/packages/extension/e2e/hub.spec.ts b/packages/extension/e2e/hub.spec.ts
@@ -226,7 +226,7 @@ test.describe("Command Hub", () => {
 
     // Assert: navigated to the Hub search page with the visited page's URL as the query.
     const hubUrl = new URL(hubPage.url())
-    expect(hubUrl.origin + hubUrl.pathname).toBe(`${NEW_HUB_URL}/ja`)
+    expect(hubUrl.origin + hubUrl.pathname).toBe(`${NEW_HUB_URL}/ja/commands`)
     expect(hubUrl.searchParams.get("q")).toBe(targetUrl)
 
     // Assert: results are not limited to a single ("News") command — Google and

diff --git a/packages/extension/e2e/onboarding-shots.spec.ts b/packages/extension/e2e/onboarding-shots.spec.ts
@@ -19,14 +19,20 @@ const pathToExtension = path.join(__dirname, "../dist")
 
 type Shot = {
   name: string
-  step: keyof typeof OnboardingStep
+  // Omitted for shots that should open on whichever screen the variant
+  // starts at (e.g. variant B's welcome overlay).
+  step?: keyof typeof OnboardingStep
   phase?: StepPhase
+  variant?: "A" | "B"
 }
 
 // One shot per visually distinct screen - not one per StepPhase transition;
 // e.g. Step2's WAIT_EXECUTE looks like Step1's, so only Step1 gets it.
 const SHOTS: Shot[] = [
   { name: "00-intro", step: "INTRO" },
+  // Variant B of the onboarding A/B test (see services/experiments): no
+  // INTRO step, a brief welcome overlay in front of the first step instead.
+  { name: "00b-welcome-variant-b", variant: "B" },
   { name: "01-search-explain", step: "SEARCH", phase: StepPhase.EXPLAIN },
   {
     name: "02-search-wait-execute",
@@ -90,8 +96,10 @@ test.describe("onboarding screenshots (design review)", () => {
         fs.mkdirSync(outDir, { recursive: true })
 
         for (const shot of SHOTS) {
-          const params = new URLSearchParams({ step: shot.step })
+          const params = new URLSearchParams()
+          if (shot.step) params.set("step", shot.step)
           if (shot.phase) params.set("phase", shot.phase)
+          if (shot.variant) params.set("variant", shot.variant)
           await page.goto(
             `chrome-extension://${extensionId}/src/onboarding_page.html?${params}`,
           )

diff --git a/packages/extension/e2e/page-action.spec.ts b/packages/extension/e2e/page-action.spec.ts
@@ -53,6 +53,27 @@ async function openRecorder(
   return { optionsPage, recorderPage, completeButton }
 }
 
+async function runActionCommand(
+  context: BrowserContext,
+  page: Page,
+  commandTitle: string,
+): Promise<Page> {
+  const testPage = new TestPage(page)
+  await testPage.open()
+  await testPage.selectText("//h2[contains(text(), 'Browser')]")
+
+  const menubar = await testPage.getMenuBar()
+  await menubar.locator('[title="Action"]').hover()
+
+  const [actionPage] = await Promise.all([
+    context.waitForEvent("page", { timeout: 5000 }),
+    page.locator(`[role='menuitem'][aria-label='${commandTitle}']`).click(),
+  ])
+  await actionPage.waitForLoadState("domcontentloaded")
+
+  return actionPage
+}
+
 test.describe("PageAction Commands", () => {
   test.beforeEach(async ({ context, extensionId, getCommands }) => {
     const optionsPage = new OptionsPage(context, extensionId, getCommands)
@@ -290,4 +311,44 @@ test.describe("PageAction Commands", () => {
       waitUntil: "domcontentloaded",
     })
   })
+
+  /**
+   * E2E-47: Verify that built-in variables referenced by a user variable are
+   * expanded when the PageAction input step executes.
+   */
+  test("E2E-47: PageAction expands built-in variables in a user variable", async ({
+    context,
+    page,
+  }) => {
+    const actionPage = await runActionCommand(
+      context,
+      page,
+      "User Variable with Built-ins",
+    )
+
+    await expect(
+      actionPage.locator('input[placeholder="text input"]'),
+    ).toHaveValue(`Selected: Browser / Source: ${TEST_URL}`, {
+      timeout: 10_000,
+    })
+  })
+
+  /**
+   * E2E-48: Verify that a user variable can reference user variables defined
+   * before it and that the fully expanded value reaches the input step.
+   */
+  test("E2E-48: PageAction expands preceding user variables", async ({
+    context,
+    page,
+  }) => {
+    const actionPage = await runActionCommand(
+      context,
+      page,
+      "Nested User Variables",
+    )
+
+    await expect(
+      actionPage.locator('input[placeholder="text input"]'),
+    ).toHaveValue("Explain Topic: Browser", { timeout: 10_000 })
+  })
 })
diff --git a/packages/extension/manifest.json b/packages/extension/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "__MSG_extName__",
   "description": "__MSG_extDescription__",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "default_locale": "en",
   "icons": {
     "128": "icon128.png"

diff --git a/packages/extension/package.json b/packages/extension/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@selection-command/extension",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "private": true,
   "author": "ujiro99",
   "license": "MIT",
@@ -59,6 +59,7 @@
     "sonner": "git+https://github.com/ujiro99/sonner.git",
     "tailwind-merge": "^2.5.4",
     "tailwindcss-animate": "^1.0.7",
+    "tldts": "^7.4.13",
     "uuid": "^14.0.0",
     "zod": "^3.24.1"
   },