diff --git a/package.json b/package.json
index f9e0ed6..466b55f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "codeforge",
   "private": true,
-  "version": "26.4.0",
+  "version": "26.5.0",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index ba99ea0..12dd2b3 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -4,7 +4,7 @@ version = 4
 
 [[package]]
 name = "CodeForge"
-version = "26.4.0"
+version = "26.5.0"
 dependencies = [
  "async-trait",
  "chrono",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 3c263cd..7396e42 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "CodeForge"
-version = "26.4.0"
+version = "26.5.0"
 description = "CodeForge 是一款轻量级、高性能的桌面代码执行器，专为开发者、学生和编程爱好者设计。"
 authors = ["devlive-community"]
 edition = "2024"
diff --git a/src-tauri/src/filesystem.rs b/src-tauri/src/filesystem.rs
index d165366..0a758ed 100644
--- a/src-tauri/src/filesystem.rs
+++ b/src-tauri/src/filesystem.rs
@@ -1328,6 +1328,18 @@ pub async fn git_merge(root: String, branch: String) -> Result<String, String> {
         .map_err(|e| format!("git 任务失败: {}", e))?
 }
 
+/// 冲突文件整文件取一侧：side = "ours" | "theirs"，取该侧内容并暂存（标记已解决）。
+#[tauri::command]
+pub async fn git_resolve_side(root: String, path: String, side: String) -> Result<String, String> {
+    let flag = if side == "theirs" { "--theirs" } else { "--ours" };
+    tokio::task::spawn_blocking(move || {
+        run_git(&root, &["checkout", flag, "--", &path])?;
+        run_git(&root, &["add", "--", &path])
+    })
+    .await
+    .map_err(|e| format!("git 任务失败: {}", e))?
+}
+
 #[derive(Serialize)]
 pub struct GitCommit {
     hash: String,
diff --git a/src-tauri/src/github.rs b/src-tauri/src/github.rs
new file mode 100644
index 0000000..3b1b6e3
--- /dev/null
+++ b/src-tauri/src/github.rs
@@ -0,0 +1,241 @@
+//! GitHub REST API 集成：用用户配置的 token 直接在应用内创建/查看 PR 与 Issue。
+use serde::Serialize;
+use serde_json::{Value, json};
+
+const API: &str = "https://api.github.com";
+
+#[derive(Serialize)]
+pub struct PrItem {
+    number: u64,
+    title: String,
+    url: String,
+    state: String,
+    head: String,
+    base: String,
+    author: String,
+    draft: bool,
+}
+
+#[derive(Serialize)]
+pub struct IssueItem {
+    number: u64,
+    title: String,
+    url: String,
+    state: String,
+    author: String,
+    comments: u64,
+}
+
+fn client() -> reqwest::Client {
+    reqwest::Client::new()
+}
+
+// 统一的鉴权 GET
+async fn api_get(token: &str, path: &str) -> Result<Value, String> {
+    let resp = client()
+        .get(format!("{}{}", API, path))
+        .header("Authorization", format!("Bearer {}", token))
+        .header("Accept", "application/vnd.github+json")
+        .header("User-Agent", "CodeForge")
+        .header("X-GitHub-Api-Version", "2022-11-28")
+        .send()
+        .await
+        .map_err(|e| format!("请求失败: {}", e))?;
+    let status = resp.status();
+    let data: Value = resp
+        .json()
+        .await
+        .map_err(|e| format!("解析响应失败: {}", e))?;
+    if !status.is_success() {
+        return Err(extract_error(&data, status.as_u16()));
+    }
+    Ok(data)
+}
+
+// 统一的鉴权 POST
+async fn api_post(token: &str, path: &str, body: Value) -> Result<Value, String> {
+    let resp = client()
+        .post(format!("{}{}", API, path))
+        .header("Authorization", format!("Bearer {}", token))
+        .header("Accept", "application/vnd.github+json")
+        .header("User-Agent", "CodeForge")
+        .header("X-GitHub-Api-Version", "2022-11-28")
+        .json(&body)
+        .send()
+        .await
+        .map_err(|e| format!("请求失败: {}", e))?;
+    let status = resp.status();
+    let data: Value = resp
+        .json()
+        .await
+        .map_err(|e| format!("解析响应失败: {}", e))?;
+    if !status.is_success() {
+        return Err(extract_error(&data, status.as_u16()));
+    }
+    Ok(data)
+}
+
+fn extract_error(data: &Value, status: u16) -> String {
+    let msg = data["message"].as_str().unwrap_or("未知错误");
+    // 附带首个字段级错误，便于定位
+    let detail = data["errors"][0]["message"]
+        .as_str()
+        .map(|s| format!("（{}）", s))
+        .unwrap_or_default();
+    format!("GitHub API 错误 ({}): {}{}", status, msg, detail)
+}
+
+fn pr_from(v: &Value) -> PrItem {
+    PrItem {
+        number: v["number"].as_u64().unwrap_or(0),
+        title: v["title"].as_str().unwrap_or("").to_string(),
+        url: v["html_url"].as_str().unwrap_or("").to_string(),
+        state: v["state"].as_str().unwrap_or("").to_string(),
+        head: v["head"]["ref"].as_str().unwrap_or("").to_string(),
+        base: v["base"]["ref"].as_str().unwrap_or("").to_string(),
+        author: v["user"]["login"].as_str().unwrap_or("").to_string(),
+        draft: v["draft"].as_bool().unwrap_or(false),
+    }
+}
+
+fn issue_from(v: &Value) -> IssueItem {
+    IssueItem {
+        number: v["number"].as_u64().unwrap_or(0),
+        title: v["title"].as_str().unwrap_or("").to_string(),
+        url: v["html_url"].as_str().unwrap_or("").to_string(),
+        state: v["state"].as_str().unwrap_or("").to_string(),
+        author: v["user"]["login"].as_str().unwrap_or("").to_string(),
+        comments: v["comments"].as_u64().unwrap_or(0),
+    }
+}
+
+fn require_token(token: &str) -> Result<(), String> {
+    if token.trim().is_empty() {
+        return Err("未配置 GitHub Token（设置 → 通用 → GitHub）".to_string());
+    }
+    Ok(())
+}
+
+/// 列出仓库的 Pull Request（默认 open）。
+#[tauri::command]
+pub async fn github_list_prs(
+    token: String,
+    owner: String,
+    repo: String,
+    state: Option<String>,
+) -> Result<Vec<PrItem>, String> {
+    require_token(&token)?;
+    let st = state.unwrap_or_else(|| "open".to_string());
+    let data = api_get(
+        &token,
+        &format!("/repos/{}/{}/pulls?state={}&per_page=50", owner, repo, st),
+    )
+    .await?;
+    Ok(data
+        .as_array()
+        .map(|a| a.iter().map(pr_from).collect())
+        .unwrap_or_default())
+}
+
+/// 创建 Pull Request。
+#[tauri::command]
+pub async fn github_create_pr(
+    token: String,
+    owner: String,
+    repo: String,
+    title: String,
+    head: String,
+    base: String,
+    body: Option<String>,
+    draft: Option<bool>,
+) -> Result<PrItem, String> {
+    require_token(&token)?;
+    let payload = json!({
+        "title": title,
+        "head": head,
+        "base": base,
+        "body": body.unwrap_or_default(),
+        "draft": draft.unwrap_or(false),
+    });
+    let data = api_post(&token, &format!("/repos/{}/{}/pulls", owner, repo), payload).await?;
+    Ok(pr_from(&data))
+}
+
+/// 列出仓库的 Issue（默认 open；GitHub 会把 PR 也算作 issue，这里过滤掉）。
+#[tauri::command]
+pub async fn github_list_issues(
+    token: String,
+    owner: String,
+    repo: String,
+    state: Option<String>,
+) -> Result<Vec<IssueItem>, String> {
+    require_token(&token)?;
+    let st = state.unwrap_or_else(|| "open".to_string());
+    let data = api_get(
+        &token,
+        &format!("/repos/{}/{}/issues?state={}&per_page=50", owner, repo, st),
+    )
+    .await?;
+    Ok(data
+        .as_array()
+        .map(|a| {
+            a.iter()
+                .filter(|v| v.get("pull_request").is_none())
+                .map(issue_from)
+                .collect()
+        })
+        .unwrap_or_default())
+}
+
+#[derive(Serialize)]
+pub struct RepoBranches {
+    default_branch: String,
+    branches: Vec<String>,
+}
+
+/// 取仓库的默认分支与全部分支（供新建 PR 选择 base）。
+#[tauri::command]
+pub async fn github_repo_branches(
+    token: String,
+    owner: String,
+    repo: String,
+) -> Result<RepoBranches, String> {
+    require_token(&token)?;
+    let info = api_get(&token, &format!("/repos/{}/{}", owner, repo)).await?;
+    let default_branch = info["default_branch"]
+        .as_str()
+        .unwrap_or("main")
+        .to_string();
+    let brs = api_get(
+        &token,
+        &format!("/repos/{}/{}/branches?per_page=100", owner, repo),
+    )
+    .await?;
+    let branches = brs
+        .as_array()
+        .map(|a| {
+            a.iter()
+                .filter_map(|b| b["name"].as_str().map(String::from))
+                .collect()
+        })
+        .unwrap_or_default();
+    Ok(RepoBranches {
+        default_branch,
+        branches,
+    })
+}
+
+/// 创建 Issue。
+#[tauri::command]
+pub async fn github_create_issue(
+    token: String,
+    owner: String,
+    repo: String,
+    title: String,
+    body: Option<String>,
+) -> Result<IssueItem, String> {
+    require_token(&token)?;
+    let payload = json!({ "title": title, "body": body.unwrap_or_default() });
+    let data = api_post(&token, &format!("/repos/{}/{}/issues", owner, repo), payload).await?;
+    Ok(issue_from(&data))
+}
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index 1445a61..b9f2d62 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -16,6 +16,7 @@ mod env_manager;
 mod env_providers;
 mod example;
 mod execution;
+mod github;
 mod filesystem;
 mod font;
 mod geo;
@@ -71,7 +72,7 @@ use crate::filesystem::{
     git_file_diff, git_file_head, git_get_identity, git_get_signing, git_graph, git_hook_delete,
     git_hook_read, git_hook_save, git_hooks, git_ignore_add, git_ignore_append_block, git_init,
     git_log, git_log_file, git_merge, git_op_abort, git_op_continue, git_op_skip, git_op_state,
-    git_permalink, git_pull, git_pull_rebase, git_push, git_push_force, git_push_tags,
+    git_permalink, git_pull, git_pull_rebase, git_push, git_push_force, git_push_tags, git_resolve_side,
     git_rebase_interactive, git_reflog, git_remote_add, git_remote_branches, git_remote_remove,
     git_remotes, git_reset, git_restore_file, git_revert, git_set_identity, git_set_signing,
     git_set_upstream, git_show, git_stage, git_staged_diff, git_stash_apply, git_stash_drop,
@@ -256,6 +257,12 @@ fn main() {
             git_remote_branches,
             git_checkout_track,
             git_merge,
+            git_resolve_side,
+            github::github_list_prs,
+            github::github_create_pr,
+            github::github_repo_branches,
+            github::github_list_issues,
+            github::github_create_issue,
             git_blame,
             git_file_head,
             git_log,
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index da7bb97..b38589d 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "CodeForge",
-  "version": "26.4.0",
+  "version": "26.5.0",
   "identifier": "org.devlive.codeforge",
   "build": {
     "beforeDevCommand": "pnpm dev",
diff --git a/src/App.vue b/src/App.vue
index d7224db..69bac80 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -427,6 +427,9 @@
     <!-- AI 多文件编辑（跨已打开文件） -->
     <AiMultiEdit v-if="showAiMultiEdit" :files="gatherOpenFiles()" @apply="onAiMultiApply" @close="showAiMultiEdit = false"/>
 
+    <!-- 导出代码为图片 -->
+    <CodeImageExport v-if="codeImageCtx" :code="codeImageCtx.code" :language="currentLanguage" :file-name="currentFileName" @close="codeImageCtx = null"/>
+
     <!-- .gitignore 模板 -->
     <GitIgnoreTemplates v-if="showGitignore && rootDir" :root-dir="rootDir" @close="showGitignore = false"/>
 
@@ -434,9 +437,11 @@
     <TaskRunner v-if="showTasks && rootDir" :root-dir="rootDir" @run="runTask" @close="showTasks = false"/>
 
     <!-- Git 源代码管理 -->
-    <GitPanel v-if="showGit && rootDir"
-              :root-dir="rootDir"
+    <GitPanel v-if="showGit && gitRoot"
+              :root-dir="gitRoot"
+              :roots="allRoots"
               @open="smartOpen"
+              @switch-root="activeGitRoot = $event"
               @refresh="refreshGitStatus"
               @close="showGit = false"/>
 
@@ -539,7 +544,7 @@ import {debounce} from 'lodash-es'
 import {formatDocument, formatSelection, renameSymbol} from 'codemirror-languageserver'
 import {runGotoDefinition, lspSupportsLanguage, triggerCodeActions, applyCodeAction, formatDocumentAsync} from './editor/lspExtension'
 import {dapSupportsLanguage} from './debug/dapClient'
-import {ArrowDownAZ, ArrowUpAZ, Bookmark, CaseLower, CaseUpper, ChevronRight, Code2, CornerDownRight, Eraser, Eye, FoldVertical, FolderOpen, GitBranch, GitCompare, History, ListChecks, ListTree, Maximize2, Minimize2, Monitor, Moon, PanelBottom, PanelLeft, PanelRight, Play, Plus, Save, Search, Settings as SettingsIcon, Sparkles, Sun, Terminal as TerminalIcon, UnfoldVertical, WrapText, X} from 'lucide-vue-next'
+import {ArrowDownAZ, ArrowUpAZ, Bookmark, CaseLower, CaseUpper, ChevronRight, Code2, CornerDownRight, Eraser, Eye, FoldVertical, FolderOpen, GitBranch, GitCompare, History, Image as ImageIcon, ListChecks, ListTree, Maximize2, Minimize2, Monitor, Moon, PanelBottom, PanelLeft, PanelRight, Play, Plus, Save, Search, Settings as SettingsIcon, Sparkles, Sun, Terminal as TerminalIcon, UnfoldVertical, WrapText, X} from 'lucide-vue-next'
 import {ExecutionResult, LayoutMode, SplitDirection} from './types/app.ts'
 import AppHeader from './components/AppHeader.vue'
 import CodeEditor from './components/CodeEditor.vue'
@@ -603,6 +608,7 @@ import DebugToolbar from './components/DebugToolbar.vue'
 import DebugPanel from './components/DebugPanel.vue'
 import AiCodeAction from './components/AiCodeAction.vue'
 import AiMultiEdit from './components/AiMultiEdit.vue'
+import CodeImageExport from './components/CodeImageExport.vue'
 import ErDiagram from './components/ErDiagram.vue'
 import TxnControl from './components/TxnControl.vue'
 import {useSqlTxn} from './composables/useSqlTxn'
@@ -786,9 +792,17 @@ const rootDir = ref<string | null>(null)
 // 远程仓库永久链接（复制 / 在浏览器打开）
 const {copyPermalink, openPermalink, openRepoOnWeb} = useGitPermalink(rootDir, currentFilePath, cursorInfo)
 
-// 多根工作区：额外挂载的文件夹（Git/搜索仍走主根 rootDir）
+// 多根工作区：额外挂载的文件夹
 const {extraRoots, addWorkspaceFolder, removeWorkspaceFolder, resetExtraRoots, setExtraRoots} = useWorkspaceRoots(rootDir)
 
+// 活动根：Git 面板针对哪个根（各根独立 Git）；无效时回退主根
+const activeGitRoot = ref<string | null>(null)
+const allRoots = computed(() => [rootDir.value, ...extraRoots.value].filter((r): r is string => !!r))
+const gitRoot = computed(() => {
+  const a = activeGitRoot.value
+  return a && allRoots.value.includes(a) ? a : rootDir.value
+})
+
 // 命名工作区：保存/打开一组根
 const showWorkspaces = ref(false)
 const openWorkspace = (ws: {rootDir: string; extraRoots: string[]}) => {
@@ -966,6 +980,17 @@ const selectedOrAll = (): string => {
   return code.value
 }
 
+// 导出代码为图片（选中片段或整篇）
+const codeImageCtx = ref<{ code: string } | null>(null)
+const openCodeImage = () => {
+  const src = selectedOrAll()
+  if (!src.trim()) {
+    toast.info(t('app.noCodeToImage'))
+    return
+  }
+  codeImageCtx.value = {code: src}
+}
+
 // 以一次性提示打开 AI（临时会话，不关联执行）
 const openAiWithPrompt = (prompt: string) => {
   aiExecutionId.value = null
@@ -2553,6 +2578,7 @@ const paletteCommands = computed<PaletteCommand[]>(() => [
   {id: 'removeDuplicateLines', label: t('command.removeDuplicateLines'), group: t('command.groupText'), icon: ListChecks, run: () => removeDuplicateLines()},
   {id: 'trimTrailingWhitespace', label: t('command.trimTrailingWhitespace'), group: t('command.groupText'), icon: Eraser, run: () => trimTrailingWhitespace()},
   {id: 'copyAsMarkdown', label: t('command.copyAsMarkdown'), group: t('command.groupText'), icon: Code2, run: () => copyAsMarkdown()},
+  {id: 'exportCodeImage', label: t('command.exportCodeImage'), group: t('command.groupText'), icon: ImageIcon, run: openCodeImage},
   {id: 'indentToSpaces', label: t('command.indentToSpaces'), group: t('command.groupText'), icon: Eraser, run: () => convertIndentation(false)},
   {id: 'indentToTabs', label: t('command.indentToTabs'), group: t('command.groupText'), icon: Eraser, run: () => convertIndentation(true)},
   {id: 'foldAll', label: t('command.foldAll'), group: t('command.groupCode'), icon: FoldVertical, run: () => { if (editorView.value) foldAll(editorView.value) }},
diff --git a/src/components/CodeImageExport.vue b/src/components/CodeImageExport.vue
new file mode 100644
index 0000000..30e7d6c
--- /dev/null
+++ b/src/components/CodeImageExport.vue
@@ -0,0 +1,197 @@
+<template>
+  <div class="fixed inset-0 z-[55] flex items-start justify-center pt-12 px-6 pb-6" @click="emit('close')">
+    <div class="w-full max-w-[860px] max-h-full bg-white dark:bg-gray-900 dark:text-gray-100 rounded-lg shadow-2xl border border-gray-200 dark:border-gray-700 flex flex-col overflow-hidden" @click.stop>
+      <!-- 标题栏 -->
+      <div class="flex items-center justify-between px-4 py-2.5 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
+        <div class="flex items-center gap-2 text-sm font-medium text-gray-700 dark:text-gray-200">
+          <ImageIcon class="w-4 h-4 text-gray-400"/>
+          <span>{{ t('codeImage.title') }}</span>
+        </div>
+        <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="emit('close')">
+          <X class="w-4 h-4"/>
+        </button>
+      </div>
+
+      <!-- 选项 -->
+      <div class="flex items-center flex-wrap gap-x-5 gap-y-2 px-4 py-2 border-b border-gray-100 dark:border-gray-800 flex-shrink-0 text-xs">
+        <div class="flex items-center gap-1.5">
+          <span class="text-gray-400">{{ t('codeImage.theme') }}</span>
+          <button v-for="(th, i) in THEMES" :key="i"
+                  class="w-5 h-5 rounded-full border-2 cursor-pointer"
+                  :class="themeIdx === i ? 'border-blue-500' : 'border-transparent'"
+                  :style="{ background: th.swatch }" :title="th.name" @click="themeIdx = i"></button>
+        </div>
+        <div class="flex items-center gap-1.5">
+          <span class="text-gray-400">{{ t('codeImage.padding') }}</span>
+          <select v-model.number="padding" class="rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800 px-1.5 py-0.5 focus:outline-none cursor-pointer">
+            <option v-for="p in [16, 32, 48, 64]" :key="p" :value="p">{{ p }}</option>
+          </select>
+        </div>
+        <label class="flex items-center gap-1 cursor-pointer text-gray-500 dark:text-gray-400">
+          <input type="checkbox" v-model="showChrome" class="cursor-pointer"/>{{ t('codeImage.windowChrome') }}
+        </label>
+        <label class="flex items-center gap-1 cursor-pointer text-gray-500 dark:text-gray-400">
+          <input type="checkbox" v-model="showLineNumbers" class="cursor-pointer"/>{{ t('codeImage.lineNumbers') }}
+        </label>
+      </div>
+
+      <!-- 预览 -->
+      <div class="flex-1 overflow-auto p-6 flex items-start justify-center bg-gray-100 dark:bg-gray-950">
+        <div ref="cardRef" v-html="cardHtml"></div>
+      </div>
+
+      <!-- 底部 -->
+      <div class="flex items-center justify-end gap-2 px-4 py-2.5 border-t border-gray-200 dark:border-gray-700 flex-shrink-0">
+        <button class="text-xs px-3 py-1.5 rounded text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer disabled:opacity-40" :disabled="busy" @click="copyImage">{{ t('codeImage.copy') }}</button>
+        <button class="text-xs px-3 py-1.5 rounded bg-blue-500 text-white hover:bg-blue-600 cursor-pointer disabled:opacity-40" :disabled="busy" @click="downloadImage">{{ busy ? t('codeImage.rendering') : t('codeImage.download') }}</button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {computed, ref} from 'vue'
+import {Image as ImageIcon, X} from 'lucide-vue-next'
+import {useI18n} from 'vue-i18n'
+import {useToast} from '../plugins/toast'
+
+const props = defineProps<{ code: string; language: string; fileName?: string }>()
+const emit = defineEmits<{ close: [] }>()
+
+const {t} = useI18n()
+const toast = useToast()
+
+const THEMES = [
+  {name: 'Indigo', bg: 'linear-gradient(135deg,#667eea 0%,#764ba2 100%)', swatch: 'linear-gradient(135deg,#667eea,#764ba2)'},
+  {name: 'Sunset', bg: 'linear-gradient(135deg,#ff9a9e 0%,#fad0c4 100%)', swatch: 'linear-gradient(135deg,#ff9a9e,#fad0c4)'},
+  {name: 'Ocean', bg: 'linear-gradient(135deg,#2193b0 0%,#6dd5ed 100%)', swatch: 'linear-gradient(135deg,#2193b0,#6dd5ed)'},
+  {name: 'Mint', bg: 'linear-gradient(135deg,#43e97b 0%,#38f9d7 100%)', swatch: 'linear-gradient(135deg,#43e97b,#38f9d7)'},
+  {name: 'Graphite', bg: '#0d1117', swatch: '#0d1117'}
+]
+const FONT = "ui-monospace,'SF Mono',Menlo,Monaco,Consolas,'Courier New',monospace"
+
+const themeIdx = ref(0)
+const padding = ref(32)
+const showChrome = ref(true)
+const showLineNumbers = ref(false)
+const busy = ref(false)
+const cardRef = ref<HTMLElement>()
+
+const escapeHtml = (s: string) => s.replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;')
+
+// 行号列（作为独立列，避免破坏代码对齐）
+const codeInner = computed(() => {
+  const esc = escapeHtml(props.code.replace(/\t/g, '  '))
+  if (!showLineNumbers.value) {
+    return `<pre style="margin:0;color:#cdd6f4;font-family:${FONT};font-size:13px;line-height:1.55;white-space:pre;">${esc}</pre>`
+  }
+  const lines = props.code.replace(/\t/g, '  ').split('\n')
+  const nums = lines.map((_l, i) => i + 1).join('\n')
+  return `<div style="display:flex;gap:14px;">`
+    + `<pre style="margin:0;color:#585b70;font-family:${FONT};font-size:13px;line-height:1.55;white-space:pre;text-align:right;user-select:none;">${escapeHtml(nums)}</pre>`
+    + `<pre style="margin:0;color:#cdd6f4;font-family:${FONT};font-size:13px;line-height:1.55;white-space:pre;">${esc}</pre>`
+    + `</div>`
+})
+
+const chromeHtml = computed(() => {
+  if (!showChrome.value) {
+    return ''
+  }
+  const dot = (c: string) => `<span style="width:11px;height:11px;border-radius:50%;background:${c};display:inline-block;margin-right:7px;"></span>`
+  return `<div style="height:34px;display:flex;align-items:center;padding:0 14px;background:#181825;">`
+    + dot('#ff5f56') + dot('#ffbd2e') + dot('#27c93f')
+    + `<span style="margin-left:10px;color:#9399b2;font-family:${FONT};font-size:12px;">${escapeHtml(props.fileName || props.language)}</span>`
+    + `</div>`
+})
+
+const cardHtml = computed(() =>
+  `<div style="display:inline-block;background:${THEMES[themeIdx.value].bg};padding:${padding.value}px;box-sizing:border-box;">`
+  + `<div style="background:#1e1e2e;border-radius:10px;overflow:hidden;box-shadow:0 18px 40px rgba(0,0,0,.35);">`
+  + chromeHtml.value
+  + `<div style="padding:16px 20px;">${codeInner.value}</div>`
+  + `</div></div>`)
+
+// 用 SVG foreignObject 光栅化为 PNG（2x 清晰度）
+const renderCanvas = async (): Promise<HTMLCanvasElement> => {
+  const card = cardRef.value?.firstElementChild as HTMLElement
+  if (!card) {
+    throw new Error('no card')
+  }
+  const rect = card.getBoundingClientRect()
+  const w = Math.ceil(rect.width)
+  const h = Math.ceil(rect.height)
+  const svg = `<svg xmlns="http://www.w3.org/2000/svg" width="${w}" height="${h}">`
+    + `<foreignObject width="100%" height="100%"><div xmlns="http://www.w3.org/1999/xhtml">${cardHtml.value}</div></foreignObject></svg>`
+  const url = 'data:image/svg+xml;charset=utf-8,' + encodeURIComponent(svg)
+  const dpr = 2
+  return await new Promise((resolve, reject) => {
+    const img = new Image()
+    img.onload = () => {
+      const canvas = document.createElement('canvas')
+      canvas.width = w * dpr
+      canvas.height = h * dpr
+      const ctx = canvas.getContext('2d')!
+      ctx.scale(dpr, dpr)
+      ctx.drawImage(img, 0, 0)
+      resolve(canvas)
+    }
+    img.onerror = () => reject(new Error('render failed'))
+    img.src = url
+  })
+}
+
+const baseName = () => (props.fileName || 'code').replace(/\.[^.]+$/, '')
+
+const downloadImage = async () => {
+  busy.value = true
+  try {
+    const canvas = await renderCanvas()
+    canvas.toBlob((blob) => {
+      if (!blob) {
+        toast.error(t('codeImage.failed'))
+        return
+      }
+      const a = document.createElement('a')
+      a.href = URL.createObjectURL(blob)
+      a.download = `${baseName()}.png`
+      a.click()
+      URL.revokeObjectURL(a.href)
+      toast.success(t('codeImage.saved'))
+    }, 'image/png')
+  }
+  catch (e: any) {
+    toast.error(t('codeImage.failed') + ': ' + (e?.message || e))
+  }
+  finally {
+    busy.value = false
+  }
+}
+
+const copyImage = async () => {
+  busy.value = true
+  try {
+    const canvas = await renderCanvas()
+    await new Promise<void>((resolve, reject) => {
+      canvas.toBlob(async (blob) => {
+        try {
+          if (!blob) {
+            throw new Error('no blob')
+          }
+          await navigator.clipboard.write([new ClipboardItem({'image/png': blob})])
+          toast.success(t('codeImage.copied'))
+          resolve()
+        }
+        catch (err) {
+          reject(err)
+        }
+      }, 'image/png')
+    })
+  }
+  catch (e: any) {
+    toast.error(t('codeImage.copyFailed') + ': ' + (e?.message || e))
+  }
+  finally {
+    busy.value = false
+  }
+}
+</script>
diff --git a/src/components/ConflictResolver.vue b/src/components/ConflictResolver.vue
new file mode 100644
index 0000000..f2110f9
--- /dev/null
+++ b/src/components/ConflictResolver.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="fixed inset-0 z-[60] flex items-start justify-center pt-12 px-6 pb-6" @click="emit('close')">
+    <div class="w-full max-w-[900px] max-h-full bg-white dark:bg-gray-900 dark:text-gray-100 rounded-lg shadow-2xl border border-gray-200 dark:border-gray-700 flex flex-col overflow-hidden" @click.stop>
+      <!-- 标题栏 -->
+      <div class="flex items-center justify-between px-4 py-2.5 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
+        <div class="flex items-center gap-2 text-sm font-medium text-gray-700 dark:text-gray-200 min-w-0">
+          <GitMerge class="w-4 h-4 text-amber-500 flex-shrink-0"/>
+          <span class="truncate">{{ t('conflict.title') }} · {{ relPath }}</span>
+          <span v-if="!loading" class="text-[11px] text-gray-400 flex-shrink-0">{{ t('conflict.remaining', { n: unresolvedCount }) }}</span>
+        </div>
+        <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="emit('close')">
+          <X class="w-4 h-4"/>
+        </button>
+      </div>
+
+      <!-- 顶部批量操作 -->
+      <div v-if="!loading && conflictCount > 0" class="flex items-center gap-2 px-4 py-1.5 border-b border-gray-100 dark:border-gray-800 flex-shrink-0 text-xs">
+        <span class="text-gray-400">{{ t('conflict.allBlocks') }}:</span>
+        <button class="px-2 py-0.5 rounded border border-gray-300 dark:border-gray-600 hover:border-blue-400 cursor-pointer" @click="chooseAll('ours')">{{ t('conflict.ours') }}</button>
+        <button class="px-2 py-0.5 rounded border border-gray-300 dark:border-gray-600 hover:border-blue-400 cursor-pointer" @click="chooseAll('theirs')">{{ t('conflict.theirs') }}</button>
+        <button class="px-2 py-0.5 rounded border border-gray-300 dark:border-gray-600 hover:border-blue-400 cursor-pointer" @click="chooseAll('both')">{{ t('conflict.both') }}</button>
+      </div>
+
+      <!-- 冲突块 -->
+      <div class="flex-1 overflow-auto p-3 font-mono text-xs">
+        <div v-if="loading" class="text-gray-400 p-4">{{ t('conflict.loading') }}</div>
+        <div v-else-if="conflictCount === 0" class="text-gray-400 p-4">{{ t('conflict.noConflict') }}</div>
+        <template v-else>
+          <template v-for="(seg, i) in segments" :key="i">
+            <!-- 普通文本 -->
+            <pre v-if="seg.type === 'text'" class="whitespace-pre-wrap text-gray-500 dark:text-gray-400 px-2">{{ seg.text }}</pre>
+            <!-- 冲突块 -->
+            <div v-else class="my-2 rounded border" :class="seg.choice ? 'border-gray-200 dark:border-gray-700' : 'border-amber-400'">
+              <div class="flex items-center gap-2 px-2 py-1 bg-gray-50 dark:bg-gray-800 text-[11px]">
+                <span :class="seg.choice ? 'text-green-500' : 'text-amber-500'">{{ seg.choice ? t('conflict.resolvedBlock', { pick: pickLabel(seg.choice) }) : t('conflict.pickSide') }}</span>
+                <div class="ml-auto flex items-center gap-1">
+                  <button class="px-1.5 py-0.5 rounded cursor-pointer" :class="seg.choice === 'ours' ? 'bg-blue-500 text-white' : 'text-blue-500 hover:bg-blue-50 dark:hover:bg-blue-900/20'" @click="seg.choice = 'ours'">{{ t('conflict.ours') }}</button>
+                  <button class="px-1.5 py-0.5 rounded cursor-pointer" :class="seg.choice === 'theirs' ? 'bg-blue-500 text-white' : 'text-blue-500 hover:bg-blue-50 dark:hover:bg-blue-900/20'" @click="seg.choice = 'theirs'">{{ t('conflict.theirs') }}</button>
+                  <button class="px-1.5 py-0.5 rounded cursor-pointer" :class="seg.choice === 'both' ? 'bg-blue-500 text-white' : 'text-blue-500 hover:bg-blue-50 dark:hover:bg-blue-900/20'" @click="seg.choice = 'both'">{{ t('conflict.both') }}</button>
+                </div>
+              </div>
+              <div class="grid grid-cols-2 divide-x divide-gray-200 dark:divide-gray-700">
+                <div :class="{ 'opacity-40': seg.choice === 'theirs' }">
+                  <div class="px-2 py-0.5 text-[10px] text-blue-500 bg-blue-50/50 dark:bg-blue-900/10">{{ t('conflict.ourSide') }}</div>
+                  <pre class="whitespace-pre-wrap px-2 py-1 text-gray-700 dark:text-gray-200">{{ seg.ours.join('\n') }}</pre>
+                </div>
+                <div :class="{ 'opacity-40': seg.choice === 'ours' }">
+                  <div class="px-2 py-0.5 text-[10px] text-emerald-500 bg-emerald-50/50 dark:bg-emerald-900/10">{{ t('conflict.theirSide') }}</div>
+                  <pre class="whitespace-pre-wrap px-2 py-1 text-gray-700 dark:text-gray-200">{{ seg.theirs.join('\n') }}</pre>
+                </div>
+              </div>
+            </div>
+          </template>
+        </template>
+      </div>
+
+      <!-- 底部 -->
+      <div class="flex items-center justify-between gap-2 px-4 py-2.5 border-t border-gray-200 dark:border-gray-700 flex-shrink-0">
+        <button class="text-xs text-gray-500 hover:text-gray-700 dark:hover:text-gray-300 cursor-pointer" @click="emit('open', relPath)">{{ t('conflict.openInEditor') }}</button>
+        <div class="flex items-center gap-2">
+          <button class="text-xs px-3 py-1.5 rounded text-gray-600 dark:text-gray-300 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer" @click="emit('close')">{{ t('conflict.cancel') }}</button>
+          <button class="text-xs px-3 py-1.5 rounded bg-blue-500 text-white hover:bg-blue-600 disabled:opacity-40 disabled:cursor-not-allowed cursor-pointer"
+                  :disabled="loading || unresolvedCount > 0" @click="saveResolved">
+            {{ t('conflict.saveResolved') }}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {computed, onMounted, ref} from 'vue'
+import {invoke} from '@tauri-apps/api/core'
+import {GitMerge, X} from 'lucide-vue-next'
+import {useI18n} from 'vue-i18n'
+import {useToast} from '../plugins/toast'
+
+const props = defineProps<{ rootDir: string; relPath: string }>()
+const emit = defineEmits<{ close: []; resolved: []; open: [path: string] }>()
+
+const {t} = useI18n()
+const toast = useToast()
+
+type Choice = 'ours' | 'theirs' | 'both' | null
+interface Seg { type: 'text' | 'conflict'; text?: string; ours: string[]; theirs: string[]; choice: Choice }
+
+const loading = ref(true)
+const segments = ref<Seg[]>([])
+
+const conflictSegs = computed(() => segments.value.filter(s => s.type === 'conflict'))
+const conflictCount = computed(() => conflictSegs.value.length)
+const unresolvedCount = computed(() => conflictSegs.value.filter(s => !s.choice).length)
+
+const abs = () => `${props.rootDir}/${props.relPath}`
+const pickLabel = (c: Choice) => (c === 'ours' ? t('conflict.ours') : c === 'theirs' ? t('conflict.theirs') : t('conflict.both'))
+
+// 解析带冲突标记的文件为「文本 / 冲突块」序列（兼容 diff3 的 ||||||| base 段）
+const parse = (content: string) => {
+  const lines = content.split('\n')
+  const segs: Seg[] = []
+  let buf: string[] = []
+  const flushText = () => {
+    if (buf.length) {
+      segs.push({type: 'text', text: buf.join('\n'), ours: [], theirs: [], choice: null})
+      buf = []
+    }
+  }
+  let i = 0
+  while (i < lines.length) {
+    if (lines[i].startsWith('<<<<<<<')) {
+      flushText()
+      i++
+      const ours: string[] = []
+      while (i < lines.length && !lines[i].startsWith('=======') && !lines[i].startsWith('|||||||')) {
+        ours.push(lines[i]); i++
+      }
+      // 跳过 diff3 的 base 段
+      if (i < lines.length && lines[i].startsWith('|||||||')) {
+        i++
+        while (i < lines.length && !lines[i].startsWith('=======')) {
+          i++
+        }
+      }
+      i++ // 跳过 =======
+      const theirs: string[] = []
+      while (i < lines.length && !lines[i].startsWith('>>>>>>>')) {
+        theirs.push(lines[i]); i++
+      }
+      i++ // 跳过 >>>>>>>
+      segs.push({type: 'conflict', ours, theirs, choice: null})
+    }
+    else {
+      buf.push(lines[i]); i++
+    }
+  }
+  flushText()
+  return segs
+}
+
+const chooseAll = (c: Choice) => {
+  for (const s of conflictSegs.value) {
+    s.choice = c
+  }
+}
+
+// 按选择重建文件内容
+const rebuild = () => {
+  const out: string[] = []
+  for (const s of segments.value) {
+    if (s.type === 'text') {
+      out.push(s.text || '')
+    }
+    else if (s.choice === 'ours') {
+      out.push(...s.ours)
+    }
+    else if (s.choice === 'theirs') {
+      out.push(...s.theirs)
+    }
+    else if (s.choice === 'both') {
+      out.push(...s.ours, ...s.theirs)
+    }
+  }
+  return out.join('\n')
+}
+
+const saveResolved = async () => {
+  if (unresolvedCount.value > 0) {
+    return
+  }
+  try {
+    await invoke('write_file_text', {path: abs(), content: rebuild()})
+    await invoke('git_stage', {root: props.rootDir, paths: [abs()]})
+    toast.success(t('conflict.done'))
+    emit('resolved')
+    emit('close')
+  }
+  catch (error) {
+    toast.error(t('conflict.saveFailed') + ': ' + error)
+  }
+}
+
+onMounted(async () => {
+  try {
+    const content = await invoke<string>('read_file_text', {path: abs(), maxSizeMb: 20})
+    segments.value = parse(content)
+  }
+  catch (error) {
+    toast.error(t('conflict.loadFailed') + ': ' + error)
+    emit('close')
+  }
+  finally {
+    loading.value = false
+  }
+})
+</script>
diff --git a/src/components/GitHubPanel.vue b/src/components/GitHubPanel.vue
new file mode 100644
index 0000000..6982331
--- /dev/null
+++ b/src/components/GitHubPanel.vue
@@ -0,0 +1,203 @@
+<template>
+  <div class="fixed inset-0 z-[55] flex items-start justify-center pt-12 px-6 pb-6" @click="emit('close')">
+    <div class="w-full max-w-[760px] max-h-full bg-white dark:bg-gray-900 dark:text-gray-100 rounded-lg shadow-2xl border border-gray-200 dark:border-gray-700 flex flex-col overflow-hidden" @click.stop>
+      <!-- 标题栏 + 选项卡 -->
+      <div class="flex items-center justify-between px-4 py-2.5 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
+        <div class="flex items-center gap-3 text-sm font-medium text-gray-700 dark:text-gray-200 min-w-0">
+          <Github class="w-4 h-4 text-gray-400 flex-shrink-0"/>
+          <span class="truncate">{{ owner }}/{{ repo }}</span>
+          <div class="flex items-center gap-1 text-xs">
+            <button class="px-2 py-0.5 rounded cursor-pointer" :class="tab === 'pr' ? 'bg-blue-500 text-white' : 'text-gray-500 hover:bg-gray-100 dark:hover:bg-gray-700'" @click="switchTab('pr')">{{ t('gh.prs') }}</button>
+            <button class="px-2 py-0.5 rounded cursor-pointer" :class="tab === 'issue' ? 'bg-blue-500 text-white' : 'text-gray-500 hover:bg-gray-100 dark:hover:bg-gray-700'" @click="switchTab('issue')">{{ t('gh.issues') }}</button>
+          </div>
+        </div>
+        <div class="flex items-center gap-2">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" :title="t('gh.refresh')" @click="reload">
+            <RefreshCw class="w-4 h-4" :class="{ 'animate-spin': loading }"/>
+          </button>
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="emit('close')">
+            <X class="w-4 h-4"/>
+          </button>
+        </div>
+      </div>
+
+      <!-- 无 token 提示 -->
+      <div v-if="!token" class="flex-1 flex items-center justify-center text-center text-sm text-gray-400 px-6">
+        {{ t('gh.needToken') }}
+      </div>
+
+      <template v-else>
+        <!-- 新建表单（可折叠） -->
+        <div class="border-b border-gray-100 dark:border-gray-800 flex-shrink-0">
+          <button class="w-full flex items-center gap-1.5 px-4 py-2 text-xs text-blue-500 hover:bg-gray-50 dark:hover:bg-gray-800 cursor-pointer" @click="showForm = !showForm">
+            <component :is="showForm ? ChevronDown : ChevronRight" class="w-3.5 h-3.5"/>
+            {{ tab === 'pr' ? t('gh.newPr') : t('gh.newIssue') }}
+          </button>
+          <div v-if="showForm" class="px-4 pb-3 flex flex-col gap-2">
+            <input v-model="form.title" :placeholder="t('gh.titlePlaceholder')"
+                   class="w-full text-sm rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800 px-3 py-1.5 focus:outline-none focus:ring-1 focus:ring-blue-400"/>
+            <div v-if="tab === 'pr'" class="flex items-center gap-2 text-xs">
+              <span class="text-gray-400">{{ t('gh.from') }}</span>
+              <span class="px-2 py-1 rounded bg-gray-100 dark:bg-gray-800 font-mono">{{ branch }}</span>
+              <span class="text-gray-400">→</span>
+              <select v-if="branches.length" v-model="form.base"
+                      class="w-40 text-xs rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800 px-2 py-1 font-mono focus:outline-none cursor-pointer">
+                <option v-for="b in branches" :key="b" :value="b">{{ b }}</option>
+              </select>
+              <input v-else v-model="form.base" placeholder="main"
+                     class="w-32 text-xs rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800 px-2 py-1 font-mono focus:outline-none"/>
+              <label class="flex items-center gap-1 cursor-pointer ml-2"><input type="checkbox" v-model="form.draft" class="cursor-pointer"/>{{ t('gh.draft') }}</label>
+            </div>
+            <textarea v-model="form.body" rows="3" :placeholder="t('gh.bodyPlaceholder')"
+                      class="w-full text-sm rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800 px-3 py-1.5 resize-none focus:outline-none focus:ring-1 focus:ring-blue-400"></textarea>
+            <div class="flex justify-end">
+              <button class="text-xs px-3 py-1.5 rounded bg-blue-500 text-white hover:bg-blue-600 disabled:opacity-40 disabled:cursor-not-allowed cursor-pointer"
+                      :disabled="!form.title.trim() || submitting" @click="submit">
+                {{ submitting ? t('gh.submitting') : (tab === 'pr' ? t('gh.createPr') : t('gh.createIssue')) }}
+              </button>
+            </div>
+          </div>
+        </div>
+
+        <!-- 列表 -->
+        <div class="flex-1 overflow-auto">
+          <div v-if="loading" class="p-6 text-center text-sm text-gray-400">{{ t('gh.loading') }}</div>
+          <div v-else-if="error" class="p-6 text-center text-sm text-red-500">{{ error }}</div>
+          <div v-else-if="items.length === 0" class="p-6 text-center text-sm text-gray-400">{{ tab === 'pr' ? t('gh.noPrs') : t('gh.noIssues') }}</div>
+          <div v-for="it in items" :key="it.number"
+               class="flex items-center gap-2 px-4 py-2 border-b border-gray-100 dark:border-gray-800 hover:bg-gray-50 dark:hover:bg-gray-800 cursor-pointer"
+               @click="openUrl(it.url)">
+            <component :is="tab === 'pr' ? GitPullRequest : CircleDot" class="w-4 h-4 flex-shrink-0" :class="it.draft ? 'text-gray-400' : 'text-green-500'"/>
+            <div class="min-w-0 flex-1">
+              <div class="text-sm text-gray-800 dark:text-gray-100 truncate">{{ it.title }}</div>
+              <div class="text-[11px] text-gray-400 truncate">
+                #{{ it.number }} · {{ it.author }}
+                <template v-if="tab === 'pr'"> · <span class="font-mono">{{ it.head }} → {{ it.base }}</span><span v-if="it.draft"> · {{ t('gh.draft') }}</span></template>
+                <template v-else-if="it.comments"> · 💬 {{ it.comments }}</template>
+              </div>
+            </div>
+            <ExternalLink class="w-3.5 h-3.5 text-gray-300 flex-shrink-0"/>
+          </div>
+        </div>
+      </template>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {onMounted, reactive, ref} from 'vue'
+import {invoke} from '@tauri-apps/api/core'
+import {open as openExternalUrl} from '@tauri-apps/plugin-shell'
+import {ChevronDown, ChevronRight, CircleDot, ExternalLink, Github, GitPullRequest, RefreshCw, X} from 'lucide-vue-next'
+import {useI18n} from 'vue-i18n'
+import {useToast} from '../plugins/toast'
+
+const props = defineProps<{ owner: string; repo: string; branch: string }>()
+const emit = defineEmits<{ close: [] }>()
+
+const {t} = useI18n()
+const toast = useToast()
+
+const tab = ref<'pr' | 'issue'>('pr')
+const token = ref('')
+const loading = ref(false)
+const error = ref('')
+const items = ref<any[]>([])
+const branches = ref<string[]>([])
+const showForm = ref(false)
+const submitting = ref(false)
+const form = reactive({title: '', base: 'main', body: '', draft: false})
+
+// 拉取仓库分支与默认分支，供新建 PR 的 base 下拉使用
+const loadBranches = async () => {
+  if (!token.value) {
+    return
+  }
+  try {
+    const res = await invoke<{ default_branch: string; branches: string[] }>('github_repo_branches', {
+      token: token.value, owner: props.owner, repo: props.repo
+    })
+    branches.value = res.branches
+    if (res.default_branch) {
+      form.base = res.default_branch
+    }
+  }
+  catch { /* 拉取失败则退回文本输入 */ }
+}
+
+const openUrl = (url: string) => url && openExternalUrl(url)
+
+const reload = async () => {
+  if (!token.value) {
+    return
+  }
+  loading.value = true
+  error.value = ''
+  try {
+    items.value = tab.value === 'pr'
+      ? await invoke<any[]>('github_list_prs', {token: token.value, owner: props.owner, repo: props.repo})
+      : await invoke<any[]>('github_list_issues', {token: token.value, owner: props.owner, repo: props.repo})
+  }
+  catch (e: any) {
+    error.value = String(e?.message || e)
+  }
+  finally {
+    loading.value = false
+  }
+}
+
+const switchTab = (tb: 'pr' | 'issue') => {
+  if (tab.value === tb) {
+    return
+  }
+  tab.value = tb
+  items.value = []
+  reload()
+}
+
+const submit = async () => {
+  if (!form.title.trim()) {
+    return
+  }
+  submitting.value = true
+  try {
+    if (tab.value === 'pr') {
+      const pr = await invoke<any>('github_create_pr', {
+        token: token.value, owner: props.owner, repo: props.repo,
+        title: form.title.trim(), head: props.branch, base: form.base.trim() || 'main',
+        body: form.body, draft: form.draft
+      })
+      items.value = [pr, ...items.value]
+      toast.success(t('gh.prCreated', {n: pr.number}))
+    }
+    else {
+      const issue = await invoke<any>('github_create_issue', {
+        token: token.value, owner: props.owner, repo: props.repo,
+        title: form.title.trim(), body: form.body
+      })
+      items.value = [issue, ...items.value]
+      toast.success(t('gh.issueCreated', {n: issue.number}))
+    }
+    form.title = ''
+    form.body = ''
+    form.draft = false
+    showForm.value = false
+  }
+  catch (e: any) {
+    toast.error(String(e?.message || e))
+  }
+  finally {
+    submitting.value = false
+  }
+}
+
+onMounted(async () => {
+  try {
+    const config = await invoke<any>('get_app_config')
+    token.value = config?.github?.token || ''
+  }
+  catch { /* 忽略 */ }
+  loadBranches()
+  reload()
+})
+</script>
diff --git a/src/components/GitPanel.vue b/src/components/GitPanel.vue
index 2224e34..63a44bf 100644
--- a/src/components/GitPanel.vue
+++ b/src/components/GitPanel.vue
@@ -7,6 +7,14 @@
     <!-- 头部：分支 + 操作 -->
     <div class="flex items-center justify-between px-4 py-2.5 border-b border-gray-200 dark:border-gray-700 flex-shrink-0">
       <div class="flex items-center gap-2 text-sm font-medium text-gray-700 dark:text-gray-200 min-w-0">
+        <!-- 多根工作区：活动根切换（各根独立 Git） -->
+        <select v-if="roots && roots.length > 1"
+                :value="rootDir"
+                class="bg-gray-100 dark:bg-gray-800 text-xs text-gray-600 dark:text-gray-300 rounded px-1.5 py-0.5 focus:outline-none cursor-pointer max-w-[130px] truncate flex-shrink-0"
+                :title="t('git.switchRoot')"
+                @change="emit('switchRoot', ($event.target as HTMLSelectElement).value)">
+          <option v-for="r in roots" :key="r" :value="r" class="dark:bg-gray-800">{{ baseName(r) }}</option>
+        </select>
         <GitBranch class="w-4 h-4 text-gray-400 flex-shrink-0"/>
         <select v-if="status.is_repo"
                 :value="status.branch"
@@ -68,6 +76,12 @@
         </div>
       </template>
       <div class="flex items-center gap-2 flex-shrink-0">
+        <!-- GitHub PR / Issue（应用内管理） -->
+        <Tooltip v-if="status.is_repo && ghRepo" :text="t('git.pr.title')">
+          <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showGithub = true">
+            <GitPullRequest class="w-4 h-4"/>
+          </button>
+        </Tooltip>
         <Tooltip v-if="status.is_repo" :text="t('git.remoteTitle')">
           <button class="text-gray-400 hover:text-gray-600 dark:hover:text-gray-300 cursor-pointer" @click="showRemotes = true">
             <Cloud class="w-4 h-4"/>
@@ -172,9 +186,12 @@
           <div class="px-4 py-1 text-xs font-semibold text-red-500 flex items-center gap-1">
             <AlertTriangle class="w-3.5 h-3.5"/>{{ t('git.conflicts') }} ({{ conflicts.length }})
           </div>
-          <div v-for="f in conflicts" :key="'c' + f.path" class="group flex items-center px-4 py-1 hover:bg-gray-100 dark:hover:bg-gray-800">
+          <div v-for="f in conflicts" :key="'c' + f.path" class="group flex items-center gap-2 px-4 py-1 hover:bg-gray-100 dark:hover:bg-gray-800">
             <span class="flex-1 min-w-0 text-sm text-gray-800 dark:text-gray-200 truncate cursor-pointer" @click="openFile(f.path)">{{ f.path }}</span>
-            <button class="text-xs text-blue-500 hover:underline cursor-pointer flex-shrink-0" @click="resolve(f.path)">{{ t('git.resolve') }}</button>
+            <button class="text-xs text-blue-500 hover:underline cursor-pointer flex-shrink-0" :title="t('git.useOurs')" @click="resolveSide(f.path, 'ours')">{{ t('conflict.ours') }}</button>
+            <button class="text-xs text-blue-500 hover:underline cursor-pointer flex-shrink-0" :title="t('git.useTheirs')" @click="resolveSide(f.path, 'theirs')">{{ t('conflict.theirs') }}</button>
+            <button class="text-xs text-amber-600 dark:text-amber-400 hover:underline cursor-pointer flex-shrink-0 font-medium" @click="conflictFile = f.path">{{ t('git.resolveAssist') }}</button>
+            <button class="text-xs text-gray-400 hover:underline cursor-pointer flex-shrink-0" :title="t('git.markResolvedHint')" @click="resolve(f.path)">{{ t('git.resolve') }}</button>
           </div>
         </div>
 
@@ -361,6 +378,13 @@
   <!-- 分支对比 -->
   <GitCompare v-if="showCompare" :root-dir="rootDir" :branch="status.branch" @close="showCompare = false"/>
 
+  <!-- 冲突解决辅助 -->
+  <ConflictResolver v-if="conflictFile" :root-dir="rootDir" :rel-path="conflictFile"
+                    @open="p => { openFile(p); conflictFile = null }" @resolved="refresh" @close="conflictFile = null"/>
+
+  <!-- GitHub PR / Issue -->
+  <GitHubPanel v-if="showGithub && ghRepo" :owner="ghRepo.owner" :repo="ghRepo.repo" :branch="status.branch" @close="showGithub = false"/>
+
   <!-- 单文件改动对比：HEAD vs 工作区 -->
   <DiffView v-if="diffFile"
             :original="diffFile.original"
@@ -372,10 +396,10 @@
 </template>
 
 <script setup lang="ts">
-import {computed, h, onBeforeUnmount, onMounted, ref} from 'vue'
+import {computed, h, onBeforeUnmount, onMounted, ref, watch} from 'vue'
 import {kvGet, kvSet} from '../composables/useKvStore'
 import {invoke} from '@tauri-apps/api/core'
-import {AlertTriangle, Archive, Boxes, Cloud, Crosshair, DownloadCloud, Eraser, GitBranch, GitBranchPlus, GitCompare as GitCompareIcon, GitCompareArrows, GitMerge, History, ListOrdered, MoreHorizontal, Network, Pencil, RefreshCw, RotateCcw, Rows3, Sparkles, Tag, Trash2, TreeDeciduous, Undo2, UserCog, Webhook, X} from 'lucide-vue-next'
+import {AlertTriangle, Archive, Boxes, Cloud, Crosshair, DownloadCloud, Eraser, GitBranch, GitBranchPlus, GitCompare as GitCompareIcon, GitCompareArrows, GitMerge, GitPullRequest, History, ListOrdered, MoreHorizontal, Network, Pencil, RefreshCw, RotateCcw, Rows3, Sparkles, Tag, Trash2, TreeDeciduous, Undo2, UserCog, Webhook, X} from 'lucide-vue-next'
 import Button from '../ui/Button.vue'
 import Modal from '../ui/Modal.vue'
 import Tooltip from '../ui/Tooltip.vue'
@@ -383,6 +407,8 @@ import DiffView from './DiffView.vue'
 import GitLog from './GitLog.vue'
 import GitReflog from './GitReflog.vue'
 import GitCompare from './GitCompare.vue'
+import ConflictResolver from './ConflictResolver.vue'
+import GitHubPanel from './GitHubPanel.vue'
 import GitStash from './GitStash.vue'
 import GitTags from './GitTags.vue'
 import GitRemotes from './GitRemotes.vue'
@@ -401,8 +427,35 @@ import {useAiConfig} from '../composables/useAiConfig'
 interface GitFile { path: string; index: string; worktree: string }
 interface GitStatusData { is_repo: boolean; branch: string; ahead: number; behind: number; files: GitFile[] }
 
-const props = defineProps<{ rootDir: string }>()
-const emit = defineEmits<{ close: []; refresh: []; open: [path: string] }>()
+const props = defineProps<{ rootDir: string; roots?: string[] }>()
+const emit = defineEmits<{ close: []; refresh: []; open: [path: string]; switchRoot: [root: string] }>()
+
+const baseName = (p: string) => p.split(/[\\/]/).filter(Boolean).pop() || p
+
+// ===== GitHub PR / Issue 集成（用配置的 token 在应用内管理）=====
+const showGithub = ref(false)
+const ghRepo = ref<{ owner: string; repo: string } | null>(null)
+const remoteToWebUrl = (raw: string): string | null => {
+  let u = raw.trim().replace(/\.git$/, '')
+  const scp = u.match(/^git@([^:]+):(.+)$/)
+  if (scp) {
+    return `https://${scp[1]}/${scp[2]}`
+  }
+  u = u.replace(/^ssh:\/\/(git@)?/, 'https://').replace(/^git:\/\//, 'https://')
+  return u.startsWith('http://') || u.startsWith('https://') ? u.replace(/^http:\/\//, 'https://') : null
+}
+const detectGithub = async () => {
+  try {
+    const remotes = await invoke<{ name: string; url: string }[]>('git_remotes', {root: props.rootDir})
+    const origin = remotes.find(r => r.name === 'origin') || remotes[0]
+    const web = origin && remoteToWebUrl(origin.url)
+    const m = web && web.match(/github\.com\/([^/]+)\/([^/]+)/)
+    ghRepo.value = m ? {owner: m[1], repo: m[2]} : null
+  }
+  catch {
+    ghRepo.value = null
+  }
+}
 
 // 面板宽度（可拖拽左缘改宽，持久化到 KV）
 const clampWidth = (w: number) => Math.max(360, Math.min(w, Math.max(360, window.innerWidth - 200)))
@@ -512,9 +565,11 @@ const refresh = async () => {
       remoteBranches.value = await invoke<string[]>('git_remote_branches', {root: props.rootDir})
       opState.value = await invoke<string>('git_op_state', {root: props.rootDir})
       submoduleCount.value = (await invoke<unknown[]>('git_submodules', {root: props.rootDir})).length
+      detectGithub()
     }
     else {
       opState.value = 'none'
+      ghRepo.value = null
     }
     emit('refresh')
   }
@@ -557,6 +612,21 @@ const resolve = async (path: string) => {
     toast.error(t('git.stageFailed') + ': ' + error)
   }
 }
+
+// 冲突文件整文件取一侧（ours/theirs）并标记已解决
+const resolveSide = async (path: string, side: 'ours' | 'theirs') => {
+  try {
+    await invoke('git_resolve_side', {root: props.rootDir, path, side})
+    toast.success(t('git.resolved'))
+    await refresh()
+  }
+  catch (error) {
+    toast.error(t('git.stageFailed') + ': ' + error)
+  }
+}
+
+// 冲突解决辅助界面的目标文件（相对路径）
+const conflictFile = ref<string | null>(null)
 const stageAll = () => stage(unstaged.value.map(f => f.path))
 const unstageAll = () => unstage(staged.value.map(f => f.path))
 
@@ -929,6 +999,11 @@ const genMessage = async () => {
 }
 
 onMounted(refresh)
+// 活动根切换时重新载入该根的 Git 状态
+watch(() => props.rootDir, () => {
+  branchMenu.value = false
+  refresh()
+})
 
 // 行内小组件：文件名 + 状态字母 + 暂存/取消按钮
 const FileRow = (rowProps: { file: GitFile; staged?: boolean }, {emit: rowEmit }: any) => {
diff --git a/src/components/setting/Shortcut.vue b/src/components/setting/Shortcut.vue
index 88469ab..214fc16 100644
--- a/src/components/setting/Shortcut.vue
+++ b/src/components/setting/Shortcut.vue
@@ -8,6 +8,25 @@
       <Button type="secondary" size="sm" @click="resetAll">{{ t('settings.shortcut.resetAll') }}</Button>
     </div>
 
+    <!-- 快捷键预设：套用 / 保存当前 / 删除 -->
+    <div class="flex items-center flex-wrap gap-2 mb-4 p-3 rounded-lg border border-gray-200 dark:border-gray-700 bg-gray-50 dark:bg-gray-800/50">
+      <span class="text-xs font-medium text-gray-500 dark:text-gray-400">{{ t('settings.shortcut.presets') }}</span>
+      <select v-if="presets.length" class="text-xs rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800 px-2 py-1 focus:outline-none cursor-pointer max-w-[160px]"
+              :value="''" @change="onApplyPreset">
+        <option value="" disabled>{{ t('settings.shortcut.applyPreset') }}</option>
+        <option v-for="p in presets" :key="p.name" :value="p.name">{{ p.name }}</option>
+      </select>
+      <div v-for="p in presets" :key="'chip' + p.name" class="inline-flex items-center gap-1 text-xs px-2 py-0.5 rounded bg-white dark:bg-gray-700 border border-gray-200 dark:border-gray-600">
+        <span class="truncate max-w-[100px]">{{ p.name }}</span>
+        <button class="text-gray-400 hover:text-red-500 cursor-pointer" @click="deletePreset(p.name)"><X class="w-3 h-3"/></button>
+      </div>
+      <div class="flex items-center gap-1 ml-auto">
+        <input v-model="newPresetName" :placeholder="t('settings.shortcut.presetNamePlaceholder')" @keydown.enter="doSavePreset"
+               class="text-xs rounded border border-gray-300 dark:border-gray-600 bg-white dark:bg-gray-800 px-2 py-1 focus:outline-none w-32"/>
+        <Button size="sm" :disabled="!newPresetName.trim()" @click="doSavePreset">{{ t('settings.shortcut.savePreset') }}</Button>
+      </div>
+    </div>
+
     <div class="space-y-1">
       <div v-for="action in actions"
            :key="action.id"
@@ -43,15 +62,37 @@
 <script setup lang="ts">
 import {onMounted, onUnmounted, ref} from 'vue'
 import {useI18n} from 'vue-i18n'
-import {Keyboard} from 'lucide-vue-next'
+import {Keyboard, X} from 'lucide-vue-next'
 import Button from '../../ui/Button.vue'
+import {useToast} from '../../plugins/toast'
 import {comboFromEvent, formatCombo, useShortcuts} from '../../composables/useShortcuts'
 
 const {t} = useI18n()
-const {actions, getBinding, setBinding, resetBinding, resetAll} = useShortcuts()
+const toast = useToast()
+const {actions, getBinding, setBinding, resetBinding, resetAll, presets, savePreset, applyPreset, deletePreset} = useShortcuts()
 
 const recordingId = ref<string | null>(null)
 
+// 快捷键预设
+const newPresetName = ref('')
+const doSavePreset = () => {
+  const name = newPresetName.value.trim()
+  if (!name) {
+    return
+  }
+  savePreset(name)
+  newPresetName.value = ''
+  toast.success(t('settings.shortcut.presetSaved', {name}))
+}
+const onApplyPreset = (e: Event) => {
+  const name = (e.target as HTMLSelectElement).value
+  ;(e.target as HTMLSelectElement).value = ''
+  if (name) {
+    applyPreset(name)
+    toast.success(t('settings.shortcut.presetApplied', {name}))
+  }
+}
+
 const onRecordKeydown = (e: KeyboardEvent) => {
   if (!recordingId.value) {
     return
diff --git a/src/composables/useShortcuts.ts b/src/composables/useShortcuts.ts
index 6efcee9..9862ca9 100644
--- a/src/composables/useShortcuts.ts
+++ b/src/composables/useShortcuts.ts
@@ -9,6 +9,13 @@ export interface ShortcutAction
     default: string
 }
 
+// 命名快捷键预设：一整套绑定，可保存/套用/切换
+export interface ShortcutPreset
+{
+    name: string
+    bindings: Record<string, string>
+}
+
 // 可自定义的快捷键动作及默认绑定（Mod = mac 上 ⌘，其他平台 Ctrl）。
 // 动作名（label）由 i18n 提供（shortcutAction.<id>），随界面语言切换。
 const SHORTCUT_DEFS: { id: string; default: string }[] = [
@@ -35,6 +42,7 @@ const SHORTCUT_DEFS: { id: string; default: string }[] = [
 ]
 
 const STORAGE_KEY = 'shortcuts'
+const PRESET_KEY = 'shortcut-presets'
 
 const isMac = typeof navigator !== 'undefined' && /Mac/i.test(navigator.platform)
 
@@ -129,6 +137,41 @@ export function useShortcuts()
         SHORTCUT_DEFS.map(a => ({id: a.id, label: i18n.global.t(`shortcutAction.${a.id}`), default: a.default}))
     )
 
+    // ===== 命名预设：保存当前整套绑定，随时套用/切换 =====
+    const presets = ref<ShortcutPreset[]>(kvGetJSON<ShortcutPreset[]>(PRESET_KEY, []))
+    const reloadPresets = () => {
+        presets.value = kvGetJSON<ShortcutPreset[]>(PRESET_KEY, [])
+    }
+    const persistPresets = () => kvSetJSON(PRESET_KEY, presets.value)
+
+    // 把当前生效的整套绑定存为预设（同名覆盖）
+    const savePreset = (name: string) => {
+        const entry: ShortcutPreset = {name, bindings: {...bindings.value}}
+        const i = presets.value.findIndex(p => p.name === name)
+        if (i >= 0) {
+            presets.value[i] = entry
+        }
+        else {
+            presets.value = [...presets.value, entry]
+        }
+        persistPresets()
+    }
+
+    // 套用预设：把预设的绑定作为覆盖生效
+    const applyPreset = (name: string) => {
+        const p = presets.value.find(pr => pr.name === name)
+        if (!p) {
+            return
+        }
+        overrides.value = {...p.bindings}
+        persist()
+    }
+
+    const deletePreset = (name: string) => {
+        presets.value = presets.value.filter(p => p.name !== name)
+        persistPresets()
+    }
+
     return {
         actions,
         bindings,
@@ -138,6 +181,11 @@ export function useShortcuts()
         resetAll,
         matchAction,
         formatCombo,
-        reload: load
+        reload: load,
+        presets,
+        savePreset,
+        applyPreset,
+        deletePreset,
+        reloadPresets
     }
 }
diff --git a/src/i18n/locales/en.json b/src/i18n/locales/en.json
index be13d95..3be9956 100644
--- a/src/i18n/locales/en.json
+++ b/src/i18n/locales/en.json
@@ -97,6 +97,12 @@
       "cancel": "Cancel",
       "edit": "Edit",
       "reset": "Reset",
+      "presets": "Presets",
+      "applyPreset": "Apply preset…",
+      "savePreset": "Save as preset",
+      "presetNamePlaceholder": "Preset name",
+      "presetSaved": "Saved preset \"{name}\"",
+      "presetApplied": "Applied preset \"{name}\"",
       "hint": "Tip: changes take effect after closing Settings."
     },
     "cache": {
@@ -352,6 +358,16 @@
   },
   "git": {
     "notRepo": "Not a Git repository",
+    "switchRoot": "Switch workspace root (per-root Git)",
+    "pr": {
+      "title": "GitHub Pull Request",
+      "create": "New PR for current branch",
+      "list": "View all PRs"
+    },
+    "useOurs": "Take our version for the whole file",
+    "useTheirs": "Take their version for the whole file",
+    "resolveAssist": "Resolve…",
+    "markResolvedHint": "Already fixed manually? Mark as resolved (stage)",
     "opInProgress": "{op} in progress (resolve conflicts then continue, or abort)",
     "opContinue": "Continue",
     "opAbort": "Abort",
@@ -704,6 +720,7 @@
     "aiGenDoc": "AI generate doc comment",
     "aiTranslate": "AI translate comments/docs",
     "aiMultiEdit": "AI multi-file edit",
+    "exportCodeImage": "Export code as image",
     "history": "Run history",
     "diff": "Diff (current vs saved)",
     "preview": "Live preview (Markdown / HTML)",
@@ -1038,6 +1055,60 @@
     "all": "All",
     "pivotHint": "Drag a field to \"Values\" to build the pivot table"
   },
+  "codeImage": {
+    "title": "Export code as image",
+    "theme": "Theme",
+    "padding": "Padding",
+    "windowChrome": "Window chrome",
+    "lineNumbers": "Line numbers",
+    "copy": "Copy to clipboard",
+    "download": "Download PNG",
+    "rendering": "Rendering…",
+    "saved": "Image saved",
+    "copied": "Image copied",
+    "failed": "Render failed",
+    "copyFailed": "Copy failed"
+  },
+  "gh": {
+    "prs": "Pull Requests",
+    "issues": "Issues",
+    "refresh": "Refresh",
+    "needToken": "Configure a token first in Settings → General → GitHub",
+    "newPr": "New Pull Request",
+    "newIssue": "New Issue",
+    "titlePlaceholder": "Title",
+    "bodyPlaceholder": "Description (optional, Markdown supported)",
+    "from": "from",
+    "draft": "Draft",
+    "createPr": "Create PR",
+    "createIssue": "Create Issue",
+    "submitting": "Submitting…",
+    "loading": "Loading…",
+    "noPrs": "No open pull requests",
+    "noIssues": "No open issues",
+    "prCreated": "Created PR #{n}",
+    "issueCreated": "Created Issue #{n}"
+  },
+  "conflict": {
+    "title": "Resolve conflicts",
+    "remaining": "{n} unresolved",
+    "allBlocks": "All blocks",
+    "ours": "Ours",
+    "theirs": "Theirs",
+    "both": "Both",
+    "loading": "Loading…",
+    "noConflict": "No conflict markers in this file",
+    "resolvedBlock": "Picked: {pick}",
+    "pickSide": "Choose which side to keep",
+    "ourSide": "Ours (current branch)",
+    "theirSide": "Theirs (incoming branch)",
+    "openInEditor": "Edit manually in editor",
+    "cancel": "Cancel",
+    "saveResolved": "Save & mark resolved",
+    "done": "Conflict resolved",
+    "saveFailed": "Save failed",
+    "loadFailed": "Load failed"
+  },
   "sqlEdit": {
     "confirmTitle": "Confirm write-back",
     "confirmHint": "The following statement will update the database (the WHERE clause matches the row's original values; identical rows would all be updated):",
@@ -1461,6 +1532,7 @@
     "noDiagnostics": "No diagnostics in the current file",
     "replUnsupported": "No built-in REPL for the current language",
     "replStarted": "REPL started: {cmd}",
+    "noCodeToImage": "No code to export",
     "aiMultiNeedFiles": "Open the files you want to edit first",
     "aiMultiApplied": "AI edits applied ({n} file(s))",
     "aiMultiWriteFailed": "Failed to write {name}: ",
diff --git a/src/i18n/locales/zh-CN.json b/src/i18n/locales/zh-CN.json
index 1221a50..e2f0178 100644
--- a/src/i18n/locales/zh-CN.json
+++ b/src/i18n/locales/zh-CN.json
@@ -97,6 +97,12 @@
       "cancel": "取消",
       "edit": "修改",
       "reset": "重置",
+      "presets": "预设",
+      "applyPreset": "套用预设…",
+      "savePreset": "保存为预设",
+      "presetNamePlaceholder": "预设名称",
+      "presetSaved": "已保存预设「{name}」",
+      "presetApplied": "已套用预设「{name}」",
       "hint": "提示：修改后关闭设置即生效。"
     },
     "cache": {
@@ -352,6 +358,16 @@
   },
   "git": {
     "notRepo": "非 Git 仓库",
+    "switchRoot": "切换工作区根（各根独立 Git）",
+    "pr": {
+      "title": "GitHub Pull Request",
+      "create": "为当前分支新建 PR",
+      "list": "查看所有 PR"
+    },
+    "useOurs": "整文件采用我方版本",
+    "useTheirs": "整文件采用他方版本",
+    "resolveAssist": "解决…",
+    "markResolvedHint": "已手动改好则直接标记为已解决（暂存）",
     "opInProgress": "{op} 进行中（解决冲突后继续，或中止）",
     "opContinue": "继续",
     "opAbort": "中止",
@@ -704,6 +720,7 @@
     "aiGenDoc": "AI 生成文档注释",
     "aiTranslate": "AI 翻译注释/文档",
     "aiMultiEdit": "AI 多文件编辑",
+    "exportCodeImage": "导出代码为图片",
     "history": "执行历史",
     "diff": "差异对比（当前 vs 已保存）",
     "preview": "实时预览（Markdown / HTML）",
@@ -1038,6 +1055,60 @@
     "all": "全部",
     "pivotHint": "把字段拖到「值」即可生成透视表"
   },
+  "codeImage": {
+    "title": "导出代码为图片",
+    "theme": "主题",
+    "padding": "内边距",
+    "windowChrome": "窗口装饰",
+    "lineNumbers": "行号",
+    "copy": "复制到剪贴板",
+    "download": "下载 PNG",
+    "rendering": "渲染中…",
+    "saved": "图片已保存",
+    "copied": "图片已复制",
+    "failed": "生成失败",
+    "copyFailed": "复制失败"
+  },
+  "gh": {
+    "prs": "Pull Requests",
+    "issues": "Issues",
+    "refresh": "刷新",
+    "needToken": "请先在「设置 → 通用 → GitHub」配置 Token",
+    "newPr": "新建 Pull Request",
+    "newIssue": "新建 Issue",
+    "titlePlaceholder": "标题",
+    "bodyPlaceholder": "描述（可选，支持 Markdown）",
+    "from": "从",
+    "draft": "草稿",
+    "createPr": "创建 PR",
+    "createIssue": "创建 Issue",
+    "submitting": "提交中…",
+    "loading": "加载中…",
+    "noPrs": "没有开放的 Pull Request",
+    "noIssues": "没有开放的 Issue",
+    "prCreated": "已创建 PR #{n}",
+    "issueCreated": "已创建 Issue #{n}"
+  },
+  "conflict": {
+    "title": "解决冲突",
+    "remaining": "剩余 {n} 处未解决",
+    "allBlocks": "全部冲突",
+    "ours": "我方",
+    "theirs": "他方",
+    "both": "两者",
+    "loading": "读取中…",
+    "noConflict": "该文件没有冲突标记",
+    "resolvedBlock": "已选：{pick}",
+    "pickSide": "请选择保留哪一侧",
+    "ourSide": "我方（当前分支）",
+    "theirSide": "他方（合入分支）",
+    "openInEditor": "在编辑器中手动编辑",
+    "cancel": "取消",
+    "saveResolved": "保存并标记已解决",
+    "done": "冲突已解决",
+    "saveFailed": "保存失败",
+    "loadFailed": "读取失败"
+  },
   "sqlEdit": {
     "confirmTitle": "确认写回",
     "confirmHint": "将执行以下语句更新数据库（WHERE 依据该行原值定位，若存在完全相同的行会一并更新）：",
@@ -1461,6 +1532,7 @@
     "noDiagnostics": "当前文件没有诊断问题",
     "replUnsupported": "当前语言暂无内置 REPL",
     "replStarted": "已启动 REPL：{cmd}",
+    "noCodeToImage": "没有可导出的代码",
     "aiMultiNeedFiles": "请先打开需要参与编辑的文件",
     "aiMultiApplied": "已应用 AI 修改（{n} 个文件）",
     "aiMultiWriteFailed": "写入 {name} 失败：",