diff --git a/plugins/jenkins-lite/CHANGELOG.md b/plugins/jenkins-lite/CHANGELOG.md
index 09e44009..f41d1613 100644
--- a/plugins/jenkins-lite/CHANGELOG.md
+++ b/plugins/jenkins-lite/CHANGELOG.md
@@ -4,7 +4,64 @@
 
 ---
 
-## v1.2.1 (最新)
+## v1.4.0 (最新)
+
+### 🆕 新增
+
+- **日志高亮 + 自动滚到底**：BuildLogModal 打开后日志自动滚到底部；含 `ERROR / Exception / FATAL / BUILD FAILURE / failed / Error:` 的行红字 + 浅红底 + 红色左边框
+- **复制错误日志**：弹窗底部新增「复制错误 (N)」按钮，仅复制含错误关键字的行，N 为错误行数
+- **日志滚动快捷键**：弹窗打开时 `↑ / ↓` 滚一行、`PgUp / PgDn` 翻页、`Home / End` 顶/底
+- **键盘操作提示**：Sidebar / JobsList / BuildHistory 各自下方加 `<kbd>` 风格的快捷键提示行
+- **Sidebar 视图即时切换**：`↑↓` 直接切视图，不再需要 `Enter` 确认
+- **JobsList 即时联动右侧**：`↑↓ / Shift+↑↓` 切换选中项时自动联动右侧构建历史
+- **弹窗 Enter 确认 / Esc 取消**：构建确认和收藏确认弹窗都支持 Enter 直接确认、Esc 取消
+- **Esc 后焦点还原**：弹窗关闭时焦点回到打开它的那条 Job / build，不再被强制弹到搜索框
+
+### 🎨 优化
+
+- **BuildLogModal 布局**：`.log-body` 去掉冲突的 `min/max-height` 限制，`.modal-footer` 加 `flex: 0 0 auto`，日志很长时 footer 始终可见
+- **键盘提示分隔符**：Sidebar 提示行加 `·` 分隔，多个快捷键之间不挤
+
+### 🐛 修复
+
+- **空白页**：根因是 Vue 3 `provide / inject` 在同组件内不自洽（provide 存到 `instance.provides`，同组件 inject 走 `appContext.provides`），App.vue 改用直接 import 模块级 ref
+- **JobItem 受控展开**：Folder 展开状态从组件内提升到 JobsList，便于键盘导航跨层操作
+
+### 🔧 内部
+
+- `useBuildPolling` 新增 `stopWatchingBuild(jobName?, buildNumber?)` 参数化清理
+- `useKeyboardNav` 模块级 ref export 给 App.vue 直接使用（绕过 provide/inject 同组件限制）
+- `tests/App.smoke.test.ts` 新增，捕获 App 根挂载类回归
+
+---
+
+## v1.3.0
+
+### 🆕 新增
+
+- **构建完成通知**：触发构建后自动监听该 build 直到结束，完成时弹出系统通知（成功 / 失败 / 不稳定 / 中止）
+- **构建日志弹窗**：右侧历史面板点击构建记录不再跳转 Jenkins，而是打开弹窗直接查看 console log
+  - 弹窗内仍提供「在 Jenkins 中打开」按钮，需要详细页面时一键跳转
+  - 支持「复制日志」到剪贴板
+- **键盘快捷键**：
+  - `←` / `→` 在 Sidebar / JobsList / BuildHistory 三个面板间循环切换（焦点默认在 Sidebar）
+  - `↑` / `↓` 在当前面板内上下移动选中项
+  - `Shift + ↑` / `Shift + ↓` 在 JobsList 中进入 Folder / 退出到父 Folder（同级导航走纯 ↑↓）
+  - `Enter` 触发当前选中项的主操作：Sidebar 切视图 / JobsList 触发构建（含二次确认）/ BuildHistory 打开构建日志
+  - `Cmd / Ctrl + Enter` 在 JobsList 收藏当前选中项（走二次确认，防误触）
+  - `Esc` 关闭弹窗
+  - 被聚焦的面板有蓝色描边，选中项左侧出现蓝色高亮条
+
+### 🔧 内部
+
+- `preload.js` 新增 `getBuildConsole` 接口（`/job/<segments>/<n>/consoleText`），沿用 Folder 嵌套路径分段规则
+- `useBuildPolling` 新增 `watchBuild(jobName, buildNumber, onComplete)`：独立定时器监听单个 build 完成，不影响右侧历史面板的轮询
+- 新增 `useKeyboardNav` composable：provide/inject 集中管面板焦点与选中索引
+- `JobItem` 的 Folder 展开状态从组件内提升到 `JobsList`，以便键盘导航能跨层操作
+
+---
+
+## v1.2.1
 
 ### 🎨 优化
 
diff --git a/plugins/jenkins-lite/CLAUDE.md b/plugins/jenkins-lite/CLAUDE.md
index 48b0355b..d14b3eb1 100644
--- a/plugins/jenkins-lite/CLAUDE.md
+++ b/plugins/jenkins-lite/CLAUDE.md
@@ -97,4 +97,4 @@ grep -rn 'X\.Y\.0' --include='*.ts' --include='*.vue' --include='*.json' --inclu
 
 - `jenkins` / `Jenkins` / `j` / `jl` — 打开插件
 - `构建` / `build` — 触发构建
-- `jenkins收藏` / `jenkins-fav` — 收藏视图
\ No newline at end of file
+- `jenkins收藏` / `jenkins-fav` — 收藏视图
diff --git a/plugins/jenkins-lite/package.json b/plugins/jenkins-lite/package.json
index 17baf0ee..0407959a 100644
--- a/plugins/jenkins-lite/package.json
+++ b/plugins/jenkins-lite/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jenkins-lite",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "Jenkins Lite 一款轻量级的 Jenkins 辅助工具。告别繁琐的网页操作，插件提供实时查询与一键构建功能，帮助开发者快速检索任务状态、监控构建进度并秒级触发构建，显著提升 CI/CD 工作效率。",
   "type": "module",
   "scripts": {
diff --git a/plugins/jenkins-lite/plugin.json b/plugins/jenkins-lite/plugin.json
index 947e8365..edb0dd2d 100644
--- a/plugins/jenkins-lite/plugin.json
+++ b/plugins/jenkins-lite/plugin.json
@@ -2,7 +2,7 @@
   "name": "jenkins-lite",
   "title": "Jenkins Lite",
   "description": " 一款轻量级 Jenkins 辅助工具。告别繁琐的网页操作，可轻松实现实时查询任务状态、监控构建进度、一键触发构建，可显著提升 CI/CD 效率。",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "main": "index.html",
   "logo": "logo.png",
   "author": "康康学长",
diff --git a/plugins/jenkins-lite/preload.js b/plugins/jenkins-lite/preload.js
index 662acfb7..0b25dc46 100644
--- a/plugins/jenkins-lite/preload.js
+++ b/plugins/jenkins-lite/preload.js
@@ -48,6 +48,44 @@ function jenkinsRequest(jenkinsUrl, username, apiToken, apiPath) {
   })
 }
 
+// Jenkins 文本端点调用（不解析 JSON，直接返回原始字符串）
+function jenkinsRequestText(jenkinsUrl, username, apiToken, apiPath) {
+  return new Promise((resolve, reject) => {
+    const parsedUrl = new URL(jenkinsUrl)
+    const isHttps = parsedUrl.protocol === 'https:'
+    const httpModule = isHttps ? https : http
+
+    const auth = Buffer.from(username + ':' + apiToken).toString('base64')
+    const cleanPath = apiPath.startsWith('/') ? apiPath : '/' + apiPath
+
+    const options = {
+      hostname: parsedUrl.hostname,
+      port: parsedUrl.port || (isHttps ? 443 : 80),
+      path: cleanPath,
+      method: 'GET',
+      headers: {
+        'Authorization': 'Basic ' + auth,
+        'Accept': 'text/plain'
+      }
+    }
+
+    const req = httpModule.request(options, (res) => {
+      let data = ''
+      res.on('data', (chunk) => { data += chunk })
+      res.on('end', () => {
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          resolve(data)
+        } else {
+          reject(new Error('HTTP ' + res.statusCode))
+        }
+      })
+    })
+
+    req.on('error', reject)
+    req.end()
+  })
+}
+
 // Jenkins 构建触发
 function jenkinsBuild(jenkinsUrl, username, apiToken, jobName) {
   return new Promise((resolve, reject) => {
@@ -163,6 +201,17 @@ window.services = {
       return jenkinsRequest(jenkinsUrl, username, apiToken, '/api/json')
         .then(function() { return { success: true, error: null } })
         .catch(function(err) { return { success: false, error: err.message } })
+    },
+    // 获取构建的 console log（纯文本）
+    getBuildConsole: function(jenkinsUrl, username, apiToken, jobName, buildNumber) {
+      return jenkinsRequestText(
+        jenkinsUrl,
+        username,
+        apiToken,
+        getJobPath(jobName) + '/' + encodeURIComponent(String(buildNumber)) + '/consoleText'
+      )
+        .then(function(data) { return { data: data || '', error: null } })
+        .catch(function(err) { return { data: '', error: err.message } })
     }
   },
   // 读文件
diff --git a/plugins/jenkins-lite/public/plugin.json b/plugins/jenkins-lite/public/plugin.json
index fbe2c4db..4c46fc21 100644
--- a/plugins/jenkins-lite/public/plugin.json
+++ b/plugins/jenkins-lite/public/plugin.json
@@ -4,7 +4,7 @@
   "title": "Jenkins Lite",
   "description": "Jenkins Lite 一款轻量级的 Jenkins 辅助工具。告别繁琐的网页操作，插件提供实时查询与一键构建功能，帮助开发者快速检索任务状态、监控构建进度并秒级触发构建，显著提升 CI/CD 工作效率。",
   "author": "康康学长",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "main": "index.html",
   "preload": "preload/services.js",
   "logo": "logo.png",
diff --git a/plugins/jenkins-lite/public/preload/services.js b/plugins/jenkins-lite/public/preload/services.js
index 00d67661..be2c9a42 100644
--- a/plugins/jenkins-lite/public/preload/services.js
+++ b/plugins/jenkins-lite/public/preload/services.js
@@ -48,6 +48,44 @@ function jenkinsRequest(jenkinsUrl, username, apiToken, apiPath) {
   })
 }
 
+// Jenkins 文本端点调用（不解析 JSON，直接返回原始字符串）
+function jenkinsRequestText(jenkinsUrl, username, apiToken, apiPath) {
+  return new Promise((resolve, reject) => {
+    const parsedUrl = new URL(jenkinsUrl)
+    const isHttps = parsedUrl.protocol === 'https:'
+    const httpModule = isHttps ? https : http
+
+    const auth = Buffer.from(username + ':' + apiToken).toString('base64')
+    const cleanPath = apiPath.startsWith('/') ? apiPath : '/' + apiPath
+
+    const options = {
+      hostname: parsedUrl.hostname,
+      port: parsedUrl.port || (isHttps ? 443 : 80),
+      path: cleanPath,
+      method: 'GET',
+      headers: {
+        'Authorization': 'Basic ' + auth,
+        'Accept': 'text/plain'
+      }
+    }
+
+    const req = httpModule.request(options, (res) => {
+      let data = ''
+      res.on('data', (chunk) => { data += chunk })
+      res.on('end', () => {
+        if (res.statusCode >= 200 && res.statusCode < 300) {
+          resolve(data)
+        } else {
+          reject(new Error('HTTP ' + res.statusCode))
+        }
+      })
+    })
+
+    req.on('error', reject)
+    req.end()
+  })
+}
+
 // Jenkins 构建触发
 function jenkinsBuild(jenkinsUrl, username, apiToken, jobName) {
   return new Promise((resolve, reject) => {
@@ -120,6 +158,17 @@ window.services = {
       return jenkinsRequest(jenkinsUrl, username, apiToken, '/api/json')
         .then(function() { return { success: true, error: null } })
         .catch(function(err) { return { success: false, error: err.message } })
+    },
+    // 获取构建的 console log（纯文本）
+    getBuildConsole: function(jenkinsUrl, username, apiToken, jobName, buildNumber) {
+      return jenkinsRequestText(
+        jenkinsUrl,
+        username,
+        apiToken,
+        '/job/' + encodeURIComponent(jobName) + '/' + encodeURIComponent(String(buildNumber)) + '/consoleText'
+      )
+        .then(function(data) { return { data: data || '', error: null } })
+        .catch(function(err) { return { data: '', error: err.message } })
     }
   },
   // 读文件
diff --git a/plugins/jenkins-lite/src/App.vue b/plugins/jenkins-lite/src/App.vue
index c6c2de2e..152b8af9 100644
--- a/plugins/jenkins-lite/src/App.vue
+++ b/plugins/jenkins-lite/src/App.vue
@@ -1,13 +1,25 @@
 <script setup lang="ts">
-import { ref, onMounted } from 'vue'
+import { ref, onMounted, onUnmounted } from 'vue'
 import Sidebar from './components/Sidebar.vue'
 import JobsList from './components/JobsList.vue'
 import BuildHistory from './components/BuildHistory.vue'
 import SettingsModal from './components/SettingsModal.vue'
 import { useInstances } from './composables/useInstances'
 import { useFavorites } from './composables/useFavorites'
+import {
+  provideKeyboardNav,
+  focusedPanel,
+  cyclePanel,
+  type FocusedPanel
+} from './composables/useKeyboardNav'
 import type { JobInfo, Favorite } from './types'
 
+provideKeyboardNav()
+// 注意：根组件不能 inject 自己 provide 的内容（Vue 3 设计限制）
+// 直接 import 模块级 ref 用于本组件自己的状态访问
+const navFocusedPanel = focusedPanel
+const navCyclePanel = cyclePanel
+
 const { loadInstances, currentInstance, hasInstances } = useInstances()
 const { loadFavorites } = useFavorites()
 
@@ -21,6 +33,10 @@ const autoSelectFirstJob = ref(false)
 const searchFocusKey = ref(0)
 const initialSearchQuery = ref('')
 
+const sidebarRef = ref<InstanceType<typeof Sidebar> | null>(null)
+const jobsListRef = ref<InstanceType<typeof JobsList> | null>(null)
+const buildHistoryRef = ref<InstanceType<typeof BuildHistory> | null>(null)
+
 /**
  * 处理收藏点击 - 跳转到收藏的视图并选中该 job
  */
@@ -45,7 +61,6 @@ const handleFavoriteClick = (fav: Favorite) => {
 const handleViewChange = (viewName: string) => {
   currentView.value = viewName
   window.ztools.dbStorage.setItem('lastView', viewName)
-  // 视图变了，旧选中 Job 可能不在新视图里，清掉
   selectedJob.value = undefined
   window.ztools.dbStorage.removeItem('lastSelectedJob')
   autoSelectFirstJob.value = true
@@ -90,6 +105,88 @@ const handleAddInstance = () => {
   showSettings.value = true
 }
 
+/**
+ * 全局键盘事件分发
+ */
+const handleGlobalKeydown = (e: KeyboardEvent) => {
+  const target = e.target as HTMLElement | null
+  // 输入框里直接输入的文字不抢
+  if (target && (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable)) {
+    return
+  }
+  // 修饰键：只认 Ctrl/Meta；其他修饰键不抢
+  if (e.altKey) return
+
+  const ctrlOrMeta = e.ctrlKey || e.metaKey
+
+  // 面板切换
+  if (e.key === 'ArrowLeft' && !ctrlOrMeta && !e.shiftKey) {
+    e.preventDefault()
+    navCyclePanel(-1)
+    return
+  }
+  if (e.key === 'ArrowRight' && !ctrlOrMeta && !e.shiftKey) {
+    e.preventDefault()
+    navCyclePanel(1)
+    return
+  }
+
+  // 当前面板的方法
+  const panel: FocusedPanel = navFocusedPanel.value
+  if (panel === 'sidebar') {
+    const ref = sidebarRef.value
+    if (!ref) return
+    if (!ctrlOrMeta && !e.shiftKey && (e.key === 'ArrowUp' || e.key === 'ArrowDown')) {
+      e.preventDefault()
+      ref.moveInSiblings(e.key === 'ArrowUp' ? -1 : 1)
+      return
+    }
+    if (e.key === 'Enter' && !ctrlOrMeta && !e.shiftKey) {
+      e.preventDefault()
+      ref.primaryAction()
+      return
+    }
+  } else if (panel === 'jobs') {
+    const ref = jobsListRef.value
+    if (!ref) return
+    if (!ctrlOrMeta && !e.shiftKey && (e.key === 'ArrowUp' || e.key === 'ArrowDown')) {
+      e.preventDefault()
+      ref.moveInSiblings(e.key === 'ArrowUp' ? -1 : 1)
+      return
+    }
+    if (!ctrlOrMeta && e.shiftKey && (e.key === 'ArrowUp' || e.key === 'ArrowDown')) {
+      e.preventDefault()
+      ref.moveTree(e.key === 'ArrowUp' ? -1 : 1)
+      return
+    }
+    if (e.key === 'Enter' && !ctrlOrMeta && !e.shiftKey) {
+      e.preventDefault()
+      ref.primaryAction()
+      return
+    }
+    if (e.key === 'Enter' && ctrlOrMeta && !e.shiftKey) {
+      e.preventDefault()
+      ref.favoriteAction()
+      return
+    }
+  } else if (panel === 'history') {
+    const ref = buildHistoryRef.value
+    if (!ref) return
+    if (!ctrlOrMeta && !e.shiftKey && (e.key === 'ArrowUp' || e.key === 'ArrowDown')) {
+      e.preventDefault()
+      ref.moveInSiblings(e.key === 'ArrowUp' ? -1 : 1)
+      return
+    }
+    if (e.key === 'Enter' && !ctrlOrMeta && !e.shiftKey) {
+      e.preventDefault()
+      ref.primaryAction()
+      return
+    }
+  }
+}
+
+window.addEventListener('keydown', handleGlobalKeydown)
+
 onMounted(async () => {
   await loadInstances()
   loadFavorites()
@@ -111,11 +208,16 @@ onMounted(async () => {
     editInstanceId.value = undefined
   }
 })
+
+onUnmounted(() => {
+  window.removeEventListener('keydown', handleGlobalKeydown)
+})
 </script>
 
 <template>
   <div class="app">
     <Sidebar
+      ref="sidebarRef"
       :current-view="currentView"
       :selected-job="selectedJob"
       @favorite-click="handleFavoriteClick"
@@ -140,8 +242,9 @@ onMounted(async () => {
       </header>
 
       <div class="content-body">
-        <div class="jobs-panel">
+        <div class="jobs-panel" :class="{ 'is-keyboard-panel': navFocusedPanel === 'jobs' }">
           <JobsList
+            ref="jobsListRef"
             :selected-job="selectedJob"
             :current-view="currentView"
             :focus-key="searchFocusKey"
@@ -151,8 +254,8 @@ onMounted(async () => {
           />
         </div>
 
-        <div class="history-panel">
-          <BuildHistory :selected-job="selectedJob" />
+        <div class="history-panel" :class="{ 'is-keyboard-panel': navFocusedPanel === 'history' }">
+          <BuildHistory ref="buildHistoryRef" :selected-job="selectedJob" />
         </div>
       </div>
     </main>
@@ -267,10 +370,20 @@ body {
   flex: 1;
   overflow: hidden;
   border-right: 1px solid var(--border-color, #e0e0e0);
+  transition: box-shadow 0.15s;
+}
+
+.jobs-panel.is-keyboard-panel {
+  box-shadow: inset 0 0 0 1px var(--primary-color, #0078d4);
 }
 
 .history-panel {
   width: 320px;
   overflow: hidden;
+  transition: box-shadow 0.15s;
+}
+
+.history-panel.is-keyboard-panel {
+  box-shadow: inset 0 0 0 1px var(--primary-color, #0078d4);
 }
 </style>
diff --git a/plugins/jenkins-lite/src/components/BuildHistory.vue b/plugins/jenkins-lite/src/components/BuildHistory.vue
index 95a61301..2e6753ad 100644
--- a/plugins/jenkins-lite/src/components/BuildHistory.vue
+++ b/plugins/jenkins-lite/src/components/BuildHistory.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="build-history">
+  <div class="build-history" @click="focusPanel">
     <div class="history-header">
       <h3>构建历史</h3>
       <button class="refresh-btn" @click="refresh" :disabled="loading">
@@ -7,6 +7,13 @@
       </button>
     </div>
 
+    <div class="keyboard-hint">
+      <span><kbd>←</kbd><kbd>→</kbd> 切面板</span>
+      <span><kbd>↑</kbd><kbd>↓</kbd> 切换</span>
+      <span><kbd>Enter</kbd> 查看日志</span>
+      <span><kbd>Esc</kbd> 关闭</span>
+    </div>
+
     <div v-if="!selectedJob" class="empty">
       选择一个 Job 查看构建历史
     </div>
@@ -23,12 +30,14 @@
       暂无构建记录
     </div>
 
-    <div v-else class="builds">
+    <div v-else class="builds" ref="buildsRef">
       <div
-        v-for="build in builds"
+        v-for="(build, idx) in builds"
         :key="build.number"
         class="build-item"
-        @click="openBuild(build.url)"
+        :class="{ 'is-keyboard-selected': nav.focusedPanel.value === 'history' && nav.historyIndex.value === idx }"
+        @click="openLog(build)"
+        :data-build-index="idx"
       >
         <div class="build-main">
           <div class="build-info">
@@ -54,14 +63,23 @@
         <span class="build-link">→</span>
       </div>
     </div>
+
+    <BuildLogModal
+      v-if="logBuild"
+      :build="logBuild"
+      :job-name="props.selectedJob || ''"
+      @close="closeLog"
+    />
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, watch, onUnmounted } from 'vue'
+import { ref, watch, onUnmounted, nextTick } from 'vue'
 import type { BuildInfo } from '../types'
 import { useInstances } from '../composables/useInstances'
 import { useBuildPolling } from '../composables/useBuildPolling'
+import { useKeyboardNav } from '../composables/useKeyboardNav'
+import BuildLogModal from './BuildLogModal.vue'
 
 const props = defineProps<{
   selectedJob?: string
@@ -69,10 +87,13 @@ const props = defineProps<{
 
 const { currentClient } = useInstances()
 const { currentBuilds, startPolling, stopPolling } = useBuildPolling()
+const nav = useKeyboardNav()
 
 const builds = ref<BuildInfo[]>([])
 const loading = ref(false)
 const error = ref<string | null>(null)
+const logBuild = ref<BuildInfo | null>(null)
+const buildsRef = ref<HTMLElement | null>(null)
 
 /**
  * 加载构建历史
@@ -189,12 +210,80 @@ const formatTime = (timestamp: number): string => {
 }
 
 /**
- * 打开构建页面
+ * 打开日志弹窗（替代原直接跳转 Jenkins 的行为）
+ */
+const openLog = (build: BuildInfo) => {
+  logBuild.value = build
+}
+
+const closeLog = () => {
+  logBuild.value = null
+}
+
+/**
+ * 点击本面板任何位置 → 焦点切到 history
+ */
+const focusPanel = () => {
+  if (nav.focusedPanel.value !== 'history') {
+    nav.setFocusedPanel('history')
+  }
+}
+
+/**
+ * historyIndex 越界裁剪
+ */
+const clampHistoryIndex = () => {
+  const n = builds.value.length
+  if (n === 0) {
+    nav.historyIndex.value = 0
+  } else if (nav.historyIndex.value >= n) {
+    nav.historyIndex.value = n - 1
+  } else if (nav.historyIndex.value < 0) {
+    nav.historyIndex.value = 0
+  }
+}
+
+watch(builds, () => clampHistoryIndex())
+
+/**
+ * 同级内移动（↑↓）
+ */
+const moveInSiblings = (delta: number) => {
+  const n = builds.value.length
+  if (n === 0) return
+  nav.historyIndex.value = Math.max(0, Math.min(n - 1, nav.historyIndex.value + delta))
+  scrollSelectedIntoView()
+}
+
+/**
+ * 主操作：打开选中条目的日志弹窗
  */
-const openBuild = (url: string) => {
-  window.ztools.shellOpenExternal(url)
+const primaryAction = () => {
+  const target = builds.value[nav.historyIndex.value]
+  if (target) openLog(target)
 }
 
+/**
+ * 滚动选中项入视
+ */
+const scrollSelectedIntoView = () => {
+  nextTick(() => {
+    const root = buildsRef.value
+    if (!root) return
+    const el = root.querySelector(`[data-build-index="${nav.historyIndex.value}"]`) as HTMLElement | null
+    if (el) el.scrollIntoView({ block: 'nearest' })
+  })
+}
+
+defineExpose({
+  focusPanel,
+  moveInSiblings,
+  primaryAction,
+  handleEsc: () => {
+    if (logBuild.value) closeLog()
+  }
+})
+
 // 监听选中 Job 变化
 watch(() => props.selectedJob, (job) => {
   if (job) {
@@ -239,6 +328,35 @@ onUnmounted(() => {
   font-weight: 600;
 }
 
+.keyboard-hint {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 4px 12px;
+  padding: 6px 12px;
+  font-size: 10px;
+  color: var(--text-secondary, #999);
+  border-bottom: 1px solid var(--border-color, #e0e0e0);
+  background: var(--bg-secondary, #fafafa);
+  line-height: 1.6;
+}
+
+.keyboard-hint kbd {
+  display: inline-block;
+  padding: 0 4px;
+  min-width: 14px;
+  text-align: center;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  font-size: 10px;
+  color: var(--text-color, #333);
+  background: var(--bg-color, #fff);
+  border: 1px solid var(--border-color, #e0e0e0);
+  border-bottom-width: 2px;
+  border-radius: 3px;
+  line-height: 14px;
+  margin: 0 1px;
+}
+
 .refresh-btn {
   padding: 4px 8px;
   border: none;
@@ -306,6 +424,11 @@ onUnmounted(() => {
   background: var(--bg-hover, #f5f5f5);
 }
 
+.build-item.is-keyboard-selected {
+  background: var(--primary-bg, rgba(0, 120, 212, 0.15));
+  box-shadow: inset 2px 0 0 var(--primary-color, #0078d4);
+}
+
 .build-main {
   flex: 1;
   display: flex;
diff --git a/plugins/jenkins-lite/src/components/BuildLogModal.vue b/plugins/jenkins-lite/src/components/BuildLogModal.vue
new file mode 100644
index 00000000..928860b3
--- /dev/null
+++ b/plugins/jenkins-lite/src/components/BuildLogModal.vue
@@ -0,0 +1,553 @@
+<template>
+  <div class="modal-overlay" @click.self="handleClose">
+    <div class="modal">
+      <div class="modal-header">
+        <div class="header-left">
+          <span
+            class="build-status-dot"
+            :class="getBuildClass(build)"
+          ></span>
+          <span class="build-title">{{ jobName }} #{{ build.number }}</span>
+          <span class="build-result">{{ getBuildResultText(build) }}</span>
+        </div>
+        <button class="close-btn" @click="handleClose" title="关闭">
+          <span class="close-icon"></span>
+        </button>
+      </div>
+
+      <div class="meta">
+        <div class="meta-row">
+          <span class="meta-label">开始</span>
+          <span class="meta-value">{{ formatStartTime(build.timestamp) }}</span>
+        </div>
+        <div class="meta-row" v-if="!build.building && build.duration">
+          <span class="meta-label">结束</span>
+          <span class="meta-value">{{ formatEndTime(build.timestamp, build.duration) }}</span>
+        </div>
+        <div class="meta-row">
+          <span class="meta-label">耗时</span>
+          <span class="meta-value">{{ formatDuration(build.duration, build.building) }}</span>
+        </div>
+        <div class="meta-row meta-hint">
+          <kbd>↑</kbd><kbd>↓</kbd> 滚动 ·
+          <kbd>PgUp</kbd><kbd>PgDn</kbd> 翻页 ·
+          <kbd>Home</kbd><kbd>End</kbd> 顶/底
+        </div>
+      </div>
+
+      <div class="log-body" ref="logBodyRef">
+        <div v-if="loading" class="log-loading">加载日志中...</div>
+        <div v-else-if="error" class="log-error">{{ error }}</div>
+        <div v-else-if="!consoleText" class="log-empty">暂无日志输出</div>
+        <pre v-else class="log-pre">
+          <span
+            v-for="(line, idx) in consoleLines"
+            :key="idx"
+            class="log-line"
+            :class="{ 'log-line-error': isErrorLine(line) }"
+          >{{ line }}</span>
+        </pre>
+      </div>
+
+      <div class="modal-footer">
+        <button class="btn btn-default" @click="openInJenkins" title="在浏览器中打开 Jenkins 详情页">
+          在 Jenkins 中打开
+        </button>
+        <div class="footer-right">
+          <button class="btn btn-default" @click="copyErrorLog" :disabled="!errorLines.length || loading" :title="errorLines.length ? `共 ${errorLines.length} 行错误` : '没有错误行'">
+            复制错误 <span v-if="errorLines.length" class="error-count">({{ errorLines.length }})</span>
+          </button>
+          <button class="btn btn-default" @click="copyLog" :disabled="!consoleText || loading">
+            复制日志
+          </button>
+          <button class="btn btn-primary" @click="handleClose">关闭</button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch, onMounted, onUnmounted, nextTick } from 'vue'
+import type { BuildInfo } from '../types'
+import { useInstances } from '../composables/useInstances'
+
+const props = defineProps<{
+  build: BuildInfo
+  jobName: string
+}>()
+
+const emit = defineEmits<{
+  (e: 'close'): void
+}>()
+
+const { currentClient } = useInstances()
+const consoleText = ref('')
+const loading = ref(false)
+const error = ref<string | null>(null)
+const logBodyRef = ref<HTMLElement | null>(null)
+
+/**
+ * 关闭弹窗时把焦点还回打开它的那条 build（而不是跳去搜索框）
+ */
+let previouslyFocused: HTMLElement | null = null
+
+/**
+ * 弹窗打开时用 ↑↓ / PgUp / PgDn / Home / End 控制日志滚动条（替代面板间的选中移动）
+ */
+const handleScrollKeydown = (e: KeyboardEvent) => {
+  if (!logBodyRef.value) return
+  const el = logBodyRef.value
+  const lineHeight = 18 // 与 .log-pre line-height 1.55 + font-size 12 ≈ 18px 同步
+  let delta = 0
+
+  if (e.key === 'ArrowDown') delta = lineHeight
+  else if (e.key === 'ArrowUp') delta = -lineHeight
+  else if (e.key === 'PageDown') delta = el.clientHeight - lineHeight
+  else if (e.key === 'PageUp') delta = -(el.clientHeight - lineHeight)
+  else if (e.key === 'Home') {
+    el.scrollTop = 0
+    e.preventDefault()
+    e.stopPropagation()
+    e.stopImmediatePropagation()
+    return
+  } else if (e.key === 'End') {
+    el.scrollTop = el.scrollHeight
+    e.preventDefault()
+    e.stopPropagation()
+    e.stopImmediatePropagation()
+    return
+  } else {
+    return
+  }
+
+  if (delta !== 0) {
+    el.scrollTop += delta
+    e.preventDefault()
+    e.stopPropagation()
+    e.stopImmediatePropagation()
+  }
+}
+
+window.addEventListener('keydown', handleScrollKeydown, { capture: true })
+
+/**
+ * 错误关键词：包含任一项的行会被标红高亮
+ */
+const ERROR_KEYWORDS = ['ERROR', 'Exception', 'FATAL', 'BUILD FAILURE', 'failed', 'Error:']
+
+/**
+ * 把日志按行拆分用于逐行渲染 + 错误高亮
+ */
+const consoleLines = computed(() => consoleText.value.split('\n'))
+
+/**
+ * 行级错误判定
+ */
+const isErrorLine = (line: string): boolean => {
+  if (!line) return false
+  return ERROR_KEYWORDS.some(kw => line.includes(kw))
+}
+
+/**
+ * 仅含错误关键字的行（用于复制错误日志 / 计数显示）
+ */
+const errorLines = computed(() => consoleLines.value.filter(isErrorLine))
+
+/**
+ * 自动滚到日志末尾
+ */
+const scrollLogToBottom = () => {
+  nextTick(() => {
+    const el = logBodyRef.value
+    if (!el) return
+    el.scrollTop = el.scrollHeight
+  })
+}
+
+/**
+ * 拉取构建日志
+ */
+const fetchLog = async () => {
+  if (!currentClient.value) {
+    error.value = '未连接到 Jenkins'
+    return
+  }
+
+  loading.value = true
+  error.value = null
+  consoleText.value = ''
+
+  const result = await currentClient.value.getBuildConsole(props.jobName, props.build.number)
+
+  if (result.error) {
+    error.value = `加载失败: ${result.error}`
+  } else {
+    consoleText.value = result.data || ''
+  }
+
+  loading.value = false
+}
+
+const handleClose = () => {
+  emit('close')
+}
+
+const openInJenkins = () => {
+  if (props.build.url) {
+    window.ztools.shellOpenExternal(props.build.url)
+  }
+}
+
+const copyLog = () => {
+  if (!consoleText.value) return
+  window.ztools.copyText(consoleText.value)
+  window.ztools.showNotification('日志已复制', 'Jenkins Lite')
+}
+
+/**
+ * 仅复制错误行
+ */
+const copyErrorLog = () => {
+  const lines = errorLines.value
+  if (lines.length === 0) return
+  window.ztools.copyText(lines.join('\n'))
+  window.ztools.showNotification(`已复制 ${lines.length} 行错误日志`, 'Jenkins Lite')
+}
+
+/**
+ * 状态样式
+ */
+const getBuildClass = (build: BuildInfo): string => {
+  if (build.building) return 'building'
+  if (build.result === 'SUCCESS') return 'success'
+  if (build.result === 'FAILURE') return 'failure'
+  if (build.result === 'UNSTABLE') return 'unstable'
+  if (build.result === 'ABORTED') return 'aborted'
+  return ''
+}
+
+const getBuildResultText = (build: BuildInfo): string => {
+  if (build.building) return '运行中'
+  if (build.result === 'SUCCESS') return '成功'
+  if (build.result === 'FAILURE') return '失败'
+  if (build.result === 'UNSTABLE') return '不稳定'
+  if (build.result === 'ABORTED') return '中止'
+  return ''
+}
+
+const formatStartTime = (timestamp: number): string => {
+  const date = new Date(timestamp)
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`
+}
+
+const formatEndTime = (timestamp: number, duration: number): string => {
+  const endTimestamp = timestamp + duration
+  const date = new Date(endTimestamp)
+  return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}`
+}
+
+const formatDuration = (duration: number, building: boolean): string => {
+  if (building) return '运行中...'
+  if (!duration) return '-'
+  const seconds = Math.floor(duration / 1000)
+  const minutes = Math.floor(seconds / 60)
+  const secs = seconds % 60
+  if (minutes > 0) return `${minutes}分${secs}秒`
+  return `${secs}秒`
+}
+
+const pad = (n: number): string => n.toString().padStart(2, '0')
+
+// 打开即拉日志；日志到达后自动滚到底部
+watch(() => props.build.number, () => {
+  fetchLog()
+}, { immediate: true })
+
+// 日志内容更新 → 滚到底
+watch(consoleText, () => {
+  scrollLogToBottom()
+})
+
+/**
+ * Esc 关闭弹窗。
+ * ZTools 主进程在 BrowserWindow 层面有内置"Esc 退出插件"行为，可能吃 stopPropagation。
+ * 这里用最激进的组合：capture + preventDefault + stopImmediatePropagation。
+ * 关闭后焦点还原到打开它的 build（不是搜索框），由 onUnmounted 里的 restoreFocus 处理。
+ */
+const handleKeydown = (e: KeyboardEvent) => {
+  if (e.key !== 'Escape') return
+  e.preventDefault()
+  e.stopPropagation()
+  e.stopImmediatePropagation()
+  handleClose()
+}
+
+window.addEventListener('keydown', handleKeydown, { capture: true })
+
+onMounted(() => {
+  // 记录打开弹窗前的焦点元素（一般是点开的那条 build）
+  previouslyFocused = document.activeElement as HTMLElement | null
+})
+
+onUnmounted(() => {
+  window.removeEventListener('keydown', handleKeydown, { capture: true } as any)
+  window.removeEventListener('keydown', handleScrollKeydown, { capture: true } as any)
+  // 还原焦点到打开弹窗的 build 条目，方便继续 ↑↓ / Enter 操作
+  if (previouslyFocused && typeof previouslyFocused.focus === 'function') {
+    nextTick(() => previouslyFocused?.focus({ preventScroll: true }))
+  }
+})
+</script>
+
+<style scoped>
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1100;
+}
+
+.modal {
+  background: var(--bg-color, #fff);
+  border-radius: 8px;
+  width: 720px;
+  max-width: 90vw;
+  max-height: 80vh;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  border: 1px solid var(--border-color, #e0e0e0);
+}
+
+.modal-header {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 14px 16px;
+  border-bottom: 1px solid var(--border-color, #e0e0e0);
+}
+
+.header-left {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  flex: 1;
+  overflow: hidden;
+}
+
+.build-status-dot {
+  width: 10px;
+  height: 10px;
+  border-radius: 50%;
+  flex-shrink: 0;
+}
+.build-status-dot.success { background: #52c41a; }
+.build-status-dot.failure { background: #ff4d4f; }
+.build-status-dot.unstable { background: #faad14; }
+.build-status-dot.aborted { background: #8c8c8c; }
+.build-status-dot.building { background: #1890ff; animation: pulse 1.5s infinite; }
+
+@keyframes pulse {
+  0%, 100% { opacity: 1; }
+  50% { opacity: 0.5; }
+}
+
+.build-title {
+  font-weight: 600;
+  font-size: 14px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+.build-result {
+  font-size: 12px;
+  color: var(--text-secondary, #666);
+}
+
+.close-btn {
+  width: 28px;
+  height: 28px;
+  border: none;
+  background: transparent;
+  cursor: pointer;
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  transition: background 0.15s;
+}
+
+.close-btn:hover {
+  background: var(--bg-hover, #f0f0f0);
+}
+
+.close-icon {
+  position: relative;
+  width: 14px;
+  height: 14px;
+}
+.close-icon::before,
+.close-icon::after {
+  content: '';
+  position: absolute;
+  top: 50%;
+  left: 0;
+  width: 100%;
+  height: 1.5px;
+  background: var(--text-secondary, #888);
+}
+.close-icon::before { transform: rotate(45deg); }
+.close-icon::after { transform: rotate(-45deg); }
+
+.meta {
+  display: flex;
+  gap: 24px;
+  padding: 10px 16px;
+  border-bottom: 1px solid var(--border-color, #e0e0e0);
+  background: var(--bg-secondary, #fafafa);
+  flex-wrap: wrap;
+}
+
+.meta-row {
+  display: flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 12px;
+}
+
+.meta-hint {
+  margin-left: auto;
+  font-size: 10px;
+  color: var(--text-secondary, #999);
+}
+
+.meta-hint kbd {
+  display: inline-block;
+  padding: 0 4px;
+  min-width: 14px;
+  text-align: center;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  font-size: 10px;
+  color: var(--text-color, #333);
+  background: var(--bg-color, #fff);
+  border: 1px solid var(--border-color, #e0e0e0);
+  border-bottom-width: 2px;
+  border-radius: 3px;
+  line-height: 14px;
+  margin: 0 1px;
+}
+
+.error-count {
+  color: #ff4d4f;
+  font-weight: 600;
+}
+
+.meta-label {
+  color: var(--text-secondary, #999);
+}
+
+.meta-value {
+  color: var(--text-color, #333);
+  font-variant-numeric: tabular-nums;
+}
+
+.log-body {
+  flex: 1 1 auto;
+  overflow: auto;
+  background: var(--bg-secondary, #1e1e1e);
+  min-height: 120px;
+  /* 用 min/max-height 区间给 log-body 弹性空间，确保 footer 始终可见 */
+}
+
+.log-loading,
+.log-error,
+.log-empty {
+  padding: 32px;
+  text-align: center;
+  color: var(--text-secondary, #888);
+  font-size: 13px;
+}
+
+.log-error {
+  color: #ff7875;
+}
+
+.log-pre {
+  margin: 0;
+  padding: 14px 16px;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  font-size: 12px;
+  line-height: 1.55;
+  color: #d4d4d4;
+  white-space: pre-wrap;
+  word-break: break-all;
+}
+
+.log-line {
+  display: block;
+}
+
+.log-line-error {
+  color: #ff7875;
+  background: rgba(255, 77, 79, 0.12);
+  border-left: 2px solid #ff4d4f;
+  padding-left: 6px;
+  margin-left: -8px;
+}
+
+.modal-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 12px 16px;
+  border-top: 1px solid var(--border-color, #e0e0e0);
+  background: var(--bg-color, #fff);
+  flex: 0 0 auto; /* footer 永远在底部，不被压缩或滚动 */
+}
+
+.footer-right {
+  display: flex;
+  gap: 8px;
+}
+
+.btn {
+  padding: 6px 14px;
+  border-radius: 4px;
+  cursor: pointer;
+  font-size: 13px;
+  transition: background 0.15s, opacity 0.15s;
+}
+
+.btn-default {
+  background: var(--bg-color, #fff);
+  border: 1px solid var(--border-color, #e0e0e0);
+  color: var(--text-color, #333);
+}
+
+.btn-default:hover:not(:disabled) {
+  background: var(--bg-hover, #f0f0f0);
+}
+
+.btn-default:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.btn-primary {
+  background: var(--primary-color, #0078d4);
+  border: 1px solid var(--primary-color, #0078d4);
+  color: #fff;
+}
+
+.btn-primary:hover {
+  filter: brightness(0.92);
+}
+</style>
\ No newline at end of file
diff --git a/plugins/jenkins-lite/src/components/JobItem.vue b/plugins/jenkins-lite/src/components/JobItem.vue
index 557ff87c..8d3915ca 100644
--- a/plugins/jenkins-lite/src/components/JobItem.vue
+++ b/plugins/jenkins-lite/src/components/JobItem.vue
@@ -1,10 +1,15 @@
 <template>
-  <div class="job-item">
+  <div
+    class="job-item"
+    :class="{ 'is-keyboard-selected': props.isSelected }"
+    :data-job-path="job.fullName || job.name"
+  >
     <div class="job-info" @click="handleClick">
       <span
         v-if="isFolder"
         class="folder-arrow"
-        :class="{ expanded }"
+        :class="{ expanded: isExpanded }"
+        @click.stop="handleToggleExpand"
       ></span>
       <span class="job-name" :title="displayName">{{ displayName }}</span>
     </div>
@@ -28,40 +33,46 @@
     </div>
 
     <!-- 子 Jobs（Folder 展开） -->
-    <div v-if="job.jobs && job.jobs.length > 0 && expanded" class="job-children">
+    <div v-if="isFolder && job.jobs && job.jobs.length > 0 && isExpanded" class="job-children">
       <JobItem
         v-for="child in job.jobs"
         :key="child.url"
         :job="child"
         :favorited="false"
         :show-full-name="showFullName"
+        :expanded="props.expandedMap?.has(child.fullName || child.name) ?? false"
+        :expanded-map="props.expandedMap"
+        :selected-path="props.selectedPath"
         @toggle-favorite="emit('toggle-favorite', $event)"
         @build="emit('build', $event)"
         @click="emit('click', $event)"
+        @toggle-expand="emit('toggle-expand', $event)"
       />
     </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from 'vue'
+import { computed } from 'vue'
 import type { JobInfo } from '../types'
-import { JOB_COLOR_MAP } from '../types'
 
 const props = defineProps<{
   job: JobInfo
   favorited: boolean
   showFullName?: boolean
+  expanded?: boolean
+  expandedMap?: Set<string>
+  selectedPath?: string | null
+  isSelected?: boolean
 }>()
 
 const emit = defineEmits<{
   (e: 'toggle-favorite', job: JobInfo): void
   (e: 'build', job: JobInfo): void
   (e: 'click', job: JobInfo): void
+  (e: 'toggle-expand', job: JobInfo): void
 }>()
 
-const expanded = ref(false)
-
 const displayName = computed(() => {
   return props.showFullName ? (props.job.fullName || props.job.name) : props.job.name
 })
@@ -73,13 +84,24 @@ const isFolder = computed(() => {
   return Array.isArray(props.job.jobs) || /(?:Folder|MultiBranchProject)$/.test(props.job._class || '')
 })
 
+const isExpanded = computed(() => {
+  if (props.expandedMap) {
+    return props.expandedMap.has(props.job.fullName || props.job.name)
+  }
+  return !!props.expanded
+})
+
 const handleClick = () => {
   if (isFolder.value) {
-    expanded.value = !expanded.value
+    emit('toggle-expand', props.job)
     return
   }
   emit('click', props.job)
 }
+
+const handleToggleExpand = () => {
+  emit('toggle-expand', props.job)
+}
 </script>
 
 <style scoped>
@@ -92,13 +114,18 @@ const handleClick = () => {
   background: var(--bg-color, #fff);
   border-radius: 6px;
   cursor: pointer;
-  transition: background 0.2s;
+  transition: background 0.2s, box-shadow 0.15s;
 }
 
 .job-item:hover {
   background: var(--bg-hover, #f5f5f5);
 }
 
+.job-item.is-keyboard-selected {
+  background: var(--primary-bg, rgba(0, 120, 212, 0.15));
+  box-shadow: inset 2px 0 0 var(--primary-color, #0078d4);
+}
+
 .job-info {
   flex: 1;
   display: flex;
@@ -115,6 +142,7 @@ const handleClick = () => {
   border-left: 5px solid var(--text-secondary, #888);
   transition: transform 0.15s;
   flex-shrink: 0;
+  cursor: pointer;
 }
 
 .folder-arrow.expanded {
@@ -135,7 +163,8 @@ const handleClick = () => {
   transition: opacity 0.2s;
 }
 
-.job-item:hover .job-actions {
+.job-item:hover .job-actions,
+.job-item.is-keyboard-selected .job-actions {
   opacity: 1;
 }
 
@@ -193,4 +222,4 @@ const handleClick = () => {
   margin-left: 10px;
   margin-top: 2px;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/plugins/jenkins-lite/src/components/JobsList.vue b/plugins/jenkins-lite/src/components/JobsList.vue
index db4ad9d7..200803a2 100644
--- a/plugins/jenkins-lite/src/components/JobsList.vue
+++ b/plugins/jenkins-lite/src/components/JobsList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="jobs-list">
+  <div class="jobs-list" @click="focusPanel">
     <div class="jobs-header">
       <input
         ref="searchInputRef"
@@ -7,12 +7,22 @@
         type="text"
         class="search-input"
         placeholder="搜索 Jobs..."
+        @focus="focusPanel"
       />
       <button class="refresh-btn" @click="refreshJobs" :disabled="loading">
         <span class="refresh-icon" :class="{ spinning: loading }"></span>
       </button>
     </div>
 
+    <div class="keyboard-hint">
+      <span><kbd>←</kbd><kbd>→</kbd> 切面板</span>
+      <span><kbd>↑</kbd><kbd>↓</kbd> 同级</span>
+      <span><kbd>⇧</kbd><kbd>↑</kbd><kbd>↓</kbd> 跨层</span>
+      <span><kbd>Enter</kbd> 构建</span>
+      <span><kbd>⌘</kbd><kbd>Enter</kbd> 收藏</span>
+      <span><kbd>Esc</kbd> 关闭</span>
+    </div>
+
     <div class="jobs-content">
       <div v-if="loading" class="loading">
         加载中...
@@ -26,45 +36,74 @@
         没有找到 Jobs
       </div>
 
-      <div v-else class="jobs">
+      <div v-else class="jobs" ref="jobsContentRef">
         <JobItem
           v-for="job in filteredJobs"
           :key="job.url"
           :job="job"
           :favorited="checkFavorited(job.fullName || job.name)"
           :show-full-name="props.currentView === '__favorites__'"
+          :expanded-map="expandedFolders"
+          :selected-path="selectedPath"
+          :is-selected="isSelectedJob(job)"
           @toggle-favorite="handleToggleFavorite"
           @build="handleBuild"
           @click="handleJobClick"
+          @toggle-expand="toggleExpand"
         />
       </div>
     </div>
 
     <!-- 构建确认弹窗 -->
     <div v-if="buildConfirmJob" class="modal-overlay" @click.self="cancelBuild">
-      <div class="modal">
+      <div class="modal" ref="buildConfirmModalRef" tabindex="-1">
         <div class="modal-header">确认构建</div>
         <div class="modal-body">
           确定要触发 <strong>{{ buildConfirmJob.name }}</strong> 的构建吗？
+          <div class="modal-hint">按 Enter 确认 / Esc 取消</div>
         </div>
         <div class="modal-footer">
           <button class="btn btn-default" @click="cancelBuild">取消</button>
-          <button class="btn btn-primary" @click="confirmBuild" :disabled="building">
+          <button class="btn btn-primary" @click="confirmBuild" :disabled="building" ref="buildConfirmOkRef">
             {{ building ? '构建中...' : '确认构建' }}
           </button>
         </div>
       </div>
     </div>
+
+    <!-- 收藏确认弹窗（键盘触发 Cmd+Enter 走二次确认） -->
+    <div v-if="favoriteConfirmJob" class="modal-overlay" @click.self="cancelFavorite">
+      <div class="modal" ref="favoriteConfirmModalRef" tabindex="-1">
+        <div class="modal-header">确认收藏</div>
+        <div class="modal-body">
+          <template v-if="isJobFavorited(favoriteConfirmJob)">
+            确定要取消 <strong>{{ favoriteConfirmJob.name }}</strong> 的收藏吗？
+          </template>
+          <template v-else>
+            确定要收藏 <strong>{{ favoriteConfirmJob.name }}</strong> 吗？
+          </template>
+          <div class="modal-hint">按 Enter 确认 / Esc 取消</div>
+        </div>
+        <div class="modal-footer">
+          <button class="btn btn-default" @click="cancelFavorite">取消</button>
+          <button class="btn btn-primary" @click="confirmFavorite" ref="favoriteConfirmOkRef">
+            确认
+          </button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, onMounted, nextTick } from 'vue'
+import { ref, computed, watch, onMounted, onUnmounted, nextTick } from 'vue'
 import JobItem from './JobItem.vue'
 import { useInstances } from '../composables/useInstances'
 import { useFavorites } from '../composables/useFavorites'
+import { useBuildPolling } from '../composables/useBuildPolling'
+import { useKeyboardNav } from '../composables/useKeyboardNav'
 import { flattenFavoriteJobs } from '../utils/jobs'
-import type { JobInfo } from '../types'
+import type { JobInfo, BuildInfo } from '../types'
 
 const props = defineProps<{
   selectedJob?: string
@@ -76,10 +115,13 @@ const props = defineProps<{
 const emit = defineEmits<{
   (e: 'job-click', job: JobInfo): void
   (e: 'build-complete', result: { jobName: string; success: boolean }): void
+  (e: 'focus-jobs'): void
 }>()
 
 const { currentInstance, currentClient, loadInstances } = useInstances()
 const { isFavorited, toggleFavorite, loadFavorites, favorites } = useFavorites()
+const { watchBuild, stopWatchingBuild } = useBuildPolling()
+const nav = useKeyboardNav()
 
 /**
  * 收藏的 Job 名称集合（响应式）
@@ -100,13 +142,87 @@ const checkFavorited = (jobName: string): boolean => {
   return favoritedJobs.value.has(jobName)
 }
 
+const isJobFavorited = (job: JobInfo | null): boolean => {
+  if (!job) return false
+  return checkFavorited(job.fullName || job.name)
+}
+
 const jobs = ref<JobInfo[]>([])
 const loading = ref(false)
 const error = ref<string | null>(null)
 const searchQuery = ref(props.initialQuery || '')
 const searchInputRef = ref<HTMLInputElement | null>(null)
+const jobsContentRef = ref<HTMLElement | null>(null)
 const buildConfirmJob = ref<JobInfo | null>(null)
+const favoriteConfirmJob = ref<JobInfo | null>(null)
 const building = ref(false)
+const buildConfirmModalRef = ref<HTMLElement | null>(null)
+const favoriteConfirmModalRef = ref<HTMLElement | null>(null)
+const buildConfirmOkRef = ref<HTMLButtonElement | null>(null)
+const favoriteConfirmOkRef = ref<HTMLButtonElement | null>(null)
+
+/**
+ * 关闭弹窗时把焦点还原到触发它的那条 Job（不是搜索框）
+ */
+const lastFocusedJobEl = ref<HTMLElement | null>(null)
+const captureFocusForModal = () => {
+  lastFocusedJobEl.value = document.activeElement as HTMLElement | null
+}
+const restoreFocusFromModal = () => {
+  nextTick(() => {
+    const el = lastFocusedJobEl.value
+    if (el && typeof el.focus === 'function') {
+      el.focus({ preventScroll: true })
+    }
+  })
+  lastFocusedJobEl.value = null
+}
+
+/**
+ * 受控的 Folder 展开集合（fullName 集合）
+ */
+const expandedFolders = ref<Set<string>>(new Set())
+
+/**
+ * 当前选中的 Job path（jobsParentPath + jobsIndex 派生）
+ */
+const selectedPath = computed<string | null>(() => {
+  const siblings = getChildren(nav.jobsParentPath.value)
+  const node = siblings[nav.jobsIndex.value]
+  return node ? (node.fullName || node.name) : null
+})
+
+/**
+ * 给 JobItem 用的高亮判定：path 全等
+ */
+const isSelectedJob = (job: JobInfo): boolean => {
+  return (job.fullName || job.name) === selectedPath.value
+}
+
+/**
+ * 获取 parentPath 下的直接子节点列表
+ * parentPath=null 时返回顶级（filteredJobs 顶层）
+ */
+const getChildren = (parentPath: string | null): JobInfo[] => {
+  if (parentPath === null || parentPath === '') return filteredJobs.value
+  const node = findNode(filteredJobs.value, parentPath)
+  return node?.jobs || []
+}
+
+/**
+ * 递归查找节点
+ */
+const findNode = (jobList: JobInfo[], path: string): JobInfo | null => {
+  for (const job of jobList) {
+    const name = job.fullName || job.name
+    if (name === path) return job
+    if (job.jobs) {
+      const found = findNode(job.jobs, path)
+      if (found) return found
+    }
+  }
+  return null
+}
 
 /**
  * 加载 Jobs
@@ -189,7 +305,18 @@ const filterJobsRecursive = (jobList: JobInfo[], query: string): JobInfo[] => {
 }
 
 /**
- * 处理收藏切换
+ * Folder 展开/收拢切换
+ */
+const toggleExpand = (job: JobInfo) => {
+  const name = job.fullName || job.name
+  const next = new Set(expandedFolders.value)
+  if (next.has(name)) next.delete(name)
+  else next.add(name)
+  expandedFolders.value = next
+}
+
+/**
+ * 处理收藏切换（鼠标点击走即时路径，不弹确认）
  */
 const handleToggleFavorite = (job: JobInfo) => {
   if (!currentInstance.value) return
@@ -202,14 +329,17 @@ const handleToggleFavorite = (job: JobInfo) => {
 }
 
 /**
- * 处理构建
+ * 处理构建（鼠标点击 / 键盘 Enter 都走这里 → 弹出确认）
  */
 const handleBuild = (job: JobInfo) => {
+  captureFocusForModal()
   buildConfirmJob.value = job
+  nextTick(() => buildConfirmModalRef.value?.focus())
 }
 
 const cancelBuild = () => {
   buildConfirmJob.value = null
+  restoreFocusFromModal()
 }
 
 const confirmBuild = async () => {
@@ -218,18 +348,66 @@ const confirmBuild = async () => {
   building.value = true
   const jobName = buildConfirmJob.value.fullName || buildConfirmJob.value.name
 
+  // 触发前抓基线最大 build number，用于后续识别本次触发的新 build
+  const baselineResult = await currentClient.value.getBuilds(jobName)
+  const baselineMax = baselineResult.data && baselineResult.data.length > 0
+    ? Math.max(...baselineResult.data.map(b => b.number))
+    : 0
+
   const result = await currentClient.value.triggerBuild(jobName)
 
   building.value = false
   buildConfirmJob.value = null
+  restoreFocusFromModal()
 
   if (result.error) {
     window.ztools.showNotification(`构建触发失败: ${result.error}`, 'Jenkins Lite')
-  } else {
-    window.ztools.showNotification(`${jobName} 构建已触发`, 'Jenkins Lite')
-    // 刷新 Jobs 列表以更新状态
-    setTimeout(() => loadJobs(), 2000)
+    return
   }
+
+  window.ztools.showNotification(`${jobName} 构建已触发，正在监听结果...`, 'Jenkins Lite')
+  // 刷新 Jobs 列表以更新状态
+  setTimeout(() => loadJobs(), 2000)
+
+  // 监听本次触发的 build 完成；watchBuild 会一直轮询直到目标 build 出现在队列并完成
+  const targetBuildNumber = baselineMax + 1
+  watchBuild(jobName, targetBuildNumber, (build: BuildInfo) => {
+    const resultText = formatBuildResultForNotification(build.result)
+    window.ztools.showNotification(
+      `${jobName} #${build.number} 构建${resultText}`,
+      'Jenkins Lite'
+    )
+    emit('build-complete', { jobName, success: build.result === 'SUCCESS' })
+    if (props.selectedJob === jobName) {
+      loadJobs()
+    }
+  })
+}
+
+/**
+ * 构建结果 → 通知文案
+ */
+const formatBuildResultForNotification = (result: BuildInfo['result']): string => {
+  if (result === 'SUCCESS') return '成功'
+  if (result === 'FAILURE') return '失败'
+  if (result === 'UNSTABLE') return '不稳定'
+  if (result === 'ABORTED') return '已中止'
+  return '结束'
+}
+
+/**
+ * 收藏确认（键盘触发）
+ */
+const cancelFavorite = () => {
+  favoriteConfirmJob.value = null
+  restoreFocusFromModal()
+}
+
+const confirmFavorite = () => {
+  if (!favoriteConfirmJob.value) return
+  handleToggleFavorite(favoriteConfirmJob.value)
+  favoriteConfirmJob.value = null
+  restoreFocusFromModal()
 }
 
 /**
@@ -239,24 +417,183 @@ const handleJobClick = (job: JobInfo) => {
   emit('job-click', job)
 }
 
-// 监听实例变化
-watch(currentInstance, () => {
-  loadJobs()
-})
+/**
+ * 点击本面板任何位置 → 焦点切到 jobs
+ */
+const focusPanel = () => {
+  if (nav.focusedPanel.value !== 'jobs') {
+    nav.setFocusedPanel('jobs')
+  }
+  emit('focus-jobs')
+}
+
+// ========== 键盘导航接口（供 App.vue 的 window keydown 调用） ==========
+
+/**
+ * 获取父路径与同级 index
+ */
+const getParentInfo = (path: string): { parentPath: string | null; index: number } => {
+  const segments = path.split('/')
+  if (segments.length === 1) return { parentPath: null, index: 0 }
+  const parentPath = segments.slice(0, -1).join('/')
+  const siblings = getChildren(parentPath)
+  const index = siblings.findIndex(j => (j.fullName || j.name) === path)
+  return { parentPath, index: Math.max(0, index) }
+}
+
+/**
+ * 限制 siblingIndex 合法范围
+ */
+const clampJobsIndex = () => {
+  const siblings = getChildren(nav.jobsParentPath.value)
+  if (siblings.length === 0) {
+    nav.jobsIndex.value = 0
+  } else if (nav.jobsIndex.value >= siblings.length) {
+    nav.jobsIndex.value = siblings.length - 1
+  } else if (nav.jobsIndex.value < 0) {
+    nav.jobsIndex.value = 0
+  }
+}
 
-// 监听选中的 Job
-watch(() => props.selectedJob, (newJob) => {
-  if (newJob) {
-    const job = findJob(jobs.value, newJob)
-    if (job) {
-      handleJobClick(job)
+/**
+ * 当前选中节点（用于滚动入视等）
+ */
+const getCurrentNode = (): JobInfo | null => {
+  const siblings = getChildren(nav.jobsParentPath.value)
+  return siblings[nav.jobsIndex.value] || null
+}
+
+/**
+ * 在同级内移动（plain ↑↓）
+ */
+const moveInSiblings = (delta: number) => {
+  const siblings = getChildren(nav.jobsParentPath.value)
+  if (siblings.length === 0) {
+    nav.jobsParentPath.value = null
+    nav.jobsIndex.value = 0
+    return
+  }
+  nav.jobsIndex.value = Math.max(0, Math.min(siblings.length - 1, nav.jobsIndex.value + delta))
+  scrollSelectedIntoView()
+  syncRightPanelWithSelection()
+}
+
+/**
+ * 跨层移动（Shift+↑↓）
+ * delta=+1: 进入 Folder 的第一个子（若当前是 Folder 且已展开或将被自动展开）
+ * delta=-1: 跳到父 Folder
+ */
+const moveTree = (delta: number) => {
+  const current = getCurrentNode()
+  if (!current) return
+  const fullName = current.fullName || current.name
+
+  if (delta > 0) {
+    // Shift+Down: 进 Folder
+    if (!current.jobs || current.jobs.length === 0) return
+    // 自动展开
+    if (!expandedFolders.value.has(fullName)) {
+      const next = new Set(expandedFolders.value)
+      next.add(fullName)
+      expandedFolders.value = next
     }
+    nav.jobsParentPath.value = fullName
+    nav.jobsIndex.value = 0
+  } else {
+    // Shift+Up: 出到父 Folder
+    if (!current.fullName || !current.fullName.includes('/')) return
+    const parentInfo = getParentInfo(current.fullName)
+    nav.jobsParentPath.value = parentInfo.parentPath
+    nav.jobsIndex.value = parentInfo.index
+  }
+  clampJobsIndex()
+  scrollSelectedIntoView()
+  syncRightPanelWithSelection()
+}
+
+/**
+ * 键盘移动选中项后，把当前 leaf job 自动同步给右侧构建历史面板
+ * （Folder 不联动 —— Folder 不可构建）
+ */
+const syncRightPanelWithSelection = () => {
+  const current = getCurrentNode()
+  if (!current) return
+  if (current.jobs && current.jobs.length > 0) return // Folder 跳过
+  handleJobClick(current)
+}
+
+/**
+ * 主操作（Enter）：
+ * - Folder: 展开/收拢
+ * - Leaf: 弹出构建确认
+ */
+const primaryAction = () => {
+  const current = getCurrentNode()
+  if (!current) return
+  if (current.jobs && current.jobs.length > 0) {
+    toggleExpand(current)
+    return
+  }
+  handleBuild(current)
+}
+
+/**
+ * 收藏操作（Cmd/Ctrl + Enter）：
+ * - 仅 Leaf 触发，Folder 直接忽略
+ * - 走二次确认弹窗
+ */
+const favoriteAction = () => {
+  const current = getCurrentNode()
+  if (!current) return
+  if (current.jobs && current.jobs.length > 0) return // Folder 跳过
+  captureFocusForModal()
+  favoriteConfirmJob.value = current
+  nextTick(() => favoriteConfirmModalRef.value?.focus())
+}
+
+/**
+ * 把当前选中节点滚动入视
+ */
+const scrollSelectedIntoView = () => {
+  nextTick(() => {
+    const root = jobsContentRef.value
+    if (!root) return
+    const path = selectedPath.value
+    if (!path) return
+    const el = root.querySelector(`[data-job-path="${CSS.escape(path)}"]`) as HTMLElement | null
+    if (el) el.scrollIntoView({ block: 'nearest' })
+  })
+}
+
+// 暴露给 App.vue 的接口
+defineExpose({
+  focusPanel,
+  moveInSiblings,
+  moveTree,
+  primaryAction,
+  favoriteAction,
+  handleEsc: () => {
+    // 弹窗 Esc 关闭：优先最近的
+    if (favoriteConfirmJob.value) cancelFavorite()
+    else if (buildConfirmJob.value) cancelBuild()
   }
 })
 
-// 监听视图变化，重新加载 Jobs，并自动选中第一个
+// 监听实例变化
+watch(currentInstance, () => {
+  loadJobs()
+})
+
+// 监听视图变化，重置选中路径
 watch(() => props.currentView, () => {
   loadJobs()
+  nav.jobsParentPath.value = null
+  nav.jobsIndex.value = 0
+})
+
+// 监听 jobs 数据变化，调整 index 不越界
+watch(filteredJobs, () => {
+  clampJobsIndex()
 })
 
 // 当 Jobs 加载完成后，自动选中第一个（收藏视图除外）
@@ -278,17 +615,6 @@ watch(() => props.focusKey, (key) => {
   }
 })
 
-const findJob = (jobList: JobInfo[], name: string): JobInfo | null => {
-  for (const job of jobList) {
-    if ((job.fullName || job.name) === name) return job
-    if (job.jobs) {
-      const found = findJob(job.jobs, name)
-      if (found) return found
-    }
-  }
-  return null
-}
-
 // 获取第一个 Job（递归）
 const getFirstJob = (jobList: JobInfo[]): JobInfo | null => {
   for (const job of jobList) {
@@ -307,6 +633,58 @@ onMounted(async () => {
   loadFavorites()
   loadJobs()
 })
+
+/**
+ * Esc 关闭当前打开的弹窗（优先收藏确认，其次构建确认）。
+ * Enter 触发确认（按"确认"按钮）。
+ * ZTools 主进程有内置"Esc 退出插件"行为，单靠 stopPropagation 不够；用 capture +
+ * preventDefault + stopImmediatePropagation。
+ * 焦点还原到打开弹窗的那条 Job（不是搜索框），由 cancelBuild / cancelFavorite
+ * 里的 restoreFocusFromModal 处理。
+ */
+const handleEsc = () => {
+  if (favoriteConfirmJob.value) cancelFavorite()
+  else if (buildConfirmJob.value) cancelBuild()
+}
+
+const handleEnter = () => {
+  // 构建中重复触发会重复构建，需拦截
+  if (building.value) return
+  if (favoriteConfirmJob.value) confirmFavorite()
+  else if (buildConfirmJob.value) confirmBuild()
+}
+
+const handleWindowKeydown = (e: KeyboardEvent) => {
+  if (!buildConfirmJob.value && !favoriteConfirmJob.value) return
+
+  if (e.key === 'Escape') {
+    e.preventDefault()
+    e.stopPropagation()
+    e.stopImmediatePropagation()
+    handleEsc()
+    return
+  }
+
+  if (e.key === 'Enter') {
+    // 不抢输入框里的 Enter（搜索框等）
+    const target = e.target as HTMLElement | null
+    if (target && (target.tagName === 'INPUT' || target.tagName === 'TEXTAREA' || target.isContentEditable)) {
+      return
+    }
+    e.preventDefault()
+    e.stopPropagation()
+    e.stopImmediatePropagation()
+    handleEnter()
+  }
+}
+
+window.addEventListener('keydown', handleWindowKeydown, { capture: true })
+
+onUnmounted(() => {
+  // 组件卸载时清掉所有未结束的 build watcher，避免内存泄漏
+  stopWatchingBuild()
+  window.removeEventListener('keydown', handleWindowKeydown, { capture: true } as any)
+})
 </script>
 
 <style scoped>
@@ -338,6 +716,35 @@ onMounted(async () => {
   border-color: var(--primary-color, #0078d4);
 }
 
+.keyboard-hint {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  gap: 4px 12px;
+  padding: 6px 12px;
+  font-size: 10px;
+  color: var(--text-secondary, #999);
+  border-bottom: 1px solid var(--border-color, #e0e0e0);
+  background: var(--bg-secondary, #fafafa);
+  line-height: 1.6;
+}
+
+.keyboard-hint kbd {
+  display: inline-block;
+  padding: 0 4px;
+  min-width: 14px;
+  text-align: center;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  font-size: 10px;
+  color: var(--text-color, #333);
+  background: var(--bg-color, #fff);
+  border: 1px solid var(--border-color, #e0e0e0);
+  border-bottom-width: 2px;
+  border-radius: 3px;
+  line-height: 14px;
+  margin: 0 1px;
+}
+
 .refresh-btn {
   padding: 8px 12px;
   border: 1px solid var(--border-color, #e0e0e0);
@@ -410,6 +817,7 @@ onMounted(async () => {
   border-radius: 8px;
   width: 320px;
   overflow: hidden;
+  outline: none;
 }
 
 .modal-header {
@@ -422,6 +830,12 @@ onMounted(async () => {
   padding: 24px 16px;
 }
 
+.modal-hint {
+  margin-top: 12px;
+  font-size: 11px;
+  color: var(--text-secondary, #999);
+}
+
 .modal-footer {
   padding: 12px 16px;
   display: flex;
@@ -453,4 +867,4 @@ onMounted(async () => {
   opacity: 0.6;
   cursor: not-allowed;
 }
-</style>
+</style>
\ No newline at end of file
diff --git a/plugins/jenkins-lite/src/components/Sidebar.vue b/plugins/jenkins-lite/src/components/Sidebar.vue
index 7f0ebcea..27d20290 100644
--- a/plugins/jenkins-lite/src/components/Sidebar.vue
+++ b/plugins/jenkins-lite/src/components/Sidebar.vue
@@ -1,5 +1,5 @@
 <template>
-  <aside class="sidebar">
+  <aside class="sidebar" @click="focusPanel">
     <div class="sidebar-header">
       <h1 class="logo">Jenkins Lite</h1>
     </div>
@@ -29,7 +29,7 @@
       </div>
     </div>
 
-    <nav class="sidebar-nav">
+    <nav class="sidebar-nav" ref="navRef">
       <!-- Jenkins 视图列表 + 收藏 -->
       <div class="nav-section" v-if="hasInstances && currentInstance">
         <div class="nav-section-title">视图</div>
@@ -37,9 +37,13 @@
         <!-- 收藏 - 作为特殊视图 -->
         <div
           class="nav-item favorite-view-item"
-          :class="{ active: props.currentView === '__favorites__' }"
+          :class="{
+            active: props.currentView === '__favorites__',
+            'is-keyboard-selected': nav.focusedPanel.value === 'sidebar' && nav.sidebarIndex.value === 0
+          }"
           @click="selectView('__favorites__')"
           title="收藏的 Jobs"
+          data-nav-index="0"
         >
           <span class="nav-icon star-icon"></span>
           <span class="nav-label">收藏</span>
@@ -50,11 +54,15 @@
 
         <!-- Jenkins 视图列表 -->
         <div
-          v-for="view in views"
+          v-for="(view, idx) in views"
           :key="view.name"
           class="nav-item"
-          :class="{ active: props.currentView === view.name }"
+          :class="{
+            active: props.currentView === view.name,
+            'is-keyboard-selected': nav.focusedPanel.value === 'sidebar' && nav.sidebarIndex.value === idx + 1
+          }"
           @click="selectView(view.name)"
+          :data-nav-index="idx + 1"
         >
           <span class="nav-icon view-icon"></span>
           <span class="nav-label" :title="view.name">{{ view.name }}</span>
@@ -66,6 +74,11 @@
     </nav>
 
     <div class="sidebar-footer">
+      <div class="keyboard-hint">
+        <kbd>←</kbd><kbd>→</kbd> 切面板
+        <span class="hint-sep">·</span>
+        <kbd>↑</kbd><kbd>↓</kbd> 切换视图
+      </div>
       <a class="footer-link" href="https://github.com/kshq1996/ztools-jenkins" target="_blank" title="查看开源仓库">
         <span class="github-icon"></span>
         <span>开源 v{{ version }}</span>
@@ -75,9 +88,10 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, onMounted } from 'vue'
+import { ref, computed, watch, onMounted, nextTick } from 'vue'
 import { useInstances } from '../composables/useInstances'
 import { useFavorites } from '../composables/useFavorites'
+import { useKeyboardNav } from '../composables/useKeyboardNav'
 import type { Favorite, JenkinsView } from '../types'
 
 const props = defineProps<{
@@ -90,14 +104,17 @@ const emit = defineEmits<{
   (e: 'view-change', viewName: string): void
   (e: 'open-settings'): void
   (e: 'add-instance'): void
+  (e: 'focus-sidebar'): void
 }>()
 
 const { instances, currentInstance, currentClient, hasInstances, switchInstance } = useInstances()
 const { favorites } = useFavorites()
+const nav = useKeyboardNav()
 
 const views = ref<JenkinsView[]>([])
 const showServiceMenu = ref(false)
-const version = '1.2.1'
+const version = '1.4.0'
+const navRef = ref<HTMLElement | null>(null)
 
 /** 当前实例的收藏（按添加时间倒序） */
 const currentInstanceFavorites = computed(() => {
@@ -107,6 +124,29 @@ const currentInstanceFavorites = computed(() => {
     .sort((a, b) => b.addedAt - a.addedAt)
 })
 
+/**
+ * 导航项总数（收藏 + 视图）
+ */
+const navItemsCount = computed(() => {
+  return 1 + views.value.length // 1 = 收藏
+})
+
+/**
+ * sidebarIndex 越界裁剪
+ */
+const clampSidebarIndex = () => {
+  const n = navItemsCount.value
+  if (n === 0) {
+    nav.sidebarIndex.value = 0
+  } else if (nav.sidebarIndex.value >= n) {
+    nav.sidebarIndex.value = n - 1
+  } else if (nav.sidebarIndex.value < 0) {
+    nav.sidebarIndex.value = 0
+  }
+}
+
+watch(navItemsCount, () => clampSidebarIndex())
+
 const toggleServiceMenu = () => {
   showServiceMenu.value = !showServiceMenu.value
 }
@@ -137,6 +177,66 @@ const selectView = (viewName: string) => {
   emit('view-change', viewName)
 }
 
+/**
+ * 根据 sidebarIndex 选中目标视图 / 收藏
+ */
+const activateNavItem = (index: number) => {
+  if (index === 0) {
+    selectView('__favorites__')
+  } else {
+    const view = views.value[index - 1]
+    if (view) selectView(view.name)
+  }
+}
+
+/**
+ * 同级内移动（↑↓）
+ * 选中即切换视图 —— 不再需要回车确认，直接查询/加载
+ */
+const moveInSiblings = (delta: number) => {
+  const n = navItemsCount.value
+  if (n === 0) return
+  nav.sidebarIndex.value = Math.max(0, Math.min(n - 1, nav.sidebarIndex.value + delta))
+  scrollSelectedIntoView()
+  // 移动即选中（与 JobsList 的"键盘移动联动右侧"一致）
+  activateNavItem(nav.sidebarIndex.value)
+}
+
+/**
+ * 主操作（Enter）：保留点击 / Enter 切换的兜底（鼠标点击不触发 moveInSiblings）
+ */
+const primaryAction = () => {
+  activateNavItem(nav.sidebarIndex.value)
+}
+
+/**
+ * 滚动选中项入视
+ */
+const scrollSelectedIntoView = () => {
+  nextTick(() => {
+    const root = navRef.value
+    if (!root) return
+    const el = root.querySelector(`[data-nav-index="${nav.sidebarIndex.value}"]`) as HTMLElement | null
+    if (el) el.scrollIntoView({ block: 'nearest' })
+  })
+}
+
+/**
+ * 点击本面板 → 焦点切到 sidebar
+ */
+const focusPanel = () => {
+  if (nav.focusedPanel.value !== 'sidebar') {
+    nav.setFocusedPanel('sidebar')
+  }
+  emit('focus-sidebar')
+}
+
+defineExpose({
+  focusPanel,
+  moveInSiblings,
+  primaryAction
+})
+
 watch(currentInstance, () => loadViews())
 watch(currentClient, () => {
   if (currentClient.value) loadViews()
@@ -331,6 +431,10 @@ onMounted(() => {
   color: var(--primary-color, #0078d4);
 }
 
+.nav-item.is-keyboard-selected {
+  box-shadow: inset 2px 0 0 var(--primary-color, #0078d4);
+}
+
 .nav-icon {
   width: 14px;
   height: 14px;
@@ -394,6 +498,38 @@ onMounted(() => {
   border-top: 1px solid var(--border-color, #e0e0e0);
 }
 
+.keyboard-hint {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 4px;
+  font-size: 10px;
+  color: var(--text-secondary, #999);
+  padding: 4px 8px;
+  margin-bottom: 6px;
+  line-height: 1.6;
+}
+
+.keyboard-hint .hint-sep {
+  margin: 0 2px;
+  color: var(--text-secondary, #aaa);
+}
+
+.keyboard-hint kbd {
+  display: inline-block;
+  padding: 0 4px;
+  min-width: 14px;
+  text-align: center;
+  font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
+  font-size: 10px;
+  color: var(--text-color, #333);
+  background: var(--bg-color, #fff);
+  border: 1px solid var(--border-color, #e0e0e0);
+  border-bottom-width: 2px;
+  border-radius: 3px;
+  line-height: 14px;
+}
+
 .footer-link {
   display: flex;
   align-items: center;
diff --git a/plugins/jenkins-lite/src/composables/useBuildPolling.ts b/plugins/jenkins-lite/src/composables/useBuildPolling.ts
index cfb79fc8..5ccd4922 100644
--- a/plugins/jenkins-lite/src/composables/useBuildPolling.ts
+++ b/plugins/jenkins-lite/src/composables/useBuildPolling.ts
@@ -6,6 +6,9 @@ let pollingInterval: ReturnType<typeof setInterval> | null = null
 let currentPollingJob: string | null = null
 const currentBuilds = ref<BuildInfo[]>([])
 
+// 独立 watch 句柄池：key = `${jobName}#${buildNumber}`
+const buildWatchers = new Map<string, ReturnType<typeof setInterval>>()
+
 export function useBuildPolling() {
   const { currentClient } = useInstances()
 
@@ -61,11 +64,77 @@ export function useBuildPolling() {
     return completed.length > 0 ? completed[0] : null
   }
 
+  /**
+   * 监听某个 build 是否结束（独立计时器，可并行多个，不影响 currentBuilds）
+   * - 每 intervalMs 拉一次该 Job 的构建列表
+   * - 找到 number === buildNumber 且 !building 时清掉定时器并 onComplete(build)
+   * - 若 build 还没出现在队列里（刚 trigger），会继续轮询直至出现
+   */
+  const watchBuild = (
+    jobName: string,
+    buildNumber: number,
+    onComplete: (build: BuildInfo) => void,
+    intervalMs = 5000
+  ) => {
+    const key = `${jobName}#${buildNumber}`
+    // 同一 build 已存在 watcher：先清掉旧的
+    stopWatchingBuild(jobName, buildNumber)
+
+    const tick = async () => {
+      if (!currentClient.value) return
+      const result = await currentClient.value.getBuilds(jobName)
+      if (result.error || !result.data) return // 出错等下一轮
+      const found = result.data.find(b => b.number === buildNumber)
+      if (found && !found.building) {
+        stopWatchingBuild(jobName, buildNumber)
+        onComplete(found)
+      }
+    }
+
+    // 立即跑一次，然后定时
+    tick()
+    const timer = setInterval(tick, intervalMs)
+    buildWatchers.set(key, timer)
+  }
+
+  /**
+   * 停止监听某个 build（buildNumber 缺省则清掉该 job 的所有 watcher；jobName 与 buildNumber 都缺省则清空全部）
+   */
+  const stopWatchingBuild = (jobName?: string, buildNumber?: number) => {
+    if (buildNumber === undefined && (jobName === undefined || jobName === '')) {
+      for (const timer of buildWatchers.values()) {
+        clearInterval(timer)
+      }
+      buildWatchers.clear()
+      return
+    }
+    if (buildNumber === undefined) {
+      const prefix = `${jobName}#`
+      for (const [key, timer] of buildWatchers) {
+        if (key.startsWith(prefix)) {
+          clearInterval(timer)
+          buildWatchers.delete(key)
+        }
+      }
+      return
+    }
+    const key = `${jobName}#${buildNumber}`
+    const timer = buildWatchers.get(key)
+    if (timer) {
+      clearInterval(timer)
+      buildWatchers.delete(key)
+    }
+  }
+
   /**
    * 清理
    */
   onUnmounted(() => {
     stopPolling()
+    for (const timer of buildWatchers.values()) {
+      clearInterval(timer)
+    }
+    buildWatchers.clear()
   })
 
   return {
@@ -74,6 +143,8 @@ export function useBuildPolling() {
     stopPolling,
     hasBuilding,
     getLastCompletedBuild,
-    fetchBuilds
+    fetchBuilds,
+    watchBuild,
+    stopWatchingBuild
   }
-}
+}
\ No newline at end of file
diff --git a/plugins/jenkins-lite/src/composables/useKeyboardNav.ts b/plugins/jenkins-lite/src/composables/useKeyboardNav.ts
new file mode 100644
index 00000000..080e4f74
--- /dev/null
+++ b/plugins/jenkins-lite/src/composables/useKeyboardNav.ts
@@ -0,0 +1,59 @@
+import { ref, provide, inject, type Ref, type InjectionKey } from 'vue'
+
+export type FocusedPanel = 'sidebar' | 'jobs' | 'history'
+
+const PANEL_ORDER: FocusedPanel[] = ['sidebar', 'jobs', 'history']
+
+// 模块级共享状态：单实例插件只需一份
+export const focusedPanel = ref<FocusedPanel>('sidebar')
+export const sidebarIndex = ref(0)
+// jobs 面板采用 (parentPath, index) 二元定位以支持跨层导航
+// parentPath=null 代表顶级（filteredJobs 顶层）
+export const jobsParentPath = ref<string | null>(null)
+export const jobsIndex = ref(0)
+export const historyIndex = ref(0)
+
+export function setFocusedPanel(p: FocusedPanel) {
+  focusedPanel.value = p
+}
+
+export function cyclePanel(dir: 1 | -1) {
+  const i = PANEL_ORDER.indexOf(focusedPanel.value)
+  focusedPanel.value = PANEL_ORDER[(i + dir + PANEL_ORDER.length) % PANEL_ORDER.length]
+}
+
+export interface KeyboardNav {
+  focusedPanel: Ref<FocusedPanel>
+  sidebarIndex: Ref<number>
+  jobsParentPath: Ref<string | null>
+  jobsIndex: Ref<number>
+  historyIndex: Ref<number>
+  setFocusedPanel: (p: FocusedPanel) => void
+  cyclePanel: (dir: 1 | -1) => void
+}
+
+export const KEYBOARD_NAV_KEY: InjectionKey<KeyboardNav> = Symbol('keyboard-nav')
+
+/**
+ * 在根组件 setup 中调用，向后代注入键盘导航上下文。
+ * 注意：provide/inject 在 Vue 3 里只能父→子，不能同组件自取自用（provide 存到
+ * instance.provides，但同组件 inject 走的是 appContext / parent.provides）。
+ * 因此本组件要使用导航状态，请直接 import 模块级 ref（如 focusedPanel）。
+ */
+export function provideKeyboardNav() {
+  provide(KEYBOARD_NAV_KEY, {
+    focusedPanel,
+    sidebarIndex,
+    jobsParentPath,
+    jobsIndex,
+    historyIndex,
+    setFocusedPanel,
+    cyclePanel,
+  })
+}
+
+export function useKeyboardNav(): KeyboardNav {
+  const nav = inject(KEYBOARD_NAV_KEY)
+  if (!nav) throw new Error('KeyboardNav context not provided')
+  return nav
+}
\ No newline at end of file
diff --git a/plugins/jenkins-lite/src/dev/mockZtools.ts b/plugins/jenkins-lite/src/dev/mockZtools.ts
index cebf2841..82351a04 100644
--- a/plugins/jenkins-lite/src/dev/mockZtools.ts
+++ b/plugins/jenkins-lite/src/dev/mockZtools.ts
@@ -175,6 +175,30 @@ export const servicesMock = {
     testConnection: async (url: string, username: string, apiToken: string) => {
       await delay(800)
       return { success: true, error: null }
+    },
+    getBuildConsole: async (url: string, username: string, apiToken: string, jobName: string, buildNumber: number) => {
+      await delay(300)
+      const sample = [
+        `Started by user admin`,
+        `Running on Jenkins agent in workspace /var/jenkins_home/workspace/${jobName}`,
+        `[Pipeline] Start of Pipeline`,
+        `[Pipeline] node`,
+        `[Pipeline] { (Checkout)`,
+        `[Pipeline] echo 'Checking out source code'`,
+        `[Pipeline] sh 'git fetch origin'`,
+        `[Pipeline] sh 'git checkout main'`,
+        `[Pipeline] }`,
+        `[Pipeline] { (Build)`,
+        `[Pipeline] sh 'npm ci'`,
+        `[Pipeline] sh 'npm run build'`,
+        `[Pipeline] sh 'npm run test'`,
+        `[Pipeline] }`,
+        `[Pipeline] // node`,
+        `[Pipeline] End of Pipeline`,
+        `Finished: SUCCESS`,
+        ``
+      ].join('\n')
+      return { data: sample, error: null }
     }
   }
 }
diff --git a/plugins/jenkins-lite/src/utils/jenkins.ts b/plugins/jenkins-lite/src/utils/jenkins.ts
index b72f668a..a1ee9682 100644
--- a/plugins/jenkins-lite/src/utils/jenkins.ts
+++ b/plugins/jenkins-lite/src/utils/jenkins.ts
@@ -33,4 +33,8 @@ export class JenkinsClient {
   async getViewJobs(viewName: string): Promise<{ data: JobInfo[]; error: string | null }> {
     return (window.services as any).jenkins.getViewJobs(this.jenkinsUrl, this.username, this.apiToken, viewName)
   }
+
+  async getBuildConsole(jobName: string, buildNumber: number): Promise<{ data: string; error: string | null }> {
+    return (window.services as any).jenkins.getBuildConsole(this.jenkinsUrl, this.username, this.apiToken, jobName, buildNumber)
+  }
 }
diff --git a/plugins/jenkins-lite/tests/App.smoke.test.ts b/plugins/jenkins-lite/tests/App.smoke.test.ts
new file mode 100644
index 00000000..28529cc7
--- /dev/null
+++ b/plugins/jenkins-lite/tests/App.smoke.test.ts
@@ -0,0 +1,50 @@
+// @vitest-environment jsdom
+
+import { mount } from '@vue/test-utils'
+import { describe, expect, it } from 'vitest'
+import { nextTick } from 'vue'
+import App from '../src/App.vue'
+
+describe('App smoke', () => {
+  it('mounts without throwing', async () => {
+    // setup minimal window.ztools mocks
+    ;(window as any).ztools = {
+      dbStorage: {
+        getItem: () => undefined,
+        setItem: () => {},
+        removeItem: () => {}
+      },
+      db: {
+        allDocs: () => [],
+        put: () => ({ ok: true, id: '' }),
+        get: () => null,
+        remove: () => ({ ok: true, id: '' })
+      },
+      showNotification: () => {},
+      shellOpenExternal: () => {},
+      copyText: () => {},
+      getPath: () => '',
+      onPluginEnter: () => {},
+      getWindowType: () => 'main',
+      isDev: () => true
+    }
+    ;(window as any).services = {
+      jenkins: {
+        getJobs: async () => ({ data: [], error: null }),
+        getBuilds: async () => ({ data: [], error: null }),
+        triggerBuild: async () => ({ error: null }),
+        getViews: async () => ({ data: [], error: null }),
+        getViewJobs: async () => ({ data: [], error: null }),
+        testConnection: async () => ({ success: true, error: null }),
+        getBuildConsole: async () => ({ data: '', error: null })
+      }
+    }
+
+    const wrapper = mount(App)
+    expect(wrapper.exists()).toBe(true)
+    await nextTick()
+    // App should render 3 panels
+    const html = wrapper.html()
+    expect(html.length).toBeGreaterThan(100)
+  })
+})
\ No newline at end of file
diff --git a/plugins/jenkins-lite/tests/JobItem.test.ts b/plugins/jenkins-lite/tests/JobItem.test.ts
index e4358ebf..7cab6b89 100644
--- a/plugins/jenkins-lite/tests/JobItem.test.ts
+++ b/plugins/jenkins-lite/tests/JobItem.test.ts
@@ -2,6 +2,7 @@
 
 import { mount } from '@vue/test-utils'
 import { describe, expect, it } from 'vitest'
+import { ref } from 'vue'
 import JobItem from '../src/components/JobItem.vue'
 import type { JobInfo } from '../src/types'
 
@@ -21,13 +22,26 @@ describe('JobItem folders', () => {
       _class: 'com.cloudbees.hudson.plugins.folder.Folder',
       jobs: [child]
     }
+    const expandedMap = ref<Set<string>>(new Set())
     const wrapper = mount(JobItem, {
-      props: { job: folder, favorited: false }
+      props: {
+        job: folder,
+        favorited: false,
+        expandedMap: expandedMap.value
+      }
     })
 
     expect(wrapper.findAll('.job-item')).toHaveLength(1)
     await wrapper.find('.job-info').trigger('click')
 
+    // 模拟父组件响应 toggle-expand 事件：把 folder 的 fullName 加进 expandedMap
+    const emits = wrapper.emitted('toggle-expand')
+    expect(emits).toBeDefined()
+    const toggled = emits![0][0] as JobInfo
+    expandedMap.value = new Set([...expandedMap.value, toggled.fullName || toggled.name])
+    await wrapper.setProps({ expandedMap: expandedMap.value })
+    await wrapper.vm.$nextTick()
+
     expect(wrapper.findAll('.job-item')).toHaveLength(2)
     expect(wrapper.emitted('click')).toBeUndefined()
 
@@ -49,4 +63,4 @@ describe('JobItem folders', () => {
     expect(wrapper.find('.job-name').text()).toBe('team/services/deploy')
     expect(wrapper.find('.folder-arrow').exists()).toBe(false)
   })
-})
+})
\ No newline at end of file
diff --git a/plugins/jenkins-lite/tests/preload.test.ts b/plugins/jenkins-lite/tests/preload.test.ts
index 6f7823c6..abadc31c 100644
--- a/plugins/jenkins-lite/tests/preload.test.ts
+++ b/plugins/jenkins-lite/tests/preload.test.ts
@@ -94,4 +94,14 @@ describe('Jenkins folder traversal', () => {
     expect(requestedPaths).toContainEqual(expect.stringMatching(/^\/job\/team\/job\/deploy\/api\/json/))
     expect(requestedPaths).toContain('/job/team/job/deploy/build')
   })
+
+  it('fetches console text for a nested build with the same per-segment job path', async () => {
+    const { service, requestedPaths } = loadJenkinsService()
+
+    const result = await service.getBuildConsole('http://jenkins.example', 'user', 'token', 'team/deploy', 42)
+
+    expect(result.error).toBeNull()
+    expect(typeof result.data).toBe('string')
+    expect(requestedPaths).toContain('/job/team/job/deploy/42/consoleText')
+  })
 })