diff --git a/AI功能使用說明.md b/AI功能使用說明.md
index a329117..ee60062 100644
--- a/AI功能使用說明.md
+++ b/AI功能使用說明.md
@@ -8,26 +8,12 @@ DramaLing的AI生成功能現已完全實現，支持智能英文句子分析、
 
 ### **1. 設置Gemini API Key**
 
-#### **方法一：使用.NET User Secrets（推薦）**
+#### **方法一：使用.NET User Secrets**
 ```bash
 cd backend/DramaLing.Api
 dotnet user-secrets set "Gemini:ApiKey" "你的真實Gemini API Key"
 ```
 
-#### **方法二：使用環境變數**
-```bash
-export GEMINI_API_KEY="你的真實Gemini API Key"
-```
-
-#### **方法三：appsettings.json（不推薦用於生產）**
-```json
-{
-  "Gemini": {
-    "ApiKey": "你的真實Gemini API Key"
-  }
-}
-```
-
 ### **2. 啟動服務**
 
 #### **後端服務（port 5000）**
@@ -116,13 +102,6 @@ npm run dev
 
 ## 🧪 **測試模式**
 
-### **Mock模式（預設）**
-當沒有設置真實Gemini API Key時，系統自動使用Mock數據：
-- 模擬1秒API延遲
-- 提供完整的測試數據
-- 包含語法錯誤修正範例
-- 包含16個詞彙分析和1個慣用語
-
 ### **真實API模式**
 設置真實Gemini API Key後：
 - 調用Google Gemini Pro模型
diff --git a/AI生成網頁前端需求規格.md b/AI生成網頁前端需求規格.md
index b715888..d388856 100644
--- a/AI生成網頁前端需求規格.md
+++ b/AI生成網頁前端需求規格.md
@@ -49,7 +49,7 @@ DramaLing AI生成網頁是個人化英語學習平台的核心功能，專注
 驗收標準：
 - 簡單詞彙顯示灰色虛線（已掌握）
 - 適中詞彙顯示綠色邊框（重點學習）
-- 艱難詞彙顯示橙色邊框（挑戰詞彙）
+- 困難詞彙顯示橙色邊框（挑戰詞彙）
 - 能調整個人CEFR等級設定
 ```
 
@@ -104,7 +104,7 @@ DramaLing AI生成網頁是個人化英語學習平台的核心功能，專注
 系統會根據我的CEFR程度與詞彙CEFR程度進行比較分類：
 - 簡單啦：學習者CEFR > 詞彙CEFR（簡單詞彙）
 - 重點學習：學習者CEFR = 詞彙CEFR（適中難度詞彙）
-- 具挑戰：學習者CEFR < 詞彙CEFR（艱難詞彙）
+- 具挑戰：學習者CEFR < 詞彙CEFR（困難詞彙）
 - 慣用語：獨立分類，不參與等級比較
 
 範例（用戶A2等級）：
@@ -213,7 +213,7 @@ DramaLing AI生成網頁是個人化英語學習平台的核心功能，專注
 用戶等級 vs 詞彙等級：
 - 用戶 > 詞彙 → 簡單詞彙 (灰色虛線)
 - 用戶 = 詞彙 → 適中難度詞彙 (綠色邊框)
-- 用戶 < 詞彙 → 艱難詞彙 (橙色邊框)
+- 用戶 < 詞彙 → 困難詞彙 (橙色邊框)
 - 慣用語標記 → 藍色邊框，在慣用語區域顯示
 ```
 
@@ -239,7 +239,7 @@ DramaLing AI生成網頁是個人化英語學習平台的核心功能，專注
    - 樣式：`bg-green-50 border border-green-200`
    - 顏色：`text-green-700 font-medium`
    - 含義：重點學習目標
-3. **艱難詞彙**:
+3. **困難詞彙**:
    - 樣式：`bg-orange-50 border border-orange-200`
    - 顏色：`text-orange-700 font-medium`
    - 含義：挑戰性詞彙
@@ -263,7 +263,7 @@ DramaLing AI生成網頁是個人化英語學習平台的核心功能，專注
    - 背景：綠色邊框
    - 數字：綠色大字體
    - 標籤：「重點學習」
-3. **艱難詞彙卡片**:
+3. **困難詞彙卡片**:
    - 背景：橙色邊框
    - 數字：橙色大字體
    - 標籤：「有點挑戰」
@@ -397,7 +397,7 @@ DramaLing AI生成網頁是個人化英語學習平台的核心功能，專注
 3. **個人化訊息**:
    - 簡單詞彙：對你來說太簡單
    - 適中難度詞彙：對你來說剛剛好
-   - 艱難詞彙：對你來說較難
+   - 困難詞彙：對你來說較難
 
 ---
 
@@ -573,7 +573,7 @@ interface WordAnalysisOptional {
 - 語法修正：顯示2個錯誤修正
 - 簡單詞彙：8個
 - 適中詞彙：4個
-- 艱難詞彙：3個
+- 困難詞彙：3個
 - 慣用語：1個
 
 #### **TEST1.2 邊界值測試**
diff --git a/frontend/app/generate/page.tsx b/frontend/app/generate/page.tsx
index 86a8fd6..d3c2639 100644
--- a/frontend/app/generate/page.tsx
+++ b/frontend/app/generate/page.tsx
@@ -36,8 +36,8 @@ interface GrammarCorrection {
   }>;
 }
 
-interface PhrasePopup {
-  phrase: string;
+interface IdiomPopup {
+  idiom: string;
   analysis: any;
   position: { x: number; y: number };
 }
@@ -49,8 +49,7 @@ function GenerateContent() {
   const [sentenceAnalysis, setSentenceAnalysis] = useState<Record<string, any> | null>(null)
   const [sentenceMeaning, setSentenceMeaning] = useState('')
   const [grammarCorrection, setGrammarCorrection] = useState<GrammarCorrection | null>(null)
-  const [finalText, setFinalText] = useState('')
-  const [phrasePopup, setPhrasePopup] = useState<PhrasePopup | null>(null)
+  const [idiomPopup, setIdiomPopup] = useState<IdiomPopup | null>(null)
 
 
   // 處理句子分析 - 使用真實API
@@ -75,15 +74,21 @@ function GenerateContent() {
             includeGrammarCheck: true,
             includeVocabularyAnalysis: true,
             includeTranslation: true,
-            includePhraseDetection: true,
+            includeIdiomDetection: true,
             includeExamples: true
           }
         })
       })
 
       if (!response.ok) {
-        const errorData = await response.json()
-        throw new Error(errorData.error?.message || `API請求失敗: ${response.status}`)
+        let errorMessage = `API請求失敗: ${response.status}`
+        try {
+          const errorData = await response.json()
+          errorMessage = errorData.error?.message || errorData.message || errorMessage
+        } catch (e) {
+          console.warn('無法解析錯誤回應:', e)
+        }
+        throw new Error(errorMessage)
       }
 
       const result = await response.json()
@@ -108,10 +113,10 @@ function GenerateContent() {
           corrections: apiData.grammarCorrection.corrections || []
         })
 
-        // 使用修正後的文本作為最終文本
-        setFinalText(apiData.grammarCorrection.correctedText || textInput)
+        // 不需要單獨設置finalText，直接從API數據計算
+        // setFinalText() - 移除這個狀態設置
       } else {
-        setFinalText(textInput)
+        // 如果沒有語法修正，也不需要設置finalText
       }
 
       setShowAnalysisView(true)
@@ -125,7 +130,7 @@ function GenerateContent() {
         corrections: []
       })
       setSentenceMeaning('分析過程中發生錯誤，請稍後再試。')
-      setFinalText(textInput)
+      // 錯誤時也不設置finalText，使用原始輸入
       setShowAnalysisView(true)
     } finally {
       setIsAnalyzing(false)
@@ -139,15 +144,17 @@ function GenerateContent() {
 
   const handleAcceptCorrection = useCallback(() => {
     if (grammarCorrection?.correctedText) {
-      setFinalText(grammarCorrection.correctedText)
-      console.log('✅ 已採用修正版本，後續學習將基於正確的句子進行！')
+      // 更新用戶輸入為修正後的版本
+      setTextInput(grammarCorrection.correctedText)
+      console.log('✅ 已採用修正版本，文本已更新為正確版本！')
     }
   }, [grammarCorrection?.correctedText])
 
   const handleRejectCorrection = useCallback(() => {
-    setFinalText(grammarCorrection?.originalText || textInput)
-    console.log('📝 已保持原始版本，將基於您的原始輸入進行學習。')
-  }, [grammarCorrection?.originalText, textInput])
+    // 保持原始輸入不變，只是隱藏語法修正面板
+    setGrammarCorrection(null)
+    console.log('📝 已保持原始版本，繼續使用您的原始輸入。')
+  }, [])
 
   // 詞彙統計計算 - 移到組件頂層避免Hooks順序問題
   const vocabularyStats = useMemo(() => {
@@ -157,14 +164,14 @@ function GenerateContent() {
     let simpleCount = 0
     let moderateCount = 0
     let difficultCount = 0
-    let phraseCount = 0
+    let idiomCount = 0
 
     Object.entries(sentenceAnalysis).forEach(([, wordData]: [string, any]) => {
-      const isPhrase = wordData?.isPhrase || wordData?.IsPhrase
+      const isIdiom = wordData?.isIdiom || wordData?.IsIdiom
       const difficultyLevel = wordData?.difficultyLevel || 'A1'
 
-      if (isPhrase) {
-        phraseCount++
+      if (isIdiom) {
+        idiomCount++
       } else {
         const userIndex = getLevelIndex(userLevel)
         const wordIndex = getLevelIndex(difficultyLevel)
@@ -179,7 +186,7 @@ function GenerateContent() {
       }
     })
 
-    return { simpleCount, moderateCount, difficultCount, phraseCount }
+    return { simpleCount, moderateCount, difficultCount, idiomCount }
   }, [sentenceAnalysis])
 
   // 保存單個詞彙
@@ -340,7 +347,7 @@ function GenerateContent() {
                       <div>
                         <span className="text-sm font-medium text-yellow-700">建議修正：</span>
                         <div className="bg-yellow-100 p-3 rounded border border-yellow-300 mt-1 font-medium">
-                          {grammarCorrection.correctedText || finalText}
+                          {grammarCorrection.correctedText || textInput}
                         </div>
                       </div>
                     </div>
@@ -389,7 +396,7 @@ function GenerateContent() {
 
                   {/* 片語與俚語卡片 */}
                   <div className="bg-blue-50 border border-blue-200 rounded-lg p-3 sm:p-4 text-center">
-                    <div className="text-xl sm:text-2xl font-bold text-blue-700 mb-1">{vocabularyStats.phraseCount}</div>
+                    <div className="text-xl sm:text-2xl font-bold text-blue-700 mb-1">{vocabularyStats.idiomCount}</div>
                     <div className="text-blue-700 text-xs sm:text-sm font-medium">慣用語</div>
                   </div>
                 </div>
@@ -399,9 +406,9 @@ function GenerateContent() {
               <div className="text-left mb-8">
                 <div className="text-xl sm:text-2xl lg:text-3xl font-medium text-gray-900 mb-6" >
                   <ClickableTextV2
-                    text={finalText}
+                    text={textInput}
                     analysis={sentenceAnalysis || undefined}
-                    showPhrasesInline={false}
+                    showIdiomsInline={false}
                     onWordClick={(word, analysis) => {
                       console.log('Clicked word:', word, analysis)
                     }}
@@ -420,43 +427,43 @@ function GenerateContent() {
                   if (!sentenceAnalysis) return null
 
                   // 提取片語
-                  const phrases: Array<{
-                    phrase: string
+                  const idioms: Array<{
+                    idiom: string
                     meaning: string
                     difficultyLevel: string
                   }> = []
 
                   Object.entries(sentenceAnalysis).forEach(([word, wordData]: [string, any]) => {
-                    const isPhrase = wordData?.isPhrase || wordData?.IsPhrase
-                    if (isPhrase) {
-                      phrases.push({
-                        phrase: wordData?.word || word,
+                    const isIdiom = wordData?.isIdiom || wordData?.IsIdiom
+                    if (isIdiom) {
+                      idioms.push({
+                        idiom: wordData?.word || word,
                         meaning: wordData?.translation || '',
                         difficultyLevel: wordData?.difficultyLevel || 'A1'
                       })
                     }
                   })
 
-                  if (phrases.length === 0) return null
+                  if (idioms.length === 0) return null
 
 
                   return (
                     <div className="bg-gray-50 rounded-lg p-4 mt-4">
                       <h3 className="font-semibold text-gray-900 mb-2 text-left">慣用語</h3>
                       <div className="flex flex-wrap gap-2">
-                        {phrases.map((phrase, index) => (
+                        {idioms.map((idiom, index) => (
                           <span
                             key={index}
                             className="cursor-pointer transition-all duration-200 rounded-lg relative mx-0.5 px-1 py-0.5 inline-flex items-center gap-1 bg-blue-50 border border-blue-200 hover:bg-blue-100 hover:shadow-lg transform hover:-translate-y-0.5 text-blue-700 font-medium"
                             onClick={(e) => {
                               // 找到片語的完整分析資料
-                              const phraseAnalysis = sentenceAnalysis?.["cut someone some slack"]
+                              const idiomAnalysis = sentenceAnalysis?.["cut someone some slack"]
 
-                              if (phraseAnalysis) {
-                                // 設定片語彈窗狀態
-                                setPhrasePopup({
-                                  phrase: phrase.phrase,
-                                  analysis: phraseAnalysis,
+                              if (idiomAnalysis) {
+                                // 設定慣用語彈窗狀態
+                                setIdiomPopup({
+                                  idiom: idiom.idiom,
+                                  analysis: idiomAnalysis,
                                   position: {
                                     x: e.currentTarget.getBoundingClientRect().left + e.currentTarget.getBoundingClientRect().width / 2,
                                     y: e.currentTarget.getBoundingClientRect().bottom + 10
@@ -464,9 +471,9 @@ function GenerateContent() {
                                 })
                               }
                             }}
-                            title={`${phrase.phrase}: ${phrase.meaning}`}
+                            title={`${idiom.idiom}: ${idiom.meaning}`}
                           >
-                            {phrase.phrase}
+                            {idiom.idiom}
                           </span>
                         ))}
                       </div>
@@ -490,17 +497,17 @@ function GenerateContent() {
         )}
 
         {/* 片語彈窗 */}
-        {phrasePopup && (
+        {idiomPopup && (
           <>
             <div
               className="fixed inset-0 bg-black bg-opacity-50 z-40"
-              onClick={() => setPhrasePopup(null)}
+              onClick={() => setIdiomPopup(null)}
             />
             <div
               className="fixed z-50 bg-white rounded-xl shadow-lg w-96 max-w-md overflow-hidden"
               style={{
-                left: `${phrasePopup.position.x}px`,
-                top: `${phrasePopup.position.y}px`,
+                left: `${idiomPopup.position.x}px`,
+                top: `${idiomPopup.position.y}px`,
                 transform: 'translate(-50%, 8px)',
                 maxHeight: '85vh',
                 overflowY: 'auto'
@@ -509,7 +516,7 @@ function GenerateContent() {
               <div className="bg-gradient-to-br from-blue-50 to-indigo-50 p-5 border-b border-blue-200">
                 <div className="flex justify-end mb-3">
                   <button
-                    onClick={() => setPhrasePopup(null)}
+                    onClick={() => setIdiomPopup(null)}
                     className="text-gray-400 hover:text-gray-600 w-6 h-6 rounded-full bg-white bg-opacity-80 hover:bg-opacity-100 transition-all flex items-center justify-center"
                   >
                     ✕
@@ -517,19 +524,19 @@ function GenerateContent() {
                 </div>
 
                 <div className="mb-3">
-                  <h3 className="text-2xl font-bold text-gray-900">{phrasePopup.analysis.word}</h3>
+                  <h3 className="text-2xl font-bold text-gray-900">{idiomPopup.analysis.word}</h3>
                 </div>
 
                 <div className="flex items-center justify-between">
                   <div className="flex items-center gap-3">
                     <span className="text-sm bg-gray-100 text-gray-700 px-3 py-1 rounded-full">
-                      {phrasePopup.analysis.partOfSpeech}
+                      {idiomPopup.analysis.partOfSpeech}
                     </span>
-                    <span className="text-base text-gray-600">{phrasePopup.analysis.pronunciation}</span>
+                    <span className="text-base text-gray-600">{idiomPopup.analysis.pronunciation}</span>
                   </div>
 
                   <span className="px-3 py-1 rounded-full text-sm font-medium border bg-blue-100 text-blue-700 border-blue-200">
-                    {phrasePopup.analysis.difficultyLevel}
+                    {idiomPopup.analysis.difficultyLevel}
                   </span>
                 </div>
               </div>
@@ -537,23 +544,23 @@ function GenerateContent() {
               <div className="p-4 space-y-4">
                 <div className="bg-green-50 rounded-lg p-3 border border-green-200">
                   <h4 className="font-semibold text-green-900 mb-2 text-left text-sm">中文翻譯</h4>
-                  <p className="text-green-800 font-medium text-left">{phrasePopup.analysis.translation}</p>
+                  <p className="text-green-800 font-medium text-left">{idiomPopup.analysis.translation}</p>
                 </div>
 
                 <div className="bg-gray-50 rounded-lg p-3 border border-gray-200">
                   <h4 className="font-semibold text-gray-900 mb-2 text-left text-sm">英文定義</h4>
-                  <p className="text-gray-700 text-left text-sm leading-relaxed">{phrasePopup.analysis.definition}</p>
+                  <p className="text-gray-700 text-left text-sm leading-relaxed">{idiomPopup.analysis.definition}</p>
                 </div>
 
-                {phrasePopup.analysis.example && (
+                {idiomPopup.analysis.example && (
                   <div className="bg-blue-50 rounded-lg p-3 border border-blue-200">
                     <h4 className="font-semibold text-blue-900 mb-2 text-left text-sm">例句</h4>
                     <div className="space-y-2">
                       <p className="text-blue-800 text-left text-sm italic">
-                        "{phrasePopup.analysis.example}"
+                        "{idiomPopup.analysis.example}"
                       </p>
                       <p className="text-blue-700 text-left text-sm">
-                        {phrasePopup.analysis.exampleTranslation}
+                        {idiomPopup.analysis.exampleTranslation}
                       </p>
                     </div>
                   </div>
@@ -563,11 +570,11 @@ function GenerateContent() {
               <div className="p-4 pt-2">
                 <button
                   onClick={async () => {
-                    const result = await handleSaveWord(phrasePopup.phrase, phrasePopup.analysis)
+                    const result = await handleSaveWord(idiomPopup.idiom, idiomPopup.analysis)
                     if (result.success) {
-                      setPhrasePopup(null)
+                      setIdiomPopup(null)
                     } else {
-                      console.error('Save phrase error:', result.error)
+                      console.error('Save idiom error:', result.error)
                     }
                   }}
                   className="w-full bg-primary text-white py-3 rounded-lg font-medium hover:bg-primary-hover transition-colors flex items-center justify-center gap-2"
diff --git a/frontend/components/ClickableTextV2.tsx b/frontend/components/ClickableTextV2.tsx
index 2e81ee4..03fa094 100644
--- a/frontend/components/ClickableTextV2.tsx
+++ b/frontend/components/ClickableTextV2.tsx
@@ -11,11 +11,11 @@ interface WordAnalysis {
   pronunciation: string
   synonyms: string[]
   antonyms?: string[]
-  isPhrase: boolean
+  isIdiom: boolean
   isHighValue?: boolean
   learningPriority?: 'high' | 'medium' | 'low'
-  phraseInfo?: {
-    phrase: string
+  idiomInfo?: {
+    idiom: string
     meaning: string
     warning: string
     colorCode: string
@@ -32,7 +32,7 @@ interface ClickableTextProps {
   onWordClick?: (word: string, analysis: WordAnalysis) => void
   onSaveWord?: (word: string, analysis: WordAnalysis) => Promise<{ success: boolean; error?: string }>
   remainingUsage?: number
-  showPhrasesInline?: boolean
+  showIdiomsInline?: boolean
 }
 
 const POPUP_CONFIG = {
@@ -48,7 +48,7 @@ export function ClickableTextV2({
   onWordClick,
   onSaveWord,
   remainingUsage = 5,
-  showPhrasesInline = true
+  showIdiomsInline = true
 }: ClickableTextProps) {
   const [selectedWord, setSelectedWord] = useState<string | null>(null)
   const [popupPosition, setPopupPosition] = useState({ x: 0, y: 0, showBelow: false })
@@ -110,8 +110,8 @@ export function ClickableTextV2({
 
     if (!wordAnalysis) return ""
 
-    const isPhrase = getWordProperty(wordAnalysis, 'isPhrase')
-    if (isPhrase) return ""
+    const isIdiom = getWordProperty(wordAnalysis, 'isIdiom')
+    if (isIdiom) return ""
 
     const difficultyLevel = getWordProperty(wordAnalysis, 'difficultyLevel') || 'A1'
     const userLevel = typeof window !== 'undefined' ? localStorage.getItem('userEnglishLevel') || 'A2' : 'A2'