Merge pull request #361 from ujiro99/copilot/update-ai-prompt-icon

デフォルトAI-promptコマンドのGeminiアイコンURLをSingle Source of Truthに統一

Author: ujiro99

packages/extension/scripts/vite.config.ts

@@ -1,3 +1,4 @@
+import fs from "fs"
 import path from "path"
 import { defineConfig } from "vite"
 import packageJson from "../package.json"
@@ -8,6 +9,10 @@ export default defineConfig({
   define: {
     __APP_NAME__: JSON.stringify(packageJson.name),
     __APP_VERSION__: JSON.stringify(packageJson.version),
+    __AI_SERVICES_JSON__: fs.readFileSync(
+      path.resolve(__dirname, "../../hub/public/data/ai-services.json"),
+      "utf-8",
+    ),
   },
   resolve: {
     alias: {

packages/extension/src/services/aiPrompt.ts

@@ -1,69 +1,20 @@
-import { SelectorType } from "@/const"
 import { HUB_URL } from "@/const"
 import { Storage, LOCAL_STORAGE_KEY } from "@/services/storage"
-import type { Caches } from "@/types"
+import type { Caches, AiService } from "@/types"
+import {
+  normalizeServices,
+  AI_SERVICES_FALLBACK,
+  getAiServicesFallback,
+} from "@/services/aiPromptFallback"
 
-/**
- * Defines selectors and configuration for a supported AI service.
- */
-export type AiService = {
-  id: string
-  name: string
-  url: string
-  faviconUrl: string
-  inputSelectors: string[]
-  submitSelectors: string[]
-  selectorType: SelectorType
-}
+export { getAiServicesFallback }
 
 /** External endpoint URL for AI service config data. */
 const AI_SERVICES_URL = `${HUB_URL}/data/ai-services.json`
 
 /** Today's date string "YYYY-MM-DD" used as cache TTL key. */
 const todayStr = (): string => new Date().toISOString().slice(0, 10)
 
-/**
- * Normalize raw JSON data fetched from the external endpoint into AiService[].
- * - Items that are missing required fields (id, url, inputSelectors, submitSelectors) are silently skipped.
- * - The external JSON may omit `selectorType`, defaulting to `CSS`.
- */
-const normalizeServices = (raw: unknown[]): AiService[] => {
-  const results: AiService[] = []
-  for (const item of raw) {
-    const s = item as Partial<AiService>
-    if (
-      !s.id ||
-      !s.url ||
-      !Array.isArray(s.inputSelectors) ||
-      !Array.isArray(s.submitSelectors) ||
-      s.inputSelectors.length === 0 ||
-      s.submitSelectors.length === 0
-    ) {
-      console.warn("Skipping invalid AI service entry:", s)
-      continue
-    }
-    results.push({
-      id: s.id,
-      name: s.name ?? s.id,
-      url: s.url,
-      faviconUrl: s.faviconUrl ?? "",
-      inputSelectors: s.inputSelectors,
-      submitSelectors: s.submitSelectors,
-      selectorType: s.selectorType ?? SelectorType.css,
-    })
-  }
-  return results
-}
-
-/**
- * List of supported AI services with their DOM selectors.
- * Built from the hub's ai-services.json at compile time.
- * Used as fallback when the external fetch fails and no cache is available.
- * Selector arrays are tried in order, using the first one that matches.
- */
-const AI_SERVICES_FALLBACK: AiService[] =
-  normalizeServices(__AI_SERVICES_JSON__)
-
 /**
  * Retrieve AI service definitions.
  * Strategy:
@@ -126,9 +77,3 @@ export const findAiService = async (
   const services = await getAiServices()
   return services.find((s) => s.id === id)
 }
-
-/**
- * Return the list of AI services synchronously using only the hardcoded fallback.
- * Used in UI contexts where async is not available (e.g. option section rendering).
- */
-export const getAiServicesFallback = (): AiService[] => AI_SERVICES_FALLBACK

packages/extension/src/services/aiPromptFallback.ts

@@ -0,0 +1,47 @@
+import { SelectorType } from "@/const"
+import type { AiService } from "@/types"
+
+/**
+ * Normalize raw JSON data fetched from the external endpoint into AiService[].
+ * Items missing required fields are silently skipped.
+ */
+export const normalizeServices = (raw: unknown[]): AiService[] => {
+  const results: AiService[] = []
+  for (const item of raw) {
+    const s = item as Partial<AiService>
+    if (
+      !s.id ||
+      !s.url ||
+      !Array.isArray(s.inputSelectors) ||
+      !Array.isArray(s.submitSelectors) ||
+      s.inputSelectors.length === 0 ||
+      s.submitSelectors.length === 0
+    ) {
+      console.warn("Skipping invalid AI service entry:", s)
+      continue
+    }
+    results.push({
+      id: s.id,
+      name: s.name ?? s.id,
+      url: s.url,
+      faviconUrl: s.faviconUrl ?? "",
+      inputSelectors: s.inputSelectors,
+      submitSelectors: s.submitSelectors,
+      selectorType: s.selectorType ?? SelectorType.css,
+    })
+  }
+  return results
+}
+
+/**
+ * List of supported AI services built from the hub's ai-services.json at compile time.
+ * Used as fallback when the external fetch fails and no cache is available.
+ */
+export const AI_SERVICES_FALLBACK: AiService[] =
+  normalizeServices(__AI_SERVICES_JSON__)
+
+/**
+ * Return the list of AI services synchronously using only the hardcoded fallback.
+ * Safe to use in Node.js / non-browser contexts (no chrome dependency).
+ */
+export const getAiServicesFallback = (): AiService[] => AI_SERVICES_FALLBACK

packages/extension/src/services/option/defaultSettings.test.ts

@@ -2,6 +2,7 @@ import { describe, it, expect } from "vitest"
 import { DefaultCommands, getDefaultCommands } from "./defaultSettings"
 import { isLinkCommand } from "@/lib/utils"
 import { INSERT, toInsertTemplate } from "@/services/pageAction"
+import { getAiServicesFallback } from "@/services/aiPrompt"
 
 const SYM_SELECTED_TEXT = toInsertTemplate(INSERT.SELECTED_TEXT)
 const SYM_URL = toInsertTemplate(INSERT.URL)
@@ -227,6 +228,26 @@ describe("getDefaultCommands", () => {
     }
   })
 
+  it("DS-23: all AI_PROMPT commands with serviceId 'gemini' should use the current Gemini icon URL", () => {
+    const geminiService = getAiServicesFallback().find((s) => s.id === "gemini")
+    expect(geminiService, "Gemini service must exist in ai-services.json").toBeDefined()
+    const expectedIconUrl = geminiService!.faviconUrl
+    for (const locale of ALL_LOCALES) {
+      const commands = getDefaultCommands(locale)
+      const geminiAiCmds = commands.filter(
+        (c) =>
+          (c as any).openMode === "aiPrompt" &&
+          (c as any).aiPromptOption?.serviceId === "gemini",
+      )
+      for (const cmd of geminiAiCmds) {
+        expect(
+          (cmd as any).iconUrl,
+          `Gemini AI prompt command "${(cmd as any).title}" in locale "${locale}" should use the current Gemini icon URL`,
+        ).toBe(expectedIconUrl)
+      }
+    }
+  })
+
   it("DS-22: page summary and YouTube summary commands should use {{Url}} not {{SelectedText}}", () => {
     for (const locale of ALL_LOCALES) {
       const commands = getDefaultCommands(locale)