diff --git a/Agent.md b/Agent.md
index d89a5a9c..1a163d0f 100644
--- a/Agent.md
+++ b/Agent.md
@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
   - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
   - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
   - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
-  - Unit tests `npm test` (233: 44 daemon_client + 19 conn-manager + 22 app-commands + 111 renderer smoke + 15 i18n + 7 integration + 3 commands + 5 build-config + 7 gui-state); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
+  - Unit tests `npm test` (234: 44 daemon_client + 19 conn-manager + 22 app-commands + 112 renderer smoke + 15 i18n + 7 integration + 3 commands + 5 build-config + 7 gui-state); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
   - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
   - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.port; python -m emrg
 ```
 
 Python: `uv run pytest tests/ -v` (777) — import check: `uv run python -c "from emrg.client.app import run_client"`
-GUI: `cd emrg/gui && npm test` (233: 44 daemon_client + 19 conn-manager + 22 app-commands + 111 renderer smoke + 15 i18n + 7 integration + 3 commands + 5 build-config + 7 gui-state) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
+GUI: `cd emrg/gui && npm test` (234: 44 daemon_client + 19 conn-manager + 22 app-commands + 112 renderer smoke + 15 i18n + 7 integration + 3 commands + 5 build-config + 7 gui-state) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
 CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
 Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)
 
diff --git a/emrg/gui/renderer/css/layout.css b/emrg/gui/renderer/css/layout.css
index eef95a19..bdef448e 100644
--- a/emrg/gui/renderer/css/layout.css
+++ b/emrg/gui/renderer/css/layout.css
@@ -83,6 +83,50 @@
   color: var(--text-3);
 }
 
+/* rant 14:10:14 P2：设置面板 tab（模型服务/工作目录/GitHub/外观/语言/关于） */
+.panel-tabs {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 4px;
+  margin-bottom: var(--sp-3);
+}
+.panel-tab {
+  flex: 1;
+  min-width: 0;
+  padding: 6px 8px;
+  border: 1px solid var(--border);
+  border-radius: var(--radius-sm);
+  background: transparent;
+  color: var(--text-2);
+  font-size: var(--fs-secondary);
+  line-height: 1.2;
+  cursor: pointer;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  transition: background var(--dur-fast) var(--ease), color var(--dur-fast) var(--ease);
+}
+.panel-tab:hover {
+  background: var(--bg-soft);
+  color: var(--text-1);
+}
+.panel-tab.active {
+  background: color-mix(in srgb, var(--accent) 14%, transparent);
+  border-color: color-mix(in srgb, var(--accent) 40%, transparent);
+  color: var(--accent);
+}
+.panel-tab-body .settings-group {
+  margin-bottom: var(--sp-3);
+}
+.panel-actions {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+  margin-top: var(--sp-3);
+  padding-top: var(--sp-2);
+  border-top: 1px solid var(--border);
+}
+
 /* 成长状态卡（WorkBuddy P3：自进化可见化） */
 .growth-card {
   margin: 0 var(--sp-3) var(--sp-3);
diff --git a/emrg/gui/renderer/index.html b/emrg/gui/renderer/index.html
index 79846a24..85caa07c 100644
--- a/emrg/gui/renderer/index.html
+++ b/emrg/gui/renderer/index.html
@@ -50,7 +50,63 @@
       </section>
       <section class="side-panel hidden" id="panel-tasks" data-panel-body="tasks">
         <div class="side-panel-title" data-i18n="nav.tasksPanel">任务</div>
-        <div class="side-panel-body" data-i18n="nav.placeholder">面板内容将在后续版本填充</div>
+        <div class="side-panel-body">
+          <!-- rant 14:10:14 P3：任务管理从设置迁出（替代 settings 内任务区 + tasks-dialog） -->
+          <div class="hint" style="margin-bottom:6px;" data-i18n="settings.tasksHint">管理定时任务与自定义任务类型（内置类型只读）</div>
+          <div id="task-list" class="task-list"></div>
+          <div style="display:flex;gap:8px;margin-top:8px;">
+            <button type="button" id="task-add-btn" class="btn btn-ghost" style="flex:1;" data-i18n="settings.taskAdd">＋ 添加任务</button>
+            <button type="button" id="task-template-mgr-btn" class="btn btn-ghost" style="flex:1;" data-i18n="settings.taskTemplates">自定义类型</button>
+          </div>
+          <!-- 任务表单（添加/编辑） -->
+          <div id="task-form" class="task-form hidden">
+            <label class="model-form-label" data-i18n="settings.taskName">任务名
+              <input type="text" id="task-form-name" maxlength="32" placeholder="daily-report" />
+            </label>
+            <div class="model-form-row">
+              <label class="model-form-label" data-i18n="settings.taskType">类型
+                <select id="task-form-type"></select>
+              </label>
+              <label class="model-form-label" data-i18n="settings.taskProject">项目
+                <select id="task-form-project"></select>
+              </label>
+            </div>
+            <div class="model-form-row">
+              <label class="model-form-label" data-i18n="settings.taskInterval">间隔（秒，≥60）
+                <input type="number" id="task-form-interval" min="60" step="1" value="1800" />
+              </label>
+              <label class="model-form-vision" style="align-self:flex-end;margin-bottom:8px;">
+                <input type="checkbox" id="task-form-enabled" checked /> <span data-i18n="settings.taskEnabled">启用</span>
+              </label>
+            </div>
+            <label class="model-form-label" data-i18n="settings.taskRepo">仓库（选填 owner/repo）
+              <input type="text" id="task-form-repo" maxlength="80" placeholder="acme/repo" />
+            </label>
+            <div class="model-form-footer">
+              <div style="display:flex;gap:8px;margin-left:auto;">
+                <button type="button" id="task-form-cancel" class="btn btn-ghost" style="padding:6px 12px;min-height:30px;" data-i18n="settings.cancel">取消</button>
+                <button type="button" id="task-form-save" class="btn btn-primary" style="padding:6px 12px;min-height:30px;" data-i18n="settings.taskSave">保存任务</button>
+              </div>
+            </div>
+          </div>
+          <!-- 自定义类型表单 -->
+          <div id="task-template-form" class="task-form hidden">
+            <label class="model-form-label" data-i18n="settings.templateName">类型名
+              <input type="text" id="task-template-name" maxlength="32" placeholder="report" />
+            </label>
+            <label class="model-form-label" data-i18n="settings.templatePrompt">提示词模板
+              <textarea id="task-template-prompt" rows="6" style="width:100%;min-height:120px;" placeholder="# {{ instance_id }} ..."></textarea>
+            </label>
+            <div class="model-form-footer">
+              <div style="display:flex;gap:8px;margin-left:auto;">
+                <button type="button" id="task-template-cancel" class="btn btn-ghost" style="padding:6px 12px;min-height:30px;" data-i18n="settings.cancel">取消</button>
+                <button type="button" id="task-template-save" class="btn btn-primary" style="padding:6px 12px;min-height:30px;" data-i18n="settings.templateSave">保存类型</button>
+              </div>
+            </div>
+          </div>
+          <!-- 自定义类型列表 -->
+          <div id="task-template-list" class="task-list hidden" style="margin-top:8px;"></div>
+        </div>
       </section>
       <section class="side-panel hidden" id="panel-rants" data-panel-body="rants">
         <div class="side-panel-title" data-i18n="nav.rantsPanel">Rant</div>
@@ -58,7 +114,106 @@
       </section>
       <section class="side-panel hidden" id="panel-settings" data-panel-body="settings">
         <div class="side-panel-title" data-i18n="nav.settingsPanel">设置</div>
-        <div class="side-panel-body" data-i18n="nav.placeholder">面板内容将在后续版本填充</div>
+        <!-- rant 14:10:14 P2：设置改为面板，6 tab（模型服务/工作目录/GitHub/外观/语言/关于） -->
+        <div class="panel-tabs" id="settings-tabs" role="tablist">
+          <button type="button" class="panel-tab active" id="settings-tab-model" data-settings-tab="model" data-i18n="settings.groupModel">模型服务</button>
+          <button type="button" class="panel-tab" id="settings-tab-workdir" data-settings-tab="workdir" data-i18n="settings.groupWorkdir">工作目录</button>
+          <button type="button" class="panel-tab" id="settings-tab-github" data-settings-tab="github" data-i18n="settings.groupGithub">GitHub</button>
+          <button type="button" class="panel-tab" id="settings-tab-appearance" data-settings-tab="appearance" data-i18n="settings.groupAppearance">外观</button>
+          <button type="button" class="panel-tab" id="settings-tab-language" data-settings-tab="language" data-i18n="settings.groupLanguage">语言</button>
+          <button type="button" class="panel-tab" id="settings-tab-about" data-settings-tab="about" data-i18n="settings.aboutTitle">关于</button>
+        </div>
+        <div class="panel-tab-body" id="settings-body-model" data-settings-body="model">
+          <div class="settings-group">
+            <label><span data-i18n="settings.apiKey">API Key</span> <input type="password" id="set-api-key" /></label>
+            <label><span data-i18n="settings.baseUrl">接口地址</span> <input type="text" id="set-base-url" placeholder="https://api.deepseek.com" /></label>
+            <div class="settings-group-title" style="margin-top:14px;" data-i18n="settings.availableModels">可用模型</div>
+            <div id="model-list"></div>
+            <button type="button" id="add-model-btn" class="btn btn-ghost" style="width:100%;margin-top:6px;" data-i18n="settings.addModel">＋ 添加模型</button>
+            <!-- 行内添加/编辑模型表单 -->
+            <div id="model-form" class="model-form hidden">
+              <div class="model-form-row">
+                <label class="model-form-label" data-i18n="settings.name">名称
+                  <input type="text" id="model-form-name" placeholder="如 deepseek-v3" maxlength="40" data-i18n-placeholder="settings.modelNamePlaceholder" />
+                </label>
+                <label class="model-form-label" data-i18n="settings.modelId">模型 ID（选填）
+                  <input type="text" id="model-form-id" placeholder="默认同名称" maxlength="60" data-i18n-placeholder="settings.modelIdPlaceholder" />
+                </label>
+              </div>
+              <div class="model-form-footer">
+                <label class="model-form-vision"><input type="checkbox" id="model-form-vision" /> <span data-i18n="settings.vision">支持图片</span></label>
+                <div style="display:flex;gap:8px;margin-left:auto;">
+                  <button type="button" id="model-form-cancel" class="btn btn-ghost" style="padding:6px 12px;min-height:30px;" data-i18n="settings.cancel">取消</button>
+                  <button type="button" id="model-form-save" class="btn btn-primary" style="padding:6px 12px;min-height:30px;" data-i18n="settings.saveModel">保存模型</button>
+                </div>
+              </div>
+            </div>
+            <div class="hint" style="margin-top:8px;" data-i18n="settings.defaultHint">点左侧圆点可设为默认模型，切换后下一条消息即生效</div>
+          </div>
+        </div>
+        <div class="panel-tab-body hidden" id="settings-body-workdir" data-settings-body="workdir">
+          <div class="settings-group">
+            <label><span data-i18n="settings.workdirDesc">EMRG 在哪里帮你干活</span>
+              <div class="dir-row">
+                <input type="text" id="set-project-dir" readonly />
+                <button type="button" id="pick-dir-btn" class="btn btn-ghost" data-i18n="settings.choose">选择…</button>
+              </div>
+            </label>
+          </div>
+        </div>
+        <div class="panel-tab-body hidden" id="settings-body-github" data-settings-body="github">
+          <div class="settings-group">
+            <div id="github-status" class="hint" style="margin-bottom:6px;">—</div>
+            <div id="github-auth-row" style="display:flex;gap:8px;">
+              <input type="password" id="set-github-token" placeholder="GitHub Personal Access Token" style="flex:1;min-width:0;" data-i18n-placeholder="settings.githubTokenPlaceholder" />
+              <button type="button" id="github-connect-btn" class="btn btn-primary" data-i18n="settings.githubConnect">连接</button>
+              <button type="button" id="github-disconnect-btn" class="btn btn-ghost hidden" data-i18n="settings.githubDisconnect">断开</button>
+            </div>
+            <div class="hint" style="margin-top:6px;" data-i18n="settings.githubHint">用于自进化推送 PR；授权后自动执行 gh auth setup-git，git 操作不再弹 GCM</div>
+          </div>
+        </div>
+        <div class="panel-tab-body hidden" id="settings-body-appearance" data-settings-body="appearance">
+          <div class="settings-group">
+            <label><span data-i18n="settings.theme">主题</span>
+              <div class="theme-options" id="theme-options">
+                <button type="button" class="theme-option" data-theme="light" data-i18n="settings.themeLight">浅色</button>
+                <button type="button" class="theme-option" data-theme="dark" data-i18n="settings.themeDark">深色</button>
+                <button type="button" class="theme-option" data-theme="system" data-i18n="settings.themeSystem">跟随系统</button>
+              </div>
+            </label>
+          </div>
+        </div>
+        <div class="panel-tab-body hidden" id="settings-body-language" data-settings-body="language">
+          <div class="settings-group">
+            <label><span data-i18n="settings.groupLanguage">语言</span>
+              <div class="theme-options" id="lang-options">
+                <button type="button" class="theme-option" data-lang="" data-i18n="settings.langFollowSystem">跟随系统</button>
+                <button type="button" class="theme-option" data-lang="zh" data-i18n="settings.langZh">中文</button>
+                <button type="button" class="theme-option" data-lang="en" data-i18n="settings.langEn">English</button>
+              </div>
+            </label>
+          </div>
+        </div>
+        <div class="panel-tab-body hidden" id="settings-body-about" data-settings-body="about">
+          <div class="settings-group">
+            <div class="about-box">
+              <div class="about-line">EMRG <span id="about-version">v0.2.8</span> · <span id="about-evolutions">🌱 <span data-i18n="copy.growthCountPrefix">已自我进化</span> 0 <span data-i18n="copy.times">次</span></span></div>
+              <div class="about-line hidden" id="about-update"></div>
+              <div class="about-line">
+                <button type="button" class="btn btn-sm" id="about-update-check-btn" data-i18n="settings.checkUpdate">检查更新</button>
+              </div>
+              <div class="hint" style="margin-top:6px;" data-i18n="settings.aboutDesc">EMRG 是一个会自我进化的 AI 智能体——每次改进都会自动汇报，你可以随时在这里看到它的成长。</div>
+            </div>
+          </div>
+          <div class="settings-group">
+            <div class="settings-group-title" data-i18n="settings.recentTitle">最近改进</div>
+            <div id="about-recent" class="about-recent"></div>
+          </div>
+        </div>
+        <div class="panel-actions">
+          <button type="button" id="settings-cancel" class="btn btn-ghost" data-i18n="settings.cancel">取消</button>
+          <button type="button" id="settings-save" class="btn btn-primary" data-i18n="settings.save">保存</button>
+        </div>
       </section>
       <div class="sidebar-footer">
         <span id="status-dot" class="status-dot gray" title="连接状态" data-i18n-title="sidebar.statusTitle"></span>
@@ -138,157 +293,6 @@
     <div id="result-resizer" title="拖拽调整宽度" data-i18n-title="result.resize"></div>
   </div>
 
-  <!-- 设置对话框 -->
-  <dialog id="settings-dialog">
-    <div class="dialog-card">
-      <h2 data-i18n="settings.title">设置</h2>
-      <div class="settings-group">
-        <div class="settings-group-title" data-i18n="settings.groupModel">模型服务</div>
-        <label><span data-i18n="settings.apiKey">API Key</span> <input type="password" id="set-api-key" /></label>
-        <label><span data-i18n="settings.baseUrl">接口地址</span> <input type="text" id="set-base-url" placeholder="https://api.deepseek.com" /></label>
-        <div class="settings-group-title" style="margin-top:14px;" data-i18n="settings.availableModels">可用模型</div>
-        <div id="model-list"></div>
-        <button type="button" id="add-model-btn" class="btn btn-ghost" style="width:100%;margin-top:6px;" data-i18n="settings.addModel">＋ 添加模型</button>
-        <!-- 行内添加/编辑模型表单 -->
-        <div id="model-form" class="model-form hidden">
-          <div class="model-form-row">
-            <label class="model-form-label" data-i18n="settings.name">名称
-              <input type="text" id="model-form-name" placeholder="如 deepseek-v3" maxlength="40" data-i18n-placeholder="settings.modelNamePlaceholder" />
-            </label>
-            <label class="model-form-label" data-i18n="settings.modelId">模型 ID（选填）
-              <input type="text" id="model-form-id" placeholder="默认同名称" maxlength="60" data-i18n-placeholder="settings.modelIdPlaceholder" />
-            </label>
-          </div>
-          <div class="model-form-footer">
-            <label class="model-form-vision"><input type="checkbox" id="model-form-vision" /> <span data-i18n="settings.vision">支持图片</span></label>
-            <div style="display:flex;gap:8px;margin-left:auto;">
-              <button type="button" id="model-form-cancel" class="btn btn-ghost" style="padding:6px 12px;min-height:30px;" data-i18n="settings.cancel">取消</button>
-              <button type="button" id="model-form-save" class="btn btn-primary" style="padding:6px 12px;min-height:30px;" data-i18n="settings.saveModel">保存模型</button>
-            </div>
-          </div>
-        </div>
-        <div class="hint" style="margin-top:8px;" data-i18n="settings.defaultHint">点左侧圆点可设为默认模型，切换后下一条消息即生效</div>
-      </div>
-      <div class="settings-group">
-        <div class="settings-group-title" data-i18n="settings.groupWorkdir">工作目录</div>
-        <label><span data-i18n="settings.workdirDesc">EMRG 在哪里帮你干活</span>
-          <div class="dir-row">
-            <input type="text" id="set-project-dir" readonly />
-            <button type="button" id="pick-dir-btn" class="btn btn-ghost" data-i18n="settings.choose">选择…</button>
-          </div>
-        </label>
-      </div>
-      <div class="settings-group">
-        <div class="settings-group-title" data-i18n="settings.groupGithub">GitHub 连接</div>
-        <div id="github-status" class="hint" style="margin-bottom:6px;">—</div>
-        <div id="github-auth-row" style="display:flex;gap:8px;">
-          <input type="password" id="set-github-token" placeholder="GitHub Personal Access Token" style="flex:1;min-width:0;" data-i18n-placeholder="settings.githubTokenPlaceholder" />
-          <button type="button" id="github-connect-btn" class="btn btn-primary" data-i18n="settings.githubConnect">连接</button>
-          <button type="button" id="github-disconnect-btn" class="btn btn-ghost hidden" data-i18n="settings.githubDisconnect">断开</button>
-        </div>
-        <div class="hint" style="margin-top:6px;" data-i18n="settings.githubHint">用于自进化推送 PR；授权后自动执行 gh auth setup-git，git 操作不再弹 GCM</div>
-      </div>
-      <div class="settings-group">
-        <div class="settings-group-title" data-i18n="settings.groupAppearance">外观</div>
-        <label><span data-i18n="settings.theme">主题</span>
-          <div class="theme-options" id="theme-options">
-            <button type="button" class="theme-option" data-theme="light" data-i18n="settings.themeLight">浅色</button>
-            <button type="button" class="theme-option" data-theme="dark" data-i18n="settings.themeDark">深色</button>
-            <button type="button" class="theme-option" data-theme="system" data-i18n="settings.themeSystem">跟随系统</button>
-          </div>
-        </label>
-      </div>
-      <div class="settings-group">
-        <div class="settings-group-title" data-i18n="settings.groupLanguage">语言</div>
-        <label><span data-i18n="settings.groupLanguage">语言</span>
-          <div class="theme-options" id="lang-options">
-            <button type="button" class="theme-option" data-lang="" data-i18n="settings.langFollowSystem">跟随系统</button>
-            <button type="button" class="theme-option" data-lang="zh" data-i18n="settings.langZh">中文</button>
-            <button type="button" class="theme-option" data-lang="en" data-i18n="settings.langEn">English</button>
-          </div>
-        </label>
-      </div>
-      <div class="settings-group">
-        <div class="settings-group-title" data-i18n="settings.groupTasks">定时任务</div>
-        <div class="hint" style="margin-bottom:6px;" data-i18n="settings.tasksHint">管理定时任务与自定义任务类型（内置类型只读）</div>
-        <!-- 任务列表 -->
-        <div id="task-list" class="task-list"></div>
-        <div style="display:flex;gap:8px;margin-top:8px;">
-          <button type="button" id="task-add-btn" class="btn btn-ghost" style="flex:1;" data-i18n="settings.taskAdd">＋ 添加任务</button>
-          <button type="button" id="task-template-mgr-btn" class="btn btn-ghost" style="flex:1;" data-i18n="settings.taskTemplates">自定义类型</button>
-        </div>
-        <!-- 任务表单（添加/编辑） -->
-        <div id="task-form" class="task-form hidden">
-          <label class="model-form-label" data-i18n="settings.taskName">任务名
-            <input type="text" id="task-form-name" maxlength="32" placeholder="daily-report" />
-          </label>
-          <div class="model-form-row">
-            <label class="model-form-label" data-i18n="settings.taskType">类型
-              <select id="task-form-type"></select>
-            </label>
-            <label class="model-form-label" data-i18n="settings.taskProject">项目
-              <select id="task-form-project"></select>
-            </label>
-          </div>
-          <div class="model-form-row">
-            <label class="model-form-label" data-i18n="settings.taskInterval">间隔（秒，≥60）
-              <input type="number" id="task-form-interval" min="60" step="1" value="1800" />
-            </label>
-            <label class="model-form-vision" style="align-self:flex-end;margin-bottom:8px;">
-              <input type="checkbox" id="task-form-enabled" checked /> <span data-i18n="settings.taskEnabled">启用</span>
-            </label>
-          </div>
-          <label class="model-form-label" data-i18n="settings.taskRepo">仓库（选填 owner/repo）
-            <input type="text" id="task-form-repo" maxlength="80" placeholder="acme/repo" />
-          </label>
-          <div class="model-form-footer">
-            <div style="display:flex;gap:8px;margin-left:auto;">
-              <button type="button" id="task-form-cancel" class="btn btn-ghost" style="padding:6px 12px;min-height:30px;" data-i18n="settings.cancel">取消</button>
-              <button type="button" id="task-form-save" class="btn btn-primary" style="padding:6px 12px;min-height:30px;" data-i18n="settings.taskSave">保存任务</button>
-            </div>
-          </div>
-        </div>
-        <!-- 自定义类型表单 -->
-        <div id="task-template-form" class="task-form hidden">
-          <label class="model-form-label" data-i18n="settings.templateName">类型名
-            <input type="text" id="task-template-name" maxlength="32" placeholder="report" />
-          </label>
-          <label class="model-form-label" data-i18n="settings.templatePrompt">提示词模板
-            <textarea id="task-template-prompt" rows="6" style="width:100%;min-height:120px;" placeholder="# {{ instance_id }} ..."></textarea>
-          </label>
-          <div class="model-form-footer">
-            <div style="display:flex;gap:8px;margin-left:auto;">
-              <button type="button" id="task-template-cancel" class="btn btn-ghost" style="padding:6px 12px;min-height:30px;" data-i18n="settings.cancel">取消</button>
-              <button type="button" id="task-template-save" class="btn btn-primary" style="padding:6px 12px;min-height:30px;" data-i18n="settings.templateSave">保存类型</button>
-            </div>
-          </div>
-        </div>
-        <!-- 自定义类型列表 -->
-        <div id="task-template-list" class="task-list hidden" style="margin-top:8px;"></div>
-      </div>
-      <div class="settings-group">
-        <div class="settings-group-title" data-i18n="settings.aboutTitle">关于</div>
-        <div class="about-box">
-          <div class="about-line">EMRG <span id="about-version">v0.2.8</span> · <span id="about-evolutions">🌱 <span data-i18n="copy.growthCountPrefix">已自我进化</span> 0 <span data-i18n="copy.times">次</span></span></div>
-          <div class="about-line hidden" id="about-update"></div>
-          <div class="about-line">
-            <button type="button" class="btn btn-sm" id="about-update-check-btn" data-i18n="settings.checkUpdate">检查更新</button>
-          </div>
-          <div class="hint" style="margin-top:6px;" data-i18n="settings.aboutDesc">EMRG 是一个会自我进化的 AI 智能体——每次改进都会自动汇报，你可以随时在这里看到它的成长。</div>
-        </div>
-      </div>
-      <!-- WorkBuddy P3：最近改进列表（daemon evolution_summary） -->
-      <div class="settings-group">
-        <div class="settings-group-title" data-i18n="settings.recentTitle">最近改进</div>
-        <div id="about-recent" class="about-recent"></div>
-      </div>
-      <div class="dialog-actions">
-        <button type="button" id="settings-cancel" class="btn btn-ghost" data-i18n="settings.cancel">取消</button>
-        <button type="button" id="settings-save" class="btn btn-primary" data-i18n="settings.save">保存</button>
-      </div>
-    </div>
-  </dialog>
-
   <!-- 首启引导 -->
   <dialog id="welcome-dialog">
     <div class="dialog-card">
@@ -470,18 +474,6 @@ <h2 data-i18n="rant.title">🧬 进化 — 告诉 EMRG 往哪里走</h2>
     </div>
   </dialog>
 
-  <!-- 任务列表对话框（/trigger，GUI / 指令 P4） -->
-  <dialog id="tasks-dialog">
-    <div class="dialog-card" style="min-width:440px;">
-      <h2 data-i18n="tasks.title">后台任务</h2>
-      <p style="color:var(--text-2);font-size:var(--fs-secondary);margin:0 0 var(--sp-3);" data-i18n="tasks.desc">点击任务立即触发一次运行。</p>
-      <div id="tasks-list" class="help-list"></div>
-      <div class="dialog-actions">
-        <button type="button" id="tasks-close" class="btn btn-ghost" data-i18n="help.close">关闭</button>
-      </div>
-    </div>
-  </dialog>
-
   <!-- 进化完成 toast（WorkBuddy P3：进化发生时温和提示） -->
   <div id="evolution-toast" class="evolution-toast hidden">
     <div class="evolution-toast-title" data-i18n="copy.evolutionToastTitle">🌱 EMRG 刚刚完成一次自我进化！</div>
diff --git a/emrg/gui/renderer/js/app.js b/emrg/gui/renderer/js/app.js
index 09f8df86..f49e36ba 100644
--- a/emrg/gui/renderer/js/app.js
+++ b/emrg/gui/renderer/js/app.js
@@ -279,11 +279,11 @@ const App = (() => {
           }
           break;
         case "/trigger":
-          // P4：/trigger <name> 直接触发；无参数 → 任务列表对话框
+          // P4：/trigger <name> 直接触发；无参数 → 打开任务面板（rant 14:10:14 P3：替代 tasks-dialog）
           if (parsed.args.length > 0) {
             await doTrigger(parsed.args[0]);
           } else {
-            showTasksDialog();
+            openTasksPanel();
           }
           break;
         default:
@@ -480,38 +480,14 @@ const App = (() => {
     }
   }
 
-  // /trigger：任务列表对话框（点击立即触发）
-  async function showTasksDialog() {
-    const list = $("tasks-list");
-    const dialog = $("tasks-dialog");
-    if (!list || !dialog) return;
-    list.innerHTML = `<div class="help-row"><span class="help-hint">${_t("dlg.loading")}</span></div>`;
-    dialog.showModal();
+  // /trigger：任务面板（rant 14:10:14 P3：替代 tasks-dialog；点击行立即触发）
+  async function openTasksPanel() {
+    if (state.activePanel !== "tasks") switchPanel("tasks");
     try {
-      const tasks = await window.emrg.listTasks();
-      list.innerHTML = "";
-      if (!tasks || tasks.length === 0) {
-        list.innerHTML = `<div class="help-row"><span class="help-hint">${_t("app.noTasks")}</span></div>`;
-        return;
-      }
-      for (const t of tasks) {
-        const row = el("button", {
-          class: "help-row",
-          type: "button",
-          style: "width:100%;text-align:left;cursor:pointer;background:none;border:none;",
-        });
-        const name = el("span", { class: "help-cmd" }, t.name || t.type || _t("app.unnamed"));
-        const hint = el("span", { class: "help-hint" }, t.enabled === false ? _t("app.taskDisabled") : _t("app.taskInterval", { n: t.interval ?? "-" }));
-        row.appendChild(name);
-        row.appendChild(hint);
-        row.addEventListener("click", async () => {
-          dialog.close();
-          await doTrigger(t.name);
-        });
-        list.appendChild(row);
-      }
+      await Dialogs.loadTaskMeta();
+      await Dialogs.renderTaskList();
     } catch (e) {
-      list.innerHTML = `<div class="help-row"><span class="help-hint">${_t("app.tasksFailed", { msg: escapeHtml(e.message) })}</span></div>`;
+      Chat.addSystemMessage(_t("app.tasksFailed", { msg: e.message }));
     }
   }
 
@@ -703,6 +679,18 @@ const App = (() => {
     }
   }
 
+  /** rant 14:10:14 P2：设置面板 tab 切换（模型服务/工作目录/GitHub/外观/语言/关于）。 */
+  const SETTINGS_TABS = ["model", "workdir", "github", "appearance", "language", "about"];
+  function switchSettingsTab(name) {
+    if (!SETTINGS_TABS.includes(name)) return;
+    for (const t of SETTINGS_TABS) {
+      const tabBtn = $(`settings-tab-${t}`);
+      const body = $(`settings-body-${t}`);
+      if (tabBtn) tabBtn.classList.toggle("active", t === name);
+      if (body) body.classList.toggle("hidden", t !== name);
+    }
+  }
+
   // ── 历史按需加载（rant 14:15:12：切会话恢复最近 N 条 + 滚动到顶加载更早）──
   const historyPages = new Map(); // sid → { offset, hasMore, loading }
   const HISTORY_PAGE = 50;
@@ -1497,9 +1485,17 @@ const App = (() => {
     $("stop-btn").addEventListener("click", () => window.emrg.cancel().catch(() => {}));
     // rant 14:10:14 P1：侧边栏导航点击切换面板
     for (const p of SIDE_PANELS) {
-      $(`nav-${p}`)?.addEventListener("click", () => switchPanel(p));
+      $(`nav-${p}`)?.addEventListener("click", () => {
+        switchPanel(p);
+        // P2：面板打开时加载对应数据（settings 走 showSettings 刷新全部；tasks 走任务加载）
+        if (p === "settings" && state.activePanel === "settings") {
+          loadEvolutionSummary();
+          Dialogs.showSettings();
+        } else if (p === "tasks" && state.activePanel === "tasks") {
+          openTasksPanel();
+        }
+      });
     }
-    // B1（rant 21:59:11）：侧边栏"＋ 新对话"→ 项目选择弹窗（选项目新建 / 新建项目），不再直接新建
     $("new-chat-btn").addEventListener("click", () => Dialogs.showNewSessionDialog());
     // B2（rant 21:59:11）：侧边栏"打开会话"入口 → 两步弹窗（选项目 → 选会话）
     $("open-chat-btn")?.addEventListener("click", () => Dialogs.showOpenSessionDialog());
@@ -1511,7 +1507,7 @@ const App = (() => {
       Dialogs.showSettings();
     });
     Dialogs.initLangButtons(); // rant 21:19：设置语言选择器
-    $("settings-cancel").addEventListener("click", () => $("settings-dialog").close());
+    $("settings-cancel").addEventListener("click", () => switchPanel("settings")); // P2：取消=关闭设置面板
     $("settings-save").addEventListener("click", Dialogs.saveSettings);
     $("pick-dir-btn").addEventListener("click", async () => {
       const dir = await window.emrg.pickProjectDir();
@@ -1536,7 +1532,11 @@ const App = (() => {
       $("rant-dialog").close();
       await submitRant(msg, proj);
     });
-    $("tasks-close").addEventListener("click", () => $("tasks-dialog").close());
+
+    // rant 14:10:14 P2：设置面板 tab 切换（模型服务/工作目录/GitHub/外观/语言/关于）
+    document.querySelectorAll("#settings-tabs .panel-tab").forEach((tab) => {
+      tab.addEventListener("click", () => switchSettingsTab(tab.dataset.settingsTab));
+    });
 
     // 设置/首启对话框：Enter 提交（与重命名/模型表单一致的交互）
     const enterToSave = (fn) => (e) => {
@@ -1693,6 +1693,8 @@ const App = (() => {
     showOpenSessionsMenu, // P4 slice 2：打开会话右键菜单
     activateSessionView, // P3 slice 2：激活会话容器（display 切换；导出供测试）
     switchPanel, // rant 14:10:14 P1：侧边栏面板切换（导出供测试）
+    switchSettingsTab, // rant 14:10:14 P2：设置面板 tab 切换（导出供测试）
+    openTasksPanel, // rant 14:10:14 P3：任务面板打开 + 加载（导出供测试）
     refreshSessions,
     showConvMenu,
     handleEvent,
diff --git a/emrg/gui/renderer/js/dialogs.js b/emrg/gui/renderer/js/dialogs.js
index bd01028d..55654b8a 100644
--- a/emrg/gui/renderer/js/dialogs.js
+++ b/emrg/gui/renderer/js/dialogs.js
@@ -232,11 +232,6 @@ const Dialogs = (() => {
       } catch { /* 元素缺失（测试桩）时忽略 */ }
       // Windows GCM rant Stage 2：GitHub 连接状态随设置面板打开时刷新
       await refreshGithubStatus();
-      // 定时任务管理（rant 2026-08-12T18:23:15 P3）：任务/类型列表随设置面板打开时刷新
-      try {
-        await loadTaskMeta();
-        await renderTaskList();
-      } catch { /* 元素缺失（测试桩）时忽略 */ }
       // Auto update-check prompt (rant 2026-08-10T07:12:12): about area shows
       // a one-time non-intrusive line when a newer release exists.
       // rant 2026-08-11T09:18:16：手动"检查更新"按钮（force 重新检查）
@@ -245,7 +240,8 @@ const Dialogs = (() => {
     } catch (e) {
       Chat.addSystemMessage(_t("settings.readFailed", { msg: e.message }));
     }
-    $("settings-dialog").showModal();
+    // rant 14:10:14 P2：设置改为面板（不再弹窗）；已在面板内（nav 打开后刷新）则不再 toggle
+    if (App.state.activePanel !== "settings") App.switchPanel("settings");
   }
 
   async function saveSettings() {
@@ -266,7 +262,6 @@ const Dialogs = (() => {
     }
     try {
       await window.emrg.saveSettings(config);
-      if ($("settings-dialog").open) $("settings-dialog").close();
       Chat.addSystemMessage(_t("dlg.saved"));
       App.state.apiKeyConfigured = true;
       App.state.projectDir = config.projectDir || App.state.projectDir;
@@ -1126,6 +1121,7 @@ const Dialogs = (() => {
     initNewSessionDialog, // P5 slice 2：新建会话对话框初始化
     showNewSessionDialog, // P5 slice 2：新建会话（选项目）
     initTaskManagement, // rant 18:23:15 P3：定时任务/自定义类型管理初始化
+    loadTaskMeta, // rant 18:23:15 P3：任务/类型元数据加载（面板打开/测试复用）
     renderTaskList, // rant 18:23:15 P3：任务列表渲染（测试/刷新复用）
     saveTaskForm, // rant 18:23:15 P3：任务表单提交（测试复用）
     saveTemplateForm, // rant 18:23:15 P3：类型表单提交（测试复用）
diff --git a/emrg/gui/test/app-commands.test.js b/emrg/gui/test/app-commands.test.js
index 28ab22ab..550199e1 100644
--- a/emrg/gui/test/app-commands.test.js
+++ b/emrg/gui/test/app-commands.test.js
@@ -227,14 +227,15 @@ test("P4：/rant 直接跟内容快速提交（不打开对话框）", async ()
   assert.ok(!(els["rant-dialog"] && els["rant-dialog"].__open), "direct rant submit should not open dialog");
 });
 
-test("P4：/trigger 无参数打开任务列表对话框", async () => {
+test("P4：/trigger 无参数打开任务面板", async () => {
   const { ctx, els } = makeSandbox({
     listTasks: async () => [{ name: "emrg-task", type: "evolution", interval: 60 }],
     triggerTask: async () => ({ ok: true }),
   });
   await tick();
   await vm.runInContext("App.handleCommand({ type: 'command', cmd: '/trigger', args: [] })", ctx);
-  assert.ok(els["tasks-dialog"] && els["tasks-dialog"].__open === true, "tasks dialog opened");
+  const panel = els["panel-tasks"];
+  assert.ok(panel && !panel.classList.contains("hidden"), "tasks panel should be open");
 });
 
 test("P4：/trigger <name> 直接触发（不打开对话框）", async () => {
diff --git a/emrg/gui/test/renderer.smoke.test.js b/emrg/gui/test/renderer.smoke.test.js
index 54318c41..055d48bf 100644
--- a/emrg/gui/test/renderer.smoke.test.js
+++ b/emrg/gui/test/renderer.smoke.test.js
@@ -114,8 +114,9 @@ const ELEMENT_IDS = [
   "conn-banner", "empty-state", "model-switcher", "model-switcher-label", "brand-star", "new-chat-btn", "open-chat-btn",
   "side-nav", "nav-sessions", "nav-projects", "nav-tasks", "nav-rants", "nav-settings",
   "panel-sessions", "panel-projects", "panel-tasks", "panel-rants", "panel-settings",
-  "settings-dialog", "settings-cancel", "settings-save", "set-api-key", "set-base-url", "set-project-dir",
-  "set-model", "pick-dir-btn", "theme-options", "welcome-dialog", "welcome-api-key", "welcome-base-url",
+  "settings-tabs", "settings-tab-model", "settings-tab-workdir", "settings-tab-github", "settings-tab-appearance", "settings-tab-language", "settings-tab-about",
+  "settings-body-model", "settings-body-workdir", "settings-body-github", "settings-body-appearance", "settings-body-language", "settings-body-about",
+  "settings-cancel", "settings-save", "set-api-key", "set-base-url", "set-project-dir",  "set-model", "pick-dir-btn", "theme-options", "welcome-dialog", "welcome-api-key", "welcome-base-url",
   "welcome-model", "welcome-project-dir", "welcome-pick-btn", "welcome-save", "confirm-dialog",
   "confirm-title", "confirm-message", "confirm-cancel", "confirm-ok", "main",
   "rename-dialog", "rename-input", "rename-cancel", "rename-ok", "ctx-menu",
@@ -127,7 +128,6 @@ const ELEMENT_IDS = [
   "memory-dialog", "memory-list", "memory-detail", "memory-close",
   "skills-dialog", "skills-list", "skills-close",
   "rant-dialog", "rant-message", "rant-project", "rant-cancel", "rant-submit",
-  "tasks-dialog", "tasks-list", "tasks-close",
   "result-panel", "result-list", "result-toggle",
   "result-tabs", "result-tab-files", "result-tab-artifacts", "result-tabbar", "result-files", "result-viewer", "result-resizer",
   "growth-card", "growth-count", "about-recent",
@@ -2494,7 +2494,7 @@ test("P3：设置面板打开 → 任务列表渲染（名称/类型/项目/间
     triggerTask: async () => ({}),
   });
   await tick();
-  await vm.runInContext("EMRG_Dialogs.showSettings()", ctx);
+  await vm.runInContext("App.openTasksPanel()", ctx);
   await tick();
   // 任务行渲染：2 行 + 空态兜底（无）
   const rows = vm.runInContext('document.getElementById("task-list").children.length', ctx);
@@ -2541,7 +2541,7 @@ test("P3：新增任务表单 —— 间隔 <60 客户端拒绝；≥60 提交 t
     taskCreate: async (payload) => { created = payload; return { ok: true }; },
   });
   await tick();
-  await vm.runInContext("EMRG_Dialogs.showSettings()", ctx);
+  await vm.runInContext("App.openTasksPanel()", ctx);
   await tick();
   // 点"＋ 添加任务" → 空表单
   els["task-form"].classList.add("hidden"); // 镜像 index.html 初始态（task-form hidden）
@@ -2592,7 +2592,7 @@ test("P3：自定义类型管理 —— 内置只读；自定义增删改走模
     taskTemplateDelete: async (payload) => { deletedTpl = payload; return { ok: true }; },
   });
   await tick();
-  await vm.runInContext("EMRG_Dialogs.showSettings()", ctx);
+  await vm.runInContext("App.openTasksPanel()", ctx);
   await tick();
   // 打开自定义类型列表（镜像 index.html 初始态：task-template-list hidden）
   els["task-template-list"].classList.add("hidden");
@@ -2694,3 +2694,35 @@ test("rant 14:10:14 P1：侧边栏导航切换面板 + 高亮（点同项关闭
   assert.strictEqual(visible("panel-settings"), false, "点同项应关闭面板");
   assert.strictEqual(active("nav-settings"), false, "关闭后导航取消高亮");
 });
+
+test("rant 14:10:14 P2：设置面板 tab 切换（6 tab 独立显隐 + 高亮）", async () => {
+  const { ctx } = makeSandbox();
+  await vm.runInContext("App.boot()", ctx);
+  await tick();
+  const visible = (id) => vm.runInContext(`document.getElementById("${id}").classList.contains("hidden") === false`, ctx);
+  const active = (id) => vm.runInContext(`document.getElementById("${id}").classList.contains("active")`, ctx);
+  // 归一化初始态（index.html 标记 hidden 由 switchSettingsTab 全量重设，mock 需显式触发）
+  await vm.runInContext("App.switchSettingsTab('model')", ctx);
+  await tick();
+  // 默认：model tab 激活且可见，其余 tab body 隐藏
+  assert.strictEqual(visible("settings-body-model"), true, "默认显示模型服务 tab");
+  for (const t of ["workdir", "github", "appearance", "language", "about"]) {
+    assert.strictEqual(visible(`settings-body-${t}`), false, `默认隐藏 ${t} tab`);
+  }
+  // 切到 GitHub tab → 只有它可见 + 高亮
+  await vm.runInContext("App.switchSettingsTab('github')", ctx);
+  await tick();
+  assert.strictEqual(visible("settings-body-github"), true, "GitHub tab 应显示");
+  assert.strictEqual(active("settings-tab-github"), true, "GitHub tab 应高亮");
+  assert.strictEqual(visible("settings-body-model"), false, "模型服务 tab 应隐藏");
+  assert.strictEqual(active("settings-tab-model"), false, "模型服务 tab 取消高亮");
+  // 切到关于 → GitHub 关、关于开
+  await vm.runInContext("App.switchSettingsTab('about')", ctx);
+  await tick();
+  assert.strictEqual(visible("settings-body-about"), true, "关于 tab 应显示");
+  assert.strictEqual(visible("settings-body-github"), false, "GitHub tab 应隐藏");
+  // 非法 tab 名 → 忽略（不抛）
+  await vm.runInContext("App.switchSettingsTab('bogus')", ctx);
+  await tick();
+  assert.strictEqual(visible("settings-body-about"), true, "非法 tab 名应保持当前 tab");
+});