diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 542ed61e2..4e993fd73 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -61,6 +61,7 @@ jobs:
         run: |
           python3 tests/scripts/macos_installer_release_test.py
           python3 tests/scripts/macos_portable_package_test.py
+          python3 tests/scripts/macos_update_dedup_test.py
           bash tests/scripts/macos_release_scripts_test.sh
 
   web-tests:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e88e62e2d..6ae1d4dfe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -130,6 +130,7 @@ find_package(nlohmann_json CONFIG REQUIRED)
 find_package(unofficial-sqlite3 CONFIG REQUIRED)
 find_package(Crow CONFIG REQUIRED)
 find_package(Threads REQUIRED)
+find_package(ZLIB REQUIRED)
 
 # cpr ships with libcurl; on Windows libcurl >= 8.14 is required for proper
 # certificate handling.  Detect the version through the CURL::libcurl target
diff --git a/assets/desktop_pet/agent_office_pet.html b/assets/desktop_pet/agent_office_pet.html
index 8e822d63d..f4b35180c 100644
--- a/assets/desktop_pet/agent_office_pet.html
+++ b/assets/desktop_pet/agent_office_pet.html
@@ -95,6 +95,7 @@
   <div class="grip" id="grip" title="拖动调整大小，双击恢复默认大小"><svg viewBox="0 0 16 16" aria-hidden="true"><path d="M2 7L7 2M2 11L11 2M2 15L15 2" stroke="#2b2737" stroke-width="3.4" stroke-linecap="square" fill="none"/><path d="M2 7L7 2M2 11L11 2M2 15L15 2" stroke="#ffffff" stroke-width="1.4" stroke-linecap="square" fill="none"/></svg></div>
   <div class="zoom-badge" id="zoomBadge" hidden></div>
 </div>
+<script src="./office_characters.js"></script>
 <script>
 /* AI Agent 像素办公室 —— 纯原生 JS，零依赖，可离线运行
    ACECode 桌面宠物版：只保留场景画布与气泡层；草地不画（窗口在那里透明），
@@ -207,131 +208,9 @@
 }
 
 /* ---------- 3. 小人：1 套模板 × 调色板 × 翻转 × 补丁 ---------- */
-const BODY = {
-  front: [ // 面朝右下（看得见脸）
-    '....hhhhh...',
-    '..hhhhhhhhh.',
-    '.hhhhhhhllhh',
-    '.hhhhhhhhhhh',
-    '.hhhhhhshhsh',
-    '.hhhhsssssss',
-    '.Hhhssessses',
-    '.Hhhssessses',
-    '..Hhsbssssbs',
-    '...HSsssssS.',
-    '.....sss....',
-    '...cwwwwcc..',
-    '..ccccwwcccc',
-    '.ccccccccccc',
-    '.sCccccccccs',
-    '..CCCCCCCC..',
-    '..pppppppp..'],
-  back: [  // 背对镜头（面朝左上）
-    '...hhhhhh...',
-    '..hhhhhhhhh.',
-    '.hhhhllhhhhh',
-    '.hhhhhhhhhhh',
-    '.hhhhhhhhhhh',
-    '.hhhhhhhhhhh',
-    '.hhhhhhhhhhs',
-    '.HhhhhhhhhHs',
-    '..HHhhhhhHS.',
-    '...HHHHHH...',
-    '.....sss....',
-    '...cccccc...',
-    '..cccccccc..',
-    '.cccccccccc.',
-    '.sCccccccCs.',
-    '..CCCCCCCC..',
-    '..pppppppp..'],
-};
-const FRAMES = { // 动作 = 在同一模板上打几行补丁（_ 表示不变）
-  front: {
-    typeA: [[13, '_s__________'], [14, '_C__________']],
-    typeB: [[13, '___________s'], [14, '___________c']],
-    blink: [[6, '______s___s_']],
-  },
-  back: {
-    typeA: [[13, '_s__________'], [14, '_c__________']],
-    typeB: [[13, '__________s_'], [14, '__________C_']],
-  },
-};
-const ACC = { // 配饰 / 发型也是补丁
-  long:    { front: [[8, '.h__________'], [9, '.hh_________'], [10, '.hH_________'], [11, '.hH_________'], [12, '.H__________']],
-             back:  [[9, '.hhHHHHHHhh.'], [10, '..hhhhhhhh..'], [11, '..hHhhhhHh..']] },
-  tie:     { front: [[12, '______r_____'], [13, '______r_____']] },
-  glasses: { front: [[6, '_____g_ggg_g']], back: [[6, '__________g_']] },
-  headset: { front: [[1, '__aaaaaaaaa_'], [5, '__aA________'], [6, '__aA________'], [7, '__aA________'], [8, '____a_______'], [9, '____aa______']],
-             back:  [[1, '__aaaaaaaaa_'], [5, '_a_________a'], [6, '_a_________a']] },
-  cap:     { front: [[0, '....aaaaa...'], [1, '..aaaaaaaaa.'], [2, '.aaaaaaaaaaa'], [3, '________AAAA']],
-             back:  [[0, '...aaaaaa...'], [1, '..aaaaaaaaa.'], [2, '.aaaaaaaaaaa'], [3, '.aaaaaaaaaaa']] },
-
-  // ---- 扩充发型（10 种）：只改头发像素，发色跟着 h / H / l 走 ----
-  ponytail:  { front: [[2, 'a___________'], [3, 'h___________'], [4, 'h___________'], [5, 'h___________'], [6, 'H___________'], [7, 'h___________'], [8, 'Hh__________'], [9, '.H__________']],
-               back:  [[4, '_____aa_____'], [9, '_____hh_____'], [10, '_____hH_____'], [11, '_____hh_____'], [12, '_____H______']] },
-  twintails: { front: [[2, 'a___________'], [3, 'h___________'], [4, 'h___________'], [5, 'h___________'], [6, 'H___________'], [7, 'h___________'], [8, 'Hh__________'], [9, '.H_________a'], [10, '___________h'], [11, '__________hH']],
-               back:  [[3, 'a__________a'], [4, 'h___________'], [5, 'h___________'], [6, 'H___________'], [7, 'h___________'], [8, 'h__________h'], [9, 'H_________hh'], [10, '_h________hH'], [11, '_H__________']] },
-  bun:       { front: [[0, 'hlh.________'], [1, 'hhHa________'], [2, 'H___________']],
-               back:  [[1, '____HHHH____'], [2, '___HhllhH___'], [3, '___HhhhhH___'], [4, '____HHHH____'], [5, '_____aa_____']] },
-  spiky:     { front: [[0, '...h.h.h.h..'], [1, '.hhhhhhhlhhh'], [2, 'h___________'], [4, 'h___________']],
-               back:  [[0, '..h.h.h.h.h.'], [1, '.hhhhhhhhhhh'], [3, 'h___________'], [5, 'h___________']] },
-  bald:      { front: [[0, '....sssss...'], [1, '..Sssssssss.'], [2, '.Ssssssswsss'], [3, '.Sssssssssss'], [4, '.SsSssssssss'], [5, '.SsbSsssssss'], [6, '.SsS________'], [7, '.SSs________'], [8, '..Ss________'], [9, '...S________']],
-               back:  [[0, '...ssssss...'], [1, '..sssssssss.'], [2, '.sssswssssss'], [3, '.sssssssssss'], [4, '.sssssssssss'], [5, '.sssssssssss'], [6, '.Sssssssssss'], [7, '.SssssssssSs'], [8, '..SSsssssSS.'], [9, '...SSSSSS...']] },
-  bangs:     { front: [[4, '.hhhhhhhhhhh'], [5, '_____HhHhHhH']] },
-  bob:       { front: [[5, '___________h'], [6, 'hHhh_______h'], [7, 'hHhh_______h'], [8, 'hhhH_______H'], [9, '.HHH________']],
-               back:  [[6, 'hhhhhhhhhhhh'], [7, 'hHhhhhhhhhHh'], [8, 'hHHhhhhhhHHh'], [9, '.HHHHHHHHHH.']] },
-  afro:      { front: [[0, '..hhlhhhhh..'], [1, '.hhhhhhlhhhh'], [2, 'hhlhhhhhhhhh'], [3, 'hhhhhlhhhhhh'], [4, 'hh_l________'], [5, 'hhlh________'], [6, 'hHhh________'], [7, 'hhHh________'], [8, '.hHh________']],
-               back:  [[0, '..hhhlhhhh..'], [1, '.hhlhhhhhlhh'], [2, 'hhhhhhlhhhhh'], [3, 'hlhhhhhhhlhh'], [4, 'hhhhlhhhhhhh'], [5, 'hhhhhhhhlhhh'], [6, 'hhlhhhhhhhhs'], [7, 'hHhhhhlhhhHs'], [8, '.hHHhhhhhHS.']] },
-  mohawk:    { front: [[0, '...hhlhh....'], [1, '..HhhhhhHHH.'], [2, '.HHHhhhhHHHH'], [3, '.HHHHhhHHHHH'], [4, '.HHHHHHsHHsH'], [5, '.HHHH_______'], [6, '.HHH________'], [7, '.HHH________'], [8, '..HH________']],
-               back:  [[0, '...HHhhHH...'], [1, '..HHHhhHHHH.'], [2, '.HHHHhlHHHHH'], [3, '.HHHHhhHHHHH'], [4, '.HHHHhhHHHHH'], [5, '.HHHHhhHHHHH'], [6, '.HHHHhhHHHHs'], [7, '.HHHHhhHHHHs'], [8, '..HHHhhHHHS.']] },
-  braid:     { front: [[8, '_h__________'], [9, '_hH_________'], [10, '__Hh________'], [11, '__hH________'], [12, '__Hh________'], [13, '___a________']],
-               back:  [[9, '_____hH_____'], [10, '_____Hh_____'], [11, '_____hH_____'], [12, '_____Hh_____'], [13, '_____aa_____']] },
-
-  // ---- 扩充配饰（10 种）：帽子 / 头饰 / 脸部 / 胸前，颜色走 a / A（accColor）或固定色 ----
-  beanie:    { front: [[0, '....aawaa...'], [1, '..aaaaaaaaa.'], [2, '.aaaaaaaaaaa'], [3, '.AAAAAAAAAAA']],
-               back:  [[0, '...aawaaa...'], [1, '..aaaaaaaaa.'], [2, '.aaaaaaaaaaa'], [3, '.AAAAAAAAAAA']] },
-  headband:  { front: [[3, '.aaaaaaaaaaa']],
-               back:  [[3, '.aaaaaaaaaaa'], [4, 'a___________'], [5, 'A___________']] },
-  bow:       { front: [[0, 'aa.aa_______'], [1, 'aAAa________'], [2, '.a__________']],
-               back:  [[0, '...aa.aa....'], [1, '...aaAAaa...'], [2, '____a__a____']] },
-  shades:    { front: [[6, '____gkkgkkkk'], [7, '_____kk__kk_']], back: [[6, '__________g_']] },
-  mask:      { front: [[7, '____M_______'], [8, '____Mmmmmmmm'], [9, '____MmmmmmM_']], back: [[7, '__________M_']] },
-  beard:     { front: [[7, '____h_______'], [8, '____hhsssshh'], [9, '___HhhhhhhH_']], back: [[8, '__________h_']] },
-  mustache:  { front: [[8, '______HhhH__'], [9, '______H__H__']] },
-  bowtie:    { front: [[11, '____aaAaa___'], [12, '____a___a___']] },
-  badge:     { front: [[11, '____a___a___'], [12, '_____a_a____'], [13, '_____yYy____']], back: [[11, '____aaaa____']] },
-  scarf:     { front: [[10, '____aAaAa___'], [11, '___aaaaaaa__'], [12, '____A_______'], [13, '____a_______']],
-               back:  [[10, '____aAaAa___'], [11, '___aaaaaa___']] },
-};
-const luminance = c => { const [r, g, b] = toRGB(c); return (0.2126 * r + 0.7152 * g + 0.0722 * b) / 255; };
-function lookPal(L) {
-  return {
-    h: L.hair, H: dark(L.hair, .28), l: lite(L.hair, .35),
-    // 深肤色上默认眼色几乎看不见，换成更深的一档
-    s: L.skin, S: dark(L.skin, .13), b: mix(L.skin, '#ff6f6f', .35), e: luminance(L.skin) < .45 ? '#140d12' : '#2a2230',
-    c: L.shirt, C: dark(L.shirt, .22), w: '#ffffff', p: L.pants || '#3a3f52',
-    a: L.accColor || '#454b5e', A: L.accColor ? dark(L.accColor, .25) : '#ff8a5c',
-    r: '#d8423a', g: '#9aa3b8',
-    k: '#1d2130', m: '#f3f6fb', M: '#c5cdd9', y: '#ffd35c', Y: '#d9a92e',   // 墨镜片 / 口罩 / 工牌卡片
-  };
-}
-// 走路 = 坐姿模板下面再接三行腿脚;手臂沿用打字的两帧补丁当摆臂
-const LEGS = {
-  stand: ['...pp..pp...', '...pp..pp...', '..kkk..kkk..'],
-  walkA: ['..pp....pp..', '.pp......pp.', '.kk......kk.'],
-  walkB: ['...pp..pp...', '...pp..pp...', '..kkk..kkk..'],
-};
-const WALK_ARMS = { walkA: 'typeA', walkB: 'typeB' };
-function charSprite(L, pose, frame, flip) {
-  return sprite(`ch|${L.key}|${pose}|${frame}|${+flip}`, () => {
-    const legs = LEGS[frame];
-    let rows = patch(BODY[pose], FRAMES[pose][legs ? WALK_ARMS[frame] : frame]);
-    for (const k of L.acc) rows = patch(rows, ACC[k] && ACC[k][pose]);
-    if (legs) rows = rows.concat(legs);
-    const cv = pix(rows, lookPal(L), flip);
-    return { cv, ax: cv.width >> 1, ay: cv.height - 2 };
-  });
-}
+const { characterSprite: charSprite, stableLook, HAIR_COLORS, SKIN_TONES,
+  SHIRT_COLORS, ACC_COLORS, HAIR_STYLES, HEADWEAR, FACEWEAR, CHESTWEAR,
+  TALL_HAIR } = globalThis.ACEOfficeCharacters;
 
 /* ---------- 4. 其他像素模板（图标 / 数字 / 信封 / 植物） ---------- */
 const MINI = {
@@ -875,20 +754,6 @@
   return a;
 }
 // 随机外观池：前半段是原有的，后 10 个是扩充的
-const HAIR_COLORS = ['#231d1c', '#5b3b2b', '#b8683a', '#dcb24c', '#2c2a38', '#8b5a39', '#c94f7c', '#4a6fa5',
-  '#b9bcc6', '#f1dca0', '#8e2b3b', '#e0673a', '#5fc8a8', '#9b7fd6', '#5aa9e6', '#f29bb8', '#2f3f7a', '#2c8c8c'];
-const SKIN_TONES = ['#f7d5b5', '#eec7a3', '#d9a77f', '#b9825a', '#f9dcc0',
-  '#fbe5d6', '#f3cfb3', '#e8b894', '#e0ac7e', '#c68c62', '#a8714a', '#94603e', '#7d4f33', '#6b4430', '#5a3825'];
-const SHIRT_COLORS = ['#3aa56b', '#e0574c', '#4a8fdc', '#f2a444', '#7a62d8', '#2fb5b0', '#e36aa6',
-  '#f4d35e', '#2e3a59', '#8a9aa9', '#f2f2ec', '#3a3b45', '#a3d977', '#8e3b5f', '#c9975b', '#86c5f0', '#ff8f7a'];
-const ACC_COLORS = ['#e8544a', '#3a8cf0', '#45b36a',
-  '#f2c14e', '#8e6bd8', '#2fb5b0', '#f08a3c', '#e36aa6', '#3a3f52', '#f4f4f0', '#7a4a2a', '#9fd4ff', '#b8e986'];
-// 四个槽位各抽一个，互不打架；空字符串的权重就是「不戴」的概率
-const HAIR_STYLES = ['', '', 'long', 'ponytail', 'twintails', 'bun', 'spiky', 'bald', 'bangs', 'bob', 'afro', 'mohawk', 'braid'];
-const HEADWEAR = ['', '', '', 'cap', 'beanie', 'headband', 'bow', 'headset'];
-const FACEWEAR = ['', '', '', 'glasses', 'shades', 'mask', 'beard', 'mustache'];
-const CHESTWEAR = ['', '', 'tie', 'bowtie', 'badge', 'scarf'];
-const TALL_HAIR = new Set(['bun', 'spiky', 'afro', 'mohawk']);   // 帽子会把它们压扁
 function randomLook() {
   const style = pick(HAIR_STYLES);
   let head = pick(HEADWEAR);
@@ -1506,12 +1371,6 @@
   if(!motionOK()){a.walk=null;walkers.delete(a);}
   return true;
 }
-function stableLook(seed) {
-  const rand=rng(seed), choose=items=>items[Math.floor(rand()*items.length)];
-  const style=choose(HAIR_STYLES);let head=choose(HEADWEAR);
-  if(TALL_HAIR.has(style)&&(head==='cap'||head==='beanie'))head='';
-  return {hair:choose(HAIR_COLORS),skin:choose(SKIN_TONES),shirt:choose(SHIRT_COLORS),pants:'#3a3f52',acc:[style,head,choose(FACEWEAR),choose(CHESTWEAR)].filter(Boolean),accColor:choose(ACC_COLORS)};
-}
 function safeIcon(svg) {
   // Keep SVG in an image document: never inject bridge-provided markup into DOM.
   return 'data:image/svg+xml;charset=utf-8,'+encodeURIComponent(String(svg).replace(/currentColor/g,'#27324f'));
@@ -1543,13 +1402,22 @@
     if(a&&a.leaving&&!returnToSeat(a,bossOf(item,visible)))a=null;
     if(!a) {
       a=addAgent({id:item.id,name:item.name,role:item.root?'conductor':'coder',seat:item.root?'s_conductor':undefined,
-        look:item.root?{hair:'#3b2a22',skin:'#f7d5b5',shirt:'#2d406e',pants:'#262b38',acc:['tie']}:stableLook(item.seed)});
+        look:item.root&&!item.avatarIdentity?{hair:'#3b2a22',skin:'#f7d5b5',shirt:'#2d406e',pants:'#262b38',acc:['tie']}:stableLook(item.seed)});
       if(!a)continue;
       a.parentPath=item.parentPath||'';
       if(liveReady&&!item.root)enterOffice(a,bossOf(item,visible));
     }
     const key=[item.state,item.label,item.tool].join('|');
     if(key!==a.activityKey){a.activityKey=key;a.labelAt=simNow;}
+    // A live expert switch updates the existing actor without moving its seat.
+    if((a.avatarIdentity||'')!==(item.avatarIdentity||'')) {
+      const look=item.root&&!item.avatarIdentity
+        ?{hair:'#3b2a22',skin:'#f7d5b5',shirt:'#2d406e',pants:'#262b38',acc:['tie'],accColor:''}
+        :stableLook(item.seed);
+      look.key=[look.hair,look.skin,look.shirt,look.pants,look.acc.join('+'),look.accColor].join('|');
+      a.look=look;
+    }
+    a.avatarIdentity=item.avatarIdentity||'';
     a.name=item.name;a.contextKnown=item.contextKnown;a.contextRatio=item.contextRatio;a.parentPath=item.parentPath||'';
     a.activityLabel=item.label;a.detail=item.detail||'';a.tool=item.tool;a.icon=item.icon||'';a.iconSvg=item.iconSvg||'';
     if(liveReady&&item.compactId&&item.compactId!==a.compactId) {
diff --git a/assets/desktop_pet/office_characters.js b/assets/desktop_pet/office_characters.js
new file mode 100644
index 000000000..f4506ef29
--- /dev/null
+++ b/assets/desktop_pet/office_characters.js
@@ -0,0 +1,201 @@
+// Shared original Agent Office pixel art. Used by the native pet and React portraits.
+// Classic script for file:// previews; importing it as a module installs the same API.
+(function (root) {
+'use strict';
+const INK = '#2b2737';
+const mk = (w, h) => { const c = document.createElement('canvas'); c.width = w; c.height = h; return c; };
+const rng = s => () => { s |= 0; s = s + 0x6D2B79F5 | 0; let t = Math.imul(s ^ s >>> 15, 1 | s); t = t + Math.imul(t ^ t >>> 7, 61 | t) ^ t; return ((t ^ t >>> 14) >>> 0) / 4294967296; };
+const toRGB = h => { const n = parseInt(h.slice(1), 16); return [n >> 16 & 255, n >> 8 & 255, n & 255]; };
+const toHex = a => '#' + a.map(v => Math.max(0, Math.min(255, Math.round(v))).toString(16).padStart(2, '0')).join('');
+const mix = (a, b, t) => { const A = toRGB(a), B = toRGB(b); return toHex(A.map((v, i) => v + (B[i] - v) * t)); };
+const lite = (c, t) => mix(c, '#ffffff', t), dark = (c, t) => mix(c, '#000000', t);
+function outline(cv, col = INK) {
+  const g = cv.getContext('2d'), W = cv.width, H = cv.height;
+  const im = g.getImageData(0, 0, W, H), d = im.data, a = new Uint8Array(W * H);
+  for (let i = 0; i < W * H; i++) a[i] = d[i * 4 + 3] > 0 ? 1 : 0;
+  const [r, gg, b] = toRGB(col);
+  for (let y = 0; y < H; y++) for (let x = 0; x < W; x++) {
+    const i = y * W + x; if (a[i]) continue;
+    if ((x > 0 && a[i - 1]) || (x < W - 1 && a[i + 1]) || (y > 0 && a[i - W]) || (y < H - 1 && a[i + W])) {
+      const k = i * 4; d[k] = r; d[k + 1] = gg; d[k + 2] = b; d[k + 3] = 255;
+    }
+  }
+  g.putImageData(im, 0, 0);
+}
+function pix(rows, pal, flip = false, ol = true) {
+  const h = rows.length, w = rows[0].length, m = ol ? 1 : 0;
+  const cv = mk(w + 2 * m, h + 2 * m), g = cv.getContext('2d');
+  rows.forEach((row, y) => { for (let x = 0; x < w; x++) { const c = pal[row[x]]; if (!c) continue; g.fillStyle = c; g.fillRect((flip ? w - 1 - x : x) + m, y + m, 1, 1); } });
+  if (ol) outline(cv, pal.ink || INK);
+  return cv;
+}
+const patch = (rows, ps) => {
+  if (!ps) return rows; rows = rows.slice();
+  for (const [i, s] of ps) rows[i] = [...rows[i]].map((ch, k) => (s[k] && s[k] !== '_') ? s[k] : ch).join('');
+  return rows;
+};
+const SPR = new Map();
+const sprite = (key, build) => { let s = SPR.get(key); if (!s) { s = build(); SPR.set(key, s); } return s; };
+const BODY = {
+  front: [ // 面朝右下（看得见脸）
+    '....hhhhh...',
+    '..hhhhhhhhh.',
+    '.hhhhhhhllhh',
+    '.hhhhhhhhhhh',
+    '.hhhhhhshhsh',
+    '.hhhhsssssss',
+    '.Hhhssessses',
+    '.Hhhssessses',
+    '..Hhsbssssbs',
+    '...HSsssssS.',
+    '.....sss....',
+    '...cwwwwcc..',
+    '..ccccwwcccc',
+    '.ccccccccccc',
+    '.sCccccccccs',
+    '..CCCCCCCC..',
+    '..pppppppp..'],
+  back: [  // 背对镜头（面朝左上）
+    '...hhhhhh...',
+    '..hhhhhhhhh.',
+    '.hhhhllhhhhh',
+    '.hhhhhhhhhhh',
+    '.hhhhhhhhhhh',
+    '.hhhhhhhhhhh',
+    '.hhhhhhhhhhs',
+    '.HhhhhhhhhHs',
+    '..HHhhhhhHS.',
+    '...HHHHHH...',
+    '.....sss....',
+    '...cccccc...',
+    '..cccccccc..',
+    '.cccccccccc.',
+    '.sCccccccCs.',
+    '..CCCCCCCC..',
+    '..pppppppp..'],
+};
+const FRAMES = { // 动作 = 在同一模板上打几行补丁（_ 表示不变）
+  front: {
+    typeA: [[13, '_s__________'], [14, '_C__________']],
+    typeB: [[13, '___________s'], [14, '___________c']],
+    blink: [[6, '______s___s_']],
+  },
+  back: {
+    typeA: [[13, '_s__________'], [14, '_c__________']],
+    typeB: [[13, '__________s_'], [14, '__________C_']],
+  },
+};
+const ACC = { // 配饰 / 发型也是补丁
+  long:    { front: [[8, '.h__________'], [9, '.hh_________'], [10, '.hH_________'], [11, '.hH_________'], [12, '.H__________']],
+             back:  [[9, '.hhHHHHHHhh.'], [10, '..hhhhhhhh..'], [11, '..hHhhhhHh..']] },
+  tie:     { front: [[12, '______r_____'], [13, '______r_____']] },
+  glasses: { front: [[6, '_____g_ggg_g']], back: [[6, '__________g_']] },
+  headset: { front: [[1, '__aaaaaaaaa_'], [5, '__aA________'], [6, '__aA________'], [7, '__aA________'], [8, '____a_______'], [9, '____aa______']],
+             back:  [[1, '__aaaaaaaaa_'], [5, '_a_________a'], [6, '_a_________a']] },
+  cap:     { front: [[0, '....aaaaa...'], [1, '..aaaaaaaaa.'], [2, '.aaaaaaaaaaa'], [3, '________AAAA']],
+             back:  [[0, '...aaaaaa...'], [1, '..aaaaaaaaa.'], [2, '.aaaaaaaaaaa'], [3, '.aaaaaaaaaaa']] },
+
+  // ---- 扩充发型（10 种）：只改头发像素，发色跟着 h / H / l 走 ----
+  ponytail:  { front: [[2, 'a___________'], [3, 'h___________'], [4, 'h___________'], [5, 'h___________'], [6, 'H___________'], [7, 'h___________'], [8, 'Hh__________'], [9, '.H__________']],
+               back:  [[4, '_____aa_____'], [9, '_____hh_____'], [10, '_____hH_____'], [11, '_____hh_____'], [12, '_____H______']] },
+  twintails: { front: [[2, 'a___________'], [3, 'h___________'], [4, 'h___________'], [5, 'h___________'], [6, 'H___________'], [7, 'h___________'], [8, 'Hh__________'], [9, '.H_________a'], [10, '___________h'], [11, '__________hH']],
+               back:  [[3, 'a__________a'], [4, 'h___________'], [5, 'h___________'], [6, 'H___________'], [7, 'h___________'], [8, 'h__________h'], [9, 'H_________hh'], [10, '_h________hH'], [11, '_H__________']] },
+  bun:       { front: [[0, 'hlh.________'], [1, 'hhHa________'], [2, 'H___________']],
+               back:  [[1, '____HHHH____'], [2, '___HhllhH___'], [3, '___HhhhhH___'], [4, '____HHHH____'], [5, '_____aa_____']] },
+  spiky:     { front: [[0, '...h.h.h.h..'], [1, '.hhhhhhhlhhh'], [2, 'h___________'], [4, 'h___________']],
+               back:  [[0, '..h.h.h.h.h.'], [1, '.hhhhhhhhhhh'], [3, 'h___________'], [5, 'h___________']] },
+  bald:      { front: [[0, '....sssss...'], [1, '..Sssssssss.'], [2, '.Ssssssswsss'], [3, '.Sssssssssss'], [4, '.SsSssssssss'], [5, '.SsbSsssssss'], [6, '.SsS________'], [7, '.SSs________'], [8, '..Ss________'], [9, '...S________']],
+               back:  [[0, '...ssssss...'], [1, '..sssssssss.'], [2, '.sssswssssss'], [3, '.sssssssssss'], [4, '.sssssssssss'], [5, '.sssssssssss'], [6, '.Sssssssssss'], [7, '.SssssssssSs'], [8, '..SSsssssSS.'], [9, '...SSSSSS...']] },
+  bangs:     { front: [[4, '.hhhhhhhhhhh'], [5, '_____HhHhHhH']] },
+  bob:       { front: [[5, '___________h'], [6, 'hHhh_______h'], [7, 'hHhh_______h'], [8, 'hhhH_______H'], [9, '.HHH________']],
+               back:  [[6, 'hhhhhhhhhhhh'], [7, 'hHhhhhhhhhHh'], [8, 'hHHhhhhhhHHh'], [9, '.HHHHHHHHHH.']] },
+  afro:      { front: [[0, '..hhlhhhhh..'], [1, '.hhhhhhlhhhh'], [2, 'hhlhhhhhhhhh'], [3, 'hhhhhlhhhhhh'], [4, 'hh_l________'], [5, 'hhlh________'], [6, 'hHhh________'], [7, 'hhHh________'], [8, '.hHh________']],
+               back:  [[0, '..hhhlhhhh..'], [1, '.hhlhhhhhlhh'], [2, 'hhhhhhlhhhhh'], [3, 'hlhhhhhhhlhh'], [4, 'hhhhlhhhhhhh'], [5, 'hhhhhhhhlhhh'], [6, 'hhlhhhhhhhhs'], [7, 'hHhhhhlhhhHs'], [8, '.hHHhhhhhHS.']] },
+  mohawk:    { front: [[0, '...hhlhh....'], [1, '..HhhhhhHHH.'], [2, '.HHHhhhhHHHH'], [3, '.HHHHhhHHHHH'], [4, '.HHHHHHsHHsH'], [5, '.HHHH_______'], [6, '.HHH________'], [7, '.HHH________'], [8, '..HH________']],
+               back:  [[0, '...HHhhHH...'], [1, '..HHHhhHHHH.'], [2, '.HHHHhlHHHHH'], [3, '.HHHHhhHHHHH'], [4, '.HHHHhhHHHHH'], [5, '.HHHHhhHHHHH'], [6, '.HHHHhhHHHHs'], [7, '.HHHHhhHHHHs'], [8, '..HHHhhHHHS.']] },
+  braid:     { front: [[8, '_h__________'], [9, '_hH_________'], [10, '__Hh________'], [11, '__hH________'], [12, '__Hh________'], [13, '___a________']],
+               back:  [[9, '_____hH_____'], [10, '_____Hh_____'], [11, '_____hH_____'], [12, '_____Hh_____'], [13, '_____aa_____']] },
+
+  // ---- 扩充配饰（10 种）：帽子 / 头饰 / 脸部 / 胸前，颜色走 a / A（accColor）或固定色 ----
+  beanie:    { front: [[0, '....aawaa...'], [1, '..aaaaaaaaa.'], [2, '.aaaaaaaaaaa'], [3, '.AAAAAAAAAAA']],
+               back:  [[0, '...aawaaa...'], [1, '..aaaaaaaaa.'], [2, '.aaaaaaaaaaa'], [3, '.AAAAAAAAAAA']] },
+  headband:  { front: [[3, '.aaaaaaaaaaa']],
+               back:  [[3, '.aaaaaaaaaaa'], [4, 'a___________'], [5, 'A___________']] },
+  bow:       { front: [[0, 'aa.aa_______'], [1, 'aAAa________'], [2, '.a__________']],
+               back:  [[0, '...aa.aa....'], [1, '...aaAAaa...'], [2, '____a__a____']] },
+  shades:    { front: [[6, '____gkkgkkkk'], [7, '_____kk__kk_']], back: [[6, '__________g_']] },
+  mask:      { front: [[7, '____M_______'], [8, '____Mmmmmmmm'], [9, '____MmmmmmM_']], back: [[7, '__________M_']] },
+  beard:     { front: [[7, '____h_______'], [8, '____hhsssshh'], [9, '___HhhhhhhH_']], back: [[8, '__________h_']] },
+  mustache:  { front: [[8, '______HhhH__'], [9, '______H__H__']] },
+  bowtie:    { front: [[11, '____aaAaa___'], [12, '____a___a___']] },
+  badge:     { front: [[11, '____a___a___'], [12, '_____a_a____'], [13, '_____yYy____']], back: [[11, '____aaaa____']] },
+  scarf:     { front: [[10, '____aAaAa___'], [11, '___aaaaaaa__'], [12, '____A_______'], [13, '____a_______']],
+               back:  [[10, '____aAaAa___'], [11, '___aaaaaa___']] },
+};
+const luminance = c => { const [r, g, b] = toRGB(c); return (0.2126 * r + 0.7152 * g + 0.0722 * b) / 255; };
+function lookPal(L) {
+  return {
+    h: L.hair, H: dark(L.hair, .28), l: lite(L.hair, .35),
+    // 深肤色上默认眼色几乎看不见，换成更深的一档
+    s: L.skin, S: dark(L.skin, .13), b: mix(L.skin, '#ff6f6f', .35), e: luminance(L.skin) < .45 ? '#140d12' : '#2a2230',
+    c: L.shirt, C: dark(L.shirt, .22), w: '#ffffff', p: L.pants || '#3a3f52',
+    a: L.accColor || '#454b5e', A: L.accColor ? dark(L.accColor, .25) : '#ff8a5c',
+    r: '#d8423a', g: '#9aa3b8',
+    k: '#1d2130', m: '#f3f6fb', M: '#c5cdd9', y: '#ffd35c', Y: '#d9a92e',   // 墨镜片 / 口罩 / 工牌卡片
+  };
+}
+// 走路 = 坐姿模板下面再接三行腿脚;手臂沿用打字的两帧补丁当摆臂
+const LEGS = {
+  stand: ['...pp..pp...', '...pp..pp...', '..kkk..kkk..'],
+  walkA: ['..pp....pp..', '.pp......pp.', '.kk......kk.'],
+  walkB: ['...pp..pp...', '...pp..pp...', '..kkk..kkk..'],
+};
+const WALK_ARMS = { walkA: 'typeA', walkB: 'typeB' };
+function charSprite(L, pose, frame, flip) {
+  return sprite(`ch|${L.key}|${pose}|${frame}|${+flip}`, () => {
+    const legs = LEGS[frame];
+    let rows = patch(BODY[pose], FRAMES[pose][legs ? WALK_ARMS[frame] : frame]);
+    for (const k of L.acc) rows = patch(rows, ACC[k] && ACC[k][pose]);
+    if (legs) rows = rows.concat(legs);
+    const cv = pix(rows, lookPal(L), flip);
+    return { cv, ax: cv.width >> 1, ay: cv.height - 2 };
+  });
+}
+
+const HAIR_COLORS = ['#231d1c', '#5b3b2b', '#b8683a', '#dcb24c', '#2c2a38', '#8b5a39', '#c94f7c', '#4a6fa5',
+  '#b9bcc6', '#f1dca0', '#8e2b3b', '#e0673a', '#5fc8a8', '#9b7fd6', '#5aa9e6', '#f29bb8', '#2f3f7a', '#2c8c8c'];
+const SKIN_TONES = ['#f7d5b5', '#eec7a3', '#d9a77f', '#b9825a', '#f9dcc0',
+  '#fbe5d6', '#f3cfb3', '#e8b894', '#e0ac7e', '#c68c62', '#a8714a', '#94603e', '#7d4f33', '#6b4430', '#5a3825'];
+const SHIRT_COLORS = ['#3aa56b', '#e0574c', '#4a8fdc', '#f2a444', '#7a62d8', '#2fb5b0', '#e36aa6',
+  '#f4d35e', '#2e3a59', '#8a9aa9', '#f2f2ec', '#3a3b45', '#a3d977', '#8e3b5f', '#c9975b', '#86c5f0', '#ff8f7a'];
+const ACC_COLORS = ['#e8544a', '#3a8cf0', '#45b36a',
+  '#f2c14e', '#8e6bd8', '#2fb5b0', '#f08a3c', '#e36aa6', '#3a3f52', '#f4f4f0', '#7a4a2a', '#9fd4ff', '#b8e986'];
+// 四个槽位各抽一个，互不打架；空字符串的权重就是「不戴」的概率
+const HAIR_STYLES = ['', '', 'long', 'ponytail', 'twintails', 'bun', 'spiky', 'bald', 'bangs', 'bob', 'afro', 'mohawk', 'braid'];
+const HEADWEAR = ['', '', '', 'cap', 'beanie', 'headband', 'bow', 'headset'];
+const FACEWEAR = ['', '', '', 'glasses', 'shades', 'mask', 'beard', 'mustache'];
+const CHESTWEAR = ['', '', 'tie', 'bowtie', 'badge', 'scarf'];
+const TALL_HAIR = new Set(['bun', 'spiky', 'afro', 'mohawk']);   // 帽子会把它们压扁
+function stableLook(seed) {
+  const rand=rng(seed), choose=items=>items[Math.floor(rand()*items.length)];
+  const style=choose(HAIR_STYLES);let head=choose(HEADWEAR);
+  if(TALL_HAIR.has(style)&&(head==='cap'||head==='beanie'))head='';
+  return {hair:choose(HAIR_COLORS),skin:choose(SKIN_TONES),shirt:choose(SHIRT_COLORS),pants:'#3a3f52',acc:[style,head,choose(FACEWEAR),choose(CHESTWEAR)].filter(Boolean),accColor:choose(ACC_COLORS)};
+}
+
+function stableSeed(value) {
+  let hash = 2166136261;
+  for (const c of String(value)) hash = Math.imul(hash ^ c.codePointAt(0), 16777619);
+  return hash >>> 0;
+}
+function characterSprite(look, pose = 'front', frame = 'stand', flip = false) {
+  if (look.key) return charSprite(look, pose, frame, flip);
+  const normalized = { ...look, acc: look.acc || [] };
+  normalized.key = [normalized.hair, normalized.skin, normalized.shirt, normalized.pants,
+    normalized.acc.join('+'), normalized.accColor || ''].join('|');
+  return charSprite(normalized, pose, frame, flip);
+}
+root.ACEOfficeCharacters = Object.freeze({stableSeed, stableLook, characterSprite,
+  HAIR_COLORS, SKIN_TONES, SHIRT_COLORS, ACC_COLORS, HAIR_STYLES, HEADWEAR,
+  FACEWEAR, CHESTWEAR, TALL_HAIR});
+})(globalThis);
diff --git a/assets/seed/MANIFEST.json b/assets/seed/MANIFEST.json
index cd4b0ca37..6e2bb8c85 100644
--- a/assets/seed/MANIFEST.json
+++ b/assets/seed/MANIFEST.json
@@ -1,5 +1,5 @@
 {
-  "bundle_version": "2026-10-09.1",
+  "bundle_version": "2026-10-10.1",
   "description": "Versioned default ACECode global Skill, expert, and managed hook seed bundle reconciled at startup.",
   "skills": [
     {
@@ -74,61 +74,61 @@
       "name": "opc-asset-strategist",
       "source_id": "acecode:opc-expert/opc-asset-strategist@2026-07-27",
       "relative_path": "opc-asset-strategist",
-      "expert_json_sha256": "608f10116741d377004b62ce7cb6c928191c7766b298ffc510cbba0687025be2"
+      "expert_json_sha256": "dfbf7c55580bde6430c3bb9e58ea4606225bd8f1a5d3d674fa1be6075cbe92cf"
     },
     {
       "name": "opc-conversion-designer",
       "source_id": "acecode:opc-expert/opc-conversion-designer@2026-07-27",
       "relative_path": "opc-conversion-designer",
-      "expert_json_sha256": "7dde3a19e17feecb0d4189310d856d49789febb1997c4225163bcf24276fc904"
+      "expert_json_sha256": "842b208a4285b12f7807ff1b2d8a9552213e5712bdd7ed699e8599e0ab71d607"
     },
     {
       "name": "opc-dashboard-reviewer",
       "source_id": "acecode:opc-expert/opc-dashboard-reviewer@2026-07-27",
       "relative_path": "opc-dashboard-reviewer",
-      "expert_json_sha256": "5b49d6f450b73e43acd8e41149b7587cd62f73e8fd89c011316b8be9d5fc2f9c"
+      "expert_json_sha256": "9ff4ec1bf71bf447dc4535acdfba0d55c0866a338bbded6288be2458ace3b11d"
     },
     {
       "name": "opc-model-architect",
       "source_id": "acecode:opc-expert/opc-model-architect@2026-07-27",
       "relative_path": "opc-model-architect",
-      "expert_json_sha256": "9191890cc26df6d48366496fb755ec95fc97f037219834e36f543b5c29a50728"
+      "expert_json_sha256": "49ebf21569f13644efbb3c9446638c91a0df10043b89fcf55c16af84924b44dd"
     },
     {
       "name": "opc-mvp-designer",
       "source_id": "acecode:opc-expert/opc-mvp-designer@2026-07-27",
       "relative_path": "opc-mvp-designer",
-      "expert_json_sha256": "9a7f373fd34295a07ee415d136864a298005c1e905637c87f0aea1ce02b121b4"
+      "expert_json_sha256": "54a4a06f588e7412c1a56a05d8f51659c09af665d019043513059c860059fa9a"
     },
     {
       "name": "opc-niche-strategist",
       "source_id": "acecode:opc-expert/opc-niche-strategist@2026-07-27",
       "relative_path": "opc-niche-strategist",
-      "expert_json_sha256": "e9ba654a872c2876719549bbfec3840d1e98156c0ae98c6f661ecd33b080b974"
+      "expert_json_sha256": "b77b8f7cd1170e7474b0b11b4f4516ed5c1dcfebddd580958dfe3b00770af465"
     },
     {
       "name": "opc-resource-auditor",
       "source_id": "acecode:opc-expert/opc-resource-auditor@2026-07-27",
       "relative_path": "opc-resource-auditor",
-      "expert_json_sha256": "6362a865739a5097da0eadf1d502a8c81fffb7ec5021d2eb7ae755e71e5a3a82"
+      "expert_json_sha256": "1367a8949f5777831bd081fb3695d33f8e960e4e201d3bee7b9278d7b801a995"
     },
     {
       "name": "opc-team",
       "source_id": "acecode:opc-expert/opc-team@2026-07-27",
       "relative_path": "opc-team",
-      "expert_json_sha256": "6ce471a322c6e36b4ab9d92ff1a16b5df9fe685a60c25957d2108a293a20c00e"
+      "expert_json_sha256": "9ff9d4e9c487865fa5290a8d4d71ac606a9244cbe3dcad63b6977901d6bcf793"
     },
     {
       "name": "opc-team-lead",
       "source_id": "acecode:opc-expert/opc-team-lead@2026-07-27",
       "relative_path": "opc-team-lead",
-      "expert_json_sha256": "878809e76c8cb2d9c1279da0ca20e8fb97489a8ff19d6c9be35d0205fc219ee5"
+      "expert_json_sha256": "9b5f4fa6f6ab8bf9ecc1b8986c4cd5004a489362657b89fb98ea1eb519f9a864"
     },
     {
       "name": "opc-value-designer",
       "source_id": "acecode:opc-expert/opc-value-designer@2026-07-27",
       "relative_path": "opc-value-designer",
-      "expert_json_sha256": "a8855db067eac7f3bb9d4f2d67902a93b55b0b2b7ebdba03a432a1fa9eab2b1a"
+      "expert_json_sha256": "099b6a67ed9f29a4c9bb2a9b82f62f89a4ea7737100046d9a76c5957dbc50f99"
     }
   ],
   "hooks": [
diff --git a/assets/seed/experts/opc-asset-strategist/avatars/opc-asset-strategist.png b/assets/seed/experts/opc-asset-strategist/avatars/opc-asset-strategist.png
deleted file mode 100644
index 5114785b1..000000000
Binary files a/assets/seed/experts/opc-asset-strategist/avatars/opc-asset-strategist.png and /dev/null differ
diff --git a/assets/seed/experts/opc-asset-strategist/expert.json b/assets/seed/experts/opc-asset-strategist/expert.json
index 8a5996f15..09cb56144 100644
--- a/assets/seed/experts/opc-asset-strategist/expert.json
+++ b/assets/seed/experts/opc-asset-strategist/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-asset-strategist",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "agent",
   "displayName": "沉墨",
   "profession": "资产沉淀师",
@@ -23,7 +23,6 @@
   "skills": [
     "skills/opc-asset-ops"
   ],
-  "avatar": "avatars/opc-asset-strategist.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/experts/opc-conversion-designer/avatars/opc-conversion-designer.png b/assets/seed/experts/opc-conversion-designer/avatars/opc-conversion-designer.png
deleted file mode 100644
index da5a4a2cc..000000000
Binary files a/assets/seed/experts/opc-conversion-designer/avatars/opc-conversion-designer.png and /dev/null differ
diff --git a/assets/seed/experts/opc-conversion-designer/expert.json b/assets/seed/experts/opc-conversion-designer/expert.json
index 09fe38829..69eed2f0b 100644
--- a/assets/seed/experts/opc-conversion-designer/expert.json
+++ b/assets/seed/experts/opc-conversion-designer/expert.json
@@ -8,7 +8,6 @@
       "profession": "转化路径设计师"
     }
   ],
-  "avatar": "avatars/opc-conversion-designer.png",
   "created_at": "2026-07-26T06:25:34Z",
   "defaultInitPrompt": "",
   "displayDescription": "把触达、承接和成交串成一条清楚的路径，找出断点并确定最小闭环。",
@@ -36,5 +35,5 @@
     "product": "WorkBuddy",
     "version": "1.0.0"
   },
-  "version": "1.0.0"
+  "version": "1.0.0-acecode.2"
 }
diff --git a/assets/seed/experts/opc-dashboard-reviewer/avatars/opc-dashboard-reviewer.png b/assets/seed/experts/opc-dashboard-reviewer/avatars/opc-dashboard-reviewer.png
deleted file mode 100644
index 0653d51f0..000000000
Binary files a/assets/seed/experts/opc-dashboard-reviewer/avatars/opc-dashboard-reviewer.png and /dev/null differ
diff --git a/assets/seed/experts/opc-dashboard-reviewer/expert.json b/assets/seed/experts/opc-dashboard-reviewer/expert.json
index 3f36cb6de..679e5d552 100644
--- a/assets/seed/experts/opc-dashboard-reviewer/expert.json
+++ b/assets/seed/experts/opc-dashboard-reviewer/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-dashboard-reviewer",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "agent",
   "displayName": "复明",
   "profession": "经营复盘师",
@@ -23,7 +23,6 @@
   "skills": [
     "skills/opc-dashboard-review"
   ],
-  "avatar": "avatars/opc-dashboard-reviewer.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/experts/opc-model-architect/avatars/opc-model-architect.png b/assets/seed/experts/opc-model-architect/avatars/opc-model-architect.png
deleted file mode 100644
index 567d965f7..000000000
Binary files a/assets/seed/experts/opc-model-architect/avatars/opc-model-architect.png and /dev/null differ
diff --git a/assets/seed/experts/opc-model-architect/expert.json b/assets/seed/experts/opc-model-architect/expert.json
index b0d3bcc3d..4a6a9a098 100644
--- a/assets/seed/experts/opc-model-architect/expert.json
+++ b/assets/seed/experts/opc-model-architect/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-model-architect",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "agent",
   "displayName": "墨方",
   "profession": "商业模式架构师",
@@ -23,7 +23,6 @@
   "skills": [
     "skills/opc-business-model-design"
   ],
-  "avatar": "avatars/opc-model-architect.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/experts/opc-mvp-designer/avatars/opc-mvp-designer.png b/assets/seed/experts/opc-mvp-designer/avatars/opc-mvp-designer.png
deleted file mode 100644
index 0c10ca204..000000000
Binary files a/assets/seed/experts/opc-mvp-designer/avatars/opc-mvp-designer.png and /dev/null differ
diff --git a/assets/seed/experts/opc-mvp-designer/expert.json b/assets/seed/experts/opc-mvp-designer/expert.json
index 551234b43..c5a203d8c 100644
--- a/assets/seed/experts/opc-mvp-designer/expert.json
+++ b/assets/seed/experts/opc-mvp-designer/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-mvp-designer",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "agent",
   "displayName": "验真",
   "profession": "MVP实验设计师",
@@ -23,7 +23,6 @@
   "skills": [
     "skills/opc-mvp-designer"
   ],
-  "avatar": "avatars/opc-mvp-designer.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/experts/opc-niche-strategist/avatars/opc-niche-strategist.png b/assets/seed/experts/opc-niche-strategist/avatars/opc-niche-strategist.png
deleted file mode 100644
index 061e4257c..000000000
Binary files a/assets/seed/experts/opc-niche-strategist/avatars/opc-niche-strategist.png and /dev/null differ
diff --git a/assets/seed/experts/opc-niche-strategist/expert.json b/assets/seed/experts/opc-niche-strategist/expert.json
index 13c5f2cec..a6ae31a4e 100644
--- a/assets/seed/experts/opc-niche-strategist/expert.json
+++ b/assets/seed/experts/opc-niche-strategist/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-niche-strategist",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "agent",
   "displayName": "林利基",
   "profession": "利基定位师",
@@ -23,7 +23,6 @@
   "skills": [
     "skills/opc-niche-positioning"
   ],
-  "avatar": "avatars/opc-niche-strategist.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/experts/opc-resource-auditor/avatars/opc-resource-auditor.png b/assets/seed/experts/opc-resource-auditor/avatars/opc-resource-auditor.png
deleted file mode 100644
index e0d5c1e03..000000000
Binary files a/assets/seed/experts/opc-resource-auditor/avatars/opc-resource-auditor.png and /dev/null differ
diff --git a/assets/seed/experts/opc-resource-auditor/expert.json b/assets/seed/experts/opc-resource-auditor/expert.json
index a8dd35a75..d22cf31ce 100644
--- a/assets/seed/experts/opc-resource-auditor/expert.json
+++ b/assets/seed/experts/opc-resource-auditor/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-resource-auditor",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "agent",
   "displayName": "顾盘",
   "profession": "资源盘点师",
@@ -23,7 +23,6 @@
   "skills": [
     "skills/opc-resource-audit"
   ],
-  "avatar": "avatars/opc-resource-auditor.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/experts/opc-team-lead/avatars/opc-team-lead.png b/assets/seed/experts/opc-team-lead/avatars/opc-team-lead.png
deleted file mode 100644
index 5729bb820..000000000
Binary files a/assets/seed/experts/opc-team-lead/avatars/opc-team-lead.png and /dev/null differ
diff --git a/assets/seed/experts/opc-team-lead/expert.json b/assets/seed/experts/opc-team-lead/expert.json
index 1b60a1af4..f789fe7e7 100644
--- a/assets/seed/experts/opc-team-lead/expert.json
+++ b/assets/seed/experts/opc-team-lead/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-team-lead",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "agent",
   "displayName": "易牧",
   "profession": "首席编排师",
@@ -23,7 +23,6 @@
   "skills": [
     "skills/opc-orchestrator"
   ],
-  "avatar": "avatars/opc-team-lead.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/experts/opc-team/ACECode-ADAPTATION.md b/assets/seed/experts/opc-team/ACECode-ADAPTATION.md
index 00114988d..58931a418 100644
--- a/assets/seed/experts/opc-team/ACECode-ADAPTATION.md
+++ b/assets/seed/experts/opc-team/ACECode-ADAPTATION.md
@@ -8,10 +8,12 @@
 - 1 名主理人和 8 名领域成员的提示词
 - 9 个配套 Skill 及其参考资料
 - `opc-doc/` 成果目录和会话恢复契约
-- 原始头像、中文名称和快捷提问
+- 中文名称和快捷提问
 
 运行时适配：
 
+- 默认头像改用 ACECode 像素办公室人物；成员子会话按专家 ID 关联同一外观。用户自行设置的头像保持原样。
+
 - WorkBuddy 的 `TeamCreate` 不再执行；在 ACECode 中，选择本专家团即完成团队绑定。
 - WorkBuddy 的 Agent 调度改为
   `spawn_subagent(expert_member="<成员专家 ID>", prompt="...", wait=true)`。
diff --git a/assets/seed/experts/opc-team/avatars/team.png b/assets/seed/experts/opc-team/avatars/team.png
deleted file mode 100644
index 2816f3614..000000000
Binary files a/assets/seed/experts/opc-team/avatars/team.png and /dev/null differ
diff --git a/assets/seed/experts/opc-team/expert.json b/assets/seed/experts/opc-team/expert.json
index 8ffdb5401..d710c337e 100644
--- a/assets/seed/experts/opc-team/expert.json
+++ b/assets/seed/experts/opc-team/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-team",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "team",
   "displayName": "一人公司专家团",
   "profession": "一人公司共创团队",
@@ -24,7 +24,6 @@
       "opc-dashboard-reviewer"
     ]
   },
-  "avatar": "avatars/team.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/experts/opc-value-designer/avatars/opc-value-designer.png b/assets/seed/experts/opc-value-designer/avatars/opc-value-designer.png
deleted file mode 100644
index a5f22f154..000000000
Binary files a/assets/seed/experts/opc-value-designer/avatars/opc-value-designer.png and /dev/null differ
diff --git a/assets/seed/experts/opc-value-designer/expert.json b/assets/seed/experts/opc-value-designer/expert.json
index ee8bb738e..c89e6ad5b 100644
--- a/assets/seed/experts/opc-value-designer/expert.json
+++ b/assets/seed/experts/opc-value-designer/expert.json
@@ -1,6 +1,6 @@
 {
   "name": "opc-value-designer",
-  "version": "1.0.0-acecode.1",
+  "version": "1.0.0-acecode.2",
   "expertType": "agent",
   "displayName": "言之",
   "profession": "价值主张设计师",
@@ -23,7 +23,6 @@
   "skills": [
     "skills/opc-value-proposition"
   ],
-  "avatar": "avatars/opc-value-designer.png",
   "license": "CC-BY-NC-SA-4.0",
   "homepage": "https://github.com/easychen/opc-methodology",
   "upstream": {
diff --git a/assets/seed/seed.version b/assets/seed/seed.version
index ffeed077b..347fb9fae 100644
--- a/assets/seed/seed.version
+++ b/assets/seed/seed.version
@@ -1 +1 @@
-2026-10-09.1
+2026-10-10.1
diff --git a/cmake/acecode_bin2cpp.cmake b/cmake/acecode_bin2cpp.cmake
index 19c5413f4..f42e36afc 100644
--- a/cmake/acecode_bin2cpp.cmake
+++ b/cmake/acecode_bin2cpp.cmake
@@ -13,6 +13,16 @@ if(NOT BIN2CPP_INPUT OR NOT BIN2CPP_OUTPUT OR NOT BIN2CPP_SYMBOL)
 endif()
 
 file(READ "${BIN2CPP_INPUT}" _hex HEX)
+if(BIN2CPP_INLINE_JS)
+    # Preserve binary reads and make the native pet page fully self-contained.
+    file(READ "${BIN2CPP_INLINE_JS}" _script_hex HEX)
+    string(HEX "<script src=\"./office_characters.js\"></script>" _script_tag)
+    string(FIND "${_hex}" "${_script_tag}" _script_pos)
+    if(_script_pos EQUAL -1)
+        message(FATAL_ERROR "bin2cpp: shared office character script tag missing")
+    endif()
+    string(REPLACE "${_script_tag}" "3c7363726970743e${_script_hex}3c2f7363726970743e" _hex "${_hex}")
+endif()
 string(REGEX REPLACE "(..)" "0x\\1," _arr "${_hex}")
 string(LENGTH "${_hex}" _hexlen)
 math(EXPR _len "${_hexlen} / 2")
diff --git a/cmake/acecode_desktop.cmake b/cmake/acecode_desktop.cmake
index 7e3326e91..6004c1697 100644
--- a/cmake/acecode_desktop.cmake
+++ b/cmake/acecode_desktop.cmake
@@ -145,10 +145,12 @@ if(WIN32 OR APPLE)
         OUTPUT ${ACECODE_DESKTOP_PET_PAGE_CPP}
         COMMAND ${CMAKE_COMMAND}
             -DBIN2CPP_INPUT=${ACECODE_DESKTOP_PET_PAGE}
+            -DBIN2CPP_INLINE_JS=${CMAKE_SOURCE_DIR}/assets/desktop_pet/office_characters.js
             -DBIN2CPP_OUTPUT=${ACECODE_DESKTOP_PET_PAGE_CPP}
             -DBIN2CPP_SYMBOL=desktop_pet_page
             -P ${CMAKE_SOURCE_DIR}/cmake/acecode_bin2cpp.cmake
         DEPENDS ${ACECODE_DESKTOP_PET_PAGE} ${CMAKE_SOURCE_DIR}/cmake/acecode_bin2cpp.cmake
+            ${CMAKE_SOURCE_DIR}/assets/desktop_pet/office_characters.js
         COMMENT "Embedding the desktop agent office"
         VERBATIM
     )
@@ -251,9 +253,11 @@ if(APPLE)
         MACOSX_BUNDLE_BUNDLE_VERSION "${ACECODE_BUILD_VERSION}"
         MACOSX_BUNDLE_COPYRIGHT "ACECode contributors"
     )
-    add_dependencies(acecode-desktop acecode acecode-computer-use)
+    add_executable(acecode-macos-cli-launcher ${ACECODE_MACOS_CLI_LAUNCHER_SOURCE})
+    add_dependencies(acecode-desktop acecode acecode-computer-use acecode-macos-cli-launcher)
     set_property(TARGET acecode-desktop APPEND PROPERTY
-        LINK_DEPENDS $<TARGET_FILE:acecode> $<TARGET_FILE:acecode-computer-use>)
+        LINK_DEPENDS $<TARGET_FILE:acecode> $<TARGET_FILE:acecode-computer-use>
+            $<TARGET_FILE:acecode-macos-cli-launcher>)
     add_custom_command(TARGET acecode-desktop POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E rm -f
             $<TARGET_FILE_DIR:acecode-desktop>/acecode-desktop
@@ -263,6 +267,9 @@ if(APPLE)
         COMMAND ${CMAKE_COMMAND} -E copy_if_different
             $<TARGET_FILE:acecode-computer-use>
             $<TARGET_FILE_DIR:acecode-desktop>/acecode-computer-use
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
+            $<TARGET_FILE:acecode-macos-cli-launcher>
+            $<TARGET_FILE_DIR:acecode-desktop>/acecode-cli
         COMMAND ${CMAKE_COMMAND} -E rm -rf
             "$<TARGET_BUNDLE_DIR:acecode-desktop>/../acecode-desktop.app"
         COMMENT "Copying acecode daemon into ACECode.app bundle"
diff --git a/cmake/acecode_embed_assets.cmake b/cmake/acecode_embed_assets.cmake
index 8b3b90476..076159e89 100644
--- a/cmake/acecode_embed_assets.cmake
+++ b/cmake/acecode_embed_assets.cmake
@@ -1,96 +1,23 @@
-# acecode_embed_assets: 把 web/ 下的所有文件嵌入成 C++ 字节数组,在 build
-# 时生成 ${CMAKE_BINARY_DIR}/generated/static_assets_data.cpp。
-#
-# 用法:
-#   include(cmake/acecode_embed_assets.cmake)
-#   acecode_generate_embedded_assets(${CMAKE_SOURCE_DIR}/web
-#                                      ${CMAKE_BINARY_DIR}/generated/static_assets_data.cpp
-#                                      ${BUILD_VERSION})
-#
-# 生成的文件实现 `acecode::web::lookup_embedded_asset(name)` —— 静态 std::map
-# 把相对路径(如 "index.html" / "components/ace-app.js")映射到 std::span。
-# index.html 的内容会做一次模板替换,把 `?v=__VERSION__` 替换成传入的
-# BUILD_VERSION 字符串(失败 fallback 不替换 — 不阻断 build)。
-#
-# 注意: 单文件输出会让 MSVC 编译稍慢(几百 KB cpp);若以后嵌入资源膨胀严重
-# 可拆多 TU。当前 web/ 总量 << 1MB,不优化。
-
+# Generate deterministic gzip resources. Track both added/removed paths and
+# modifications of existing files so an incremental native build refreshes Vite output.
+set(_ACECODE_EMBED_GENERATOR "${CMAKE_CURRENT_LIST_DIR}/../scripts/embed_web_assets.py")
 function(acecode_generate_embedded_assets web_dir out_file version)
-    if(NOT EXISTS "${web_dir}")
-        message(STATUS "[acecode_embed_assets] web dir not found: ${web_dir} — generating empty asset map")
-        file(WRITE "${out_file}" "// Auto-generated. web/ dir absent at configure time.\n#include \"web/static_assets.hpp\"\nnamespace acecode::web {\nconst std::map<std::string, std::pair<const unsigned char*, std::size_t>>& embedded_asset_map() {\n    static const std::map<std::string, std::pair<const unsigned char*, std::size_t>> m;\n    return m;\n}\n}\n")
-        return()
+    find_package(Python3 REQUIRED COMPONENTS Interpreter)
+    file(GLOB_RECURSE assets CONFIGURE_DEPENDS "${web_dir}/*")
+    set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
+        ${assets} "${_ACECODE_EMBED_GENERATOR}")
+    execute_process(
+        COMMAND "${Python3_EXECUTABLE}" "${_ACECODE_EMBED_GENERATOR}"
+            --root "${web_dir}" --output "${out_file}" --version "${version}"
+        RESULT_VARIABLE result
+        OUTPUT_VARIABLE report
+        ERROR_VARIABLE errors
+    )
+    if(NOT result EQUAL 0)
+        message(FATAL_ERROR "Embedded asset generation failed: ${errors}")
     endif()
-
-    file(GLOB_RECURSE rels CONFIGURE_DEPENDS RELATIVE "${web_dir}" "${web_dir}/*")
-    list(FILTER rels EXCLUDE REGEX "(^|/)(README\\.md|\\.gitignore)$")
-
-    set(content "// Auto-generated by acecode_embed_assets. DO NOT EDIT.\n")
-    string(APPEND content "#include \"web/static_assets.hpp\"\n\n")
-    string(APPEND content "namespace acecode::web {\n\n")
-
-    set(map_entries "")
-    set(idx 0)
-    foreach(rel IN LISTS rels)
-        set(src_file "${web_dir}/${rel}")
-        if(IS_DIRECTORY "${src_file}")
-            continue()
-        endif()
-        # GLOB CONFIGURE_DEPENDS notices added/removed names, not changes to
-        # existing files. Reconfigure when Vite rewrites an embedded asset.
-        set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS "${src_file}")
-
-        # index.html 走模板替换:把 ?v=__VERSION__ 替成 ?v=${version}
-        # 其它文件原样读取。
-        #
-        # 关键:必须用 HEX(二进制)模式读,绝不能用文本模式 file(READ ... raw_text)。
-        # 压缩后的前端 bundle 里含真实控制字节(某些库把 ASCII 控制符定义成裸字节,
-        # 如 f.SUB="\x1a"),而 CMake 在 Windows 文本模式下会把 0x1A(Ctrl+Z)当 EOF,
-        # 把 index.html 在该字节处截断 → 嵌入的前端残缺 → 部署机(走嵌入)白屏。
-        # 因此 __VERSION__ 的替换改在 hex 空间做(token 与 version 都是安全 ASCII)。
-        if(rel STREQUAL "index.html")
-            file(READ "${src_file}" hex_data HEX)
-            # "__VERSION__" 的小写 hex(file(READ HEX) 输出小写)
-            set(_token_hex "5f5f56455253494f4e5f5f")
-            set(_ver_tmp "${out_file}.ver.tmp")
-            file(WRITE "${_ver_tmp}" "${version}")
-            file(READ "${_ver_tmp}" _version_hex HEX)
-            file(REMOVE "${_ver_tmp}")
-            string(REPLACE "${_token_hex}" "${_version_hex}" hex_data "${hex_data}")
-        else()
-            file(READ "${src_file}" hex_data HEX)
-        endif()
-
-        # 文件名 → C++ 变量名:非字母数字转 _,加序号防 collision
-        string(REGEX REPLACE "[^A-Za-z0-9]" "_" var_safe "${rel}")
-        set(var_name "asset_${idx}_${var_safe}")
-
-        # 把每两位 hex 转成 0xXX, 格式
-        string(REGEX REPLACE "(..)" "0x\\1," hex_arr "${hex_data}")
-        string(LENGTH "${hex_data}" hex_len)
-        math(EXPR data_len "${hex_len} / 2")
-
-        # 空文件:hex_arr 为空,需要一个最小占位避免 "{}; " 编译失败 —
-        # 写一个 0 字节占位,size 仍为 0。
-        if(data_len EQUAL 0)
-            string(APPEND content "static const unsigned char ${var_name}[1] = {0};\n")
-        else()
-            string(APPEND content "static const unsigned char ${var_name}[] = {${hex_arr}};\n")
-        endif()
-        # 把反斜杠路径分隔符换成 / 让 map key 跨平台一致。
-        string(REPLACE "\\" "/" rel_norm "${rel}")
-        string(APPEND map_entries "    {\"${rel_norm}\", {${var_name}, ${data_len}}},\n")
-
-        math(EXPR idx "${idx} + 1")
-    endforeach()
-
-    string(APPEND content "\nconst std::map<std::string, std::pair<const unsigned char*, std::size_t>>& embedded_asset_map() {\n")
-    string(APPEND content "    static const std::map<std::string, std::pair<const unsigned char*, std::size_t>> m = {\n${map_entries}    };\n")
-    string(APPEND content "    return m;\n}\n\n")
-    string(APPEND content "} // namespace acecode::web\n")
-
-    file(WRITE "${out_file}" "${content}")
-    message(STATUS "[acecode_embed_assets] wrote ${out_file} with ${idx} assets (BUILD_VERSION=${version})")
+    string(STRIP "${report}" report)
+    message(STATUS "${report}")
 endfunction()
 
 # 拿 git short hash 作 BUILD_VERSION;非 git 环境 fallback 用日期+秒。
diff --git a/cmake/acecode_layer_contract.cmake b/cmake/acecode_layer_contract.cmake
index 61e4ef31f..3c55840d2 100644
--- a/cmake/acecode_layer_contract.cmake
+++ b/cmake/acecode_layer_contract.cmake
@@ -18,6 +18,10 @@ if(TARGET acecode_deepin_window_effects)
     list(APPEND _primary_targets acecode_deepin_window_effects)
     list(REMOVE_ITEM _desktop_inactive ${ACECODE_DEEPIN_WINDOW_EFFECTS_SOURCE})
 endif()
+if(TARGET acecode-macos-cli-launcher)
+    list(APPEND _primary_targets acecode-macos-cli-launcher)
+    list(REMOVE_ITEM _desktop_inactive ${ACECODE_MACOS_CLI_LAUNCHER_SOURCE})
+endif()
 if(TARGET acecode_computer_use_native)
     list(APPEND _primary_targets acecode_computer_use_native acecode-computer-use)
 endif()
diff --git a/cmake/acecode_layer_libraries.cmake b/cmake/acecode_layer_libraries.cmake
index be9e22746..1500fa923 100644
--- a/cmake/acecode_layer_libraries.cmake
+++ b/cmake/acecode_layer_libraries.cmake
@@ -142,7 +142,7 @@ acecode_set_source_define("${ACECODE_CHANNEL_BRIDGE_SOURCE}"
 acecode_collect_group_sources(_web apps/web)
 acecode_add_layer_library(acecode_web apps ${_web}
     "${CMAKE_BINARY_DIR}/generated/static_assets_data.cpp")
-target_link_libraries(acecode_web PUBLIC acecode_host acecode_crow)
+target_link_libraries(acecode_web PUBLIC acecode_host acecode_crow PRIVATE ZLIB::ZLIB)
 
 acecode_collect_group_sources(_tui apps/tui)
 acecode_add_layer_library(acecode_tui apps ${_tui}
@@ -166,6 +166,7 @@ target_link_libraries(acecode_cli PUBLIC acecode_tui acecode_headless acecode_da
 # Reusable desktop code is application-owned, with only base-layer linkage.
 # Browser hosts and platform shell entry points remain executable-owned.
 set(ACECODE_DESKTOP_BINARY_ONLY_SOURCES
+    ${ACECODE_MACOS_CLI_LAUNCHER_SOURCE}
     ${ACECODE_DEEPIN_WINDOW_EFFECTS_SOURCE} ${ACECODE_DESKTOP_LINUX_SOURCE}
     ${ACECODE_AGENT_BROWSER_HOST_SOURCE} ${ACECODE_AGENT_BROWSER_HOST_MAC_SOURCE}
     ${ACECODE_DESKTOP_MAIN_SOURCE} ${ACECODE_DESKTOP_SPLASH_SOURCE}
diff --git a/cmake/acecode_source_paths.cmake b/cmake/acecode_source_paths.cmake
index 95d7a1dfe..9418de5f5 100644
--- a/cmake/acecode_source_paths.cmake
+++ b/cmake/acecode_source_paths.cmake
@@ -5,6 +5,7 @@ set(ACECODE_CHANNEL_BRIDGE_SOURCE "${CMAKE_SOURCE_DIR}/src/host/channels/bridge.
 set(ACECODE_WINPTY_AGENT_LOCATION_SOURCE "${CMAKE_SOURCE_DIR}/src/base/pty/winpty_agent_location.cpp")
 set(ACECODE_DEEPIN_WINDOW_EFFECTS_SOURCE "${CMAKE_SOURCE_DIR}/src/apps/desktop/deepin_window_effects.cpp")
 set(ACECODE_DESKTOP_MAIN_SOURCE "${CMAKE_SOURCE_DIR}/src/apps/desktop/main.cpp")
+set(ACECODE_MACOS_CLI_LAUNCHER_SOURCE "${CMAKE_SOURCE_DIR}/src/apps/desktop/macos_cli_launcher.cpp")
 set(ACECODE_DESKTOP_SPLASH_SOURCE "${CMAKE_SOURCE_DIR}/src/apps/desktop/splash_screen.cpp")
 set(ACECODE_DESKTOP_WEB_HOST_SOURCE "${CMAKE_SOURCE_DIR}/src/apps/desktop/web_host.cpp")
 set(ACECODE_DESKTOP_PET_SOURCE "${CMAKE_SOURCE_DIR}/src/apps/desktop/desktop_pet.cpp")
diff --git a/docs/channels.md b/docs/channels.md
index ddd885836..a4ebcb966 100644
--- a/docs/channels.md
+++ b/docs/channels.md
@@ -151,12 +151,15 @@ new one.
 | Command | Effect |
 | --- | --- |
 | `/help` | Commands available to the sender |
-| `/status` | Platform, session, location, model, busy state, pending approvals and questions |
+| `/status` | Platform, session, location, model, permission mode, reasoning effort, busy state, pending approvals and questions |
 | `/stop` | Stop the current turn |
 | `/new` | New session in the bound session's workspace, or a no-workspace session |
 | `/sessions`, `/sessions more`, `/sessions search <text>` | Numbered list of sessions to switch to |
 | `/resume <number or session id>` | Switch the binding; numbers refer to the latest list |
 | `/model [name]` | List saved models, or switch the bound session's model from the next turn |
+| `/mode [default\|auto\|yolo]` | Show or change the bound session's permission mode: default, automatic, or full access (`accept-edits` is an alias for `auto`) |
+| `/yolo` | Switch directly to full access, skipping tool permission prompts and allowing pending permission requests |
+| `/effort [level\|default]` | Show current reasoning effort and supported levels, set a supported level, or restore the model preset with `default` |
 | `/approve <id>`, `/deny <id>` | Decide a permission request once |
 | `/aq ...` | Answer an AskUserQuestion, with the same syntax as `/rc` |
 
@@ -169,6 +172,14 @@ starts with `/` is expanded as an opencode or skill command exactly like Web
 input. Plain text sent while a question is pending is handed to that question as
 an interjection.
 
+`/mode`, `/yolo`, and `/effort` apply only to the bound session and work while
+it is busy. Permission changes follow the same rules as Desktop. Effort changes
+take effect on the next model request, including later requests in the current
+turn; the in-flight request is not interrupted. Use `/effort` to see the current
+model's supported levels. Unsupported levels leave the setting unchanged. These
+commands require an existing session (`/new` or a normal message creates one)
+and do not change global defaults.
+
 ### Output And Media
 
 The assistant text of each turn and turn errors are sent; tool progress is not.
diff --git a/docs/daemon-api.md b/docs/daemon-api.md
index 029612bf1..3c6a8c6c2 100644
--- a/docs/daemon-api.md
+++ b/docs/daemon-api.md
@@ -235,6 +235,14 @@ update their transcript presentation.
 
 ---
 
+### Embedded frontend encoding
+
+Embedded frontend resources negotiate gzip using `Accept-Encoding`. Compressed
+responses include `Content-Encoding: gzip` and `Vary: Accept-Encoding`; clients
+without gzip support (including explicit `gzip;q=0`) receive the original bytes
+with the same content type and cache policy. SPA fallback follows the same rule.
+Development `--static-dir` resources continue to be read from disk on each request.
+
 ## 3. HTTP Endpoint Index
 
 | Method | Path | Purpose |
@@ -566,6 +574,8 @@ disabled, the write is silently ignored.
 `session` 与 `workspace` 可省略；默认选最近办公室。选择子会话时返回它所属的根办公室。
 显式选择不存在或已归档会话返回 `404`，并在可用时附带当前 `offices`。
 
+绑定专家的条目保留 `expert_id`、`expert_member_id` 与 `expert` 展示信息，其中 `expert.avatar_identity` 是目录头像、子 agent 和办公室共用的稳定像素身份。引用式专家团成员使用被引用专家身份，主会话使用主理人身份；内嵌成员使用团队 ID 与成员 ID 的组合。`expert.avatar_url` 继续指向用户配置的头像（没有配置时为空）。这些字段不包含本地文件路径。
+
 ```json
 {
   "offices": [{"id":"root","workspace_hash":"abc123","title":"Review", "last_user_message_at":"2026-10-06T10:00:00Z"}],
@@ -1071,11 +1081,11 @@ storage directly; they do not call the daemon HTTP API:
 
 | Tool | Behavior |
 |---|---|
-| `create_thread` | create a background thread and queue its initial prompt |
+| `create_thread` | create a thread in the inherited or explicitly selected workspace and queue its initial prompt |
 | `fork_thread` | fork completed persisted history into a new thread |
 | `list_threads` | globally list pinned threads plus cursor-paginated recent threads |
 | `read_thread` | read bounded, cursor-paginated turns from any workspace |
-| `send_message_to_thread` | queue a follow-up prompt |
+| `send_message_to_thread` | queue a follow-up prompt to a thread in any workspace |
 | `wait_threads` | wait for up to eight targets across workspaces using event cursors |
 | `set_thread_title` | rename a thread |
 | `set_thread_pinned` | update the existing pinned-session state |
@@ -1098,7 +1108,36 @@ the next page; it is an offset into the current ordering, not a frozen snapshot.
 `errors` reports incomplete project scans. `read_thread` and each `wait_threads`
 target accept optional `workspaceHash` from the list for direct lookup and
 disambiguation when the same `threadId` exists in multiple projects.
-Creation and mutation tools retain their existing calling-workspace semantics.
+Other mutation tools retain their existing calling-workspace semantics.
+
+`create_thread` accepts required `prompt`, optional `title`/`model`, and an
+optional target: `workspaceHash` for a registered workspace, `cwd` for an
+existing absolute directory, or `noWorkspace:true`. These three target forms
+are mutually exclusive. An omitted target (`noWorkspace:false` also counts as
+omitted) inherits the caller's workspace-free state or working directory.
+Workspace-free threads receive independent cache directories and persist
+`no_workspace:true`, so the no-workspace sidebar list can discover them.
+Directory targets are registered as visible workspaces, preserving existing
+names and other workspace preferences. An explicit `cwd` is canonicalized;
+a workspace hash retains the registered workspace's directory identity.
+Invalid target types, relative/missing/non-directory paths, unknown hashes,
+and conflicting selectors fail without creating a thread or silently falling
+back to the caller's directory.
+
+For example, `create_thread({"cwd":"N:/Users/shao/test333","prompt":"哈哈哈"})`
+returns `{"threadId":"...","title":"","status":"running","cwd":"...",
+"workspaceHash":"...","noWorkspace":false}`. The returned `workspaceHash`
+is the storage project hash, including for workspace-free threads, consistent
+with `list_threads` and `read_thread`. If initial input delivery fails, the
+new thread is destroyed and its files are removed from its actual project.
+
+`send_message_to_thread` accepts optional `workspaceHash` from creation or
+discovery. It locates threads globally and restores inactive targets using
+their own cwd and workspace-free state. Ambiguous ids require a hash; an id
+already active in another project is rejected to prevent misdelivery. A
+successful result is `{"threadId":"...","delivery":"queued","workspaceHash":"..."}`.
+This queues ordinary input; it does not answer or dismiss a pending user
+question, and sending to the calling thread remains invalid.
 
 `delete_thread` also removes search-index and pin records. It may target its
 calling thread, including a cascade whose tree contains the caller. In that
@@ -2672,6 +2711,13 @@ when no main avatar is configured. `state_avatar_urls` contains each state
 that has an effective image: the configured state image, or the main avatar
 when that state is not configured.
 
+Definitions and their `agents` also include `avatar_identity`, a stable key for
+the shared virtual-office pixel portrait. Clients use it when `avatar_url` is
+empty. Session expert presentation carries the corresponding selected member's
+identity and custom avatar URL, so spawning a new session does not change the
+expert's pixel appearance. Built-in experts use pixel portraits; user-supplied
+image and state-image endpoints keep their existing behavior.
+
 `GET /api/experts/:id/avatar?workspace=<hash>` serves the main avatar.
 Appending `&state=working`, `&state=needs_attention`, or `&state=idle` serves
 that state image and falls back to the main avatar if the state file becomes
@@ -2801,10 +2847,43 @@ Returns the effective skill directory:
 }
 ```
 
-`source` is `project_acecode`, `project_agent`, or `global_acecode`.
-`global_path` always points at the user-global skills root
-(`~/.acecode/skills`) regardless of which root was selected as `path`;
-the settings page "open global skills directory" button relies on it.
+With default scanning, `source` is `project_acecode`, `project_agent`, or
+`global_acecode`, and `global_path` points at the active ACECode data
+directory's `skills` folder. With custom scan paths, `path` is the first
+configured project root (or the first global root if none), `global_path`
+is the first global root, and `source` is `project_configured` or
+`global_configured`. An unconfigured scope returns an empty path. Custom
+roots are not created by this request.
+
+### `GET /api/config/skill-paths`
+
+Returns `{ "paths": [".acecode/skills", "${ACECODE_DATA_DIR}/skills"],
+"default_paths": [...], "customized": true }` (illustrative custom list).
+`paths` is the editable effective list; defaults honor legacy
+`skills.reuse_opencode` and `skills.external_dirs`.
+
+### `PUT /api/config/skill-paths`
+
+Body: `{ "paths": [".acecode/skills", "~/.codex/skills"] }`.
+Persists `skills.scan_paths` and refreshes daemon and existing session
+skill registries (session prompt snapshots apply at the control boundary).
+Returns the same shape as GET. Requires normal API authorization; returns
+400 for invalid input, 500 for persistence failure, and 409 during data
+directory migration. Failed validation/persistence leaves active paths intact.
+
+- Missing/null `skills.scan_paths` preserves legacy scanning exactly.
+  PUT `{ "paths": null }` restores this default behavior.
+- An explicit list replaces all ordinary defaults and legacy external roots;
+  an empty list disables ordinary scanning without deleting skills.
+- Entries are searched in list order; first skill name wins. Each relative
+  entry expands from the selected workspace through ancestors, excluding HOME
+  (or up to the filesystem root if HOME is not an ancestor). Global entries
+  remain global when no workspace is selected.
+- Absolute paths, `~`, and `${ENV}` are supported. `${ACECODE_DATA_DIR}` resolves
+  to the active data directory; `${XDG_CONFIG_HOME}` / `${XDG_CACHE_HOME}` fall
+  back to `~/.config` / `~/.cache`. Unset other variables are skipped.
+- Expert package skill roots retain priority. Allow/disable/platform policies
+  and seed installation locations are unchanged.
 
 ### `GET /api/skills?workspace=<hash>`
 
@@ -2831,9 +2910,15 @@ including, HOME) or `"global"` (user-global roots and
 `config.skills.external_dirs`). `workspace` is optional; without it the
 daemon's compatibility workspace (its own cwd) is used.
 
-Disabled config entries whose skill no longer exists on disk (ghost
-entries) are still included with `enabled:false` and `source:""` so the UI
-can release them from `config.skills.disabled`.
+When `skills.scan_paths` is configured, the same ordered resolution used by
+runtime discovery determines duplicate selection; relative entries are
+classified as project roots and absolute entries as global roots.
+
+Only discovered skills are listed. A skill whose `SKILL.md` was deleted or
+whose directory is outside the effective scan scope disappears on refresh,
+even if its name remains in `config.skills.disabled`. Listing does not prune
+disable preferences: a skill restored later (or discovered in another
+workspace) still appears with `enabled:false`.
 
 ### `PUT /api/skills/:name?workspace=<hash>`
 
diff --git a/docs/macos-release.md b/docs/macos-release.md
index da9f1949a..86eb7ca7a 100644
--- a/docs/macos-release.md
+++ b/docs/macos-release.md
@@ -68,16 +68,30 @@ package size, and SHA-256. Native preflight additionally enforces:
   outside App Translocation and other app bundles. Custom directories are
   supported alongside `~/Applications` and `/Applications`.
 
-The updater stages a hidden sibling, validates it, retains a uniquely named previous bundle,
-and rolls back when replacement validation fails. New PKG installations always
+The updater creates a private sibling directory `.acecode-update-<UUID>` with
+`staging/ACECode.app`, `previous/ACECode.app`, and `failed/ACECode.app` slots.
+It validates the staged app, retains the previous bundle, and rolls back when
+replacement validation fails. All copies retain the actual name `ACECode.app`:
+an old process can remain alive until restart, and renaming its bundle to a
+random name can expose that name in macOS permission prompts. The UUID belongs
+to the containing directory, not the application name. Empty containers are
+removed on exit; remaining application copies are preserved. Copies inside an
+update directory cannot be used as self-update installation targets.
+New PKG installations always
 use `~/Applications`; existing `/Applications` installations remain supported
 but are neither relocated nor deleted automatically.
 
 Custom installer locations (including the `~/Apps` fallback) update in place
 without elevation when the current account has permission. Unwritable locations
 require a manual installation or moving the app to a writable folder. Retained
-`.ACECode-<UUID>.previous.app` backups require manual cleanup when no longer
-needed; the updater does not delete unrelated or existing backups.
+`.acecode-update-<UUID>/previous/ACECode.app` backups require manual cleanup
+when no longer needed and their old processes have exited. Historical
+`.ACECode-<UUID>.previous.app` backups are left untouched; the updater does not
+delete unrelated or existing backups. An update executed by an older version
+still uses that version's naming policy. After updating, quit and reopen the
+installed `ACECode.app` to stop running from the old copy. macOS permission
+dialog attribution must be verified on a Mac; portable filesystem tests do not
+prove the text of a system permission dialog.
 
 Older ACECode versions with the two-directory restriction need one manual
 installation of the new version before custom-location self-update is available.
diff --git a/docs/release-artifacts.md b/docs/release-artifacts.md
index 2194f36d9..17b885206 100644
--- a/docs/release-artifacts.md
+++ b/docs/release-artifacts.md
@@ -20,6 +20,8 @@ Deepin 构建是发布任务的必需依赖，不能因已有普通 Linux 包而
 
 调试符号使用 `dev_only.` 文件名前缀；避免方括号等会被 GitHub 改写的字符，使 `SHA256SUMS.txt` 中的文件名与下载名一致。
 
+macOS 更新 ZIP 的运行时与资源只保存在 `ACECode.app` 中。根目录 `acecode` 是从已签名、公证应用的 `Contents/MacOS/acecode-cli` 复制的小型转发程序（上限 256 KiB），让旧版平铺 CLI 更新器仍可安装；它按自身真实路径执行应用内 daemon，资源从应用内解析。禁止再附带根目录 `share`、`channels` 或 `acecode-computer-use`。检查模型目录和种子时使用应用内路径，并验证转发程序与应用内副本一致。普通 macOS 手动便携包保留既有布局。
+
 完整正式版同步到 aupdate 时，验证六类更新 ZIP 和两个 PKG 的版本、大小、哈希及公网下载。Linux 更新 ZIP 使用 `linux-x64-updater-v1`、`linux-arm64-updater-v1` manifest target。PKG 是独立手动下载项，不写入自动更新 manifest。
 
 本地可运行 `python tests/scripts/verify_release_assets_test.py` 验证缺包、空包、重复包和错误版本的阻断逻辑；macOS CI 另验证签名、公证、安装器布局与打包脚本。
diff --git a/openspec/changes/add-channel-mode-and-effort-commands/.openspec.yaml b/openspec/changes/add-channel-mode-and-effort-commands/.openspec.yaml
new file mode 100644
index 000000000..a36921962
--- /dev/null
+++ b/openspec/changes/add-channel-mode-and-effort-commands/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-10-11
diff --git a/openspec/changes/add-channel-mode-and-effort-commands/design.md b/openspec/changes/add-channel-mode-and-effort-commands/design.md
new file mode 100644
index 000000000..3e54dcc50
--- /dev/null
+++ b/openspec/changes/add-channel-mode-and-effort-commands/design.md
@@ -0,0 +1,23 @@
+## Context
+
+内置通道共用 `channels/core/commands` 和 `Conversations`。权限与 effort 的真实状态由 `SessionRegistry` 管理：`set_permission_mode` 同步模式、清理许可缓存并在 yolo 时解决待审批；`set_reasoning_effort` 校验能力、替换后续请求使用的 provider，持久化失败回滚。
+
+## Goals / Non-Goals
+
+**Goals:** 复用现有会话接口及生命周期，保持各平台一致的命令行为与中文回执。
+
+**Non-Goals:** 不增加全局默认设置，不修改权限引擎、模型能力规则或新会话默认权限；不改前端。
+
+## Decisions
+
+1. 在既有命令解析器新增 Mode、Effort 和 Yolo 类型。模式参数在解析层归一化；只接受目标三档和既有 auto 别名，拒绝多余参数。
+2. `ConversationDeps` 注入权限设置、模型状态读取、effort 设置回调，由 daemon 组合根接入 registry。通道不直接操作 SessionEntry 内部状态，也不创建第二套权限规则。
+3. `/effort default` 映射为空 optional；查询从 `SessionModelState` 读取实际值及启用的 `supported_efforts`。成功回执使用 registry 返回状态，失败时查询并展示现有能力。
+4. 控制命令沿用先授权、去重、恢复绑定的顺序，在普通输入/技能展开前截获。无绑定时沿用提示，不悄悄建会话。
+5. 用解析单测、路由假服务测试和 daemon 生产装配端到端测试分别验证语法、隔离以及真实 registry 行为。
+
+## Risks / Trade-offs
+
+- [用户在待审批时发送 yolo] → 沿用桌面端语义，立即允许挂起请求，帮助中明确跳过工具权限确认。
+- [模型能力变化或持久化失败] → 由 registry 再校验并保留原设置，通道不宣称成功。
+- [已安装 daemon 未更新] → 本次验证源码和测试产物，部署需要重新构建并启动对应版本。
diff --git a/openspec/changes/add-channel-mode-and-effort-commands/proposal.md b/openspec/changes/add-channel-mode-and-effort-commands/proposal.md
new file mode 100644
index 000000000..b78828c8b
--- /dev/null
+++ b/openspec/changes/add-channel-mode-and-effort-commands/proposal.md
@@ -0,0 +1,24 @@
+## Why
+
+消息通道目前只能切模型、逐次批准工具，无法像桌面端一样调整当前会话的权限模式和思考深度。用户需要在 IM 中直接切换默认、自动、完全审批模式，并用 `/yolo` 一步开启完全访问权限。
+
+## What Changes
+
+- 增加 `/mode [default|auto|yolo]`，查询或切换当前绑定会话的权限；`accept-edits` 兼容为 `auto`。
+- 增加 `/yolo`，直接切换为 `yolo`，沿用现有完全访问权限语义。
+- 增加 `/effort [档位|default]`，查询当前值与模型支持的档位，或设置思考深度；`default` 恢复模型预设。
+- 帮助和状态回复展示新命令、当前权限及 effort；命令在忙碌时立即处理，不进入模型上下文。
+
+## Capabilities
+
+### New Capabilities
+
+- `channel-session-controls`: 内置消息通道的会话权限与 effort 指令、回执和错误语义。
+
+### Modified Capabilities
+
+无。内置消息通道原规范仍在 `add-desktop-im-channels` 变更中，主规范尚未收录。
+
+## Impact
+
+修改 `channels/core` 的解析和路由、daemon 的会话服务装配、对应 C++ 测试及 `docs/channels.md`。复用 `SessionRegistry` 的权限和 reasoning 接口，保持默认新会话权限、授权检查、绑定隔离和消息去重。
diff --git a/openspec/changes/add-channel-mode-and-effort-commands/specs/channel-session-controls/spec.md b/openspec/changes/add-channel-mode-and-effort-commands/specs/channel-session-controls/spec.md
new file mode 100644
index 000000000..e1b425798
--- /dev/null
+++ b/openspec/changes/add-channel-mode-and-effort-commands/specs/channel-session-controls/spec.md
@@ -0,0 +1,45 @@
+## Purpose
+
+为内置消息通道提供与当前会话绑定的权限模式和思考深度指令，使用户在 IM 中查询并调整执行策略，同时保留授权、绑定隔离和忙碌会话的既有行为。
+
+## ADDED Requirements
+
+### Requirement: 通道权限模式指令
+
+内置消息通道 SHALL 支持 `/mode` 查询及 `/mode default|auto|yolo` 切换绑定会话权限，兼容 `accept-edits` 为 `auto`。`/yolo` SHALL 直接等价于 `/mode yolo`，使用现有完全访问权限语义，包括允许已挂起的权限请求。所有回复 SHALL 使用中文并展示模式名称。
+
+#### Scenario: 切换三种权限
+- **WHEN** 已授权用户依次发送 `/mode auto`、`/yolo`、`/mode default`
+- **THEN** 仅其绑定会话依次切到自动、完全访问权限和默认权限，持久化模式并回复成功
+
+#### Scenario: 查询与错误输入
+- **WHEN** 用户发送 `/mode` 或 `/mode invalid` 或 `/yolo extra`
+- **THEN** 查询返回当前模式和用法，错误输入返回用法并保持原状态
+
+### Requirement: 通道思考深度指令
+
+通道 SHALL 支持 `/effort` 查询当前思考深度与模型支持的档位、`/effort <档位>` 切换，以及 `/effort default` 恢复模型预设。档位 SHALL 取自当前模型能力；不支持的值、能力不可用或更新失败 SHALL 返回明确错误，保留原状态。
+
+#### Scenario: 忙碌时调整深度
+- **WHEN** 会话正在执行，用户发送模型支持的 `/effort high`
+- **THEN** 更新会话设置并持久化，从下一次模型请求起生效，当前请求不中断
+
+#### Scenario: 恢复模型预设
+- **WHEN** 用户发送 `/effort default`
+- **THEN** 移除会话覆盖，回复更新后的有效档位
+
+#### Scenario: 模型不支持指定档位
+- **WHEN** 用户请求当前模型不支持的 effort
+- **THEN** 回复中文错误和当前可用档位，原设置不变
+
+### Requirement: 命令路由与可发现性
+
+`/help` SHALL 列出新指令，`/status` SHALL 显示当前权限模式和 effort。上述新指令 SHALL 在会话忙碌时直接处理且不进入对话或技能展开。未授权、无绑定、会话已删除及重复消息 SHALL 沿用既有处理，不能修改其他会话或全局配置。
+
+#### Scenario: 控制命令不进入模型
+- **WHEN** 已绑定会话收到新的权限或 effort 命令
+- **THEN** 回复操作结果，模型输入数量保持不变
+
+#### Scenario: 无绑定或未授权
+- **WHEN** 无绑定的联系人或未授权用户发送 `/yolo`
+- **THEN** 提示建立会话或完成授权，不新建会话且不修改任何权限
diff --git a/openspec/changes/add-channel-mode-and-effort-commands/tasks.md b/openspec/changes/add-channel-mode-and-effort-commands/tasks.md
new file mode 100644
index 000000000..c2cfd4c36
--- /dev/null
+++ b/openspec/changes/add-channel-mode-and-effort-commands/tasks.md
@@ -0,0 +1,9 @@
+## 1. 指令与路由
+
+- [x] 1.1 增加 mode、yolo、effort 解析和帮助，解析测试覆盖别名、参数错误和忙碌策略。
+- [x] 1.2 接入会话服务及中文回执、查询和状态展示；路由测试覆盖会话隔离、无绑定、去重、忙碌及失败。
+
+## 2. 集成验收
+
+- [x] 2.1 增加 daemon 生产装配端到端用例，验证真实权限切换、挂起审批及 effort 更新和恢复默认。
+- [x] 2.2 更新通道命令文档，通过 Windows C++ 定向回归、OpenSpec 严格校验和 diff 检查，记录验收边界。
diff --git a/openspec/changes/add-channel-mode-and-effort-commands/verification.md b/openspec/changes/add-channel-mode-and-effort-commands/verification.md
new file mode 100644
index 000000000..205a2d852
--- /dev/null
+++ b/openspec/changes/add-channel-mode-and-effort-commands/verification.md
@@ -0,0 +1,23 @@
+# 验收记录
+
+日期：2026-10-11。范围：当前检出的内置消息通道 `/` 指令及 `/help`，未修改设置页 UI。
+
+## 构建与静态检查
+
+- `cmake --build build --config Release --target acecode_unit_tests --parallel 4`：通过。
+- `openspec validate add-channel-mode-and-effort-commands --strict`：通过。
+- 本次九个代码、测试与文档文件的 `git diff --check`：通过。
+- `python scripts/layers/check_layers.py --strict`：全仓仍有两项与本次无关的工作区问题：`src/apps/desktop/web_host.cpp:73` 的 `web_host_focus.hpp` include 未解析；`src/host/session_host/thread_service.cpp` 为 1259 行，超过登记上限 1211。本次修改没有对应命中。
+
+## 回归范围
+
+使用 Windows Release 测试程序执行 `ChannelCommands.*:ChannelRouter.*:ImChannelsEndToEnd.*:SessionReasoningTest.*`。
+
+最终结果：4 个测试套件共 55 项全部通过，耗时约 86 秒。
+
+- 解析及路由：参数、别名、帮助、忙碌时执行、消息去重、绑定隔离、无绑定、无授权、会话删除、失败保留状态。
+- daemon 生产装配及本机模拟 Telegram：三档权限切换与持久化、`/yolo` 放行正在等待的审批、effort 支持档位查询、更新与恢复预设、非法档位拒绝。
+- 原有跨平台集成回归及 reasoning 忙碌更新、持久化失败回滚测试。
+- 首轮 `/help` 回执等待超时：测试原先只等待权限状态更新就继续发送，未等限速队列中的回执；已改为逐条等待实际回复，保留失败时的回复快照用于诊断。
+
+验证使用生产通道与会话实现、模拟平台服务器；未向真实聊天账号发送消息，未重启或替换用户正在运行的 Desktop/daemon。
diff --git a/openspec/changes/add-keyboard-shortcuts-and-compact-channels/design.md b/openspec/changes/add-keyboard-shortcuts-and-compact-channels/design.md
index 172a3f454..7569750ae 100644
--- a/openspec/changes/add-keyboard-shortcuts-and-compact-channels/design.md
+++ b/openspec/changes/add-keyboard-shortcuts-and-compact-channels/design.md
@@ -4,7 +4,7 @@ App owns navigation and panels; ChatView owns input, cancellation and reasoning
 
 ## Goals / Non-Goals
 
-Keep each action's existing handler and lifetime owner. Share shortcut definitions between dispatch, help and terminal forwarding. No rebinding editor, backend protocol change, packaging or release.
+Keep each action's existing handler and lifetime owner. Share shortcut definitions between dispatch, help and terminal forwarding. No backend protocol change, packaging or release.
 
 ## Decisions
 
@@ -25,3 +25,10 @@ Keep each action's existing handler and lifetime owner. Share shortcut definitio
 ## Migration Plan
 
 Ship with the regular Web build; Desktop requires a later embedded bundle rebuild. No stored-data migration. Reverting this change restores the old UI and listeners.
+
+## 2026-10-11: Editable bindings
+
+- Every displayed binding gains an accessible edit icon to its right. A focused recording dialog captures a chord without dispatching it; Save validates conflicts and reserved keys, Cancel leaves the current binding intact, and Restore default resets only the selected action. History exposes separate previous/next bindings within its existing row.
+- Keep defaults immutable and persist validated overrides through the existing preference storage helpers. One observable store supplies dispatch, help, button hints and terminal forwarding; updates apply immediately and storage events synchronize other windows. A failed persistent write leaves the old binding active and reports an error.
+- Contextual send/newline/history/save/find/dismiss handlers consult the same registry while retaining their current focus and IME guards. Do not synthesize keyboard events or create parallel action implementations. Browser-default suppression and sandboxed presentation forwarding follow the effective binding.
+- Record exact physical key and modifiers. Prevent duplicates (including optional-Shift reasoning defaults), standalone modifiers, printable unmodified global shortcuts, focus traversal and known system/browser editing chords. Preserve visible close/cancel controls so recording Escape is safe.
diff --git a/openspec/changes/add-keyboard-shortcuts-and-compact-channels/proposal.md b/openspec/changes/add-keyboard-shortcuts-and-compact-channels/proposal.md
index 520d11b43..821c0a5e6 100644
--- a/openspec/changes/add-keyboard-shortcuts-and-compact-channels/proposal.md
+++ b/openspec/changes/add-keyboard-shortcuts-and-compact-channels/proposal.md
@@ -5,6 +5,7 @@
 ## What Changes
 
 - 设置新增“快捷键”页签，按功能及按键搜索，搜索栏沿用已归档会话的吸顶布局。
+- 每项按键右侧提供编辑图标；支持录入、冲突校验、持久保存和单项恢复默认，实际处理入口与提示同步更新（2026-10-11 补充）。
 - 实现已确认的七项默认快捷键，以及 Ctrl+- 前进、Ctrl+Shift+- 后退、Ctrl+Alt+> / < 增减当前会话思维深度。
 - 保留现有快捷键，明确输入法、弹窗、编辑器及终端的事件优先级。
 - 消息通道卡片保持稳定高度，管理位于连接按钮左侧；启用后可取消连接。状态和请求详情集中到管理对话框。
diff --git a/openspec/changes/add-keyboard-shortcuts-and-compact-channels/specs/keyboard-shortcuts/spec.md b/openspec/changes/add-keyboard-shortcuts-and-compact-channels/specs/keyboard-shortcuts/spec.md
index d1bf59662..02f221434 100644
--- a/openspec/changes/add-keyboard-shortcuts-and-compact-channels/specs/keyboard-shortcuts/spec.md
+++ b/openspec/changes/add-keyboard-shortcuts-and-compact-channels/specs/keyboard-shortcuts/spec.md
@@ -4,6 +4,21 @@ Make frequent ACECode Web and Desktop actions discoverable and executable throug
 
 ## ADDED Requirements
 
+### Requirement: Editable persistent bindings
+Each listed shortcut SHALL expose an edit icon after its key display. Recording SHALL capture the new combination without performing any application action. Saving SHALL replace the old binding immediately, update visible hints, and persist across reopening. Cancel SHALL leave the binding unchanged. Restore default SHALL affect only the selected binding. Previous/next history keys SHALL be independently editable.
+
+#### Scenario: Rebind a common action
+- **WHEN** the user edits New session from Ctrl+Alt+N to Ctrl+Alt+J and saves
+- **THEN** only the new chord creates a session, its label updates, and the binding survives reload
+
+#### Scenario: Conflict or persistence failure
+- **WHEN** the chosen chord conflicts with another action, is reserved, or cannot be saved
+- **THEN** an actionable inline message is shown and the old binding remains active
+
+#### Scenario: Contextual shortcut
+- **WHEN** the user edits a sending, newline, history, saving, finding or dismissal binding
+- **THEN** the new chord works in the owning context with existing IME and focus protections
+
 ### Requirement: Searchable shortcut settings
 Settings SHALL expose a 快捷键 section containing both existing and new shortcuts, searchable by action, description and key combination. The search bar SHALL remain visible at the top of the settings content scroll area.
 
@@ -12,7 +27,7 @@ Settings SHALL expose a 快捷键 section containing both existing and new short
 - **THEN** the opaque search bar stays at the top and the list filters to matching shortcuts
 
 ### Requirement: Common application actions
-The application SHALL support Ctrl+Alt+N for a new current-workspace session, Ctrl+Alt+I to focus its input without changing draft text, Ctrl+Alt+B/E for left/right panels, Ctrl+, for settings, Ctrl+/ for shortcut settings, and Ctrl+Shift+. for stopping current work. Existing search, console, find and contextual editing shortcuts SHALL retain their behavior. macOS SHALL display and accept corresponding Cmd/Option bindings except the existing Ctrl+backquote console binding.
+With default bindings, the application SHALL support Ctrl+Alt+N for a new current-workspace session, Ctrl+Alt+I to focus its input without changing draft text, Ctrl+Alt+B/E for left/right panels, Ctrl+, for settings, Ctrl+/ for shortcut settings, and Ctrl+Shift+. for stopping current work. Existing search, console, find and contextual editing shortcuts SHALL retain their behavior until explicitly rebound. macOS SHALL display and accept corresponding Cmd/Option defaults except the existing Ctrl+backquote console binding.
 
 #### Scenario: Navigation history
 - **WHEN** the user presses Ctrl+- or Ctrl+Shift+-
@@ -27,7 +42,7 @@ The application SHALL support Ctrl+Alt+N for a new current-workspace session, Ct
 - **THEN** the corresponding existing action runs once in the active workspace/session and preserves drafts and cancellation behavior
 
 ### Requirement: Incremental reasoning depth
-Ctrl+Alt+> SHALL increase and Ctrl+Alt+< SHALL decrease the active conversation's supported reasoning depth. The physical Period/Comma keys with or without Shift SHALL be accepted. The effective default SHALL be respected, unsupported levels skipped, bounds clamped and in-flight changes guarded.
+With default bindings, Ctrl+Alt+> SHALL increase and Ctrl+Alt+< SHALL decrease the active conversation's supported reasoning depth. The physical Period/Comma keys with or without Shift SHALL be accepted by default. The effective default depth SHALL be respected, unsupported levels skipped, bounds clamped and in-flight changes guarded.
 
 #### Scenario: Running conversation
 - **WHEN** a running conversation changes depth using the keyboard
diff --git a/openspec/changes/add-keyboard-shortcuts-and-compact-channels/tasks.md b/openspec/changes/add-keyboard-shortcuts-and-compact-channels/tasks.md
index d8f27795b..a31e50f95 100644
--- a/openspec/changes/add-keyboard-shortcuts-and-compact-channels/tasks.md
+++ b/openspec/changes/add-keyboard-shortcuts-and-compact-channels/tasks.md
@@ -14,7 +14,25 @@
 - [x] 3.1 Run focused and full Web tests, i18n generation, build, strict OpenSpec validation and diff checks; record results.
 - [x] 3.2 Run browser checks across desktop/narrow, light/dark and keyboard/overlay/IME contexts; record evidence and separate Web proof from installed Desktop verification.
 
-## Validation evidence (2026-10-07)
+## 4. Editable bindings (2026-10-11)
+
+- [x] 4.1 Implement observable persistent overrides, capture/validation/conflict/reset logic; verify default compatibility, modifier collisions and storage failure tests.
+- [x] 4.2 Connect effective bindings to global/contextual handlers, labels, terminal and presentation forwarding; verify old bindings stop working and new bindings act once.
+- [x] 4.3 Add edit icons and recording UI with save/cancel/default controls and localized errors; verify keyboard focus, recording isolation and reload persistence in browser.
+- [x] 4.4 Run focused/full Web tests, production build, i18n, strict OpenSpec and scoped diff checks; record browser evidence and native verification limits.
+
+## Editable-binding validation evidence (2026-10-11)
+
+- All 20 catalog rows expose editable bindings; the history row has independent previous/next editors (21 edit buttons).
+- `pnpm i18n:catalog`, final `pnpm test` (3101 pass records, exit 0), `pnpm build`, strict OpenSpec validation and `git diff --check` passed. The production compatibility scan checked 4524 regex literals with no lookbehind.
+- `node scripts/test-shortcut-editing.mjs` passed recording isolation, cancel, conflicts, reserved keys, immediate replacement, reload persistence, reactive hints, xterm forwarding, cross-window storage updates, failed-write preservation, send/newline/history/find, dismissal and individual reset checks.
+- `node scripts/test-preview-presentation.mjs` passed existing preview regressions plus actual Markdown save rebinding and live sandboxed PPT shortcut updates without reloading slides. Its fixture now derives dirty state from draft/baseline text so saving is actually exercised.
+- Browser screenshots/results: `C:/Users/shao/AppData/Local/Temp/ace-shortcut-editing-Kjdf4t/`; preview regression screenshots: `C:/Users/shao/AppData/Local/Temp/ace-preview-presentation-q65JeG/`.
+- Full-suite/build logs: `%TEMP%/ace-shortcut-edit-web-tests-final.log` and `%TEMP%/ace-shortcut-edit-build-final.log`. Impeccable detector returned no findings; desktop light and narrow dark editor screenshots were inspected.
+- Existing source-based tests were updated to follow the shared matcher; behavior tests retain the default desktop Ctrl+Enter newline contract, IME/keyCode 229 protections and legacy alternate-layout/numpad matching. A remapped desktop newline no longer falls through into sending a message.
+- Browser tests use isolated storage and mocked APIs. No real sessions, channels or credentials were changed. Unrelated dirty work remains preserved; no commit, release or installed Desktop package rebuild was performed.
+
+## Prior validation evidence (2026-10-07)
 
 - Focused Node tests: appShortcuts, channelsSettings, settingsNavigation and browserDefaults passed.
 - `pnpm i18n:catalog`, final `pnpm test`, final `pnpm build`, strict OpenSpec validation and `git diff --check` passed. Build compatibility scan checked 4518 regex literals with no lookbehind.
diff --git a/openspec/changes/animate-session-title-updates/.openspec.yaml b/openspec/changes/animate-session-title-updates/.openspec.yaml
new file mode 100644
index 000000000..a36921962
--- /dev/null
+++ b/openspec/changes/animate-session-title-updates/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-10-11
diff --git a/openspec/changes/animate-session-title-updates/design.md b/openspec/changes/animate-session-title-updates/design.md
new file mode 100644
index 000000000..8542bfc69
--- /dev/null
+++ b/openspec/changes/animate-session-title-updates/design.md
@@ -0,0 +1,31 @@
+## 背景
+
+两处标题均由服务端 title / summary 派生，分别在 transcript 与 Sidebar 中消费 session_updated。侧栏已有测量溢出与悬停滚动，顶部既支持内联也支持 portal。
+
+## 目标与边界
+
+让标题更新可见，并保持两处播放进度一致。动画仅属于展示层；持久化标题、可访问名称、编辑初值始终是完整文本。
+
+## 决策
+
+1. 按会话作用域和 ID 共享短生命周期的动画状态，React hook 只在同一已加载会话的标题发生变化时启动。初次挂载与历史加载直接显示完整标题，订阅释放后清理计时与状态。
+2. 按字素逐步呈现，约每字 28ms，总时长限制为 180–650ms。开始显示第一个字并跟随黑色方块光标，最后一个字完成时立即移除光标，不附加闪烁循环。深色背景提供细浅色边缘，使黑色方块仍然可辨。旧 WebView 缺少字素分割能力时直接显示完整文字，避免截断复合字符。
+3. 共享文字组件使用不可见完整文本稳定测量宽度，视觉层展示当前进度，避免标题栏工作区标签随打字移动。完整文字供辅助技术读取，视觉层与光标隐藏于可访问树。
+4. 打字期间暂停侧栏跑马灯，完成后恢复原有溢出行为。减少动态效果时将逐字反馈缩短至最多 320ms，保留不闪烁的短暂光标；页面处于后台时直接完成。已有编辑流程与鼠标键盘事件保持原样。
+
+### 2026-10-12 实机修正
+
+运行中的 Desktop 服务已经返回含打字组件的前端，而 Windows `SPI_GETCLIENTAREAANIMATION` 返回 false。上一版将减少动态效果直接映射为完全跳过打字，违背了用户需要感知改名的目标。修正为更短的非位移动效，不改 Windows 设置；验证必须包含 reduced-motion 模式下的可见中间帧，而不只是普通模式。
+
+### 2026-10-12 标题同步修正
+
+真实 transcript hook 复现：正文事件 seq=20 先到时，后到的首次标题通知 seq=19 被全局 lastSeq 丢弃，侧栏没有这道过滤。对 title 与 summary 分别记录最后接受的事件序号；正文水位继续维持原去重规则，旧标题不能覆盖新标题，旧蜂群模式不随放行的标题更新回退。
+
+同时为历史请求捕获发出时的状态，按字段修订号保护请求期间到达的标题与摘要（包括用户清空）。初始历史、补拉响应及游标失效重载均采用该规则；请求发出前的元数据仍可被更新快照替换，不把标题永久锁死。
+
+## 风险与处理
+
+- 不同数据源到达时间不同：共享同一会话的目标文本与进度，重复更新不会重置计时。
+- 历史加载被误判为改名：顶部在 transcript 加载完成之前仅建立基线；切换身份重置观察。
+- 快速重命名与组件卸载：新目标覆盖旧动画；最后一个订阅移除时取消调度。
+- 源码验证与安装版不同步：执行 Web 测试、构建及浏览器验证，单独说明未重建的 Desktop。
diff --git a/openspec/changes/animate-session-title-updates/proposal.md b/openspec/changes/animate-session-title-updates/proposal.md
new file mode 100644
index 000000000..d9f02c95a
--- /dev/null
+++ b/openspec/changes/animate-session-title-updates/proposal.md
@@ -0,0 +1,23 @@
+## 为什么
+
+会话首句触发自动命名时，顶部和侧边栏直接替换文字，用户容易错过标题变化。增加快速打字与短暂光标，让这次更新清楚可见。
+
+## 变更内容
+
+- 同一会话的显示标题更新时，顶部和侧边栏同步逐字呈现新标题，结束立即移除光标。
+- 初次显示、切换会话、重复刷新相同标题不重播；连续改名直接呈现最新一轮。
+- 保留侧边栏长标题悬停滚动、标题编辑与既有布局；遵循减少动态效果偏好。
+
+## 能力
+
+### 新增能力
+
+- `session-title-transition`：会话显示标题变更时的同步打字反馈。
+
+### 修改能力
+
+无。
+
+## 影响
+
+影响 Web 与 Desktop 共用的标题栏、侧边栏及展示辅助模块。标题生成、存储与通信协议保持原有语义，不引入依赖。
diff --git a/openspec/changes/animate-session-title-updates/specs/session-title-transition/spec.md b/openspec/changes/animate-session-title-updates/specs/session-title-transition/spec.md
new file mode 100644
index 000000000..05cc9f53e
--- /dev/null
+++ b/openspec/changes/animate-session-title-updates/specs/session-title-transition/spec.md
@@ -0,0 +1,41 @@
+## Purpose
+
+提供会话标题更新时的明确视觉反馈，使用户能够在顶部标题栏与侧边栏同时察觉自动命名和后续改名，并保证加载、导航、编辑与无障碍阅读时标题内容稳定完整。
+
+## ADDED Requirements
+
+### Requirement: 标题更新同步快速打字
+
+系统 SHALL 在已显示会话的标题变更时，在顶部与侧边栏按相同进度快速逐字呈现新标题，并在当前文字末尾显示明显的黑色方块光标。完成后 MUST 立即移除光标。
+
+#### Scenario: 标题通知与正文或历史响应交错
+- **WHEN** 自动命名通知在序号更高的正文事件之后到达，或新标题已到达而旧历史请求尚未结束
+- **THEN** 顶部仍显示最新命名结果，无需切换会话；旧的改名通知不能覆盖更新的改名结果
+
+#### Scenario: 首句自动命名
+- **WHEN** 首句发送后的自动标题替换当前显示标题
+- **THEN** 顶部与侧栏同步呈现新标题，整个打字过程不超过 650ms，完成后无光标残留
+
+#### Scenario: 连续更新
+- **WHEN** 打字尚未结束时收到不同的新标题
+- **THEN** 立即转为最新标题的打字过程，旧标题不排队播放
+
+### Requirement: 加载和导航不重复播放
+
+系统 SHALL 在初次加载或切换会话时直接展示完整标题；相同标题的重复通知 MUST NOT 重启动画。
+
+#### Scenario: 加载历史及重复刷新
+- **WHEN** 打开历史会话、切换会话或列表刷新仍返回相同标题
+- **THEN** 完整标题正常显示，不因挂载或刷新触发打字
+
+### Requirement: 保持布局和访问能力
+
+系统 SHALL 保持标题行尺寸、完整可访问名称、重命名输入和长标题溢出行为；打字期间暂停侧栏悬停滚动，完成后恢复。减少动态效果偏好下 SHALL 保留不超过 320ms 的逐字反馈，不引入闪烁或布局移动。
+
+#### Scenario: 长标题与重命名
+- **WHEN** 长标题正在打字或用户进入标题编辑
+- **THEN** 相邻标签及按钮不因逐字显示移动，编辑初值始终为完整标题，打字结束后长标题仍可悬停滚动
+
+#### Scenario: 减少动态效果
+- **WHEN** 系统启用了减少动态效果
+- **THEN** 顶部和侧栏仍呈现可见的同步打字中间帧，320ms 内完成并移除光标
diff --git a/openspec/changes/animate-session-title-updates/tasks.md b/openspec/changes/animate-session-title-updates/tasks.md
new file mode 100644
index 000000000..f235259df
--- /dev/null
+++ b/openspec/changes/animate-session-title-updates/tasks.md
@@ -0,0 +1,45 @@
+## 1. 展示实现
+
+- [x] 1.1 实现共享打字进度、字素分割、打断与订阅清理，以定向测试验证重复更新、连续改名和计时释放。
+- [x] 1.2 将顶部与侧栏接入同一展示组件，保留编辑、布局、悬停滚动及减少动态效果路径，以浏览器检查验证。
+
+## 2. 验证
+
+- [x] 2.1 完成浏览器回归：初次加载、同步打字、完成光标消失、切换会话、连续更新、长标题、内联与 portal、窄屏及减少动态效果。
+- [x] 2.2 执行 pnpm test、pnpm build、OpenSpec 严格验证及差异审查，记录结果与安装版验收边界。
+
+## 3. 实机减少动态效果修复
+
+- [x] 3.1 调整减少动态效果分支，保留最多 320ms 的打字反馈；以普通与 reduced-motion 中间帧和完成断言验证。
+- [x] 3.2 重跑 Web 测试与构建，核验运行中 Desktop 服务返回修复后的资源，并记录浏览器与实机证据边界。
+
+## 4. 顶部标题同步与方块光标
+
+- [x] 4.1 复现并修复标题元数据被正文事件水位误丢弃或旧历史响应覆盖的问题；用真实 transcript hook 验证无需切换会话即可更新，旧改名仍不能覆盖新改名。
+- [x] 4.2 光标改为明显的黑色方块，完成立即移除；浏览器验证两处光标的颜色、尺寸和生命周期，保留已有减少动态效果反馈。
+- [x] 4.3 重跑 Web 测试、构建、浏览器回归与 OpenSpec 严格验证，记录运行资源是否已更新。
+
+## 2026-10-12 顶部同步与光标验证
+
+- 修改前真实 transcript hook 回归失败：正文 seq=20 后收到标题 seq=19，顶部仍为原标题；修复后通过，旧标题 seq=18 不能回退。
+- 已覆盖旧补拉响应晚于新标题、清空标题、独立摘要序号、正文去重与旧蜂群模式隔离；`pnpm test` 全量通过。
+- 浏览器 14 组场景通过，新增真实 hook + 独立侧栏事件接收的竞态检查，以及光标黑色与方形尺寸检查。浅色、深色及减少动态效果下均正常，完成后无光标残留。证据：本机临时目录 `ace-title-animation-0TGqwi`。
+- `pnpm build`、正则兼容性、差异检查与 OpenSpec 严格验证通过。保留本轮之前的减少动态效果及轨迹改动。
+- 最后核验时 Desktop 与 daemon 进程均已退出，旧运行端口不可连接，因此未宣称当前客户端页面已加载本轮代码。已生成最新 `web/dist`，客户端重新打开或刷新后加载；未重启用户进程、未改动用户真实会话标题。
+
+## 2026-10-12 修复验证
+
+- Windows `SPI_GETCLIENTAREAANIMATION=false`；独立原生 WebView2 验证窗口实际返回 `prefers-reduced-motion=true`，未覆盖系统偏好。两处捕获到相同且可见的逐字中间帧，结束无光标残留。
+- 浏览器 12 组场景通过，增加 reduced-motion 模式 100ms 中间帧及 320ms 完成检查；截图在本机临时目录 `ace-title-animation-GXrP0H`。
+- `pnpm test`、`pnpm build`（含正则兼容检查）、OpenSpec 严格验证与差异检查通过。
+- 当前 Desktop daemon 使用工作区 `web/dist`；HTTP 返回内容与新构建的 SHA-256 一致，包含 320ms 缩短分支，响应为 `Cache-Control: no-cache`。用户当前已打开的页面需要 F5 刷新才能加载新脚本。
+- 本轮未修改 Windows 设置、未重启用户当前 Desktop、未写入用户会话标题。原生证据来自独立验证窗口，运行实例证据来自其实际 HTTP 静态资源。
+
+## 首次验证记录
+
+- `pnpm test`：通过，包含共享进度、重复更新、打断、字素、时长上限、减少动态效果及清理的新增测试。
+- `pnpm build`：通过，正则兼容性检查通过。
+- `node scripts/test-session-title-animation.mjs`：Edge / Chromium 真实组件验证 12 组场景通过，包括内联与 portal、390px 窄屏、实时减少动态效果和完整重命名初值。截图位于本机临时目录 `ace-title-animation-UL9l0e`。
+- `openspec validate animate-session-title-updates --strict` 与 `git diff --check`：通过。
+- Impeccable 检测只报告全局样式中的 12 个既有问题，新增标题样式未命中。
+- 已核对并保留工作区既有改动；未提交或推送。Desktop 未重建，以上结果为源码、Web 构建和浏览器证据，不代表已安装客户端已更新。
diff --git a/openspec/changes/configure-skill-scan-paths/.openspec.yaml b/openspec/changes/configure-skill-scan-paths/.openspec.yaml
new file mode 100644
index 000000000..53f62d706
--- /dev/null
+++ b/openspec/changes/configure-skill-scan-paths/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-10-10
diff --git a/openspec/changes/configure-skill-scan-paths/design.md b/openspec/changes/configure-skill-scan-paths/design.md
new file mode 100644
index 000000000..3236de760
--- /dev/null
+++ b/openspec/changes/configure-skill-scan-paths/design.md
@@ -0,0 +1,29 @@
+## Context
+
+`skill_init.cpp` is shared by TUI, daemon, tools and session initialization. It splits project/global roots. Settings has a dedicated Configuration section and search locating behavior. Skill policy refresh already publishes snapshots via session control callbacks.
+
+## Goals / Non-Goals
+
+Goals: one editable ordered list, consistent runtime/UI resolution, backward-compatible absence, persistence-before-refresh.
+Non-goals: changing seed installation locations, importing skill content, packaging or release.
+
+## Decisions
+
+- Use `optional<vector<string>> scan_paths` instead of repurposing `external_dirs`: preserves absent vs empty and lets old configuration retain exact discovery order.
+- Custom list entries resolve in order. Relative entries expand along workspace ancestors; absolute/`~` paths are global. `${ACECODE_DATA_DIR}` denotes the active data directory; `${XDG_CONFIG_HOME}` and `${XDG_CACHE_HOME}` fall back to `~/.config` and `~/.cache`. Other `${ENV}` require a nonempty value. This keeps one human-editable list instead of exposing separate arrays and switches.
+- Default editor values include project-relative roots and global templates, honoring legacy `reuse_opencode` and `external_dirs`. Unchanged drafts are not saved. Explicit custom save uses literal list priority, including interleaved global/project paths. Restore sends null.
+- Keep existing project/global helper projections for grouping, add the shared ordered resolver for initialization and UI duplicate selection. Expert roots remain prepended.
+- GET/PUT `/api/config/skill-paths` exposes effective editable `paths`, `default_paths`, and `customized`. PUT requires `paths` (string array or null), validates before atomically mutating only `skills.scan_paths`, then refreshes daemon/session policies under the existing config lock.
+- Configuration uses a multiline editor with save/reset and help. Skills links internally to Configuration, focuses the named textarea after mount/loading, and reuses existing focus styling. Register all new visible copy in i18n and add a search entry.
+- Follow-up deletion fix: the settings catalog is based solely on discoverable skills. Remove the Web API's synthetic rows derived only from `skills.disabled`. Keep disable preferences without pruning during GET: a missing skill may exist in another workspace, on a temporarily unavailable directory, or be restored later. Existing disabled skills retain their full metadata; a restored same-name skill remains disabled.
+- Follow-up pagination: preserve the global/workspace grouping and complete API arrays, but slice each filtered list before creating card elements. One section-level page-size preference uses the existing `usePreference` helper with 20/50/100 and a default of 50. Each list owns its page; query/page-size changes reset to 1, refreshed shorter lists clamp the page, toggles preserve it. Top and bottom controls make long pages navigable; page changes scroll/focus the list's top controls. Counts still use the full lists. This addresses render volume without changing disk scan or API pagination contracts.
+
+## Risks / Trade-offs
+
+- Reordering a custom list can override a project skill with a global one -> explain first-match priority and test UI/runtime agreement.
+- Missing directories/environment variables -> skip without creating arbitrary paths; preserve entries so removable/offline paths can later work.
+- Native default install/open paths may be excluded by a custom list -> keep seed location unchanged; directory opening should follow configured roots where customized.
+
+## Migration Plan
+
+No eager user-config rewrite. Missing/null uses old paths; reset removes the override. Existing `external_dirs` and `reuse_opencode` remain stored and resume on reset.
diff --git a/openspec/changes/configure-skill-scan-paths/proposal.md b/openspec/changes/configure-skill-scan-paths/proposal.md
new file mode 100644
index 000000000..1ff01241b
--- /dev/null
+++ b/openspec/changes/configure-skill-scan-paths/proposal.md
@@ -0,0 +1,23 @@
+## Why
+
+Skill 扫描目录目前大多内置，用户无法在设置中统一增删或调整优先级；技能页也缺少跳转入口。
+
+## What Changes
+
+- 增加 `skills.scan_paths` 有序路径列表，未配置时保持旧扫描规则，显式空列表关闭普通目录扫描。
+- 配置页增加多行路径编辑、保存及恢复默认；技能说明旁增加可定位到该配置的链接。
+- 保存后更新全局与已有会话 registry，保持专家包目录优先及现有启停策略。
+- 技能列表只展示实际扫描到的技能，删除文件或移出扫描范围后不再因禁用记录补回幽灵条目；保留禁用偏好。
+- 技能设置增加分页，全局与各工作区分别分页，共用每页 20/50/100 条选择，默认 50，仅渲染当前页卡片。
+
+## Capabilities
+
+### New Capabilities
+
+### Modified Capabilities
+
+- `agent-skill-directory-compat`: 允许覆盖默认扫描路径，并通过设置配置及跳转。
+
+## Impact
+
+涉及配置序列化、共享技能目录解析、Web 设置 API、会话 registry 刷新、设置页及搜索索引；同步 API 文档和回归测试。默认安装位置不变，无发布副作用。
diff --git a/openspec/changes/configure-skill-scan-paths/specs/agent-skill-directory-compat/spec.md b/openspec/changes/configure-skill-scan-paths/specs/agent-skill-directory-compat/spec.md
new file mode 100644
index 000000000..a625628c2
--- /dev/null
+++ b/openspec/changes/configure-skill-scan-paths/specs/agent-skill-directory-compat/spec.md
@@ -0,0 +1,77 @@
+## ADDED Requirements
+
+### Requirement: Configure the complete ordered skill scan path list
+The system SHALL accept `skills.scan_paths` as an optional ordered string array replacing ordinary default and legacy external scan roots. Missing or null SHALL preserve legacy discovery and priority; an empty array SHALL scan no ordinary roots. Relative paths SHALL resolve along the current workspace ancestor chain excluding HOME; absolute and home-relative paths SHALL be global. Unresolved environment variables SHALL be skipped. Expert package roots SHALL retain first priority.
+
+#### Scenario: Custom paths replace defaults and respect order
+- **WHEN** a user saves a list of global and project-relative paths
+- **THEN** only those ordinary paths are scanned in list order, with nearer ancestors first for each relative path
+- **AND** UI listing, commands and session skill discovery agree on duplicate resolution
+
+#### Scenario: Empty list and restore defaults
+- **WHEN** the user saves an empty array
+- **THEN** ordinary skill discovery is disabled without deleting any files
+- **WHEN** the user restores defaults
+- **THEN** existing compatibility flags and external directories determine discovery again
+
+### Requirement: Edit scan paths in Settings and navigate from Skills
+Settings Configuration SHALL provide a labeled multiline Skill scan paths editor, explicit save, restore defaults, and loading/error/saved feedback. Skills SHALL show a keyboard-accessible link beside its description that opens Configuration and locates the editor. Settings search SHALL find the field in Chinese and English.
+
+#### Scenario: Navigate and save
+- **WHEN** a user activates the scan-path link in Skills
+- **THEN** Configuration opens with the scan-path field visible and focused
+- **WHEN** the user saves valid paths
+- **THEN** the configuration is persisted and existing session skill policies refresh at their control boundary
+
+#### Scenario: Invalid or failed save
+- **WHEN** the request contains a non-array or non-string path, or persistence fails
+- **THEN** the server rejects the request without changing active paths
+- **AND** the editor retains the user's draft and displays an error
+
+### Requirement: Settings skill catalog reflects discovered files
+The settings skill catalog SHALL include only skills discovered under the effective scan paths. Disable preferences SHALL affect the enabled state of discovered skills without generating synthetic catalog entries or being removed by a list refresh.
+
+#### Scenario: A disabled skill is deleted and later restored
+- **GIVEN** a discovered skill is disabled
+- **WHEN** its SKILL.md is removed and the catalog is refreshed
+- **THEN** the skill disappears from the catalog
+- **AND** other discovered skills remain listed
+- **WHEN** the same skill is restored and the catalog is refreshed
+- **THEN** it appears again with its disabled preference preserved
+
+#### Scenario: A disabled skill leaves the scan scope
+- **WHEN** its directory is removed from the configured scan paths or is outside the selected workspace
+- **THEN** the skill does not appear as a synthetic global entry
+- **AND** the disable preference is preserved for other workspaces or later discovery
+
+### Requirement: Paginate skills in Settings
+The Skills settings page SHALL offer page sizes of 20, 50 and 100, default to 50 when no valid preference exists, and remember the selected size. The global list and each expanded workspace list SHALL paginate independently using that shared size and SHALL render only their current page's skill cards.
+
+#### Scenario: Large catalog and page navigation
+- **WHEN** a catalog contains more than 50 skills and the user has no saved page-size preference
+- **THEN** each visible list renders at most 50 cards with total count and page navigation
+- **WHEN** the user changes a list's page
+- **THEN** that list shows the corresponding cards without changing other lists' pages
+- **AND** the page's controls remain reachable by keyboard
+
+#### Scenario: Search and page-size changes
+- **WHEN** the user searches skills
+- **THEN** the filter covers the complete catalogs before pagination and each list starts on page 1
+- **WHEN** the user selects 20 or 100 entries per page
+- **THEN** each list returns to page 1 using the selected size
+
+#### Scenario: Toggle and refreshed catalog
+- **WHEN** a user toggles a skill on a later page
+- **THEN** its enabled state updates without resetting the page and enabled counts still describe the complete catalog
+- **WHEN** a refresh makes the current page out of range
+- **THEN** the list shows its last valid page, or the existing empty state if no entries remain
+
+## MODIFIED Requirements
+
+### Requirement: Discover skills from .agent skill directories
+Unless an explicit scan-path list overrides default discovery, the system SHALL discover and register skills from the default `.agent` skill directory in addition to the default `.acecode` skill directory, using the same `SKILL.md`-based directory structure and metadata parsing rules.
+
+#### Scenario: Skills are found in the .agent directory
+- **WHEN** the user has a valid skill with `SKILL.md` under the supported default `.agent` skill root and has not configured an explicit scan-path list
+- **THEN** the system discovers that skill during skill registry scan
+- **THEN** the skill is available to list and load through the existing skill interfaces
diff --git a/openspec/changes/configure-skill-scan-paths/tasks.md b/openspec/changes/configure-skill-scan-paths/tasks.md
new file mode 100644
index 000000000..a280869df
--- /dev/null
+++ b/openspec/changes/configure-skill-scan-paths/tasks.md
@@ -0,0 +1,26 @@
+## 1. Configuration and discovery
+
+- [x] 1.1 Add optional ordered scan paths and shared resolution; verify config round-trip, empty/reset, environment, workspace isolation and precedence with C++ tests.
+- [x] 1.2 Add authenticated configuration API, atomic save and live policy refresh; verify HTTP validation/persistence and listing/runtime agreement, and document the API.
+
+  Verified: Windows MSVC Release `acecode_unit_tests` rebuilt successfully (`--parallel 1`). Focused filter `SkillInitOpencodeTest.*:SkillsHandlerTest.*:ConfigFirstInitTest.*:WebServerHttp.Skill*:CommandsHandlerTest.*:SkillViewToolTest.*:SkillsToolTest.*` passed 80/80 tests. HTTP coverage includes updating an already-created session, daemon body lookup, list refresh, persistence, empty list and reset. Handler tests cover invalid input and write failure preserving configuration.
+
+## 2. Settings
+
+- [x] 2.1 Add the path editor, defaults action, Skills link, search and translations; verify Web unit tests and keyboard navigation/save in browser.
+
+  Verified: `pnpm test`, `pnpm build`, and `node scripts/test-skill-scan-paths.mjs` with installed Edge. Browser covers keyboard link/focus, default values, failed-save draft retention, retry, navigation persistence, empty/reset, light/dark/narrow layouts and English. Impeccable detector returned no findings. This is browser fixture verification, not installed Desktop verification.
+
+- [x] 2.2 Remove synthetic disabled entries from the settings catalog; verify delete/refresh/restore and changed scan scope through native handler and HTTP regression tests, update API documentation, and rerun strict validation.
+
+  Follow-up verified on 2026-10-10: rebuilt Windows MSVC Release tests with `--parallel 1`; the same focused native filter now passes 82/82. New handler and HTTP scenarios cover actual SKILL.md deletion in project/global roots, remaining installed entries, restore with disable preferences intact, and switching to empty scan paths. `node src/lib/skillsSettings.test.js`, strict OpenSpec validation and `git diff --check` pass. This backend-only fix did not require new Web assets; installed Desktop/daemon was not restarted or repackaged.
+
+## 3. Integration
+
+- [x] 3.1 Run focused native tests, pnpm test/build, strict OpenSpec validation and git diff --check; record results and remaining limits.
+
+  Verified on 2026-10-10: all checks above plus `openspec validate configure-skill-scan-paths --strict` and `git diff --check`. Full native suite and installed Desktop packaging/restart were not run; no commit, push or release performed.
+
+- [x] 3.2 Add 20/50/100 (default 50) per-list pagination, shared persisted size, full-catalog search and page clamping; verify pure pagination tests and browser checks for card counts, workspace independence, keyboard navigation, refresh and toggles; run pnpm test/build, translations and strict validation.
+
+  Pagination verified on 2026-10-10: `pnpm test`, `pnpm build`, `node scripts/test-skill-pagination.mjs`, strict OpenSpec and diff checks pass. Installed Edge fixture with 2,300 global skills and 123 workspace skills confirms at most the selected page size is rendered per list, independent pages, search across all entries, toggle count/page preservation, refresh clamping, no repeated scan requests on page/search changes, persisted 20/50/100 selection, invalid preference fallback, keyboard focus, light/dark/narrow layouts and English. Impeccable detector reports no findings. Native API contracts are unchanged; installed Desktop was not repackaged.
diff --git a/openspec/changes/fix-thread-workspace-creation/.openspec.yaml b/openspec/changes/fix-thread-workspace-creation/.openspec.yaml
new file mode 100644
index 000000000..a36921962
--- /dev/null
+++ b/openspec/changes/fix-thread-workspace-creation/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-10-11
diff --git a/openspec/changes/fix-thread-workspace-creation/design.md b/openspec/changes/fix-thread-workspace-creation/design.md
new file mode 100644
index 000000000..6875ed4e8
--- /dev/null
+++ b/openspec/changes/fix-thread-workspace-creation/design.md
@@ -0,0 +1,28 @@
+## Context
+
+见 proposal.md。当前 ThreadScope 只保留 cwd；ThreadService::create 只设置 cwd/model，SessionOptions 的 no_workspace 默认 false。界面按 no_workspace 与可见 WorkspaceRegistry 分别列举会话。续聊的 resolve_thread 只查调用方项目，无法覆盖目标切换后的创建结果。
+
+## Goals / Non-Goals
+
+**Goals:** 在工具适配层保留结构化归属，在服务层统一解析目标，复用现有注册、缓存目录分配和全局会话定位机制。
+
+**Non-Goals:** 不迁移历史数据、不修改提问工具行为、不扩展删除/归档等其他写工具作用域，不变更 UI 布局或发布运行版本。
+
+## Decisions
+
+1. 引入 ThreadCreateTarget 值对象；ThreadScope 补充 no_workspace。工具通过调用方 SessionManager 的元数据提取归属，不根据路径名猜测。创建支持 workspaceHash/cwd/noWorkspace，互斥冲突在执行前报错。
+2. 默认继承 no_workspace；无工作区交给 SessionRegistry 分配独立缓存目录，避免多个独立会话共用文件写入位置。普通目录复用 WorkspaceRegistry::register_new，随后读取持久化 marker 确认可见性，避免只报告内存注册成功。显式 hash 保留注册表中的 cwd 身份；显式目录使用 canonical 路径。
+3. 返回实际 entry 的 cwd、存储 hash、noWorkspace；失败清理由新 entry 的存储位置决定，不能继续使用调用方 scope.cwd。
+4. 续聊复用 resolve_discovered_thread，支持 workspaceHash；恢复使用目标元数据，并验证 runtime 中同 ID 的存储项目一致，阻止跨项目误投递。其他写工具保持既有作用域。
+5. 用临时 HOME 的真实 SessionRegistry 与记录输入的 LocalSessionClient 测试替身验证持久化和路由，不发真实模型请求；追加 Web 列表验证（若已有测试入口适用），复用 Windows 增量构建。
+
+## Risks / Trade-offs
+
+- 显式创建到隐藏工作区会使该工作区重新可见 → 保留名称、图标和附加目录，符合用户创建后能找到的预期。
+- 新增可选参数不能破坏旧调用 → 默认行为只修复归属，title/model/prompt 保持原有约定。
+- 当前运行中的 Desktop 不会热加载 C++ 修改 → 验证源码和测试，不将其表述为已替换运行版本。
+- 工作区注册后首条投递可能失败 → 清理新会话文件，保留可见工作区注册及原有会话数据。
+
+## Migration Plan
+
+代码合入后随下次构建启动生效。已有不可见会话不做自动修复；本次不直接改写正在运行会话的磁盘元数据。回滚可移除新增可选工具参数与目标解析实现，既有会话格式不变。
diff --git a/openspec/changes/fix-thread-workspace-creation/proposal.md b/openspec/changes/fix-thread-workspace-creation/proposal.md
new file mode 100644
index 000000000..50f5aca8c
--- /dev/null
+++ b/openspec/changes/fix-thread-workspace-creation/proposal.md
@@ -0,0 +1,24 @@
+## Why
+
+无工作区会话通过 `create_thread` 创建新会话时，只复制临时 cwd，遗漏 no_workspace，导致新会话同时被无工作区列表和可见工作区列表排除。创建工具也不能指定目标工作区或目录，无法完成用户明确要求的跨工作区创建。
+
+## What Changes
+
+- 创建工具支持可选 `workspaceHash`、`cwd`、`noWorkspace`，默认继承调用会话归属。
+- 无工作区新会话使用独立缓存目录；普通目标目录注册为可见工作区，返回真实位置元数据。
+- 续聊工具支持全局定位和可选 `workspaceHash`，使新会话创建后仍可从原会话继续发送任务。
+- 补充无工作区、跨工作区、目标校验、失败清理及续聊回归测试，更新工具协议文档。
+
+## Capabilities
+
+### New Capabilities
+
+- `thread-workspace-creation`: 定义 AI 创建会话的目标选择、可见性、返回身份与跨工作区续聊约定。已有 thread 工具规范仍在未归档变更中，本次不覆盖其历史记录。
+
+### Modified Capabilities
+
+无。复用既有 shared-daemon-workspaces 的工作区注册与会话归属机制。
+
+## Impact
+
+涉及 `ThreadService`、thread 工具 schema、会话工具单元测试和 `docs/daemon-api.md`。不变更 HTTP 路由，不改其他元数据修改工具的作用域，不自动修改已有用户会话，不发布或替换运行中的 Desktop。
diff --git a/openspec/changes/fix-thread-workspace-creation/specs/thread-workspace-creation/spec.md b/openspec/changes/fix-thread-workspace-creation/specs/thread-workspace-creation/spec.md
new file mode 100644
index 000000000..a0d2f765e
--- /dev/null
+++ b/openspec/changes/fix-thread-workspace-creation/specs/thread-workspace-creation/spec.md
@@ -0,0 +1,49 @@
+## Purpose
+
+让用户通过 AI 在当前归属、指定工作区或指定文件夹创建可在界面找到的独立会话，并能从原会话继续发送任务，避免将无工作区的临时执行目录误识别为普通工作区。
+
+## ADDED Requirements
+
+### Requirement: 显式选择创建目标
+
+`create_thread` SHALL 接受可选 `workspaceHash`、`cwd`、`noWorkspace`。省略目标时继承调用会话归属；`workspaceHash` 指向已注册工作区，`cwd` 为已存在的绝对目录，`noWorkspace=true` 创建无工作区会话。系统 MUST 拒绝冲突目标、错误类型、未知工作区、相对路径及不存在或非目录路径，不能静默回退到当前目录。
+
+#### Scenario: 指定其他工作区
+- **WHEN** 从无工作区调用创建工具并提供已注册工作区的 hash
+- **THEN** 新会话使用目标工作区 cwd、归属及存储位置
+
+#### Scenario: 指定文件夹
+- **WHEN** 提供已存在的绝对目录 cwd
+- **THEN** 系统规范化该目录并确保目标工作区在界面可见，保留已有显示名称等配置
+
+#### Scenario: 目标参数非法
+- **WHEN** 同时提供 cwd 与 workspaceHash、noWorkspace=true 与目录目标，或目标类型/路径非法
+- **THEN** 返回明确错误，不创建会话
+
+### Requirement: 正确继承无工作区归属并返回位置
+
+系统 SHALL 为无工作区新会话分配独立缓存目录，持久化 no_workspace，并返回 `threadId`、`cwd`、`workspaceHash` 和 `noWorkspace`；workspaceHash 使用与全局会话查询一致的存储项目 hash。普通会话目标 SHALL 注册为可见工作区，创建结果可通过对应界面列表发现。首条输入投递失败时 MUST 清理实际目标中的新会话文件。
+
+#### Scenario: 无工作区调用默认创建
+- **WHEN** 无工作区会话省略目标调用 create_thread
+- **THEN** 新会话仍属于无工作区，可通过无工作区列表发现，且不会把调用方临时目录注册成工作区
+
+#### Scenario: 普通工作区调用默认创建
+- **WHEN** 普通会话省略目标调用 create_thread
+- **THEN** 新会话使用调用方目录，并保留 title/model 与首条 prompt 行为
+
+#### Scenario: 投递失败
+- **WHEN** 新会话创建后首条输入无法排队
+- **THEN** 销毁新会话并清理目标存储，不删除调用方历史
+
+### Requirement: 跨工作区继续发送任务
+
+`send_message_to_thread` SHALL 全局定位 threadId，并接受可选 workspaceHash 消除歧义。恢复非活跃目标时 MUST 使用目标自身 cwd 和 noWorkspace 属性。不能将请求发送给其他工作区中同 ID 的活跃会话；自发消息仍被拒绝。
+
+#### Scenario: 新建后继续发送
+- **WHEN** 原会话向刚创建的其他工作区或独立无工作区会话发送 prompt
+- **THEN** 输入进入目标会话队列，目标归属保持不变
+
+#### Scenario: 同 ID 冲突
+- **WHEN** 目标 ID 对应多个存储项目且未指定 workspaceHash，或运行时已加载其他项目的同 ID
+- **THEN** 返回明确错误，不把消息投递给错误会话
diff --git a/openspec/changes/fix-thread-workspace-creation/tasks.md b/openspec/changes/fix-thread-workspace-creation/tasks.md
new file mode 100644
index 000000000..a50c93a2a
--- /dev/null
+++ b/openspec/changes/fix-thread-workspace-creation/tasks.md
@@ -0,0 +1,23 @@
+## 1. 实现与回归
+
+- [x] 1.1 补齐创建目标解析、无工作区归属、可见注册及返回身份，并通过 ThreadTools 创建与失败清理回归。
+- [x] 1.2 接通跨工作区续聊与目标恢复，验证无工作区续聊、磁盘恢复和同 ID 防误投递测试。
+- [x] 1.3 更新工具 schema、描述与协议文档，验证旧参数兼容及非法目标类型拒绝。
+
+## 2. 集成验收
+
+- [x] 2.1 复用 Windows 构建目录完成单元测试编译，运行 thread/workspace/no-workspace 相关测试，记录真实结果。
+- [x] 2.2 通过 OpenSpec 严格校验与 git diff --check，审查文件范围并区分源码验证和运行版本。
+
+- [x] 2.3 发布整合时将纯标题/事件格式化辅助函数拆到独立实现文件，保持 thread_service.cpp 不超过既有行数上限；通过分层检查和线程相关原生回归。
+
+## 验收记录
+
+- 2026-10-11：复用 `build/refactor-phase1-windows`，通过 `scripts/dev_windows_env.bat` 加载 MSVC 环境后增量构建 `acecode_unit_tests` 成功。
+- `ThreadCreation.*:ThreadTools.*:HeadlessSessionScope.*:WorkspaceRegistry*.*` 及五项 WebServerHttp 会话/工作区回归共 69/69 通过。其中新增 10 项创建/续聊测试及 1 项 AI 创建后侧栏 HTTP 列表测试。
+- 新增 HTTP 回归验证 `/api/sessions?scope=no-workspace` 在新会话活跃及退出后都返回正确标题和无工作区归属。
+- 测试报告：`C:/Users/shao/AppData/Local/Temp/acecode-thread-workspace-final-tests.xml`；构建目录是验证副本，未替换 `build/Release` 中正在运行的 Desktop/daemon。
+- 不修改现有用户会话；原不可见历史会话没有迁移。未提交、未发布。
+- `openspec validate fix-thread-workspace-creation --strict` 与本次文件的 `git diff --check` 均通过；144 个已记录基线的无关修改文件内容未变。
+
+- 2026-10-12 发布整合验收：`thread_service.cpp` 1188 行，未超过既有 1211 行上限；分层、体积、所有权、路径和映射严格检查全部通过。Windows MinSizeRel 三目标构建成功，线程/技能/配置/通道/升级等 1382 项原生回归中 1380 项通过、2 项外部环境用例按设计跳过，无失败。
diff --git a/openspec/changes/fix-trajectory-turn-order/.openspec.yaml b/openspec/changes/fix-trajectory-turn-order/.openspec.yaml
new file mode 100644
index 000000000..a36921962
--- /dev/null
+++ b/openspec/changes/fix-trajectory-turn-order/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-10-11
diff --git a/openspec/changes/fix-trajectory-turn-order/design.md b/openspec/changes/fix-trajectory-turn-order/design.md
new file mode 100644
index 000000000..90d6e47e1
--- /dev/null
+++ b/openspec/changes/fix-trajectory-turn-order/design.md
@@ -0,0 +1,24 @@
+## Context
+
+现场只读接口确认事件顺序为 legacy_context、message(user)、turn_start、model_step_start、model_request、model_response、turn_end。当前投影遇上下文创建匿名回合，遇用户消息创建回合，遇 turn_start 强制再建回合。四次输入被投影为 3、5、7、9。
+
+布局原先通过下一个助手或 partial 推断输入归属；尚无助手结果时请求与用户行可落入不同回合。实时 partial 的 turn 则来自聊天计数，与轨迹投影不是同一身份来源。
+
+## Goals / Non-Goals
+
+目标：修复投影身份和实时布局，并兼容用户消息早于或晚于 turn_start 的事件顺序及旧会话。
+
+不改变后端事件协议、磁盘记录、轮询频率、轨迹视觉样式；不把加载局部历史时缺少的绝对回合总数伪装为已知数据。
+
+## Decisions
+
+1. 上下文暂存至真正回合建立，再附入该回合；turn_start 复用 turn_id 或 user_message_id 对应回合，结束事件不创建新回合。保留仅有上下文的历史展示。
+2. 投影产生输入序号到回合编号的映射，布局优先使用该映射，兼容未提供映射的 DeepSeek 输入。系统提示使用所属请求的回合。相比仅修计数，这也能消除尚无助手结果时的临时错位。
+3. 实时状态携带 activeTurnId，投影提供身份到编号的映射。匹配活动身份优先于聊天估算编号；新回合尚未被轮询到时放在当前历史之后，不回填到旧回合。已持久化相同步骤结果后隐藏 partial。
+4. 在每个事件前缀上重建投影，验证编号、输入归属与分段合并；浏览器回放验证真实组件在轮询与流式更新交替时的顺序。
+
+## Risks / Trade-offs
+
+- [风险] 旧会话缺少 turn_start → 用户消息仍可建立回合，legacy_index 保持原有排序。
+- [风险] 历史快照与流式消息不同步 → 以稳定身份匹配；明确已完成步骤后抑制残留 partial。
+- [风险] 工作区存在大量其他改动 → 本次仅改相关轨迹文件、实时状态字段和测试，不提交其他改动。
diff --git a/openspec/changes/fix-trajectory-turn-order/proposal.md b/openspec/changes/fix-trajectory-turn-order/proposal.md
new file mode 100644
index 000000000..2138906f6
--- /dev/null
+++ b/openspec/changes/fix-trajectory-turn-order/proposal.md
@@ -0,0 +1,24 @@
+## Why
+
+真实测试会话只有四次用户输入，轨迹却显示 Turn 3、5、7、9；实时回复又使用聊天计数，导致轮询前后编号和消息位置跳动。需要按同一次输入的稳定身份统一轨迹归属。
+
+## What Changes
+
+- 初始化上下文不单独消耗回合编号，用户消息及其开始、结束事件归入同一回合。
+- 给输入和上下文保留明确回合归属，尚未收到助手结果时也不依赖后续助手猜测位置。
+- 实时回复优先按活动回合身份匹配持久轨迹，完成后不重复展示旧 partial。
+- 增加真实事件顺序、轮询分段、连续回合、历史兼容记录的回归验证。
+
+## Capabilities
+
+### New Capabilities
+
+- `session-trajectory-tolerance`: 沿用未归档 change 中的能力路径，补充回合编号与实时归属容错约束。
+
+### Modified Capabilities
+
+无。
+
+## Impact
+
+影响 Web 轨迹投影、布局输入及聊天实时轨迹状态。保持轨迹接口、持久化文件、页面样式与英文文案不变。
diff --git a/openspec/changes/fix-trajectory-turn-order/specs/session-trajectory-tolerance/spec.md b/openspec/changes/fix-trajectory-turn-order/specs/session-trajectory-tolerance/spec.md
new file mode 100644
index 000000000..20c09356c
--- /dev/null
+++ b/openspec/changes/fix-trajectory-turn-order/specs/session-trajectory-tolerance/spec.md
@@ -0,0 +1,33 @@
+## Purpose
+
+保证会话轨迹在历史记录、回合生命周期事件与实时消息分批到达时具有一致的回合编号和消息归属，使用户能够可靠查看每次输入、模型步骤及回复的执行顺序。
+
+## ADDED Requirements
+
+### Requirement: 同一次输入只占一个轨迹回合
+
+轨迹 SHALL 将同一次用户输入及其回合开始、结束事件归入同一回合，初始化上下文 SHALL NOT 单独增加回合编号。
+
+#### Scenario: 初始化上下文先于用户消息和回合开始
+- **WHEN** 新会话依次出现初始化上下文、用户消息、同一输入的回合开始事件和助手回复
+- **THEN** 它们显示在 Turn 1，后续输入依次显示为 Turn 2、Turn 3
+
+#### Scenario: 回合开始早于用户消息
+- **WHEN** 开始事件先到，且 user_message_id 与后到用户消息的 id 对应
+- **THEN** 两条事件归入同一回合，不产生空白回合或跳号
+
+### Requirement: 分批更新保持输入与实时回复的回合归属
+
+轨迹 SHALL 在尚无助手结果时保留用户及上下文的回合归属，实时回复 SHALL 优先按活动回合身份关联，且 SHALL NOT 因聊天计数不同而插入已完成旧回合。
+
+#### Scenario: 新回合先流式输出后收到轨迹轮询
+- **WHEN** 已有多个完成回合，新回合实时回复先于持久轨迹更新到达
+- **THEN** 新回复显示在历史之后，轨迹更新到达后保持同一回合位置
+
+#### Scenario: 持久结果到达但实时状态尚未清空
+- **WHEN** 同一回合和模型步骤的持久结果已收到，但旧流式片段仍存在
+- **THEN** 只显示持久结果，不重复展示旧流式片段
+
+#### Scenario: 旧回合没有助手结果
+- **WHEN** 一个回合在生成助手结果前结束，随后出现新用户回合
+- **THEN** 两次用户输入分别留在各自回合，不合并到后一个助手回合
diff --git a/openspec/changes/fix-trajectory-turn-order/tasks.md b/openspec/changes/fix-trajectory-turn-order/tasks.md
new file mode 100644
index 000000000..9aafc4df5
--- /dev/null
+++ b/openspec/changes/fix-trajectory-turn-order/tasks.md
@@ -0,0 +1,9 @@
+## 1. 修复与回归
+
+- [x] 1.1 复用用户和生命周期身份，修复上下文虚增回合，并用真实顺序及逐事件前缀测试验证连续编号
+- [x] 1.2 布局保留输入归属，实时状态按回合身份匹配，并验证轮询延迟、空回复及已完成 partial 去重
+
+## 2. 集成验证
+
+- [x] 2.1 浏览器回放连续回合和延迟轮询，确认 turn 编号及消息顺序稳定
+- [x] 2.2 通过完整 pnpm test、pnpm build、OpenSpec 严格校验及本次差异检查，记录实际会话只读复验结果
diff --git a/openspec/changes/fix-trajectory-turn-order/verification.md b/openspec/changes/fix-trajectory-turn-order/verification.md
new file mode 100644
index 000000000..b4d8cadd0
--- /dev/null
+++ b/openspec/changes/fix-trajectory-turn-order/verification.md
@@ -0,0 +1,26 @@
+# 验证记录
+
+日期：2026-10-11。当前 master 工作区内实施；保留已有其他改动。
+
+## 根因与现场只读复验
+
+- 原始真实事件顺序为初始化上下文、用户消息、turn_start；前端分别创建了三个回合。
+- 修复前四次输入投影为 `[3, 5, 7, 9]`；修复后，同一真实接口数据投影为 `[1, 2, 3, 4]`。
+- 另一条单次输入的测试会话修复后投影为 `[1]`。
+- 现场接口仅执行 GET，没有修改会话或重启运行中的 Desktop/daemon。
+
+## 自动化验证
+
+- `node web/src/lib/trajectoryModel.test.js`：通过。覆盖上下文、两种生命周期顺序、不同身份别名、重复开始/结束边界、连续四轮每条事件前缀、无助手结果、身份优先于过时编号、tail 缺少开始事件、引导与工具注入输入、完成后 partial 去重。
+- `node web/src/lib/sessionTranscript.test.js`：通过。覆盖活动回合身份进入 partial，以及历史快照缺少开始事件时恢复身份。
+- `node web/scripts/test-trajectory-turn-order.mjs`：Chromium 无头浏览器通过，无页面异常。通过 `ACE_PLAYWRIGHT_MODULE` 与 `ACE_CHROMIUM_EXECUTABLE` 复用本机已安装工具。
+- 浏览器回放覆盖初始化上下文的首轮、六轮历史后第七轮先流式输出、用户消息/turn_start/model_request/model_response 分段轮询及最终结果去重。聊天状态的计数故意保持过时，轨迹仍按活动身份定位。
+- 浏览器截图：`C:/Users/shao/AppData/Local/Temp/ace-trajectory-turn-order/trajectory-turn-order.png`。
+- `pnpm test`：最终代码通过；日志包含 3110 条 `[pass]`，Node TAP 汇总 3/3，通过且无失败。
+- `pnpm build`：最终代码通过；构建后的 4524 个正则通过旧 WebView lookbehind 兼容检查。
+- `openspec validate fix-trajectory-turn-order --strict`：通过。
+- 本次六个已跟踪修改文件的 `git diff --check`：通过；新增浏览器脚本独立保留。
+
+## 验证边界
+
+上述为当前源码、真实只读响应投影及浏览器组件回放结果。已安装 Desktop 尚未重打包或替换，不能据此宣称当前运行的安装版已经包含修复。OpenSpec change 目录遵循当前仓库忽略规则，文档保留在本地。
diff --git a/openspec/changes/preserve-macos-update-app-name/.openspec.yaml b/openspec/changes/preserve-macos-update-app-name/.openspec.yaml
new file mode 100644
index 000000000..a36921962
--- /dev/null
+++ b/openspec/changes/preserve-macos-update-app-name/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-10-11
diff --git a/openspec/changes/preserve-macos-update-app-name/design.md b/openspec/changes/preserve-macos-update-app-name/design.md
new file mode 100644
index 000000000..edd34840e
--- /dev/null
+++ b/openspec/changes/preserve-macos-update-app-name/design.md
@@ -0,0 +1,27 @@
+## Context
+
+见 proposal.md。自更新在旧进程仍存活时移动整个应用；桌面重启为后续单独操作。主应用 `CFBundleName` / `CFBundleDisplayName` 已为 ACECode，但更新备份的实际文件名包含 UUID。Apple 文档说明显示名称可能采用实际文件名，TCC 还依赖 responsible code 归属；这里确认了不合适的命名代码，尚未确认用户机器的具体 TCC 归属。
+
+参考：[Apple Display Names](https://developer.apple.com/library/archive/documentation/MacOSX/Conceptual/BPFileSystem/Articles/DisplayNames.html)、[On File System Permissions](https://developer.apple.com/forums/thread/678819)。前者说明文件名与显示名称关系，不作为特定 TCC 弹窗已复现的证据。
+
+## Goals / Non-Goals
+
+目标是更新各阶段始终保持应用叶子目录名 `ACECode.app`，且完整保留签名与故障恢复。范围仅为内置 macOS 自更新，不扩展为权限管理或安装器重构，不改变重启时机。
+
+## Decisions
+
+- 单次更新创建同卷私有目录 `.acecode-update-<UUID>`，其中 `staging/ACECode.app`、`previous/ACECode.app` 和 `failed/ACECode.app` 分别承载三个阶段。随机标识只进入外层目录。
+- 在已有 portable bundle 模块中封装目录所有权；根目录独占创建，POSIX 权限为 0700，已有目录或符号链接拒绝接管。析构只删除自己创建的空目录，任何仍含应用的目录必须保留。
+- 原有复制、信任验证、两步移动与回滚顺序保持。成功备份仍由现有返回值和诊断日志公开实际路径。
+- 安装位置校验拒绝 `.acecode-update-*` 下的副本，避免保持名称后把备份当作正式安装再次升级。
+- 不直接修改运行中应用的 plist；这会破坏封装签名。单纯改 `CFBundleDisplayName` 也无法消除实际文件名的 UUID。
+
+## Risks / Trade-offs
+
+- [TCC 名称选择受 macOS 版本和启动方式影响] → 源码和文件操作测试只证明名称与恢复约束；系统弹窗列为 Mac 实机待验，不能声称通过。
+- [旧版本仍按旧逻辑升级] → 新逻辑随新版本运行后生效，旧版本执行的那次更新仍可能留下旧名字；正常退出并重新打开正式安装可结束旧进程。
+- [回滚失败] → 只清理空容器，备份及失败副本保留，错误继续给出可恢复路径。
+
+## Migration Plan
+
+随常规版本发布，不在本任务发布或提交。不重命名或删除历史 `.ACECode-<UUID>.previous.app`；文档记录新旧两类备份。Mac 验收覆盖更新完成但未重启时触发文件权限、重启后申请及回滚故障。
diff --git a/openspec/changes/preserve-macos-update-app-name/proposal.md b/openspec/changes/preserve-macos-update-app-name/proposal.md
new file mode 100644
index 000000000..a52721a61
--- /dev/null
+++ b/openspec/changes/preserve-macos-update-app-name/proposal.md
@@ -0,0 +1,24 @@
+## Why
+
+用户反馈 macOS 权限弹窗出现 `.acecode-xxxx-xxxx`，无法辨认请求者。代码中存在高度吻合的来源：自更新把仍可能运行的旧应用重命名为 `.ACECode-<UUID>.previous.app`；系统可能采用实际 bundle 文件名。当前 Windows 环境尚未复现用户的系统弹窗。
+
+## What Changes
+
+- 自更新的暂存、备份和失败隔离应用均保持 `ACECode.app` 名称，随机编号及阶段信息移入外层私有目录。
+- 保持同卷替换、签名验证、失败回滚和备份保留行为；清理仅删除本次创建的空容器。
+- 更新目录中的副本不得被作为正式安装位置再次自更新。
+- 补充路径、回滚文件操作和清理回归验证，以及 Mac 实机待验说明。
+
+## Capabilities
+
+### New Capabilities
+
+无。
+
+### Modified Capabilities
+
+- `self-upgrade`: macOS 更新期间保持应用名称及备份恢复能力。
+
+## Impact
+
+涉及 `src/adapters/upgrade/macos_bundle.*`、`macos_app_installer.mm`、对应测试与 `docs/macos-release.md`。不改签名内容、bundle identifier、权限范围或发布配置；不自动迁移或删除旧备份。
diff --git a/openspec/changes/preserve-macos-update-app-name/specs/self-upgrade/spec.md b/openspec/changes/preserve-macos-update-app-name/specs/self-upgrade/spec.md
new file mode 100644
index 000000000..0a5ba6da4
--- /dev/null
+++ b/openspec/changes/preserve-macos-update-app-name/specs/self-upgrade/spec.md
@@ -0,0 +1,26 @@
+## ADDED Requirements
+
+### Requirement: macOS update copies preserve the application name
+
+macOS 自更新 SHALL 在暂存、备份及失败隔离阶段保持应用文件名 `ACECode.app`，唯一编号 SHALL 仅放在外层目录。系统 SHALL 保留原有签名验证和失败回滚能力，不更改应用签名内容。
+
+#### Scenario: Update completes before the old process exits
+- **WHEN** 自更新替换完成但旧应用仍在运行
+- **THEN** 旧应用所在的备份 bundle 仍名为 `ACECode.app`
+- **AND** 返回的备份路径指向可恢复的旧应用
+
+#### Scenario: Replacement fails and rollback succeeds
+- **WHEN** 安装失败但可恢复原应用
+- **THEN** 原应用恢复到正式安装路径，当前更新的空容器被清理
+
+#### Scenario: Rollback cannot restore the original
+- **WHEN** 安装和回滚均失败
+- **THEN** 仍含旧应用或失败应用的容器被保留，不因清理操作丢失副本
+
+#### Scenario: Update directory already exists
+- **WHEN** 本次更新选定的私有根路径已经存在，包括符号链接
+- **THEN** 更新拒绝接管该目录，且不删除或覆盖其内容
+
+#### Scenario: Backup copy attempts self-update
+- **WHEN** 运行于更新私有目录中的应用尝试自更新
+- **THEN** 安装位置校验拒绝该副本作为正式安装目标
diff --git a/openspec/changes/preserve-macos-update-app-name/tasks.md b/openspec/changes/preserve-macos-update-app-name/tasks.md
new file mode 100644
index 000000000..e219adc78
--- /dev/null
+++ b/openspec/changes/preserve-macos-update-app-name/tasks.md
@@ -0,0 +1,17 @@
+## 1. 实现
+
+- [x] 1.1 封装保留 ACECode.app 名称的更新目录和空目录清理生命周期；以目录独占、名称和备份保留回归测试验证。
+- [x] 1.2 接入 macOS 原生更新器并拒绝对备份自身更新；审查所有复制、移动、验证和回滚分支，并通过路径校验测试。
+- [x] 1.3 更新 Mac 发布说明，解释新旧备份路径及更新后重启行为；核对文档和实现一致。
+
+## 2. 验证
+
+- [x] 2.1 执行定向原生测试、OpenSpec strict 校验和 git diff --check，记录结果与平台限制。
+- [ ] 2.2 在 Mac 上编译原生更新器并验证签名更新、故障回滚，以及更新前后权限弹窗的实际名称。
+
+## 验证记录（2026-10-11）
+
+- WSL Ubuntu 使用 g++ C++17 编译实际 `macos_bundle.cpp`、`encoding.cpp` 和 `macos_bundle_test.cpp`（仓库现有 GoogleTest），10 项全部通过，0 跳过。包括 0700 权限、已有目录/符号链接拒绝、应用名称、成功备份、恢复后空目录清理、未恢复副本保留，以及备份不可自更新。
+- `openspec validate preserve-macos-update-app-name --strict` 通过。
+- 本次五个源代码/测试/文档文件 `git diff --check` 通过。
+- 当前为 Windows 主机，未编译 Objective-C++ 原生更新器、未使用 Developer ID 签名应用做实际更新，未复现 TCC 弹窗；2.2 保持待验。未发布、未提交。
diff --git a/openspec/changes/restore-chat-focus-on-window-activation/.openspec.yaml b/openspec/changes/restore-chat-focus-on-window-activation/.openspec.yaml
new file mode 100644
index 000000000..a36921962
--- /dev/null
+++ b/openspec/changes/restore-chat-focus-on-window-activation/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-10-11
diff --git a/openspec/changes/restore-chat-focus-on-window-activation/design.md b/openspec/changes/restore-chat-focus-on-window-activation/design.md
new file mode 100644
index 000000000..21aa6aec3
--- /dev/null
+++ b/openspec/changes/restore-chat-focus-on-window-activation/design.md
@@ -0,0 +1,33 @@
+## Context
+
+目前 Windows 的 WM_ACTIVATE 只发送网页事件，没有调用 WebView2 MoveFocus；macOS/Linux 的 set_window_focus_handler 为空实现。前端通过多次未托管的延迟调用恢复 Slate 焦点，并额外保留终端焦点。
+
+## Goals / Non-Goals
+
+目标：让原生激活、网页选择和实际键盘输入一致；保留草稿、选区以及 Slate 等待 DOM 更新的保护。
+不涉及：消息发送、布局、浏览器普通网页的自动聚焦策略、发布或替换运行中的用户程序。
+
+## Decisions
+
+1. 增加仅聚焦当前活动窗口 WebView 的 bridge。Windows 使用 MoveFocus，macOS 使用 makeFirstResponder，Linux 使用 gtk_widget_grab_focus。先由网页确认聊天可用，再调用原生层，成功后恢复输入。不同于现有拉前窗口功能，此入口不得激活后台窗口。
+2. 各平台接通原生窗口激活通知，最大化/恢复状态变化也发送同一通知。回调沿用 GUI 线程模型；macOS 观察者析构退订，Linux 信号随窗口销毁。
+3. 将窗口激活后的帧调度集中在 composerCaretRestore，合并重复通知；失焦、隐藏、卸载或用户开始其他交互后撤销待执行恢复。ChatView 直接提供聚焦回调，不再叠加无人管理的重试。
+4. 按本次要求移除终端焦点例外。保留设置、提问和模态框等阻塞表面的焦点管理，它们打开时底层聊天不是可用输入区域。
+5. 三平台原生聚焦和观察者资源管理收敛到 `web_host_focus.hpp`；WebHost 保留窗口事件转发。文件拖放复用同一活动 WebView 聚焦入口，保持入口文件不超过分层行数上限。
+
+## Risks / Trade-offs
+
+### 2026-10-12 中文输入回归
+
+在当前 Windows 的真实 WebView2 中复现：`Input.imeSetComposition` 已启动中文合成时，窗口激活通知仍调用原生 `MoveFocus`，合成文本被提前提交；随后正常提交再次插入相同文字。普通 Chromium 模拟的网页焦点没有此行为。现有恢复只由 pointerdown / keydown 撤销，遗漏 compositionstart、beforeinput 和 input，并且新激活通知仍可在合成中进入原生桥。
+
+修复在自动恢复调度器记录合成状态：合成开始、文本输入与合成结束均撤销过期任务，合成中拒绝新恢复；页面已经获得真实焦点时不重复调用原生 MoveFocus，仅恢复聊天元素。RichComposer 的所有命令式聚焦入口在 active / settling 阶段直接退出，避免其他恢复入口改动原生候选词及选区；未渲染的 React 更新也延迟聚焦。保留旧 DOM 光标采纳和未渲染操作保护，不重建编辑器。以原生 WebView2 的合成中间状态、最终文字以及 DOM / Slate 光标偏移一致作为验收依据。
+
+- 原生和 DOM 通知可能重入 → 合并在途请求，回调完成后复核页面状态。
+- 快速切走或打开弹框 → 在每次恢复前校验，取消过期异步工作。
+- 原生 WebView 获焦与 Slate 内部状态可能不同步 → 使用真实编辑器验证实际键盘输入和选区；保留已有 Slate 防护。
+- 当前验收机器为 Windows → 优先完成原生 Windows 验证，WebKit 自动化与 macOS/Linux 真机结果分别记录。
+
+## Migration Plan
+
+无配置或数据迁移。前端兼容缺少新 bridge 的旧桌面壳；回滚本次源文件即可恢复原行为。
diff --git a/openspec/changes/restore-chat-focus-on-window-activation/proposal.md b/openspec/changes/restore-chat-focus-on-window-activation/proposal.md
new file mode 100644
index 000000000..beeec5df0
--- /dev/null
+++ b/openspec/changes/restore-chat-focus-on-window-activation/proposal.md
@@ -0,0 +1,22 @@
+## Why
+
+桌面窗口经 Alt+Tab、最小化恢复或最大化后，聊天输入框可能显示光标但收不到键盘输入，需要再次点击。用户要求窗口重新获得焦点时，有可用聊天输入框就自动恢复输入，Windows 优先并覆盖 macOS、Linux。
+
+## What Changes
+
+- 补齐原生窗口激活、WebView 键盘焦点和聊天光标之间的恢复流程。
+- 窗口重新激活时，即使此前使用过终端或预览，也回到当前聊天输入框。
+- 保留草稿和选区；后台窗口、隐藏聊天和正在交互的阻塞弹框不执行恢复；取消失效的异步恢复。
+- 补充 Windows 原生及跨浏览器回归验证，并分别记录其他平台的实现和实测状态。
+
+## Capabilities
+
+### New Capabilities
+- `desktop-chat-focus`: 桌面窗口重新激活时恢复当前可用聊天输入框的键盘焦点。
+
+### Modified Capabilities
+无。
+
+## Impact
+
+涉及 desktop WebHost、原生 bridge、ChatView 和 composerCaretRestore；不增加依赖，不改变消息提交协议。
diff --git a/openspec/changes/restore-chat-focus-on-window-activation/specs/desktop-chat-focus/spec.md b/openspec/changes/restore-chat-focus-on-window-activation/specs/desktop-chat-focus/spec.md
new file mode 100644
index 000000000..7e4741301
--- /dev/null
+++ b/openspec/changes/restore-chat-focus-on-window-activation/specs/desktop-chat-focus/spec.md
@@ -0,0 +1,41 @@
+## Purpose
+
+保证桌面应用从其他程序切回、从最小化恢复或切换窗口显示状态时，当前可用聊天输入框立即具备真实键盘输入能力，用户不必再次点击；同时保护现有草稿、选区与阻塞弹框交互。
+
+## ADDED Requirements
+
+### Requirement: 窗口激活恢复聊天输入
+
+Windows、macOS、Linux 桌面端 SHALL 在窗口重新获得焦点，或活动窗口完成最大化/恢复后，将键盘焦点交给当前可用聊天输入框。之前位于终端或预览中的焦点 MUST NOT 阻止恢复。
+
+#### Scenario: 从其他程序切回
+- **WHEN** 用户通过 Alt+Tab 或平台对应操作切回有聊天输入框的窗口
+- **THEN** 用户无需鼠标点击即可继续输入，已有草稿和有效选区保留
+
+#### Scenario: 恢复或最大化
+- **WHEN** 用户从最小化、隐藏状态恢复聊天窗口，或最大化/还原活动窗口
+- **THEN** 聊天输入框接收随后键入的文字
+
+### Requirement: 恢复只作用于当前可用聊天
+
+系统 MUST 取消过期恢复，不得拉前后台窗口、聚焦已卸载或隐藏的聊天，或覆盖阻塞弹框中的输入；普通窗口内控件切换 MUST NOT 触发持续抢焦点。
+
+#### Scenario: 快速切走
+- **WHEN** 恢复仍在等待执行，用户又切到其他窗口
+- **THEN** 过期恢复不改变当前窗口或输入位置
+
+#### Scenario: 阻塞表面打开
+- **WHEN** 设置、搜索、提问或模态框正在占用输入
+- **THEN** 底层聊天不夺取焦点
+
+#### Scenario: 激活后继续其他操作
+- **WHEN** 用户已经恢复窗口并主动点击其他控件或输入文字
+- **THEN** 尚未执行的重复恢复被撤销，不影响本次交互
+
+#### Scenario: 中文输入期间收到恢复通知
+- **WHEN** 中文输入法处于合成或提交结算阶段，窗口再次通知激活，或上一轮延迟恢复到达
+- **THEN** 系统 MUST 保留原生合成与可见光标，不重新聚焦 WebView 或编辑器，不提前提交、重复插入或移到其他位置
+
+#### Scenario: 无键盘事件的文本输入
+- **WHEN** 输入法或原生输入服务以 beforeinput / input 更新文本而没有 keydown
+- **THEN** 待执行的焦点恢复 MUST 被撤销，后续文字沿可见光标继续插入
diff --git a/openspec/changes/restore-chat-focus-on-window-activation/tasks.md b/openspec/changes/restore-chat-focus-on-window-activation/tasks.md
new file mode 100644
index 000000000..5d1229d35
--- /dev/null
+++ b/openspec/changes/restore-chat-focus-on-window-activation/tasks.md
@@ -0,0 +1,26 @@
+## 1. 原生焦点恢复
+
+- [x] 1.1 实现三平台活动窗口 WebView 聚焦与激活/恢复通知，通过 Windows 编译和平台分支审查验证。
+
+## 2. 聊天输入恢复
+
+- [x] 2.1 实现可撤销、去重的原生/DOM 焦点恢复，移除终端例外并保留 Slate 选区，通过定向回归测试验证。
+
+## 3. 集成验收
+
+- [x] 3.1 执行前端完整测试与构建、跨浏览器输入验证、OpenSpec 严格验证，记录证据和平台实测限制。
+- [x] 3.2 在连接且解锁的 Windows 桌面执行原生恢复输入实测；2026-10-12 使用独立 WebHost 验证窗口，通过切换、最小化恢复、最大化还原、隐藏显示的真实键盘输入及选区/弹框保护。
+
+## 4. 中文合成与焦点恢复回归
+
+- [x] 4.1 补齐输入事件的恢复撤销与合成期聚焦保护，以调度器和命令式聚焦定向测试验证。
+- [x] 4.2 使用真实 WebView2 复现并回归窗口激活与中文合成交错，断言合成未被提前提交、最终文字无重复、DOM 和 Slate 光标一致；执行 Web 全量测试、构建及 OpenSpec 严格验证。
+
+## 2026-10-12 验证记录
+
+- 修复前独立原生 WebView2 复现：合成中的 `中文` 因激活恢复提前写入 `tail`，得到 `中文tail`，再次提交后成为 `中文中文abctail`；对应断言稳定失败。普通浏览器的同一场景未出现原生提前提交。
+- `test-composer-focus-selection.mjs`：修复后 Chromium 6 组、原生 WebView2 7 组通过，覆盖恢复前后合成、遗留拖拽、直接聚焦、替换选区及真实窗口切回；提交后可见 DOM 光标与 Slate 插入点一致。测试通过 CDP 驱动浏览器中文合成，不宣称人工操作 Windows 候选词窗口验收。
+- `test-desktop-focus.mjs`：原生窗口切换、最小化恢复、最大化还原、隐藏显示的真实键盘输入，以及后台拒绝、选区和模态框保护通过。
+- `pnpm test`、`pnpm build`（正则兼容检查）、OpenSpec 严格验证和差异检查通过；新增取消路径包含 beforeinput、input、compositionstart/end，以及合成结束事件丢失后的失焦/隐藏恢复。
+- 运行中 Desktop 服务的 HTTP 前端资源 SHA-256 与最终 `web/dist/index.html` 一致。未重启用户正在使用的客户端；当前窗口需重新加载脚本。F5 被 browserDefaults 拦截，应重新启动客户端加载修复。
+- 保留工作区其他已有改动，未提交或推送；macOS/Linux 真机范围不扩充。
diff --git a/openspec/changes/restore-chat-focus-on-window-activation/validation.md b/openspec/changes/restore-chat-focus-on-window-activation/validation.md
new file mode 100644
index 000000000..5351e75b4
--- /dev/null
+++ b/openspec/changes/restore-chat-focus-on-window-activation/validation.md
@@ -0,0 +1,44 @@
+# 窗口激活后的聊天焦点验收
+
+日期：2026-10-11。当前 master 工作区；保留原有未提交改动，未提交、推送、发布或替换运行中的 Desktop。
+
+## 实现
+
+- Windows 继续接收 WM_ACTIVATE，并补齐最大化/还原通知；前端请求经过活动窗口校验后，WebView2 MoveFocus 交还系统键盘焦点。
+- macOS 补齐窗口成为 key、最小化恢复和全屏/最大化状态通知，使用 makeFirstResponder；Linux 接通 focus-in-event、窗口状态通知并使用 gtk_widget_grab_focus。
+- 前端统一管理恢复请求、帧调度和有限重试。终端不再阻止聊天恢复；原生通知先于页面可见时保留意图。失焦、隐藏、卸载或用户点击/输入会取消旧请求，阻塞弹框维持焦点保护。
+- 复用 Slate 已有选区和 DOM 就绪保护，并将取消条件传入其延迟重试。
+
+## 已通过
+
+- `node web/src/lib/composerCaretRestore.test.js`：覆盖原生桥成功/拒绝/失败、通知合并、激活早于可见、终端切回、弹框、失焦、交互和卸载取消。
+- `node web/src/lib/richComposerFocus.test.js`：7 项，包含 Slate 待提交时撤销恢复。
+- `pnpm test`、`pnpm build`：完整前端测试与生产构建通过；旧 WebView 正则兼容扫描通过。
+- `web/scripts/test-desktop-focus.mjs`：Chromium 与 Playwright WebKit 均通过真实编辑器键盘输入、原生桥重入去重、终端切回、草稿选区恢复、弹框保护和卸载检查。未发现页面运行错误。
+- Windows MSVC Release/x64 定向编译：本次 `web_host.cpp`、`main.cpp` 成功；独立原生测试宿主链接成功。
+- `python -B scripts/layers/check_layers.py --repo . --layout final --strict`、OpenSpec strict、定向 `git diff --check` 通过；Impeccable detector 结果 `[]`。分层检查使用包含新增文件的临时 Git 索引，实际用户索引未改变。
+
+## 原生实测限制
+
+独立宿主 `tests/desktop/fixtures/window_focus_host.cpp` 使用生产 WebHost、生产 RichComposer 和 Win32 SendInput，检查窗口切换、最小化恢复、最大化/还原、隐藏恢复、后台拒绝和选区/弹框保护。
+
+本次运行环境的 `query session` 显示 shao 会话 2 为 Disc；当前线程桌面为 WinSta0/Default，输入桌面不可访问，`GetForegroundWindow()` 返回空。测试不能获得真实前台或发送可验证键盘输入，最终以退出码 77 明确跳过。此前诊断运行中后台聚焦入口返回 false，与保护约定一致。**Windows 真正前台键盘恢复仍需在连接、解锁的桌面补验，不宣称已通过。**
+
+已有静态库混用编译器版本导致独立宿主第一次链接出现 `__std_find_end_1` / `__std_mismatch_*`。在临时目录以同一 MSVC 重编译所需的三个 helper 对象后链接通过；未清理或覆盖用户构建目录。
+
+初次分层检查发现入口文件超过行数限制，随后将原生聚焦与观察者提取到 `web_host_focus.hpp`，保持原限制不变。已有文件拖放架构测试同步追踪新的公共聚焦路径与后台保护，最终分层检查为零问题。
+
+macOS、Linux 已完成实现及源码审查，未在对应操作系统编译或真机实测；Windows 上的 Playwright WebKit 不等同于原生 WKWebView。
+
+## 复测入口
+
+```powershell
+$env:ACE_PLAYWRIGHT_MODULE = 'C:/Users/shao/AppData/Local/Python/pythoncore-3.14-64/Lib/site-packages/playwright/driver/package/index.mjs'
+node web/scripts/test-desktop-focus.mjs
+
+# 在连接且解锁的 Windows 桌面运行；原生宿主需链接当前 web_host.cpp 和 desktop support。
+$env:ACE_FOCUS_NATIVE_HOST = "$env:TEMP/ace-focus-native/window_focus_host.exe"
+node web/scripts/test-desktop-focus.mjs
+```
+
+本次编译命令和日志位于 `%TEMP%/ace-focus-native/compile.cmd`、`link.cmd`、`compile.log`、`link.log`、`smoke.log`；前端完整日志位于 `%TEMP%/ace-focus-web-tests.log` 和 `ace-focus-web-build.log`。
diff --git a/openspec/changes/slim-release-payloads/.openspec.yaml b/openspec/changes/slim-release-payloads/.openspec.yaml
new file mode 100644
index 000000000..53f62d706
--- /dev/null
+++ b/openspec/changes/slim-release-payloads/.openspec.yaml
@@ -0,0 +1,2 @@
+schema: spec-driven
+created: 2026-10-10
diff --git a/openspec/changes/slim-release-payloads/design.md b/openspec/changes/slim-release-payloads/design.md
new file mode 100644
index 000000000..53cada181
--- /dev/null
+++ b/openspec/changes/slim-release-payloads/design.md
@@ -0,0 +1,41 @@
+## Context
+
+See proposal.md for measured baselines. `acecode_embed_assets.cmake` currently emits raw arrays and `static_assets.cpp` returns them; the route already handles cache headers. `agent_office_pet.html` owns the actual pixel body, accessories, palette, seeded appearance and animation. Session metadata already persists expert/member IDs, but the office projection drops these fields. macOS desktop and flat CLI share one manifest target; existing extractors reject ZIP symlinks, and old flat validators require a root `acecode` file.
+
+## Goals / Non-Goals
+
+**Goals:** Retain complete offline features, URLs, custom expert resources, session semantics and old updater compatibility while reducing packaged data. Reuse the office's existing pixel art exactly.
+
+**Non-Goals:** Frontend feature removal, dependency/language reductions, layout redesign, deleting developer build caches, publishing a release or rewriting tags. Manual macOS portable archive layout is outside this update-ZIP change.
+
+## Decisions
+
+1. Generate gzip byte arrays using a Python standard-library generator called by CMake; timestamp is fixed, files sorted, binary reads preserved. Keep uncompressed form only where smaller. Carry stored size, decoded size and encoding metadata. Negotiate gzip at HTTP boundary; cache immutable decoded data for clients requiring identity encoding. Existing filesystem sources remain live and uncompressed. Reuse zlib with an explicit native dependency. Keep reconfigure dependencies for existing-file changes and generator changes.
+2. Extract pixel character templates, palette and deterministic look selection into one small JavaScript asset consumable both by React and the self-contained pet page. Generate portrait pixels from those templates; do not introduce new image artwork or a second appearance algorithm. Use effective expert identity from structured `expert_id`/`expert_member_id`; root team maps to its lead, referenced members map to their expert IDs. Keep custom images intact and use pixel defaults when no custom image is configured. Replace managed built-in portrait declarations and remove their obsolete PNGs, bumping the seed bundle with the standard reconciliation machinery.
+3. Add a tiny native macOS CLI forwarder, stored inside `ACECode.app/Contents/MacOS` so the existing nested-code signing and app notarization cover it. The update ZIP copies just that small forwarder to root as `acecode`; the large daemon and resources exist only inside the app. The wrapper resolves its real executable location and `exec`s the bundled daemon, preserving arguments, signals and exit status. This retains the old flat validator/application path and makes later invocations use the existing signed-app update path. An app-only ZIP would break old CLI clients; symlink ZIP entries are rejected by the existing extractor. The tiny forwarder duplicate is intentional compatibility overhead, not a duplicate runtime.
+4. Keep edits scoped to current checkout. Capture current file baselines and preserve concurrent skill-scan work, especially shared API documentation and generated i18n content. No release side effects.
+
+## Risks / Trade-offs
+
+- [Bad encoded bytes cause a blank UI] -> binary round-trip fixtures including control bytes, deterministic regeneration tests, HTTP gzip/identity checks and browser startup verification.
+- [HTTP caches mix encodings] -> Vary on Accept-Encoding for compressed resources and explicit q=0 handling.
+- [Avatar drift between surfaces] -> one shared character source and expert binding tests across catalog, subagents and office snapshots.
+- [Seed upgrade overwrites custom portraits] -> existing managed-hash reconciliation, fresh/old/custom profile tests, no blanket user-directory cleanup.
+- [CLI wrapper loses path or signing compatibility] -> argument/space/symlink/exit probes, old-validator package tests, nested-code signature verification; native macOS checks remain explicitly recorded if not available on this host.
+
+## Migration Plan
+
+The source change takes effect on the next normal package build. Existing desktop updates use the unchanged signed app installer. Existing flat CLI installs receive a small root entry plus the app; unrelated old files remain untouched. Custom expert packages remain preserved by seed reconciliation. Rollback is a normal previous-version package and does not require manifest schema or target-name migration.
+
+## Validation record (2026-10-10)
+
+- Generator/native-page script tests: 3 passed, including binary control bytes, deterministic gzip, CMake incremental rebuild, and exact shared-office script inlining.
+- Web suite: 3087 existing `[pass]` records plus 3 new Node tests passed; production build and ES2020 regex compatibility check passed.
+- Browser: 9 pixel-identity checks; existing office suite passed 70 checks with the Windows bridge fixture and 70 with the macOS bridge fixture; opt-in/welcome/polling/preview suite passed. Real catalog, subagent and office components were rendered in Edge; these are browser fixtures, not an installed Desktop update.
+- macOS forwarder/package: 3 tests compiled and executed the real POSIX launcher on WSL, exercised spaces, PATH/symlinks, exact arguments and exit codes, verified one runtime/resource tree, and rejected missing/oversized forwarding entries. Portable package tests 4 passed; release-asset tests 6 passed; release shell contracts passed against an LF-normalized temporary fixture (the Windows checkout uses CRLF). Native macOS signature/notarization and `_NSGetExecutablePath` execution are not available on this Windows host; the new test is registered in the macOS CI job.
+- Layer, source-size, ownership, include, doc-path and migration-map gates passed; the new identity helper is separate from the size-capped registry implementation.
+- Final native-generation measurement after build-version substitution: 317 files, 13,800,341 raw bytes -> 4,480,962 stored bytes (67.53% reduction; 8.89 MiB saved). Replaced default PNGs: 3,853,891 bytes removed. Seed version is `2026-10-10.1`; no built-in expert PNG remains.
+- Windows `acecode`, `acecode-desktop`, and `acecode_unit_tests` built successfully in `build/refactor-phase1-windows`. The first long build predated the added source-file inventory and failed at link; CMake regeneration and the final 27-step incremental build passed.
+- Focused native suite: 141 executed, 0 skipped, 0 failed (19.2 s), including `DesktopOfficeHttp.ExpertMemberIdentitySurvivesOfficeProjection`, both `PixelPortraitUpgrade*` tests, `UpgradeApply.LegacyMacFlatInstallAcceptsOneAppAndSmallForwarder`, packaged seed manifest hashes, and gzip negotiation/content/cache tests.
+- Real staged daemon: 8 HTTP checks passed for gzip, identity, explicit gzip quality zero, concurrent fallback, SPA fallback and versioned SVG caching. Served HTML is 12,875,655 bytes decoded / 3,866,414 bytes gzip; decoded SHA-256 is `53833d3fc42a01a61e99829dfaf301490b5d2bd79efb26156789158d06dc95a8` and matches current dist with version substitution. Edge successfully started the actual compressed frontend. Isolated test processes/profiles were cleaned up; the existing installed Desktop processes were left running.
+- Browser test maintenance: the existing office preference test now reads the label span instead of concatenating shortcut badges; no production menu behavior was changed. The HTTP browser harness explicitly writes UTF-8 to Node stdin on Windows.
diff --git a/openspec/changes/slim-release-payloads/proposal.md b/openspec/changes/slim-release-payloads/proposal.md
new file mode 100644
index 000000000..94b5fd7ee
--- /dev/null
+++ b/openspec/changes/slim-release-payloads/proposal.md
@@ -0,0 +1,26 @@
+## Why
+
+v1.0.3 Windows 包解压后 42.75 MiB，其中前端 HTML 原文 12.26 MiB、内置专家 PNG 头像约 3.68 MiB；macOS 更新 ZIP 为兼容独立 CLI 重复携带完整 daemon 和资源，增加约 18.3 MiB 下载量。用户要求压缩前端、改用像素办公室头像并关联专家子 agent、去除 macOS 更新包重复载荷。
+
+## What Changes
+
+- 构建时确定性压缩可获益的内嵌前端资源，保留原始内容兼容路径和开发目录服务。
+- 将办公室现有人物模板和稳定外观算法提取为共享资源；内置专家使用同一像素头像身份，对应专家团子 agent 沿结构化专家绑定取得相同外观。
+- 移除已替换的内置专家大 PNG，升级种子清单，并保留用户自定义头像。
+- macOS 更新 ZIP 只携带一份完整应用和资源，以小型、签名且随应用公证的 CLI 转发入口维持旧版独立 CLI 的平铺更新兼容性。
+- 增加体积、资源完整性、头像身份关联和旧版更新路径回归检查。
+
+## Capabilities
+
+### New Capabilities
+
+- `compressed-web-assets`: 内嵌前端压缩存储、HTTP 编码协商和无损兼容。
+- `expert-office-avatars`: 专家和其子 agent 使用与像素办公室一致的稳定头像。
+
+### Modified Capabilities
+
+- `self-upgrade`: macOS 更新包去重，同时保留桌面与独立 CLI 升级入口和签名验证。
+
+## Impact
+
+涉及 CMake 资源生成器、静态资源接口与 HTTP 路由、前端专家和子 agent 展示、办公室内嵌页面、专家种子资源和元数据投影、macOS CLI 转发入口及打包验证。沿用现有 zlib 依赖；生成器使用 Python 标准库。保留当前分支、工作区其他改动，不发布或改变既有标签。
diff --git a/openspec/changes/slim-release-payloads/specs/compressed-web-assets/spec.md b/openspec/changes/slim-release-payloads/specs/compressed-web-assets/spec.md
new file mode 100644
index 000000000..c00931ed9
--- /dev/null
+++ b/openspec/changes/slim-release-payloads/specs/compressed-web-assets/spec.md
@@ -0,0 +1,24 @@
+## Purpose
+
+Reduce installed application size and static-resource transfer costs while preserving the complete offline frontend, existing URLs, MIME types, cache behavior, and development directory overrides.
+
+## ADDED Requirements
+
+### Requirement: Lossless compressed frontend delivery
+The packaged application SHALL store compressible frontend assets in compressed form when that reduces size, and SHALL deliver their complete original content with correct content types. Generation MUST be deterministic and preserve binary bytes and version substitution.
+
+#### Scenario: Browser accepts gzip
+- **WHEN** a browser requests a compressed embedded asset with gzip accepted
+- **THEN** the response carries gzip encoding and an appropriate Vary header, and decompresses to the original asset
+
+#### Scenario: Client does not accept gzip
+- **WHEN** a client omits gzip support or explicitly assigns gzip quality zero
+- **THEN** the same resource is returned uncompressed without a Content-Encoding header
+
+#### Scenario: Existing asset changes
+- **WHEN** a frontend file is modified without changing its name
+- **THEN** the next native build refreshes its embedded content
+
+#### Scenario: Development directory and incompressible assets
+- **WHEN** an asset comes from the configured development directory or compression would increase its size
+- **THEN** its original bytes remain available through the same resource URL
diff --git a/openspec/changes/slim-release-payloads/specs/expert-office-avatars/spec.md b/openspec/changes/slim-release-payloads/specs/expert-office-avatars/spec.md
new file mode 100644
index 000000000..f997832e7
--- /dev/null
+++ b/openspec/changes/slim-release-payloads/specs/expert-office-avatars/spec.md
@@ -0,0 +1,31 @@
+## Purpose
+
+Give built-in experts a compact recognizable pixel identity shared with the existing virtual office, so users can recognize the same expert across the catalog, team execution, and its live subagent without downloading separate portraits.
+
+## ADDED Requirements
+
+### Requirement: Shared pixel expert identity
+Built-in experts SHALL use portraits derived from the existing office character templates. An expert and a subagent bound to that expert SHALL have the same stable appearance in the catalog, subagent presentation, and virtual office. Identity MUST use structured expert and member bindings rather than display-name matching or session order.
+
+#### Scenario: Team delegates to an expert
+- **WHEN** a team spawns a subagent for a declared expert member
+- **THEN** its portrait and office character match that member's catalog identity even when the session ID changes
+
+#### Scenario: Expert is the session leader
+- **WHEN** an expert-bound root session is shown in the office
+- **THEN** its character uses the expert identity rather than the generic conductor appearance
+
+#### Scenario: Custom expert portrait
+- **WHEN** a user has configured a custom portrait or state portrait
+- **THEN** the configured image is preserved and remains available
+
+### Requirement: Compact built-in expert resources
+Release seed resources SHALL omit the replaced built-in photographic PNG portraits. Managed seed upgrades MUST retain user modifications and update only managed defaults under the existing seed reconciliation contract.
+
+#### Scenario: Fresh installation
+- **WHEN** built-in experts are seeded in an empty profile
+- **THEN** all experts have pixel identities without requiring the old portrait files
+
+#### Scenario: Existing modified expert
+- **WHEN** seed reconciliation encounters a user-modified expert package
+- **THEN** it preserves that package and its custom image resources
diff --git a/openspec/changes/slim-release-payloads/specs/self-upgrade/spec.md b/openspec/changes/slim-release-payloads/specs/self-upgrade/spec.md
new file mode 100644
index 000000000..0f5e03b0d
--- /dev/null
+++ b/openspec/changes/slim-release-payloads/specs/self-upgrade/spec.md
@@ -0,0 +1,20 @@
+## ADDED Requirements
+
+### Requirement: Deduplicated macOS update payload
+The macOS self-update archive SHALL contain a single complete signed application payload and a lightweight CLI forwarding entry, without a second copy of the daemon, Computer Use runtime, model catalog, or seed tree outside the application. It MUST remain consumable by the existing desktop and flat CLI updater, preserve executable permissions and argument boundaries, and keep strict signature and notarization checks for official releases.
+
+#### Scenario: Existing desktop installation updates
+- **WHEN** an existing desktop client consumes the deduplicated archive
+- **THEN** it finds, verifies and atomically installs the complete app through the existing app update path
+
+#### Scenario: Existing flat CLI installation updates
+- **WHEN** a client expecting a root acecode executable consumes the archive
+- **THEN** it installs the forwarding entry and app, and subsequent CLI invocations execute the bundled daemon with unchanged arguments and its bundled resources
+
+#### Scenario: Forwarding entry is invoked through PATH or a symbolic link
+- **WHEN** a user launches the CLI outside the installation directory
+- **THEN** it locates the app relative to the real launcher location and returns the daemon's exit behavior
+
+#### Scenario: Incomplete archive
+- **WHEN** the application, forwarding entry, required runtime, or bundled resources are missing
+- **THEN** package verification fails before publication
diff --git a/openspec/changes/slim-release-payloads/tasks.md b/openspec/changes/slim-release-payloads/tasks.md
new file mode 100644
index 000000000..47e6cd02f
--- /dev/null
+++ b/openspec/changes/slim-release-payloads/tasks.md
@@ -0,0 +1,20 @@
+## 1. Compressed frontend
+
+- [x] 1.1 Implement deterministic compressed resource generation and verify binary/control-byte round trips and incremental regeneration tests (2 Python tests passed).
+- [x] 1.2 Serve negotiated gzip with identity fallback and verify MIME, caching, q=0 handling and concurrent lookups in native tests (focused native suite and 8 real HTTP checks passed; actual bundled page started in Edge).
+
+## 2. Shared pixel expert identities
+
+- [x] 2.1 Extract the existing office character renderer and identity helpers; verify the same seed produces identical portrait and office pixels (unit tests, 9 avatar browser checks, 70 office regression checks, native-page inline-byte verification).
+- [x] 2.2 Carry expert/member identity through session and office projections and subagent UI; verify team lead/member/repeated-session associations and custom avatar preservation (C++ office HTTP/catalog identity test, pure JS and browser tests passed).
+- [x] 2.3 Replace built-in expert PNG resources with pixel defaults and update the seed manifest; verify fresh install, managed upgrade and user-modified package preservation (native seed suite passed, including both new portrait migration cases).
+
+## 3. macOS update deduplication
+
+- [x] 3.1 Build the small bundled CLI forwarder and verify paths, arguments, exit status and missing-payload failures with focused tests (3 real POSIX compiler/exec and package tests passed on WSL).
+- [x] 3.2 Package the app once plus the forwarding entry; update package/signature/resource checks and verify the old flat updater contract and desktop app discovery (real POSIX launcher/package tests, Windows old-flat-apply test and existing Mac bundle tests passed; native Apple trust checks remain in release CI).
+
+## 4. Integration and evidence
+
+- [x] 4.1 Run web tests/build, focused native tests/build, script tests, strict OpenSpec validation and scoped diff checks; record exact results and any unavailable native platform checks (all applicable Windows/WSL/browser gates passed; native Mac trust checks are explicitly pending the normal release environment).
+- [x] 4.2 Verify rendered expert/subagent/office identity, gzip HTTP/browser startup and before/after payload sizes; document the final behavior and measured savings (see design.md validation record and the daemon API/release-artifact documentation).
diff --git a/scripts/embed_web_assets.py b/scripts/embed_web_assets.py
new file mode 100644
index 000000000..a33297c45
--- /dev/null
+++ b/scripts/embed_web_assets.py
@@ -0,0 +1,59 @@
+#!/usr/bin/env python3
+"""Generate deterministic, losslessly compressed native frontend resources."""
+import argparse
+import gzip
+import io
+import json
+from pathlib import Path
+
+
+def encode_asset(data):
+    buffer = io.BytesIO()
+    with gzip.GzipFile(filename="", mode="wb", fileobj=buffer,
+                       compresslevel=9, mtime=0) as stream:
+        stream.write(data)
+    compressed = buffer.getvalue()
+    return (compressed, True) if len(compressed) < len(data) else (data, False)
+
+
+def generate(root, output, version):
+    entries = []
+    original_size = stored_size = 0
+    output.parent.mkdir(parents=True, exist_ok=True)
+    with output.open("w", encoding="utf-8", newline="\n") as stream:
+        stream.write('// Generated by embed_web_assets.py. DO NOT EDIT.\n'
+                     '#include "web/static_assets.hpp"\n'
+                     'namespace acecode::web {\n')
+        for path in sorted(root.rglob("*")) if root.exists() else []:
+            if not path.is_file() or path.name in {"README.md", ".gitignore"}:
+                continue
+            relative = path.relative_to(root).as_posix()
+            raw = path.read_bytes()
+            if relative == "index.html":
+                raw = raw.replace(b"__VERSION__", version.encode("utf-8"))
+            data, compressed = encode_asset(raw)
+            name = f"asset_{len(entries)}"
+            stream.write(f"static const unsigned char {name}[] = {{\n")
+            for offset in range(0, len(data), 24):
+                stream.write("".join(f"0x{byte:02x}," for byte in data[offset:offset + 24]) + "\n")
+            if not data:
+                stream.write("0\n")
+            stream.write("};\n")
+            entries.append(f"    {{{json.dumps(relative)}, {{{name}, {len(data)}, "
+                           f"{len(raw)}, {'true' if compressed else 'false'}}}}},\n")
+            original_size += len(raw)
+            stored_size += len(data)
+        stream.write("const std::map<std::string, EmbeddedAsset>& embedded_asset_map() {\n"
+                     "    static const std::map<std::string, EmbeddedAsset> assets = {\n")
+        stream.writelines(entries)
+        stream.write("    };\n    return assets;\n}\n}\n")
+    print(f"[acecode_embed_assets] {len(entries)} assets: {original_size} -> {stored_size} bytes")
+
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument("--root", required=True, type=Path)
+    parser.add_argument("--output", required=True, type=Path)
+    parser.add_argument("--version", required=True)
+    args = parser.parse_args()
+    generate(args.root, args.output, args.version)
diff --git a/scripts/macos_create_update_zip.sh b/scripts/macos_create_update_zip.sh
index 26bc8f42c..36466d9a0 100755
--- a/scripts/macos_create_update_zip.sh
+++ b/scripts/macos_create_update_zip.sh
@@ -8,11 +8,10 @@ Usage:
       --output <ACECode-version-macos-arch-update.zip> [--require-trusted]
 
 Creates a self-update ZIP with Apple's ditto tool. The archive contains the
-complete app plus a root `acecode` copied from its notarized bundled daemon and
-a root `share/acecode` resource tree so standalone CLI installs retain their
-existing flat upgrade path, offline model catalog, and default seed bundle. The
-command extracts into a clean temporary directory and verifies executable
-permissions/resources.
+complete app plus a small root `acecode` copied from its notarized bundled CLI
+forwarder. The daemon, helper and resources exist only inside the app; existing
+flat CLI updaters still find a root executable. The command extracts into a clean
+temporary directory and verifies executable permissions and bundled resources.
 --require-trusted also requires strict signatures, a stapled app ticket, and
 Gatekeeper acceptance; tagged release jobs use this mode after app notarization.
 USAGE
@@ -72,6 +71,16 @@ if [[ ! -d "$app_path" || "$(basename "$app_path")" != "ACECode.app" ]]; then
     exit 1
 fi
 computer_use_helper="$app_path/Contents/MacOS/acecode-computer-use"
+cli_launcher="$app_path/Contents/MacOS/acecode-cli"
+if [[ ! -x "$cli_launcher" || ! -s "$cli_launcher" ]]; then
+    echo "ACECode.app is missing the CLI forwarder: $cli_launcher" >&2
+    exit 1
+fi
+# A copied full daemon would silently restore the old duplicate payload.
+if [[ "$(wc -c < "$cli_launcher" | tr -d '[:space:]')" -gt 262144 ]]; then
+    echo "CLI forwarder exceeds the 256 KiB package budget" >&2
+    exit 1
+fi
 if [[ ! -x "$computer_use_helper" || ! -s "$computer_use_helper" ]]; then
     echo "ACECode.app is missing the Computer Use helper: $computer_use_helper" >&2
     exit 1
@@ -112,22 +121,11 @@ trap cleanup EXIT
 
 /usr/bin/ditto -c -k --keepParent "$app_path" "$temporary_zip"
 # The manifest target is shared by desktop and standalone CLI installations.
-# Reuse the already signed/notarized bundled daemon as the flat CLI payload.
-/usr/bin/ditto "$app_path/Contents/MacOS/acecode-daemon" \
-    "$temporary_root/acecode"
-/usr/bin/ditto "$computer_use_helper" "$temporary_root/acecode-computer-use"
-mkdir -p "$temporary_root/share/acecode"
-/usr/bin/ditto "$models_dev_dir" \
-    "$temporary_root/share/acecode/models_dev"
-/usr/bin/ditto "$seed_dir" \
-    "$temporary_root/share/acecode/seed"
-if [[ -d "$app_path/Contents/Resources/channels" ]]; then
-    /usr/bin/ditto "$app_path/Contents/Resources/channels" "$temporary_root/channels"
-fi
+# Reuse only the signed/notarized tiny launcher. All runtime data stays in the app.
+/usr/bin/ditto "$cli_launcher" "$temporary_root/acecode"
 (
     cd "$temporary_root"
-    /usr/bin/zip -qr "$temporary_zip" acecode acecode-computer-use share
-    if [[ -d channels ]]; then /usr/bin/zip -qr "$temporary_zip" channels; fi
+    /usr/bin/zip -q "$temporary_zip" acecode
 )
 mkdir -p "$verify_root"
 /usr/bin/ditto -x -k "$temporary_zip" "$verify_root"
@@ -137,24 +135,26 @@ app_main="$verified_app/Contents/MacOS/ACECode"
 app_daemon="$verified_app/Contents/MacOS/acecode-daemon"
 verified_cli="$verify_root/acecode"
 verified_app_models="$verified_app/Contents/Resources/share/acecode/models_dev"
-verified_cli_models="$verify_root/share/acecode/models_dev"
 verified_app_seed="$verified_app/Contents/Resources/share/acecode/seed"
-verified_cli_seed="$verify_root/share/acecode/seed"
 if [[ ! -d "$verified_app" || ! -x "$app_main" || ! -x "$app_daemon" ||
-      ! -x "$verified_cli" || ! -x "$verify_root/acecode-computer-use" ||
+      ! -x "$verified_cli" || ! -x "$verified_app/Contents/MacOS/acecode-cli" ||
       ! -x "$verified_app/Contents/MacOS/acecode-computer-use" ]]; then
     echo "Extracted update archive is missing executable ACECode app or CLI binaries." >&2
     exit 1
 fi
-if ! /usr/bin/cmp -s "$verify_root/acecode-computer-use" "$verified_app/Contents/MacOS/acecode-computer-use"; then
-    echo "Extracted Computer Use helpers differ between CLI and app payloads." >&2
+if ! /usr/bin/cmp -s "$verified_cli" "$verified_app/Contents/MacOS/acecode-cli"; then
+    echo "Extracted CLI forwarder differs from the signed app copy." >&2
     exit 1
 fi
+for duplicate in share channels acecode-computer-use; do
+    if [[ -e "$verify_root/$duplicate" ]]; then
+        echo "Duplicated macOS runtime resource: $duplicate" >&2
+        exit 1
+    fi
+done
 for models_dev_file in "${models_dev_files[@]}"; do
-    if [[ ! -f "$verified_app_models/$models_dev_file" ||
-          ! -f "$verified_cli_models/$models_dev_file" ]] ||
-       ! /usr/bin/cmp -s "$verified_app_models/$models_dev_file" \
-           "$verified_cli_models/$models_dev_file"; then
+    if [[ ! -f "$verified_app_models/$models_dev_file" ]] ||
+       ! /usr/bin/cmp -s "$verified_app_models/$models_dev_file" "$models_dev_dir/$models_dev_file"; then
         echo "Extracted update archive has missing or mismatched models.dev resource: $models_dev_file" >&2
         exit 1
     fi
@@ -162,14 +162,11 @@ done
 python3 "$repo_root/scripts/verify_seed_bundle.py" \
     --source "$repo_root/assets/seed" \
     --packaged "$verified_app_seed"
-python3 "$repo_root/scripts/verify_seed_bundle.py" \
-    --source "$repo_root/assets/seed" \
-    --packaged "$verified_cli_seed"
 
 if [[ "$require_trusted" == true ]]; then
     /usr/bin/codesign --verify --deep --strict --verbose=2 "$verified_app"
     /usr/bin/codesign --verify --strict --verbose=2 "$verified_cli"
-    /usr/bin/codesign --verify --strict --verbose=2 "$verify_root/acecode-computer-use"
+    /usr/bin/codesign --verify --strict --verbose=2 "$verified_app/Contents/MacOS/acecode-computer-use"
     xcrun stapler validate "$verified_app"
     /usr/sbin/spctl --assess --type execute --verbose=4 "$verified_app"
 fi
diff --git a/src/adapters/upgrade/macos_app_installer.mm b/src/adapters/upgrade/macos_app_installer.mm
index bb208d4a2..31745df91 100644
--- a/src/adapters/upgrade/macos_app_installer.mm
+++ b/src/adapters/upgrade/macos_app_installer.mm
@@ -413,12 +413,13 @@ bool install_macos_app_update(const fs::path& installed_bundle,
         NSFileManager* file_manager = [NSFileManager defaultManager];
         NSURL* installed_url = file_url(installed_bundle, YES);
         NSURL* candidate_url = file_url(candidate_bundle, YES);
-        const fs::path temporary_path = applications_dir /
-            (".ACECode-" + std::string([[[NSUUID UUID] UUIDString] UTF8String]) +
-             ".updating.app");
-        const fs::path previous_path = applications_dir /
-            (".ACECode-" + std::string([[[NSUUID UUID] UUIDString] UTF8String]) +
-             ".previous.app");
+        // The old bundle may still own running processes until restart. Keep
+        // its actual app name stable for macOS permission/display-name lookup.
+        MacosAppUpdateWorkspace workspace(applications_dir /
+            (".acecode-update-" + std::string([[[NSUUID UUID] UUIDString] UTF8String])));
+        if (!workspace.create(error)) return false;
+        const fs::path temporary_path = workspace.staged_bundle();
+        const fs::path previous_path = workspace.previous_bundle();
         NSURL* temporary_url = file_url(temporary_path, YES);
         NSURL* previous_url = file_url(previous_path, YES);
         if (!installed_url || !candidate_url || !temporary_url || !previous_url) {
@@ -481,9 +482,7 @@ bool install_macos_app_update(const fs::path& installed_bundle,
             !authenticate_candidate(previous_path, installed_bundle,
                                     expected_version, &final_error)) {
             std::string cleanup_error;
-            const fs::path failed_path = applications_dir /
-                (".ACECode-" + std::string([[[NSUUID UUID] UUIDString] UTF8String]) +
-                 ".failed.app");
+            const fs::path failed_path = workspace.failed_bundle();
             NSURL* failed_url = file_url(failed_path, YES);
             bool moved_failed = failed_url &&
                 move_item(file_manager, installed_url, failed_url, &cleanup_error);
diff --git a/src/adapters/upgrade/macos_bundle.cpp b/src/adapters/upgrade/macos_bundle.cpp
index e192a3108..280f6dfeb 100644
--- a/src/adapters/upgrade/macos_bundle.cpp
+++ b/src/adapters/upgrade/macos_bundle.cpp
@@ -3,9 +3,15 @@
 #include "utils/encoding.hpp"
 
 #include <algorithm>
+#include <cerrno>
 #include <cctype>
+#include <utility>
 #include <vector>
 
+#ifndef _WIN32
+#include <sys/stat.h>
+#endif
+
 namespace fs = std::filesystem;
 
 namespace acecode::upgrade {
@@ -35,10 +41,62 @@ bool is_complete_bundle_layout(const fs::path& bundle) {
 
 } // namespace
 
+MacosAppUpdateWorkspace::MacosAppUpdateWorkspace(fs::path root)
+    : root_(std::move(root)) {}
+
+MacosAppUpdateWorkspace::~MacosAppUpdateWorkspace() {
+    if (!owns_root_) return;
+    // remove (not remove_all) deliberately leaves every nonempty directory.
+    for (const auto& directory : {staged_bundle().parent_path(),
+            previous_bundle().parent_path(), failed_bundle().parent_path(), root_}) {
+        std::error_code ec;
+        if (is_real_directory(directory)) fs::remove(directory, ec);
+    }
+}
+
+fs::path MacosAppUpdateWorkspace::staged_bundle() const {
+    return root_ / "staging" / "ACECode.app";
+}
+
+fs::path MacosAppUpdateWorkspace::previous_bundle() const {
+    return root_ / "previous" / "ACECode.app";
+}
+
+fs::path MacosAppUpdateWorkspace::failed_bundle() const {
+    return root_ / "failed" / "ACECode.app";
+}
+
+bool MacosAppUpdateWorkspace::create(std::string* error) {
+    if (owns_root_) {
+        if (error) *error = "macOS update directory is already in use";
+        return false;
+    }
+    for (const auto& directory : {root_, staged_bundle().parent_path(),
+            previous_bundle().parent_path(), failed_bundle().parent_path()}) {
+        std::error_code ec;
+#ifdef _WIN32
+        const bool created = fs::create_directory(directory, ec);
+#else
+        // Atomically require a new private directory; never adopt a preexisting
+        // directory or follow a symlink at the selected update root.
+        const bool created = ::mkdir(directory.c_str(), S_IRWXU) == 0;
+        if (!created) ec = std::error_code(errno, std::generic_category());
+#endif
+        if (!created) {
+            if (error) *error = "cannot create private macOS update directory: " +
+                directory.u8string() + ": " +
+                (ec ? ensure_utf8(ec.message()) : "path already exists");
+            return false;
+        }
+        if (directory == root_) owns_root_ = true;
+    }
+    return true;
+}
+
 bool macos_app_install_path_is_safe(const fs::path& bundle, std::string* error) {
     auto reject = [&]() {
         if (error) *error = "macOS self-update requires an absolute real ACECode.app "
-            "with a real parent, outside App Translocation and other app bundles";
+            "with a real parent, outside App Translocation, update copies and other app bundles";
         return false;
     };
     if (!bundle.is_absolute() || bundle != bundle.lexically_normal() ||
@@ -47,7 +105,7 @@ bool macos_app_install_path_is_safe(const fs::path& bundle, std::string* error)
         std::string name = component.string();
         std::transform(name.begin(), name.end(), name.begin(),
             [](unsigned char c) { return static_cast<char>(std::tolower(c)); });
-        if (name == "apptranslocation" ||
+        if (name == "apptranslocation" || name.rfind(".acecode-update-", 0) == 0 ||
             fs::path(name).extension() == ".app") return reject();
     }
     std::error_code ec;
diff --git a/src/adapters/upgrade/macos_bundle.hpp b/src/adapters/upgrade/macos_bundle.hpp
index 6ff37f191..28f73147c 100644
--- a/src/adapters/upgrade/macos_bundle.hpp
+++ b/src/adapters/upgrade/macos_bundle.hpp
@@ -6,8 +6,28 @@
 
 namespace acecode::upgrade {
 
+// Owns only newly created update directories. Destruction removes empty
+// containers, never application copies needed by a running process or rollback.
+class MacosAppUpdateWorkspace {
+public:
+    explicit MacosAppUpdateWorkspace(std::filesystem::path root);
+    ~MacosAppUpdateWorkspace();
+    MacosAppUpdateWorkspace(const MacosAppUpdateWorkspace&) = delete;
+    MacosAppUpdateWorkspace& operator=(const MacosAppUpdateWorkspace&) = delete;
+
+    bool create(std::string* error = nullptr);
+    std::filesystem::path staged_bundle() const;
+    std::filesystem::path previous_bundle() const;
+    std::filesystem::path failed_bundle() const;
+
+private:
+    std::filesystem::path root_;
+    bool owns_root_ = false;
+};
+
 // Require an absolute, canonical, real ACECode.app and parent; reject App
-// Translocation and bundles nested in another application. Does not check trust.
+// Translocation, update copies and bundles nested in another application.
+// Does not check trust.
 bool macos_app_install_path_is_safe(
     const std::filesystem::path& bundle,
     std::string* error = nullptr);
diff --git a/src/apps/daemon/im_channels.cpp b/src/apps/daemon/im_channels.cpp
index 587d60c17..ec913c878 100644
--- a/src/apps/daemon/im_channels.cpp
+++ b/src/apps/daemon/im_channels.cpp
@@ -57,6 +57,26 @@ std::unique_ptr<channels::core::ChannelHost> make_im_channel_host(ImChannelDeps
         }
         return registry->switch_model(id, *profile, nullptr, error);
     };
+    conversation.set_permission_mode = [registry](const std::string& id, const std::string& mode) {
+        const auto parsed = PermissionManager::parse_mode_name(mode);
+        return parsed && registry->set_permission_mode(id, *parsed);
+    };
+    conversation.model_state = [registry](const std::string& id) { return registry->current_model_state(id); };
+    conversation.set_reasoning_effort = [registry](const std::string& id,
+                                                  const std::optional<std::string>& effort,
+                                                  std::string* error) -> std::optional<SessionModelState> {
+        const auto result = registry->set_reasoning_effort(id, effort);
+        if (result.status == SessionReasoningStatus::Updated) return result.state;
+        if (error) {
+            switch (result.status) {
+                case SessionReasoningStatus::InvalidEffort: *error = "当前模型不支持该 effort 档位"; break;
+                case SessionReasoningStatus::UnknownSession: *error = "会话不存在"; break;
+                case SessionReasoningStatus::Unavailable: *error = "当前会话模型不可用"; break;
+                default: *error = "更新思考深度失败,原设置已保留"; break;
+            }
+        }
+        return std::nullopt;
+    };
     // 与 Web 输入相同的展开顺序:先 opencode 命令,再技能命令。
     conversation.expand_skill = [config, config_mu, registry](const std::string& id, const std::string& text) {
         if (auto entry = registry->acquire(id); entry && !entry->cwd.empty()) {
diff --git a/src/apps/desktop/macos_cli_launcher.cpp b/src/apps/desktop/macos_cli_launcher.cpp
new file mode 100644
index 000000000..a288a4860
--- /dev/null
+++ b/src/apps/desktop/macos_cli_launcher.cpp
@@ -0,0 +1,52 @@
+// Small, signed CLI entry for the deduplicated macOS update archive.
+// exec preserves terminal I/O, argument boundaries, signals and exit status.
+#include <cerrno>
+#include <cstdio>
+#include <cstdint>
+#include <cstring>
+#include <filesystem>
+#include <vector>
+#include <unistd.h>
+#ifdef __APPLE__
+#include <mach-o/dyld.h>
+#endif
+
+namespace {
+std::filesystem::path launcher_path() {
+#ifdef __APPLE__
+    std::uint32_t size = 0;
+    _NSGetExecutablePath(nullptr, &size);
+    std::vector<char> path(size);
+    if (_NSGetExecutablePath(path.data(), &size) != 0) return {};
+    return std::filesystem::canonical(path.data());
+#else
+    // Linux permits exercising the actual exec path in portable packaging tests.
+    return std::filesystem::canonical("/proc/self/exe");
+#endif
+}
+} // namespace
+
+int main(int argc, char** argv) {
+    try {
+        const auto parent = launcher_path().parent_path();
+        const bool bundled = parent.filename() == "MacOS" &&
+                             parent.parent_path().filename() == "Contents" &&
+                             parent.parent_path().parent_path().filename() == "ACECode.app";
+        const auto daemon = bundled ? parent / "acecode-daemon"
+            : parent / "ACECode.app" / "Contents" / "MacOS" / "acecode-daemon";
+        const std::string executable = daemon.string();
+        std::vector<char*> arguments;
+        arguments.reserve(static_cast<std::size_t>(argc) + 1);
+        arguments.push_back(const_cast<char*>(executable.c_str()));
+        for (int i = 1; i < argc; ++i) arguments.push_back(argv[i]);
+        arguments.push_back(nullptr);
+        ::execv(executable.c_str(), arguments.data());
+        const int code = errno;
+        std::fprintf(stderr, "ACECode CLI: cannot start %s: %s\n",
+                     executable.c_str(), std::strerror(code));
+        return code == ENOENT ? 127 : 126;
+    } catch (const std::exception& error) {
+        std::fprintf(stderr, "ACECode CLI: cannot locate the installed application: %s\n", error.what());
+        return 126;
+    }
+}
diff --git a/src/apps/desktop/main.cpp b/src/apps/desktop/main.cpp
index 564a8e44c..85f5d1270 100644
--- a/src/apps/desktop/main.cpp
+++ b/src/apps/desktop/main.cpp
@@ -2053,6 +2053,9 @@ int main(int argc, char** argv) {
         bring_window_foreground();
         return nlohmann::json{{"ok", true}}.dump();
     });
+    host.bind("aceDesktop_focusActiveWebview", [&host](const std::string& /*req*/) -> std::string {
+        return nlohmann::json{{"ok", host.focus_active_webview()}}.dump();
+    });
 #ifdef _WIN32
     host.bind("aceDesktop_setTaskbarBadge", [&host](const std::string& req) -> std::string {
         const auto badge = parse_taskbar_badge_args(req);
@@ -2074,9 +2077,7 @@ int main(int argc, char** argv) {
         return nlohmann::json{{"ok", host.focus_after_file_drop()}}.dump();
     });
 
-    // WM_SIZE 时如果最大化状态变化(被 web_host.cpp 内部 g_last_known_maximized 去重过),
-    // eval 一段 JS 调前端 window.aceDesktop_onMaximizeStateChanged(bool),让 TopBar 切换
-    // 图标。前端没注册回调时静默吞,避免 webview 异常 ts 上报。
+    // 去重后的原生最大化状态同步到 TopBar；前端尚未注册回调时忽略。
     host.set_window_state_change_handler([&host, &agent_browser](bool maximized) {
         agent_browser.refresh_layout();
         const std::string js = std::string(
@@ -2100,9 +2101,7 @@ int main(int argc, char** argv) {
         agent_browser.set_parent_visible(visible);
     });
 
-    // Native window activation does not consistently reach WebView2 as a DOM
-    // focus event. Send an explicit event after WM_ACTIVATE so a visible chat
-    // composer can restore keyboard focus without requiring another click.
+    // Explicit native activation lets the visible composer restore keyboard focus.
     host.set_window_focus_handler([&host, &agent_browser]() {
         agent_browser.set_parent_visible(true);
         host.eval("(function(){try{window.dispatchEvent(new Event("
diff --git a/src/apps/desktop/web_host.cpp b/src/apps/desktop/web_host.cpp
index 84b9e1135..2bcc0c0e9 100644
--- a/src/apps/desktop/web_host.cpp
+++ b/src/apps/desktop/web_host.cpp
@@ -70,6 +70,8 @@
 #  undef Success
 #endif
 
+#include "web_host_focus.hpp"
+
 namespace acecode::desktop {
 
 namespace {
@@ -86,6 +88,8 @@ WebHost::FileDropHandler g_file_drop_handler;
 // main.cpp uses this GUI-thread callback to consume its one-shot open request.
 std::function<void()> g_existing_instance_focus_handler;
 
+using detail::window_focus_handler;
+
 #ifdef __APPLE__
 std::function<void(bool)> g_mac_window_state_handler;
 bool g_mac_last_known_maximized = false;
@@ -98,11 +102,7 @@ MacApplicationReopenImp g_mac_original_reopen_imp = nullptr;
 NSString* const kAceCodeFocusExistingNotification =
     @"dev.acecode.desktop.focusExisting.v1";
 
-NSWindow* mac_window_from_host(webview::webview& w) {
-    auto window_result = w.window();
-    if (!window_result.ok() || !window_result.value()) return nil;
-    return static_cast<NSWindow*>(window_result.value());
-}
+using detail::mac_window_from_host;
 
 void notify_mac_window_state_if_changed(NSWindow* window) {
     if (!window) return;
@@ -112,6 +112,7 @@ void notify_mac_window_state_if_changed(NSWindow* window) {
     if (g_mac_window_state_handler) {
         g_mac_window_state_handler(maximized);
     }
+    if ([window isKeyWindow] && window_focus_handler) window_focus_handler();
 }
 
 bool mac_window_is_fullscreen(NSWindow* window) {
@@ -174,6 +175,7 @@ void notify_mac_window_fullscreen_if_changed(NSWindow* window) {
     if (g_mac_window_fullscreen_handler) {
         g_mac_window_fullscreen_handler(fullscreen);
     }
+    if ([window isKeyWindow] && window_focus_handler) window_focus_handler();
 }
 
 id install_mac_window_fullscreen_observer(webview::webview& w,
@@ -711,11 +713,6 @@ void notify_window_visibility(bool visible) {
     if (g_window_visibility_handler) g_window_visibility_handler(visible);
 }
 
-// WebView2 does not reliably turn a native top-level activation into a DOM
-// window.focus event. The Desktop main process uses this callback to dispatch
-// an explicit frontend event after the host has completed WM_ACTIVATE handling.
-std::function<void()> g_window_focus_handler;
-
 // 单例联动:第二次启动 acecode-desktop 会向已有 host window 派 focus msg,
 // 让我们把窗口拉前 + 显示。同名 RegisterWindowMessageW 在两端拿到一致 UINT,
 // 见 single_instance_win.cpp 头注。第一次访问时 lazily register,缓存到 static。
@@ -1373,8 +1370,8 @@ LRESULT CALLBACK host_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa
         case WM_ACTIVATE: {
             const LRESULT result = call_host_default_proc(hwnd, msg, wparam, lparam);
             if (LOWORD(wparam) != WA_INACTIVE && !::IsIconic(hwnd) &&
-                g_window_focus_handler) {
-                g_window_focus_handler();
+                window_focus_handler) {
+                window_focus_handler();
             }
             return result;
         }
@@ -1406,13 +1403,17 @@ LRESULT CALLBACK host_window_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa
             // 拉满整个客户区,所以先让它跑完,再按顶边线让位重新摆放。
             const LRESULT result = call_host_default_proc(hwnd, msg, wparam, lparam);
             resize_webview_widget(hwnd);
+            const bool was_visible = g_last_known_window_visible;
+            const bool maximized = ::IsZoomed(hwnd) != FALSE;
+            const bool state_changed = maximized != g_last_known_maximized;
+            g_last_known_maximized = maximized;
             notify_window_visibility(wparam != SIZE_MINIMIZED);
-            if (g_window_state_handler) {
-                const bool maximized = ::IsZoomed(hwnd) != FALSE;
-                if (maximized != g_last_known_maximized) {
-                    g_last_known_maximized = maximized;
-                    g_window_state_handler(maximized);
-                }
+            if (state_changed && g_window_state_handler) {
+                g_window_state_handler(maximized);
+            }
+            if (wparam != SIZE_MINIMIZED && (state_changed || !was_visible) &&
+                ::GetForegroundWindow() == hwnd && window_focus_handler) {
+                window_focus_handler();
             }
             return result;
         }
@@ -1905,7 +1906,7 @@ extern "C" int linux_window_delete_event(void*, void*, void*) {
     return dispatch_wm_close(g_close_handler) == CloseDispatch::ConsumedByHandler ? 1 : 0;
 }
 
-extern "C" int linux_window_state_event(void*, GdkEventWindowStateCompat* event, void*) {
+extern "C" int linux_window_state_event(void* window, GdkEventWindowStateCompat* event, void*) {
     const bool maximized = event &&
         ((event->new_window_state & kGdkWindowStateMaximized) != 0);
     if (maximized != g_linux_last_known_maximized) {
@@ -1914,6 +1915,12 @@ extern "C" int linux_window_state_event(void*, GdkEventWindowStateCompat* event,
             g_linux_window_state_handler(maximized);
         }
     }
+    if (event && (event->changed_mask & (GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_MAXIMIZED |
+                                      GDK_WINDOW_STATE_FULLSCREEN)) &&
+        !(event->new_window_state & GDK_WINDOW_STATE_ICONIFIED) &&
+        gtk_window_is_active(GTK_WINDOW(window)) && window_focus_handler) {
+        window_focus_handler();
+    }
     return 0;
 }
 
@@ -1933,6 +1940,7 @@ void install_linux_close_handler(webview::webview& w) {
 void install_linux_window_state_handler(webview::webview& w) {
     auto window = w.window();
     if (!window.ok() || !window.value()) return;
+    detail::install_linux_window_focus_handler(w);
     auto& api = gtk_window_api();
     if (!api.load()) return;
     api.signal_connect_data(window.value(),
@@ -2160,16 +2168,10 @@ struct WebHost::Impl {
           center_on_first_show(
               startup_mode == StartupWindowMode::OffscreenUntilReady),
           com(custom_window != nullptr) {
-        // 三段式构造:
-        //   (1) 默认 Loader 路径,优先 offscreen custom_window;失败 → 切
-        //       自管 nullptr 父窗口再试一次(沿用现有降级)。
-        //   (2) (1) 整段还是抛 → 探测 Edge 浏览器 / EdgeWebView Runtime
-        //       自带的 msedgewebview2.exe 目录,通过
-        //       WEBVIEW2_BROWSER_EXECUTABLE_FOLDER 环境变量(WebView2Loader.dll
-        //       公开的覆盖钩子)指过去再试。
-        //   (3) Edge fallback 仍失败或没找到 Edge → 抛 WebHostInitializationError
-        //       给 desktop main。main 还有最后一层 Edge --app=<daemon URL>
-        //       兜底,不能在 WebHost 构造函数里直接 ExitProcess。
+        // 优先使用离屏宿主；失败后切为 webview 自有窗口重试。
+        // 默认 Loader 仍失败时，探测系统 Edge/WebView Runtime 目录，
+        // 通过 WEBVIEW2_BROWSER_EXECUTABLE_FOLDER 重新装载。
+        // 最后抛 WebHostInitializationError，由 main 的 Edge --app 兜底；禁止直接 ExitProcess。
 
         // WebView2 创建之前把默认打底色钉进环境变量。官方文档:仅靠
         // put_DefaultBackgroundColor 属性,首帧之前仍会闪默认白;环境变量是
@@ -2260,6 +2262,7 @@ struct WebHost::Impl {
         configure_mac_window_chrome(*w);
         install_mac_edit_menu(*w);
         mac_focus_observer = install_mac_focus_existing_observer(*w);
+        mac_window_focus = std::make_unique<detail::MacWindowFocusObservers>(*w);
         mac_enter_fullscreen_observer = install_mac_window_fullscreen_observer(
             *w, NSWindowDidEnterFullScreenNotification);
         mac_exit_fullscreen_observer = install_mac_window_fullscreen_observer(
@@ -2298,6 +2301,7 @@ struct WebHost::Impl {
 #endif
 
     ~Impl() {
+        window_focus_handler = {};
 #ifdef _WIN32
         taskbar_badge.reset();
         HWND hwnd = custom_window;
@@ -2315,6 +2319,7 @@ struct WebHost::Impl {
             [[NSDistributedNotificationCenter defaultCenter] removeObserver:mac_focus_observer];
             mac_focus_observer = nil;
         }
+        mac_window_focus.reset();
         if (mac_enter_fullscreen_observer) {
             [[NSNotificationCenter defaultCenter]
                 removeObserver:mac_enter_fullscreen_observer];
@@ -2363,6 +2368,7 @@ struct WebHost::Impl {
 #endif
 #ifdef __APPLE__
     id mac_focus_observer = nil;
+    std::unique_ptr<detail::MacWindowFocusObservers> mac_window_focus;
     id mac_enter_fullscreen_observer = nil;
     id mac_exit_fullscreen_observer = nil;
 #endif
@@ -2500,19 +2506,17 @@ bool WebHost::focus_after_file_drop() {
         ::AttachThreadInput(current_thread, foreground_thread, TRUE) != FALSE;
     set_visible(true);
     if (attached) ::AttachThreadInput(current_thread, foreground_thread, FALSE);
-    if (::GetForegroundWindow() != hwnd) return false;
-
-    auto controller_result = impl_->w->browser_controller();
-    if (!controller_result.ok()) return false;
-    auto* controller = static_cast<ICoreWebView2Controller*>(controller_result.value());
-    return controller && SUCCEEDED(
-        controller->MoveFocus(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC));
+    return focus_active_webview();
 #else
     set_visible(true);
     return true;
 #endif
 }
 
+bool WebHost::focus_active_webview() {
+    return detail::focus_active_webview(*impl_->w);
+}
+
 bool WebHost::open_dev_tools() {
 #ifdef _WIN32
     auto controller_result = impl_->w->browser_controller();
@@ -2740,11 +2744,7 @@ void WebHost::set_window_visibility_handler(WindowVisibilityHandler handler) {
 #endif
 }
 void WebHost::set_window_focus_handler(WindowFocusHandler handler) {
-#ifdef _WIN32
-    g_window_focus_handler = std::move(handler);
-#else
-    (void)handler;
-#endif
+    window_focus_handler = std::move(handler);
 }
 void WebHost::set_existing_instance_focus_handler(
     ExistingInstanceFocusHandler handler) {
diff --git a/src/apps/desktop/web_host.hpp b/src/apps/desktop/web_host.hpp
index 9e563e149..f977435ad 100644
--- a/src/apps/desktop/web_host.hpp
+++ b/src/apps/desktop/web_host.hpp
@@ -67,6 +67,9 @@ class WebHost {
     // Called once when a file drop is accepted, before asynchronous work.
     // Restore OS keyboard focus without the notification TOPMOST fallback.
     bool focus_after_file_drop();
+
+    // Transfer keyboard focus inside the already-active window; never foreground it.
+    bool focus_active_webview();
     acecode::ClipboardPathsReadResult read_clipboard_paths();
 
     // 注入一段 JS 在每次 navigate 前执行(`window.__ACECODE_INITIAL_*` 之类常量
@@ -146,8 +149,8 @@ class WebHost {
     using WindowVisibilityHandler = std::function<void(bool visible)>;
     void set_window_visibility_handler(WindowVisibilityHandler handler);
 
-    // Windows host activation is not guaranteed to surface as a DOM window.focus
-    // event in WebView2. Register a native activation callback so the frontend can
+    // Native activation is not guaranteed to surface as a DOM window.focus
+    // event. Register a GUI-thread activation callback so the frontend can
     // explicitly restore the chat composer focus after the Desktop window returns.
     using WindowFocusHandler = std::function<void()>;
     void set_window_focus_handler(WindowFocusHandler handler);
diff --git a/src/apps/desktop/web_host_focus.hpp b/src/apps/desktop/web_host_focus.hpp
new file mode 100644
index 000000000..73cb4aa7f
--- /dev/null
+++ b/src/apps/desktop/web_host_focus.hpp
@@ -0,0 +1,88 @@
+#pragma once
+
+#include <functional>
+#include <webview/webview.h>
+
+#ifdef __APPLE__
+#import <AppKit/AppKit.h>
+#elif !defined(_WIN32)
+#include <gtk/gtk.h>
+#endif
+
+namespace acecode::desktop::detail {
+
+// Single GUI-thread host callback, cleared before the native window is destroyed.
+inline std::function<void()> window_focus_handler;
+
+inline bool focus_active_webview(webview::webview& host) {
+    auto window = host.window();
+    if (!window.ok() || !window.value()) return false;
+#ifdef _WIN32
+    auto hwnd = static_cast<HWND>(window.value());
+    if (::GetForegroundWindow() != hwnd || ::IsIconic(hwnd) || !::IsWindowVisible(hwnd)) return false;
+    auto controller_result = host.browser_controller();
+    if (!controller_result.ok()) return false;
+    auto* controller = static_cast<ICoreWebView2Controller*>(controller_result.value());
+    return controller && SUCCEEDED(controller->MoveFocus(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC));
+#else
+    auto widget = host.widget();
+    if (!widget.ok() || !widget.value()) return false;
+#ifdef __APPLE__
+    auto* native_window = static_cast<NSWindow*>(window.value());
+    if (![native_window isKeyWindow] || ![native_window isVisible] || [native_window isMiniaturized]) return false;
+    return [native_window makeFirstResponder:static_cast<NSView*>(widget.value())] == YES;
+#else
+    if (!gtk_window_is_active(GTK_WINDOW(window.value())) ||
+        !gtk_widget_get_mapped(GTK_WIDGET(window.value()))) return false;
+    gtk_widget_grab_focus(GTK_WIDGET(widget.value()));
+    return gtk_widget_has_focus(GTK_WIDGET(widget.value())) != FALSE;
+#endif
+#endif
+}
+
+#ifdef __APPLE__
+inline NSWindow* mac_window_from_host(webview::webview& host) {
+    auto window = host.window();
+    return window.ok() ? static_cast<NSWindow*>(window.value()) : nil;
+}
+
+class MacWindowFocusObservers {
+public:
+    explicit MacWindowFocusObservers(webview::webview& host) {
+        auto* window = mac_window_from_host(host);
+        if (!window) return;
+        key_ = observe(window, NSWindowDidBecomeKeyNotification);
+        restore_ = observe(window, NSWindowDidDeminiaturizeNotification);
+    }
+    ~MacWindowFocusObservers() {
+        if (key_) [[NSNotificationCenter defaultCenter] removeObserver:key_];
+        if (restore_) [[NSNotificationCenter defaultCenter] removeObserver:restore_];
+    }
+    MacWindowFocusObservers(const MacWindowFocusObservers&) = delete;
+    MacWindowFocusObservers& operator=(const MacWindowFocusObservers&) = delete;
+
+private:
+    static id observe(NSWindow* window, NSNotificationName name) {
+        return [[NSNotificationCenter defaultCenter]
+            addObserverForName:name object:window queue:[NSOperationQueue mainQueue]
+            usingBlock:^(__unused NSNotification* note) {
+                if ([window isKeyWindow] && window_focus_handler) window_focus_handler();
+            }];
+    }
+    id key_ = nil;
+    id restore_ = nil;
+};
+#elif !defined(_WIN32)
+inline void install_linux_window_focus_handler(webview::webview& host) {
+    auto window = host.window();
+    if (!window.ok() || !window.value()) return;
+    // The signal and its stateless callback are destroyed with the GTK window.
+    g_signal_connect(window.value(), "focus-in-event",
+        G_CALLBACK(+[](GtkWidget*, GdkEventFocus*, gpointer) -> gboolean {
+            if (window_focus_handler) window_focus_handler();
+            return FALSE;
+        }), nullptr);
+}
+#endif
+
+} // namespace acecode::desktop::detail
diff --git a/src/apps/web/handlers/skills_handler.cpp b/src/apps/web/handlers/skills_handler.cpp
index d2737ad53..35939a4c4 100644
--- a/src/apps/web/handlers/skills_handler.cpp
+++ b/src/apps/web/handlers/skills_handler.cpp
@@ -1,4 +1,5 @@
 #include "skills_handler.hpp"
+#include "config/config_mutation.hpp"
 
 #include "skills/skill_init.hpp"
 #include "skills/skill_activation.hpp"
@@ -83,13 +84,63 @@ SkillRootSelection select_skill_root(const fs::path& workspace_cwd,
     return {global_norm, "global_acecode", global_norm};
 }
 
-SkillRootSelection resolve_skill_root_for_cwd(const std::string& workspace_cwd_utf8) {
+SkillRootSelection resolve_skill_root_for_cwd(const std::string& workspace_cwd_utf8,
+                                             const AppConfig* config) {
+    if (config && config->skills.scan_paths) {
+        const auto projects = project_skill_scan_roots(*config, workspace_cwd_utf8);
+        const auto globals = global_skill_scan_roots(*config);
+        const fs::path global = globals.empty() ? fs::path{} : globals.front();
+        return {projects.empty() ? global : projects.front(),
+                projects.empty() ? "global_configured" : "project_configured", global};
+    }
     fs::path cwd;
     if (!workspace_cwd_utf8.empty()) cwd = acecode::path_from_utf8(workspace_cwd_utf8);
     const auto global_root = acecode::path_from_utf8(get_acecode_dir()) / "skills";
     return select_skill_root(cwd, global_root, true);
 }
 
+nlohmann::json skill_scan_paths_payload(const AppConfig& config) {
+    const auto defaults = default_skill_scan_paths(config);
+    return {{"paths", config.skills.scan_paths.value_or(defaults)},
+            {"default_paths", defaults},
+            {"customized", config.skills.scan_paths.has_value()}};
+}
+
+SkillToggleResult set_skill_scan_paths(const nlohmann::json& body,
+                                       AppConfig& config,
+                                       const std::string& config_path) {
+    auto invalid = [](const char* message) -> SkillToggleResult {
+        return {false, 400, {{"error", message}}};
+    };
+    if (!body.is_object() || !body.contains("paths")) {
+        return invalid("paths (string array or null) required");
+    }
+    std::optional<std::vector<std::string>> paths;
+    if (!body["paths"].is_null()) {
+        if (!body["paths"].is_array()) return invalid("paths must be a string array or null");
+        paths.emplace();
+        for (const auto& value : body["paths"]) {
+            if (!value.is_string()) return invalid("each scan path must be a string");
+            const auto raw = value.get<std::string>();
+            if (raw.find_first_of(std::string("\0\r\n", 3)) != std::string::npos) {
+                return invalid("scan paths must not contain NUL or line breaks");
+            }
+            const auto begin = raw.find_first_not_of(" \t");
+            if (begin == std::string::npos) return invalid("scan paths must not be blank");
+            paths->push_back(raw.substr(begin, raw.find_last_not_of(" \t") - begin + 1));
+        }
+    }
+    const auto result = mutate_config([paths](AppConfig& candidate, std::string&) {
+        if (candidate.skills.scan_paths == paths) return false;
+        candidate.skills.scan_paths = paths;
+        return true;
+    }, config_path, &config);
+    if (!result.ok) return {false, 500, {{"error", result.error}}};
+    // Keep environment/runtime-only settings in the active config untouched.
+    config.skills.scan_paths = result.config.skills.scan_paths;
+    return {true, 200, skill_scan_paths_payload(config)};
+}
+
 SkillToggleResult set_skill_enabled(const std::string& name,
                                        bool enabled,
                                        AppConfig& cfg,
@@ -146,7 +197,8 @@ nlohmann::json build_skills_payload_with_roots(
     const std::vector<std::string>& disabled_list,
     const SkillUsageStore* skill_usage,
     std::int64_t now_epoch_ms,
-    int idle_days) {
+    int idle_days,
+    const std::vector<fs::path>* ordered_roots) {
     // 扫描时 disabled 置空 —— 禁用中的 skill 也保留完整元数据(描述/来源),
     // 而不是像旧实现那样只剩一个名字。
     std::unordered_set<std::string> project_root_keys;
@@ -156,6 +208,7 @@ nlohmann::json build_skills_payload_with_roots(
 
     std::vector<fs::path> roots = project_roots;
     roots.insert(roots.end(), global_roots.begin(), global_roots.end());
+    if (ordered_roots) roots = *ordered_roots;
 
     SkillRegistry registry;
     registry.set_scan_roots(std::move(roots));
@@ -178,7 +231,6 @@ nlohmann::json build_skills_payload_with_roots(
     }
 
     nlohmann::json arr = nlohmann::json::array();
-    std::unordered_set<std::string> listed;
     for (const auto& s : registry.list()) {
         nlohmann::json o;
         o["name"]        = s.name;
@@ -203,25 +255,6 @@ nlohmann::json build_skills_payload_with_roots(
             o["pinned"]    = false;
             o["dormant"]   = false;
         }
-        listed.insert(s.name);
-        arr.push_back(std::move(o));
-    }
-
-    // 幽灵条目:disabled 里残留、但磁盘上已经找不到的名字。仍然列出,
-    // 让用户能从禁用列表里清掉它。
-    for (const auto& name : disabled_list) {
-        if (listed.count(name)) continue;
-        nlohmann::json o;
-        o["name"]        = name;
-        o["command_key"] = name;
-        o["description"] = "";
-        o["category"]    = "";
-        o["enabled"]     = false;
-        o["source"]      = "";
-        o["useCount"]    = 0;
-        o["lastUsedAt"]  = "";
-        o["pinned"]      = false;
-        o["dormant"]     = false;
         arr.push_back(std::move(o));
     }
     return arr;
@@ -237,13 +270,14 @@ nlohmann::json build_skills_payload(const AppConfig& cfg,
                 std::chrono::system_clock::now().time_since_epoch())
                 .count();
     }
+    const auto roots = skill_scan_roots(cfg, workspace_cwd_utf8);
     return build_skills_payload_with_roots(
         project_skill_scan_roots(cfg, workspace_cwd_utf8),
         global_skill_scan_roots(cfg),
         cfg.skills.disabled,
         skill_usage,
         now_epoch_ms,
-        cfg.skills.idle_days);
+        cfg.skills.idle_days, &roots);
 }
 
 } // namespace acecode::web
diff --git a/src/apps/web/handlers/skills_handler.hpp b/src/apps/web/handlers/skills_handler.hpp
index ea48789fd..5e93ca829 100644
--- a/src/apps/web/handlers/skills_handler.hpp
+++ b/src/apps/web/handlers/skills_handler.hpp
@@ -42,7 +42,13 @@ SkillRootSelection select_skill_root(const std::filesystem::path& workspace_cwd,
                                      const std::filesystem::path& global_acecode_skills_root,
                                      bool create_missing_roots);
 
-SkillRootSelection resolve_skill_root_for_cwd(const std::string& workspace_cwd_utf8);
+SkillRootSelection resolve_skill_root_for_cwd(const std::string& workspace_cwd_utf8,
+                                             const AppConfig* config = nullptr);
+
+nlohmann::json skill_scan_paths_payload(const AppConfig& config);
+SkillToggleResult set_skill_scan_paths(const nlohmann::json& body,
+                                       AppConfig& config,
+                                       const std::string& config_path);
 
 // 切换 skill 启停。config_path 空 = 用 save_config 默认路径(~/.acecode/config.json)。
 // lookup_registry:可选的"已知性"校验 registry(如某个 workspace 的临时扫描
@@ -64,15 +70,16 @@ std::optional<std::string> get_skill_body(const std::string& name,
 // disabled),每条带
 //   - enabled:name 不在 disabled 中
 //   - source:"project"(命中 project_roots)/ "global"(其余根)
-// disabled 中磁盘上已不存在的名字(幽灵条目)仍以 enabled=false、source=""
-// 列出,让用户能把它从禁用列表里放出来。
+// 只列出实际扫描到的技能。disabled 中未扫描到的名字不会生成条目;
+// 刷新不清理禁用偏好,以便其他工作区或恢复后的同名技能仍保持禁用。
 nlohmann::json build_skills_payload_with_roots(
     const std::vector<std::filesystem::path>& project_roots,
     const std::vector<std::filesystem::path>& global_roots,
     const std::vector<std::string>& disabled,
     const SkillUsageStore* skill_usage = nullptr,
     std::int64_t now_epoch_ms = 0,
-    int idle_days = 0);
+    int idle_days = 0,
+    const std::vector<std::filesystem::path>* ordered_roots = nullptr);
 
 // 便捷封装:扫描根取自 skill_init 的 project/global 根构成(与
 // initialize_skill_registry 一致),disabled 取自 cfg.skills.disabled。
diff --git a/src/apps/web/routes/routes_desktop_office.cpp b/src/apps/web/routes/routes_desktop_office.cpp
index bc00f7ef3..d25d9b3b0 100644
--- a/src/apps/web/routes/routes_desktop_office.cpp
+++ b/src/apps/web/routes/routes_desktop_office.cpp
@@ -7,7 +7,8 @@ namespace {
 json office_item(const json& source) {
     json item = json::object();
     for (const auto* key : {"id", "active", "status", "workspace_hash", "workspace_name",
-             "parent_session_id", "agent_path", "archived", "no_workspace", "title", "summary",
+             "parent_session_id", "agent_path", "expert_id", "expert_member_id", "expert",
+             "archived", "no_workspace", "title", "summary",
              "last_user_message_at", "last_turn_outcome", "updated_at", "context_window", "token_usage"}) {
         if (source.contains(key)) item[key] = source[key];
     }
diff --git a/src/apps/web/routes/routes_files.cpp b/src/apps/web/routes/routes_files.cpp
index ae88f4e44..054db4d13 100644
--- a/src/apps/web/routes/routes_files.cpp
+++ b/src/apps/web/routes/routes_files.cpp
@@ -414,6 +414,43 @@ void WebServer::Impl::register_files() {
     }
 
 void WebServer::Impl::register_skills() {
+        CROW_ROUTE(app, "/api/config/skill-paths").methods(crow::HTTPMethod::Options)
+        ([this](const crow::request& req) { return cors_preflight(req); });
+
+        CROW_ROUTE(app, "/api/config/skill-paths").methods(crow::HTTPMethod::GET)
+        ([this](const crow::request& req) {
+            if (auto rej = require_auth(req)) return std::move(*rej);
+            if (!deps.app_config) return with_cors(req, crow::response(503));
+            std::shared_lock<std::shared_mutex> lock(app_config_mu);
+            crow::response response(skill_scan_paths_payload(*deps.app_config).dump());
+            response.add_header("Content-Type", "application/json");
+            return with_cors(req, std::move(response));
+        });
+
+        CROW_ROUTE(app, "/api/config/skill-paths").methods(crow::HTTPMethod::PUT)
+        ([this](const crow::request& req) {
+            if (auto rej = require_auth(req)) return std::move(*rej);
+            if (auto rej = reject_if_migrating(req)) return std::move(*rej);
+            if (!deps.app_config) return with_cors(req, crow::response(503));
+            const auto body = json::parse(req.body, nullptr, false);
+            std::lock_guard<std::shared_mutex> lock(app_config_mu);
+            auto result = set_skill_scan_paths(body, *deps.app_config, deps.config_path);
+            if (result.ok) {
+                if (deps.skill_registry) {
+                    const auto workspace = compatibility_workspace();
+                    initialize_skill_registry(*deps.skill_registry, *deps.app_config,
+                                              workspace.cwd);
+                }
+                if (deps.session_registry) {
+                    deps.session_registry->refresh_skill_policy(*deps.app_config);
+                }
+            }
+            crow::response response(result.http_status);
+            response.body = result.body.dump();
+            response.add_header("Content-Type", "application/json");
+            return with_cors(req, std::move(response));
+        });
+
         CROW_ROUTE(app, "/api/skills/root").methods(crow::HTTPMethod::Options)
         ([this](const crow::request& req) {
             return cors_preflight(req);
@@ -438,7 +475,8 @@ void WebServer::Impl::register_skills() {
                 ws = compatibility_workspace();
             }
 
-            auto selected = resolve_skill_root_for_cwd(ws->cwd);
+            std::shared_lock<std::shared_mutex> lock(app_config_mu);
+            auto selected = resolve_skill_root_for_cwd(ws->cwd, deps.app_config);
             json body{
                 {"path", path_to_utf8(selected.path)},
                 {"source", selected.source},
diff --git a/src/apps/web/routes/routes_misc.cpp b/src/apps/web/routes/routes_misc.cpp
index 3bfd0c431..e690a0c65 100644
--- a/src/apps/web/routes/routes_misc.cpp
+++ b/src/apps/web/routes/routes_misc.cpp
@@ -825,12 +825,19 @@ void WebServer::Impl::register_static() {
             auto qpos = path.find('?');
             if (qpos != std::string::npos) path.resize(qpos);
 
+            const bool gzip = accepts_gzip(req.get_header_value("Accept-Encoding"));
+            const auto encoding_headers = [](crow::response& response, const AssetLookupResult& asset) {
+                if (asset.vary_accept_encoding) response.add_header("Vary", "Accept-Encoding");
+                if (asset.gzip) response.add_header("Content-Encoding", "gzip");
+            };
+
             if (!path.empty()) {
-                auto r = assets->lookup(path);
+                auto r = assets->lookup(path, gzip);
                 if (r.has_value()) {
                     crow::response resp(200);
                     resp.body.assign(reinterpret_cast<const char*>(r->data), r->size);
                     resp.add_header("Content-Type", r->content_type);
+                    encoding_headers(resp, *r);
                     if (req.url_params.get("v")) {
                         resp.add_header("Cache-Control", "public, max-age=31536000, immutable");
                     } else {
@@ -842,7 +849,7 @@ void WebServer::Impl::register_static() {
             }
 
             // SPA fallback: 任何不存在的资源都返回 index.html(让前端 hash 路由处理)
-            auto idx = assets->lookup("index.html");
+            auto idx = assets->lookup("index.html", gzip);
             if (!idx.has_value()) {
                 crow::response resp(503);
                 resp.body = "index.html missing — front-end not bundled";
@@ -851,6 +858,7 @@ void WebServer::Impl::register_static() {
             crow::response resp(200);
             resp.body.assign(reinterpret_cast<const char*>(idx->data), idx->size);
             resp.add_header("Content-Type", idx->content_type);
+            encoding_headers(resp, *idx);
             resp.add_header("Cache-Control", "no-cache");
             resp.add_header("Referrer-Policy", "no-referrer");
             return resp;
diff --git a/src/apps/web/server_helpers.cpp b/src/apps/web/server_helpers.cpp
index ece7bad1c..c51525eee 100644
--- a/src/apps/web/server_helpers.cpp
+++ b/src/apps/web/server_helpers.cpp
@@ -22,6 +22,21 @@ namespace acecode::web {
 
 using nlohmann::json;
 
+namespace {
+void append_expert_avatar(json& presentation, const ExpertDefinition& expert,
+                          const std::string& member_id, const std::string& workspace,
+                          const ExpertRegistry& registry, const std::string& cwd) {
+    presentation["avatar_identity"] = expert.avatar_identity(member_id);
+    std::optional<ExpertDefinition> referenced;
+    if (expert.references_existing_experts && (!member_id.empty() || expert.avatar_path.empty())) {
+        referenced = registry.find(cwd, member_id.empty() ? expert.lead_expert_id : member_id);
+    }
+    const auto& portrait = referenced ? *referenced : expert;
+    presentation["avatar_url"] = portrait.avatar_path.empty() ? std::string{}
+        : "/api/experts/" + portrait.id + "/avatar?workspace=" + workspace;
+}
+} // namespace
+
 // =====================================================================
 // Free functions (formerly anonymous-namespace, now shared across route TUs)
 // =====================================================================
@@ -923,12 +938,15 @@ json WebServer::Impl::session_info_to_json(const SessionInfo& s, const SessionMe
             expert_json["display_name"] = s.expert_display_name;
             expert_json["type"] = s.expert_type;
             expert_json["source"] = s.expert_source;
-        } else if (deps.expert_registry && m) {
-            if (auto resolved = deps.expert_registry->find(m->cwd, expert_id)) {
+        }
+        if (deps.expert_registry) {
+            if (auto resolved = deps.expert_registry->find(storage_cwd, expert_id)) {
                 expert_json["display_name"] = resolved->display_name;
                 expert_json["type"] = to_string(resolved->type);
                 expert_json["source"] = resolved->source;
                 expert_json["missing"] = false;
+                append_expert_avatar(expert_json, *resolved, expert_member_id,
+                                     workspace_hash, *deps.expert_registry, storage_cwd);
             } else {
                 expert_json["missing"] = true;
             }
@@ -995,6 +1013,8 @@ json WebServer::Impl::session_meta_to_json(const SessionMeta& m, const std::stri
                 expert_json["type"] = to_string(resolved->type);
                 expert_json["source"] = resolved->source;
                 expert_json["missing"] = false;
+                append_expert_avatar(expert_json, *resolved, m.expert_member_id,
+                                     workspace_hash, *deps.expert_registry, m.cwd);
             }
         }
         o["expert"] = std::move(expert_json);
diff --git a/src/apps/web/static_assets.cpp b/src/apps/web/static_assets.cpp
index e32269542..f82e23352 100644
--- a/src/apps/web/static_assets.cpp
+++ b/src/apps/web/static_assets.cpp
@@ -5,7 +5,9 @@
 
 #include <filesystem>
 #include <fstream>
+#include <limits>
 #include <stdexcept>
+#include <zlib.h>
 
 namespace acecode::web {
 
@@ -47,8 +49,66 @@ bool ends_with(const std::string& s, const std::string& suffix) {
     return std::equal(suffix.rbegin(), suffix.rend(), s.rbegin());
 }
 
+std::string_view trim(std::string_view value) {
+    const auto first = value.find_first_not_of(" \t");
+    if (first == std::string_view::npos) return {};
+    return value.substr(first, value.find_last_not_of(" \t") - first + 1);
+}
+
+bool ascii_equal(std::string_view a, std::string_view b) {
+    if (a.size() != b.size()) return false;
+    for (std::size_t i = 0; i < a.size(); ++i) {
+        const auto lower = [](char c) { return c >= 'A' && c <= 'Z' ? c + ('a' - 'A') : c; };
+        if (lower(a[i]) != lower(b[i])) return false;
+    }
+    return true;
+}
+
+bool positive_quality(std::string_view value) {
+    value = trim(value);
+    if (value.empty() || (value[0] != '0' && value[0] != '1')) return false;
+    bool positive = value[0] == '1';
+    if (value.size() == 1) return positive;
+    if (value[1] != '.' || value.size() > 5) return false;
+    for (std::size_t i = 2; i < value.size(); ++i) {
+        if (value[i] < '0' || value[i] > '9' || (value[0] == '1' && value[i] != '0')) return false;
+        positive = positive || value[i] != '0';
+    }
+    return positive;
+}
+
 } // namespace
 
+bool accepts_gzip(std::string_view header) {
+    std::optional<bool> gzip, wildcard;
+    while (!header.empty()) {
+        const auto comma = header.find(',');
+        auto item = trim(header.substr(0, comma));
+        const auto semi = item.find(';');
+        const auto name = trim(item.substr(0, semi));
+        bool allowed = true;
+        if (semi != std::string_view::npos) {
+            auto parameters = item.substr(semi + 1);
+            while (!parameters.empty()) {
+                const auto next = parameters.find(';');
+                const auto parameter = trim(parameters.substr(0, next));
+                const auto equals = parameter.find('=');
+                if (ascii_equal(trim(parameter.substr(0, equals)), "q")) {
+                    allowed = allowed && equals != std::string_view::npos &&
+                              positive_quality(parameter.substr(equals + 1));
+                }
+                if (next == std::string_view::npos) break;
+                parameters.remove_prefix(next + 1);
+            }
+        }
+        if (ascii_equal(name, "gzip")) gzip = allowed && gzip.value_or(true);
+        else if (name == "*") wildcard = allowed && wildcard.value_or(true);
+        if (comma == std::string_view::npos) break;
+        header.remove_prefix(comma + 1);
+    }
+    return gzip.value_or(wildcard.value_or(false));
+}
+
 std::string mime_type_for_path(const std::string& path) {
     for (const auto& row : kMimeTable) {
         if (ends_with(path, row.ext)) return row.mime;
@@ -56,18 +116,54 @@ std::string mime_type_for_path(const std::string& path) {
     return "application/octet-stream";
 }
 
-std::optional<AssetLookupResult> EmbeddedAssetSource::lookup(const std::string& path) const {
+std::optional<AssetLookupResult> EmbeddedAssetSource::lookup(const std::string& path,
+                                                           bool accept_gzip) const {
     const auto& m = embedded_asset_map();
     auto it = m.find(path);
     if (it == m.end()) return std::nullopt;
     AssetLookupResult r;
     r.content_type = mime_type_for_path(path);
-    r.data = it->second.first;
-    r.size = it->second.second;
+    const auto& asset = it->second;
+    r.vary_accept_encoding = asset.gzip;
+    r.gzip = asset.gzip && accept_gzip;
+    r.data = asset.data;
+    r.size = asset.size;
+    if (asset.gzip && !accept_gzip) {
+        std::lock_guard<std::mutex> lock(decoded_mutex_);
+        auto cached = decoded_.find(path);
+        if (cached == decoded_.end()) {
+            if (asset.size > std::numeric_limits<uInt>::max() ||
+                asset.decoded_size >= std::numeric_limits<uInt>::max()) {
+                throw std::runtime_error("embedded asset exceeds decompression limit");
+            }
+            auto decoded = std::make_shared<std::string>(asset.decoded_size + 1, '\0');
+            z_stream stream{};
+            stream.next_in = const_cast<Bytef*>(asset.data);
+            stream.avail_in = static_cast<uInt>(asset.size);
+            stream.next_out = reinterpret_cast<Bytef*>(decoded->data());
+            stream.avail_out = static_cast<uInt>(decoded->size());
+            if (inflateInit2(&stream, 16 + MAX_WBITS) != Z_OK) {
+                throw std::runtime_error("cannot initialize embedded asset decompression");
+            }
+            // Own zlib's internal allocation; the stream itself has stack storage.
+            const auto release = [](z_stream* state) { inflateEnd(state); };
+            const std::unique_ptr<z_stream, decltype(release)> cleanup(&stream, release);
+            const int result = inflate(&stream, Z_FINISH);
+            const bool valid = result == Z_STREAM_END && stream.total_in == asset.size &&
+                               stream.total_out == asset.decoded_size;
+            if (!valid) throw std::runtime_error("corrupt compressed embedded asset: " + path);
+            decoded->resize(asset.decoded_size);
+            cached = decoded_.emplace(path, std::move(decoded)).first;
+        }
+        r.owned_buffer = cached->second;
+        r.data = reinterpret_cast<const unsigned char*>(r.owned_buffer->data());
+        r.size = r.owned_buffer->size();
+    }
     return r;
 }
 
-std::optional<AssetLookupResult> FileSystemAssetSource::lookup(const std::string& path) const {
+std::optional<AssetLookupResult> FileSystemAssetSource::lookup(const std::string& path,
+                                                             bool /*accept_gzip*/) const {
     fs::path full = path_from_utf8(root_) / path_from_utf8(path);
 
     // 安全:确保 full 在 root_ 之下(防 ".." 穿越)。weakly_canonical 可能解析失败,
diff --git a/src/apps/web/static_assets.hpp b/src/apps/web/static_assets.hpp
index d6fcf305e..11bd58e60 100644
--- a/src/apps/web/static_assets.hpp
+++ b/src/apps/web/static_assets.hpp
@@ -13,8 +13,10 @@
 #include <cstddef>
 #include <map>
 #include <memory>
+#include <mutex>
 #include <optional>
 #include <string>
+#include <string_view>
 #include <utility>
 
 namespace acecode::web {
@@ -23,9 +25,10 @@ struct AssetLookupResult {
     std::string                 content_type;
     const unsigned char*        data = nullptr;
     std::size_t                 size = 0;
-    // 当 source = FileSystem 时,持有一份从磁盘读出来的 buffer 用于保活。
-    // EmbeddedAssetSource 不需要,data 直接指向静态数组。
-    std::shared_ptr<std::string> owned_buffer;
+    bool gzip = false;
+    bool vary_accept_encoding = false;
+    // Shared by the source cache and in-flight responses; immutable after publication.
+    std::shared_ptr<const std::string> owned_buffer;
 };
 
 class AssetSource {
@@ -33,26 +36,40 @@ class AssetSource {
     virtual ~AssetSource() = default;
     // path 是相对路径(如 "index.html" / "components/ace-app.js"),
     // 不带 leading "/"。Caller 调用前已剥掉 "/static/" 前缀。
-    virtual std::optional<AssetLookupResult> lookup(const std::string& path) const = 0;
+    virtual std::optional<AssetLookupResult> lookup(const std::string& path,
+                                                   bool accept_gzip = false) const = 0;
 };
 
 class EmbeddedAssetSource : public AssetSource {
 public:
-    std::optional<AssetLookupResult> lookup(const std::string& path) const override;
+    std::optional<AssetLookupResult> lookup(const std::string& path,
+                                           bool accept_gzip = false) const override;
+private:
+    mutable std::mutex decoded_mutex_;
+    // Shared immutable decoded assets are retained for identity-only clients.
+    mutable std::map<std::string, std::shared_ptr<const std::string>> decoded_;
 };
 
 class FileSystemAssetSource : public AssetSource {
 public:
     explicit FileSystemAssetSource(std::string root) : root_(std::move(root)) {}
-    std::optional<AssetLookupResult> lookup(const std::string& path) const override;
+    std::optional<AssetLookupResult> lookup(const std::string& path,
+                                           bool accept_gzip = false) const override;
 private:
     std::string root_;
 };
 
 // 由 build 期生成的 static_assets_data.cpp 提供。tests 也可以引用它直接验证
 // 嵌入完整性。
-const std::map<std::string, std::pair<const unsigned char*, std::size_t>>&
-    embedded_asset_map();
+struct EmbeddedAsset {
+    const unsigned char* data;
+    std::size_t size;
+    std::size_t decoded_size;
+    bool gzip;
+};
+const std::map<std::string, EmbeddedAsset>& embedded_asset_map();
+
+bool accepts_gzip(std::string_view accept_encoding);
 
 // 工厂:根据 web.static_dir 决定走嵌入还是磁盘。空 = 嵌入。non-empty +
 // 路径不存在 → 抛 std::runtime_error,worker.cpp 启动期捕获后 fail-fast。
diff --git a/src/base/config/config.cpp b/src/base/config/config.cpp
index e67bb3594..5448ddd79 100644
--- a/src/base/config/config.cpp
+++ b/src/base/config/config.cpp
@@ -926,6 +926,11 @@ static AppConfig load_config_from_path_once(
             }
             if (j.contains("skills") && j["skills"].is_object()) {
                 const auto& sj = j["skills"];
+                if (sj.contains("scan_paths") && sj["scan_paths"].is_array() &&
+                    std::all_of(sj["scan_paths"].begin(), sj["scan_paths"].end(),
+                                [](const auto& value) { return value.is_string(); })) {
+                    cfg.skills.scan_paths = sj["scan_paths"].get<std::vector<std::string>>();
+                }
                 if (sj.contains("disabled") && sj["disabled"].is_array()) {
                     for (const auto& v : sj["disabled"]) {
                         if (v.is_string()) cfg.skills.disabled.push_back(v.get<std::string>());
@@ -2259,12 +2264,13 @@ nlohmann::json build_config_json(const AppConfig& cfg) {
     }
 
     SkillsConfig skills_d;
-    if (!cfg.skills.disabled.empty() ||
+    if (cfg.skills.scan_paths || !cfg.skills.disabled.empty() ||
         !cfg.skills.external_dirs.empty() ||
         cfg.skills.reuse_opencode != skills_d.reuse_opencode ||
         cfg.skills.idle_days != skills_d.idle_days) {
         nlohmann::json sj = nlohmann::json::object();
         if (!cfg.skills.disabled.empty()) sj["disabled"] = cfg.skills.disabled;
+        if (cfg.skills.scan_paths) sj["scan_paths"] = *cfg.skills.scan_paths;
         if (!cfg.skills.external_dirs.empty()) sj["external_dirs"] = cfg.skills.external_dirs;
         if (cfg.skills.reuse_opencode != skills_d.reuse_opencode)
             sj["reuse_opencode"] = cfg.skills.reuse_opencode;
diff --git a/src/base/config/config.hpp b/src/base/config/config.hpp
index 10f6a490c..96d0ca45f 100644
--- a/src/base/config/config.hpp
+++ b/src/base/config/config.hpp
@@ -69,6 +69,8 @@ struct McpServerConfig {
 };
 
 struct SkillsConfig {
+    // Missing/null preserves legacy roots; an explicit array replaces them.
+    std::optional<std::vector<std::string>> scan_paths;
     std::vector<std::string> disabled;       // skill names to hide even if present on disk
     std::vector<std::string> external_dirs;  // extra directories to scan (supports ~ and ${ENV})
     bool reuse_opencode = true;              // reuse opencode-compatible skill roots by default
diff --git a/src/domain/experts/expert_identity.cpp b/src/domain/experts/expert_identity.cpp
new file mode 100644
index 000000000..9c566d380
--- /dev/null
+++ b/src/domain/experts/expert_identity.cpp
@@ -0,0 +1,19 @@
+#include "expert_registry.hpp"
+
+namespace acecode {
+
+const ExpertAgent* ExpertDefinition::selected_agent(const std::string& member_id) const {
+    return agent(member_id.empty() ? lead_agent_id : member_id);
+}
+
+std::string ExpertDefinition::avatar_identity(const std::string& member_id) const {
+    if (references_existing_experts) {
+        return "expert:" + (member_id.empty() ? lead_expert_id : member_id);
+    }
+    if (type == ExpertType::Team) {
+        return "expert:" + id + "/" + (member_id.empty() ? lead_agent_id : member_id);
+    }
+    return "expert:" + id;
+}
+
+} // namespace acecode
diff --git a/src/domain/experts/expert_registry.cpp b/src/domain/experts/expert_registry.cpp
index 5faa83190..0fdfc30d4 100644
--- a/src/domain/experts/expert_registry.cpp
+++ b/src/domain/experts/expert_registry.cpp
@@ -1450,10 +1450,6 @@ const ExpertAgent* ExpertDefinition::agent(const std::string& agent_id) const {
     return it == agents.end() ? nullptr : &*it;
 }
 
-const ExpertAgent* ExpertDefinition::selected_agent(const std::string& member_id) const {
-    return agent(member_id.empty() ? lead_agent_id : member_id);
-}
-
 std::vector<fs::path> ExpertDefinition::selected_skill_roots(
     const std::string& member_id) const {
     std::vector<fs::path> roots = skill_roots;
@@ -1841,12 +1837,14 @@ json expert_definition_to_json(const ExpertDefinition& expert,
             {"id", agent.id},
             {"display_name", agent.display_name},
             {"profession", agent.profession},
+            {"avatar_identity", expert.avatar_identity(agent.id)},
         };
         if (include_instructions) item["instructions"] = agent.instructions;
         agents.push_back(std::move(item));
     }
     json result = {
         {"id", expert.id},
+        {"avatar_identity", expert.avatar_identity()},
         {"version", expert.version},
         {"type", to_string(expert.type)},
         {"display_name", expert.display_name},
diff --git a/src/domain/experts/expert_registry.hpp b/src/domain/experts/expert_registry.hpp
index eab316441..277a0c3ea 100644
--- a/src/domain/experts/expert_registry.hpp
+++ b/src/domain/experts/expert_registry.hpp
@@ -91,6 +91,7 @@ struct ExpertDefinition {
 
     const ExpertAgent* agent(const std::string& agent_id) const;
     const ExpertAgent* selected_agent(const std::string& member_id = {}) const;
+    std::string avatar_identity(const std::string& member_id = {}) const;
     std::vector<std::filesystem::path> selected_skill_roots(
         const std::string& member_id = {}) const;
     ExpertCapabilityScopes selected_capabilities(
diff --git a/src/domain/skills/skill_init.cpp b/src/domain/skills/skill_init.cpp
index 3e6198eb9..350165ace 100644
--- a/src/domain/skills/skill_init.cpp
+++ b/src/domain/skills/skill_init.cpp
@@ -18,6 +18,57 @@ namespace {
 
 namespace fs = std::filesystem;
 
+// Expand before determining scope, so ${ENV} can name an absolute global root.
+// Unknown variables must not accidentally become relative workspace paths.
+std::optional<fs::path> expanded_scan_path(const std::string& raw) {
+    std::string expanded;
+    for (std::size_t pos = 0; pos < raw.size();) {
+        if (raw.compare(pos, 2, "${") != 0) {
+            expanded += raw[pos++];
+            continue;
+        }
+        const auto end = raw.find('}', pos + 2);
+        if (end == std::string::npos) return std::nullopt;
+        const auto name = raw.substr(pos + 2, end - pos - 2);
+        std::string value;
+        if (name == "ACECODE_DATA_DIR") value = get_acecode_dir();
+        else value = getenv_utf8(name.c_str());
+        if (value.empty() && name == "XDG_CONFIG_HOME") value = expand_path("~/.config");
+        if (value.empty() && name == "XDG_CACHE_HOME") value = expand_path("~/.cache");
+        if (value.empty()) return std::nullopt;
+        expanded += value;
+        pos = end + 1;
+    }
+    expanded = expand_path(expanded);
+    if (expanded.empty() || expanded.front() == '~' ||
+        expanded.find("${") != std::string::npos) return std::nullopt;
+    return path_from_utf8(expanded);
+}
+
+std::vector<fs::path> configured_scan_roots(
+    const AppConfig& config, const std::string& working_dir,
+    std::optional<bool> project_only = std::nullopt) {
+    std::vector<fs::path> roots;
+    const auto dirs = get_project_dirs_up_to_home(working_dir);
+    for (const auto& raw : *config.skills.scan_paths) {
+        const auto path = expanded_scan_path(raw);
+        if (!path) continue;
+        const bool project = !path->is_absolute();
+        if (project_only && project != *project_only) continue;
+        if (project) {
+            // Reject drive-relative/root-relative paths on Windows: they depend
+            // on process state, not the selected workspace.
+            if (path->has_root_path()) continue;
+            for (const auto& dir : dirs) {
+                roots.push_back((path_from_utf8(dir) / *path).lexically_normal());
+            }
+        } else {
+            roots.push_back(path->lexically_normal());
+        }
+    }
+    return roots;
+}
+
 std::string env_or_expanded_path(const char* name, const std::string& fallback) {
     std::string value = getenv_utf8(name);
     if (!value.empty()) return value;
@@ -61,8 +112,54 @@ void append_opencode_global_skill_roots(std::vector<fs::path>& roots) {
 
 } // namespace
 
+std::vector<std::string> default_skill_scan_paths(const AppConfig& config) {
+    std::vector<std::string> paths = {".acecode/skills", ".agent/skills"};
+    if (config.skills.reuse_opencode) {
+        for (const char* path : {".opencode/skills", ".opencode/skill",
+                                 ".agents/skills", ".claude/skills"}) {
+            paths.emplace_back(path);
+        }
+    }
+    paths.emplace_back("${ACECODE_DATA_DIR}/skills");
+    paths.emplace_back("~/.agent/skills");
+    if (config.skills.reuse_opencode) {
+        for (const char* path : {"${XDG_CONFIG_HOME}/opencode/skills",
+                                 "${XDG_CONFIG_HOME}/opencode/skill",
+                                 "~/.opencode/skills", "~/.opencode/skill",
+                                 "${OPENCODE_CONFIG_DIR}/skills",
+                                 "${OPENCODE_CONFIG_DIR}/skill",
+                                 "~/.agents/skills", "~/.claude/skills",
+                                 "${XDG_CACHE_HOME}/opencode/skills"}) {
+            paths.emplace_back(path);
+        }
+    }
+    for (const auto& raw : config.skills.external_dirs) {
+        // Legacy external dirs are global, even when written relatively.
+        const auto expanded = expand_path(raw);
+        if (expanded.empty()) continue;
+        auto path = path_from_utf8(expanded);
+        if (path.is_relative()) {
+            std::error_code ec;
+            const auto absolute = fs::absolute(path, ec);
+            if (!ec) path = absolute;
+        }
+        paths.push_back(path_to_utf8(path));
+    }
+    return paths;
+}
+
+std::vector<fs::path> skill_scan_roots(
+    const AppConfig& config, const std::string& working_dir) {
+    if (config.skills.scan_paths) return configured_scan_roots(config, working_dir);
+    auto roots = project_skill_scan_roots(config, working_dir);
+    auto global = global_skill_scan_roots(config);
+    roots.insert(roots.end(), global.begin(), global.end());
+    return roots;
+}
+
 std::vector<std::filesystem::path> project_skill_scan_roots(
     const AppConfig& config, const std::string& working_dir) {
+    if (config.skills.scan_paths) return configured_scan_roots(config, working_dir, true);
     std::vector<std::filesystem::path> roots;
 
     for (const auto& dir : get_project_dirs_up_to_home(working_dir)) {
@@ -80,6 +177,7 @@ std::vector<std::filesystem::path> project_skill_scan_roots(
 }
 
 std::vector<std::filesystem::path> global_skill_scan_roots(const AppConfig& config) {
+    if (config.skills.scan_paths) return configured_scan_roots(config, {}, false);
     std::vector<std::filesystem::path> roots;
 
     roots.emplace_back(path_from_utf8(get_acecode_dir()) / "skills");
@@ -106,8 +204,9 @@ void initialize_skill_registry(SkillRegistry& skill_registry,
     std::error_code ec;
 
     std::vector<std::filesystem::path> roots = prepended_roots;
-    auto project_roots = project_skill_scan_roots(config, working_dir);
-    for (auto& root : project_roots) roots.emplace_back(std::move(root));
+    for (auto& root : skill_scan_roots(config, working_dir)) {
+        roots.emplace_back(std::move(root));
+    }
 
     // ~/.acecode/skills 是历史上自动创建的全局根,保持行为不变。
     std::filesystem::path default_acecode_skills_dir =
@@ -116,10 +215,6 @@ void initialize_skill_registry(SkillRegistry& skill_registry,
         std::filesystem::create_directories(default_acecode_skills_dir, ec);
     }
 
-    for (auto& root : global_skill_scan_roots(config)) {
-        roots.emplace_back(std::move(root));
-    }
-
     std::optional<std::unordered_set<std::string>> effective_allowed;
     std::unordered_set<std::string> effective_disabled(
         config.skills.disabled.begin(), config.skills.disabled.end());
diff --git a/src/domain/skills/skill_init.hpp b/src/domain/skills/skill_init.hpp
index 0e7f86094..2d645fcc2 100644
--- a/src/domain/skills/skill_init.hpp
+++ b/src/domain/skills/skill_init.hpp
@@ -3,7 +3,7 @@
 // 共享 SkillRegistry 初始化逻辑:扫描根目录顺序与 main.cpp 历史实现保持一致,
 // 让 TUI(main.cpp)与 daemon(worker.cpp)看到同一组 skills。
 //
-// 扫描根顺序(first-wins by skill name):
+// 未配置 skills.scan_paths 时的扫描根顺序(first-wins by skill name):
 //   1) project walk — <cwd...>/.acecode/skills,深度优先回溯到 HOME
 //   2) project walk — <cwd...>/.agent/skills,深度优先回溯到 HOME
 //   3) opencode project compat roots — when config.skills.reuse_opencode is true
@@ -22,6 +22,14 @@ namespace acecode {
 class SkillRegistry;
 struct AppConfig;
 
+// Editable default templates (legacy compatibility flags/external dirs apply).
+std::vector<std::string> default_skill_scan_paths(const AppConfig& config);
+
+// Ordered ordinary roots. Explicit scan_paths replaces all legacy roots;
+// relative paths expand along the workspace chain, absolute paths are global.
+std::vector<std::filesystem::path> skill_scan_roots(
+    const AppConfig& config, const std::string& working_dir);
+
 void initialize_skill_registry(SkillRegistry& skill_registry,
                                  const AppConfig& config,
                                  const std::string& working_dir,
@@ -30,12 +38,13 @@ void initialize_skill_registry(SkillRegistry& skill_registry,
                                  const std::optional<std::vector<std::string>>&
                                      expert_allowed = std::nullopt);
 
-// 项目链扫描根(上表 1-3 段):working_dir 沿目录树向上(不含 HOME 本身)。
+// 项目链扫描根(默认上表 1-3 段,自定义时为相对路径条目):
+// working_dir 沿目录树向上(不含 HOME 本身)。
 // 命中这些根的 skill 在 web UI 里归类为「项目技能」。纯枚举,不创建目录。
 std::vector<std::filesystem::path> project_skill_scan_roots(
     const AppConfig& config, const std::string& working_dir);
 
-// 全局扫描根(上表 4-7 段):用户全局目录 + opencode 全局兼容根 + external_dirs。
+// 全局扫描根(默认上表 4-7 段,自定义时为绝对路径条目)。
 // 纯枚举,不创建目录(~/.acecode/skills 的自动创建留在 initialize_skill_registry)。
 std::vector<std::filesystem::path> global_skill_scan_roots(const AppConfig& config);
 
diff --git a/src/host/channels/core/commands.cpp b/src/host/channels/core/commands.cpp
index 4f8fab464..9cb5e728c 100644
--- a/src/host/channels/core/commands.cpp
+++ b/src/host/channels/core/commands.cpp
@@ -1,5 +1,7 @@
 #include "commands.hpp"
 
+#include "config/vocab/permission_mode.hpp"
+
 #include <algorithm>
 #include <cctype>
 
@@ -35,6 +37,9 @@ Command parse_command(const std::string& raw) {
     else if (name == "/sessions" || name == "/session") command.kind = CommandKind::Sessions;
     else if (name == "/resume") command.kind = CommandKind::Resume;
     else if (name == "/model" || name == "/models") command.kind = CommandKind::Model;
+    else if (name == "/mode") command.kind = CommandKind::Mode;
+    else if (name == "/yolo") command.kind = CommandKind::Yolo;
+    else if (name == "/effort") command.kind = CommandKind::Effort;
     else if (name == "/approve") command.kind = CommandKind::Approve;
     else if (name == "/deny") command.kind = CommandKind::Deny;
     else if (name == "/aq") command.kind = CommandKind::Question;
@@ -50,6 +55,21 @@ Command parse_command(const std::string& raw) {
         if (lowered != "more" && lowered != "all" && lowered.rfind("search ", 0) != 0)
             command.error = "用法:/sessions、/sessions more 或 /sessions search <关键词>。";
     }
+    if (command.kind == CommandKind::Mode && !command.argument.empty()) {
+        auto mode = parse_permission_mode_name(command.argument);
+        if (!mode) mode = parse_permission_mode_name(lower(command.argument));
+        if (!mode || *mode == PermissionMode::Plan)
+            command.error = "用法:/mode [default|auto|yolo]。分别为默认权限、自动模式、完全访问权限。";
+        else
+            command.argument = permission_mode_name(*mode);
+    }
+    if (command.kind == CommandKind::Yolo && !command.argument.empty())
+        command.error = "用法:/yolo。直接切换到完全访问权限,无需参数。";
+    if (command.kind == CommandKind::Effort) {
+        command.argument = lower(command.argument);
+        if (command.argument.find_first_of(" \t\r\n") != std::string::npos)
+            command.error = "用法:/effort [档位|default]。发送 /effort 查看当前模型支持的档位。";
+    }
     return command;
 }
 
@@ -66,6 +86,9 @@ std::string help(bool owner) {
         "/sessions 列出可切换的会话(more 查看更多,search <关键词> 搜索)\n"
         "/resume <编号或会话 ID> 切换到某个会话\n"
         "/model [名称] 查看或切换模型\n"
+        "/mode [default|auto|yolo] 查看或切换默认权限、自动模式、完全访问权限\n"
+        "/yolo 直接切换到完全访问权限(跳过工具权限确认)\n"
+        "/effort [档位|default] 查看或切换思考深度,default 恢复模型预设\n"
         "/approve <编号>、/deny <编号> 处理权限请求\n"
         "/aq 回答提问\n"
         "其它文字会直接发给当前会话。";
diff --git a/src/host/channels/core/commands.hpp b/src/host/channels/core/commands.hpp
index adc264ecb..6560471b3 100644
--- a/src/host/channels/core/commands.hpp
+++ b/src/host/channels/core/commands.hpp
@@ -8,7 +8,9 @@
 
 namespace acecode::channels::core {
 
-enum class CommandKind { None, Help, Status, Stop, New, Sessions, Resume, Model, Approve, Deny, Question };
+enum class CommandKind {
+    None, Help, Status, Stop, New, Sessions, Resume, Model, Mode, Yolo, Effort, Approve, Deny, Question
+};
 
 struct Command {
     CommandKind kind = CommandKind::None;
diff --git a/src/host/channels/core/conversations.cpp b/src/host/channels/core/conversations.cpp
index 4a49e4f7d..762b2bd31 100644
--- a/src/host/channels/core/conversations.cpp
+++ b/src/host/channels/core/conversations.cpp
@@ -53,6 +53,9 @@ const char* command_name(CommandKind kind) {
         case CommandKind::Sessions: return "/sessions";
         case CommandKind::Resume: return "/resume";
         case CommandKind::Model: return "/model";
+        case CommandKind::Mode: return "/mode";
+        case CommandKind::Yolo: return "/yolo";
+        case CommandKind::Effort: return "/effort";
         case CommandKind::Approve: return "/approve";
         case CommandKind::Deny: return "/deny";
         case CommandKind::Question: return "/aq";
@@ -61,6 +64,33 @@ const char* command_name(CommandKind kind) {
     return "(text)";
 }
 
+std::string permission_label(const std::string& mode) {
+    if (mode == "default") return "默认权限 (default)";
+    if (mode == "auto" || mode == "accept-edits") return "自动模式 (auto)";
+    if (mode == "yolo") return "完全访问权限 (yolo)";
+    if (mode == "plan") return "计划模式 (plan)";
+    return mode;
+}
+
+std::string effort_status(const std::optional<SessionModelState>& state, bool list_options) {
+    if (!state || state->deleted) return "思考深度:模型不可用";
+    if (!state->reasoning || !state->reasoning->supported ||
+        !(state->reasoning->mandatory || state->reasoning->enabled.value_or(state->reasoning->default_enabled)) ||
+        state->reasoning->supported_efforts.empty() ||
+        (state->provider != "openai" && state->provider != "anthropic"))
+        return "思考深度:当前模型未启用或不支持 effort 档位";
+    const auto& reasoning = *state->reasoning;
+    std::string text = "思考深度:" + state->reasoning_effort.value_or(
+        reasoning.effort.value_or(reasoning.default_effort.value_or("默认")));
+    if (!state->reasoning_effort) text += " (模型预设)";
+    if (list_options) {
+        text += "\n可用档位:";
+        for (const auto& effort : reasoning.supported_efforts) text += " " + effort;
+        text += "\n用法:/effort <档位>,/effort default 恢复模型预设。";
+    }
+    return text;
+}
+
 } // namespace
 
 Conversations::Conversations(std::string platform, ChannelStore& store, AccessControl& access,
@@ -184,6 +214,8 @@ void Conversations::handle_bound_command(const im::Inbound& inbound, const Comma
                                location_label(*record) + "\n模型:" +
                                (info && !info->model_name.empty() ? info->model_name : std::string("默认")) +
                                "\n状态:" + (info && info->busy ? "执行中" : "空闲");
+            text += "\n权限模式:" + (info ? permission_label(info->permission_mode) : "不可用");
+            text += "\n" + effort_status(deps_.model_state ? deps_.model_state(id) : std::nullopt, false);
             const auto permissions = projection->pending_permission_ids();
             for (const auto& request : permissions) text += "\n待确认权限:" + request;
             for (const auto& line : projection->pending_question_texts()) text += "\n" + line;
@@ -212,6 +244,41 @@ void Conversations::handle_bound_command(const im::Inbound& inbound, const Comma
             reply(inbound, texts::model_switched(command.argument));
             return;
         }
+        case CommandKind::Mode:
+        case CommandKind::Yolo: {
+            if (command.kind == CommandKind::Mode && command.argument.empty()) {
+                const auto info = session_info(id);
+                reply(inbound, "权限模式:" + (info ? permission_label(info->permission_mode) : "不可用") +
+                               "\n用法:/mode default|auto|yolo,或 /yolo 直接切换到完全访问权限。");
+                return;
+            }
+            const auto mode = command.kind == CommandKind::Yolo ? std::string("yolo") : command.argument;
+            if (!deps_.set_permission_mode || !deps_.set_permission_mode(id, mode)) {
+                reply(inbound, texts::turn_failed("切换权限模式失败"));
+                return;
+            }
+            reply(inbound, "已切换权限模式为 " + permission_label(mode) + "。");
+            return;
+        }
+        case CommandKind::Effort: {
+            if (command.argument.empty()) {
+                reply(inbound, effort_status(deps_.model_state ? deps_.model_state(id) : std::nullopt, true));
+                return;
+            }
+            const auto effort = command.argument == "default" ? std::nullopt
+                                                               : std::optional<std::string>(command.argument);
+            std::string error;
+            const auto updated = deps_.set_reasoning_effort ? deps_.set_reasoning_effort(id, effort, &error)
+                                                           : std::nullopt;
+            if (!updated) {
+                reply(inbound, texts::turn_failed(error.empty() ? "切换思考深度失败" : error) + "\n" +
+                               effort_status(deps_.model_state ? deps_.model_state(id) : std::nullopt, true));
+                return;
+            }
+            reply(inbound, std::string(effort ? "已更新思考深度。" : "已恢复模型预设思考深度。") +
+                           "从下一次模型请求起生效。\n" + effort_status(updated, false));
+            return;
+        }
         case CommandKind::Approve:
         case CommandKind::Deny: {
             if (!projection->take_permission(command.argument)) {
diff --git a/src/host/channels/core/conversations.hpp b/src/host/channels/core/conversations.hpp
index c0f2eb0fa..9bd7c1af0 100644
--- a/src/host/channels/core/conversations.hpp
+++ b/src/host/channels/core/conversations.hpp
@@ -35,6 +35,11 @@ struct ConversationDeps {
     std::function<bool(const rc::RcSessionTarget&)> resume_target;
     std::function<std::vector<std::string>()> model_names;
     std::function<bool(const std::string&, const std::string&, std::string*)> switch_model;
+    std::function<bool(const std::string& session_id, const std::string& mode)> set_permission_mode;
+    std::function<std::optional<SessionModelState>(const std::string& session_id)> model_state;
+    std::function<std::optional<SessionModelState>(const std::string& session_id,
+                                                 const std::optional<std::string>& effort,
+                                                 std::string* error)> set_reasoning_effort;
     // 普通文本提交前做技能命令展开(与 Web 输入一致);返回展开后的文本。
     std::function<std::string(const std::string& session_id, const std::string& text)> expand_skill;
     // 某会话即将被 taker 接管:host 让所有平台释放它(跨平台转移绑定)。
diff --git a/src/host/session_host/thread_presentation.cpp b/src/host/session_host/thread_presentation.cpp
new file mode 100644
index 000000000..90564825e
--- /dev/null
+++ b/src/host/session_host/thread_presentation.cpp
@@ -0,0 +1,88 @@
+#include "thread_presentation.hpp"
+#include "session/session_client.hpp"
+#include "session/session_storage.hpp"
+#include "utils/encoding.hpp"
+
+#include <cctype>
+
+namespace acecode::thread_presentation {
+
+using nlohmann::json;
+
+namespace { constexpr std::size_t kSummaryChars = 240; }
+
+std::string trim_and_limit(std::string value,
+                           std::size_t max_chars,
+                           bool* truncated) {
+    while (!value.empty() &&
+           std::isspace(static_cast<unsigned char>(value.front()))) {
+        value.erase(value.begin());
+    }
+    while (!value.empty() &&
+           std::isspace(static_cast<unsigned char>(value.back()))) {
+        value.pop_back();
+    }
+    const std::string limited = truncate_utf8_prefix(value, max_chars);
+    if (truncated) *truncated = limited.size() < value.size();
+    return limited;
+}
+
+json thread_summary(const SessionMeta& meta,
+                    const SessionInfo* active,
+                    bool pinned,
+                    int pinned_index) {
+    const bool is_active = active != nullptr;
+    const bool busy = active && active->busy;
+    json out{
+        {"threadId", meta.id},
+        {"cwd", meta.cwd},
+        {"noWorkspace", meta.no_workspace},
+        {"title", active && !active->title.empty() ? active->title : meta.title},
+        {"summary", trim_and_limit(
+            active && !active->summary.empty() ? active->summary : meta.summary,
+            kSummaryChars)},
+        {"createdAt", active && !active->created_at.empty()
+                          ? active->created_at : meta.created_at},
+        {"updatedAt", active && !active->updated_at.empty()
+                          ? active->updated_at : meta.updated_at},
+        {"active", is_active},
+        {"busy", busy},
+        {"status", busy ? "running" : "idle"},
+        {"archived", meta.archived},
+        {"pinned", pinned},
+        {"parentThreadId", meta.parent_session_id.empty()
+                               ? json(nullptr) : json(meta.parent_session_id)},
+        {"model", active && !active->model_name.empty()
+                      ? active->model_name : meta.model_preset},
+    };
+    if (pinned_index > 0) out["pinnedIndex"] = pinned_index;
+    return out;
+}
+
+std::string event_kind_name(SessionEventKind kind) {
+    return to_string(kind);
+}
+
+
+json compact_wait_event(const SessionEvent& event) {
+    json out{
+        {"cursor", std::to_string(event.seq)},
+        {"type", event_kind_name(event.kind)},
+    };
+    if (!event.payload.is_object()) return out;
+    for (const char* key : {
+             "busy", "outcome", "reason", "request_id", "title"}) {
+        if (event.payload.contains(key)) out[key] = event.payload[key];
+    }
+    if (event.kind == SessionEventKind::Message) {
+        bool truncated = false;
+        out["role"] = event.payload.value("role", std::string{});
+        out["content"] = trim_and_limit(
+            event.payload.value("content", std::string{}),
+            1200, &truncated);
+        out["truncated"] = truncated;
+    }
+    return out;
+}
+
+} // namespace acecode::thread_presentation
diff --git a/src/host/session_host/thread_presentation.hpp b/src/host/session_host/thread_presentation.hpp
new file mode 100644
index 000000000..8399183fc
--- /dev/null
+++ b/src/host/session_host/thread_presentation.hpp
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <cstddef>
+#include <string>
+#include <nlohmann/json_fwd.hpp>
+
+namespace acecode {
+struct SessionMeta;
+struct SessionInfo;
+struct SessionEvent;
+}
+
+namespace acecode::thread_presentation {
+
+std::string trim_and_limit(std::string value, std::size_t max_chars,
+                           bool* truncated = nullptr);
+nlohmann::json thread_summary(const SessionMeta& meta, const SessionInfo* active,
+                              bool pinned, int pinned_index = 0);
+nlohmann::json compact_wait_event(const SessionEvent& event);
+
+} // namespace acecode::thread_presentation
diff --git a/src/host/session_host/thread_service.cpp b/src/host/session_host/thread_service.cpp
index 686218be4..ca8178ea5 100644
--- a/src/host/session_host/thread_service.cpp
+++ b/src/host/session_host/thread_service.cpp
@@ -1,4 +1,5 @@
 #include "thread_service.hpp"
+#include "thread_presentation.hpp"
 #include "session/scoped_subscription.hpp"
 #include "thread_wait_state.hpp"
 #include "agent/transcript/conversation_history.hpp"
@@ -17,6 +18,7 @@
 #include "utils/logger.hpp"
 #include "utils/paths.hpp"
 #include "utils/utf8_path.hpp"
+#include "workspace/workspace_registry.hpp"
 
 #include <algorithm>
 #include <chrono>
@@ -38,11 +40,13 @@ namespace acecode {
 namespace {
 
 using nlohmann::json;
+using thread_presentation::trim_and_limit;
+using thread_presentation::thread_summary;
+using thread_presentation::compact_wait_event;
 
 constexpr std::size_t kMaxListLimit = 50;
 constexpr std::size_t kMaxTurnLimit = 20;
 constexpr std::size_t kMaxItemChars = 8000;
-constexpr std::size_t kSummaryChars = 240;
 constexpr std::size_t kMaxWaitTargets = 8;
 constexpr int kMaxWaitMs = 120000;
 
@@ -59,22 +63,6 @@ struct ScopedThread {
     }
 };
 
-std::string trim_and_limit(std::string value,
-                           std::size_t max_chars,
-                           bool* truncated = nullptr) {
-    while (!value.empty() &&
-           std::isspace(static_cast<unsigned char>(value.front()))) {
-        value.erase(value.begin());
-    }
-    while (!value.empty() &&
-           std::isspace(static_cast<unsigned char>(value.back()))) {
-        value.pop_back();
-    }
-    const std::string limited = truncate_utf8_prefix(value, max_chars);
-    if (truncated) *truncated = limited.size() < value.size();
-    return limited;
-}
-
 bool valid_title(const std::string& title) {
     if (title.size() > 160) return false;
     return std::none_of(title.begin(), title.end(), [](unsigned char ch) {
@@ -334,64 +322,6 @@ std::optional<std::size_t> parse_cursor_offset(const std::string& cursor) {
     }
 }
 
-json thread_summary(const SessionMeta& meta,
-                    const SessionInfo* active,
-                    bool pinned,
-                    int pinned_index = 0) {
-    const bool is_active = active != nullptr;
-    const bool busy = active && active->busy;
-    json out{
-        {"threadId", meta.id},
-        {"cwd", meta.cwd},
-        {"noWorkspace", meta.no_workspace},
-        {"title", active && !active->title.empty() ? active->title : meta.title},
-        {"summary", trim_and_limit(
-            active && !active->summary.empty() ? active->summary : meta.summary,
-            kSummaryChars)},
-        {"createdAt", active && !active->created_at.empty()
-                          ? active->created_at : meta.created_at},
-        {"updatedAt", active && !active->updated_at.empty()
-                          ? active->updated_at : meta.updated_at},
-        {"active", is_active},
-        {"busy", busy},
-        {"status", busy ? "running" : "idle"},
-        {"archived", meta.archived},
-        {"pinned", pinned},
-        {"parentThreadId", meta.parent_session_id.empty()
-                               ? json(nullptr) : json(meta.parent_session_id)},
-        {"model", active && !active->model_name.empty()
-                      ? active->model_name : meta.model_preset},
-    };
-    if (pinned_index > 0) out["pinnedIndex"] = pinned_index;
-    return out;
-}
-
-std::string event_kind_name(SessionEventKind kind) {
-    return to_string(kind);
-}
-
-
-json compact_wait_event(const SessionEvent& event) {
-    json out{
-        {"cursor", std::to_string(event.seq)},
-        {"type", event_kind_name(event.kind)},
-    };
-    if (!event.payload.is_object()) return out;
-    for (const char* key : {
-             "busy", "outcome", "reason", "request_id", "title"}) {
-        if (event.payload.contains(key)) out[key] = event.payload[key];
-    }
-    if (event.kind == SessionEventKind::Message) {
-        bool truncated = false;
-        out["role"] = event.payload.value("role", std::string{});
-        out["content"] = trim_and_limit(
-            event.payload.value("content", std::string{}),
-            1200, &truncated);
-        out["truncated"] = truncated;
-    }
-    return out;
-}
-
 std::vector<ChatMessage> completed_history_for_fork(
     std::vector<ChatMessage> messages,
     bool source_busy) {
@@ -764,8 +694,9 @@ ThreadServiceResult ThreadService::create(
     const ThreadScope& scope,
     const std::string& prompt,
     const std::string& title,
-    const std::string& model_name) const {
-    if (!deps_.registry || !deps_.client || scope.cwd.empty()) {
+    const std::string& model_name,
+    const ThreadCreateTarget& target) const {
+    if (!deps_.registry || !deps_.client) {
         return ThreadServiceResult::fail("thread creation is unavailable");
     }
     if (prompt.empty()) return ThreadServiceResult::fail("prompt is required");
@@ -774,6 +705,52 @@ ThreadServiceResult ThreadService::create(
     SessionOptions options;
     options.cwd = scope.cwd;
     options.model_name = model_name;
+    const bool explicit_directory = !target.cwd.empty() || !target.workspace_hash.empty();
+    if ((!target.cwd.empty() && !target.workspace_hash.empty()) ||
+        (target.no_workspace && explicit_directory)) {
+        return ThreadServiceResult::fail(
+            "choose only one of cwd, workspaceHash or noWorkspace:true");
+    }
+    options.no_workspace = target.no_workspace || (!explicit_directory &&
+        (scope.no_workspace || (scope.caller_manager && scope.caller_manager->is_no_workspace())));
+    if (!target.workspace_hash.empty()) {
+        if (!valid_storage_token(target.workspace_hash)) {
+            return ThreadServiceResult::fail("invalid workspaceHash");
+        }
+        const auto workspace = desktop::load_workspace_metadata(
+            projects_directory(), target.workspace_hash);
+        if (!workspace || !desktop::workspace_hash_matches_cwd(
+                target.workspace_hash, workspace->cwd)) {
+            return ThreadServiceResult::fail("workspaceHash does not identify a registered workspace");
+        }
+        options.cwd = workspace->cwd;
+    } else if (!target.cwd.empty()) {
+        options.cwd = target.cwd;
+    }
+    if (!options.no_workspace) {
+        const auto path = path_from_utf8(options.cwd);
+        if (options.cwd.empty() || options.cwd.find('\0') != std::string::npos ||
+            !path.is_absolute()) {
+            return ThreadServiceResult::fail("cwd must be an existing absolute directory");
+        }
+        std::error_code ec;
+        if (!std::filesystem::is_directory(path, ec) || ec) {
+            return ThreadServiceResult::fail("workspace directory is unavailable: " + options.cwd);
+        }
+        if (!target.cwd.empty()) {
+            const auto canonical = std::filesystem::canonical(path, ec);
+            if (ec) return ThreadServiceResult::fail("failed to resolve cwd: " + ec.message());
+            options.cwd = path_to_utf8(canonical);
+        }
+        desktop::WorkspaceRegistry workspaces;
+        const auto workspace = workspaces.register_new(projects_directory(), options.cwd);
+        const auto persisted = desktop::load_workspace_metadata(projects_directory(), workspace.hash);
+        if (!persisted || !persisted->desktop_visible ||
+            !desktop::workspace_hash_matches_cwd(workspace.hash, persisted->cwd)) {
+            return ThreadServiceResult::fail("failed to persist workspace registration");
+        }
+        options.workspace_hash = workspace.hash;
+    }
     std::string id;
     try {
         id = deps_.registry->create(options);
@@ -788,17 +765,21 @@ ThreadServiceResult ThreadService::create(
         return ThreadServiceResult::fail("failed to persist new thread");
     }
     if (!title.empty()) entry->sm->set_session_title(title);
+    const std::string project_dir = entry->sm->current_project_dir();
     if (!deps_.client->send_input(id, prompt)) {
         deps_.client->destroy_session(id);
         std::string ignored;
         SessionStorage::purge_session_files(
-            SessionStorage::get_project_dir(scope.cwd), id, &ignored);
+            project_dir, id, &ignored);
         return ThreadServiceResult::fail("failed to queue initial prompt");
     }
     return ThreadServiceResult::ok(json{
         {"threadId", id},
         {"title", title},
         {"status", "running"},
+        {"cwd", entry->cwd},
+        {"workspaceHash", storage_workspace_hash(project_dir)},
+        {"noWorkspace", entry->no_workspace},
     });
 }
 
@@ -853,32 +834,49 @@ ThreadServiceResult ThreadService::fork(
 ThreadServiceResult ThreadService::send(
     const ThreadScope& scope,
     const std::string& thread_id,
-    const std::string& prompt) const {
+    const std::string& prompt,
+    const std::string& workspace_hash) const {
     if (thread_id.empty()) return ThreadServiceResult::fail("threadId is required");
     if (thread_id == scope.caller_thread_id) {
         return ThreadServiceResult::fail(
             "the calling thread cannot send a message to itself");
     }
     if (prompt.empty()) return ThreadServiceResult::fail("prompt is required");
-    auto scoped = resolve_thread(deps_, scope, thread_id);
-    if (!scoped) {
-        return ThreadServiceResult::fail(
-            "thread is unavailable in the current workspace");
+    std::string error;
+    auto scoped = resolve_discovered_thread(deps_, scope, thread_id, workspace_hash, error);
+    if (!scoped) return ThreadServiceResult::fail(error);
+    const auto expected_hash = storage_workspace_hash(scoped->project_dir);
+    const auto active_matches_target = [&](const std::shared_ptr<SessionEntry>& active) {
+        return active && active->sm &&
+            storage_workspace_hash(active->sm->current_project_dir()) == expected_hash;
+    };
+    if (deps_.registry) {
+        const auto active = deps_.registry->acquire(thread_id);
+        if (active && !active_matches_target(active)) {
+            return ThreadServiceResult::fail("threadId is active in a different workspace");
+        }
     }
     if (!scoped->active) {
         SessionOptions options;
-        options.cwd = scope.cwd;
+        options.cwd = scoped->meta.cwd;
+        options.no_workspace = scoped->meta.no_workspace;
+        options.workspace_hash = options.no_workspace ? std::string{} : expected_hash;
+        if (options.cwd.empty()) return ThreadServiceResult::fail("target thread cwd is unavailable");
         if (!deps_.client ||
             !deps_.client->resume_session(thread_id, options)) {
             return ThreadServiceResult::fail("failed to resume target thread");
         }
     }
+    if (deps_.registry && !active_matches_target(deps_.registry->acquire(thread_id))) {
+        return ThreadServiceResult::fail("target thread workspace changed before delivery");
+    }
     if (!deps_.client || !deps_.client->send_input(thread_id, prompt)) {
         return ThreadServiceResult::fail("failed to queue thread prompt");
     }
     return ThreadServiceResult::ok(json{
         {"threadId", thread_id},
         {"delivery", "queued"},
+        {"workspaceHash", expected_hash},
     });
 }
 
diff --git a/src/host/session_host/thread_service.hpp b/src/host/session_host/thread_service.hpp
index f7faea608..fed765edd 100644
--- a/src/host/session_host/thread_service.hpp
+++ b/src/host/session_host/thread_service.hpp
@@ -20,6 +20,13 @@ struct ThreadScope {
     std::string cwd;
     std::string caller_thread_id;
     SessionManager* caller_manager = nullptr;
+    bool no_workspace = false;
+};
+
+struct ThreadCreateTarget {
+    std::string cwd;
+    std::string workspace_hash;
+    bool no_workspace = false;
 };
 
 struct ThreadWaitTarget {
@@ -44,7 +51,8 @@ struct ThreadServiceResult {
 
 // In-process thread domain service shared by model tools and host surfaces.
 // Discovery reads persistent and active sessions across all ACECode projects.
-// Mutations retain the calling workspace scope. No operation loops back
+// Creation and input delivery support explicit targets; other mutations
+// retain the calling workspace scope. No operation loops back
 // through ACECode's HTTP API.
 class ThreadService {
 public:
@@ -74,12 +82,14 @@ class ThreadService {
     ThreadServiceResult create(const ThreadScope& scope,
                                const std::string& prompt,
                                const std::string& title = {},
-                               const std::string& model_name = {}) const;
+                               const std::string& model_name = {},
+                               const ThreadCreateTarget& target = {}) const;
     ThreadServiceResult fork(const ThreadScope& scope,
                              const std::string& thread_id = {}) const;
     ThreadServiceResult send(const ThreadScope& scope,
                              const std::string& thread_id,
-                             const std::string& prompt) const;
+                             const std::string& prompt,
+                             const std::string& workspace_hash = {}) const;
     ThreadServiceResult set_title(const ThreadScope& scope,
                                   const std::string& thread_id,
                                   const std::string& title) const;
diff --git a/src/host/session_host/tools/thread_tools.cpp b/src/host/session_host/tools/thread_tools.cpp
index c3c44248f..80b41134a 100644
--- a/src/host/session_host/tools/thread_tools.cpp
+++ b/src/host/session_host/tools/thread_tools.cpp
@@ -34,6 +34,7 @@ ThreadScope scope_from_context(const ToolContext& ctx) {
     scope.cwd = ctx.cwd;
     scope.caller_manager = ctx.session_manager;
     if (!ctx.session_manager) return scope;
+    scope.no_workspace = ctx.session_manager->is_no_workspace();
     scope.caller_thread_id = ctx.session_manager->current_session_id();
     if (!scope.caller_thread_id.empty()) {
         const auto meta = ctx.session_manager->load_session_meta(
@@ -103,12 +104,22 @@ json object_schema(json properties,
 ToolImpl create_thread_tool(std::shared_ptr<ThreadToolDeps> deps) {
     return make_tool(
         "create_thread",
-        "Create a separate ACECode thread in the current workspace and send "
-        "its initial prompt. Creation is non-blocking and returns threadId.",
+        "Create a separate ACECode thread and queue its initial prompt. "
+        "Omit targets to inherit the caller's workspace or workspace-free "
+        "state. To select a target, pass workspaceHash from list_threads or "
+        "create_workspace, an existing absolute cwd, or noWorkspace:true. "
+        "Directory targets become visible workspaces. Returns threadId, "
+        "cwd, workspaceHash and noWorkspace for locating the new thread.",
         object_schema(json{
             {"prompt", json{{"type", "string"}, {"minLength", 1}}},
             {"title", json{{"type", "string"}, {"maxLength", 160}}},
             {"model", json{{"type", "string"}}},
+            {"workspaceHash", json{{"type", "string"}, {"minLength", 1},
+                {"description", "Registered workspace hash; cannot combine with cwd or noWorkspace:true"}}},
+            {"cwd", json{{"type", "string"}, {"minLength", 1},
+                {"description", "Existing absolute directory; cannot combine with workspaceHash or noWorkspace:true"}}},
+            {"noWorkspace", json{{"type", "boolean"},
+                {"description", "True creates a workspace-free thread; false or omitted inherits unless a directory target is supplied"}}},
         }, json::array({"prompt"})),
         false,
         [deps](const std::string& arguments,
@@ -120,11 +131,25 @@ ToolImpl create_thread_tool(std::shared_ptr<ThreadToolDeps> deps) {
             if (!parser) return error;
             auto prompt = required_arg<std::string>(*parser, "prompt", &error);
             if (!prompt) return error;
+            ThreadCreateTarget target;
+            for (const auto* key : {"cwd", "workspaceHash"}) {
+                const auto value = parser->get<json>(key);
+                if (!value) continue;
+                if (!value->is_string() || value->get<std::string>().empty()) {
+                    return tool_error(std::string(key) + " must be a non-empty string");
+                }
+                (std::string(key) == "cwd" ? target.cwd : target.workspace_hash) =
+                    value->get<std::string>();
+            }
+            if (const auto value = parser->get<json>("noWorkspace")) {
+                if (!value->is_boolean()) return tool_error("noWorkspace must be a boolean");
+                target.no_workspace = value->get<bool>();
+            }
             return service_result(service->create(
                 scope_from_context(ctx),
                 *prompt,
                 parser->get_or<std::string>("title", {}),
-                parser->get_or<std::string>("model", {})));
+                parser->get_or<std::string>("model", {}), target));
         });
 }
 
@@ -225,11 +250,14 @@ ToolImpl read_thread_tool(std::shared_ptr<ThreadToolDeps> deps) {
 ToolImpl send_message_tool(std::shared_ptr<ThreadToolDeps> deps) {
     return make_tool(
         "send_message_to_thread",
-        "Send a follow-up prompt to an existing ACECode thread in the "
-        "background.",
+        "Queue a follow-up prompt to an existing ACECode thread in any "
+        "workspace, including workspace-free threads. Optional workspaceHash "
+        "from create_thread or list_threads locates the storage project and "
+        "disambiguates threadId. Queuing does not answer a pending user question.",
         object_schema(json{
             {"threadId", json{{"type", "string"}, {"minLength", 1}}},
             {"prompt", json{{"type", "string"}, {"minLength", 1}}},
+            {"workspaceHash", json{{"type", "string"}, {"minLength", 1}}},
         }, json::array({"threadId", "prompt"})),
         false,
         [deps](const std::string& arguments,
@@ -244,9 +272,16 @@ ToolImpl send_message_tool(std::shared_ptr<ThreadToolDeps> deps) {
             if (!thread_id) return error;
             auto prompt = required_arg<std::string>(*parser, "prompt", &error);
             if (!prompt) return error;
+            std::string workspace_hash;
+            if (const auto value = parser->get<json>("workspaceHash")) {
+                if (!value->is_string() || value->get<std::string>().empty()) {
+                    return tool_error("workspaceHash must be a non-empty string");
+                }
+                workspace_hash = value->get<std::string>();
+            }
             return service_result(service->send(
                 scope_from_context(ctx),
-                *thread_id, *prompt));
+                *thread_id, *prompt, workspace_hash));
         });
 }
 
diff --git a/tests/channels/core/commands_test.cpp b/tests/channels/core/commands_test.cpp
index e12cc559d..7c65a410b 100644
--- a/tests/channels/core/commands_test.cpp
+++ b/tests/channels/core/commands_test.cpp
@@ -27,6 +27,16 @@ TEST(ChannelCommands, ParsesKnownCommands) {
     EXPECT_EQ(resume.argument, "3");
     EXPECT_EQ(parse_command("/models").kind, CommandKind::Model);
     EXPECT_EQ(parse_command("/model gpt-5").argument, "gpt-5");
+    EXPECT_EQ(parse_command("/mode").kind, CommandKind::Mode);
+    EXPECT_EQ(parse_command(" /MODE AUTO ").argument, "auto");
+    EXPECT_EQ(parse_command("/mode accept-edits").argument, "auto");
+    EXPECT_EQ(parse_command("/mode acceptEdits").argument, "auto");
+    EXPECT_EQ(parse_command("/mode default").argument, "default");
+    EXPECT_EQ(parse_command("/mode yolo").argument, "yolo");
+    EXPECT_EQ(parse_command(" /YOLO ").kind, CommandKind::Yolo);
+    EXPECT_EQ(parse_command("/effort").kind, CommandKind::Effort);
+    EXPECT_EQ(parse_command(" /EFFORT HIGH ").argument, "high");
+    EXPECT_EQ(parse_command("/effort default").argument, "default");
     EXPECT_EQ(parse_command("/approve abc").kind, CommandKind::Approve);
     EXPECT_EQ(parse_command("/deny abc").kind, CommandKind::Deny);
     EXPECT_EQ(parse_command("/aq 1 2").kind, CommandKind::Question);
@@ -39,6 +49,7 @@ TEST(ChannelCommands, UnknownSlashTextIsPlainInput) {
     EXPECT_EQ(parse_command("/review 这个文件").kind, CommandKind::None);
     EXPECT_EQ(parse_command("").kind, CommandKind::None);
     EXPECT_EQ(parse_command("/statusbar").kind, CommandKind::None);
+    EXPECT_EQ(parse_command("/yolo-extra").kind, CommandKind::None);
 }
 
 // 场景:命令缺参数或参数格式不对。
@@ -49,6 +60,12 @@ TEST(ChannelCommands, ReportsUsageErrors) {
     EXPECT_FALSE(parse_command("/deny a b").error.empty());
     EXPECT_FALSE(parse_command("/sessions everything").error.empty());
     EXPECT_TRUE(parse_command("/sessions all").error.empty());
+    EXPECT_FALSE(parse_command("/mode invalid").error.empty());
+    EXPECT_FALSE(parse_command("/mode auto yolo").error.empty());
+    EXPECT_FALSE(parse_command("/yolo extra").error.empty());
+    EXPECT_FALSE(parse_command("/effort high low").error.empty());
+    EXPECT_FALSE(parse_command("/effort high\tlow").error.empty());
+    EXPECT_TRUE(parse_command("/effort xhigh").error.empty());
 }
 
 // 场景:会话正在执行时收到各种命令。
@@ -57,7 +74,8 @@ TEST(ChannelCommands, OnlyNewAndResumeWaitForIdle) {
     EXPECT_FALSE(runs_while_busy(CommandKind::New));
     EXPECT_FALSE(runs_while_busy(CommandKind::Resume));
     for (const auto kind : {CommandKind::Help, CommandKind::Status, CommandKind::Stop, CommandKind::Sessions,
-                            CommandKind::Model, CommandKind::Approve, CommandKind::Deny, CommandKind::Question})
+                            CommandKind::Model, CommandKind::Mode, CommandKind::Yolo, CommandKind::Effort,
+                            CommandKind::Approve, CommandKind::Deny, CommandKind::Question})
         EXPECT_TRUE(runs_while_busy(kind));
 }
 
@@ -66,6 +84,10 @@ TEST(ChannelCommands, OnlyNewAndResumeWaitForIdle) {
 TEST(ChannelCommands, HelpAndPromptsAreChinese) {
     EXPECT_EQ(texts::help(true).find("只能在自己创建的会话"), std::string::npos);
     EXPECT_NE(texts::help(false).find("只能在自己创建的会话"), std::string::npos);
+    for (const auto* command : {"/mode", "/yolo", "/effort"}) {
+        EXPECT_NE(texts::help(true).find(command), std::string::npos);
+        EXPECT_NE(texts::help(false).find(command), std::string::npos);
+    }
     const auto prompt = texts::permission_prompt("p1", "bash", "{\"command\":\"ls\"}");
     EXPECT_NE(prompt.find("/approve p1"), std::string::npos);
     EXPECT_NE(prompt.find("/deny p1"), std::string::npos);
diff --git a/tests/channels/core/router_test.cpp b/tests/channels/core/router_test.cpp
index 9b9515bac..a96ee118b 100644
--- a/tests/channels/core/router_test.cpp
+++ b/tests/channels/core/router_test.cpp
@@ -73,6 +73,26 @@ class ChannelRouter : public ::testing::Test {
             switched.emplace_back(id, name);
             return true;
         };
+        deps.set_permission_mode = [this](const std::string& id, const std::string& mode) {
+            mode_changes.emplace_back(id, mode);
+            if (fail_controls) return false;
+            std::lock_guard<std::mutex> lock(sessions.mu);
+            sessions.sessions.at(id).permission_mode = mode;
+            return true;
+        };
+        deps.model_state = [this](const std::string& id) -> std::optional<SessionModelState> {
+            return model_states[id];
+        };
+        deps.set_reasoning_effort = [this](const std::string& id, const std::optional<std::string>& effort,
+                                          std::string* error) -> std::optional<SessionModelState> {
+            effort_changes.emplace_back(id, effort);
+            if (fail_controls || (effort && *effort != "low" && *effort != "high")) {
+                *error = "测试更新失败";
+                return std::nullopt;
+            }
+            model_states[id].reasoning_effort = effort;
+            return model_states[id];
+        };
         deps.expand_skill = [](const std::string&, const std::string& text) { return "[展开]" + text; };
         deps.release_session = [this](const std::string& id, const std::string& key, const std::string& label) {
             if (conversations) conversations->release_session(id, key, label);
@@ -107,6 +127,10 @@ class ChannelRouter : public ::testing::Test {
     AccessControl access;
     std::unique_ptr<Conversations> conversations;
     std::vector<std::pair<std::string, std::string>> switched;
+    std::vector<std::pair<std::string, std::string>> mode_changes;
+    std::vector<std::pair<std::string, std::optional<std::string>>> effort_changes;
+    std::map<std::string, SessionModelState> model_states;
+    bool fail_controls = false;
     int binding_changes = 0;
 };
 
@@ -196,6 +220,98 @@ TEST_F(ChannelRouter, BusySessionRejectsSwitching) {
     EXPECT_TRUE(transport->wait_said("状态:执行中"));
 }
 
+TEST_F(ChannelRouter, ModeCommandsStayInBoundSessionWhileBusy) {
+    send("1", "/new", "m1");
+    send("2", "/new", "m2");
+    const auto id = bound("2");
+    sessions.set_busy(id, true);
+    send("2", "/mode", "m3");
+    EXPECT_TRUE(transport->wait_said("权限模式:默认权限 (default)"));
+    send("2", "/mode auto", "m4");
+    EXPECT_TRUE(transport->wait_said("已切换权限模式为 自动模式 (auto)"));
+    send("2", "/yolo", "m5");
+    send("2", "/yolo", "m5");
+    EXPECT_TRUE(transport->wait_said("已切换权限模式为 完全访问权限 (yolo)"));
+    send("2", "/status", "m6");
+    EXPECT_TRUE(transport->wait_said("权限模式:完全访问权限 (yolo)"));
+    send("2", "/mode default", "m7");
+    ASSERT_EQ(mode_changes.size(), 3u);
+    EXPECT_EQ(mode_changes[0], std::make_pair(id, std::string("auto")));
+    EXPECT_EQ(mode_changes[1], std::make_pair(id, std::string("yolo")));
+    EXPECT_EQ(mode_changes[2], std::make_pair(id, std::string("default")));
+    EXPECT_TRUE(sessions.input_log().empty());
+    std::lock_guard<std::mutex> lock(sessions.mu);
+    EXPECT_EQ(sessions.sessions.at(bound("1")).permission_mode, "default");
+    EXPECT_TRUE(sessions.sessions.at(id).busy);
+}
+
+TEST_F(ChannelRouter, EffortQueriesChangesResetsAndReportsFailures) {
+    send("1", "/new", "m1");
+    const auto id = bound("1");
+    auto& model = model_states[id];
+    model.provider = "openai";
+    model.reasoning = ModelReasoningOptions{};
+    model.reasoning->supported = true;
+    model.reasoning->enabled = true;
+    model.reasoning->supported_efforts = {"low", "high"};
+    model.reasoning->effort = "low";
+    sessions.set_busy(id, true);
+    send("1", "/effort", "m2");
+    EXPECT_TRUE(transport->wait_said("思考深度:low (模型预设)"));
+    EXPECT_TRUE(transport->wait_said("可用档位: low high"));
+    send("1", "/effort high", "m3");
+    send("1", "/effort high", "m3");
+    EXPECT_TRUE(transport->wait_said("从下一次模型请求起生效"));
+    EXPECT_EQ(model.reasoning_effort, "high");
+    send("1", "/effort invalid", "m4");
+    EXPECT_TRUE(transport->wait_said("测试更新失败"));
+    EXPECT_EQ(model.reasoning_effort, "high");
+    send("1", "/status", "m5");
+    EXPECT_TRUE(transport->wait_said("思考深度:high"));
+    send("1", "/effort default", "m6");
+    EXPECT_TRUE(transport->wait_said("已恢复模型预设思考深度"));
+    EXPECT_FALSE(model.reasoning_effort);
+    ASSERT_EQ(effort_changes.size(), 3u);
+    EXPECT_EQ(effort_changes.back().first, id);
+    EXPECT_FALSE(effort_changes.back().second);
+    EXPECT_TRUE(sessions.input_log().empty());
+    model.reasoning->enabled = false;
+    send("1", "/effort", "m7");
+    EXPECT_TRUE(transport->wait_said("当前模型未启用或不支持 effort 档位"));
+}
+
+TEST_F(ChannelRouter, ControlsRejectUnboundUnauthorizedMalformedAndDeletedSessions) {
+    for (const auto* command : {"/mode auto", "/yolo", "/effort high"}) {
+        send("1", command, std::string("unbound-") + command);
+        send("9", command, std::string("unauthorized-") + command);
+    }
+    EXPECT_TRUE(transport->wait_said("当前还没有会话"));
+    EXPECT_TRUE(sessions.created_log().empty());
+    send("1", "/new", "new");
+    send("1", "/mode bad", "bad-mode");
+    send("1", "/yolo extra", "bad-yolo");
+    send("1", "/effort high low", "bad-effort");
+    const auto id = bound("1");
+    restart();
+    sessions.remove(id);
+    send("1", "/yolo", "deleted");
+    EXPECT_TRUE(transport->wait_said("无法打开当前绑定的会话"));
+    EXPECT_TRUE(mode_changes.empty());
+    EXPECT_TRUE(effort_changes.empty());
+    EXPECT_TRUE(sessions.input_log().empty());
+}
+
+TEST_F(ChannelRouter, FailedModeUpdateDoesNotReportSuccess) {
+    send("1", "/new", "m1");
+    fail_controls = true;
+    send("1", "/yolo", "m2");
+    EXPECT_TRUE(transport->wait_said("切换权限模式失败"));
+    EXPECT_FALSE(transport->said("已切换权限模式"));
+    send("1", "/mode", "m3");
+    EXPECT_TRUE(transport->wait_said("权限模式:默认权限 (default)"));
+    EXPECT_TRUE(sessions.input_log().empty());
+}
+
 // 场景:机主 /sessions 列出全部会话,然后目录里新增一个排在最前面的会话,再 /resume 1。
 // 期望:编号按最近一次列表的快照解析,选中的是列表里的第 1 项而不是新会话。
 TEST_F(ChannelRouter, ResumeIndexUsesLatestListingSnapshot) {
diff --git a/tests/config/config_first_init_test.cpp b/tests/config/config_first_init_test.cpp
index d10a476de..fb007b3bc 100644
--- a/tests/config/config_first_init_test.cpp
+++ b/tests/config/config_first_init_test.cpp
@@ -234,6 +234,23 @@ TEST_F(ConfigFirstInitTest, RuntimeSkillAllowlistIsNeverPersisted) {
     EXPECT_FALSE(reloaded.skills.allowed.has_value());
 }
 
+TEST_F(ConfigFirstInitTest, SkillScanPathsRoundTripEmptyAndReset) {
+    const auto path = temp_home / ".acecode/config.json";
+    acecode::AppConfig cfg;
+    EXPECT_FALSE(cfg.skills.scan_paths);
+    for (const auto& paths : {std::vector<std::string>{".custom/skills", "~/.codex/skills"},
+                             std::vector<std::string>{}}) {
+        cfg.skills.scan_paths = paths;
+        acecode::save_config(cfg, path.string());
+        auto loaded = acecode::load_config_from_path(path.string(), false);
+        ASSERT_TRUE(loaded.skills.scan_paths);
+        EXPECT_EQ(*loaded.skills.scan_paths, paths);
+    }
+    cfg.skills.scan_paths.reset();
+    acecode::save_config(cfg, path.string());
+    EXPECT_FALSE(acecode::load_config_from_path(path.string(), false).skills.scan_paths);
+}
+
 TEST_F(ConfigFirstInitTest, ExplicitEmptySavedModelsDoesNotSynthesizeCopilot) {
     fs::create_directories(temp_home / ".acecode");
     {
diff --git a/tests/cpp_source_paths.json b/tests/cpp_source_paths.json
index 81258524b..57c43f4cb 100644
--- a/tests/cpp_source_paths.json
+++ b/tests/cpp_source_paths.json
@@ -13,6 +13,7 @@
   "desktop/splash_screen.cpp": "src/apps/desktop/splash_screen.cpp",
   "desktop/startup_progress.hpp": "src/apps/desktop/startup_progress.hpp",
   "desktop/web_host.cpp": "src/apps/desktop/web_host.cpp",
+  "desktop/web_host_focus.hpp": "src/apps/desktop/web_host_focus.hpp",
   "tool/agent_browser/browser_tools.cpp": "src/adapters/tool/agent_browser/browser_tools.cpp",
   "tool/agent_browser/browser_tools.hpp": "src/adapters/tool/agent_browser/browser_tools.hpp",
   "tool/agent_browser/cdp_client.cpp": "src/adapters/tool/agent_browser/cdp_client.cpp",
diff --git a/tests/daemon/im_channels_e2e_test.cpp b/tests/daemon/im_channels_e2e_test.cpp
index 65563fea9..f901e449e 100644
--- a/tests/daemon/im_channels_e2e_test.cpp
+++ b/tests/daemon/im_channels_e2e_test.cpp
@@ -293,6 +293,124 @@ TEST_F(ImChannelsEndToEnd, TelegramValidatesTokenBindsOwnerAndChats) {
         if (info.id == session) EXPECT_TRUE(info.no_workspace);
 }
 
+TEST_F(ImChannelsEndToEnd, TelegramModeCommandsChangeAndPersistBoundSession) {
+    start_host();
+    connect_telegram_as_owner();
+    telegram.push_update(telegram_message(42, "private", 42, 2, "/new"));
+    ASSERT_TRUE(wait_until([&] { return !bound("telegram", "42", "42").empty(); }));
+    const auto id = bound("telegram", "42", "42");
+    auto entry = registry->acquire(id);
+    ASSERT_TRUE(entry);
+    const auto other = client->create_session(SessionOptions{});
+    std::int64_t sequence = 3;
+    for (const auto& item : std::vector<std::pair<std::string, PermissionMode>>{
+             {"/mode auto", PermissionMode::Auto}, {"/yolo", PermissionMode::Yolo},
+             {"/mode default", PermissionMode::Default}}) {
+        telegram.push_update(telegram_message(42, "private", 42, sequence++, item.first));
+        ASSERT_TRUE(wait_until([&] { return entry->perm->mode() == item.second; }));
+        ASSERT_TRUE(wait_until([&] {
+            return SessionStorage::read_meta(SessionStorage::meta_path(
+                SessionStorage::get_project_dir(entry->cwd), id)).permission_mode ==
+                PermissionManager::mode_name(item.second);
+        }));
+        // 状态先更新,回执仍经 Telegram 限速队列发送;逐条等回执再继续。
+        const std::string mode_marker = std::string("(") + PermissionManager::mode_name(item.second) + ")";
+        ASSERT_TRUE(wait_until([&] { return telegram_sent(42, mode_marker); }));
+        EXPECT_EQ(registry->acquire(other)->perm->mode(), PermissionMode::Default);
+        EXPECT_FALSE(model_saw(item.first));
+    }
+    telegram.push_update(telegram_message(42, "private", 42, sequence++, "/help"));
+    const bool help_received = wait_until([&] { return telegram_sent(42, "/effort") && telegram_sent(42, "/yolo"); });
+    if (!help_received) {
+        json sent = json::array();
+        for (const auto& call : telegram.calls_to("sendMessage")) sent.push_back(call.body);
+        ADD_FAILURE() << "Missing command help in Telegram replies: " << sent.dump(2);
+    }
+    telegram.push_update(telegram_message(42, "private", 42, sequence++, "/status"));
+    EXPECT_TRUE(wait_until([&] { return telegram_sent(42, "权限模式:默认权限 (default)"); }));
+}
+
+TEST_F(ImChannelsEndToEnd, TelegramYoloResolvesPendingPermission) {
+    std::atomic<int> calls{0};
+    ToolDef def;
+    def.name = "deploy_preview";
+    def.description = "deploy a preview build";
+    def.parameters = json{{"type", "object"}, {"properties", json::object()}};
+    ASSERT_TRUE(tools.register_tool(ToolImpl{def, [&](const std::string&, const ToolContext&) {
+        ++calls;
+        return ToolResult{"deployed", true};
+    }, false}));
+    start_host();
+    connect_telegram_as_owner();
+    provider->push_tool_call("deploy_preview", "{}", "call-yolo");
+    provider->push_text("部署完成");
+    telegram.push_update(telegram_message(42, "private", 42, 2, "部署一下"));
+    ASSERT_TRUE(wait_until([&] { return telegram_sent(42, "需要你确认一个操作"); }));
+    EXPECT_EQ(calls.load(), 0);
+    telegram.push_update(telegram_message(42, "private", 42, 3, "/yolo"));
+    ASSERT_TRUE(wait_until([&] { return telegram_sent(42, "部署完成"); }));
+    EXPECT_EQ(calls.load(), 1);
+    EXPECT_EQ(registry->acquire(bound("telegram", "42", "42"))->perm->mode(), PermissionMode::Yolo);
+    EXPECT_FALSE(model_saw("/yolo"));
+}
+
+TEST_F(ImChannelsEndToEnd, TelegramEffortCommandsUseRealModelStateAndPersistOverride) {
+    client.reset();
+    registry.reset();
+    ModelProfile profile;
+    profile.name = "reasoning-test";
+    profile.provider = "openai";
+    profile.model = "channel-test";
+    profile.base_url = "http://127.0.0.1:1/v1";
+    profile.api_key = "test-key";
+    profile.context_window = 128000;
+    profile.capabilities_source = "manual";
+    profile.reasoning = ModelReasoningOptions{};
+    profile.reasoning->supported = true;
+    profile.reasoning->default_enabled = true;
+    profile.reasoning->supported_efforts = {"low", "high"};
+    profile.reasoning->effort = "low";
+    profile.reasoning->default_effort = "low";
+    config.saved_models = {profile};
+    config.default_model_name = profile.name;
+    SessionRegistryDeps deps;
+    deps.tools = &tools;
+    deps.template_permissions = &permissions;
+    deps.config = &config;
+    deps.config_mutex = &config_mu;
+    deps.cwd = workspace;
+    deps.no_workspace_cache_root = path_to_utf8(home / "no-workspace");
+    registry = std::make_unique<SessionRegistry>(deps);
+    client = std::make_unique<LocalSessionClient>(*registry);
+    start_host();
+    connect_telegram_as_owner();
+    telegram.push_update(telegram_message(42, "private", 42, 2, "/new"));
+    ASSERT_TRUE(wait_until([&] { return !bound("telegram", "42", "42").empty(); }));
+    const auto id = bound("telegram", "42", "42");
+    const auto other = client->create_session(SessionOptions{});
+    const auto entry = registry->acquire(id);
+    ASSERT_TRUE(entry);
+    const auto meta_path = SessionStorage::meta_path(SessionStorage::get_project_dir(entry->cwd), id);
+    telegram.push_update(telegram_message(42, "private", 42, 3, "/effort"));
+    ASSERT_TRUE(wait_until([&] { return telegram_sent(42, "可用档位: low high"); }));
+    telegram.push_update(telegram_message(42, "private", 42, 4, "/effort high"));
+    ASSERT_TRUE(wait_until([&] { return telegram_sent(42, "已更新思考深度"); }));
+    EXPECT_EQ(registry->current_model_state(id)->reasoning_effort, "high");
+    EXPECT_EQ(SessionStorage::read_meta(meta_path).reasoning_effort, "high");
+    EXPECT_FALSE(registry->current_model_state(other)->reasoning_effort);
+    EXPECT_EQ(config.saved_models.front().reasoning->effort, "low");
+    telegram.push_update(telegram_message(42, "private", 42, 5, "/effort invalid"));
+    ASSERT_TRUE(wait_until([&] { return telegram_sent(42, "当前模型不支持该 effort 档位"); }));
+    EXPECT_EQ(registry->current_model_state(id)->reasoning_effort, "high");
+    telegram.push_update(telegram_message(42, "private", 42, 6, "/effort default"));
+    ASSERT_TRUE(wait_until([&] { return telegram_sent(42, "已恢复模型预设思考深度"); }));
+    const auto reset = registry->current_model_state(id);
+    ASSERT_TRUE(reset && reset->reasoning);
+    EXPECT_FALSE(reset->reasoning_effort);
+    EXPECT_EQ(reset->reasoning->effort, "low");
+    EXPECT_FALSE(SessionStorage::read_meta(meta_path).reasoning_effort);
+}
+
 // 场景:机器人在一个未批准的群里被 @,机主在设置页批准该群后再次 @ 提问;群里不 @ 的消息。
 // 期望:未批准时只产生群的待批准请求、不回复;批准后 @ 的提问进入会话并在群里得到答复;
 // 不 @ 的消息被忽略。隐私模式(默认开启)反映在快照里。
diff --git a/tests/desktop/fixtures/window_focus_host.cpp b/tests/desktop/fixtures/window_focus_host.cpp
new file mode 100644
index 000000000..d60d44094
--- /dev/null
+++ b/tests/desktop/fixtures/window_focus_host.cpp
@@ -0,0 +1,85 @@
+// Standalone Windows smoke host for web/scripts/test-desktop-focus.mjs.
+// Link against the production web_host.cpp and desktop support libraries.
+#include "desktop/web_host.hpp"
+#include <nlohmann/json.hpp>
+#include <windows.h>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <type_traits>
+
+// Test driver only: simulate an explicit user switch from a background runner.
+static void activate_test_window(HWND window) {
+    const DWORD foreground = GetWindowThreadProcessId(GetForegroundWindow(), nullptr);
+    const DWORD current = GetCurrentThreadId();
+    const bool attached = foreground && foreground != current && AttachThreadInput(current, foreground, TRUE);
+    SetForegroundWindow(window);
+    SetFocus(window);
+    if (attached) AttachThreadInput(current, foreground, FALSE);
+}
+
+int main(int argc, char** argv) {
+    if (argc != 2) return 2;
+    if (!GetForegroundWindow()) {
+        std::cout << "[skip] Native keyboard test requires an active, unlocked Windows desktop" << std::endl;
+        return 77;
+    }
+    using acecode::desktop::WebHost;
+    WebHost host(false, WebHost::StartupWindowMode::OffscreenUntilReady);
+    host.set_title("ACECode focus verification");
+    host.set_size(1170, 820);
+    const auto hwnd = static_cast<HWND>(host.native_window());
+    const HWND previous = GetForegroundWindow();
+    using UniqueWindow = std::unique_ptr<std::remove_pointer_t<HWND>, decltype(&DestroyWindow)>;
+    UniqueWindow peer(CreateWindowExW(0, L"STATIC", L"Focus verification peer",
+        WS_OVERLAPPEDWINDOW, 100, 100, 300, 160, nullptr, nullptr, GetModuleHandleW(nullptr), nullptr),
+        &DestroyWindow);
+    const HWND other = peer.get(); // Borrowed for synchronous test operations.
+    if (!other) return 3;
+    int result = 1;
+    host.bind("aceDesktop_focusActiveWebview", [&host](const std::string&) {
+        return nlohmann::json{{"ok", host.focus_active_webview()}}.dump();
+    });
+    host.set_window_focus_handler([&host] {
+        host.eval("window.dispatchEvent(new Event('acecode:desktop-window-focus'))");
+    });
+    host.bind("aceFocusTest", [&](const std::string& request) {
+        const auto args = nlohmann::json::parse(request);
+        const std::string op = args.at(0);
+        if (op == "show" || op == "return" || op == "restore") {
+            ShowWindow(other, SW_HIDE);
+            if (IsIconic(hwnd)) ShowWindow(hwnd, SW_RESTORE);
+            host.set_visible(true);
+            activate_test_window(hwnd);
+        } else if (op == "away") {
+            ShowWindow(other, SW_SHOW);
+            activate_test_window(other);
+        } else if (op == "minimize") {
+            ShowWindow(hwnd, SW_MINIMIZE);
+        } else if (op == "maximize") {
+            ShowWindow(hwnd, SW_MAXIMIZE);
+        } else if (op == "unmaximize") {
+            ShowWindow(hwnd, SW_RESTORE);
+        } else if (op == "hide") {
+            host.set_visible(false);
+        } else if (op == "type") {
+            if (GetForegroundWindow() != hwnd) return std::string("{\"ok\":false}");
+            INPUT input[2]{};
+            input[0].type = input[1].type = INPUT_KEYBOARD;
+            input[0].ki.wScan = input[1].ki.wScan = L'Z';
+            input[0].ki.dwFlags = KEYEVENTF_UNICODE;
+            input[1].ki.dwFlags = KEYEVENTF_UNICODE | KEYEVENTF_KEYUP;
+            if (SendInput(2, input, sizeof(INPUT)) != 2) return std::string("{\"ok\":false}");
+        } else if (op == "done") {
+            result = args.at(1).get<bool>() ? 0 : 1;
+            std::cout << args.at(2).dump() << std::endl;
+            host.request_quit();
+        }
+        return std::string("{\"ok\":true}");
+    });
+    host.navigate(argv[1]);
+    host.run();
+    peer.reset();
+    if (IsWindow(previous)) SetForegroundWindow(previous);
+    return result;
+}
diff --git a/tests/experts/expert_registry_test.cpp b/tests/experts/expert_registry_test.cpp
index cc744b9d9..7f1ae46c7 100644
--- a/tests/experts/expert_registry_test.cpp
+++ b/tests/experts/expert_registry_test.cpp
@@ -25,6 +25,22 @@
 
 namespace fs = std::filesystem;
 
+TEST(ExpertAvatarIdentity, ReferencedMembersMatchTheirStandaloneExpert) {
+    acecode::ExpertDefinition team;
+    team.id = "team";
+    team.type = acecode::ExpertType::Team;
+    team.references_existing_experts = true;
+    team.lead_expert_id = "leader";
+    acecode::ExpertDefinition worker;
+    worker.id = "worker";
+    EXPECT_EQ(team.avatar_identity("worker"), worker.avatar_identity());
+    EXPECT_EQ(team.avatar_identity(), "expert:leader");
+    team.references_existing_experts = false;
+    team.lead_agent_id = "leader";
+    EXPECT_EQ(team.avatar_identity(), "expert:team/leader");
+    EXPECT_EQ(team.avatar_identity("worker"), "expert:team/worker");
+}
+
 namespace {
 
 void install_test_provider(
diff --git a/tests/scripts/embedded_assets_rebuild_test.py b/tests/scripts/embedded_assets_rebuild_test.py
index b09e7f772..787861328 100644
--- a/tests/scripts/embedded_assets_rebuild_test.py
+++ b/tests/scripts/embedded_assets_rebuild_test.py
@@ -1,7 +1,10 @@
 """Verify that rebuilding after a Vite output change refreshes embedded bytes."""
 from pathlib import Path
+import gzip
+import re
 import shutil
 import subprocess
+import sys
 import tempfile
 import unittest
 
@@ -9,6 +12,55 @@
 
 
 class EmbeddedAssetsRebuildTest(unittest.TestCase):
+    @unittest.skipUnless(shutil.which("cmake"), "requires CMake")
+    def test_native_office_inlines_the_shared_character_source(self):
+        with tempfile.TemporaryDirectory() as directory:
+            output = Path(directory) / "pet.cpp"
+            source = ROOT / 'assets/desktop_pet/agent_office_pet.html'
+            shared = ROOT / 'assets/desktop_pet/office_characters.js'
+            subprocess.run(['cmake', f'-DBIN2CPP_INPUT={source}', f'-DBIN2CPP_OUTPUT={output}',
+                            '-DBIN2CPP_SYMBOL=desktop_pet_page', f'-DBIN2CPP_INLINE_JS={shared}',
+                            '-P', str(ROOT / 'cmake/acecode_bin2cpp.cmake')], check=True, capture_output=True)
+            decoded = bytes(int(value, 16) for value in re.findall(r'0x([0-9a-f]{2})', output.read_text()))
+            expected = source.read_bytes().replace(b'<script src="./office_characters.js"></script>',
+                                                    b'<script>' + shared.read_bytes() + b'</script>')
+            self.assertEqual(decoded, expected)
+            self.assertNotIn(b'<script src=', decoded)
+
+    def test_compressed_resources_round_trip_and_are_deterministic(self):
+        with tempfile.TemporaryDirectory() as directory:
+            root = Path(directory)
+            web = root / "web"
+            web.mkdir()
+            html = b'<html>__VERSION__\x1a\x00\xff' + b'large repeated frontend ' * 500 + b'</html>'
+            (web / "index.html").write_bytes(html)
+            (web / "empty.js").write_bytes(b'')
+            (web / "small.bin").write_bytes(bytes(range(32)))
+            output = root / "embedded.cpp"
+            command = [sys.executable, str(ROOT / "scripts/embed_web_assets.py"),
+                       "--root", str(web), "--output", str(output), "--version", "v-test"]
+            subprocess.run(command, check=True, capture_output=True)
+            generated = output.read_bytes()
+            subprocess.run(command, check=True, capture_output=True)
+            self.assertEqual(output.read_bytes(), generated)
+            text = generated.decode()
+            arrays = dict(re.findall(r'unsigned char (asset_\d+)\[\] = \{(.*?)\};', text, re.S))
+            entries = re.findall(r'\{"([^"]+)", \{(asset_\d+), (\d+), (\d+), (true|false)\}\}', text)
+            self.assertEqual(len(entries), 3)
+            for name, symbol, size, decoded_size, compressed in entries:
+                data = bytes(int(x, 16) for x in re.findall(r'0x([0-9a-f]{2})', arrays[symbol]))
+                self.assertEqual(len(data), int(size))
+                if compressed == 'true':
+                    data = gzip.decompress(data)
+                expected = (web / name).read_bytes().replace(b'__VERSION__', b'v-test')
+                self.assertEqual(data, expected)
+                self.assertEqual(len(data), int(decoded_size))
+                if name == 'index.html':
+                    self.assertEqual(compressed, 'true')
+                    self.assertLess(int(size), len(data) // 4)
+                else:
+                    self.assertEqual(compressed, 'false')
+
     @unittest.skipUnless(shutil.which("cmake") and shutil.which("ninja"), "requires CMake and Ninja")
     def test_modified_asset_reconfigures_without_changing_its_filename(self):
         with tempfile.TemporaryDirectory() as directory:
diff --git a/tests/scripts/embedded_frontend_http_test.py b/tests/scripts/embedded_frontend_http_test.py
new file mode 100644
index 000000000..4b9104459
--- /dev/null
+++ b/tests/scripts/embedded_frontend_http_test.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+"""Probe a built daemon's embedded assets in an isolated staged profile."""
+import argparse
+from concurrent.futures import ThreadPoolExecutor
+import gzip
+import hashlib
+import json
+import os
+from pathlib import Path
+import shutil
+import socket
+import subprocess
+import tempfile
+import time
+import urllib.request
+
+ROOT = Path(__file__).resolve().parents[2]
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+    parser.add_argument('--binary', required=True, type=Path)
+    parser.add_argument('--playwright-module')
+    parser.add_argument('--build-version', help='embedded build hash (defaults to current checkout)')
+    args = parser.parse_args()
+    binary = args.binary.resolve()
+    # A short, real path avoids junction and MAX_PATH issues during seed setup.
+    temp_base = binary.anchor if os.name == 'nt' else None
+    with tempfile.TemporaryDirectory(prefix='ace-http-', dir=temp_base) as temporary:
+        root = Path(temporary)
+        package = root / 'package'
+        package.mkdir()
+        staged = package / binary.name
+        shutil.copy2(binary, staged)
+        for resource in ['seed', 'models_dev']:
+            shutil.copytree(ROOT / 'assets' / resource, package / 'share/acecode' / resource)
+        profile = root / 'profile'
+        profile.mkdir()
+        workspace = root / 'workspace'
+        workspace.mkdir()
+        env = {**os.environ, **{key: str(profile) for key in ['HOME', 'USERPROFILE', 'APPDATA', 'LOCALAPPDATA']}}
+        with socket.socket() as listener:
+            listener.bind(('127.0.0.1', 0))
+            port = listener.getsockname()[1]
+        url = f'http://127.0.0.1:{port}'
+        with (root / 'daemon.log').open('wb') as log:
+            child = subprocess.Popen([str(staged), 'daemon', '--foreground',
+                                      f'--port={port}', '--token=embedded-asset-fixture',
+                                      f'--cwd={workspace}', f'--run-dir={root / "run"}'],
+                                     cwd=workspace, env=env, stdout=log, stderr=subprocess.STDOUT)
+            try:
+                deadline = time.monotonic() + 35
+                while True:
+                    try:
+                        with urllib.request.urlopen(url + '/api/health', timeout=1) as response:
+                            if response.status == 200:
+                                break
+                    except OSError:
+                        if child.poll() is not None or time.monotonic() > deadline:
+                            raise AssertionError(f'isolated daemon failed to start (exit={child.poll()})')
+                        time.sleep(.1)
+
+                def fetch(encoding, path='/'):
+                    request = urllib.request.Request(url + path, headers={'Accept-Encoding': encoding})
+                    with urllib.request.urlopen(request, timeout=15) as response:
+                        return response.headers, response.read()
+
+                compressed_headers, compressed = fetch('gzip')
+                assert compressed_headers.get('Content-Encoding') == 'gzip'
+                assert compressed_headers.get('Vary') == 'Accept-Encoding'
+                original = gzip.decompress(compressed)
+                version = args.build_version or subprocess.check_output(
+                    ['git', '-C', str(ROOT), 'rev-parse', '--short', 'HEAD'], text=True).strip()
+                expected = (ROOT / 'web/dist/index.html').read_bytes().replace(
+                    b'__VERSION__', version.encode('utf-8'))
+                assert original == expected, 'embedded page is stale or truncated'
+                assert len(compressed) < len(original) // 2
+                with ThreadPoolExecutor(max_workers=4) as pool:
+                    for headers, data in pool.map(fetch, ['', 'identity', 'gzip;q=0', '*;q=1, gzip;q=0']):
+                        assert headers.get('Content-Encoding') is None
+                        assert headers.get('Vary') == 'Accept-Encoding'
+                        assert headers.get('Content-Type') == compressed_headers.get('Content-Type')
+                        assert data == original
+                headers, fallback = fetch('gzip', '/not-a-resource/spa')
+                assert gzip.decompress(fallback) == original
+                assert headers.get('Cache-Control') == 'no-cache'
+                asset = 'vs-icons/Copy.svg'
+                headers, icon = fetch('gzip', '/' + asset + '?v=fixture')
+                if headers.get('Content-Encoding') == 'gzip':
+                    icon = gzip.decompress(icon)
+                assert icon == (ROOT / 'web/dist' / asset).read_bytes()
+                assert headers.get('Cache-Control') == 'public, max-age=31536000, immutable'
+
+                if args.playwright_module:
+                    script = '''
+import {pathToFileURL} from 'node:url';
+const {chromium}=await import(pathToFileURL(process.env.PROBE_PLAYWRIGHT).href);
+const browser=await chromium.launch({channel:'msedge',headless:true});
+try {
+  const page=await browser.newPage({locale:'zh-CN'});const errors=[];
+  page.on('pageerror',error=>errors.push(error.message));
+  const response=await page.goto(process.env.PROBE_URL+'/?token=embedded-asset-fixture');
+  await page.waitForFunction(()=>document.querySelector('#root')?.children.length>0);
+  await page.getByRole('button',{name:'ACECode 快捷菜单'}).waitFor();
+  if(response.headers()['content-encoding']!=='gzip'||errors.length)throw Error(JSON.stringify(errors));
+  console.log('embedded gzip browser startup: PASS');
+} finally {await browser.close();}
+'''
+                    subprocess.run(['node', '--input-type=module', '-'], input=script,
+                                   text=True, encoding='utf-8',
+                                   env={**env, 'PROBE_PLAYWRIGHT': args.playwright_module,
+                                        'PROBE_URL': url}, check=True, timeout=50)
+                print(json.dumps({'http_checks': 8, 'identity_bytes': len(original),
+                                  'gzip_bytes': len(compressed),
+                                  'sha256': hashlib.sha256(original).hexdigest()}))
+            finally:
+                child.terminate()
+                try:
+                    child.wait(timeout=10)
+                except subprocess.TimeoutExpired:
+                    child.kill()
+                    child.wait(timeout=5)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/tests/scripts/macos_release_scripts_test.sh b/tests/scripts/macos_release_scripts_test.sh
index a477a55cb..8658de4c4 100755
--- a/tests/scripts/macos_release_scripts_test.sh
+++ b/tests/scripts/macos_release_scripts_test.sh
@@ -116,6 +116,7 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
     touch "$fake_app/Contents/MacOS/ACECode" \
           "$fake_app/Contents/MacOS/acecode-daemon"
     printf '%s\n' 'fixture helper' > "$fake_app/Contents/MacOS/acecode-computer-use"
+    printf '%s\n' 'fixture CLI forwarder' > "$fake_app/Contents/MacOS/acecode-cli"
     printf '%s\n' '{}' > \
         "$fake_app/Contents/Resources/share/acecode/models_dev/api.json"
     printf '%s\n' '{}' > \
@@ -125,6 +126,7 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
     chmod +x "$fake_app/Contents/MacOS/ACECode" \
              "$fake_app/Contents/MacOS/acecode-daemon"
     chmod +x "$fake_app/Contents/MacOS/acecode-computer-use"
+    chmod +x "$fake_app/Contents/MacOS/acecode-cli"
     expect_status 2 "missing app notarization credentials" \
         env -u NOTARYTOOL_PROFILE -u APPLE_ID -u APPLE_TEAM_ID \
             -u APPLE_APP_SPECIFIC_PASSWORD \
@@ -140,12 +142,12 @@ if [[ "$(uname -s)" == "Darwin" ]]; then
     test -x "$temporary_root/extracted-update/ACECode.app/Contents/MacOS/ACECode"
     test -x "$temporary_root/extracted-update/ACECode.app/Contents/MacOS/acecode-daemon"
     test -x "$temporary_root/extracted-update/acecode"
-    test -x "$temporary_root/extracted-update/acecode-computer-use"
-    cmp "$temporary_root/extracted-update/acecode-computer-use" \
-        "$temporary_root/extracted-update/ACECode.app/Contents/MacOS/acecode-computer-use"
+    test ! -e "$temporary_root/extracted-update/acecode-computer-use"
+    test ! -e "$temporary_root/extracted-update/share"
+    cmp "$temporary_root/extracted-update/acecode" \
+        "$temporary_root/extracted-update/ACECode.app/Contents/MacOS/acecode-cli"
     for models_dev_file in api.json MANIFEST.json LICENSE; do
         test -f "$temporary_root/extracted-update/ACECode.app/Contents/Resources/share/acecode/models_dev/$models_dev_file"
-        test -f "$temporary_root/extracted-update/share/acecode/models_dev/$models_dev_file"
     done
 fi
 
diff --git a/tests/scripts/macos_update_dedup_test.py b/tests/scripts/macos_update_dedup_test.py
new file mode 100644
index 000000000..aace06a77
--- /dev/null
+++ b/tests/scripts/macos_update_dedup_test.py
@@ -0,0 +1,144 @@
+#!/usr/bin/env python3
+"""Exercise the real CLI forwarder and update script with offline Apple tool fixtures."""
+import json
+import os
+from pathlib import Path
+import shutil
+import subprocess
+import sys
+import tempfile
+import unittest
+import zipfile
+
+ROOT = Path(__file__).resolve().parents[2]
+MOCK_DITTO = '''#!/usr/bin/env python3
+import os, pathlib, shutil, sys, zipfile
+args = sys.argv[1:]
+source, target = map(pathlib.Path, args[-2:])
+if '-c' in args:
+    with zipfile.ZipFile(target, 'w', zipfile.ZIP_DEFLATED) as archive:
+        for p in source.rglob('*'):
+            archive.write(p, p.relative_to(source.parent))
+elif '-x' in args:
+    with zipfile.ZipFile(source) as archive:
+        archive.extractall(target)
+        for item in archive.infolist():
+            os.chmod(target / item.filename, (item.external_attr >> 16) & 0o777)
+elif source.is_dir(): shutil.copytree(source, target)
+else: shutil.copy2(source, target)
+'''
+
+
+@unittest.skipUnless(os.name == 'posix' and shutil.which('c++') and shutil.which('zip'),
+                     'requires POSIX C++ compiler and zip (macOS or Linux)')
+class MacUpdateDedupTest(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.compiled = tempfile.TemporaryDirectory(prefix='ace-cli-compiler-')
+        cls.launcher = Path(cls.compiled.name) / 'acecode-cli'
+        subprocess.run(['c++', '-std=c++17', '-Os',
+                        str(ROOT / 'src/apps/desktop/macos_cli_launcher.cpp'),
+                        '-o', str(cls.launcher)], check=True, capture_output=True)
+
+    @classmethod
+    def tearDownClass(cls):
+        cls.compiled.cleanup()
+
+    def setUp(self):
+        self.temp = tempfile.TemporaryDirectory(prefix='ace update space-')
+        self.addCleanup(self.temp.cleanup)
+        self.root = Path(self.temp.name)
+        self.app = self.root / 'source/ACECode.app'
+        self.macos = self.app / 'Contents/MacOS'
+        self.macos.mkdir(parents=True)
+        self.resources = self.app / 'Contents/Resources/share/acecode'
+        self.resources.mkdir(parents=True)
+        shutil.copytree(ROOT / 'assets/seed', self.resources / 'seed')
+        shutil.copytree(ROOT / 'assets/models_dev', self.resources / 'models_dev')
+        shutil.copy2(self.launcher, self.macos / 'acecode-cli')
+        for name in ['ACECode', 'acecode-computer-use', 'acecode-daemon']:
+            p = self.macos / name
+            p.write_text('#!/usr/bin/env python3\nimport json, os, sys\n'
+                         'print(json.dumps(sys.argv[1:]))\n'
+                         'sys.exit(int(os.environ.get("FIXTURE_EXIT", "0")))\n')
+            p.chmod(0o755)
+        (self.app / 'Contents/Info.plist').write_text('<plist/>')
+        tools = self.root / 'tools'
+        tools.mkdir()
+        ditto = tools / 'ditto'
+        ditto.write_text(MOCK_DITTO)
+        ditto.chmod(0o755)
+        uname = tools / 'uname'
+        uname.write_text('#!/bin/sh\nprintf Darwin\n')
+        uname.chmod(0o755)
+        scripts = self.root / 'scripts'
+        scripts.mkdir()
+        shutil.copytree(ROOT / 'assets/seed', self.root / 'assets/seed')
+        shutil.copy2(ROOT / 'scripts/verify_seed_bundle.py', scripts / 'verify_seed_bundle.py')
+        text = (ROOT / 'scripts/macos_create_update_zip.sh').read_text()
+        text = text.replace('/usr/bin/ditto', '"' + str(ditto) + '"')
+        self.script = scripts / 'macos_create_update_zip.sh'
+        self.script.write_text(text)
+        self.env = {**os.environ, 'PATH': str(tools) + os.pathsep + os.environ['PATH']}
+        self.archive = self.root / 'update.zip'
+
+    def package(self, success=True):
+        result = subprocess.run(['bash', str(self.script), '--app', str(self.app),
+                                 '--output', str(self.archive)], env=self.env,
+                                capture_output=True, text=True)
+        self.assertEqual(result.returncode == 0, success, result.stdout + result.stderr)
+        return result
+
+    def extract(self):
+        target = self.root / 'installed folder'
+        with zipfile.ZipFile(self.archive) as archive:
+            archive.extractall(target)
+            for item in archive.infolist():
+                (target / item.filename).chmod((item.external_attr >> 16) & 0o777)
+        return target
+
+    def test_single_runtime_payload_and_legacy_cli_entry(self):
+        self.package()
+        with zipfile.ZipFile(self.archive) as archive:
+            names = archive.namelist()
+            self.assertIn('acecode', names)
+            self.assertEqual(sum(n.endswith('/acecode-daemon') for n in names), 1)
+            self.assertEqual(sum(n.endswith('/models_dev/api.json') for n in names), 1)
+            self.assertFalse(any(n.startswith(('share/', 'channels/')) for n in names))
+            self.assertNotIn('acecode-computer-use', names)
+            self.assertLess(archive.getinfo('acecode').file_size, 256 * 1024)
+        installed = self.extract()
+        args = ['two words', '', '中文路径', '--literal=$HOME;echo nope']
+        result = subprocess.run([str(installed / 'acecode'), *args], cwd=self.root,
+                                capture_output=True, text=True,
+                                env={**self.env, 'FIXTURE_EXIT': '37'})
+        self.assertEqual(result.returncode, 37, result.stderr)
+        self.assertEqual(json.loads(result.stdout), args)
+
+    def test_path_symlink_and_bundled_invocation(self):
+        self.package()
+        installed = self.extract()
+        bin_dir = self.root / 'bin'
+        bin_dir.mkdir()
+        (bin_dir / 'acecode').symlink_to(installed / 'acecode')
+        env = {**self.env, 'PATH': str(bin_dir) + os.pathsep + self.env['PATH']}
+        for command in ['acecode', str(installed / 'ACECode.app/Contents/MacOS/acecode-cli')]:
+            result = subprocess.run([command, '--version'], env=env, cwd=self.root,
+                                    capture_output=True, text=True)
+            self.assertEqual(result.returncode, 0, result.stderr)
+            self.assertEqual(json.loads(result.stdout), ['--version'])
+
+    def test_missing_runtime_and_missing_or_oversized_forwarder(self):
+        shutil.copy2(self.launcher, self.root / 'acecode')
+        result = subprocess.run([str(self.root / 'acecode')], capture_output=True, text=True)
+        self.assertEqual(result.returncode, 127)
+        self.assertIn('cannot start', result.stderr)
+        (self.macos / 'acecode-cli').unlink()
+        self.assertIn('missing the CLI forwarder', self.package(False).stderr)
+        (self.macos / 'acecode-cli').write_bytes(b'x' * (262144 + 1))
+        (self.macos / 'acecode-cli').chmod(0o755)
+        self.assertIn('256 KiB', self.package(False).stderr)
+
+
+if __name__ == '__main__':
+    unittest.main()
diff --git a/tests/session_host/thread_tools_test.cpp b/tests/session_host/thread_tools_test.cpp
index ab188cfb5..839ca8b9d 100644
--- a/tests/session_host/thread_tools_test.cpp
+++ b/tests/session_host/thread_tools_test.cpp
@@ -8,6 +8,8 @@
 #include "session_host/thread_service.hpp"
 #include "session_host/tools/thread_tools.hpp"
 #include "utils/paths.hpp"
+#include "utils/utf8_path.hpp"
+#include "workspace/workspace_registry.hpp"
 
 #include <algorithm>
 #include <chrono>
@@ -116,8 +118,267 @@ void persist_thread(const std::string& cwd,
         message("user", content)));
 }
 
+// Keep real registry/storage behavior while recording input without calling a model.
+class ThreadCreation : public ThreadTools {
+protected:
+    class RecordingClient : public acecode::LocalSessionClient {
+    public:
+        explicit RecordingClient(acecode::SessionRegistry& registry)
+            : LocalSessionClient(registry), registry_(registry) {}
+        bool accept_input = true;
+        std::string delivered_id;
+        std::string delivered_project;
+        std::string delivered_prompt;
+        bool send_input(const std::string& id, const std::string& text) override {
+            auto entry = registry_.acquire(id);
+            if (!entry || !entry->sm) return false;
+            delivered_id = id;
+            delivered_project = entry->sm->current_project_dir();
+            delivered_prompt = text;
+            if (!accept_input) return false;
+            entry->sm->on_message(message("user", text));
+            return true;
+        }
+    private:
+        acecode::SessionRegistry& registry_; // Borrowed; fixture destroys client first.
+    };
+
+    acecode::ToolExecutor tools;
+    acecode::PermissionManager permissions;
+    std::unique_ptr<acecode::SessionRegistry> registry;
+    std::unique_ptr<RecordingClient> client;
+    std::string caller_cwd;
+
+    void SetUp() override {
+        ThreadTools::SetUp();
+        caller_cwd = workspace("caller");
+        acecode::SessionRegistryDeps deps;
+        deps.tools = &tools;
+        deps.cwd = caller_cwd;
+        deps.template_permissions = &permissions;
+        deps.provider_accessor = [] { return std::shared_ptr<acecode::LlmProvider>{}; };
+        registry = std::make_unique<acecode::SessionRegistry>(std::move(deps));
+        client = std::make_unique<RecordingClient>(*registry);
+        auto thread_deps = std::make_shared<acecode::ThreadToolDeps>();
+        thread_deps->service = std::make_shared<acecode::ThreadService>(
+            acecode::ThreadService::Deps{registry.get(), client.get()});
+        acecode::register_codex_thread_tools(tools, std::move(thread_deps));
+    }
+    void TearDown() override {
+        client.reset();
+        registry.reset();
+        ThreadTools::TearDown();
+    }
+    acecode::ToolResult create(const nlohmann::json& args,
+                              acecode::SessionManager* caller = nullptr) {
+        acecode::ToolContext context;
+        context.cwd = caller_cwd;
+        context.session_manager = caller;
+        return tools.execute("create_thread", args.dump(), context);
+    }
+    std::string projects() const {
+        return acecode::path_to_utf8(acecode::path_from_utf8(acecode::get_acecode_dir()) / "projects");
+    }
+};
+
 } // namespace
 
+TEST_F(ThreadCreation, InheritsWorkspaceFreeCallerWithIndependentVisibleStorage) {
+    acecode::SessionOptions options;
+    options.no_workspace = true;
+    const auto caller_id = registry->create(options);
+    auto caller = registry->acquire(caller_id);
+    ASSERT_NE(caller, nullptr);
+    const auto result = create({{"prompt", "hello"}, {"title", "New file"}}, caller->sm.get());
+    ASSERT_TRUE(result.success) << result.output;
+    const auto body = nlohmann::json::parse(result.output);
+    auto entry = registry->acquire(body["threadId"].get<std::string>());
+    ASSERT_NE(entry, nullptr);
+    EXPECT_TRUE(entry->no_workspace);
+    EXPECT_TRUE(entry->workspace_hash.empty());
+    EXPECT_NE(entry->cwd, caller->cwd);
+    EXPECT_EQ(body["cwd"], entry->cwd);
+    EXPECT_EQ(body["noWorkspace"], true);
+    EXPECT_EQ(body["workspaceHash"], acecode::SessionStorage::compute_project_hash(entry->cwd));
+    const auto listed = acecode::find_no_workspace_session_meta(entry->id);
+    ASSERT_TRUE(listed.has_value());
+    EXPECT_TRUE(listed->no_workspace);
+    EXPECT_EQ(listed->title, "New file");
+    EXPECT_FALSE(acecode::desktop::load_workspace_metadata(
+        projects(), acecode::SessionStorage::compute_project_hash(caller->cwd)).has_value());
+    EXPECT_EQ(client->delivered_prompt, "hello");
+}
+
+TEST_F(ThreadCreation, DefaultDirectoryBecomesVisibleWithoutChangingCaller) {
+    const auto result = create({{"prompt", "hello"}});
+    ASSERT_TRUE(result.success) << result.output;
+    const auto body = nlohmann::json::parse(result.output);
+    EXPECT_EQ(body["cwd"], caller_cwd);
+    EXPECT_EQ(body["noWorkspace"], false);
+    acecode::desktop::WorkspaceRegistry workspaces;
+    workspaces.scan(projects());
+    const auto visible = workspaces.get(body["workspaceHash"].get<std::string>());
+    ASSERT_TRUE(visible.has_value());
+    EXPECT_EQ(visible->cwd, caller_cwd);
+    const auto rows = acecode::SessionStorage::list_session_metadata(
+        acecode::SessionStorage::get_project_dir(caller_cwd));
+    ASSERT_EQ(rows.size(), 1u);
+    EXPECT_EQ(rows[0].id, body["threadId"]);
+    EXPECT_FALSE(rows[0].no_workspace);
+}
+
+TEST_F(ThreadCreation, ExplicitWorkspaceRestoresVisibilityAndPreservesProfile) {
+    const auto target_cwd = workspace("target");
+    acecode::desktop::WorkspaceRegistry workspaces;
+    const auto target = workspaces.register_new(projects(), target_cwd);
+    ASSERT_TRUE(workspaces.set_name(projects(), target.hash, "Custom name"));
+    ASSERT_TRUE(workspaces.hide(projects(), target.hash));
+    acecode::SessionOptions options;
+    options.no_workspace = true;
+    auto caller = registry->acquire(registry->create(options));
+    const auto result = create({{"prompt", "hello target"}, {"workspaceHash", target.hash}}, caller->sm.get());
+    ASSERT_TRUE(result.success) << result.output;
+    const auto body = nlohmann::json::parse(result.output);
+    EXPECT_EQ(body["cwd"], target_cwd);
+    EXPECT_EQ(body["workspaceHash"], target.hash);
+    EXPECT_EQ(body["noWorkspace"], false);
+    const auto persisted = acecode::desktop::load_workspace_metadata(projects(), target.hash);
+    ASSERT_TRUE(persisted.has_value());
+    EXPECT_TRUE(persisted->desktop_visible);
+    EXPECT_EQ(persisted->name, "Custom name");
+    EXPECT_TRUE(caller->no_workspace);
+}
+
+TEST_F(ThreadCreation, ExplicitDirectorySupportsUtf8AndCanonicalPath) {
+    const auto target = root / acecode::path_from_utf8(u8"目标目录");
+    std::filesystem::create_directories(target / "child");
+    const auto cwd = acecode::path_to_utf8(target / "child" / "..");
+    const auto result = create({{"prompt", "hello"}, {"cwd", cwd}});
+    ASSERT_TRUE(result.success) << result.output;
+    const auto body = nlohmann::json::parse(result.output);
+    EXPECT_EQ(body["cwd"], acecode::path_to_utf8(std::filesystem::canonical(target)));
+    const auto visible = acecode::desktop::load_workspace_metadata(
+        projects(), body["workspaceHash"].get<std::string>());
+    ASSERT_TRUE(visible.has_value());
+    EXPECT_TRUE(visible->desktop_visible);
+}
+
+TEST_F(ThreadCreation, ExplicitWorkspaceFreeTargetOverridesCallerDirectory) {
+    const auto result = create({{"prompt", "hello"}, {"noWorkspace", true}});
+    ASSERT_TRUE(result.success) << result.output;
+    const auto body = nlohmann::json::parse(result.output);
+    EXPECT_EQ(body["noWorkspace"], true);
+    EXPECT_NE(body["cwd"], caller_cwd);
+    EXPECT_TRUE(acecode::find_no_workspace_session_meta(body["threadId"]).has_value());
+}
+
+TEST_F(ThreadCreation, RejectsInvalidTargetsWithoutCreatingSessions) {
+    const auto file = root / "file.txt";
+    { std::ofstream output(file); output << "file"; }
+    const std::vector<nlohmann::json> targets{
+        {{"cwd", "relative"}}, {{"cwd", acecode::path_to_utf8(root / "missing")}},
+        {{"cwd", acecode::path_to_utf8(file)}}, {{"cwd", ""}}, {{"cwd", 42}},
+        {{"cwd", nullptr}}, {{"workspaceHash", "../outside"}},
+        {{"workspaceHash", "unknown"}}, {{"workspaceHash", 42}},
+        {{"workspaceHash", ""}}, {{"noWorkspace", "true"}}, {{"noWorkspace", nullptr}},
+        {{"cwd", caller_cwd}, {"workspaceHash", "anything"}},
+        {{"cwd", caller_cwd}, {"noWorkspace", true}},
+        {{"workspaceHash", "anything"}, {"noWorkspace", true}},
+    };
+    for (auto args : targets) {
+        SCOPED_TRACE(args.dump());
+        args["prompt"] = "must not create";
+        EXPECT_FALSE(create(args).success);
+        EXPECT_TRUE(registry->list_active().empty());
+        EXPECT_TRUE(client->delivered_id.empty());
+    }
+}
+
+TEST_F(ThreadCreation, RejectsUnpersistableWorkspaceRegistration) {
+    const auto cwd = workspace("blocked-marker");
+    const auto project = acecode::SessionStorage::get_project_dir(cwd);
+    std::filesystem::create_directories(acecode::path_from_utf8(project) / "workspace.json");
+    const auto result = create({{"prompt", "hello"}, {"cwd", cwd}});
+    EXPECT_FALSE(result.success);
+    EXPECT_TRUE(registry->list_active().empty());
+}
+
+TEST_F(ThreadCreation, FailedInputCleansActualTargetAndPreservesCaller) {
+    acecode::SessionOptions options;
+    options.cwd = caller_cwd;
+    auto caller = registry->acquire(registry->create(options));
+    caller->sm->on_message(message("user", "preserve me"));
+    client->accept_input = false;
+    for (const auto& target : std::vector<nlohmann::json>{
+             {{"cwd", workspace("failed-target")}}, {{"noWorkspace", true}}}) {
+        auto args = target;
+        args["prompt"] = "rejected";
+        const auto result = create(args, caller->sm.get());
+        EXPECT_FALSE(result.success);
+        EXPECT_EQ(registry->acquire(client->delivered_id), nullptr);
+        EXPECT_TRUE(acecode::SessionStorage::find_session_files(
+            client->delivered_project, client->delivered_id).empty());
+        EXPECT_FALSE(acecode::SessionStorage::find_session_files(
+            caller->sm->current_project_dir(), caller->id).empty());
+    }
+}
+
+TEST_F(ThreadCreation, SendsAcrossWorkspacesAndResumesUsingTargetIdentity) {
+    for (const bool no_workspace : {false, true}) {
+        auto args = nlohmann::json{{"prompt", "first"}};
+        if (no_workspace) args["noWorkspace"] = true;
+        else args["cwd"] = workspace("send-target");
+        const auto created = create(args);
+        ASSERT_TRUE(created.success) << created.output;
+        const auto body = nlohmann::json::parse(created.output);
+        const auto id = body["threadId"].get<std::string>();
+        acecode::ToolContext context;
+        context.cwd = caller_cwd;
+        context.session_manager = nullptr;
+        const auto sent = tools.execute("send_message_to_thread",
+            nlohmann::json{{"threadId", id}, {"prompt", "second"}}.dump(), context);
+        ASSERT_TRUE(sent.success) << sent.output;
+        registry->destroy(id);
+        const auto resumed = tools.execute("send_message_to_thread",
+            nlohmann::json{{"threadId", id}, {"prompt", "third"},
+                           {"workspaceHash", body["workspaceHash"]}}.dump(), context);
+        ASSERT_TRUE(resumed.success) << resumed.output;
+        auto active = registry->acquire(id);
+        ASSERT_NE(active, nullptr);
+        EXPECT_EQ(active->cwd, body["cwd"]);
+        EXPECT_EQ(active->no_workspace, no_workspace);
+        EXPECT_EQ(client->delivered_id, id);
+        EXPECT_EQ(client->delivered_prompt, "third");
+        const auto history = active->sm->load_active_messages();
+        EXPECT_TRUE(std::any_of(history.begin(), history.end(), [](const auto& item) {
+            return item.role == "user" && item.content == "third";
+        }));
+    }
+}
+
+TEST_F(ThreadCreation, RejectsAmbiguousOrConflictingActiveIdentity) {
+    const std::string id = "20261011-000000-cafe";
+    const auto other_cwd = workspace("duplicate");
+    persist_thread(caller_cwd, id, {}, "caller project");
+    persist_thread(other_cwd, id, {}, "other project");
+    acecode::ThreadService service({registry.get(), client.get()});
+    acecode::ThreadScope scope;
+    scope.cwd = caller_cwd;
+    const auto ambiguous = service.send(scope, id, "ambiguous");
+    EXPECT_FALSE(ambiguous.success);
+    EXPECT_NE(ambiguous.error.find("workspaceHash"), std::string::npos);
+    acecode::SessionOptions options;
+    options.cwd = caller_cwd;
+    ASSERT_TRUE(registry->resume(id, options));
+    const auto conflict = service.send(scope, id, "wrong project",
+        acecode::SessionStorage::compute_project_hash(other_cwd));
+    EXPECT_FALSE(conflict.success);
+    EXPECT_NE(conflict.error.find("different workspace"), std::string::npos);
+    EXPECT_TRUE(client->delivered_id.empty());
+    scope.caller_thread_id = id;
+    EXPECT_FALSE(service.send(scope, id, "self").success);
+}
+
 TEST_F(ThreadTools, RegistersCodexAlignedIndependentToolNames) {
     acecode::ToolExecutor tools;
     auto deps = std::make_shared<acecode::ThreadToolDeps>();
@@ -141,6 +402,16 @@ TEST_F(ThreadTools, RegistersCodexAlignedIndependentToolNames) {
     EXPECT_FALSE(tools.is_read_only("repair_thread"));
 
     const auto definitions = tools.get_tool_definitions();
+    for (const char* name : {"create_thread", "send_message_to_thread"}) {
+        const auto definition = std::find_if(definitions.begin(), definitions.end(),
+            [name](const auto& item) { return item.name == name; });
+        ASSERT_NE(definition, definitions.end());
+        EXPECT_TRUE(definition->parameters["properties"].contains("workspaceHash"));
+        if (std::string(name) == "create_thread") {
+            EXPECT_TRUE(definition->parameters["properties"].contains("cwd"));
+            EXPECT_TRUE(definition->parameters["properties"].contains("noWorkspace"));
+        }
+    }
     const auto read = std::find_if(
         definitions.begin(), definitions.end(), [](const auto& definition) {
             return definition.name == "read_thread";
diff --git a/tests/skills/default_skill_seeder_test.cpp b/tests/skills/default_skill_seeder_test.cpp
index cb6b529d6..eadf9f1d3 100644
--- a/tests/skills/default_skill_seeder_test.cpp
+++ b/tests/skills/default_skill_seeder_test.cpp
@@ -704,6 +704,47 @@ TEST_F(DefaultSkillSeederTest, PreservesUserCreatedExpertWithSeededId) {
     EXPECT_FALSE(outcome->acecode_owned);
 }
 
+TEST_F(DefaultSkillSeederTest, PixelPortraitUpgradeRemovesOnlyManagedDefaultImages) {
+    const auto& seed = acecode::default_expert_seeds().front();
+    const auto source = seed_root.parent_path() / "experts" / seed.relative_path;
+    const auto target = home / "experts" / seed.relative_path;
+    auto original = read_json(source / "expert.json");
+    original["avatar"] = "avatars/default.png";
+    write_file(source / "expert.json", original.dump(2) + "\n");
+    write_file(source / "avatars" / "default.png", "old-managed-portrait");
+    ASSERT_TRUE(acecode::reconcile_default_global_skills(home, seed_root).version_written);
+    ASSERT_TRUE(fs::exists(target / "avatars" / "default.png"));
+    original.erase("avatar");
+    write_file(source / "expert.json", original.dump(2) + "\n");
+    fs::remove(source / "avatars" / "default.png");
+    write_seed_version(seed_root, kSeedVersion2);
+    const auto result = acecode::reconcile_default_global_skills(home, seed_root);
+    ASSERT_TRUE(result.version_written) << result.error;
+    EXPECT_FALSE(fs::exists(target / "avatars" / "default.png"));
+    EXPECT_FALSE(read_json(target / "expert.json").contains("avatar"));
+}
+
+TEST_F(DefaultSkillSeederTest, PixelPortraitUpgradePreservesUserReplacedImages) {
+    const auto& seed = acecode::default_expert_seeds().front();
+    const auto source = seed_root.parent_path() / "experts" / seed.relative_path;
+    const auto target = home / "experts" / seed.relative_path;
+    auto original = read_json(source / "expert.json");
+    original["avatar"] = "avatars/default.png";
+    write_file(source / "expert.json", original.dump(2) + "\n");
+    write_file(source / "avatars" / "default.png", "old-managed-portrait");
+    ASSERT_TRUE(acecode::reconcile_default_global_skills(home, seed_root).version_written);
+    write_file(target / "avatars" / "default.png", "user-custom-portrait");
+    original.erase("avatar");
+    write_file(source / "expert.json", original.dump(2) + "\n");
+    fs::remove(source / "avatars" / "default.png");
+    write_seed_version(seed_root, kSeedVersion2);
+    const auto result = acecode::reconcile_default_global_skills(home, seed_root);
+    ASSERT_TRUE(result.version_written) << result.error;
+    EXPECT_EQ(read_file(target / "avatars" / "default.png"), "user-custom-portrait");
+    EXPECT_TRUE(read_json(target / "expert.json").contains("avatar"));
+    EXPECT_EQ(count_expert_outcome(result, "preserved_user_modified"), 1u);
+}
+
 TEST_F(DefaultSkillSeederTest, UpdatesPristineAcecodeOwnedSeed) {
     auto first =
         acecode::reconcile_default_global_skills(home, seed_root);
diff --git a/tests/skills/skill_init_test.cpp b/tests/skills/skill_init_test.cpp
index 227652512..18e902fcf 100644
--- a/tests/skills/skill_init_test.cpp
+++ b/tests/skills/skill_init_test.cpp
@@ -211,6 +211,69 @@ TEST_F(SkillInitOpencodeTest, RuntimeAllowlistFlowsThroughInitializer) {
     EXPECT_TRUE(empty.list().empty());
 }
 
+TEST_F(SkillInitOpencodeTest, CustomScanPathsReplaceDefaultsAndPreserveInterleavedPriority) {
+    const auto global = root / "custom-global";
+    write_skill(global, "shared", "global first");
+    write_skill(workspace / "custom-skills", "shared", "project second");
+    write_skill(workspace / "custom-skills", "local", "workspace");
+    write_skill(workspace.parent_path() / "custom-skills", "local", "ancestor");
+    write_skill(workspace / ".acecode/skills", "excluded", "default");
+    acecode::AppConfig cfg;
+    cfg.skills.external_dirs = {(root / "legacy").string()};
+    cfg.skills.scan_paths = std::vector<std::string>{global.string(), "custom-skills"};
+    acecode::SkillRegistry registry;
+    initialize(registry, cfg);
+    ASSERT_TRUE(registry.find("shared"));
+    EXPECT_EQ(registry.find("shared")->description, "global first");
+    ASSERT_TRUE(registry.find("local"));
+    EXPECT_EQ(registry.find("local")->description, "workspace");
+    EXPECT_FALSE(registry.find("excluded"));
+    EXPECT_EQ(acecode::global_skill_scan_roots(cfg), std::vector<fs::path>{global});
+    EXPECT_EQ(acecode::skill_scan_roots(cfg, {}).size(), 1u);
+    EXPECT_TRUE(acecode::project_skill_scan_roots(cfg, {}).empty());
+
+    cfg.skills.scan_paths = std::vector<std::string>{"custom-skills", global.string()};
+    initialize(registry, cfg);
+    EXPECT_EQ(registry.find("shared")->description, "project second");
+    const auto other = home / "other-workspace";
+    fs::create_directories(other);
+    acecode::initialize_skill_registry(registry, cfg, other.string());
+    EXPECT_FALSE(registry.find("local"));
+
+    cfg.skills.scan_paths = std::vector<std::string>{};
+    initialize(registry, cfg);
+    EXPECT_TRUE(registry.list().empty());
+    cfg.skills.scan_paths.reset();
+    initialize(registry, cfg);
+    EXPECT_TRUE(registry.find("excluded"));
+}
+
+TEST_F(SkillInitOpencodeTest, CustomScanPathsExpandGlobalsAndSkipMissingEnvironment) {
+    clear_env_value("XDG_CONFIG_HOME");
+    clear_env_value("XDG_CACHE_HOME");
+    clear_env_value("OPENCODE_CONFIG_DIR");
+    acecode::AppConfig cfg;
+    cfg.skills.scan_paths = std::vector<std::string>{
+        "${ACECODE_DATA_DIR}/skills", "~/.codex/skills",
+        "${XDG_CONFIG_HOME}/opencode/skills", "${XDG_CACHE_HOME}/opencode/skills",
+        "${OPENCODE_CONFIG_DIR}/skills"};
+    EXPECT_EQ(acecode::global_skill_scan_roots(cfg), (std::vector<fs::path>{
+        home / ".acecode/skills", home / ".codex/skills",
+        home / ".config/opencode/skills", home / ".cache/opencode/skills"}));
+    EXPECT_TRUE(acecode::project_skill_scan_roots(cfg, workspace.string()).empty());
+}
+
+TEST_F(SkillInitOpencodeTest, EmptyCustomPathsStillAllowExpertPackageSkills) {
+    const auto expert = root / "expert";
+    write_skill(expert, "bundled", "expert package");
+    acecode::AppConfig cfg;
+    cfg.skills.scan_paths = std::vector<std::string>{};
+    acecode::SkillRegistry registry;
+    acecode::initialize_skill_registry(registry, cfg, workspace.string(), {expert});
+    ASSERT_EQ(registry.list().size(), 1u);
+    EXPECT_TRUE(registry.find("bundled"));
+}
+
 // 场景: project_skill_scan_roots / global_skill_scan_roots 的分界 ——
 // 项目链根只覆盖 workspace 向上到 HOME(不含 HOME 本身),HOME 下的
 // ~/.acecode/skills 与 external_dirs 只出现在全局根里。web 端
diff --git a/tests/upgrade/macos_bundle_test.cpp b/tests/upgrade/macos_bundle_test.cpp
index 5b911d6ea..4dfb4ca7e 100644
--- a/tests/upgrade/macos_bundle_test.cpp
+++ b/tests/upgrade/macos_bundle_test.cpp
@@ -152,6 +152,128 @@ TEST(MacosBundleInstallPath, RejectsUnsafeLocations) {
         root / "alias" / "nested" / "ACECode.app"));
 }
 
+TEST(MacosAppUpdateWorkspace, KeepsAppNamesAndCleansCancelledEmptyWorkspace) {
+    TempDir temp("acecode-macos-update-cancel");
+    const fs::path root = fs::canonical(temp.path()) / ".acecode-update-test";
+    {
+        acecode::upgrade::MacosAppUpdateWorkspace workspace(root);
+        std::string error;
+        ASSERT_TRUE(workspace.create(&error)) << error;
+        for (const auto& app : {workspace.staged_bundle(), workspace.previous_bundle(),
+                               workspace.failed_bundle()}) {
+            EXPECT_EQ(app.filename(), "ACECode.app");
+            EXPECT_EQ(app.parent_path().parent_path(), root);
+            EXPECT_TRUE(fs::is_directory(app.parent_path()));
+#ifndef _WIN32
+            EXPECT_EQ(fs::status(app.parent_path()).permissions() & fs::perms::all,
+                      fs::perms::owner_all);
+#endif
+        }
+        EXPECT_NE(workspace.staged_bundle(), workspace.previous_bundle());
+        EXPECT_NE(workspace.previous_bundle(), workspace.failed_bundle());
+#ifndef _WIN32
+        EXPECT_EQ(fs::status(root).permissions() & fs::perms::all, fs::perms::owner_all);
+#endif
+        EXPECT_FALSE(workspace.create(&error));
+    }
+    EXPECT_FALSE(fs::exists(root));
+}
+
+TEST(MacosAppUpdateWorkspace, DoesNotAdoptExistingDirectoryOrSymlink) {
+    TempDir temp("acecode-macos-update-collision");
+    const fs::path root = fs::canonical(temp.path());
+    const fs::path existing = root / ".acecode-update-existing";
+    fs::create_directory(existing);
+    {
+        acecode::upgrade::MacosAppUpdateWorkspace workspace(existing);
+        std::string error;
+        EXPECT_FALSE(workspace.create(&error));
+        EXPECT_FALSE(error.empty());
+    }
+    EXPECT_TRUE(fs::is_directory(existing));
+    write_file(existing / "sentinel");
+    const fs::path alias = root / ".acecode-update-alias";
+    std::error_code ec;
+    fs::create_directory_symlink(existing, alias, ec);
+    if (ec) GTEST_SKIP() << "directory symlinks unavailable: " << ec.message();
+    {
+        acecode::upgrade::MacosAppUpdateWorkspace workspace(alias);
+        EXPECT_FALSE(workspace.create());
+    }
+    EXPECT_TRUE(fs::is_symlink(alias));
+    EXPECT_TRUE(fs::is_regular_file(existing / "sentinel"));
+    EXPECT_FALSE(fs::exists(existing / "staging"));
+}
+
+TEST(MacosAppUpdateWorkspace, ReplacementRetainsNamedBackupAndRejectsItsSelfUpdate) {
+    TempDir temp("acecode-macos-update-replace");
+    const fs::path parent = fs::canonical(temp.path());
+    const fs::path installed = parent / "ACECode.app";
+    const fs::path root = parent / ".acecode-update-test";
+    create_bundle(installed);
+    write_file(installed / "old-version");
+    fs::path backup;
+    {
+        acecode::upgrade::MacosAppUpdateWorkspace workspace(root);
+        ASSERT_TRUE(workspace.create());
+        create_bundle(workspace.staged_bundle());
+        write_file(workspace.staged_bundle() / "new-version");
+        backup = workspace.previous_bundle();
+        fs::rename(installed, backup);
+        fs::rename(workspace.staged_bundle(), installed);
+        EXPECT_TRUE(acecode::upgrade::macos_app_install_path_is_safe(installed));
+        EXPECT_FALSE(acecode::upgrade::macos_app_install_path_is_safe(backup));
+    }
+    EXPECT_TRUE(fs::is_regular_file(installed / "new-version"));
+    EXPECT_TRUE(fs::is_regular_file(backup / "old-version"));
+    EXPECT_EQ(backup.filename(), "ACECode.app");
+    EXPECT_FALSE(fs::exists(root / "staging"));
+    EXPECT_FALSE(fs::exists(root / "failed"));
+}
+
+TEST(MacosAppUpdateWorkspace, SuccessfulRollbackRestoresOriginalAndCleansContainers) {
+    TempDir temp("acecode-macos-update-rollback");
+    const fs::path parent = fs::canonical(temp.path());
+    const fs::path installed = parent / "ACECode.app";
+    const fs::path root = parent / ".acecode-update-test";
+    create_bundle(installed);
+    write_file(installed / "old-version");
+    {
+        acecode::upgrade::MacosAppUpdateWorkspace workspace(root);
+        ASSERT_TRUE(workspace.create());
+        create_bundle(workspace.staged_bundle());
+        fs::rename(installed, workspace.previous_bundle());
+        fs::rename(workspace.staged_bundle(), installed);
+        // Final validation rejects the new app: isolate it, restore the old
+        // app, then let the installer remove the rejected candidate explicitly.
+        fs::rename(installed, workspace.failed_bundle());
+        fs::rename(workspace.previous_bundle(), installed);
+        fs::remove_all(workspace.failed_bundle());
+    }
+    EXPECT_TRUE(fs::is_regular_file(installed / "old-version"));
+    EXPECT_FALSE(fs::exists(root));
+}
+
+TEST(MacosAppUpdateWorkspace, FailedRollbackPreservesEveryRemainingCopy) {
+    TempDir temp("acecode-macos-update-preserve");
+    const fs::path root = fs::canonical(temp.path()) / ".acecode-update-test";
+    fs::path backup, failed;
+    {
+        acecode::upgrade::MacosAppUpdateWorkspace workspace(root);
+        ASSERT_TRUE(workspace.create());
+        backup = workspace.previous_bundle();
+        failed = workspace.failed_bundle();
+        create_bundle(backup);
+        create_bundle(failed);
+        write_file(backup / "old-version");
+        write_file(failed / "new-version");
+    }
+    EXPECT_TRUE(fs::is_regular_file(backup / "old-version"));
+    EXPECT_TRUE(fs::is_regular_file(failed / "new-version"));
+    EXPECT_EQ(failed.filename(), "ACECode.app");
+    EXPECT_FALSE(fs::exists(root / "staging"));
+}
+
 #ifdef __APPLE__
 TEST(MacosBundleInstaller, UnwritableParentFailsWithoutMutation) {
     if (::geteuid() == 0) GTEST_SKIP() << "root bypasses directory permissions";
diff --git a/tests/upgrade/upgrade_apply_test.cpp b/tests/upgrade/upgrade_apply_test.cpp
index 0771bf40c..4ed536831 100644
--- a/tests/upgrade/upgrade_apply_test.cpp
+++ b/tests/upgrade/upgrade_apply_test.cpp
@@ -201,6 +201,32 @@ TEST(UpgradeApply, AppliesStagedUpdateAndKeepsBackup) {
     fs::remove_all(root, ec);
 }
 
+TEST(UpgradeApply, LegacyMacFlatInstallAcceptsOneAppAndSmallForwarder) {
+    const auto root = temp_root("acecode-apply-mac-dedup");
+    const auto install = root / "install";
+    const auto staging = root / "staging";
+    const auto bundle = fs::path("ACECode.app") / "Contents";
+    write_file(install / "acecode", "previous standalone executable");
+    write_file(install / "user-file.txt", "preserved");
+    write_file(staging / "acecode", "small CLI forwarder");
+    write_file(staging / bundle / "MacOS" / "ACECode", "desktop");
+    write_file(staging / bundle / "MacOS" / "acecode-daemon", "single runtime");
+    write_file(staging / bundle / "Resources" / "share" / "acecode" / "models_dev" / "api.json", "{}");
+    std::string error;
+    const auto package = validate_staged_package(staging, "macos-arm64", &error);
+    ASSERT_TRUE(package) << error;
+    EXPECT_EQ(package->content_root, staging);
+    ASSERT_TRUE(apply_staged_update(staging, install, root / "backup", "macos-arm64", &error)) << error;
+    EXPECT_EQ(read_file(install / "acecode"), "small CLI forwarder");
+    EXPECT_EQ(read_file(install / bundle / "MacOS" / "acecode-daemon"), "single runtime");
+    EXPECT_TRUE(fs::exists(install / bundle / "Resources" / "share" / "acecode" / "models_dev" / "api.json"));
+    EXPECT_FALSE(fs::exists(install / "share"));
+    EXPECT_EQ(read_file(install / "user-file.txt"), "preserved");
+    EXPECT_EQ(read_file(root / "backup" / "acecode"), "previous standalone executable");
+    std::error_code ec;
+    fs::remove_all(root, ec);
+}
+
 TEST(UpgradeApply, AllowsSafeUpdateWhenInstallContainsUserDataDirectory) {
     const fs::path root = temp_root("acecode-apply-home-install");
     const fs::path home = root / "home";
diff --git a/tests/web/desktop_office_route_test.cpp b/tests/web/desktop_office_route_test.cpp
index fb5628309..c75b67dfc 100644
--- a/tests/web/desktop_office_route_test.cpp
+++ b/tests/web/desktop_office_route_test.cpp
@@ -1,6 +1,7 @@
 #include <gtest/gtest.h>
 #include <cpr/cpr.h>
 #include "web/server.hpp"
+#include "experts/expert_registry.hpp"
 #include "desktop/daemon_supervisor.hpp"
 #include "workspace/workspace_registry.hpp"
 #include "session_host/local_session_client.hpp"
@@ -12,6 +13,7 @@
 #include "utils/paths.hpp"
 #include <chrono>
 #include <filesystem>
+#include <fstream>
 #include <thread>
 
 using namespace acecode;
@@ -26,6 +28,7 @@ class DesktopOfficeHttp : public testing::Test {
     AppConfig cfg;
     ToolExecutor tools;
     desktop::WorkspaceRegistry workspaces;
+    ExpertRegistry experts{home.root() / ".acecode" / "experts"};
     std::unique_ptr<SessionRegistry> registry;
     std::unique_ptr<LocalSessionClient> client;
     std::unique_ptr<web::WebServer> server;
@@ -37,6 +40,7 @@ class DesktopOfficeHttp : public testing::Test {
         workspaces.register_new(projects, cwd);
         SessionRegistryDeps sessions;
         sessions.cwd = cwd; sessions.tools = &tools;
+        sessions.expert_registry = &experts;
         // Shared with the registry's provider accessor for the fixture lifetime.
         auto provider = std::make_shared<acecode_test::StubLlmProvider>();
         provider->push_text("complete");
@@ -49,6 +53,7 @@ class DesktopOfficeHttp : public testing::Test {
         deps.sync_model_reasoning = false; deps.token = "office-fixture";
         deps.projects_dir = projects; deps.workspace_registry = &workspaces;
         deps.session_client = client.get(); deps.session_registry = registry.get();
+        deps.expert_registry = &experts;
         server = std::make_unique<web::WebServer>(std::move(deps));
         worker = JoiningThread([this] { server->run(); });
         const auto deadline = std::chrono::steady_clock::now() + 3s;
@@ -80,9 +85,11 @@ class DesktopOfficeHttp : public testing::Test {
         ADD_FAILURE() << "office catalog did not settle";
         return result;
     }
-    std::string active(const std::string& parent = {}, bool no_workspace = false) {
+    std::string active(const std::string& parent = {}, bool no_workspace = false,
+                       const std::string& expert = {}, const std::string& member = {}) {
         SessionOptions opts;
         opts.cwd = cwd; opts.parent_session_id = parent; opts.no_workspace = no_workspace;
+        opts.expert_id = expert; opts.expert_member_id = member;
         if (!parent.empty()) opts.subagent_depth = 1;
         const auto id = registry->create(opts);
         auto entry = registry->acquire(id);
@@ -132,6 +139,43 @@ TEST_F(DesktopOfficeHttp, SnapshotCarriesRealRuntimeAndRoutesMeshChildToRoot) {
     EXPECT_FALSE(result["selected"].contains("session_path"));
 }
 
+TEST_F(DesktopOfficeHttp, ExpertMemberIdentitySurvivesOfficeProjection) {
+    const auto experts_root = home.root() / ".acecode" / "experts";
+    const auto write = [](const std::filesystem::path& file, const std::string& text) {
+        std::filesystem::create_directories(file.parent_path());
+        std::ofstream(file) << text;
+    };
+    for (const auto* id : {"leader", "worker"}) {
+        write(experts_root / id / "agents" / "lead.md", "# Expert\nHelp the user.\n");
+        write(experts_root / id / "expert.json", json({{"name", id}, {"version", "1.0.0"},
+            {"expertType", "agent"}, {"displayName", id}, {"agentName", "lead"},
+            {"agents", json::array({{{"id", "lead"}, {"path", "agents/lead.md"}}})}}).dump());
+    }
+    write(experts_root / "team" / "expert.json", json({{"name", "team"}, {"version", "1.0.0"},
+        {"expertType", "team"}, {"displayName", "Team"},
+        {"teamInfo", {{"leadExpert", "leader"}, {"memberExperts", json::array({"worker"})}}}}).dump());
+    ASSERT_TRUE(experts.find(cwd, "team").has_value());
+    const auto root = active({}, false, "team");
+    const auto child = active(root, false, "team", "worker");
+    const auto result = snapshot(root);
+    ASSERT_EQ(result["agents"].size(), 2u);
+    EXPECT_EQ(result["selected"]["expert"]["avatar_identity"], "expert:leader");
+    EXPECT_EQ(result["agents"][1]["id"], child);
+    EXPECT_EQ(result["agents"][1]["expert_id"], "team");
+    EXPECT_EQ(result["agents"][1]["expert_member_id"], "worker");
+    EXPECT_EQ(result["agents"][1]["expert"]["avatar_identity"], "expert:worker");
+    const auto catalog = cpr::Get(cpr::Url{url("/api/experts")}, cpr::Timeout{2000});
+    ASSERT_EQ(catalog.status_code, 200);
+    bool found = false;
+    const auto catalog_body = json::parse(catalog.text);
+    for (const auto& expert : catalog_body["experts"]) {
+        if (expert["id"] != "worker") continue;
+        found = true;
+        EXPECT_EQ(expert["avatar_identity"], result["agents"][1]["expert"]["avatar_identity"]);
+    }
+    EXPECT_TRUE(found);
+}
+
 TEST_F(DesktopOfficeHttp, HiddenWorkspaceAndNoWorkspaceAreSelectable) {
     const auto hidden_cwd = home.workspace_cwd("not-in-sidebar");
     const auto directory = SessionStorage::get_project_dir(hidden_cwd);
diff --git a/tests/web/skills_handler_test.cpp b/tests/web/skills_handler_test.cpp
index 1ca84d185..b61894ea4 100644
--- a/tests/web/skills_handler_test.cpp
+++ b/tests/web/skills_handler_test.cpp
@@ -10,6 +10,7 @@
 
 #include "config/config.hpp"
 #include "skills/skill_registry.hpp"
+#include "skills/skill_init.hpp"
 #include "skills/skill_usage_store.hpp"
 
 #include <algorithm>
@@ -67,6 +68,67 @@ void populate_registry_with_skill(acecode::SkillRegistry& r,
 
 } // namespace
 
+TEST_F(SkillsHandlerTest, ScanPathsMutationValidatesAndPreservesOtherSettings) {
+    acecode::AppConfig disk;
+    disk.skills.disabled = {"keep-disabled"};
+    disk.skills.external_dirs = {"legacy"};
+    disk.skills.reuse_opencode = false;
+    acecode::save_config(disk, cfg_path);
+    acecode::AppConfig active = disk;
+    active.skills.allowed = std::vector<std::string>{"runtime-only"};
+    auto result = acecode::web::set_skill_scan_paths(
+        {{"paths", {"  .custom/skills  ", "~/.codex/skills"}}}, active, cfg_path);
+    ASSERT_TRUE(result.ok) << result.body;
+    EXPECT_TRUE(result.body["customized"]);
+    EXPECT_EQ(result.body["paths"][0], ".custom/skills");
+    auto loaded = acecode::load_config_from_path(cfg_path, false);
+    EXPECT_EQ(loaded.skills.scan_paths, active.skills.scan_paths);
+    EXPECT_EQ(loaded.skills.disabled, disk.skills.disabled);
+    EXPECT_EQ(loaded.skills.external_dirs, disk.skills.external_dirs);
+    EXPECT_FALSE(loaded.skills.reuse_opencode);
+    EXPECT_TRUE(active.skills.allowed);
+
+    const auto before = active.skills.scan_paths;
+    for (const auto& body : {nlohmann::json::object(), nlohmann::json{{"paths", 1}},
+                            nlohmann::json{{"paths", {42}}},
+                            nlohmann::json{{"paths", {" "}}},
+                            nlohmann::json{{"paths", {"line\nbreak"}}}}) {
+        EXPECT_EQ(acecode::web::set_skill_scan_paths(body, active, cfg_path).http_status, 400);
+        EXPECT_EQ(active.skills.scan_paths, before);
+        EXPECT_EQ(acecode::load_config_from_path(cfg_path, false).skills.scan_paths, before);
+    }
+    // A directory where the config file should be forces persistence failure.
+    EXPECT_EQ(acecode::web::set_skill_scan_paths(
+        {{"paths", nlohmann::json::array()}}, active, tmp_root.string()).http_status, 500);
+    EXPECT_EQ(active.skills.scan_paths, before);
+    EXPECT_TRUE(acecode::web::set_skill_scan_paths(
+        {{"paths", nlohmann::json::array()}}, active, cfg_path).ok);
+    ASSERT_TRUE(active.skills.scan_paths);
+    EXPECT_TRUE(active.skills.scan_paths->empty());
+    EXPECT_TRUE(acecode::web::set_skill_scan_paths({{"paths", nullptr}}, active, cfg_path).ok);
+    EXPECT_FALSE(active.skills.scan_paths);
+    EXPECT_FALSE(acecode::load_config_from_path(cfg_path, false).skills.scan_paths);
+}
+
+TEST_F(SkillsHandlerTest, CustomScanPathListingMatchesRegistryPriorityAndDirectoryOpening) {
+    const auto global = tmp_root / "global";
+    const auto workspace = tmp_root / "workspace";
+    write_skill(global, "same", "global wins");
+    write_skill(workspace / "custom", "same", "project loses");
+    acecode::AppConfig cfg;
+    cfg.skills.scan_paths = std::vector<std::string>{global.string(), "custom"};
+    const auto payload = acecode::web::build_skills_payload(cfg, workspace.string());
+    ASSERT_EQ(payload.size(), 1u);
+    EXPECT_EQ(payload[0]["source"], "global");
+    EXPECT_EQ(payload[0]["description"], "global wins");
+    const auto selection = acecode::web::resolve_skill_root_for_cwd(workspace.string(), &cfg);
+    EXPECT_EQ(selection.path, workspace / "custom");
+    EXPECT_EQ(selection.global_path, global);
+    cfg.skills.scan_paths = std::vector<std::string>{};
+    EXPECT_TRUE(acecode::web::build_skills_payload(cfg, workspace.string()).empty());
+    EXPECT_TRUE(acecode::web::resolve_skill_root_for_cwd(workspace.string(), &cfg).path.empty());
+}
+
 // 场景: 把已注册 skill 禁用 → 200 + cfg.skills.disabled 含该 name + 文件回写
 TEST_F(SkillsHandlerTest, DisableEnabledSkillUpdatesConfig) {
     acecode::SkillRegistry registry;
@@ -300,21 +362,46 @@ TEST_F(SkillsHandlerTest, BuildSkillsPayloadKeepsMetadataForDisabledSkills) {
     EXPECT_EQ((*off)["source"], "global");
 }
 
-// 场景: disabled 列表里残留一个磁盘上已删除的名字(幽灵条目)→ 仍列出
-// (enabled=false、source=""),这样用户能在 UI 里把它从禁用列表放出来,
-// 而不是永远卡在 config.json 里。
-TEST_F(SkillsHandlerTest, BuildSkillsPayloadListsGhostDisabledEntries) {
+// 禁用偏好不是安装清单:未发现的名字不能补成幽灵条目。
+TEST_F(SkillsHandlerTest, BuildSkillsPayloadOmitsUndiscoveredDisabledEntries) {
     const auto global_root = tmp_root / "home" / ".acecode" / "skills";
     write_skill(global_root, "real-skill", "exists on disk");
 
     auto arr = acecode::web::build_skills_payload_with_roots(
         {}, {global_root}, /*disabled=*/{"deleted-skill"});
 
-    const auto* ghost = find_entry(arr, "deleted-skill");
-    ASSERT_NE(ghost, nullptr);
-    EXPECT_FALSE((*ghost)["enabled"].get<bool>());
-    EXPECT_EQ((*ghost)["source"], "");
-    EXPECT_EQ((*ghost)["description"], "");
+    EXPECT_EQ(find_entry(arr, "deleted-skill"), nullptr);
+    ASSERT_EQ(arr.size(), 1u);
+    EXPECT_NE(find_entry(arr, "real-skill"), nullptr);
+}
+
+TEST_F(SkillsHandlerTest, DeletedDisabledSkillDisappearsAndRestoresDisabled) {
+    const auto project_root = tmp_root / "project";
+    const auto global_root = tmp_root / "global";
+    for (const auto& root : {project_root, global_root}) {
+        SCOPED_TRACE(root.string());
+        const std::string name = root == project_root ? "project-skill" : "global-skill";
+        const std::vector<std::string> disabled{name};
+        write_skill(root, name, "before deletion");
+        const auto refresh = [&] {
+            return acecode::web::build_skills_payload_with_roots(
+                {project_root}, {global_root}, disabled);
+        };
+        auto before = refresh();
+        const auto* present = find_entry(before, name);
+        ASSERT_NE(present, nullptr);
+        EXPECT_FALSE((*present)["enabled"].get<bool>());
+        ASSERT_TRUE(fs::remove(root / "engineering" / name / "SKILL.md"));
+        EXPECT_EQ(find_entry(refresh(), name), nullptr);
+
+        write_skill(root, name, "restored metadata");
+        auto restored = refresh();
+        const auto* found = find_entry(restored, name);
+        ASSERT_NE(found, nullptr);
+        EXPECT_FALSE((*found)["enabled"].get<bool>());
+        EXPECT_EQ((*found)["description"], "restored metadata");
+        EXPECT_EQ((*found)["source"], root == project_root ? "project" : "global");
+    }
 }
 
 // 场景: 项目根与全局根有同名 skill → first-wins(项目优先),payload 里只
diff --git a/tests/web/static_assets_test.cpp b/tests/web/static_assets_test.cpp
index 5692e7dca..485cac1b6 100644
--- a/tests/web/static_assets_test.cpp
+++ b/tests/web/static_assets_test.cpp
@@ -10,6 +10,7 @@
 #include <filesystem>
 #include <fstream>
 #include <random>
+#include <future>
 
 namespace fs = std::filesystem;
 using acecode::web::EmbeddedAssetSource;
@@ -42,7 +43,7 @@ TEST(StaticAssets, EmbeddedMapContainsIndexHtml) {
     const auto& m = embedded_asset_map();
     auto it = m.find("index.html");
     ASSERT_NE(it, m.end()) << "index.html 必须被嵌入 — 检查 web/index.html 与 acecode_embed_assets";
-    EXPECT_GT(it->second.second, 0u);
+    EXPECT_GT(it->second.size, 0u);
 }
 
 // 场景: EmbeddedAssetSource 命中 index.html
@@ -62,6 +63,43 @@ TEST(StaticAssets, EmbeddedSourceMisses) {
     EXPECT_FALSE(src.lookup("").has_value());
 }
 
+TEST(StaticAssets, GzipNegotiationRespectsQualityAndExplicitExclusions) {
+    using acecode::web::accepts_gzip;
+    for (const auto* header : {"gzip", "br, gzip", "GZip;Q=0.1", "*;q=1", "gzip; q=1.000"}) {
+        EXPECT_TRUE(accepts_gzip(header)) << header;
+    }
+    for (const auto* header : {"", "br", "x-gzip", "gzip;q=0", "gzip;q=0.000, *;q=1",
+                               "gzip;q=broken", "gzip;q=1.1", "gzip;q=0.0001", "*;q=0",
+                               "gzip;q=0, gzip;q=1", "gzip;q"}) {
+        EXPECT_FALSE(accepts_gzip(header)) << header;
+    }
+}
+
+TEST(StaticAssets, EmbeddedGzipAndIdentityShareTheOriginalContent) {
+    EmbeddedAssetSource src;
+    const auto identity = src.lookup("index.html");
+    const auto encoded = src.lookup("index.html", true);
+    ASSERT_TRUE(identity);
+    ASSERT_TRUE(encoded);
+    const auto& stored = embedded_asset_map().at("index.html");
+    EXPECT_EQ(identity->size, stored.decoded_size);
+    EXPECT_FALSE(identity->gzip);
+    EXPECT_EQ(encoded->gzip, stored.gzip);
+    EXPECT_EQ(encoded->size, stored.size);
+    EXPECT_EQ(encoded->data, stored.data);
+    EXPECT_EQ(encoded->vary_accept_encoding, stored.gzip);
+    EXPECT_EQ(identity->content_type, encoded->content_type);
+    if (stored.gzip) {
+        EXPECT_LT(encoded->size, identity->size);
+        EXPECT_EQ(encoded->data[0], 0x1f);
+        EXPECT_EQ(encoded->data[1], 0x8b);
+        ASSERT_TRUE(identity->owned_buffer);
+        EXPECT_NE(identity->owned_buffer->find("<html"), std::string::npos);
+        auto concurrent = std::async(std::launch::async, [&src] { return src.lookup("index.html"); });
+        EXPECT_EQ(concurrent.get()->owned_buffer, identity->owned_buffer);
+    }
+}
+
 namespace {
 
 class FsSourceTest : public ::testing::Test {
diff --git a/tests/web/web_server_smoke_test.cpp b/tests/web/web_server_smoke_test.cpp
index ebd5e4276..a5119918a 100644
--- a/tests/web/web_server_smoke_test.cpp
+++ b/tests/web/web_server_smoke_test.cpp
@@ -54,6 +54,8 @@
 #include "session/session_user_message_search.hpp"
 #include "session/todo_state.hpp"
 #include "session_host/task_suggestion_service.hpp"
+#include "session_host/thread_service.hpp"
+#include "session_host/tools/thread_tools.hpp"
 #include "session_host/memory_command.hpp"
 #include "session_host/memory_runtime.hpp"
 #include "memory/memory_service.hpp"
@@ -3741,6 +3743,66 @@ TEST(WebServerHttp, CreateNoWorkspaceSessionIsListedOutsideWorkspaces) {
     std::filesystem::remove_all(no_workspace_project_dir);
 }
 
+// 从无工作区会话调用 AI 创建工具后,侧栏使用的接口必须列出新会话。
+TEST(WebServerHttp, ToolCreatedNoWorkspaceThreadAppearsInSidebarList) {
+    class PersistingClient final : public acecode::LocalSessionClient {
+    public:
+        explicit PersistingClient(acecode::SessionRegistry& registry)
+            : LocalSessionClient(registry), registry_(registry) {}
+        bool send_input(const std::string& id, const std::string& text) override {
+            auto entry = registry_.acquire(id);
+            if (!entry || !entry->sm) return false;
+            acecode::ChatMessage message;
+            message.role = "user";
+            message.content = text;
+            entry->sm->on_message(message);
+            return true;
+        }
+    private:
+        acecode::SessionRegistry& registry_; // Borrowed; fixture owns both.
+    };
+    WebServerFixture fx(true, false, {}, true, {}, {}, false, {},
+        [](acecode::SessionRegistry& registry) {
+            return std::make_unique<PersistingClient>(registry);
+        });
+    auto deps = std::make_shared<acecode::ThreadToolDeps>();
+    deps->service = std::make_shared<acecode::ThreadService>(
+        acecode::ThreadService::Deps{fx.registry.get(), fx.client.get()});
+    acecode::register_codex_thread_tools(fx.tools, deps);
+    acecode::SessionOptions options;
+    options.no_workspace = true;
+    auto caller = fx.registry->acquire(fx.registry->create(options));
+    ASSERT_NE(caller, nullptr);
+    const auto caller_project = acecode::SessionStorage::get_project_dir(caller->cwd);
+    acecode::ToolContext context;
+    context.cwd = caller->cwd;
+    context.session_manager = caller->sm.get();
+    const auto created = fx.tools.execute("create_thread",
+        R"({"prompt":"hello","title":"Created by AI"})", context);
+    ASSERT_TRUE(created.success) << created.output;
+    const auto body = json::parse(created.output);
+    const auto id = body["threadId"].get<std::string>();
+    const auto project = acecode::SessionStorage::get_project_dir(body["cwd"]);
+    for (bool active : {true, false}) {
+        if (!active) fx.client->destroy_session(id);
+        const auto response = cpr::Get(cpr::Url{fx.url("/api/sessions?scope=no-workspace")});
+        ASSERT_EQ(response.status_code, 200) << response.text;
+        const auto rows = json::parse(response.text);
+        const auto found = std::find_if(rows.begin(), rows.end(), [&](const auto& row) {
+            return row.value("id", std::string{}) == id;
+        });
+        ASSERT_NE(found, rows.end());
+        EXPECT_EQ((*found)["title"], "Created by AI");
+        EXPECT_EQ((*found)["no_workspace"], true);
+        EXPECT_EQ((*found)["workspace_hash"], "");
+        EXPECT_EQ((*found)["active"], active);
+    }
+    fx.client->destroy_session(caller->id);
+    caller.reset();
+    std::filesystem::remove_all(project);
+    std::filesystem::remove_all(caller_project);
+}
+
 // 场景:会话列表只在规范 JSONL 已经实际落盘时暴露 session_path。
 // 活跃与 inactive 列表必须指向同一个由 SessionStorage 生成的文件。
 TEST(WebServerHttp, SessionListExposesOnlyExistingCanonicalJsonlPath) {
@@ -8188,6 +8250,99 @@ TEST(WebServerHttp, SkillsListsProjectSkillWithSource) {
     EXPECT_TRUE(found);
 }
 
+TEST(WebServerHttp, SkillScanPathsConfigRefreshesDiscoveryAndPersists) {
+    WebServerFixture fx;
+    acecode::SessionOptions options;
+    options.cwd = fx.cwd;
+    const auto session_id = fx.registry->create(options);
+    const auto session_skills = fx.registry->skill_registry_snapshot(session_id);
+    ASSERT_TRUE(session_skills);
+    const auto global = fx.cwd_dir / "custom-global";
+    write_skill_md(global, "configured-skill", "configured path");
+    auto get = cpr::Get(cpr::Url{fx.url("/api/config/skill-paths")});
+    ASSERT_EQ(get.status_code, 200) << get.text;
+    EXPECT_FALSE(json::parse(get.text)["customized"].get<bool>());
+    auto put = [&](const json& body) {
+        return cpr::Put(cpr::Url{fx.url("/api/config/skill-paths")},
+                        cpr::Header{{"Content-Type", "application/json"}},
+                        cpr::Body{body.dump()});
+    };
+    auto saved = put({{"paths", {acecode::path_to_utf8(global)}}});
+    ASSERT_EQ(saved.status_code, 200) << saved.text;
+    EXPECT_TRUE(json::parse(saved.text)["customized"].get<bool>());
+    EXPECT_TRUE(session_skills->find("configured-skill"));
+    EXPECT_EQ(acecode::load_config_from_path((fx.tmp_dir / "config.json").string(), false)
+                  .skills.scan_paths,
+              std::optional<std::vector<std::string>>({acecode::path_to_utf8(global)}));
+    auto list = cpr::Get(cpr::Url{fx.url("/api/skills")});
+    ASSERT_EQ(list.status_code, 200);
+    ASSERT_EQ(json::parse(list.text).size(), 1u);
+    EXPECT_EQ(json::parse(list.text)[0]["name"], "configured-skill");
+    auto body = cpr::Get(cpr::Url{fx.url("/api/skills/configured-skill/body")});
+    EXPECT_EQ(body.status_code, 200) << body.text;
+    EXPECT_EQ(put({{"paths", false}}).status_code, 400);
+    EXPECT_EQ(put({{"paths", json::array()}}).status_code, 200);
+    EXPECT_FALSE(session_skills->find("configured-skill"));
+    EXPECT_TRUE(json::parse(cpr::Get(cpr::Url{fx.url("/api/skills")}).text).empty());
+    EXPECT_EQ(cpr::Get(cpr::Url{fx.url("/api/skills/configured-skill/body")}).status_code, 404);
+    EXPECT_EQ(put({{"paths", nullptr}}).status_code, 200);
+    get = cpr::Get(cpr::Url{fx.url("/api/config/skill-paths")});
+    EXPECT_FALSE(json::parse(get.text)["customized"].get<bool>());
+}
+
+TEST(WebServerHttp, SkillsRefreshRemovesDeletedDisabledSkillsAndPreservesPreferences) {
+    WebServerFixture fx;
+    const auto global_root = fx.cwd_dir / "custom-global";
+    const auto project_root = fx.cwd_dir / "project-skills";
+    const std::vector<std::pair<std::filesystem::path, std::string>> removed = {
+        {global_root, "deleted-global"}, {project_root, "deleted-project"}};
+    write_skill_md(global_root, "remaining", "keep visible");
+    for (const auto& [root, name] : removed) write_skill_md(root, name, "before delete");
+    auto set_paths = [&](const json& paths) {
+        return cpr::Put(cpr::Url{fx.url("/api/config/skill-paths")},
+                        cpr::Header{{"Content-Type", "application/json"}},
+                        cpr::Body{json{{"paths", paths}}.dump()});
+    };
+    ASSERT_EQ(set_paths({acecode::path_to_utf8(global_root), "project-skills"}).status_code, 200);
+    auto refresh = [&] {
+        const auto response = cpr::Get(cpr::Url{fx.url("/api/skills")});
+        EXPECT_EQ(response.status_code, 200) << response.text;
+        return json::parse(response.text);
+    };
+    for (const auto& [root, name] : removed) {
+        auto response = cpr::Put(cpr::Url{fx.url("/api/skills/" + name)},
+            cpr::Header{{"Content-Type", "application/json"}},
+            cpr::Body{R"({"enabled":false})"});
+        ASSERT_EQ(response.status_code, 200) << response.text;
+    }
+    auto disabled = refresh();
+    ASSERT_EQ(disabled.size(), 3u);
+    for (const auto& item : disabled) {
+        EXPECT_EQ(item["enabled"].get<bool>(), item["name"] == "remaining");
+    }
+    for (const auto& [root, name] : removed) {
+        ASSERT_TRUE(std::filesystem::remove(root / "general" / name / "SKILL.md"));
+    }
+    auto after_delete = refresh();
+    ASSERT_EQ(after_delete.size(), 1u);
+    EXPECT_EQ(after_delete[0]["name"], "remaining");
+    const auto load_disabled = [&] {
+        return acecode::load_config_from_path((fx.tmp_dir / "config.json").string(), false)
+            .skills.disabled;
+    };
+    const std::vector<std::string> expected_disabled{"deleted-global", "deleted-project"};
+    EXPECT_EQ(load_disabled(), expected_disabled);
+    for (const auto& [root, name] : removed) write_skill_md(root, name, "restored");
+    auto restored = refresh();
+    ASSERT_EQ(restored.size(), 3u);
+    for (const auto& item : restored) {
+        EXPECT_EQ(item["enabled"].get<bool>(), item["name"] == "remaining");
+    }
+    ASSERT_EQ(set_paths(json::array()).status_code, 200);
+    EXPECT_TRUE(refresh().empty());
+    EXPECT_EQ(load_disabled(), expected_disabled);
+}
+
 // 场景: GET /api/skills/root 返回选中 workspace 的有效 skill 目录。
 TEST(WebServerHttp, SkillRootReturnsProjectAcecodeSkillsForWorkspace) {
     WebServerFixture fx;
diff --git a/vcpkg.json b/vcpkg.json
index 54119199f..f79d47a4c 100644
--- a/vcpkg.json
+++ b/vcpkg.json
@@ -13,7 +13,8 @@
     "ftxui",
     "libzip",
     "nlohmann-json",
-    "sqlite3"
+    "sqlite3",
+    "zlib"
   ],
   "features": {
     "tests": {
diff --git a/web/scripts/i18n-en-overrides.mjs b/web/scripts/i18n-en-overrides.mjs
index 249dcb422..772f5339b 100644
--- a/web/scripts/i18n-en-overrides.mjs
+++ b/web/scripts/i18n-en-overrides.mjs
@@ -1,6 +1,41 @@
 // Human-reviewed product terminology and phrases where generic machine
 // translation is ambiguous without ACECode context.
 export const ENGLISH_SOURCE_OVERRIDES = Object.freeze({
+  '修改快捷键': 'Edit shortcut',
+  '此快捷键已用于“{{p0}}”，请换一组按键。': 'This shortcut is already used by “{{p0}}”. Choose another combination.',
+  '无法保存快捷键，请检查本地存储后重试。': 'Could not save the shortcut. Check local storage and try again.',
+  '此组合键由系统、浏览器或文本编辑保留，请换一组按键。': 'This combination is reserved by the system, browser or text editor. Choose another combination.',
+  '请搭配 Ctrl、Cmd 或 Alt，或使用功能键，避免影响正常输入。': 'Include Ctrl, Cmd or Alt, or use a function key to preserve normal typing.',
+  '请按下完整的快捷键组合。': 'Press a complete key combination.',
+  '点击下方输入框，然后按下新的组合键': 'Click the field below, then press the new key combination',
+  '录入快捷键': 'Record shortcut',
+  '录入期间不会执行快捷键，点击保存后立即生效。': 'Shortcuts do not run while recording. Changes take effect when saved.',
+  '修改快捷键：{{p0}}{{p1}}': 'Edit shortcut: {{p0}}{{p1}}',
+  '（上一条）': ' (previous)',
+  '（下一条）': ' (next)',
+  '关闭控制台': 'Close console',
+  '打开控制台': 'Open console',
+  '收起控制台': 'Collapse console',
+  '每页条目数': 'Items per page',
+  '全局技能分页': 'Global skills pagination',
+  '{{p0}} 技能分页': '{{p0}} skill pagination',
+  '第 {{p0}} / {{p1}} 页，共 {{p2}} 条': 'Page {{p0}} / {{p1}}, {{p2}} items',
+  '上一页': 'Previous page',
+  '下一页': 'Next page',
+  'Skill 扫描路径': 'Skill scan paths',
+  '设置 Skill 扫描路径': 'Configure Skill scan paths',
+  '保存路径': 'Save paths',
+  '加载 Skill 扫描路径失败：': 'Failed to load Skill scan paths: ',
+  '保存 Skill 扫描路径失败：': 'Failed to save Skill scan paths: ',
+  '每行一个目录，按顺序查找，同名技能优先使用靠前的路径。保存空列表将关闭普通目录扫描。': 'One directory per line, searched in order. Earlier paths take priority for duplicate skills. Saving an empty list disables ordinary directory scanning.',
+  '相对路径从当前工作区逐级向上查找；绝对路径和 ~ 路径作为全局目录。支持 ${ENV} 环境变量。': 'Relative paths are searched from the workspace up through its ancestors; absolute and ~ paths are global. ${ENV} environment variables are supported.',
+  '${ACECODE_DATA_DIR} 为数据目录；${XDG_CONFIG_HOME}、${XDG_CACHE_HOME} 默认分别为 ~/.config、~/.cache。未设置的其他变量会跳过。': '${ACECODE_DATA_DIR} is the data directory; ${XDG_CONFIG_HOME} and ${XDG_CACHE_HOME} default to ~/.config and ~/.cache. Paths with other unset variables are skipped.',
+  '使用默认路径': 'Using default paths',
+  '使用自定义路径': 'Using custom paths',
+  '已保存，技能扫描路径已更新': 'Saved. Skill scan paths updated.',
+  '该工作区没有技能，可在配置中设置 Skill 扫描路径': 'No skills in this workspace. Set Skill scan paths in Configuration.',
+  '尚未配置此范围的 Skill 扫描路径': 'No Skill scan path is configured for this scope',
+  'skill skills scan search paths directories 技能 扫描 搜索 路径 目录': 'skill skills scan search paths directories',
   '全屏演示': 'Presentation mode',
   '退出全屏演示': 'Exit presentation mode',
   '展开详情并隐藏两侧列表，再按一次还原': 'Expand details and hide both sidebars; press again to restore',
diff --git a/web/scripts/test-composer-focus-selection.mjs b/web/scripts/test-composer-focus-selection.mjs
new file mode 100644
index 000000000..99cf5ade6
--- /dev/null
+++ b/web/scripts/test-composer-focus-selection.mjs
@@ -0,0 +1,140 @@
+import assert from 'node:assert/strict';
+import os from 'node:os';
+import path from 'node:path';
+import { mkdtemp } from 'node:fs/promises';
+import { spawn } from 'node:child_process';
+import { createServer as createNetServer } from 'node:net';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { createServer, transformWithEsbuild } from 'vite';
+
+const web = fileURLToPath(new URL('../', import.meta.url));
+const { chromium } = await import(process.env.ACE_PLAYWRIGHT_MODULE
+  ? pathToFileURL(path.resolve(process.env.ACE_PLAYWRIGHT_MODULE)).href : 'playwright');
+// ACE_FOCUS_NATIVE_HOST reuses tests/desktop/fixtures/window_focus_host.cpp.
+// CDP drives the browser's IME implementation; this is not an OS candidate-picker test.
+const entry = `
+import React, {useEffect, useRef, useState} from 'react';
+import {createRoot} from 'react-dom/client';
+import {RichComposer} from '/src/components/RichComposer.jsx';
+import {bindDesktopComposerAutoFocus} from '/src/lib/composerCaretRestore.js';
+import '/src/styles/globals.css';
+function App() {
+  const composer = useRef(null);
+  const [value, setValue] = useState('tail');
+  window.fixture = {composer, setValue};
+  useEffect(() => bindDesktopComposerAutoFocus({enabled:true,
+    onFocus: canFocus => { window.focusCalls++; composer.current?.focus({canFocus}); }
+  }), []);
+  return <main style={{padding:40}}><button id="other">Other</button>
+    <RichComposer ref={composer} value={value} onChange={setValue}
+      className="ace-rich-composer-input" style={{minHeight:80}} aria-label="Chat"/>
+  </main>;
+}
+window.focusCalls = 0;
+window.activate = () => window.dispatchEvent(new Event('acecode:desktop-window-focus'));
+createRoot(document.getElementById('root')).render(<App/>);
+`;
+const html = '<html><head><meta charset="UTF-8"/></head><body><div id="root"></div><script type="module" src="/@id/virtual:focus-selection"></script></body></html>';
+const server = await createServer({root:web, logLevel:'error', server:{host:'127.0.0.1',port:0,hmr:false},
+  plugins:[{name:'focus-selection-fixture',enforce:'pre',
+    resolveId(id) { if (id === 'virtual:focus-selection') return '\0virtual:focus-selection'; },
+    async load(id) {
+      if (id === '\0virtual:focus-selection') return (await transformWithEsbuild(entry,'fixture.jsx',{loader:'jsx'})).code;
+    },
+    transform(code,id) {
+      // Read-only probes for the actual editor; production exports stay unchanged.
+      if (id.replaceAll('\\','/').endsWith('/components/RichComposer.jsx')) {
+        return code.replace('const editableRef = useRef(null);',
+          'const editableRef = useRef(null); window.composerProbe = {editor, renderPendingRef, compositionState: () => compositionStateRef.current};');
+      }
+    },
+    configureServer(vite) { vite.middlewares.use('/focus-selection', async (_req,res) => {
+      res.setHeader('Content-Type','text/html'); res.end(await vite.transformIndexHtml('/focus-selection',html));
+    }); },
+  }],
+});
+let browser;
+let native;
+try {
+  await server.listen();
+  const url = `http://127.0.0.1:${server.httpServer.address().port}/focus-selection`;
+  let page;
+  if (process.env.ACE_FOCUS_NATIVE_HOST) {
+    const portServer=createNetServer(); await new Promise(resolve=>portServer.listen(0,'127.0.0.1',resolve));
+    const port=portServer.address().port; await new Promise(resolve=>portServer.close(resolve));
+    const profile=await mkdtemp(path.join(os.tmpdir(),'ace-caret-webview-'));
+    native=spawn(process.env.ACE_FOCUS_NATIVE_HOST,[url],{windowsHide:true,stdio:'pipe',env:{...process.env,
+      WEBVIEW2_USER_DATA_FOLDER:profile,WEBVIEW2_ADDITIONAL_BROWSER_ARGUMENTS:'--remote-debugging-port='+port}});
+    for(let attempt=0;attempt<100;attempt++) {
+      try {browser=await chromium.connectOverCDP('http://127.0.0.1:'+port);break;} catch {await new Promise(resolve=>setTimeout(resolve,100));}
+    }
+    if(!browser) throw new Error('Native WebView debug endpoint unavailable');
+    page=browser.contexts()[0].pages()[0];
+    await page.waitForFunction(()=>typeof window.aceFocusTest==='function');
+    await page.evaluate(()=>window.aceFocusTest('show'));
+  } else {
+    browser = await chromium.launch({headless:true,executablePath:process.env.ACE_CHROMIUM_EXECUTABLE || undefined});
+    page = await browser.newPage();
+  }
+  const errors = [];
+  page.on('pageerror', error => errors.push(String(error)));
+  const editor = page.locator('[data-ace-rich-composer]');
+  const cdp = await page.context().newCDPSession(page);
+  const state = () => page.evaluate(() => {
+    const el = document.querySelector('[data-ace-rich-composer]');
+    const selection = getSelection();
+    const offset = nodeOffset => {
+      const range = document.createRange(); range.selectNodeContents(el);
+      range.setEnd(selection[nodeOffset+'Node'],selection[nodeOffset+'Offset']); return range.toString().length;
+    };
+    return {text:fixture.composer.current.value, dom:el.textContent,
+      model:composerProbe.editor.selection,
+      anchor:offset('anchor'),focus:offset('focus'),
+      pending:composerProbe.renderPendingRef.current,
+      focusCalls:window.focusCalls, composition:composerProbe.compositionState()};
+  });
+  const reset = async () => {
+    await page.goto(`http://127.0.0.1:${server.httpServer.address().port}/focus-selection`);
+    await editor.click(); await page.keyboard.press('End'); await page.waitForTimeout(150);
+    await page.evaluate(() => {window.focusCalls=0;});
+  };
+  const compose = text => cdp.send('Input.imeSetComposition',{text,selectionStart:text.length,selectionEnd:text.length});
+  const commit = text => cdp.send('Input.insertText',{text});
+  const outcomes=[];
+  for (const variant of ['normal','focus-before-composition','focus-during-composition','drag-then-focus',
+    'imperative-focus','selected-range', ...(native ? ['window-return'] : [])]) {
+    await reset();
+    if (variant==='window-return') {
+      await page.evaluate(()=>window.aceFocusTest('away'));
+      await page.waitForTimeout(80);
+      await page.evaluate(()=>window.aceFocusTest('return'));
+      await page.waitForTimeout(150);
+    }
+    if (variant==='drag-then-focus') await editor.dispatchEvent('dragstart',{dataTransfer:await page.evaluateHandle(()=>new DataTransfer())});
+    await page.keyboard.press('Home');
+    if (variant==='selected-range') {
+      await page.keyboard.press('Shift+ArrowRight');
+      await page.keyboard.press('Shift+ArrowRight');
+    }
+    if (variant==='focus-before-composition') {
+      await page.evaluate(()=>window.activate()); await page.waitForTimeout(40);
+    }
+    await compose('中文');
+    if (variant==='focus-during-composition'||variant==='drag-then-focus'||variant==='selected-range') await page.evaluate(()=>window.activate());
+    if (variant==='imperative-focus') await page.evaluate(()=>fixture.composer.current.focus());
+    await page.waitForTimeout(140);
+    const during=await state();
+    await commit('中文'); await page.waitForTimeout(150);
+    await page.keyboard.type('abc'); await page.waitForTimeout(150);
+    const after=await state();
+    outcomes.push({variant,during,after});
+    assert.equal(during.text,variant==='selected-range'?'il':'tail',variant+': activation must not commit the IME candidate');
+    assert.equal(during.composition.active,true,variant+': composition remains owned by the IME');
+    assert.equal(after.text,variant==='selected-range'?'中文abcil':'中文abctail',variant+': committed text must not duplicate or move');
+    assert.equal(after.anchor,5,variant+': visible caret follows the typed text');
+    assert.equal(after.focus,after.model.focus.offset,variant+': DOM caret matches Slate insertion point');
+  }
+  assert.deepEqual(errors,[]);
+  console.log(JSON.stringify({result:'passed',native:!!native,scenarios:outcomes.map(result=>result.variant)}));
+  if(native) await page.evaluate(()=>window.aceFocusTest('done',true,['caret diagnostic complete'])).catch(()=>{});
+} finally { await browser?.close(); native?.kill(); await server.close(); }
diff --git a/web/scripts/test-desktop-focus.mjs b/web/scripts/test-desktop-focus.mjs
new file mode 100644
index 000000000..922d3b534
--- /dev/null
+++ b/web/scripts/test-desktop-focus.mjs
@@ -0,0 +1,166 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { spawn } from 'node:child_process';
+import { createServer } from 'vite';
+
+const web = fileURLToPath(new URL('../', import.meta.url));
+const fixture = `
+import React, {useEffect, useRef, useState} from 'react';
+import {createRoot} from 'react-dom/client';
+import {RichComposer} from '/src/components/RichComposer.jsx';
+import {bindDesktopComposerAutoFocus} from '/src/lib/composerCaretRestore.js';
+import '/src/styles/globals.css';
+const sleep = ms => new Promise(resolve => setTimeout(resolve, ms));
+const events = [];
+for (const type of ['focus','blur','acecode:desktop-window-focus']) {
+  window.addEventListener(type, () => events.push([type, document.hasFocus(), document.activeElement?.outerHTML?.slice(0,100)]));
+}
+function App() {
+  const editor = useRef(null);
+  const [value, setValue] = useState('draft');
+  const [enabled, setEnabled] = useState(true);
+  useEffect(() => {
+    window.editor = editor;
+    window.setChatVisible = setEnabled;
+    return bindDesktopComposerAutoFocus({enabled,
+      onFocus: canFocus => editor.current?.focus({canFocus})});
+  }, [enabled]);
+  useEffect(() => {window.text = value;}, [value]);
+  return <main style={{padding:40}}>
+    <div data-ace-focus-region="terminal"><input id="terminal" aria-label="Terminal" /></div>
+    <button id="other">Other control</button>
+    {enabled && <RichComposer ref={editor} value={value} onChange={setValue} aria-label="Chat" />}
+  </main>;
+}
+createRoot(document.getElementById('root')).render(<App/>);
+window.activate = () => window.dispatchEvent(new Event('acecode:desktop-window-focus'));
+if (window.aceFocusTest) {
+  (async () => {
+    const checks = [];
+    try {
+      await sleep(600); await aceFocusTest('show'); await sleep(400);
+      for (const [name, operations] of [
+        ['window switch', ['away', 'return']],
+        ['minimize/restore', ['minimize', 'restore']],
+        ['maximize', ['maximize']],
+        ['unmaximize', ['unmaximize']],
+        ['hide/show', ['hide', 'show']],
+      ]) {
+        document.querySelector('#terminal').focus();
+        for (const op of operations) {await aceFocusTest(op); await sleep(250);}
+        const before = window.text;
+        if (document.activeElement?.getAttribute('data-ace-rich-composer') !== 'true')
+          throw new Error(name + ': composer not active ' + JSON.stringify({focused:document.hasFocus(),active:document.activeElement?.outerHTML?.slice(0,150),events}));
+        await aceFocusTest('type'); await sleep(100);
+        if (window.text !== before + 'Z') throw new Error(name + ': real keystroke missing: ' + window.text);
+        checks.push(name + ': real keyboard input passed');
+      }
+      editor.current.setSelectionRange(1, 3);
+      await sleep(80); await aceFocusTest('away'); await sleep(150);
+      const background = await aceDesktop_focusActiveWebview();
+      if (background.ok !== false) throw new Error('background window accepted focus');
+      await aceFocusTest('return'); await sleep(250);
+      if (window.getSelection().toString() !== 'ra') throw new Error('selection lost');
+      checks.push('background refusal and selection preservation passed');
+      const modal = document.createElement('div'); modal.setAttribute('role','dialog');
+      modal.innerHTML = '<input id="modal-input">'; document.body.append(modal);
+      modal.firstChild.focus(); await aceFocusTest('away'); await sleep(150);
+      await aceFocusTest('return'); await sleep(250);
+      if (document.activeElement !== modal.firstChild) throw new Error('modal focus stolen');
+      checks.push('modal protection passed');
+      await aceFocusTest('done', true, checks);
+    } catch (error) {await aceFocusTest('done', false, {checks, error: String(error)});}
+  })();
+}
+`;
+const virtual = path.join(web, '__desktop-focus-fixture.jsx').replaceAll('\\', '/');
+const server = await createServer({ root: web, logLevel: 'error',
+  server: { host: '127.0.0.1', port: 0, open: false, hmr: false },
+  plugins: [{ name: 'desktop-focus-fixture', enforce: 'pre',
+    resolveId(id) { return id === '/__desktop-focus-fixture.jsx' ? virtual : undefined; },
+    load(id) { return id.replaceAll('\\', '/') === virtual ? fixture : undefined; },
+    configureServer(vite) { vite.middlewares.use(async (req, res, next) => {
+      if (req.url !== '/focus-fixture') return next();
+      res.setHeader('Content-Type', 'text/html');
+      res.end(await vite.transformIndexHtml('/focus-fixture', '<!doctype html><html><body><div id="root"></div><script type="module" src="/__desktop-focus-fixture.jsx"></script></body></html>'));
+    }); },
+  }],
+});
+try {
+  await server.listen();
+  const url = `http://127.0.0.1:${server.httpServer.address().port}/focus-fixture`;
+  if (process.env.ACE_FOCUS_NATIVE_HOST) {
+    const profile = await fs.mkdtemp(path.join(os.tmpdir(), 'ace-focus-webview-'));
+    await new Promise((resolve, reject) => {
+      const child = spawn(process.env.ACE_FOCUS_NATIVE_HOST, [url], { windowsHide: true,
+        env: { ...process.env, WEBVIEW2_USER_DATA_FOLDER: profile }, stdio: 'inherit' });
+      const timer = setTimeout(() => {child.kill(); reject(new Error('Native focus test timed out'));}, 60000);
+      child.on('error', error => {clearTimeout(timer); reject(error);});
+      child.on('exit', code => {
+        clearTimeout(timer);
+        if (code === 77) { process.exitCode = 77; resolve(); }
+        else if (code === 0) resolve();
+        else reject(new Error(`Native focus test exit ${code}`));
+      });
+    });
+  } else {
+    const playwright = await import(process.env.ACE_PLAYWRIGHT_MODULE
+      ? pathToFileURL(path.resolve(process.env.ACE_PLAYWRIGHT_MODULE)).href : 'playwright');
+    for (const engine of ['chromium', 'webkit']) {
+      const browser = await playwright[engine].launch({headless: true});
+      try {
+        const page = await browser.newPage();
+        const errors = [];
+        page.on('pageerror', error => errors.push(error.message));
+        await page.goto(url);
+        const editor = page.locator('[data-ace-rich-composer="true"]');
+        await editor.click();
+        await page.keyboard.press('End');
+        await page.keyboard.type(' test');
+        await page.waitForTimeout(100);
+        await page.evaluate(() => {
+          window.nativeFocusCalls = 0;
+          window.aceDesktop_focusActiveWebview = async () => {
+            window.nativeFocusCalls += 1;
+            window.dispatchEvent(new Event('focus'));
+            return {ok: true};
+          };
+        });
+        await page.locator('#terminal').click();
+        await page.evaluate(() => window.activate());
+        await page.waitForTimeout(150);
+        await page.keyboard.type('Z');
+        assert.equal(await editor.innerText(), 'draft testZ');
+        assert.equal(await page.evaluate(() => window.nativeFocusCalls), 0, 'focused pages do not repeat the native focus handoff');
+        await page.evaluate(() => { delete window.aceDesktop_focusActiveWebview; });
+        await page.evaluate(() => window.editor.current.setSelectionRange(1, 3));
+        await page.waitForTimeout(40);
+        await page.locator('#other').focus();
+        await page.evaluate(() => window.activate());
+        await page.waitForTimeout(150);
+        assert.equal(await page.evaluate(() => window.getSelection().toString()), 'ra');
+        await page.keyboard.type('X');
+        assert.equal(await editor.innerText(), 'dXft testZ');
+        await page.evaluate(() => {
+          const modal = document.createElement('div'); modal.setAttribute('role','dialog');
+          modal.innerHTML = '<input id="modal-input">'; document.body.append(modal);
+          modal.firstChild.focus(); window.activate();
+        });
+        await page.waitForTimeout(150);
+        await page.keyboard.type('modal');
+        assert.equal(await page.locator('#modal-input').inputValue(), 'modal');
+        await page.evaluate(() => {
+          document.querySelector('[role="dialog"]').remove(); window.activate();
+          window.setChatVisible(false);
+        });
+        await page.waitForTimeout(150);
+        assert.equal(await editor.count(), 0);
+        assert.deepEqual(errors, []);
+        console.log(`[pass] ${engine}: keyboard input, terminal handoff, selection, modal, unmount`);
+      } finally { await browser.close(); }
+    }
+  }
+} finally { await server.close(); }
diff --git a/web/scripts/test-expert-pixel-avatars.mjs b/web/scripts/test-expert-pixel-avatars.mjs
new file mode 100644
index 000000000..2329af903
--- /dev/null
+++ b/web/scripts/test-expert-pixel-avatars.mjs
@@ -0,0 +1,95 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { createServer } from 'vite';
+
+const web = fileURLToPath(new URL('../', import.meta.url));
+const root = path.dirname(web.replace(/[\\/]$/, ''));
+const modulePath = process.env.ACE_PLAYWRIGHT_MODULE;
+const { chromium } = await import(modulePath ? pathToFileURL(path.resolve(modulePath)).href : 'playwright');
+const output = await fs.mkdtemp(path.join(os.tmpdir(), 'ace-pixel-avatars-'));
+const shared = await fs.readFile(path.join(root, 'assets/desktop_pet/office_characters.js'), 'utf8');
+const office = (await fs.readFile(path.join(root, 'assets/desktop_pet/agent_office_pet.html'), 'utf8'))
+  .replace('<script src="./office_characters.js"></script>', `<script>${shared}</script>`);
+const experts = [];
+for (const id of await fs.readdir(path.join(root, 'assets/seed/experts'))) {
+  const manifest = JSON.parse(await fs.readFile(path.join(root, 'assets/seed/experts', id, 'expert.json'), 'utf8'));
+  experts.push({ id, display_name: manifest.displayName, type: manifest.expertType,
+    references_existing_experts: !!manifest.teamInfo, lead_expert_id: manifest.teamInfo?.leadExpert });
+}
+const fixture = `
+import React from 'react';
+import {createRoot} from 'react-dom/client';
+import {ExpertAvatar} from '/src/components/ExpertCatalog.jsx';
+import {SubagentGroupBlock} from '/src/components/SubagentGroupBlock.jsx';
+import {expertAvatarIdentity,stableLook,stableSeed} from '/src/lib/officeCharacters.js';
+import '/src/styles/globals.css';
+const experts=${JSON.stringify(experts)};
+const member=experts.find(e=>e.id==='opc-value-designer');
+const identity=expertAvatarIdentity(member);
+window.avatarIdentity=identity;
+window.expectedLook=stableLook(stableSeed(identity));
+const task={id:'child',title:member.display_name,status:'running',expert:{avatar_identity:identity}};
+createRoot(document.getElementById('root')).render(<div className="p-5 text-fg bg-bg">
+  <div className="flex flex-wrap gap-4">{experts.map(e=><div key={e.id} className="flex flex-col items-center gap-1 text-xs">
+    <ExpertAvatar expert={e}/><span>{e.display_name}</span></div>)}</div>
+  <div className="mt-4"><SubagentGroupBlock agents={[{sessionId:'child',done:false}]}
+    tasksById={new Map([['child',task]])} messageAutoCollapse={false}/></div>
+  <div id="custom"><ExpertAvatar expert={{id:'custom',avatar_url:'/acecode-logo.png'}}/></div>
+  <iframe title="office" srcDoc={${JSON.stringify(office)}} style={{width:688,maxWidth:'100%',height:504,border:0}}/>
+</div>);
+`;
+const virtual = path.join(web, '__pixel-avatar-fixture.jsx').replaceAll('\\', '/');
+const server = await createServer({ root: web,
+  server: {host:'127.0.0.1',port:0,open:false,hmr:false},
+  plugins:[{name:'pixel-avatar-fixture',enforce:'pre',
+    resolveId(id){return id==='/__pixel-avatar-fixture.jsx'?virtual:undefined;},
+    load(id){return id.replaceAll('\\','/')===virtual?fixture:undefined;},
+    configureServer(vite){vite.middlewares.use(async(req,res,next)=>{
+      if(req.url!=='/avatar-fixture')return next();
+      res.setHeader('Content-Type','text/html');
+      res.end(await vite.transformIndexHtml('/avatar-fixture', '<!doctype html><html data-theme="light"><meta name="viewport" content="width=device-width, initial-scale=1"><body><div id="root"></div><script type="module" src="/__pixel-avatar-fixture.jsx"></script></body></html>'));
+    });}}],
+});
+let browser;
+const errors=[];
+try {
+  await server.listen();
+  browser=await chromium.launch({channel:'msedge',headless:true});
+  const page=await browser.newPage({viewport:{width:1100,height:850}});
+  page.on('pageerror',error=>errors.push(error.message));
+  await page.goto(`http://127.0.0.1:${server.httpServer.address().port}/avatar-fixture`);
+  await page.waitForFunction(()=>document.querySelectorAll('[data-pixel-avatar]').length===11);
+  await page.waitForFunction(()=>[...document.querySelectorAll('[data-pixel-avatar]')].every(canvas=>
+    canvas.getContext('2d').getImageData(0,0,14,14).data.some((value,index)=>index%4===3&&value>0)));
+  const identity=await page.evaluate(()=>window.avatarIdentity);
+  const pair=page.locator(`[data-pixel-avatar="${identity}"]`);
+  assert.equal(await pair.count(),2);
+  const pixels=await pair.evaluateAll(nodes=>nodes.map(c=>c.toDataURL()));
+  assert.equal(pixels[0],pixels[1], 'catalog and live child use identical portrait pixels');
+  assert.equal(await page.locator('#custom img').getAttribute('src'),'/acecode-logo.png');
+  assert.equal(await page.locator('#custom canvas').count(),0);
+  const frame=page.frames().find(f=>f!==page.mainFrame());
+  await frame.waitForFunction(()=>!!window.AgentOffice);
+  const seed=await page.evaluate(()=>globalThis.ACEOfficeCharacters.stableSeed(window.avatarIdentity));
+  await frame.evaluate(({identity,seed})=>AgentOffice.applySnapshot({version:1,connected:true,complete:true,offices:[],selected:{sessionId:'root'},agents:[
+    {id:'root',root:true,name:'主理人',seed,avatarIdentity:identity,state:'think',label:'思考中',transfers:[]},
+    {id:'child',root:false,name:'言之',seed,avatarIdentity:identity,state:'work',label:'工作中',transfers:[]},
+  ]}),{identity,seed});
+  const looks=await frame.evaluate(()=>AgentOffice.agents.map(a=>a.look));
+  assert.equal(looks.length,2);
+  assert.equal(looks[0],looks[1], 'expert-bound leader and worker use the same shared appearance');
+  const expected=await page.evaluate(()=>{const l=window.expectedLook;return [l.hair,l.skin,l.shirt,l.pants,l.acc.join('+'),l.accColor].join('|');});
+  assert.equal(looks[0],expected);
+  for(const [theme,width] of [['light',1100],['dark',520]]){
+    await page.setViewportSize({width,height:850});
+    await page.evaluate(value=>document.documentElement.dataset.theme=value,theme);
+    await page.waitForTimeout(300); // Finish the application's theme color transition.
+    assert.ok(await page.evaluate(()=>document.documentElement.scrollWidth<=innerWidth));
+    await page.screenshot({path:path.join(output,`pixel-avatars-${theme}.png`)});
+  }
+  assert.deepEqual(errors,[]);
+  console.log(JSON.stringify({output,checks:9,errors}));
+} finally {await browser?.close();await server.close();}
diff --git a/web/scripts/test-preview-presentation.mjs b/web/scripts/test-preview-presentation.mjs
index 3d91a18e5..2401200da 100644
--- a/web/scripts/test-preview-presentation.mjs
+++ b/web/scripts/test-preview-presentation.mjs
@@ -58,7 +58,7 @@ function Fixture(){
    maximized={p.sidePanelMaximized} presenting={active} onTogglePresentation={toggle}
    sidePanelListCollapsed={p.sidePanelListCollapsed} onToggleSidePanelList={()=>change('sidePanelListCollapsed')}
    onToggleMaximize={()=>change('sidePanelMaximized')} onHide={()=>setVisible(false)} onCloseTab={()=>setVisible(false)}
-   onEditFileTab={(_key,patch)=>setTab(t=>({...t,edit:{...t.edit,...patch}}))} />
+   onEditFileTab={(_key,patch)=>setTab(t=>{const edit={...t.edit,...patch};return {...t,edit:{...edit,dirty:String(edit.text??'')!==String(edit.baselineText??'')}};})} />
  </section>}
  {!p.sidePanelListCollapsed&&<aside id="right" style={{width:140}}>File list</aside>}
  </main>{dialog&&<div role="dialog">Blocking dialog</div>}<DesktopContextMenu/></>;
@@ -154,6 +154,13 @@ try {
  await page.getByRole('button',{name:'查看 Markdown 原文',exact:true}).click();await editor.waitFor();assert.match(await editor.inputValue(),/Draft stays\./);
  await page.getByRole('button',{name:'渲染 Markdown',exact:true}).click();await markdown.waitFor();
  console.log('[pass] Markdown WYSIWYG/source switches, scale and presentation retain unsaved content');
+ const savesBefore=await page.evaluate(()=>window.fixture.saves);
+ assert.deepEqual(await page.evaluate(async()=>{const {shortcutStore,captureShortcut}=await import('/src/lib/shortcutBindings.js');return shortcutStore().save('save',captureShortcut({code:'KeyG',ctrlKey:true,altKey:true}));}),{ok:true});
+ assert.equal(await page.evaluate(()=>window.fixture.tab.edit?.dirty),true,'fixture Markdown remains dirty before save');
+ await markdown.press('Control+s');await settle();assert.equal(await page.evaluate(()=>window.fixture.saves),savesBefore);
+ await markdown.press('Control+Alt+g');await page.waitForFunction(n=>window.fixture.saves===n+1,savesBefore);
+ await page.evaluate(async()=>{(await import('/src/lib/shortcutBindings.js')).shortcutStore().save('save',null);});
+ console.log('[pass] Markdown save uses the custom binding and retires Ctrl+S');
  await page.evaluate(()=>window.fixture.readonly());await page.locator('.ace-side-markdown-preview:not([contenteditable])').waitFor();
  await page.locator('.ace-side-markdown-preview').click({button:'right',position:{x:20,y:50}});await menu.getByRole('menuitem',{name:/全屏演示/}).waitFor();await page.keyboard.press('Escape');
  await page.evaluate(()=>window.fixture.diff());const diff=page.locator('.d2h-diff-table').first();await diff.waitFor();
@@ -166,6 +173,17 @@ try {
  await page.frameLocator('.ace-side-presentation-frame').locator('body').click({button:'right',position:{x:150,y:30}});await menu.getByRole('menuitem',{name:/全屏演示/}).click();await settle();assert.equal((await state()).active,true);await press();
  await page.evaluate(()=>window.dispatchEvent(new MessageEvent('message',{source:document.querySelector('iframe').contentWindow,data:{source:'acecode:presentation-preview',channel:'forged',status:'presentation'}})));await settle();assert.equal((await state()).active,false);
  console.log('[pass] real sandbox frame forwards Ctrl+F11 and context menu; forged channel is ignored');
+ await page.evaluate(async()=>{
+  window.savedPresentationFrame=document.querySelector('.ace-side-presentation-frame').contentWindow;
+  const {shortcutStore,captureShortcut}=await import('/src/lib/shortcutBindings.js');
+  shortcutStore().save('previewPresentation',captureShortcut({code:'KeyY',ctrlKey:true,altKey:true}));
+ });await settle();
+ await slide.focus();await press();assert.equal((await state()).active,false);
+ await page.keyboard.press('Control+Alt+y');await settle();assert.equal((await state()).active,true);
+ await slide.focus();await page.keyboard.press('Control+Alt+y');await settle();assert.equal((await state()).active,false);
+ assert.equal(await page.evaluate(()=>window.savedPresentationFrame===document.querySelector('.ace-side-presentation-frame').contentWindow),true);
+ await page.evaluate(async()=>{(await import('/src/lib/shortcutBindings.js')).shortcutStore().save('previewPresentation',null);});await settle();
+ console.log('[pass] live shortcut changes reach the existing sandbox frame without reloading slides');
  for(const p of ['picture.png','slides.pptx','error.txt','loading.txt']){
   await page.evaluate(p=>window.fixture.select(p),p);await settle();
   await page.locator('.ace-preview-details-body').click({button:'right',position:{x:15,y:15}});await menu.getByRole('menuitem',{name:/全屏演示/}).waitFor();await page.keyboard.press('Escape');
diff --git a/web/scripts/test-session-title-animation.mjs b/web/scripts/test-session-title-animation.mjs
new file mode 100644
index 000000000..6f8ce799c
--- /dev/null
+++ b/web/scripts/test-session-title-animation.mjs
@@ -0,0 +1,302 @@
+import assert from 'node:assert/strict';
+import { mkdtemp } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { spawn } from 'node:child_process';
+import { createServer, transformWithEsbuild } from 'vite';
+
+const web = fileURLToPath(new URL('../', import.meta.url));
+const { chromium } = await import(process.env.ACE_PLAYWRIGHT_MODULE
+  ? pathToFileURL(path.resolve(process.env.ACE_PLAYWRIGHT_MODULE)).href : 'playwright');
+const output = await mkdtemp(path.join(os.tmpdir(), 'ace-title-animation-'));
+const entry = `
+import React, {useState} from 'react';
+import {createRoot} from 'react-dom/client';
+import {flushSync} from 'react-dom';
+import {SessionTitleBar} from '/src/components/SessionTitleBar.jsx';
+import {SessionRow} from '/src/components/Sidebar.jsx';
+import {sessionDisplayTitle} from '/src/lib/sessionTitle.js';
+import '/src/styles/globals.css';
+function App() {
+  const [state, setState] = useState({id:'one', title:'新会话1', ready:true, portal:false, renaming:false});
+  const patch = values => flushSync(() => setState(s => ({...s, ...values})));
+  window.fixture = {patch};
+  const s = {id:state.id, workspace_hash:'workspace', title:state.title};
+  return <main style={{padding:16}}>
+    <div className="ace-topbar flex min-w-0 items-center justify-between" style={{height:36}}>
+      <div id="title-target" className="min-w-0"/><div id="actions-target"/>
+    </div>
+    <SessionTitleBar title={sessionDisplayTitle(s)} sessionRef={{sessionId:s.id, workspaceHash:'workspace', port:28080}}
+      titleReady={state.ready} workspaceLabel="ACECode" renaming={state.renaming}
+      titleTarget={state.portal ? document.getElementById('title-target') : null}
+      actionsTarget={state.portal ? document.getElementById('actions-target') : null}
+      onRenameCancel={() => patch({renaming:false})}
+      onRenameCommit={title => patch({title, renaming:false})}>
+      <button aria-label="Action">...</button>
+    </SessionTitleBar>
+    <aside className="bg-surface border border-edge rounded-md" style={{width:'min(270px, 100%)',marginTop:24}}>
+      <SessionRow key={s.id} s={s} active onSelect={() => {}} onTogglePin={() => {}}
+        onArchive={() => {}} onRename={(_session,title) => patch({title})}/>
+    </aside>
+  </main>;
+}
+createRoot(document.getElementById('root')).render(<App/>);
+if (window.aceFocusTest) {
+  (async () => {
+    const wait = ms => new Promise(resolve => setTimeout(resolve, ms));
+    try {
+      while (!window.fixture) await wait(20);
+      await aceFocusTest('show');
+      await wait(100);
+      const reducedMotion = matchMedia('(prefers-reduced-motion: reduce)').matches;
+      const read = () => [...document.querySelectorAll('.ace-session-title-transition')].map(el => ({
+        typing:el.dataset.titleTyping,
+        text:el.querySelector('.ace-session-title-typing')?.textContent,
+        visible:el.querySelector('.ace-session-title-typing')
+          ? getComputedStyle(el.querySelector('.ace-session-title-typing')).display !== 'none' : false,
+      }));
+      fixture.patch({title:'当前Windows设置下顶部和侧栏仍然同步逐字更新'});
+      await wait(80);
+      const partial = read();
+      if (partial.length !== 2 || partial.some(p => p.typing !== 'true' || !p.visible || p.text.length <= 1)
+        || partial[0].text !== partial[1].text) throw new Error(JSON.stringify(partial));
+      await wait(700);
+      if (document.querySelector('.ace-session-title-cursor')) throw new Error('Cursor remains after completion');
+      await aceFocusTest('done', true, {reducedMotion, partial, completedWithoutCursor:true, userAgent:navigator.userAgent});
+    } catch (error) { await aceFocusTest('done', false, {error:String(error)}); }
+  })();
+}
+`;
+const html = '<!doctype html><html><head><meta charset="UTF-8"/></head><body><div id="root"></div><script type="module" src="/@id/virtual:title-animation"></script></body></html>';
+const syncEntry = `
+import React, {useEffect, useState} from 'react';
+import {createRoot} from 'react-dom/client';
+import {SessionTitleBar} from '/src/components/SessionTitleBar.jsx';
+import {SessionRow} from '/src/components/Sidebar.jsx';
+import {useSessionTranscript} from '/src/lib/sessionTranscript.js';
+import {connection} from '/src/lib/connection.js';
+import '/src/styles/globals.css';
+const ref = {sessionId:'title-race', workspaceHash:'fixture', title:'原标题', active:true};
+const pending = [];
+const originalFetch = window.fetch;
+window.fetch = (url, options) => String(url).includes('/messages?')
+  ? new Promise(resolve => pending.push(data => resolve(new Response(JSON.stringify(data), {headers:{'Content-Type':'application/json'}}))))
+  : originalFetch(url, options);
+for (const key of ['reconfigure','retainSession','releaseSession']) connection[key] = () => {};
+window.fixture = {
+  resolve(index, data) { pending[index](data); },
+  count() { return pending.length; },
+  emit(type, seq, payload) { connection.dispatchEvent(new CustomEvent('message', {detail:{session_id:ref.sessionId,type,seq,payload}})); },
+};
+function App() {
+  const transcript = useSessionTranscript(ref, {live:true});
+  const [session, setSession] = useState({id:ref.sessionId, workspace_hash:'fixture', title:ref.title});
+  useEffect(() => {
+    const handler = e => { if (e.detail.type === 'session_updated') setSession(s => ({...s, ...e.detail.payload})); };
+    connection.addEventListener('message', handler);
+    return () => connection.removeEventListener('message', handler);
+  }, []);
+  return <main style={{padding:24}}>
+    <SessionTitleBar title={transcript.title} sessionRef={ref} titleReady={transcript.loadState === 'loaded'}/>
+    <aside style={{width:280,marginTop:24}}><SessionRow s={session} active onSelect={()=>{}} onTogglePin={()=>{}} onArchive={()=>{}}/></aside>
+  </main>;
+}
+createRoot(document.getElementById('root')).render(<App/>);
+`;
+const server = await createServer({
+  root: web, logLevel: 'error',
+  server: { host: '127.0.0.1', port: 0, open: false, hmr: false },
+  plugins: [{
+    name: 'title-animation-fixture', enforce: 'pre',
+    resolveId(id) { if (id === 'virtual:title-animation' || id === 'virtual:title-sync') return '\0' + id; },
+    async load(id) {
+      if (id === '\0virtual:title-animation') return (await transformWithEsbuild(entry, 'fixture.jsx', {loader:'jsx'})).code;
+      if (id === '\0virtual:title-sync') return (await transformWithEsbuild(syncEntry, 'sync-fixture.jsx', {loader:'jsx'})).code;
+    },
+    transform(code, id) {
+      // Exercise the actual private sidebar row without changing its production exports.
+      if (id.replaceAll('\\', '/').endsWith('/components/Sidebar.jsx')) return code + '\nexport { SessionRow };';
+    },
+    configureServer(vite) {
+      vite.middlewares.use('/title-sync', async (_req, res) => {
+        res.setHeader('Content-Type', 'text/html');
+        res.end(await vite.transformIndexHtml('/title-sync', html.replace('virtual:title-animation', 'virtual:title-sync')));
+      });
+      vite.middlewares.use('/title-animation', async (_req, res) => {
+        res.setHeader('Content-Type', 'text/html');
+        res.end(await vite.transformIndexHtml('/title-animation', html));
+      });
+    },
+  }],
+});
+let browser;
+try {
+  await server.listen();
+  if (process.env.ACE_TITLE_NATIVE_HOST) {
+    const profile = await mkdtemp(path.join(os.tmpdir(), 'ace-title-webview-'));
+    await new Promise((resolve, reject) => {
+      const child = spawn(process.env.ACE_TITLE_NATIVE_HOST,
+        [`http://127.0.0.1:${server.httpServer.address().port}/title-animation`],
+        {windowsHide:true, env:{...process.env, WEBVIEW2_USER_DATA_FOLDER:profile}, stdio:'inherit'});
+      const timer = setTimeout(() => { child.kill(); reject(new Error('Native title test timed out')); }, 30000);
+      child.on('error', error => {clearTimeout(timer); reject(error);});
+      child.on('exit', code => {clearTimeout(timer); code === 0 ? resolve() : reject(new Error('Native title test exit '+code));});
+    });
+  } else {
+    browser = await chromium.launch({headless:true, executablePath:process.env.ACE_CHROMIUM_EXECUTABLE || undefined});
+    const page = await browser.newPage({viewport:{width:1200,height:500}});
+    const errors = [];
+    page.on('pageerror', error => errors.push(String(error)));
+    await page.goto(`http://127.0.0.1:${server.httpServer.address().port}/title-animation`);
+    await page.waitForSelector('.ace-sidebar-session-title-content');
+    await page.clock.install({time:new Date('2026-10-11T00:00:00Z')});
+    await page.clock.pauseAt(new Date('2026-10-11T00:00:00Z'));
+    const patch = values => page.evaluate(values => window.fixture.patch(values), values);
+    const snapshot = () => page.evaluate(() => {
+      const top = document.querySelector('.ace-session-title .ace-session-title-transition');
+      const side = document.querySelector('aside .ace-session-title-transition');
+      const read = element => ({
+        typing:element.dataset.titleTyping,
+        full:element.querySelector('.ace-session-title-complete').textContent,
+        visible:element.querySelector('.ace-session-title-typing')?.textContent || element.textContent,
+        fullOpacity:getComputedStyle(element.querySelector('.ace-session-title-complete')).opacity,
+      });
+      return {top:read(top), side:read(side),
+        cursors:document.querySelectorAll('.ace-session-title-cursor').length,
+        workspaceX:document.querySelector('[data-session-workspace-label]').getBoundingClientRect().x,
+        marquee:getComputedStyle(document.querySelector('.ace-sidebar-session-title-content')).animationName,
+        overflow:document.documentElement.scrollWidth > innerWidth,
+      };
+    });
+    assert.equal((await snapshot()).cursors, 0);
+    const title = '会话标题更新时同步呈现快速打字效果';
+    await patch({title});
+    let frame = await snapshot();
+    assert.deepEqual(frame.top, frame.side);
+    assert.equal(frame.top.visible, '会');
+    assert.equal(frame.cursors, 2);
+    const cursorStyles = await page.locator('.ace-session-title-cursor').evaluateAll(elements => elements.map(el => {
+      const style = getComputedStyle(el);
+      return {color:style.backgroundColor, width:el.getBoundingClientRect().width, height:el.getBoundingClientRect().height};
+    }));
+    for (const cursor of cursorStyles) {
+      assert.equal(cursor.color, 'rgb(0, 0, 0)');
+      assert.ok(cursor.width >= 9 && Math.abs(cursor.width - cursor.height) < 1, JSON.stringify(cursor));
+    }
+    assert.equal(frame.top.fullOpacity, '0');
+    assert.equal(frame.side.fullOpacity, '0');
+    const x = frame.workspaceX;
+    await page.clock.runFor(160);
+    frame = await snapshot();
+    assert.deepEqual(frame.top, frame.side);
+    assert.ok(frame.top.visible.length > 1 && frame.top.visible.length < title.length);
+    assert.equal(frame.workspaceX, x);
+    await page.locator('aside').hover();
+    assert.equal((await snapshot()).marquee, 'none');
+    await page.screenshot({path:path.join(output,'desktop-typing.png')});
+    await patch({title});
+    assert.equal((await snapshot()).top.visible, frame.top.visible);
+    await page.clock.runFor(500);
+    frame = await snapshot();
+    assert.equal(frame.top.visible, title);
+    assert.equal(frame.cursors, 0);
+    assert.equal(frame.workspaceX, x);
+    assert.equal(frame.marquee, 'ace-sidebar-session-title-marquee');
+    await page.screenshot({path:path.join(output,'desktop-complete.png')});
+
+    await patch({title:'连续更新标题甲'});
+    await page.clock.runFor(70);
+    await patch({title:'连续更新标题乙'});
+    frame = await snapshot();
+    assert.deepEqual(frame.top, frame.side);
+    assert.equal(frame.top.full, '连续更新标题乙');
+    assert.equal(frame.top.visible, '连');
+    await patch({id:'two', title:'打开已有会话'});
+    assert.equal((await snapshot()).cursors, 0);
+    await page.clock.runFor(700);
+    assert.equal((await snapshot()).top.visible, '打开已有会话');
+
+    await patch({id:'three', title:'加载中', ready:false});
+    await patch({title:'历史加载后的完整标题', ready:true});
+    assert.equal((await snapshot()).top.typing, 'false');
+    await page.clock.runFor(700);
+    await patch({portal:true, title:'顶部窗口栏同样同步打字'});
+    await page.clock.runFor(100);
+    frame = await snapshot();
+    assert.deepEqual(frame.top, frame.side);
+    assert.equal(await page.locator('#title-target .ace-session-title-transition').count(), 1);
+    await patch({renaming:true});
+    assert.equal(await page.locator('[data-session-title-rename-input]').inputValue(), '顶部窗口栏同样同步打字');
+    await page.locator('[data-session-title-rename-input]').fill('手动修改后的会话标题');
+    await page.locator('[data-session-title-rename-input]').press('Enter');
+    await page.clock.runFor(50);
+    frame = await snapshot();
+    assert.deepEqual(frame.top, frame.side);
+    assert.equal(frame.top.full, '手动修改后的会话标题');
+    assert.equal(frame.cursors, 2);
+    await page.clock.runFor(700);
+
+    await page.setViewportSize({width:390,height:500});
+    await page.evaluate(() => { document.documentElement.dataset.theme = 'dark'; });
+    await patch({title:'窄屏上的较长会话标题也能保持布局稳定且正确截断'});
+    await page.clock.runFor(100);
+    frame = await snapshot();
+    assert.deepEqual(frame.top, frame.side);
+    assert.equal(frame.overflow, false);
+    await page.evaluate(() => document.getAnimations().filter(a => a instanceof CSSTransition).forEach(a => a.finish()));
+    await page.screenshot({path:path.join(output,'mobile-dark-typing.png')});
+    await page.emulateMedia({reducedMotion:'reduce'});
+    await page.clock.runFor(20);
+    assert.equal((await snapshot()).cursors, 2);
+    await page.clock.runFor(220);
+    assert.equal((await snapshot()).cursors, 0);
+    await patch({title:'减少动态效果时仍能看到标题逐字更新'});
+    await page.clock.runFor(100);
+    frame = await snapshot();
+    assert.deepEqual(frame.top, frame.side);
+    assert.ok(frame.top.visible.length > 1 && frame.top.visible.length < frame.top.full.length);
+    assert.equal(frame.top.fullOpacity, '0');
+    assert.equal(frame.cursors, 2);
+    assert.equal(await page.locator('.ace-session-title-typing').first().isVisible(), true);
+    await page.screenshot({path:path.join(output,'mobile-dark-reduced.png')});
+    await page.clock.runFor(230);
+    frame = await snapshot();
+    assert.equal(frame.top.visible, frame.top.full);
+    assert.equal(frame.cursors, 0);
+    assert.deepEqual(errors, []);
+    const syncPage = await browser.newPage({viewport:{width:1000,height:400}});
+    syncPage.on('pageerror', error => errors.push(String(error)));
+    await syncPage.route('**/diagnostics/**', route => route.fulfill({json:{ok:true}}));
+    await syncPage.goto(`http://127.0.0.1:${server.httpServer.address().port}/title-sync`);
+    await syncPage.waitForFunction(() => window.fixture?.count() === 1);
+    await syncPage.evaluate(() => fixture.resolve(0, {messages:[],events:[],title:'原标题',busy:true}));
+    await syncPage.waitForFunction(() => fixture.count() === 2);
+    await syncPage.clock.install({time:new Date('2026-10-12T00:00:00Z')});
+    await syncPage.clock.pauseAt(new Date('2026-10-12T00:00:00Z'));
+    await syncPage.evaluate(() => {
+      fixture.emit('token', 20, {text:'reply'});
+      fixture.emit('session_updated', 19, {title:'不用切换会话顶部就能更新',title_source:'generated'});
+    });
+    await syncPage.clock.runFor(100);
+    const syncTitles = await syncPage.locator('.ace-session-title-typing').allTextContents();
+    assert.equal(syncTitles.length, 2);
+    assert.equal(syncTitles[0], syncTitles[1]);
+    await syncPage.evaluate(() => fixture.resolve(1, {messages:[],events:[],title:'原标题',busy:false}));
+    await syncPage.clock.runFor(700);
+    assert.deepEqual(await syncPage.locator('.ace-session-title-complete').allTextContents(),
+      ['不用切换会话顶部就能更新', '不用切换会话顶部就能更新']);
+    assert.equal(await syncPage.locator('.ace-session-title-cursor').count(), 0);
+    await syncPage.screenshot({path:path.join(output,'title-sync-after-stale-history.png')});
+    await syncPage.close();
+    assert.deepEqual(errors, []);
+    console.log(JSON.stringify({result:'passed', output, scenarios:[
+      'synchronized progress', 'immediate cursor removal', 'stable layout', 'hover marquee pause/resume',
+      'duplicate updates', 'interruption', 'session switch', 'history load', 'portal title',
+      'rename input', 'mobile dark theme', 'live reduced motion', 'black square cursor', 'real transcript title ordering and stale history',
+    ]}));
+  }
+} finally {
+  await browser?.close();
+  await server.close();
+}
diff --git a/web/scripts/test-shortcut-editing.mjs b/web/scripts/test-shortcut-editing.mjs
new file mode 100644
index 000000000..7f7421026
--- /dev/null
+++ b/web/scripts/test-shortcut-editing.mjs
@@ -0,0 +1,290 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { createServer } from 'vite';
+
+// Real App/Settings/ChatView; all daemon requests and WebSockets are fixtures.
+const web = fileURLToPath(new URL('../', import.meta.url));
+const { chromium } = await import(process.env.ACE_PLAYWRIGHT_MODULE
+  ? pathToFileURL(path.resolve(process.env.ACE_PLAYWRIGHT_MODULE)).href : 'playwright');
+const output = await fs.mkdtemp(path.join(os.tmpdir(), 'ace-shortcut-editing-'));
+const server = await createServer({ root: web, configFile: path.join(web, 'vite.config.js'),
+  logLevel: 'error', server: { host: '127.0.0.1', port: 0 } });
+const channels = ['qq', 'weixin', 'feishu', 'dingtalk', 'telegram', 'discord', 'line'].map(platform => ({
+  platform, configured: false, enabled: false, state: 'disabled', contacts: [], pending: [], bindings: [],
+}));
+const sessions = [];
+const calls = [];
+const errors = [];
+const checks = [];
+const pass = (name) => { checks.push(name); console.log('[pass]', name); };
+const reasoning = { supported: true, default_enabled: true, supported_efforts: ['low', 'high', 'max'], default_effort: 'high' };
+const model = (effort = null) => ({ name: 'fixture', provider: 'openai', model: 'fixture-model',
+  reasoning: { ...reasoning, effort: effort || 'high' }, reasoning_effort: effort });
+const efforts = {};
+const drafts = {};
+let browser;
+let page;
+try {
+  await server.listen();
+  browser = await chromium.launch({ headless: true, executablePath: process.env.ACE_CHROMIUM_EXECUTABLE || undefined });
+  const browserContext = await browser.newContext({ viewport: { width: 1440, height: 900 } });
+  page = await browserContext.newPage();
+  page.setDefaultTimeout(15000);
+  page.on('pageerror', error => errors.push(error.message));
+  await page.context().addInitScript(() => {
+    window.keyRecords = [];
+    window.addEventListener('keydown', event => {
+      if (!event.ctrlKey && !event.metaKey) return;
+      const row = { code: event.code, key: event.key, alt: event.altKey, shift: event.shiftKey, composing: event.isComposing,
+        altGraph: event.getModifierState('AltGraph'), target: event.target.tagName,
+        overlays: [...document.querySelectorAll('[data-ace-native-overlay="blocking"]')].filter(el => el.getClientRects().length).map(el => el.outerHTML.slice(0, 100)) };
+      window.keyRecords.push(row);
+      setTimeout(() => { row.prevented = event.defaultPrevented; }, 0);
+    }, true);
+    localStorage.setItem('ace.locale', 'zh-CN');
+    class FixtureWebSocket extends EventTarget {
+      static OPEN = 1; static CLOSED = 3;
+      constructor() { super(); this.readyState = 1; setTimeout(() => this.dispatchEvent(new Event('open')), 0); }
+      send() {} close() { this.readyState = 3; }
+    }
+    window.WebSocket = FixtureWebSocket;
+    window.sentFrames = [];
+    FixtureWebSocket.prototype.send = data => {
+      try { window.sentFrames.push(JSON.parse(data)); }
+      catch { window.sentFrames.push({ terminalData: data }); }
+    };
+  });
+  await page.context().route('**/api/**', async route => {
+    const req = route.request();
+    const pathname = new URL(req.url()).pathname;
+    const body = req.postData() ? req.postDataJSON() : null;
+    calls.push({ path: pathname, method: req.method(), body });
+    const sid = pathname.match(/\/sessions\/([^/]+)/)?.[1];
+    let data = {};
+    if (pathname === '/api/health') data = { status: 'ok', cwd: 'C:/shortcut-fixture', version: 'fixture', console: { available: true } };
+    else if (pathname === '/api/channels') data = { platforms: channels };
+    else if (/\/channels\/[^/]+\/enabled$/.test(pathname)) {
+      const channel = channels.find(item => pathname.includes(`/${item.platform}/`));
+      Object.assign(channel, { enabled: body.enabled, state: body.enabled ? 'connected' : 'disabled' });
+      data = { platforms: channels };
+    } else if (/\/channels\/.*\/requests\//.test(pathname)) {
+      channels.find(item => pathname.includes(`/${item.platform}/`)).pending = [];
+      data = { platforms: channels };
+    } else if (pathname.endsWith('/sessions') && req.method() === 'POST') {
+      const session = { id: `shortcut-${sessions.length + 1}`, title: `Shortcut task ${sessions.length + 1}`,
+        created_at: '2026-10-07T08:00:00Z', cwd: 'C:/shortcut-fixture', model: 'fixture-model', provider: 'openai' };
+      sessions.push(session); data = { ...session, session_id: session.id };
+    } else if (pathname.endsWith('/sessions')) data = { sessions };
+    else if (pathname.endsWith('/draft')) {
+      if (req.method() === 'PUT') drafts[sid] = body;
+      data = drafts[sid] || { text: '' };
+    }
+    else if (pathname.endsWith('/reasoning')) { efforts[sid] = body.effort; data = model(body.effort); }
+    else if (pathname.endsWith('/model')) data = model(efforts[sid]);
+    else if (pathname.includes('/messages')) data = { messages: [], events: [], busy: false, status: 'idle' };
+    else if (pathname.includes('models')) data = { models: [model()], profiles: [model()], default_model: 'fixture' };
+    else if (pathname.includes('workspaces')) data = { workspaces: [] };
+    else if (pathname.includes('history')) data = { items: [], history: [] };
+    else if (pathname.includes('commands')) data = { commands: [] };
+    else if (pathname.includes('skills')) data = { skills: [] };
+    else if (pathname.includes('experts')) data = { experts: [] };
+    else if (pathname.includes('subagents')) data = { tasks: [] };
+    else if (pathname.includes('onboarding')) data = { dismissed: true, completed: true };
+    else if (pathname.endsWith('/api/pty') && req.method() === 'POST') data = { id: 'fixture-pty' };
+    await route.fulfill({ status: 200, contentType: 'application/json', body: JSON.stringify(data) });
+  });
+  await page.goto(`http://127.0.0.1:${server.httpServer.address().port}`, { waitUntil: 'networkidle' });
+  const recorder = page.locator('[data-shortcut-recorder]');
+  const settings = page.locator('[data-settings-window]');
+  const open = async () => {
+    await page.waitForFunction(() => ![...document.querySelectorAll('[data-ace-native-overlay="blocking"]')]
+      .some(el => el.getClientRects().length && !el.matches('[data-settings-mask]')));
+    await page.keyboard.press('Control+/');
+    await page.locator('[data-shortcut-search]').waitFor();
+  };
+  const edit = async id => {
+    await page.locator(`[data-edit-shortcut="${id}"]`).click();
+    await recorder.waitFor();
+    assert.equal(await recorder.evaluate(el => el === document.activeElement), true);
+  };
+  const save = async () => {
+    await page.getByRole('button', { name: '保存', exact: true }).click();
+    await recorder.waitFor({ state: 'detached' });
+  };
+  const assign = async (id, keys) => { await edit(id); await recorder.press(keys); await save(); };
+  const emit = async (type, payload, session_id) => page.evaluate(async ({ type, payload, session_id }) => {
+    const { connection } = await import('/src/lib/connection.js');
+    connection.dispatchEvent(new CustomEvent('message', { detail: { type, payload, session_id } }));
+  }, { type, payload, session_id });
+  await open();
+  assert.equal(await page.locator('[data-edit-shortcut]').count(), 21);
+  await edit('newSession');
+  await recorder.press('Control+Alt+j');
+  assert.equal(await recorder.inputValue(), 'Ctrl+Alt+J');
+  assert.equal(sessions.length, 0, 'recording never executes an action');
+  await page.getByRole('button', { name: '取消', exact: true }).click();
+  assert.match(await page.locator('[data-shortcut-id="newSession"]').innerText(), /Ctrl\s*Alt\s*N/);
+  await edit('newSession');
+  await recorder.press('Control+k');
+  await page.getByText(/此快捷键已用于“全局搜索”/).waitFor();
+  assert.equal(await page.getByRole('button', { name: '保存', exact: true }).isDisabled(), true);
+  await recorder.press('Control+c');
+  await page.getByText(/此组合键由系统/).waitFor();
+  await recorder.press('Control+Alt+j');
+  await save();
+  await page.keyboard.press('Escape');
+  await settings.waitFor({ state: 'detached' });
+  await page.keyboard.press('Control+Alt+n');
+  assert.equal(sessions.length, 0);
+  await page.keyboard.press('Control+Alt+j');
+  await page.waitForFunction(() => document.querySelector('.ace-topbar-session-title')?.textContent.includes('Shortcut task 1'));
+  await page.waitForLoadState('networkidle');
+  pass('every key has an edit icon; capture/cancel/conflict/reserved-key validation and live replacement');
+
+  await page.reload({ waitUntil: 'networkidle' });
+  await page.keyboard.press('Control+Alt+j');
+  await page.waitForFunction(() => document.querySelector('.ace-topbar-session-title')?.textContent.includes('Shortcut task 2'));
+  await page.waitForLoadState('networkidle');
+  await open();
+  await assign('search', 'Control+Alt+p');
+  await assign('console', 'Control+Alt+t');
+  await page.keyboard.press('Escape');
+  await settings.waitFor({ state: 'detached' });
+  await page.keyboard.press('Control+k');
+  assert.equal(await page.locator('[data-search-palette]').count(), 0);
+  await page.keyboard.press('Control+Alt+p');
+  await page.locator('[data-search-palette]').waitFor();
+  await page.keyboard.press('Control+Alt+p');
+  await page.locator('[data-search-palette]').waitFor({ state: 'detached' });
+  assert.equal(await page.locator('.ace-topbar button[title*="Ctrl+Alt+P"]').count(), 1);
+  const consoleButton = page.locator('.ace-topbar button[title*="Ctrl+Alt+T"]');
+  const beforeConsole = await consoleButton.getAttribute('aria-pressed');
+  await page.keyboard.press('Control+Backquote');
+  assert.equal(await consoleButton.getAttribute('aria-pressed'), beforeConsole);
+  if (beforeConsole === 'false') await page.keyboard.press('Control+Alt+t');
+  await page.getByRole('button', { name: '新建终端(默认 shell)', exact: true }).click();
+  await page.locator('.xterm-helper-textarea').waitFor({ state: 'attached' });
+  await page.locator('.xterm-helper-textarea').focus();
+  await page.keyboard.press('Control+Alt+p');
+  await page.locator('[data-search-palette]').waitFor();
+  await page.keyboard.press('Control+Alt+p');
+  await page.locator('[data-search-palette]').waitFor({ state: 'detached' });
+  await page.locator('.xterm-helper-textarea').focus();
+  await page.keyboard.press('Control+Alt+t');
+  assert.equal(await consoleButton.getAttribute('aria-pressed'), 'false');
+  pass('reload persistence, updated hints and remapped terminal forwarding');
+
+  await open();
+  const sibling = await page.context().newPage();
+  await sibling.goto(page.url(), { waitUntil: 'networkidle' });
+  await sibling.keyboard.press('Control+/');
+  await sibling.locator('[data-edit-shortcut="newSession"]').waitFor();
+  await assign('newSession', 'Control+Alt+u');
+  await sibling.waitForFunction(() => document.querySelector('[data-shortcut-id="newSession"]')?.textContent.includes('U'));
+  await sibling.close();
+  await edit('focusInput');
+  await recorder.press('Control+Alt+m');
+  await page.evaluate(() => {
+    window.restoreSetItem = Storage.prototype.setItem;
+    Storage.prototype.setItem = function(key, value) {
+      if (key === 'acecode.shortcuts.v1') throw new Error('fixture quota error');
+      return window.restoreSetItem.call(this, key, value);
+    };
+  });
+  await page.getByRole('button', { name: '保存', exact: true }).click();
+  await page.getByText('无法保存快捷键，请检查本地存储后重试。').waitFor();
+  await page.evaluate(() => { Storage.prototype.setItem = window.restoreSetItem; });
+  await page.getByRole('button', { name: '取消', exact: true }).click();
+  assert.match(await page.locator('[data-shortcut-id="focusInput"]').innerText(), /Ctrl\s*Alt\s*I/);
+  pass('other windows update immediately and failed storage writes keep old bindings');
+
+  await assign('send', 'Control+Alt+s');
+  await assign('newline', 'Control+Alt+Enter');
+  await assign('historyPrevious', 'Control+Alt+ArrowUp');
+  await assign('historyNext', 'Control+Alt+ArrowDown');
+  await assign('find', 'Control+Alt+f');
+  await assign('save', 'Control+Alt+g');
+  await page.keyboard.press('Escape');
+  await settings.waitFor({ state: 'detached' });
+  const composer = page.locator('[data-main-composer="true"] [contenteditable="true"]');
+  await page.keyboard.press('Control+Alt+i');
+  await composer.fill('Custom input');
+  const inputCalls = () => calls.filter(call => call.method === 'POST' && call.path.endsWith('/messages'));
+  const inputsBefore = inputCalls().length;
+  await page.keyboard.press('Enter');
+  assert.equal(inputCalls().length, inputsBefore);
+  await page.keyboard.type('second line');
+  await page.keyboard.press('Control+Alt+Enter');
+  await page.keyboard.type('third line');
+  assert.match(await composer.innerText(), /Custom input[\s\S]*second line[\s\S]*third line/);
+  const submitted = page.waitForResponse(response => response.request().method() === 'POST' && response.url().endsWith('/messages'));
+  await page.keyboard.press('Control+Alt+s');
+  await submitted;
+  assert.equal(inputCalls().length, inputsBefore + 1);
+  await emit('busy_changed', { busy: false }, 'shortcut-2');
+  await composer.fill('');
+  await page.keyboard.press('ArrowUp');
+  assert.ok(!(await composer.innerText()).includes('Custom input'));
+  await page.keyboard.press('Control+Alt+ArrowUp');
+  await page.waitForFunction(() => document.querySelector('[data-main-composer="true"] [contenteditable="true"]')?.textContent.includes('Custom input'));
+  await page.keyboard.press('Control+Alt+ArrowDown');
+  await page.keyboard.press('Control+f');
+  assert.equal(await page.getByPlaceholder('搜索当前对话内容').count(), 0);
+  await page.keyboard.press('Control+Alt+f');
+  await page.getByPlaceholder('搜索当前对话内容').waitFor();
+  await page.keyboard.press('Escape');
+  assert.equal(await page.evaluate(async () => {
+    const { isShortcut } = await import('/src/lib/shortcutBindings.js');
+    return !isShortcut({ key: 's', code: 'KeyS', ctrlKey: true }, 'save')
+      && isShortcut({ key: 'g', code: 'KeyG', ctrlKey: true, altKey: true }, 'save');
+  }), true);
+  pass('custom send, newline, both history keys, find and save matching');
+
+  await open();
+  await edit('dismiss');
+  await recorder.press('Escape');
+  assert.equal(await recorder.isVisible(), true, 'Escape is captured without dismissing the editor');
+  await recorder.press('Control+Alt+q');
+  await save();
+  await page.keyboard.press('Escape');
+  assert.equal(await settings.isVisible(), true);
+  await page.keyboard.press('Control+Alt+q');
+  await settings.waitFor({ state: 'detached' });
+  await open();
+  await edit('newSession');
+  await page.getByRole('button', { name: '恢复默认', exact: true }).click();
+  await recorder.waitFor({ state: 'detached' });
+  assert.match(await page.locator('[data-shortcut-id="newSession"]').innerText(), /Ctrl\s*Alt\s*N/);
+  assert.match(await page.locator('[data-shortcut-id="search"]').innerText(), /Ctrl\s*Alt\s*P/);
+  pass('custom dismissal and individual default restoration');
+
+  for (const [width, theme] of [[1440, 'light'], [420, 'dark']]) {
+    await page.setViewportSize({ width, height: 900 });
+    await page.evaluate(theme => document.documentElement.setAttribute('data-theme', theme), theme);
+    await page.locator('.ace-settings-content').evaluate(el => { el.scrollTop = 0; });
+    await page.screenshot({ path: path.join(output, `editable-shortcuts-${width}-${theme}.png`) });
+    await edit('newSession');
+    await recorder.press('Control+Alt+p');
+    await page.getByText(/此快捷键已用于/).waitFor();
+    await page.screenshot({ path: path.join(output, `shortcut-recorder-${width}-${theme}.png`) });
+    await page.getByRole('button', { name: '取消', exact: true }).click();
+  }
+  assert.deepEqual(errors, []);
+  await fs.writeFile(path.join(output, 'results.json'), JSON.stringify({ checks, errors }, null, 2));
+  console.log('Evidence:', output);
+} catch (error) {
+  await page?.screenshot({ path: path.join(output, 'failure.png') });
+  console.error('Runtime errors:', errors);
+  console.error('Keys:', await page?.evaluate(() => window.keyRecords.slice(-6)));
+  console.error('Frames:', await page?.evaluate(() => window.sentFrames.slice(-6)));
+  console.error('Writes:', calls.filter(call => call.method !== 'GET').slice(-8));
+  console.error('Page:', await page?.evaluate(() => document.body.innerText.slice(-1500)));
+  console.error('Evidence:', output);
+  throw error;
+} finally {
+  await browser?.close();
+  await server.close();
+}
diff --git a/web/scripts/test-skill-pagination.mjs b/web/scripts/test-skill-pagination.mjs
new file mode 100644
index 000000000..d2e0ba1bc
--- /dev/null
+++ b/web/scripts/test-skill-pagination.mjs
@@ -0,0 +1,158 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { createServer } from 'vite';
+
+const web = fileURLToPath(new URL('../', import.meta.url));
+const { chromium } = await import(process.env.ACE_PLAYWRIGHT_MODULE
+  ? pathToFileURL(path.resolve(process.env.ACE_PLAYWRIGHT_MODULE)).href : 'playwright');
+const output = await fs.mkdtemp(path.join(os.tmpdir(), 'ace-skill-pagination-'));
+const fixture = `
+import React from 'react';
+import {createRoot} from 'react-dom/client';
+import {SettingsPage} from '/src/components/SettingsPage.jsx';
+import {api} from '/src/lib/api.js';
+import {i18n} from '/src/i18n/index.js';
+import '/src/styles/globals.css';
+window.i18n=i18n;window.globalCount=2300;window.projectCount=123;window.listCalls=0;window.toggles=[];
+const enabled=new Map();
+const catalog=(count,source)=>Array.from({length:count},(_,i)=>{
+ const name=source+'-'+String(i).padStart(4,'0');
+ return {name,source,description:i===count-1?'needle':'Skill description '+i,enabled:enabled.get(name)??i%2===0};
+});
+Object.assign(api,{
+ listSkills:async workspace=>{window.listCalls++;return catalog(workspace?window.projectCount:window.globalCount,workspace?'project':'global');},
+ listWorkspaces:async()=>[{hash:'workspace',cwd:'C:/fixture',name:'Fixture workspace'}],
+ setSkillEnabled:async(name,value,workspace)=>{window.toggles.push({name,value,workspace});enabled.set(name,value);return {name,enabled:value};}
+});
+createRoot(document.getElementById('root')).render(<SettingsPage initialNavKey="skills" onClose={()=>{}}/>);
+`;
+const virtual = path.join(web, '__skill-pagination-fixture.jsx').replaceAll('\\', '/');
+const server = await createServer({ root: web, logLevel: 'error', server: { host: '127.0.0.1', port: 0, open: false, hmr: false },
+  plugins: [{ name: 'skill-pagination-fixture', enforce: 'pre',
+    resolveId(id) { return id === '/__skill-pagination-fixture.jsx' ? virtual : undefined; },
+    load(id) { return id.replaceAll('\\', '/') === virtual ? fixture : undefined; },
+    configureServer(vite) { vite.middlewares.use(async (req, res, next) => {
+      if (req.url !== '/skill-pagination-fixture') return next();
+      res.setHeader('Content-Type', 'text/html');
+      res.end(await vite.transformIndexHtml('/skill-pagination-fixture', '<!doctype html><html lang="zh-CN" data-theme="light"><meta name="viewport" content="width=device-width, initial-scale=1"><body><div id="root"></div><script type="module" src="/__skill-pagination-fixture.jsx"></script></body></html>'));
+    }); },
+  }],
+});
+let browser;
+const errors = [];
+const checks = [];
+const pass = (name) => { checks.push(name); console.log('[pass]', name); };
+try {
+  await server.listen();
+  browser = await chromium.launch({ headless: true, executablePath: process.env.ACE_CHROMIUM_EXECUTABLE || undefined });
+  const page = await browser.newPage({ viewport: { width: 1280, height: 900 } });
+  page.setDefaultTimeout(20000);
+  page.on('pageerror', error => errors.push(error.message));
+  await page.addInitScript(() => localStorage.setItem('ace.locale', 'zh-CN'));
+  const url = `http://127.0.0.1:${server.httpServer.address().port}/skill-pagination-fixture`;
+  await page.goto(url);
+  const globalList = page.locator('[data-skill-list="global"]');
+  const projectList = page.locator('[data-skill-list="workspace"]');
+  const cards = (list) => list.locator('[data-skill-card="true"]');
+  const top = (list) => list.locator('[data-skill-pagination="top"]');
+  const next = (list) => top(list).getByRole('button', { name: '下一页', exact: true });
+  const size = page.getByRole('combobox', { name: '每页条目数' });
+  const search = page.getByPlaceholder('搜索技能名称或描述...');
+  await cards(globalList).nth(49).waitFor();
+  assert.equal(await cards(globalList).count(), 50);
+  assert.equal(await size.inputValue(), '50');
+  assert.match(await top(globalList).innerText(), /2300/);
+  const initialCalls = await page.evaluate(() => window.listCalls);
+  pass('2,300 global skills render only the default 50 cards');
+
+  await next(globalList).focus();
+  await page.keyboard.press('Enter');
+  await globalList.getByText('global-0050', { exact: true }).waitFor();
+  const toggle = cards(globalList).first().getByRole('switch');
+  await toggle.click();
+  await page.waitForFunction(() => window.toggles.length === 1);
+  assert.equal(await toggle.getAttribute('aria-checked'), 'false');
+  assert.match(await cards(globalList).first().innerText(), /global-0050/);
+  await page.getByText('1149 / 2300 已启用', { exact: true }).waitFor();
+  pass('keyboard next page and toggle preserve page and full-catalog enabled count');
+
+  await page.getByRole('button', { name: /Fixture workspace/ }).first().click();
+  await cards(projectList).nth(49).waitFor();
+  await next(projectList).click();
+  await projectList.getByText('project-0050', { exact: true }).waitFor();
+  assert.match(await cards(globalList).first().innerText(), /global-0050/);
+  for (const pageSize of [20, 100]) {
+    await size.selectOption(String(pageSize));
+    await globalList.getByText('global-0000', { exact: true }).waitFor();
+    assert.equal(await cards(globalList).count(), pageSize);
+    assert.equal(await cards(projectList).count(), pageSize);
+    assert.match(await cards(projectList).first().innerText(), /project-0000/);
+  }
+  await next(projectList).click();
+  assert.equal(await cards(projectList).count(), 23);
+  assert.equal(await cards(globalList).count(), 100);
+  pass('global and workspace pages are independent; 20/100 reset both lists');
+
+  await search.fill('needle');
+  await globalList.getByText('global-2299', { exact: true }).waitFor();
+  await projectList.getByText('project-0122', { exact: true }).waitFor();
+  assert.equal(await cards(globalList).count(), 1);
+  assert.equal(await cards(projectList).count(), 1);
+  await search.fill('not-present');
+  await page.getByText('无匹配的全局技能', { exact: true }).waitFor();
+  assert.equal(await page.locator('[data-skill-card="true"]').count(), 0);
+  await search.fill('');
+  await globalList.getByText('global-0000', { exact: true }).waitFor();
+  assert.equal(await page.evaluate(() => window.listCalls), initialCalls);
+  pass('search finds off-page skills in both catalogs and page changes do not rescan');
+
+  await size.selectOption('50');
+  await next(globalList).click();
+  await next(globalList).click();
+  await next(projectList).click();
+  await page.evaluate(() => { window.globalCount = 70; window.projectCount = 60; });
+  await page.getByTitle('刷新技能列表', { exact: true }).click();
+  await page.waitForFunction(() => document.querySelectorAll('[data-skill-list="global"] [data-skill-card]').length === 20
+    && document.querySelectorAll('[data-skill-list="workspace"] [data-skill-card]').length === 10);
+  assert.match(await cards(globalList).first().innerText(), /global-0050/);
+  assert.match(await cards(projectList).first().innerText(), /project-0050/);
+  await page.evaluate(() => { window.globalCount = 150; window.projectCount = 111; });
+  await page.getByTitle('刷新技能列表', { exact: true }).click();
+  await cards(globalList).nth(49).waitFor();
+  assert.match(await cards(globalList).first().innerText(), /global-0050/);
+  pass('refresh clamps removed pages, retains workspace page and does not rebound after growth');
+
+  await size.selectOption('20');
+  await page.reload();
+  await cards(globalList).nth(19).waitFor();
+  assert.equal(await size.inputValue(), '20');
+  assert.equal(await cards(globalList).count(), 20);
+  await page.evaluate(() => localStorage.setItem('ace.skillsPageSize', '999'));
+  await page.reload();
+  await cards(globalList).nth(49).waitFor();
+  assert.equal(await size.inputValue(), '50');
+  await globalList.locator('[data-skill-pagination="bottom"]').getByRole('button', { name: '下一页', exact: true }).click();
+  await globalList.getByText('global-0050', { exact: true }).waitFor();
+  assert.equal(await top(globalList).evaluate((element) => document.activeElement === element), true);
+  pass('page size persists, invalid preferences fall back to 50, bottom navigation focuses the top');
+
+  for (const [theme, width] of [['light', 1280], ['dark', 480]]) {
+    await page.setViewportSize({ width, height: 900 });
+    await page.evaluate(theme => { document.documentElement.dataset.theme = theme; }, theme);
+    await top(globalList).scrollIntoViewIfNeeded();
+    assert.ok(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth));
+    await page.screenshot({ path: path.join(output, `pagination-${theme}-${width}.png`) });
+  }
+  await page.setViewportSize({ width: 1280, height: 900 });
+  await page.evaluate(() => window.i18n.changeLanguage('en-US'));
+  await page.getByRole('combobox', { name: 'Items per page' }).waitFor();
+  assert.match(await top(globalList).innerText(), /Page 2 \/ 46, 2300 items/);
+  assert.equal(await next(globalList).count(), 0);
+  await page.getByRole('button', { name: 'Next page', exact: true }).first().waitFor();
+  pass('responsive light/dark and English labels');
+  assert.deepEqual(errors, []);
+  console.log(JSON.stringify({ ok: true, checks, output }));
+} finally { await browser?.close(); await server.close(); }
diff --git a/web/scripts/test-skill-scan-paths.mjs b/web/scripts/test-skill-scan-paths.mjs
new file mode 100644
index 000000000..cb3aff778
--- /dev/null
+++ b/web/scripts/test-skill-scan-paths.mjs
@@ -0,0 +1,100 @@
+import assert from 'node:assert/strict';
+import fs from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { createServer } from 'vite';
+
+// Real settings components; API persistence/error responses are isolated fixtures.
+const web = fileURLToPath(new URL('../', import.meta.url));
+const { chromium } = await import(process.env.ACE_PLAYWRIGHT_MODULE
+  ? pathToFileURL(path.resolve(process.env.ACE_PLAYWRIGHT_MODULE)).href : 'playwright');
+const output = await fs.mkdtemp(path.join(os.tmpdir(), 'ace-skill-paths-'));
+const fixture = `
+import React from 'react';
+import {createRoot} from 'react-dom/client';
+import {SettingsPage} from '/src/components/SettingsPage.jsx';
+import {api} from '/src/lib/api.js';
+import {i18n} from '/src/i18n/index.js';
+import '/src/styles/globals.css';
+const defaults=['.acecode/skills','.agent/skills','.opencode/skills','.opencode/skill','.agents/skills','.claude/skills','~/.acecode/skills','~/.agent/skills','~/.config/opencode/skills','~/.config/opencode/skill','~/.opencode/skills','~/.opencode/skill','~/.agents/skills','~/.claude/skills','~/.cache/opencode/skills'];
+let config={paths:defaults,default_paths:defaults,customized:false};
+window.calls=[];window.i18n=i18n;
+Object.assign(api,{
+ listSkills:async()=>[],listWorkspaces:async()=>[],
+ getUpgradeConfig:async()=>({base_url:'https://example.invalid'}),
+ getToolchainConfig:async()=>({toolchains:[]}),
+ getTerminalConfig:async()=>({}),getDataDirectory:async()=>({effective_dir:'C:/fixture'}),
+ getSkillScanPaths:async()=>config,
+ setSkillScanPaths:async paths=>{window.calls.push(paths);if(window.failNext){window.failNext=false;throw new Error('fixture failure');}config={...config,paths:paths??defaults,customized:paths!==null};return config;}
+});
+createRoot(document.getElementById('root')).render(<SettingsPage initialNavKey="skills" onClose={()=>{}}/>);
+`;
+const virtual = path.join(web, '__skill-paths-fixture.jsx').replaceAll('\\', '/');
+const server = await createServer({ root: web, logLevel: 'error', server: { host: '127.0.0.1', port: 0, open: false, hmr: false },
+  plugins: [{ name: 'skill-paths-fixture', enforce: 'pre',
+    resolveId(id) { return id === '/__skill-paths-fixture.jsx' ? virtual : undefined; },
+    load(id) { return id.replaceAll('\\', '/') === virtual ? fixture : undefined; },
+    configureServer(vite) { vite.middlewares.use(async (req, res, next) => {
+      if (req.url !== '/skill-paths-fixture') return next();
+      res.setHeader('Content-Type', 'text/html');
+      res.end(await vite.transformIndexHtml('/skill-paths-fixture', '<!doctype html><html lang="zh-CN" data-theme="light"><meta name="viewport" content="width=device-width, initial-scale=1"><body><div id="root"></div><script type="module" src="/__skill-paths-fixture.jsx"></script></body></html>'));
+    }); },
+  }],
+});
+let browser;
+const errors = [];
+try {
+  await server.listen();
+  browser = await chromium.launch({ headless: true, executablePath: process.env.ACE_CHROMIUM_EXECUTABLE || undefined });
+  const page = await browser.newPage({ viewport: { width: 1280, height: 900 } });
+  page.setDefaultTimeout(20000);
+  page.on('pageerror', error => errors.push(error.message));
+  await page.addInitScript(() => localStorage.setItem('ace.locale', 'zh-CN'));
+  await page.goto(`http://127.0.0.1:${server.httpServer.address().port}/skill-paths-fixture`);
+  const link = page.getByRole('link', { name: '设置 Skill 扫描路径' });
+  await link.focus();
+  await page.keyboard.press('Enter');
+  const editor = page.locator('#skill-scan-paths');
+  await page.waitForFunction(() => document.activeElement?.id === 'skill-scan-paths');
+  assert.ok((await editor.inputValue()).includes('.agents/skills'));
+  assert.ok(await page.getByRole('button', { name: '保存路径', exact: true }).isDisabled());
+  await page.screenshot({ path: path.join(output, 'config-light.png') });
+  await editor.fill('.workspace-skills\n\n  C:/共享技能  \n~/.codex/skills');
+  await page.evaluate(() => { window.failNext = true; });
+  await page.getByRole('button', { name: '保存路径', exact: true }).click();
+  await page.getByText('保存 Skill 扫描路径失败：fixture failure', { exact: true }).waitFor();
+  assert.ok((await editor.inputValue()).includes('C:/共享技能'));
+  await page.getByRole('button', { name: '保存路径', exact: true }).click();
+  await page.getByText('已保存，技能扫描路径已更新', { exact: true }).waitFor();
+  assert.deepEqual(await page.evaluate(() => window.calls.at(-1)), ['.workspace-skills', 'C:/共享技能', '~/.codex/skills']);
+  await page.getByRole('button', { name: '技能', exact: true }).click();
+  await link.click();
+  await page.waitForFunction(() => document.activeElement?.id === 'skill-scan-paths');
+  assert.equal(await editor.inputValue(), '.workspace-skills\nC:/共享技能\n~/.codex/skills');
+  await editor.fill('');
+  await page.getByRole('button', { name: '保存路径', exact: true }).click();
+  await page.getByText('已保存，技能扫描路径已更新', { exact: true }).waitFor();
+  assert.deepEqual(await page.evaluate(() => window.calls.at(-1)), []);
+  await page.getByRole('button', { name: '恢复默认', exact: true }).click();
+  await page.waitForFunction(() => document.querySelector('#skill-scan-paths')?.value.includes('.agents/skills'));
+  assert.equal(await page.evaluate(() => window.calls.at(-1)), null);
+  assert.ok(await page.getByRole('button', { name: '恢复默认', exact: true }).isDisabled());
+  for (const width of [1280, 480]) {
+    await page.setViewportSize({ width, height: 900 });
+    await page.evaluate(() => { document.documentElement.dataset.theme = 'dark'; });
+    await editor.scrollIntoViewIfNeeded();
+    assert.ok(await page.evaluate(() => document.documentElement.scrollWidth <= innerWidth));
+    const box = await editor.boundingBox();
+    assert.ok(box.x >= 0 && box.x + box.width <= width);
+    await page.screenshot({ path: path.join(output, `config-dark-${width}.png`) });
+  }
+  await page.setViewportSize({ width: 1280, height: 900 });
+  await page.evaluate(() => window.i18n.changeLanguage('en-US'));
+  await page.getByRole('button', { name: 'Skills', exact: true }).click();
+  await page.getByRole('link', { name: 'Configure Skill scan paths' }).click();
+  await page.getByRole('textbox', { name: 'Skill scan paths', exact: true }).waitFor();
+  await page.screenshot({ path: path.join(output, 'config-english.png') });
+  assert.deepEqual(errors, []);
+  console.log(JSON.stringify({ ok: true, coverage: 'keyboard link/focus, loaded defaults, failure retains draft, retry, persistence across navigation, empty/reset, light/dark/narrow, English', output }));
+} finally { await browser?.close(); await server.close(); }
diff --git a/web/scripts/test-trajectory-turn-order.mjs b/web/scripts/test-trajectory-turn-order.mjs
new file mode 100644
index 000000000..7744ac474
--- /dev/null
+++ b/web/scripts/test-trajectory-turn-order.mjs
@@ -0,0 +1,144 @@
+import assert from 'node:assert/strict';
+import { mkdir } from 'node:fs/promises';
+import os from 'node:os';
+import path from 'node:path';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { createServer, transformWithEsbuild } from 'vite';
+
+// Exercise the real trajectory view with independent HTTP and stream delivery.
+const web = fileURLToPath(new URL('../', import.meta.url));
+const { chromium } = await import(process.env.ACE_PLAYWRIGHT_MODULE
+  ? pathToFileURL(path.resolve(process.env.ACE_PLAYWRIGHT_MODULE)).href : 'playwright');
+const entry = `
+import React, {useState} from 'react';
+import {createRoot} from 'react-dom/client';
+import {TrajectoryView} from '/src/components/trajectory/TrajectoryView.jsx';
+import {createTranscriptState, reduceTranscriptEvent} from '/src/lib/sessionTranscript.js';
+import '/src/styles/globals.css';
+let records = [], streamSequence = 0;
+const api = { async getTrajectory(_id, options) {
+  const incoming = options.tail ? records : records.filter(r => r.sequence > options.after);
+  const last = records.at(-1)?.sequence || 0;
+  window.fixture.servedSequence = last;
+  return { records: incoming, next_after:last, recorded_latest_sequence:last, legacy_total:1, legacy_next_after:1 };
+}};
+function App() {
+  const [session, setSession] = useState(0);
+  const [state, setState] = useState(createTranscriptState());
+  window.fixture = {
+    servedSequence: window.fixture?.servedSequence || 0,
+    reset(next) { records=next; setState(createTranscriptState()); setSession(n=>n+1); },
+    records(next) { records=next; },
+    emit(type, payload) { setState(s=>reduceTranscriptEvent(s,{type,payload,seq:++streamSequence}).state); },
+  };
+  return <TrajectoryView api={api} sessionId={'fixture-'+session} busy={state.busy} livePartial={state.trajectoryPartial}/>;
+}
+createRoot(document.getElementById('root')).render(<App/>);
+`;
+const html = `<!doctype html><html><head><meta charset="UTF-8"/></head><body>
+<div id="root" style="height:100vh;display:flex;flex-direction:column"></div>
+<script type="module" src="/@id/virtual:trajectory-turn-order"></script></body></html>`;
+const server = await createServer({
+  root: web, configFile: path.join(web, 'vite.config.js'), logLevel: 'error',
+  server: { host: '127.0.0.1', port: 0 },
+  plugins: [{
+    name: 'trajectory-turn-order-fixture',
+    resolveId(id) { if (id === 'virtual:trajectory-turn-order') return '\0virtual:trajectory-turn-order'; },
+    async load(id) {
+      if (id === '\0virtual:trajectory-turn-order') {
+        return (await transformWithEsbuild(entry, 'fixture.jsx', { loader: 'jsx' })).code;
+      }
+    },
+    configureServer(vite) {
+      vite.middlewares.use('/trajectory-turn-order', async (_req, res) => {
+        res.setHeader('Content-Type', 'text/html');
+        res.end(await vite.transformIndexHtml('/trajectory-turn-order', html));
+      });
+    },
+  }],
+});
+const records = [{ sequence: null, legacy_index: 0, type: 'legacy_context',
+  payload: { role: 'user', is_meta: true, content: 'request context' } }];
+for (let turn = 1; turn <= 7; turn += 1) {
+  for (const [type, payload] of [
+    ['message', { role: 'user', id: `user-${turn}`, content: `input ${turn}` }],
+    ['turn_start', { turn_id: `user-${turn}`, user_message_id: `user-${turn}` }],
+    ['model_step_start', { step_index: 1 }],
+    ['model_request', { step_index: 1, messages: [{ role: 'system', content: `prompt ${turn}` }] }],
+    ['model_response', { step_index: 1, content: `answer ${turn}` }],
+    ['turn_end', { turn_id: `user-${turn}` }],
+  ]) records.push({ sequence: records.length, timestamp_ms: 1000 + records.length, type, payload });
+}
+
+const errors = [];
+let browser;
+try {
+  await server.listen();
+  browser = await chromium.launch({ headless: true, executablePath: process.env.ACE_CHROMIUM_EXECUTABLE || undefined });
+  const page = await browser.newPage({ viewport: { width: 1440, height: 1000 } });
+  page.on('pageerror', error => errors.push(error.message));
+  await page.goto(`http://127.0.0.1:${server.httpServer.address().port}/trajectory-turn-order`);
+  await page.waitForFunction(() => !!window.fixture);
+  const reset = async next => {
+    await page.evaluate(next => window.fixture.reset(next), next);
+    await page.waitForFunction(last => window.fixture.servedSequence === last, next.at(-1)?.sequence || 0);
+    await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))));
+  };
+  const emit = async (type, payload) => {
+    await page.evaluate(({type,payload}) => window.fixture.emit(type,payload), {type,payload});
+    await page.evaluate(() => new Promise(resolve => requestAnimationFrame(resolve)));
+  };
+  const rows = () => page.locator('tr[data-kind]').evaluateAll(elements => {
+    let turn = 1;
+    return elements.map(row => {
+      const label = row.querySelector('[aria-label^="Turn "]')?.getAttribute('aria-label');
+      if (label) turn = Number(label.slice(5));
+      return { turn, kind: row.dataset.kind, text: row.getAttribute('aria-label'), requestOnly: !!row.dataset.requestOnly };
+    });
+  });
+  const assertTurns = async count => {
+    const labels = await page.locator('tr[data-kind] [aria-label^="Turn "]').evaluateAll(nodes => nodes.map(n => n.getAttribute('aria-label')));
+    assert.deepEqual(labels, Array.from({ length: count }, (_, i) => `Turn ${i + 1}`));
+    for (const row of await rows()) {
+      if (row.kind === 'user') assert.ok(row.text.endsWith(`input ${row.turn}`), JSON.stringify(row));
+    }
+  };
+  // Starting with context alone must not consume Turn 1.
+  await reset(records.slice(0, 1));
+  await emit('busy_changed', { busy: true, turn_id: 'user-1' });
+  await emit('model_step_start', { step_index: 1 });
+  await emit('token', { text: 'first live' });
+  await assertTurns(1);
+
+  // Restore six historical turns but leave the transcript's ordinal at zero.
+  // Stable turn identity must keep the seventh stream at the end of the ledger.
+  await reset(records.slice(0, 37));
+  await assertTurns(6);
+  await emit('busy_changed', { busy: true, turn_id: 'user-7' });
+  await emit('model_step_start', { step_index: 1 });
+  await emit('token', { text: 'seventh live' });
+  await assertTurns(7);
+  assert.ok((await rows()).at(-1).text.endsWith('seventh live'));
+  for (const end of [38, 39, 41, 42]) {
+    await page.evaluate(next => window.fixture.records(next), records.slice(0, end));
+    await page.waitForFunction(last => window.fixture.servedSequence === last, end - 1);
+    await page.evaluate(() => new Promise(resolve => requestAnimationFrame(() => requestAnimationFrame(resolve))));
+    await assertTurns(7);
+    const last = (await rows()).filter(row => !row.requestOnly).at(-1);
+    assert.equal(last.turn, 7);
+    assert.ok(last.text.endsWith(end === 42 ? 'answer 7' : 'seventh live'), JSON.stringify(last));
+  }
+  assert.equal((await rows()).filter(row => row.text.includes('seventh live')).length, 0);
+  await emit('busy_changed', { busy: false, turn_id: 'user-7' });
+  await assertTurns(7);
+
+  const output = path.resolve(process.env.ACE_TRAJECTORY_EVIDENCE_DIR || path.join(os.tmpdir(), 'ace-trajectory-turn-order'));
+  await mkdir(output, { recursive: true });
+  const screenshot = path.join(output, 'trajectory-turn-order.png');
+  await page.screenshot({ path: screenshot, fullPage: true });
+  assert.deepEqual(errors, []);
+  console.log(JSON.stringify({ result: 'passed', screenshot, scenarios: ['context-only first turn', 'seven ordered turns', 'stream before polling', 'input/start/request/response polling boundaries', 'completed partial deduplication'] }));
+} finally {
+  await browser?.close();
+  await server.close();
+}
diff --git a/web/scripts/test-virtual-office-preferences.mjs b/web/scripts/test-virtual-office-preferences.mjs
index 04d070f18..0ac9b834c 100644
--- a/web/scripts/test-virtual-office-preferences.mjs
+++ b/web/scripts/test-virtual-office-preferences.mjs
@@ -9,7 +9,9 @@ const web = fileURLToPath(new URL('../', import.meta.url));
 const modulePath = process.env.ACE_PLAYWRIGHT_MODULE;
 const { chromium } = await import(modulePath ? pathToFileURL(path.resolve(modulePath)).href : 'playwright');
 const output = await fs.mkdtemp(path.join(os.tmpdir(), 'ace-office-preferences-'));
-const html = await fs.readFile(new URL('../../assets/desktop_pet/agent_office_pet.html', import.meta.url), 'utf8');
+const characterScript = await fs.readFile(new URL('../../assets/desktop_pet/office_characters.js', import.meta.url), 'utf8');
+const html = (await fs.readFile(new URL('../../assets/desktop_pet/agent_office_pet.html', import.meta.url), 'utf8'))
+  .replace('<script src="./office_characters.js"></script>', `<script>${characterScript}</script>`);
 const fixture = `
 import React,{useState} from 'react';
 import {createRoot} from 'react-dom/client';
@@ -72,7 +74,8 @@ try {
   const toggle = page.getByRole('switch', { name: '开启虚拟办公室' });
   assert.equal(await toggle.getAttribute('aria-checked'), 'false');
   await page.getByRole('button', { name: 'ACECode 快捷菜单' }).click();
-  const labels = await page.getByRole('menuitem').allTextContents();
+  // Read labels separately from the shortcut badges added to menu items.
+  const labels = await page.getByRole('menuitem').locator('span.truncate').allTextContents();
   assert.ok(labels.indexOf('显示虚拟办公室') === labels.indexOf('设置') + 1);
   assert.ok(labels.indexOf('外观') === labels.indexOf('显示虚拟办公室') + 1);
   assert.equal(await page.getByRole('menuitem', { name: '显示虚拟办公室' }).locator('svg').count(), 1);
diff --git a/web/src/components/AnchoredMenu.jsx b/web/src/components/AnchoredMenu.jsx
index 8fff5f789..83966607e 100644
--- a/web/src/components/AnchoredMenu.jsx
+++ b/web/src/components/AnchoredMenu.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useLayoutEffect, useRef } from 'react';
 import { createPortal } from 'react-dom';
 import { anchoredMenuPosition } from '../lib/anchoredMenuPosition.js';
@@ -62,7 +63,7 @@ export function AnchoredMenu({ anchorRef, onClose, children, className = '', wid
       if (!menu.contains(event.target) && !anchor.contains(event.target)) closeRef.current?.();
     };
     const onKeyDown = (event) => {
-      if (event.key === 'Escape') {
+      if (isDismissShortcut(event)) {
         event.preventDefault();
         event.stopImmediatePropagation();
         closeRef.current?.();
diff --git a/web/src/components/ChatView.jsx b/web/src/components/ChatView.jsx
index bd42bfdd2..8001d09be 100644
--- a/web/src/components/ChatView.jsx
+++ b/web/src/components/ChatView.jsx
@@ -3092,9 +3092,9 @@ export function ChatView({ titleTarget, actionsTarget, children, sessionRef, ses
   useEffect(() => {
     return bindDesktopComposerAutoFocus({
       enabled: autoFocusOnDesktopWindowFocus,
-      onFocus: () => restoreChatInputFocusSoon(true),
+      onFocus: (canFocus) => inputRef.current?.focus({ canFocus }),
     });
-  }, [autoFocusOnDesktopWindowFocus, restoreChatInputFocusSoon]);
+  }, [autoFocusOnDesktopWindowFocus]);
 
   useLayoutEffect(() => {
     itemsRef.current = renderedItems;
@@ -4486,6 +4486,7 @@ export function ChatView({ titleTarget, actionsTarget, children, sessionRef, ses
   // ref → 已加载列表 → 会话 cwd 目录名 的顺序退让;WorkspaceRegistry 默认名就是
   // cwd 的目录名,因此没改过名的工作区第三级兜底与侧栏显示一致。
   const workspaceLabel = useMemo(() => {
+    if (ref?.noWorkspace || ref?.no_workspace) return '';
     const fromRef = String(ref?.workspaceName || ref?.workspace_name || '').trim();
     if (fromRef) return fromRef;
     if (isRealWorkspaceHash(sessionWorkspaceHash)) {
@@ -4494,7 +4495,7 @@ export function ChatView({ titleTarget, actionsTarget, children, sessionRef, ses
       if (name) return name;
     }
     return pathBaseName(ref?.cwd || health?.cwd || '') || '当前项目';
-  }, [health?.cwd, homeWorkspaces, ref?.cwd, ref?.workspaceName, ref?.workspace_name, sessionWorkspaceHash]);
+  }, [health?.cwd, homeWorkspaces, ref?.cwd, ref?.noWorkspace, ref?.no_workspace, ref?.workspaceName, ref?.workspace_name, sessionWorkspaceHash]);
   useEffect(() => () => closeDesktopContextMenu(), [sid]);
   const sessionPath = ref?.sessionPath || ref?.session_path || '';
   const sessionPinned = !!(ref?.pinned || ref?.isPinned || ref?.is_pinned);
@@ -5996,6 +5997,7 @@ export function ChatView({ titleTarget, actionsTarget, children, sessionRef, ses
       )}
       <SessionTitleBar titleTarget={titleTarget} actionsTarget={actionsTarget}
         title={title} workspaceLabel={workspaceLabel} remoteControlBound={remoteControlBound}
+        sessionRef={ref} titleReady={transcriptLoadState === 'loaded'}
         labelRef={sessionTitleLabelRef}
         renaming={headerRenaming && !!sid && !readOnlyExternalSession}
         onRenameCommit={commitHeaderRename}
diff --git a/web/src/components/ComposerSessionControls.jsx b/web/src/components/ComposerSessionControls.jsx
index b523e3a61..d7f2f9764 100644
--- a/web/src/components/ComposerSessionControls.jsx
+++ b/web/src/components/ComposerSessionControls.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { clsx } from '../lib/format.js';
 import { loadTier, loadTierTextClass } from '../lib/modelLoad.js';
@@ -251,7 +252,7 @@ export function ComposerSessionControls({
       if (!rootRef.current?.contains(event.target)) setOpenMenu('');
     };
     const onKeyDown = (event) => {
-      if (event.key === 'Escape') setOpenMenu('');
+      if (isDismissShortcut(event)) setOpenMenu('');
     };
     document.addEventListener('pointerdown', onPointerDown);
     document.addEventListener('keydown', onKeyDown);
diff --git a/web/src/components/ConsoleDock.jsx b/web/src/components/ConsoleDock.jsx
index bf602eec8..8bf613558 100644
--- a/web/src/components/ConsoleDock.jsx
+++ b/web/src/components/ConsoleDock.jsx
@@ -14,7 +14,7 @@ import { sessionWorkbench } from '../lib/sessionWorkbench.js';
 import { useWorkbenchState } from '../lib/useWorkbenchState.js';
 import { Terminal } from '@xterm/xterm';
 import { FitAddon } from '@xterm/addon-fit';
-import { matchAppShortcut } from '../lib/appShortcuts.js';
+import { matchAppShortcut, withAppShortcutHint } from '../lib/appShortcuts.js';
 import '@xterm/xterm/css/xterm.css';
 
 import { createApi } from '../lib/api.js';
@@ -712,7 +712,7 @@ export function ConsoleDock({ owner, open, height: preferredHeight, onHeightChan
           <button
             type="button"
             className="ace-console-iconbtn"
-            title="收起控制台 (Ctrl+`)"
+            title={withAppShortcutHint('收起控制台', 'console')}
             onClick={() => onToggle(false)}
           >
             <VsIcon name="close" size={14} />
diff --git a/web/src/components/DesktopContextMenu.jsx b/web/src/components/DesktopContextMenu.jsx
index 69ff374cc..15221b8a6 100644
--- a/web/src/components/DesktopContextMenu.jsx
+++ b/web/src/components/DesktopContextMenu.jsx
@@ -1,3 +1,5 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
+import { shortcutLabel } from '../lib/appShortcuts.js';
 import { Fragment, useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { flushSync } from 'react-dom';
 import {
@@ -601,7 +603,7 @@ export function DesktopContextMenu() {
     const onKeyDown = (event) => {
       const currentMenu = menuRef.current;
       if (!currentMenu) return;
-      if (event.key === 'Escape') {
+      if (isDismissShortcut(event)) {
         event.preventDefault();
         event.stopPropagation();
         close();
@@ -726,7 +728,7 @@ export function DesktopContextMenu() {
                   : <span className="ace-desktop-context-menu-icon-spacer" aria-hidden="true" />)}
                 <span>{actionLabel(action)}</span>
                 {action.id === DESKTOP_CONTEXT_ACTIONS.TOGGLE_PREVIEW_PRESENTATION && (
-                  <span className="ml-auto pl-4 text-fg-mute" aria-hidden="true">Ctrl+F11</span>
+                  <span className="ml-auto pl-4 text-fg-mute" aria-hidden="true">{shortcutLabel('previewPresentation')}</span>
                 )}
               </button>
             </Fragment>
diff --git a/web/src/components/DesktopGuidedTour.jsx b/web/src/components/DesktopGuidedTour.jsx
index 267be8fdb..6af4bb057 100644
--- a/web/src/components/DesktopGuidedTour.jsx
+++ b/web/src/components/DesktopGuidedTour.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Joyride } from 'react-joyride';
 import {
@@ -33,7 +34,7 @@ export function DesktopGuidedTour({ run, hasModel, onDismiss, onAbort }) {
   useEffect(() => {
     if (!run) return undefined;
     const dismissOnEscape = (event) => {
-      if (event.key !== 'Escape' || terminalHandledRef.current) return;
+      if (!isDismissShortcut(event) || terminalHandledRef.current) return;
       terminalHandledRef.current = true;
       event.preventDefault();
       event.stopPropagation();
diff --git a/web/src/components/ExpandedOverlay.jsx b/web/src/components/ExpandedOverlay.jsx
index 274aa8e0b..f4d3fa6e7 100644
--- a/web/src/components/ExpandedOverlay.jsx
+++ b/web/src/components/ExpandedOverlay.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // 点击宫格里的 MiniSession 后展开为完整会话覆盖层。
 // 接住整个主区,内嵌一个简化版 ChatView(直接重用 ChatView 组件,有 sessionId 即可)。
 //
@@ -27,7 +28,7 @@ export function ExpandedOverlay({ session, onClose }) {
 
   useEffect(() => {
     const onKeyDown = (event) => {
-      if (event.key !== 'Escape') return;
+      if (!isDismissShortcut(event)) return;
       event.preventDefault();
       close();
     };
diff --git a/web/src/components/ExpertCatalog.jsx b/web/src/components/ExpertCatalog.jsx
index ce75fdb37..d8bfbd757 100644
--- a/web/src/components/ExpertCatalog.jsx
+++ b/web/src/components/ExpertCatalog.jsx
@@ -12,13 +12,14 @@ import {
 import { clsx } from '../lib/format.js';
 import { Modal } from './Modal.jsx';
 import { VsIcon } from './Icon.jsx';
+import { PixelAvatar } from './PixelAvatar.jsx';
+import { expertAvatarIdentity } from '../lib/officeCharacters.js';
 
 export function ExpertAvatar({ expert, size = 36, className = '' }) {
   const [imageFailed, setImageFailed] = useState(false);
   const image = String(expert?.avatar_url || '');
   useEffect(() => setImageFailed(false), [image]);
-  const name = String(expert?.display_name || expert?.id || '专');
-  const initial = [...name][0] || '专';
+  const identity = expertAvatarIdentity(expert);
 
   return (
     <span
@@ -37,9 +38,7 @@ export function ExpertAvatar({ expert, size = 36, className = '' }) {
           onError={() => setImageFailed(true)}
         />
       ) : (
-        <span className="text-[13px] font-semibold">
-          {expert?.type === 'team' ? <VsIcon name="extension" size={Math.max(15, size / 2)} /> : initial}
-        </span>
+        <PixelAvatar identity={identity} size={size} />
       )}
     </span>
   );
diff --git a/web/src/components/ExpertComponentsPage.jsx b/web/src/components/ExpertComponentsPage.jsx
index 174ba80b1..e543d58cd 100644
--- a/web/src/components/ExpertComponentsPage.jsx
+++ b/web/src/components/ExpertComponentsPage.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useEffect, useRef, useState } from 'react';
 import { api } from '../lib/api.js';
 import {
@@ -34,7 +35,7 @@ export function ExpertComponentsPage({
       }
     };
     const handleKeyDown = (event) => {
-      if (event.key === 'Escape') {
+      if (isDismissShortcut(event)) {
         event.preventDefault();
         setCreationMenuOpen(false);
         creationMenuButtonRef.current?.focus();
diff --git a/web/src/components/FilePreviewContent.jsx b/web/src/components/FilePreviewContent.jsx
index 2b672ece7..392e9493c 100644
--- a/web/src/components/FilePreviewContent.jsx
+++ b/web/src/components/FilePreviewContent.jsx
@@ -1,4 +1,5 @@
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { isShortcut } from '../lib/shortcutBindings.js';
 import { useWorkbenchState } from '../lib/useWorkbenchState.js';
 import { useWorkbenchScroll } from '../lib/useWorkbenchScroll.js';
 import hljs from 'highlight.js/lib/core';
@@ -154,10 +155,7 @@ function HighlightedTextEditor({
       onCompositionEnd={() => setComposing(false)}
       onScroll={(event) => syncScroll(event.currentTarget)}
       onKeyDown={(event) => {
-        if (
-          (event.ctrlKey || event.metaKey)
-          && event.key.toLowerCase() === 's'
-        ) {
+        if (isShortcut(event, 'save')) {
           event.preventDefault();
           if (!event.isComposing && !event.nativeEvent?.isComposing && event.keyCode !== 229) {
             onSave?.();
diff --git a/web/src/components/GlobalFindOverlay.jsx b/web/src/components/GlobalFindOverlay.jsx
index 1d7163354..1ba6eff4b 100644
--- a/web/src/components/GlobalFindOverlay.jsx
+++ b/web/src/components/GlobalFindOverlay.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { VsIcon } from './Icon.jsx';
 import {
@@ -186,7 +187,7 @@ export function GlobalFindOverlay({
 
   const onInputKeyDown = (event) => {
     if (isComposingInputEvent(event, composingRef.current)) return;
-    if (event.key === 'Escape') {
+    if (isDismissShortcut(event)) {
       event.preventDefault();
       close();
     } else if (event.key === 'Enter') {
diff --git a/web/src/components/ImageLightbox.jsx b/web/src/components/ImageLightbox.jsx
index 5e0262135..bc833c8e6 100644
--- a/web/src/components/ImageLightbox.jsx
+++ b/web/src/components/ImageLightbox.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import {
@@ -89,7 +90,7 @@ export function ImageLightbox({ preview, onClose, contextMenuAttrs }) {
   useEffect(() => {
     if (!previewSource) return undefined;
     const onKeyDown = (event) => {
-      if (event.key !== 'Escape') return;
+      if (!isDismissShortcut(event)) return;
       event.preventDefault();
       event.stopPropagation();
       onClose?.();
diff --git a/web/src/components/InputBar.jsx b/web/src/components/InputBar.jsx
index a20a5be7d..de99fec17 100644
--- a/web/src/components/InputBar.jsx
+++ b/web/src/components/InputBar.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // 输入框:富文本 composer 自动撑高(最多 8 行) + Enter 发 / Shift+Enter 换行 +
 // 空输入或未编辑的历史项用上下键翻 history。
 //
@@ -964,7 +965,7 @@ export const InputBar = forwardRef(function InputBar({
   ]);
 
   useImperativeHandle(ref, () => ({
-    focus: () => ta.current?.focus(),
+    focus: (options) => ta.current?.focus(options),
     getElement: () => rootRef.current,
     getComposerContent: () => serializeComposerGoal(
       valueRef.current,
@@ -1181,7 +1182,7 @@ export const InputBar = forwardRef(function InputBar({
       items[nextExpertMenuItemIndex(event.key, currentIndex, items.length)]?.focus();
       return;
     }
-    if (event.key === 'ArrowLeft' || event.key === 'Escape') {
+    if (event.key === 'ArrowLeft' || isDismissShortcut(event)) {
       event.preventDefault();
       event.stopPropagation();
       closeExpertSubmenu(true);
@@ -1207,7 +1208,7 @@ export const InputBar = forwardRef(function InputBar({
       closeCapabilityMenu();
     };
     const onKeyDown = (event) => {
-      if (event.key !== 'Escape') return;
+      if (!isDismissShortcut(event)) return;
       if (expertSubmenuOpen) {
         // Mouse-opened submenus leave keyboard events with the editor.
         // Keyboard-opened submenus handle Escape on their focused menu item.
@@ -1280,6 +1281,7 @@ export const InputBar = forwardRef(function InputBar({
     // 这里只处理常规情况。
     if (shouldNavigateInputHistory({
       key: e.key,
+      code: e.code,
       value: draftValue,
       editedSinceHistory,
       historyLength: history.length,
@@ -1294,6 +1296,7 @@ export const InputBar = forwardRef(function InputBar({
       e.preventDefault();
       const next = getNextInputHistoryPointer({
         key: e.key,
+        code: e.code, altKey: e.altKey, ctrlKey: e.ctrlKey, metaKey: e.metaKey, shiftKey: e.shiftKey,
         historyLength: history.length,
         historyPointer: histPtr,
       });
@@ -1315,7 +1318,7 @@ export const InputBar = forwardRef(function InputBar({
         }
       }
       setEditedSinceHistory(false);
-      return;
+      return true;
     }
   };
 
diff --git a/web/src/components/MarkdownWysiwygEditor.jsx b/web/src/components/MarkdownWysiwygEditor.jsx
index eda3f2f3f..48090c013 100644
--- a/web/src/components/MarkdownWysiwygEditor.jsx
+++ b/web/src/components/MarkdownWysiwygEditor.jsx
@@ -1,3 +1,4 @@
+import { isShortcut } from '../lib/shortcutBindings.js';
 import {
   useCallback,
   useEffect,
@@ -335,7 +336,7 @@ export default function MarkdownWysiwygEditor({
   }, []);
 
   const handleKeyDown = useCallback((event) => {
-    if ((event.ctrlKey || event.metaKey) && event.key.toLowerCase() === 's') {
+    if (isShortcut(event, 'save')) {
       event.preventDefault();
       if (
         !disabled
diff --git a/web/src/components/Modal.jsx b/web/src/components/Modal.jsx
index d5087bdc6..1c19ade07 100644
--- a/web/src/components/Modal.jsx
+++ b/web/src/components/Modal.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // 共享 modal 容器:遮罩 + 居中 + 键盘约定。效率工具中的弹窗立即出现/关闭,
 // 不做进入/退出动画,也不延迟 onClose。
 // 不依赖 bootstrap modal,纯 Tailwind + 内联状态。
@@ -50,7 +51,7 @@ export function Modal({
       const dialog = dialogRef.current;
       const modalDialogs = [...document.querySelectorAll('[data-ace-modal-dialog="true"]')];
       if (!dialog || modalDialogs[modalDialogs.length - 1] !== dialog) return;
-      if (event.key === 'Escape') {
+      if (isDismissShortcut(event)) {
         // 输入法合成中的 Esc 只是取消候选词,不能把对话框一起关掉。
         if (event.isComposing || !dismissOnEscapeRef.current) return;
         event.stopImmediatePropagation();
@@ -117,7 +118,7 @@ export function SlideOver({ children, onClose, width = 380 }) {
 
   useEffect(() => {
     requestAnimationFrame(() => setShow(true));
-    const onKey = (e) => { if (e.key === 'Escape') handleClose(); };
+    const onKey = (e) => { if (isDismissShortcut(e)) handleClose(); };
     document.addEventListener('keydown', onKey);
     return () => document.removeEventListener('keydown', onKey);
     // eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/web/src/components/PathPickerModal.jsx b/web/src/components/PathPickerModal.jsx
index b90dc83c6..a75fbc4ee 100644
--- a/web/src/components/PathPickerModal.jsx
+++ b/web/src/components/PathPickerModal.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // Web 路径选择器弹窗(openspec add-web-path-picker):浏览 daemon 所在机器的文件系统,
 // 选一个目录(mode='folder')或文件(mode='file')。数据来自 /api/fs/roots 与 /api/fs/list,
 // 纯逻辑在 lib/pathPicker.js,Promise 形态的入口在 lib/pathPickerHost.js。
@@ -346,7 +347,7 @@ export function PathPickerModal({
     if (event.key === 'Enter') {
       event.preventDefault();
       void submitPath();
-    } else if (event.key === 'Escape') {
+    } else if (isDismissShortcut(event)) {
       event.preventDefault();
       event.stopPropagation();
       stopEdit();
diff --git a/web/src/components/PathReferenceDropdown.jsx b/web/src/components/PathReferenceDropdown.jsx
index 326caa031..105017b5b 100644
--- a/web/src/components/PathReferenceDropdown.jsx
+++ b/web/src/components/PathReferenceDropdown.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import {
   useCallback,
   useEffect,
@@ -71,7 +72,7 @@ export function PathReferenceDropdown({
 
   const onKey = useCallback((event) => {
     if (!shouldHandleComposerDropdownKey(event)) return;
-    if (event.key === 'Escape') {
+    if (isDismissShortcut(event)) {
       event.preventDefault();
       event.stopPropagation();
       onClose?.();
diff --git a/web/src/components/PixelAvatar.jsx b/web/src/components/PixelAvatar.jsx
new file mode 100644
index 000000000..72ecbb9ce
--- /dev/null
+++ b/web/src/components/PixelAvatar.jsx
@@ -0,0 +1,28 @@
+import { useEffect, useRef, useState } from 'react';
+import { characterSprite, stableLook, stableSeed } from '../lib/officeCharacters.js';
+
+export function PixelAvatar({ identity, size = 36 }) {
+  const ref = useRef(null);
+  useEffect(() => {
+    const canvas = ref.current;
+    if (!canvas) return;
+    const sprite = characterSprite(stableLook(stableSeed(identity)));
+    const context = canvas.getContext('2d');
+    context.clearRect(0, 0, 14, 14);
+    context.drawImage(sprite.cv, 0, 0, 14, 14, 0, 0, 14, 14);
+  }, [identity]);
+  return <canvas ref={ref} width={14} height={14} aria-hidden="true"
+    data-pixel-avatar={identity} className="shrink-0"
+    style={{ width: size, height: size, imageRendering: 'pixelated' }} />;
+}
+
+export function SessionPixelAvatar({ session, size = 24 }) {
+  const expert = session?.expert;
+  const [failedImage, setFailedImage] = useState('');
+  if (!expert?.avatar_identity) return null;
+  const image = expert.avatar_url;
+  return image && failedImage !== image
+    ? <img src={image} alt="" width={size} height={size} className="shrink-0 rounded object-cover"
+      onError={() => setFailedImage(image)} />
+    : <PixelAvatar identity={expert.avatar_identity} size={size} />;
+}
diff --git a/web/src/components/PresentationPreview.jsx b/web/src/components/PresentationPreview.jsx
index eb8685526..3babe603b 100644
--- a/web/src/components/PresentationPreview.jsx
+++ b/web/src/components/PresentationPreview.jsx
@@ -13,11 +13,14 @@ import {
   useOfficePreviewZoom,
 } from './OfficePreviewControls.jsx';
 import { VsIcon } from './Icon.jsx';
+import { effectiveShortcut, shortcutEventVariants } from '../lib/shortcutBindings.js';
+import { useShortcutPreferences } from '../lib/useShortcutPreferences.js';
 
 const RENDERER_READY_TIMEOUT_MS = 10_000;
 const rendererSource = presentationRendererSource(rawRendererSource);
 
 export function PresentationPreview({ blob, path }) {
+  const shortcutPreferences = useShortcutPreferences();
   const frameRef = useRef(null);
   const shellRef = useRef(null);
   const [frameRevision, setFrameRevision] = useState(0);
@@ -57,8 +60,9 @@ export function PresentationPreview({ blob, path }) {
       const message = presentationPreviewMessage(event, frameWindow, channel);
       if (!message || cancelled) return;
       if (message.status === 'presentation') {
+        const [binding] = shortcutEventVariants(effectiveShortcut('previewPresentation'));
         frameRef.current?.dispatchEvent(new KeyboardEvent('keydown', {
-          key: 'F11', code: 'F11', ctrlKey: true, bubbles: true, cancelable: true,
+          ...binding, bubbles: true, cancelable: true,
         }));
         return;
       }
@@ -87,6 +91,9 @@ export function PresentationPreview({ blob, path }) {
         return;
       }
       if (message.status !== 'ready' || rendering) return;
+      postPresentationPreviewMessage(frameWindow, channel, 'shortcuts', {
+        keys: shortcutEventVariants(effectiveShortcut('previewPresentation')),
+      });
       rendering = true;
       window.clearTimeout(timeoutId);
       try {
@@ -115,6 +122,12 @@ export function PresentationPreview({ blob, path }) {
     };
   }, [blob, channel, frameRevision, setZoom]);
 
+  useEffect(() => {
+    postPresentationPreviewMessage(frameRef.current?.contentWindow, channel, 'shortcuts', {
+      keys: shortcutEventVariants(effectiveShortcut('previewPresentation')),
+    });
+  }, [channel, frameRevision, shortcutPreferences]);
+
   useEffect(() => {
     if (status !== 'complete') return;
     postPresentationPreviewMessage(
diff --git a/web/src/components/PreviewDetailsPanel.jsx b/web/src/components/PreviewDetailsPanel.jsx
index 86fb2a705..584bd6c78 100644
--- a/web/src/components/PreviewDetailsPanel.jsx
+++ b/web/src/components/PreviewDetailsPanel.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { useWorkbenchState } from '../lib/useWorkbenchState.js';
@@ -97,7 +98,7 @@ function PreviewAddMenu({
       onClose?.();
     };
     const handleKeyDown = (event) => {
-      if (event.key === 'Escape') {
+      if (isDismissShortcut(event)) {
         event.preventDefault();
         onClose?.();
         anchorRef.current?.focus();
diff --git a/web/src/components/QuestionPicker.jsx b/web/src/components/QuestionPicker.jsx
index 53fc0045c..b8b44fe27 100644
--- a/web/src/components/QuestionPicker.jsx
+++ b/web/src/components/QuestionPicker.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // AskUserQuestion 内联 picker:停靠在输入框位置(替换 composer 输入区)。
 // 支持单选 / 多选 / 自定义答案 / 多题导航 / 折叠 / 复制 / Enter 快捷键。
 
@@ -237,7 +238,7 @@ export function QuestionPicker({ request, onResolve, originLabel = '', className
     const withCtrl = event.ctrlKey || event.metaKey;
     const ctrlEnter = withCtrl && event.key === 'Enter';
 
-    if (event.key === 'Escape') {
+    if (isDismissShortcut(event)) {
       event.preventDefault();
       if (event.repeat) return;
       if (inTextInput) {
diff --git a/web/src/components/RichComposer.jsx b/web/src/components/RichComposer.jsx
index 9d6a71f39..c32834aea 100644
--- a/web/src/components/RichComposer.jsx
+++ b/web/src/components/RichComposer.jsx
@@ -1,3 +1,4 @@
+import { composerShortcutAction, shortcutEventConsumed } from '../lib/shortcutBindings.js';
 import {
   forwardRef,
   useCallback,
@@ -1151,16 +1152,21 @@ function RichComposerShell({
 
   useImperativeHandle(ref, () => ({
     beginFileTransfer,
-    focus() {
+    focus({ canFocus } = {}) {
       const focusEditor = () => {
+        if (canFocus && !canFocus()) return true;
         if (!editableRef.current?.isConnected) return true;
+        // Native IME owns its live DOM range until compositionend has settled.
+        // Restoring focus here can commit a candidate or reinstall a stale caret.
+        if (compositionStateRef.current.active || compositionStateRef.current.settling
+          || ReactEditor.isComposing(editor)) return true;
         if (!editor.selection) {
           const end = latestTextRef.current.length;
           Transforms.select(editor, composerSelectionFromPlainTextRange(editor.children, end, end));
         }
         // Slate schedules its own timer when operations are pending. That
         // timer's later DOM lookup would escape our catch or outlive this input.
-        if (editor.operations.length > 0) return false;
+        if (editor.operations.length > 0 || renderPendingRef.current) return false;
         ReactEditor.focus(editor);
         return true;
       };
@@ -1305,8 +1311,7 @@ function RichComposerShell({
 
     // Deletes, tag navigation and parent shortcuts all read editor.selection.
     adoptDomSelection();
-    onKeyDown?.(event);
-    if (event.defaultPrevented) return;
+    if (onKeyDown?.(event) === true || shortcutEventConsumed(event)) return;
     if (disabled) {
       event.preventDefault();
       return;
@@ -1334,18 +1339,12 @@ function RichComposerShell({
       }
     }
 
-    if (event.key === 'Enter' && submitOnEnter) {
-      if (event.ctrlKey && isDesktopShell()) {
-        event.preventDefault();
-        editor.insertBreak();
-        return;
-      }
-
-      if (!event.shiftKey) {
-        event.preventDefault();
-        onSubmit?.();
-        return;
-      }
+    const shortcutAction = submitOnEnter && composerShortcutAction(event, isDesktopShell());
+    if (shortcutAction) {
+      event.preventDefault();
+      if (shortcutAction === 'newline') editor.insertBreak();
+      else if (shortcutAction === 'send' && !event.repeat) onSubmit?.();
+      return;
     }
 
     if (
diff --git a/web/src/components/SearchPalette.jsx b/web/src/components/SearchPalette.jsx
index 8a37db590..d0fe7e4eb 100644
--- a/web/src/components/SearchPalette.jsx
+++ b/web/src/components/SearchPalette.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // 全局会话搜索面板:服务端增量目录 + 有界正文短批次。
 // 每次打开/查询都有独立 request_id；本地 AbortController 与服务端取消
 // 同时执行，因此 Esc、关闭按钮、遮罩、查询替换和卸载都能真正停止工作。
@@ -366,7 +367,7 @@ export function SearchPalette({
 
   const onRootKeyDown = useCallback((event) => {
     const total = items.length;
-    if (event.key === 'Escape') {
+    if (isDismissShortcut(event)) {
       event.preventDefault();
       event.stopPropagation();
       closePalette();
diff --git a/web/src/components/SelectionActionPopover.jsx b/web/src/components/SelectionActionPopover.jsx
index a05357cb0..180f0f5a7 100644
--- a/web/src/components/SelectionActionPopover.jsx
+++ b/web/src/components/SelectionActionPopover.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { MAX_SELECTION_ANNOTATION_CHARS } from '../lib/selectionChatContext.js';
@@ -109,7 +110,7 @@ export function SelectionActionPopover({
               if (error) setError('');
             }}
             onKeyDown={(event) => {
-              if (event.key === 'Escape') {
+              if (isDismissShortcut(event)) {
                 event.preventDefault();
                 onCancel?.();
               } else if (event.key === 'Enter' && !event.shiftKey) {
diff --git a/web/src/components/SessionNavigationMask.jsx b/web/src/components/SessionNavigationMask.jsx
index 355d4d1fe..b1e793c67 100644
--- a/web/src/components/SessionNavigationMask.jsx
+++ b/web/src/components/SessionNavigationMask.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useTranslation } from 'react-i18next';
 
 export function SessionNavigationMask({ open = false, onCancel }) {
@@ -12,7 +13,7 @@ export function SessionNavigationMask({ open = false, onCancel }) {
   // 这层遮罩吞掉全部指针与键盘输入,一旦上游没能收尾就等于界面死锁。
   // Esc 是用户手里最后一个不依赖任何网络往返的出口。
   const onKeyDown = (event) => {
-    if (event.key === 'Escape' && typeof onCancel === 'function') {
+    if (isDismissShortcut(event) && typeof onCancel === 'function') {
       event.preventDefault();
       event.stopPropagation();
       onCancel();
diff --git a/web/src/components/SessionTitleBar.jsx b/web/src/components/SessionTitleBar.jsx
index 575c01ad2..1b6fdc4b6 100644
--- a/web/src/components/SessionTitleBar.jsx
+++ b/web/src/components/SessionTitleBar.jsx
@@ -1,8 +1,11 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import { VsIcon } from './Icon.jsx';
 import { tr } from '../i18n/index.js';
 import { SESSION_HEADER_CONTEXT_MENU_DELEGATE } from '../lib/desktopContextMenu.js';
+import { useSessionTitleAnimation } from '../lib/useSessionTitleAnimation.js';
+import { SessionTitleText } from './SessionTitleText.jsx';
 
 // 顶栏「重命名」就地编辑:Enter / 失焦提交,Esc 放弃;输入法合成中的 Enter 不提交。
 // 挂载时全选原标题,直接输入即替换。
@@ -29,7 +32,7 @@ function SessionTitleRenameInput({ title, onCommit, onCancel }) {
         if (e.key === 'Enter') {
           e.preventDefault();
           finish(true);
-        } else if (e.key === 'Escape') {
+        } else if (isDismissShortcut(e)) {
           e.preventDefault();
           e.stopPropagation();
           finish(false);
@@ -45,6 +48,8 @@ export function SessionTitleBar({
   titleTarget,
   actionsTarget,
   title,
+  sessionRef,
+  titleReady = true,
   workspaceLabel,
   remoteControlBound,
   renaming = false,
@@ -53,6 +58,7 @@ export function SessionTitleBar({
   labelRef,
   children,
 }) {
+  const titleAnimation = useSessionTitleAnimation(sessionRef, title, titleReady);
   const label = (
     <div ref={labelRef} className="ace-session-title flex items-center gap-2 min-w-0">
       <span className="ace-session-title-text flex min-w-0 items-center gap-1.5">
@@ -63,13 +69,17 @@ export function SessionTitleBar({
         {renaming ? (
           <SessionTitleRenameInput title={title} onCommit={onRenameCommit} onCancel={onRenameCancel} />
         ) : (
-          <span className="text-[13px] font-semibold text-fg truncate" title={title}>{title}</span>
+          <span className="text-[13px] font-semibold text-fg truncate" title={title}>
+            <SessionTitleText title={title} animation={titleAnimation} />
+          </span>
         )}
       </span>
-      <span className="ace-session-workspace shrink-0 px-2.5 py-0.5 rounded-full text-[10px] font-medium border bg-surface-hi text-fg-mute border-transparent"
-        title={workspaceLabel} data-session-workspace-label="true">
-        {workspaceLabel}
-      </span>
+      {workspaceLabel && (
+        <span className="ace-session-workspace shrink-0 px-2.5 py-0.5 rounded-full text-[10px] font-medium border bg-surface-hi text-fg-mute border-transparent"
+          title={workspaceLabel} data-session-workspace-label="true">
+          {workspaceLabel}
+        </span>
+      )}
     </div>
   );
   const actions = <div className="ace-session-title-actions flex items-center gap-1 shrink-0">{children}</div>;
diff --git a/web/src/components/SessionTitleText.jsx b/web/src/components/SessionTitleText.jsx
new file mode 100644
index 000000000..f103ae7fb
--- /dev/null
+++ b/web/src/components/SessionTitleText.jsx
@@ -0,0 +1,14 @@
+// The complete title reserves width and remains available to assistive technology.
+export function SessionTitleText({ title, animation }) {
+  const typing = Boolean(animation?.typing);
+  return (
+    <span className="ace-session-title-transition" data-title-typing={typing ? 'true' : 'false'}>
+      <span className="ace-session-title-complete">{title}</span>
+      {typing && (
+        <span className="ace-session-title-typing" aria-hidden="true">
+          {animation.text}<span className="ace-session-title-cursor" />
+        </span>
+      )}
+    </span>
+  );
+}
diff --git a/web/src/components/SettingsConfigSection.jsx b/web/src/components/SettingsConfigSection.jsx
index b00c557d7..4e930e39c 100644
--- a/web/src/components/SettingsConfigSection.jsx
+++ b/web/src/components/SettingsConfigSection.jsx
@@ -7,6 +7,7 @@ import {
 import { desktopUpdateRestartAvailable, requestDesktopUpdateRestart } from '../lib/updateJob.js';
 import { VsIcon } from './Icon.jsx';
 import { Modal } from './Modal.jsx';
+import { SkillScanPathsSettings } from './SkillScanPathsSettings.jsx';
 
 function Status({ label, tone = 'muted' }) {
   return <span className={`ace-settings-status ${tone === 'ok' ? 'text-ok' : tone === 'danger' ? 'text-danger' : 'text-fg-mute'}`}>{label}</span>;
@@ -34,7 +35,7 @@ function PathEditor({ id, label, detail, value = '', onSave, onBrowse, status, d
   );
 }
 
-export function SettingsConfigSection() {
+export function SettingsConfigSection({ skillPathsFocusRequest = 0 }) {
   const [upgradeUrl, setUpgradeUrl] = useState('');
   const [toolchains, setToolchains] = useState([]);
   const [terminal, setTerminal] = useState(null);
@@ -198,6 +199,7 @@ export function SettingsConfigSection() {
             onSave={(path) => saveTool(field.id, path)} onBrowse={() => browseTool(field.id)} />;
         })}
       </section>
+      <SkillScanPathsSettings focusRequest={skillPathsFocusRequest} disabled={migrating || restartRequired} />
       <section className="ace-settings-group">
         <h3>默认终端</h3><p>用于 Agent 命令和控制台</p>
         <div className="ace-settings-row">
diff --git a/web/src/components/SettingsPage.jsx b/web/src/components/SettingsPage.jsx
index a55a015a3..9d5fc7d7f 100644
--- a/web/src/components/SettingsPage.jsx
+++ b/web/src/components/SettingsPage.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut, shortcutEventConsumed } from '../lib/shortcutBindings.js';
 import { VirtualOfficeSettings } from './VirtualOfficeSettings.jsx';
 // 浮动设置窗口:mask + 贯通的左栏导航与右栏内容。
 //
@@ -5,7 +6,7 @@ import { VirtualOfficeSettings } from './VirtualOfficeSettings.jsx';
 // 后端真实接入的 section:常规 (权限模式) / 外观 (主题) / 配置 / 个性化 / 技能 / 模型 / 工具。
 // MCP 配置按公共/项目范围通过 API 校验、持久化并应用到运行时。
 
-import { useCallback, useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useTheme } from '../theme.jsx';
 import { ThemeCards } from './ThemeCards.jsx';
@@ -92,11 +93,15 @@ import {
   getCurrentWebCoreInfo,
 } from '../lib/webCoreInfo.js';
 import {
+  DEFAULT_SKILL_PAGE_SIZE,
+  SKILL_PAGE_SIZES,
   enabledRatioLabel,
   filterSkills,
   groupSkillsBySource,
+  isSkillPageSize,
   normalizeSkillList,
   normalizeWorkspaceList,
+  paginateSkills,
   skillsEnabledSummary,
   workspaceAutoExpand,
 } from '../lib/skillsSettings.js';
@@ -109,6 +114,7 @@ import { useSlashCommands } from './SlashCommandsContext.jsx';
 import { RefreshIcon, VsIcon } from './Icon.jsx';
 import { toast } from './Toast.jsx';
 import { loadUiLocale, persistUiLocale } from '../lib/uiLocale.js';
+import { usePreference } from '../lib/usePreference.js';
 import {
   normalizeRemoteWebState,
   remoteWebOriginSurvivesLocalMode,
@@ -197,6 +203,7 @@ export function SettingsPage({
   const [composing, setComposing] = useState(false);
   const [searchIndex, setSearchIndex] = useState(0);
   const [searchNavigation, setSearchNavigation] = useState(0);
+  const [skillPathsFocusRequest, setSkillPathsFocusRequest] = useState(0);
   const contentRef = useRef(null);
   const windowRef = useRef(null);
   const searchEntries = useMemo(() => settingsSearchEntries(developerModeUnlocked), [i18n.language, developerModeUnlocked]);
@@ -285,7 +292,7 @@ export function SettingsPage({
   // defaultPrevented 是给已经消费了这次 Esc 的浮层(菜单等)让路。
   useEffect(() => {
     const onKeyDown = (event) => {
-      if (event.key !== 'Escape' || event.defaultPrevented || event.isComposing) return;
+      if (!isDismissShortcut(event) || shortcutEventConsumed(event) || event.isComposing) return;
       if (document.querySelector('[data-ace-modal-dialog="true"]')) return;
       close();
     };
@@ -446,10 +453,15 @@ export function SettingsPage({
               onMessageAutoCollapseChange={onMessageAutoCollapseChange}
             />
           )}
-          {activeNavKey === 'config' && <SettingsConfigSection />}
+          {activeNavKey === 'config' && <SettingsConfigSection skillPathsFocusRequest={skillPathsFocusRequest} />}
           {activeNavKey === 'personalization' && <SectionPersonalization workspaceHash={activeWorkspaceHash} />}
           {activeNavKey === 'virtual-office' && <VirtualOfficeSettings office={office} />}
-          {activeNavKey === 'skills' && <SectionSkills />}
+          {activeNavKey === 'skills' && <SectionSkills onConfigurePaths={() => {
+            setSearchQuery('');
+            setSearchTerm('');
+            setActiveNav(settingsNavIndexForKey('config', developerModeUnlocked));
+            setSkillPathsFocusRequest((value) => value + 1);
+          }} />}
           {activeNavKey === 'mcp' && <SectionMCP />}
           {activeNavKey === 'connectors' && <SectionConnectors />}
           {activeNavKey === 'channels' && <ChannelsSettings />}
@@ -1659,15 +1671,54 @@ function SkillCard({ skill, busyName, onToggle }) {
   );
 }
 
-function SkillCardGrid({ skills, busyName, onToggle }) {
+function SkillPagination({ pagination, onPageChange, label, gridId, position, navRef }) {
+  const { page, pageCount, total } = pagination;
   return (
-    <div
-      data-skill-card-grid="true"
-      className="grid grid-cols-1 gap-3 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4"
-    >
-      {skills.map((skill) => (
-        <SkillCard key={skill.name} skill={skill} busyName={busyName} onToggle={onToggle} />
-      ))}
+    <nav ref={navRef} aria-label={label} tabIndex={-1} data-skill-pagination={position}
+      className="flex flex-wrap items-center justify-between gap-2 py-3 rounded-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent">
+      <span className="text-[12px] text-fg-mute tabular-nums" aria-live={position === 'top' ? 'polite' : undefined}>
+        {`第 ${page} / ${pageCount} 页，共 ${total} 条`}
+      </span>
+      <div className="flex items-center gap-2">
+        <button type="button" className="ace-settings-button" aria-controls={gridId} disabled={page <= 1}
+          onClick={() => onPageChange(page - 1)}>上一页</button>
+        <button type="button" className="ace-settings-button" aria-controls={gridId} disabled={page >= pageCount}
+          onClick={() => onPageChange(page + 1)}>下一页</button>
+      </div>
+    </nav>
+  );
+}
+
+function SkillCardGrid({ skills, busyName, onToggle, pageSize, query, scope, paginationLabel }) {
+  const [position, setPosition] = useState({ query, pageSize, page: 1 });
+  const topPagerRef = useRef(null);
+  const gridId = useId();
+  const requestedPage = position.query === query && position.pageSize === pageSize ? position.page : 1;
+  const pagination = paginateSkills(skills, requestedPage, pageSize);
+  const { page } = pagination;
+  // Render the clamped/reset page immediately, then retain it for later data updates.
+  useEffect(() => {
+    setPosition((previous) => previous.query === query && previous.pageSize === pageSize && previous.page === page
+      ? previous : { query, pageSize, page });
+  }, [query, pageSize, page]);
+  const changePage = (next) => {
+    setPosition({ query, pageSize, page: next });
+    topPagerRef.current?.scrollIntoView({ block: 'start' });
+    topPagerRef.current?.focus({ preventScroll: true });
+  };
+  const controls = { pagination, onPageChange: changePage, label: paginationLabel, gridId };
+  return (
+    <div data-skill-list={scope}>
+      <SkillPagination {...controls} position="top" navRef={topPagerRef} />
+      <div id={gridId}
+        data-skill-card-grid="true"
+        className="grid grid-cols-1 gap-3 lg:grid-cols-2 xl:grid-cols-3 2xl:grid-cols-4"
+      >
+        {pagination.items.map((skill) => (
+          <SkillCard key={skill.name} skill={skill} busyName={busyName} onToggle={onToggle} />
+        ))}
+      </div>
+      {pagination.pageCount > 1 && <SkillPagination {...controls} position="bottom" />}
     </div>
   );
 }
@@ -1680,6 +1731,7 @@ function WorkspaceSkillGroup({
   expanded,
   onToggleExpand,
   query,
+  pageSize,
   busyName,
   onToggleSkill,
   onOpenDir,
@@ -1728,11 +1780,12 @@ function WorkspaceSkillGroup({
           )}
           {loaded && shown.length === 0 && (
             <div className="px-3.5 py-3 rounded-md border border-dashed border-border text-[12px] text-fg-mute text-center mb-2">
-              {hasQuery ? '无匹配技能' : '该工作区没有技能;放到项目的 .acecode/skills 目录即可被发现'}
+              {hasQuery ? '无匹配技能' : '该工作区没有技能，可在配置中设置 Skill 扫描路径'}
             </div>
           )}
           {shown.length > 0 && (
-            <SkillCardGrid skills={shown} busyName={busyName} onToggle={onToggleSkill} />
+            <SkillCardGrid skills={shown} busyName={busyName} onToggle={onToggleSkill}
+              pageSize={pageSize} query={query} scope={ws.hash} paginationLabel={`${ws.name} 技能分页`} />
           )}
         </div>
       )}
@@ -1740,7 +1793,8 @@ function WorkspaceSkillGroup({
   );
 }
 
-function SectionSkills() {
+function SectionSkills({ onConfigurePaths }) {
+  const [pageSize, setPageSize] = usePreference('ace.skillsPageSize', DEFAULT_SKILL_PAGE_SIZE, isSkillPageSize);
   const [globalSkills, setGlobalSkills] = useState([]);
   const [workspaces, setWorkspaces] = useState([]);
   // hash -> 该工作区的项目技能数组;键缺失 = 还没加载完。
@@ -1774,7 +1828,11 @@ function SectionSkills() {
         } catch { /* bridge 兜底失败就当没有工作区 */ }
       }
       setWorkspaces(wsList);
-      if (refresh) setWsSkills({});
+      // Keep loaded groups mounted during refresh so their page can be retained
+      // or clamped when the new catalog arrives.
+      setWsSkills((previous) => Object.fromEntries(
+        wsList.filter((ws) => Object.prototype.hasOwnProperty.call(previous, ws.hash)).map((ws) => [ws.hash, previous[ws.hash]]),
+      ));
       // 后台预取各工作区的项目技能:折叠行的 N/M 计数需要它,展开时也能
       // 即刻渲染。逐个到达逐个填充,失败置空数组避免计数一直显示省略号。
       wsList.forEach((ws) => {
@@ -1834,7 +1892,7 @@ function SectionSkills() {
     try {
       const root = await api.getSkillRoot(wsHash);
       const path = scope === 'global' ? (root?.global_path || '') : (root?.path || '');
-      if (!path) throw new Error('目录路径为空');
+      if (!path) throw new Error('尚未配置此范围的 Skill 扫描路径');
       if (typeof window.aceDesktop_openInExplorer === 'function') {
         const result = parseDesktopBridgeResult(await window.aceDesktop_openInExplorer(path));
         if (!result?.ok) throw new Error(result?.error || 'open failed');
@@ -1869,6 +1927,8 @@ function SectionSkills() {
           <h2 className="text-xl font-bold mb-2">技能</h2>
           <p className="text-[12px] text-fg-mute">
             管理 ACECode 可调用的技能模块。启用后 Agent 在任务中可自动使用。
+            {' '}<a href="#skill-scan-paths" className="text-accent underline underline-offset-2 rounded-sm focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent"
+              onClick={(event) => { event.preventDefault(); onConfigurePaths(); }}>设置 Skill 扫描路径</a>
           </p>
         </div>
         <div className="flex items-center gap-3 shrink-0">
@@ -1885,19 +1945,28 @@ function SectionSkills() {
         </div>
       </div>
 
-      <div className="relative mb-5">
-        <VsIcon
-          name="search"
-          size={14}
-          className="absolute left-3 top-1/2 -translate-y-1/2 text-fg-mute pointer-events-none"
-        />
-        <input
-          type="text"
-          value={search}
-          onChange={(e) => setSearch(e.target.value)}
-          placeholder="搜索技能名称或描述..."
-          className="w-full h-9 pl-9 pr-3 text-[13px] rounded-md border border-border bg-surface text-fg outline-none focus:border-accent transition"
-        />
+      <div className="flex flex-wrap items-center gap-3 mb-5">
+        <div className="relative min-w-0 flex-1 basis-48">
+          <VsIcon
+            name="search"
+            size={14}
+            className="absolute left-3 top-1/2 -translate-y-1/2 text-fg-mute pointer-events-none"
+          />
+          <input
+            type="text"
+            value={search}
+            onChange={(e) => setSearch(e.target.value)}
+            placeholder="搜索技能名称或描述..."
+            className="w-full h-9 pl-9 pr-3 text-[13px] rounded-md border border-border bg-surface text-fg outline-none focus:border-accent transition"
+          />
+        </div>
+        <label className="flex items-center gap-2 text-[12px] text-fg-mute shrink-0">
+          每页条目数
+          <select value={pageSize} onChange={(event) => setPageSize(Number(event.target.value))}
+            className="h-9 px-2 text-[13px] rounded-md border border-border bg-surface text-fg outline-none focus:border-accent">
+            {SKILL_PAGE_SIZES.map((size) => <option key={size} value={size}>{size}</option>)}
+          </select>
+        </label>
       </div>
 
       {loading ? (
@@ -1912,7 +1981,8 @@ function SectionSkills() {
             </div>
           )}
           {filteredGlobal.length > 0 && (
-            <SkillCardGrid skills={filteredGlobal} busyName={savingName} onToggle={toggle} />
+            <SkillCardGrid skills={filteredGlobal} busyName={savingName} onToggle={toggle}
+              pageSize={pageSize} query={search} scope="global" paginationLabel="全局技能分页" />
           )}
           <button
             type="button"
@@ -1950,6 +2020,7 @@ function SectionSkills() {
                   setExpanded((prev) => ({ ...prev, [ws.hash]: !prev[ws.hash] }))
                 }
                 query={search}
+                pageSize={pageSize}
                 busyName={savingName}
                 onToggleSkill={(name, v) => toggle(name, v, ws.hash)}
                 onOpenDir={() => openDir('workspace', ws.hash)}
diff --git a/web/src/components/SettingsSearch.jsx b/web/src/components/SettingsSearch.jsx
index 5aa7e70c6..e78f331ba 100644
--- a/web/src/components/SettingsSearch.jsx
+++ b/web/src/components/SettingsSearch.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useTranslation } from 'react-i18next';
 import { VsIcon } from './Icon.jsx';
 
@@ -16,7 +17,7 @@ export function SettingsSearch({ query, onQuery, results, selected, onSelect, on
           onKeyDown={(event) => {
             if (event.nativeEvent.isComposing) return;
             // 有内容时 Esc 只清空搜索;已空时放行,让它冒泡去关闭设置窗口。
-            if (event.key === 'Escape' && query) { event.stopPropagation(); onQuery(''); }
+            if (isDismissShortcut(event) && query) { event.stopPropagation(); onQuery(''); }
             if (results.length && ['ArrowDown', 'ArrowUp', 'Enter'].includes(event.key)) {
               event.preventDefault();
               onSelect(event.key === 'Enter' ? selected : (selected + (event.key === 'ArrowDown' ? 1 : -1) + results.length) % results.length);
diff --git a/web/src/components/ShortcutsSettings.jsx b/web/src/components/ShortcutsSettings.jsx
index d2b49a29c..04e2ad0e1 100644
--- a/web/src/components/ShortcutsSettings.jsx
+++ b/web/src/components/ShortcutsSettings.jsx
@@ -1,9 +1,80 @@
 import { useEffect, useRef, useState } from 'react';
-import { filterShortcuts, shortcutCatalog } from '../lib/appShortcuts.js';
+import { filterShortcuts, shortcutCatalog, shortcutLabel } from '../lib/appShortcuts.js';
+import { bindingLabel, captureShortcut, DEFAULT_SHORTCUTS, effectiveShortcut, getShortcutOverrides, shortcutStore, validateShortcut } from '../lib/shortcutBindings.js';
+import { useShortcutPreferences } from '../lib/useShortcutPreferences.js';
 import { VsIcon } from './Icon.jsx';
+import { Modal } from './Modal.jsx';
+
+function ShortcutKeys({ label }) {
+  return label.split('+').map((key, index) => (
+    <kbd key={`${index}-${key}`} className="inline-flex h-7 min-w-7 items-center justify-center rounded border border-border bg-surface-alt px-1.5 font-sans text-[12px] text-fg-2">{key}</kbd>
+  ));
+}
+
+function shortcutError(issue) {
+  if (!issue) return '';
+  if (issue.reason === 'conflict') {
+    const action = shortcutCatalog().find((row) => row.bindings.includes(issue.conflict));
+    return `此快捷键已用于“${action?.title || issue.conflict}”，请换一组按键。`;
+  }
+  if (issue.reason === 'storage') return '无法保存快捷键，请检查本地存储后重试。';
+  if (issue.reason === 'reserved') return '此组合键由系统、浏览器或文本编辑保留，请换一组按键。';
+  if (issue.reason === 'modifier') return '请搭配 Ctrl、Cmd 或 Alt，或使用功能键，避免影响正常输入。';
+  return '请按下完整的快捷键组合。';
+}
+
+function ShortcutEditor({ editing, onClose }) {
+  const [candidate, setCandidate] = useState(() => effectiveShortcut(editing.id));
+  const [error, setError] = useState('');
+  const recordRef = useRef(null);
+  const issue = validateShortcut(editing.id, candidate, getShortcutOverrides());
+  const save = (reset = false) => {
+    const result = shortcutStore().save(editing.id, reset ? null : candidate);
+    if (!result.ok) { setError(shortcutError(result)); return; }
+    onClose();
+  };
+  return (
+    <Modal onClose={onClose} width={440} layerClassName="z-[400]" labelledBy="shortcut-editor-title" dismissOnBackdrop={false}>
+      <div className="p-5">
+        <div className="mb-4 flex items-center justify-between gap-3">
+          <h2 id="shortcut-editor-title" className="text-[15px] font-semibold">修改快捷键</h2>
+          <button type="button" aria-label="关闭" onClick={onClose}
+            className="inline-flex h-7 w-7 items-center justify-center rounded text-fg-mute hover:bg-surface-hi hover:text-fg focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent">
+            <VsIcon name="close" size={14} />
+          </button>
+        </div>
+        <p className="mb-3 text-[13px] text-fg">{editing.title}</p>
+        <label className="block text-[12px] text-fg-mute">
+          <span>点击下方输入框，然后按下新的组合键</span>
+          <input ref={recordRef} data-shortcut-recorder autoFocus readOnly value={bindingLabel(candidate)}
+            aria-label="录入快捷键" aria-describedby="shortcut-record-hint shortcut-record-error" aria-invalid={!!(error || issue)}
+            className="mt-2 h-11 w-full rounded-md border border-border bg-surface-alt px-3 text-center text-[14px] text-fg outline-none focus:border-accent"
+            onKeyDown={(event) => {
+              if (event.key === 'Tab') return;
+              event.preventDefault();
+              event.stopPropagation();
+              const captured = captureShortcut(event);
+              if (captured) { setCandidate(captured); setError(''); }
+            }} />
+        </label>
+        <p id="shortcut-record-hint" className="mt-2 text-[11px] text-fg-mute">录入期间不会执行快捷键，点击保存后立即生效。</p>
+        <div id="shortcut-record-error" role="status" className="mt-2 min-h-5 text-[12px] text-danger">{error || shortcutError(issue)}</div>
+        <div className="mt-4 flex flex-wrap items-center justify-end gap-2">
+          <button type="button" onClick={() => save(true)} title={bindingLabel(DEFAULT_SHORTCUTS[editing.id])}
+            className="mr-auto rounded px-2 py-1 text-[12px] text-fg-mute hover:bg-surface-hi hover:text-fg">恢复默认</button>
+          <button type="button" onClick={onClose} className="rounded border border-border bg-surface px-3 py-1 text-[12px] hover:bg-surface-hi">取消</button>
+          <button type="button" disabled={!!issue} onClick={() => save()} data-ace-dialog-primary="true"
+            className="rounded bg-accent px-3 py-1 text-[12px] text-white disabled:opacity-50">保存</button>
+        </div>
+      </div>
+    </Modal>
+  );
+}
 
 export function ShortcutsSettings() {
+  useShortcutPreferences();
   const [query, setQuery] = useState('');
+  const [editing, setEditing] = useState(null);
   const searchRef = useRef(null);
   const rows = filterShortcuts(shortcutCatalog(), query);
   const groups = [...new Set(rows.map((row) => row.group))];
@@ -29,9 +100,16 @@ export function ShortcutsSettings() {
                   <div className="text-[13px] text-fg">{row.title}</div>
                   <div className="mt-0.5 text-[11px] text-fg-mute">{row.description}</div>
                 </dt>
-                <dd className="flex shrink-0 items-center gap-1">
-                  {row.keys.split('+').map((key, index) => (
-                    <kbd key={`${index}-${key}`} className="inline-flex h-7 min-w-7 items-center justify-center rounded border border-border bg-surface-alt px-1.5 font-sans text-[12px] text-fg-2">{key}</kbd>
+                <dd className="flex max-w-full flex-wrap items-center justify-end gap-2">
+                  {row.bindings.map((id) => (
+                    <span key={id} className="inline-flex max-w-full flex-wrap items-center gap-1">
+                      <ShortcutKeys label={shortcutLabel(id)} />
+                      <button type="button" data-edit-shortcut={id} title="修改快捷键" aria-label={`修改快捷键：${row.title}${id === 'historyPrevious' ? '（上一条）' : id === 'historyNext' ? '（下一条）' : ''}`}
+                        onClick={() => setEditing({ id, title: row.title })}
+                        className="ml-1 inline-flex h-7 w-7 shrink-0 items-center justify-center rounded text-fg-mute hover:bg-surface-hi hover:text-fg focus-visible:outline focus-visible:outline-2 focus-visible:outline-accent">
+                        <VsIcon name="edit" size={14} />
+                      </button>
+                    </span>
                   ))}
                 </dd>
               </div>
@@ -40,6 +118,7 @@ export function ShortcutsSettings() {
         </section>
       ))}
       {rows.length === 0 && <p role="status" className="py-8 text-center text-[13px] text-fg-mute">没有找到匹配的快捷键</p>}
+      {editing && <ShortcutEditor editing={editing} onClose={() => setEditing(null)} />}
     </section>
   );
 }
diff --git a/web/src/components/SideChatWindow.jsx b/web/src/components/SideChatWindow.jsx
index 4772e76eb..444490548 100644
--- a/web/src/components/SideChatWindow.jsx
+++ b/web/src/components/SideChatWindow.jsx
@@ -1,3 +1,4 @@
+import { composerShortcutAction, isDismissShortcut } from '../lib/shortcutBindings.js';
 import { memo, useCallback, useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { createPortal } from 'react-dom';
 import {
@@ -240,7 +241,7 @@ export function SideChatWindow({
       }}
       onKeyDown={(event) => {
         event.stopPropagation();
-        if (event.key === 'Escape' && !isComposing(event)) {
+        if (isDismissShortcut(event) && !isComposing(event)) {
           event.preventDefault();
           onClose?.();
         }
@@ -307,9 +308,19 @@ export function SideChatWindow({
           placeholder="问一个不打断当前任务的问题…"
           onChange={(event) => onDraftChange?.(event.target.value)}
           onKeyDown={(event) => {
-            if (event.key === 'Enter' && !event.shiftKey && !isComposing(event)) {
+            if (isComposing(event)) return;
+            const action = composerShortcutAction(event);
+            if (action === 'send') {
               event.preventDefault();
               if (canSubmit && !event.repeat) onSubmit?.();
+            } else if (action === 'newline') {
+              event.preventDefault();
+              const input = event.currentTarget;
+              const start = input.selectionStart;
+              onDraftChange?.(draft.slice(0, start) + '\n' + draft.slice(input.selectionEnd));
+              requestAnimationFrame(() => textareaRef.current?.setSelectionRange(start + 1, start + 1));
+            } else if (action === 'ignore') {
+              event.preventDefault();
             }
           }}
         />
diff --git a/web/src/components/Sidebar.jsx b/web/src/components/Sidebar.jsx
index 22eb884aa..29069847b 100644
--- a/web/src/components/Sidebar.jsx
+++ b/web/src/components/Sidebar.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // Sidebar(200px):workspace 分组 → session list。
 //
 // 数据源:
@@ -53,6 +54,8 @@ import {
   unpinSessionId,
 } from '../lib/pinnedSessions.js';
 import { sessionDisplayTitle, withNewSessionDisplayTitles } from '../lib/sessionTitle.js';
+import { useSessionTitleAnimation } from '../lib/useSessionTitleAnimation.js';
+import { SessionTitleText } from './SessionTitleText.jsx';
 import { pushTrayMenu } from '../lib/desktopTrayMenu.js';
 import { desktopTaskbarBadge, desktopTaskbarBadgeAvailable } from '../lib/desktopTaskbarBadge.js';
 import { usePreference } from '../lib/usePreference.js';
@@ -703,7 +706,7 @@ function SessionHoverCard({
   );
 }
 
-function SidebarSessionTitle({ title }) {
+function SidebarSessionTitle({ title, animation }) {
   const viewportRef = useRef(null);
   const contentRef = useRef(null);
   const [metrics, setMetrics] = useState(() => sidebarTitleMarqueeMetrics(0, 0));
@@ -756,13 +759,14 @@ function SidebarSessionTitle({ title }) {
         'ace-sidebar-session-title-viewport',
         'min-w-0 flex-1',
         metrics.overflowing && 'is-overflowing',
-        metrics.overflowing && 'is-marquee-ready',
+        metrics.overflowing && !animation?.typing && 'is-marquee-ready',
       )}
       data-sidebar-session-title-overflow={metrics.overflowing ? 'true' : 'false'}
+      data-title-typing={animation?.typing ? 'true' : 'false'}
       style={marqueeStyle}
     >
       <span ref={contentRef} className="ace-sidebar-session-title-content">
-        {title}
+        <SessionTitleText title={title} animation={animation} />
       </span>
     </span>
   );
@@ -801,6 +805,7 @@ function SessionRow({
   // 没有就用 summary(最近一条用户消息显示文本的 80 字节截断)。这里不再另拉
   // 消息全文做跑马灯 —— 那会让侧栏 hover 时滚出一段与顶部不一致、且长度不受限的文本。
   const title = sessionDisplayTitle(s, s.name || '');
+  const titleAnimation = useSessionTitleAnimation(s, title);
   const sessionMarker = sidebarSessionMarker(s);
   const remoteControlBound = Boolean(s.remote_control_bound ?? s.remoteControlBound);
   // 被 QQ / Telegram 会话绑定的会话显示同一个电脑图标;/rc 的专属行为(换绑动画等)仍只看
@@ -1087,7 +1092,7 @@ function SessionRow({
             onChange={(e) => setDraft(e.target.value)}
             onBlur={commitRename}
             onKeyDown={(e) => {
-              if (e.key === 'Escape') {
+              if (isDismissShortcut(e)) {
                 e.preventDefault();
                 setEditing(false);
                 setDraft(title);
@@ -1120,7 +1125,7 @@ function SessionRow({
               <VsIcon name="computer" size={18} className="text-accent" />
             </span>
           )}
-          <SidebarSessionTitle title={title} />
+          <SidebarSessionTitle title={title} animation={titleAnimation} />
         </button>
       )}
       <span className="flex w-full min-w-0 items-center justify-end gap-2">
@@ -1552,7 +1557,7 @@ function WorkspaceGroup({
             onChange={(e) => setDraft(e.target.value)}
             onKeyDown={(e) => {
               if (e.key === 'Enter') { e.preventDefault(); commit(); }
-              if (e.key === 'Escape') { setEditing(false); setDraft(ws.name); }
+              if (isDismissShortcut(e)) { setEditing(false); setDraft(ws.name); }
             }}
             onBlur={commit}
             onClick={(e) => e.stopPropagation()}
diff --git a/web/src/components/SidebarExtensions.jsx b/web/src/components/SidebarExtensions.jsx
index 7eda02d0c..e5527bd02 100644
--- a/web/src/components/SidebarExtensions.jsx
+++ b/web/src/components/SidebarExtensions.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // 侧栏「扩展」入口:点击向右弹出菜单(未勾选的扩展条目 + 「自定义」),
 // 「自定义」打开对话框,勾选的条目直接固定到侧栏主导航,拖动行调整顺序。
 // 顺序与勾选状态的纯逻辑在 lib/sidebarNavigation.js,这里只负责交互与渲染。
@@ -191,7 +192,7 @@ function SidebarExtensionCustomizer({ prefs, onChange, onClose }) {
       cleanup();
     };
     const key = (keyEvent) => {
-      if (keyEvent.key !== 'Escape' || !drag.active) return;
+      if (!isDismissShortcut(keyEvent) || !drag.active) return;
       // Esc 只撤销这次拖动,不能顺带把对话框关掉。
       keyEvent.preventDefault();
       keyEvent.stopImmediatePropagation();
diff --git a/web/src/components/SkillScanPathsSettings.jsx b/web/src/components/SkillScanPathsSettings.jsx
new file mode 100644
index 000000000..d2e21e421
--- /dev/null
+++ b/web/src/components/SkillScanPathsSettings.jsx
@@ -0,0 +1,89 @@
+import { useEffect, useRef, useState } from 'react';
+import { api } from '../lib/api.js';
+import { useSlashCommands } from './SlashCommandsContext.jsx';
+
+export function SkillScanPathsSettings({ focusRequest = 0, disabled = false }) {
+  const [config, setConfig] = useState(null);
+  const [draft, setDraft] = useState('');
+  const [busy, setBusy] = useState('loading');
+  const [error, setError] = useState('');
+  const [saved, setSaved] = useState(false);
+  const [reload, setReload] = useState(0);
+  const editorRef = useRef(null);
+  const focusedRequest = useRef(0);
+  const operation = useRef(false);
+  const mounted = useRef(false);
+  const slashCommands = useSlashCommands();
+
+  useEffect(() => {
+    mounted.current = true;
+    return () => { mounted.current = false; };
+  }, []);
+
+  useEffect(() => {
+    let cancelled = false;
+    setBusy('loading');
+    setError('');
+    api.getSkillScanPaths().then((value) => {
+      if (cancelled) return;
+      setConfig(value);
+      setDraft(value.paths.join('\n'));
+    }).catch((err) => {
+      if (!cancelled) setError('加载 Skill 扫描路径失败：' + (err?.message || ''));
+    }).finally(() => { if (!cancelled) setBusy(''); });
+    return () => { cancelled = true; };
+  }, [reload]);
+
+  useEffect(() => {
+    if (!focusRequest || focusedRequest.current === focusRequest || !config || busy || disabled) return;
+    focusedRequest.current = focusRequest;
+    editorRef.current?.scrollIntoView({ block: 'center' });
+    editorRef.current?.focus({ preventScroll: true });
+  }, [focusRequest, config, busy, disabled]);
+
+  const paths = draft.split(/\r?\n/u).map((path) => path.trim()).filter(Boolean);
+  const dirty = !!config && JSON.stringify(paths) !== JSON.stringify(config.paths);
+  const unavailable = disabled || !!busy || !config;
+  const save = async (next) => {
+    if (operation.current || unavailable) return;
+    operation.current = true;
+    setBusy('saving'); setError(''); setSaved(false);
+    try {
+      const value = await api.setSkillScanPaths(next);
+      slashCommands.invalidate?.();
+      if (!mounted.current) return;
+      setConfig(value);
+      setDraft(value.paths.join('\n'));
+      setSaved(true);
+    } catch (err) {
+      if (mounted.current) setError('保存 Skill 扫描路径失败：' + (err?.message || ''));
+    } finally {
+      operation.current = false;
+      if (mounted.current) setBusy('');
+    }
+  };
+
+  return (
+    <section className="ace-settings-group" aria-labelledby="skill-scan-paths-heading">
+      <h3 id="skill-scan-paths-heading"><label htmlFor="skill-scan-paths">Skill 扫描路径</label></h3>
+      <p id="skill-scan-paths-help">每行一个目录，按顺序查找，同名技能优先使用靠前的路径。保存空列表将关闭普通目录扫描。</p>
+      <p>{'相对路径从当前工作区逐级向上查找；绝对路径和 ~ 路径作为全局目录。支持 ${ENV} 环境变量。'}</p>
+      <p>{'${ACECODE_DATA_DIR} 为数据目录；${XDG_CONFIG_HOME}、${XDG_CACHE_HOME} 默认分别为 ~/.config、~/.cache。未设置的其他变量会跳过。'}</p>
+      <textarea ref={editorRef} id="skill-scan-paths" value={draft} rows={8}
+        aria-describedby="skill-scan-paths-help" disabled={unavailable} spellCheck={false}
+        onChange={(event) => { setDraft(event.target.value); setSaved(false); }}
+        className="w-full px-3 py-2.5 text-[13px] rounded-md border border-border bg-surface text-fg outline-none focus:border-accent transition leading-relaxed resize-y disabled:opacity-60" />
+      <div className="flex flex-wrap items-center gap-3 mt-2">
+        <button type="button" className="ace-settings-button ace-settings-primary" disabled={unavailable || !dirty}
+          onClick={() => save(paths)}>{busy === 'saving' ? '保存中...' : '保存路径'}</button>
+        <button type="button" className="ace-settings-button" disabled={unavailable || (!config.customized && !dirty)}
+          onClick={() => save(null)}>恢复默认</button>
+        {config && <span className="text-[12px] text-fg-mute">{config.customized ? '使用自定义路径' : '使用默认路径'}</span>}
+        {!config && !busy && <button type="button" className="ace-settings-button" onClick={() => setReload((value) => value + 1)}>重新加载</button>}
+      </div>
+      <div className="min-h-6 mt-2 text-[12px]" role="status" aria-live="polite">
+        {error ? <span className="text-danger">{error}</span> : busy === 'loading' ? '加载中...' : saved ? <span className="text-fg-mute">已保存，技能扫描路径已更新</span> : null}
+      </div>
+    </section>
+  );
+}
diff --git a/web/src/components/SlashDropdown.jsx b/web/src/components/SlashDropdown.jsx
index 821653432..1ce47565e 100644
--- a/web/src/components/SlashDropdown.jsx
+++ b/web/src/components/SlashDropdown.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 // SlashDropdown:输入框敲 / 时弹出的命令补全浮层。
 //
 // 以 InputBar 为锚点智能选择上/下方,8 行理想可视区,空间不足时限高滚动。
@@ -136,7 +137,7 @@ export function SlashDropdown({ items, query, onSelect, onClose }) {
   const onKey = useCallback((event) => {
     if (!shouldHandleComposerDropdownKey(event)) return;
     const total = ranked.length;
-    if (event.key === 'Escape') {
+    if (isDismissShortcut(event)) {
       event.preventDefault();
       event.stopPropagation();
       onClose?.();
diff --git a/web/src/components/SubagentGroupBlock.jsx b/web/src/components/SubagentGroupBlock.jsx
index f08486f72..f30040d69 100644
--- a/web/src/components/SubagentGroupBlock.jsx
+++ b/web/src/components/SubagentGroupBlock.jsx
@@ -12,6 +12,7 @@ import { clsx } from '../lib/format.js';
 import { SUBAGENT_TASK_STATUS, taskDisplayTitle } from '../lib/subagentTasks.js';
 import { ActivityLine } from './ActivityLine.jsx';
 import { VsIcon } from './Icon.jsx';
+import { SessionPixelAvatar } from './PixelAvatar.jsx';
 
 function agentTitle(agent, task) {
   if (task) {
@@ -49,6 +50,7 @@ function AgentRow({ agent, task, onOpen }) {
         )}
         aria-hidden="true"
       />
+      <SessionPixelAvatar session={task} size={20} />
       <span className="flex-1 min-w-0 truncate text-[13px] text-fg">{title}</span>
       {clickable && (
         <VsIcon
diff --git a/web/src/components/SubagentPanel.jsx b/web/src/components/SubagentPanel.jsx
index 35904fdb8..df6686318 100644
--- a/web/src/components/SubagentPanel.jsx
+++ b/web/src/components/SubagentPanel.jsx
@@ -46,6 +46,7 @@ import {
 import { ToolSummaryIcon, VsIcon } from './Icon.jsx';
 import { TranscriptItems } from './TranscriptItems.jsx';
 import { AttachmentTextLoaderContext } from './AttachmentTextLoaderContext.jsx';
+import { SessionPixelAvatar } from './PixelAvatar.jsx';
 
 function TaskCard({ task, nowMs, onAbort, onOpenTranscript }) {
   const running = task.status === SUBAGENT_TASK_STATUS.RUNNING;
@@ -54,6 +55,7 @@ function TaskCard({ task, nowMs, onAbort, onOpenTranscript }) {
   return (
     <div className="rounded-lg border border-border bg-surface px-3 py-2.5 flex flex-col gap-1 ace-shadow">
       <div className="flex items-start gap-2">
+        <SessionPixelAvatar session={task} />
         <span className="flex-1 min-w-0 text-[12.5px] font-semibold text-fg break-words">
           {taskDisplayTitle(task)}
         </span>
diff --git a/web/src/components/TaskSuggestionCards.jsx b/web/src/components/TaskSuggestionCards.jsx
index 4f95625dd..1e559e6da 100644
--- a/web/src/components/TaskSuggestionCards.jsx
+++ b/web/src/components/TaskSuggestionCards.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useEffect, useRef, useState } from 'react';
 import { AnchoredMenu } from './AnchoredMenu.jsx';
 import { VsIcon } from './Icon.jsx';
@@ -83,7 +84,7 @@ function TaskSuggestionCard({ suggestion, state, controller, sourceRef, onOpenSe
       className="pointer-events-auto rounded-xl bg-surface border border-border p-4 text-fg"
       style={{ boxShadow: 'var(--ace-shadow-lg), var(--ace-shadow)' }}
       onKeyDown={(event) => {
-        if (event.key === 'Escape' && !menuOpen && !actionDisabled) {
+        if (isDismissShortcut(event) && !menuOpen && !actionDisabled) {
           event.preventDefault();
           event.stopPropagation();
           dismiss();
diff --git a/web/src/components/TokenBudgetRing.jsx b/web/src/components/TokenBudgetRing.jsx
index 518ffdbb9..fc3bc41b3 100644
--- a/web/src/components/TokenBudgetRing.jsx
+++ b/web/src/components/TokenBudgetRing.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import {
   useCallback,
   useEffect,
@@ -106,7 +107,7 @@ export function TokenBudgetRing({ budget, className = '' }) {
       closePanel();
     };
     const onKeyDown = (event) => {
-      if (event.key === 'Escape') closePanel();
+      if (isDismissShortcut(event)) closePanel();
     };
     const onViewportChange = () => closePanel();
 
diff --git a/web/src/components/TopBar.jsx b/web/src/components/TopBar.jsx
index 77719bae6..6ccf4449f 100644
--- a/web/src/components/TopBar.jsx
+++ b/web/src/components/TopBar.jsx
@@ -167,7 +167,7 @@ export function TopBar({
           <div ref={sessionActionsRef} className="ace-topbar-session-actions flex items-center empty:hidden" />
           {consoleAvailable && (
             <QuickBtn
-              title={consoleOpen ? '关闭控制台 (Ctrl+`)' : '打开控制台 (Ctrl+`)'}
+              title={withAppShortcutHint(consoleOpen ? '关闭控制台' : '打开控制台', 'console')}
               onClick={onToggleConsole}
               pressed={consoleOpen}
               panelToggle
diff --git a/web/src/components/UsageHeatmap.jsx b/web/src/components/UsageHeatmap.jsx
index a43fa7f81..f63a11324 100644
--- a/web/src/components/UsageHeatmap.jsx
+++ b/web/src/components/UsageHeatmap.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useEffect, useId, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { createPortal } from 'react-dom';
@@ -90,7 +91,7 @@ export function UsageHeatmap({ reloadKey = 0 }) {
     if (!tip) return undefined;
     const close = () => setTip(null);
     const onKeyDown = (event) => {
-      if (event.key !== 'Escape' || event.isComposing) return;
+      if (!isDismissShortcut(event) || event.isComposing) return;
       event.preventDefault();
       event.stopPropagation();
       close();
diff --git a/web/src/components/WorkspaceIconPicker.jsx b/web/src/components/WorkspaceIconPicker.jsx
index 1b7f54560..5782d4004 100644
--- a/web/src/components/WorkspaceIconPicker.jsx
+++ b/web/src/components/WorkspaceIconPicker.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../lib/shortcutBindings.js';
 import { useEffect, useLayoutEffect, useMemo, useRef, useState } from 'react';
 import { clsx } from '../lib/format.js';
 import {
@@ -54,7 +55,7 @@ export function WorkspaceIconPicker({ anchorRef, value, onChange, onClose }) {
   useEffect(() => {
     // Esc 只收起选择层:捕获阶段先拦下,对话框(document 冒泡阶段监听)就不会一起关掉。
     const onKey = (event) => {
-      if (event.key !== 'Escape' || event.isComposing) return;
+      if (!isDismissShortcut(event) || event.isComposing) return;
       event.preventDefault();
       event.stopPropagation();
       onClose?.();
diff --git a/web/src/components/model-settings/ModelProbeDialog.jsx b/web/src/components/model-settings/ModelProbeDialog.jsx
index ed144ce83..c25180ec4 100644
--- a/web/src/components/model-settings/ModelProbeDialog.jsx
+++ b/web/src/components/model-settings/ModelProbeDialog.jsx
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../../lib/shortcutBindings.js';
 import { useEffect, useMemo, useState } from 'react';
 import { clsx } from '../../lib/format.js';
 import { formatModelTokenLimit } from '../../lib/modelSettings.js';
@@ -51,7 +52,7 @@ export function ModelProbeDialog({
   };
 
   const blockEscapeDismiss = (event) => {
-    if (event.key !== 'Escape') return;
+    if (!isDismissShortcut(event)) return;
     event.preventDefault();
     event.stopPropagation();
     event.nativeEvent?.stopImmediatePropagation?.();
diff --git a/web/src/components/model-settings/useSavedModelReorder.js b/web/src/components/model-settings/useSavedModelReorder.js
index 9d7adb52d..1f5a8b4e0 100644
--- a/web/src/components/model-settings/useSavedModelReorder.js
+++ b/web/src/components/model-settings/useSavedModelReorder.js
@@ -1,3 +1,4 @@
+import { isDismissShortcut } from '../../lib/shortcutBindings.js';
 import { useEffect, useRef, useState } from 'react';
 import { reorderSavedModels, savedModelDropTarget } from '../../lib/savedModelOrder.js';
 
@@ -107,7 +108,7 @@ export function useSavedModelReorder({ models, filtered, query, disabled, onReor
       if (pointerEvent.pointerId === pointerId) cancel();
     };
     const key = (keyEvent) => {
-      if (keyEvent.key !== 'Escape') return;
+      if (!isDismissShortcut(keyEvent)) return;
       keyEvent.preventDefault();
       keyEvent.stopPropagation();
       cancel();
diff --git a/web/src/components/trajectory/TrajectoryView.jsx b/web/src/components/trajectory/TrajectoryView.jsx
index 85e9be066..b418a5d1b 100644
--- a/web/src/components/trajectory/TrajectoryView.jsx
+++ b/web/src/components/trajectory/TrajectoryView.jsx
@@ -282,7 +282,7 @@ export function TrajectoryView({
 
   const projection = useMemo(() => buildDeepSeekTrajectory(records), [records]);
   const {
-    nodes, runningCalls, requests, callSchemas,
+    nodes, inputTurns, runningCalls, requests, callSchemas,
   } = projection;
   const partial = useMemo(
     () => resolveDeepSeekTrajectoryPartial(projection, livePartial),
@@ -293,6 +293,7 @@ export function TrajectoryView({
   const finalized = useMemo(() => {
     const turns = deriveTrajectoryLayout({
       nodes,
+      inputTurns,
       partial: partialTurn === null || partialStep === null
         ? null
         : { turn: partialTurn, step: partialStep, blocks: [] },
@@ -301,7 +302,7 @@ export function TrajectoryView({
       callSchemas,
     });
     return { turns, lastIndex: lastCellIndex(turns) };
-  }, [callSchemas, nodes, partialStep, partialTurn, requests, runningCalls]);
+  }, [callSchemas, inputTurns, nodes, partialStep, partialTurn, requests, runningCalls]);
   const timelinePartialSignature = partialStructureSignature(partial);
   const timelinePartial = useMemo(() => (partial === null
     ? null
diff --git a/web/src/components/trajectory/deepseek/layout.ts b/web/src/components/trajectory/deepseek/layout.ts
index 265d5ba03..27bc12491 100644
--- a/web/src/components/trajectory/deepseek/layout.ts
+++ b/web/src/components/trajectory/deepseek/layout.ts
@@ -36,6 +36,8 @@ export interface TrajectoryTurnModel {
 export interface TrajectoryLayoutInput {
   nodes: ConversationSnapshot['nodes']
   eventLocations?: ReadonlyMap<number, ConversationLocation>
+  /** ACECode knows input ownership even before the corresponding assistant arrives. */
+  inputTurns?: ReadonlyMap<number, number>
   partial: ConversationSnapshot['partial']
   runningCalls: ConversationSnapshot['runningCalls']
   requests?: readonly RequestView[]
@@ -137,7 +139,7 @@ function inputCellDetail(node: InputNode): Pick<
  */
 export function deriveTrajectoryLayout(input: TrajectoryLayoutInput): readonly TrajectoryTurnModel[] {
   const {
-    nodes, eventLocations, partial, runningCalls, requests = [], callSchemas,
+    nodes, eventLocations, inputTurns, partial, runningCalls, requests = [], callSchemas,
   } = input
   const resultByCall = indexResults(nodes)
   const callById = new Map<string, ToolCallBlock>(resultByCall)
@@ -279,8 +281,10 @@ export function deriveTrajectoryLayout(input: TrajectoryLayoutInput): readonly T
     if (entry.kind === 'system') {
       const { change, request } = entry
       const turn = change.kind === 'initial'
-        ? firstVisibleTurn(nodes, partial)
-        : enclosingPromptTurn(nodes, change.seq, partial)
+        ? firstVisibleTurn(nodes, partial, inputTurns)
+        : inputTurns !== undefined
+          ? request.turn
+          : enclosingPromptTurn(nodes, change.seq, partial)
       pushMessage(turn, {
         absTime: finiteTime(change.time),
         cell: {
@@ -352,9 +356,10 @@ export function deriveTrajectoryLayout(input: TrajectoryLayoutInput): readonly T
     }
     const { node, nodeIndex: i } = entry
     if (node.kind === 'user') {
-      // user/message has no turn on the wire; enclose it in the next assistant
-      // (or partial) turn, else open the turn after the last assistant.
-      const turn = enclosingUserTurn(followingAssistants[i], partial, lastAssistantTurn)
+      // Prefer known input ownership; generic DeepSeek nodes need the next
+      // assistant (or partial) to infer their turn.
+      const turn = inputTurns?.get(node.seq)
+        ?? enclosingUserTurn(followingAssistants[i], partial, lastAssistantTurn)
       pushMessage(turn, {
         absTime: finiteTime(node.time),
         cell: {
@@ -400,7 +405,8 @@ export function deriveTrajectoryLayout(input: TrajectoryLayoutInput): readonly T
       continue
     }
     if (node.kind === 'context') {
-      const turn = enclosingUserTurn(followingAssistants[i], partial, lastAssistantTurn)
+      const turn = inputTurns?.get(node.seq)
+        ?? enclosingUserTurn(followingAssistants[i], partial, lastAssistantTurn)
       pushMessage(turn, {
         absTime: finiteTime(node.time),
         cell: {
@@ -919,12 +925,14 @@ function enclosingPromptTurn(
 function firstVisibleTurn(
   nodes: ConversationSnapshot['nodes'],
   partial: ConversationSnapshot['partial'],
+  inputTurns?: ReadonlyMap<number, number>,
 ): number {
   const turns = nodes.flatMap(node =>
     node.kind === 'assistant' && node.turn > 0
       ? [node.turn]
       : [],
   )
+  if (inputTurns !== undefined) turns.push(...inputTurns.values())
   if (partial !== null && partial.turn > 0) turns.push(partial.turn)
   return turns.length === 0 ? 1 : Math.min(...turns)
 }
diff --git a/web/src/i18n/sourceCatalog.generated.js b/web/src/i18n/sourceCatalog.generated.js
index d061f77aa..038783c13 100644
--- a/web/src/i18n/sourceCatalog.generated.js
+++ b/web/src/i18n/sourceCatalog.generated.js
@@ -48,6 +48,7 @@ export const sourceCatalogs = {
     "s_051836569928a9f9": "编辑",
     "s_054b73a972372bdb": "未找到可用终端",
     "s_05564f10bcba6ae8": "同一专家可属于多个 Tag",
+    "s_055761c5f8f17c52": "无法保存快捷键，请检查本地存储后重试。",
     "s_057dc352ed0a0a29": "更换机器人",
     "s_0580fcee37e02012": "删除失败：",
     "s_05a531a083e68807": "复制 {{p0}} 验证码 {{p1}}",
@@ -164,6 +165,7 @@ export const sourceCatalogs = {
     "s_0eb01c40432b05a9": "连接中断,正在自动重试",
     "s_0eca7afbf4f68601": "搜索技能名称或描述...",
     "s_0ecd009b61757eae": "创建独立 worktree，不包含未提交的修改。",
+    "s_0ef300e7bd9ba7eb": "Skill 扫描路径",
     "s_0f415f8b2bbbb37a": "读取运行记录失败：",
     "s_0f673a156d4bf981": "已开启 · {{p0}}",
     "s_0f7f6afb91e8922f": "移除引用",
@@ -225,6 +227,7 @@ export const sourceCatalogs = {
     "s_143dab9db74c3131": "连接完成",
     "s_145219e726b87790": "隐藏",
     "s_145eb48a326b5d27": "工具重写",
+    "s_14749c39dc5360cd": "尚未配置此范围的 Skill 扫描路径",
     "s_148d195e21b05db5": "配置",
     "s_14cbad1d857ee3e6": "连接已断开，停止状态尚未确认",
     "s_14d1e349b14010a9": "取消下载",
@@ -321,6 +324,7 @@ export const sourceCatalogs = {
     "s_1cc1ea7fb359ec40": "删除选中会话",
     "s_1cc4fe9f4a805c31": "无法获取主题包保存位置",
     "s_1cd76380a57afa58": "记忆服务在当前后台进程中不可用",
+    "s_1ce4a48671f5cf19": "skill skills scan search paths directories 技能 扫描 搜索 路径 目录",
     "s_1ce6b1d7c95ce2ee": "排序方式",
     "s_1cee7b587eb6ad2c": "模型目录尚未就绪",
     "s_1d00d201173df797": "工作目录:{{p0}}",
@@ -400,6 +404,7 @@ export const sourceCatalogs = {
     "s_23e72c9485191f17": "模型已探测，但本地缓存写入失败；下次仍需重新探测。",
     "s_23e7fcbc6cb73786": "侧边栏",
     "s_23f176008ae4f3bd": "原生文件数据无效",
+    "s_23f1b226829d3021": "设置 Skill 扫描路径",
     "s_246e46c2a4189cb5": "重命名失败:",
     "s_248e8e2921bcc92c": "会话 conversation messages auto collapse fold expand tools",
     "s_251dee09f7adbd2e": "请先填写凭据",
@@ -466,6 +471,7 @@ export const sourceCatalogs = {
     "s_2b514a81a55f19e7": "刷新已保存模型",
     "s_2b753320799bc433": "与另一个工具的重写名重复",
     "s_2b8ce0693bd34244": "最近运行：",
+    "s_2b9c1321e61c1ba1": "请按下完整的快捷键组合。",
     "s_2ba99f029a459bae": "打开设置窗口",
     "s_2babe1bab7456b5b": "保存记忆失败",
     "s_2be25ce2315f1633": "没有匹配的已保存模型",
@@ -593,6 +599,7 @@ export const sourceCatalogs = {
     "s_381796352dc0301d": "配置已保存但未能生效，请重试",
     "s_3819d5e4aa5dba68": "钢笔",
     "s_382c0306b7f3e138": "等同当前会话的停止按钮",
+    "s_38725be8afc17556": "录入期间不会执行快捷键，点击保存后立即生效。",
     "s_38744132b501a1eb": "提问",
     "s_38c043e08502e710": "个性化",
     "s_38cd88ed8b3ddbf1": "复制完整输出",
@@ -660,10 +667,12 @@ export const sourceCatalogs = {
     "s_3f2ced879297c8fa": "会话授权",
     "s_3f36ff3a3639808c": "打开该工作区的 Skill 目录",
     "s_3f4ebc4aad9793b6": "已选择",
+    "s_3f9e489b9e4d2c5b": "收起控制台",
     "s_3f9e9d6f0302baa0": "任务已启动。",
     "s_3fa2541fd877cdaa": "旁路聊天请求失败，请重试。",
     "s_3fa4b23d8bce61c3": "系统信息",
     "s_3fb2a97b1f76c492": "无法关闭建议：",
+    "s_3fb779128cca91a8": "修改快捷键",
     "s_3fcd6eb9531fea24": "模型与权限",
     "s_3fd47edce45b3603": "关闭",
     "s_3fd89a939277f7bd": "复用已保存的模型连接",
@@ -830,6 +839,7 @@ export const sourceCatalogs = {
     "s_4e033adb8cd398ff": "复制附件名",
     "s_4e55dcd70d111b0c": "无法获取文件夹路径",
     "s_4e6fd0e28c55860b": "停用",
+    "s_4e8c405c2b796248": "此组合键由系统、浏览器或文本编辑保留，请换一组按键。",
     "s_4eafa9e925b30bcd": "自定义",
     "s_4eb2c65beb7f5731": "使用已下载版本",
     "s_4ef515abfdb8690d": "安装包",
@@ -863,6 +873,7 @@ export const sourceCatalogs = {
     "s_515429adda43aa79": "安全中心",
     "s_516359e3015bc5d7": "没有可复制的 diff",
     "s_517484e7f24726ef": "后台运行",
+    "s_517821b0c539feb4": "使用自定义路径",
     "s_51a4a56a75aa376c": "将控制台日志添加到聊天",
     "s_51a75f4634dfa859": "一",
     "s_51b77d06758f8bf7": "活动加载失败：",
@@ -875,7 +886,6 @@ export const sourceCatalogs = {
     "s_5253040db8643c85": "任务",
     "s_5262e309f037b4f0": "当前会话还没有后台任务。",
     "s_526cb1883acbd3dd": "预览标签页",
-    "s_527020721f1d24c9": "关闭控制台 (Ctrl+`)",
     "s_5292ab1a36c56a6b": "归档",
     "s_52a93fc8c6b557ee": "当前后端不支持流式旁路聊天，请更新 ACECode 后重试。",
     "s_52b06532811be3e4": "与另一条规则重复",
@@ -935,6 +945,7 @@ export const sourceCatalogs = {
     "s_577feeefb88d35cf": "编辑项目",
     "s_5781473201569d72": "沙箱外执行命令",
     "s_57b070922e60d5c4": "允许联网",
+    "s_57cb3a025f981aca": "全局技能分页",
     "s_57d2858750d28004": "调色板",
     "s_57e4fcb2dad50b5c": "远程 Web 模式已开启",
     "s_57eb46dacc97defb": "在任务列表每一行右侧显示最近活动时间，关闭后仍可在悬停卡片里查看",
@@ -983,6 +994,7 @@ export const sourceCatalogs = {
     "s_5cb34fe41f5f9c77": "目录中没有匹配模型，仍可手动输入模型 ID。",
     "s_5cf720c783899644": "留空则直接使用模型 ID",
     "s_5d02c355dcc5bc82": "搜索任务",
+    "s_5d1795923987ec7d": "（下一条）",
     "s_5d24aa8ce6bedc23": "搜索任务、项目或设置",
     "s_5d31027802e2d944": "当前内容未更改",
     "s_5d344e9b4013d978": "进入快捷键并聚焦搜索栏",
@@ -1005,6 +1017,7 @@ export const sourceCatalogs = {
     "s_5ed9104315e191ce": "配置机器人",
     "s_5efd57456cbc23c5": "或运行",
     "s_5f04b51460b1e8d6": "无头 YOLO 放行",
+    "s_5f1ec17ffc7c4d8e": "每行一个目录，按顺序查找，同名技能优先使用靠前的路径。保存空列表将关闭普通目录扫描。",
     "s_5f2cfbfecf9fc4a6": "快捷入口",
     "s_5f53727059cdc69a": "输入你的答案",
     "s_5f5a4c5fb8ab71d6": "输入框当前不可用",
@@ -1047,6 +1060,7 @@ export const sourceCatalogs = {
     "s_64088d8cd78a0e89": "思考中…",
     "s_641778357a5e8a41": "查看配置 Schema",
     "s_643a1b94e9498780": "已信任钩子",
+    "s_64568afad9efa616": "每页条目数",
     "s_6492494fbe805292": "描述灵感，生成专属主题",
     "s_64ded447c5bdd6ea": "验证并继续",
     "s_64e9f3e72b149b27": "此页面意外退出，请重新加载。",
@@ -1077,6 +1091,7 @@ export const sourceCatalogs = {
     "s_6744b4c6a9aa0038": "已关闭",
     "s_674f9ac747ebfd69": "升级已安装，点击查看重启选项",
     "s_67a1de4cea20e015": "打开模型设置",
+    "s_67ee0d22e90a49f5": "已保存，技能扫描路径已更新",
     "s_681139c14b0eea8e": "{{p0}} 等 {{p1}} 个",
     "s_6820f44987bb2ae6": "重试发送",
     "s_682d211b7142758a": "已修改",
@@ -1088,6 +1103,7 @@ export const sourceCatalogs = {
     "s_68675d4b37dc5bc1": "未自动找到 Git Bash。请输入",
     "s_68a09a528d4cb4a6": "已取消归档",
     "s_68b455b6cdbf83a4": "导出 Mermaid 源码",
+    "s_68c0c2cab6899682": "此快捷键已用于“{{p0}}”，请换一组按键。",
     "s_68ec0a1ef12b104e": "此页面需要身份验证",
     "s_68f22858a36d6ac9": "模型列表已刷新",
     "s_690ebc03284945a8": "请求已超时",
@@ -1195,6 +1211,7 @@ export const sourceCatalogs = {
     "s_72ccb1274a093efb": "填写 QQ 开放平台里机器人的 AppID 与 AppSecret,保存前会先验证。",
     "s_72dde8dfef88d37d": "确认添加",
     "s_72ec61d7855c86a1": "请求超时（秒）",
+    "s_7310f2c21a738bd0": "（上一条）",
     "s_737c725c1321d260": "已保存 {{p0}},留空则不修改",
     "s_73952aa91a9366b5": "已切换至 ",
     "s_73ae35f541bc8124": "复制附件地址",
@@ -1231,6 +1248,7 @@ export const sourceCatalogs = {
     "s_75dfaf262f476b6c": "取消中",
     "s_75e8c9e1324b05c4": "权限被拒",
     "s_760f9739d4cbcc55": "打开任务完成通知",
+    "s_7622b58750bc7c55": "打开控制台",
     "s_7626053cb6469500": "等待 xAI 授权",
     "s_76420433f22d1c80": "导出",
     "s_764c924f22a0564b": "目录链接",
@@ -1264,11 +1282,11 @@ export const sourceCatalogs = {
     "s_78e5c1be3c1a2347": "壶铃",
     "s_78ea07a31cd96f65": "从此版本开始记录新的 token 用量,历史会话不会回填",
     "s_79167440a990362e": "会话已导出:{{p0}}",
+    "s_7917e52536a24669": "关闭控制台",
     "s_79209170acff4896": "等待授权",
     "s_79383e9981843085": "读取 Web 核心信息",
     "s_7948c26c9630a0cc": "资深开发工程师",
     "s_79612d07708f27c8": "平台状态",
-    "s_7967bb84220ae3d1": "该工作区没有技能;放到项目的 .acecode/skills 目录即可被发现",
     "s_797644874d78c30a": "剪贴板不可用",
     "s_79ee5900e8dc266b": "{{p0}} 配对请求",
     "s_79f326be4409d51f": "项目",
@@ -1363,6 +1381,7 @@ export const sourceCatalogs = {
     "s_8143449ded6af56c": "展开项目",
     "s_81508b76150acb3d": "留空从 PATH 查找",
     "s_817af552ff22fdff": "加载失败:",
+    "s_817fe9a6a8fa909f": "录入快捷键",
     "s_81b430b696435180": "微信",
     "s_81c9f5ef56c3acfd": "summary title generation local model 摘要模型 会话标题",
     "s_81ee43758501ff89": "例如 128000",
@@ -1464,6 +1483,7 @@ export const sourceCatalogs = {
     "s_8a32f1c8f96d5905": "沙箱后端不可用:{{p0}}",
     "s_8a687fb42860ccd0": "思考深度：{{p0}}",
     "s_8a721474fd137ec7": "检查更新失败:",
+    "s_8a8542f6964852dc": "下一页",
     "s_8a85cf0cab5e43e4": "加载失败 (HTTP {{p0}})",
     "s_8a99be840844819a": "正在停止…",
     "s_8ad47a9757f7f39b": "暗黑模式",
@@ -1566,6 +1586,7 @@ export const sourceCatalogs = {
     "s_93056bbdb0cb427b": "/{{p0}} 暂不支持附件或上下文，请仅提交文字问题",
     "s_930d70a879021dd7": "请恢复网络连接，然后重试。",
     "s_930ee3c6483b98c6": "隐藏完整目标",
+    "s_9314516c66885dc4": "保存路径",
     "s_932b072e3e03d2ad": "不在全局允许范围内；该专家仍可单独启用",
     "s_934054a9de617aad": "加载自定义指令失败:",
     "s_9344597efd4950cc": "执行失败",
@@ -1587,9 +1608,12 @@ export const sourceCatalogs = {
     "s_9477f35309b3d9f3": "该专家由当前项目提供，只能查看和派遣。",
     "s_947821324c97b7e5": "命令未记录",
     "s_949cf55bb66e100d": "config.json 中配置的插件",
+    "s_94ab83f1fcb5b7b9": "修改快捷键：{{p0}}{{p1}}",
     "s_94c37ae7b384c7d9": "发现诊断",
     "s_94f60d2252d6b686": "页面暂时不可用",
     "s_9558b453affd1197": "变更文件目录树",
+    "s_9564346d90b8b453": "{{p0}} 技能分页",
+    "s_958e80e994443818": "点击下方输入框，然后按下新的组合键",
     "s_959711ef9b3f25c6": "能力 {{p0}}",
     "s_959bca4a9cf42d60": "未找到钩子",
     "s_95a6dd0452629c54": "文件安全",
@@ -1692,6 +1716,7 @@ export const sourceCatalogs = {
     "s_9fa433be4c58ee49": "Agent 浏览器",
     "s_9fa9840d7aa93802": "主题色箭头，右下角显示 ACE",
     "s_9fc9368cc2c409a3": "暂无已配置插件",
+    "s_9fcad048086de1f8": "${ACECODE_DATA_DIR} 为数据目录；${XDG_CONFIG_HOME}、${XDG_CACHE_HOME} 默认分别为 ~/.config、~/.cache。未设置的其他变量会跳过。",
     "s_9fd56f7aae1ca61d": "显示隐藏项目",
     "s_9fef8ee282a01ab9": "本地模型目录格式不完整，请更新 ACECode 或刷新目录。",
     "s_9ff545329109ea65": "机主:{{p0}}",
@@ -1823,6 +1848,7 @@ export const sourceCatalogs = {
     "s_ac8e7ffd9e3458ab": "本平台没有可用沙盒,未知命令需要确认",
     "s_acae259f56e1fc3e": "浏览器页面已关闭",
     "s_acb60e5e17fe5e0a": "当前安装的 ACECode 已是最新版本。",
+    "s_acf6e8244ae05b33": "第 {{p0}} / {{p1}} 页，共 {{p2}} 条",
     "s_acfc4e74a650e7df": "下一步",
     "s_acfc92e72a99cc1a": "危险模式下不能开启远程 Web 模式",
     "s_ad06511b816a27fe": "{{p0}} 天 Tokens",
@@ -1930,7 +1956,6 @@ export const sourceCatalogs = {
     "s_b8f88aeead1520c8": "辅助功能",
     "s_b913e107ad8b0d83": "结束时间必须晚于开始时间",
     "s_b91472f6f25b1041": "输入消息或 / 命令…",
-    "s_b91b8a344a77fca6": "目录路径为空",
     "s_b9238eb0c9178901": "主题操作失败，请重试",
     "s_b925ae46007cd1f0": "机主绑定二维码",
     "s_b92b399d2820c415": "清除已保存密钥",
@@ -1942,6 +1967,7 @@ export const sourceCatalogs = {
     "s_b97d204a445b008d": "更新服务返回无效响应",
     "s_b9865b178892458e": "Copilot 登录已开始",
     "s_b9881117e54db03e": "已排队，等待当前目录中的任务结束。",
+    "s_b9a211063977fc57": "加载 Skill 扫描路径失败：",
     "s_b9a9f6c29b6d7f50": "请输入 http 或 https 地址",
     "s_b9e7a008a930dba2": "复制预览信息",
     "s_b9f07dc1e2f18bba": "新建专家",
@@ -2036,6 +2062,7 @@ export const sourceCatalogs = {
     "s_c2277872cdcec9e0": "有未保存的修改",
     "s_c237834f0849d424": "{{p0}} 使用了 {{p1}} 个 Token",
     "s_c23f7ae7d246d7e4": "没有可导入的 opencode 会话",
+    "s_c270560004b02761": "请搭配 Ctrl、Cmd 或 Alt，或使用功能键，避免影响正常输入。",
     "s_c27916570d04cf33": "当前工作区未在后台服务中登记",
     "s_c2a497830ef74215": "最新版本",
     "s_c2b732b196ccc7f3": "会话已彻底删除",
@@ -2100,6 +2127,7 @@ export const sourceCatalogs = {
     "s_c98e118e0a43f078": "模型",
     "s_c9ab94fde1e49d6b": "已指定 1 位主理人",
     "s_c9b87f516a38ea36": "五",
+    "s_c9b9ae7a61444ab7": "上一页",
     "s_c9c2e9f16df28557": "当前桌面版本无法保存文件，请更新客户端后重试",
     "s_c9f9e18b06233971": "添加规则",
     "s_ca0e02c309a977df": "默认模式",
@@ -2107,7 +2135,6 @@ export const sourceCatalogs = {
     "s_ca2999f99ae929cf": "工具 {{p0}} 正在等待权限确认",
     "s_ca36bb18781eb5c0": "读取目录失败:{{p0}}",
     "s_ca3b53e14e9b3c6f": "此消息不可分叉(无 ID)",
-    "s_ca403795aaaa05b8": "收起控制台 (Ctrl+`)",
     "s_ca4353258c1aa8b6": "智能添加定时任务",
     "s_ca478c91d3839a44": "输入 API Key",
     "s_ca48ad24f64e90a1": "协助用户总结当前会话的摘要",
@@ -2153,6 +2180,7 @@ export const sourceCatalogs = {
     "s_ce5419d398b3aae8": "（可选，留空表示始终生效）",
     "s_ce5b1bb1da5e76f1": "正在解压安装包",
     "s_ce70cddf9261401d": "回到当前输入框，保留草稿",
+    "s_ce79d2e77461ae05": "使用默认路径",
     "s_ce99adb25bdca08b": "下次退出时将停止后台进程",
     "s_cea5fddb03aa0275": "来自升级服务的历次版本说明",
     "s_ceb33e0328a6f776": "保存定时任务失败",
@@ -2227,6 +2255,7 @@ export const sourceCatalogs = {
     "s_d593d21fca298b8f": "微信机器人",
     "s_d5d126f6c79d9b11": "所有工作区",
     "s_d5d360963aa38a66": "打开会话失败:",
+    "s_d5db7a478068a1f7": "保存 Skill 扫描路径失败：",
     "s_d5e75e3452a056c7": "插话提交失败:",
     "s_d5f5a7a010731feb": "今天",
     "s_d61b27abfe74268f": "正在探测模型…",
@@ -2284,7 +2313,6 @@ export const sourceCatalogs = {
     "s_da8649278bb4f113": "选择 shell",
     "s_da9688984cdcb675": "暂无任务",
     "s_daa0e755d325add8": "钱币",
-    "s_daaac36c202b72a7": "打开控制台 (Ctrl+`)",
     "s_dac3ffabca3f2d31": "生效日期区间",
     "s_dae07c51f743dd55": "页面响应超时",
     "s_dae661d17c2dd8f0": "空闲",
@@ -2334,12 +2362,14 @@ export const sourceCatalogs = {
     "s_deb6051740064edd": "使用记忆",
     "s_dec96df98f052d22": "打开 LINE Developers",
     "s_deeceedbed503b78": "每日代码健康巡检",
+    "s_df0ee0cbc554323b": "相对路径从当前工作区逐级向上查找；绝对路径和 ~ 路径作为全局目录。支持 ${ENV} 环境变量。",
     "s_df359a6a54eab051": "通过配置和已启用的插件管理生命周期钩子。",
     "s_df3d58c7d84b85f2": "设置",
     "s_df4c0ce7af6b33d1": "请选择要导入的 opencode 会话",
     "s_df6aca03747ecd4b": "爪印",
     "s_df7d927c6260c252": "规则目录:{{p0}}",
     "s_dfb802238b38fbd4": "已启用",
+    "s_dfbbbe21c658be44": "该工作区没有技能，可在配置中设置 Skill 扫描路径",
     "s_dfcf27a99f8030d5": "保存专家",
     "s_dfd1bea66a52f491": "正在重试…",
     "s_e005e6e25e18c527": "刷新文件列表",
@@ -2472,7 +2502,6 @@ export const sourceCatalogs = {
     "s_ebd8027daae319aa": "搜索会话、工作区和设置",
     "s_ec7a11c7061bc164": "正在迁移工作空间…",
     "s_ec869826ec67f839": "Agent Browser 的部分浏览器数据未能复制，重启后可能需要重新登录",
-    "s_ec9bbc8139d8bdd1": "专",
     "s_ecdf5ea03d83b916": "line messaging api channel secret webhook cloudflared 机器人 im channel 消息通道 连接 取消连接",
     "s_ece45f7651c8c206": "Agent Browser 桌面桥不可用",
     "s_ed100f18801746c9": "命令规则已保存",
@@ -2748,6 +2777,7 @@ export const sourceCatalogs = {
     "s_051836569928a9f9": "edit",
     "s_054b73a972372bdb": "No usable terminal found",
     "s_05564f10bcba6ae8": "The same expert can belong to multiple Tags",
+    "s_055761c5f8f17c52": "Could not save the shortcut. Check local storage and try again.",
     "s_057dc352ed0a0a29": "Change bot",
     "s_0580fcee37e02012": "Delete failed:",
     "s_05a531a083e68807": "Copy {{p0}} verification code {{p1}}",
@@ -2864,6 +2894,7 @@ export const sourceCatalogs = {
     "s_0eb01c40432b05a9": "Connection lost, retrying automatically",
     "s_0eca7afbf4f68601": "Search for skill name or description...",
     "s_0ecd009b61757eae": "Create a separate worktree. Uncommitted changes are not included.",
+    "s_0ef300e7bd9ba7eb": "Skill scan paths",
     "s_0f415f8b2bbbb37a": "Failed to read running records:",
     "s_0f673a156d4bf981": "On · {{p0}}",
     "s_0f7f6afb91e8922f": "Remove reference",
@@ -2925,6 +2956,7 @@ export const sourceCatalogs = {
     "s_143dab9db74c3131": "All set",
     "s_145219e726b87790": "Hidden",
     "s_145eb48a326b5d27": "Tool rewrite",
+    "s_14749c39dc5360cd": "No Skill scan path is configured for this scope",
     "s_148d195e21b05db5": "Configuration",
     "s_14cbad1d857ee3e6": "Disconnected. The stop has not been confirmed",
     "s_14d1e349b14010a9": "Cancel download",
@@ -3021,6 +3053,7 @@ export const sourceCatalogs = {
     "s_1cc1ea7fb359ec40": "Delete selected sessions",
     "s_1cc4fe9f4a805c31": "Could not get the theme package save location",
     "s_1cd76380a57afa58": "The memory service is unavailable in the current background process",
+    "s_1ce4a48671f5cf19": "skill skills scan search paths directories",
     "s_1ce6b1d7c95ce2ee": "Sort order",
     "s_1cee7b587eb6ad2c": "The model catalog is not ready yet",
     "s_1d00d201173df797": "Working directory: {{p0}}",
@@ -3100,6 +3133,7 @@ export const sourceCatalogs = {
     "s_23e72c9485191f17": "Models were detected, but the local cache could not be saved. You will need to detect them again next time.",
     "s_23e7fcbc6cb73786": "Sidebar",
     "s_23f176008ae4f3bd": "The native file data is invalid",
+    "s_23f1b226829d3021": "Configure Skill scan paths",
     "s_246e46c2a4189cb5": "Rename failed:",
     "s_248e8e2921bcc92c": "conversation messages auto collapse fold expand tools",
     "s_251dee09f7adbd2e": "Fill in the credentials first",
@@ -3166,6 +3200,7 @@ export const sourceCatalogs = {
     "s_2b514a81a55f19e7": "Refresh saved models",
     "s_2b753320799bc433": "Duplicate of another rewrite name",
     "s_2b8ce0693bd34244": "Recently run:",
+    "s_2b9c1321e61c1ba1": "Press a complete key combination.",
     "s_2ba99f029a459bae": "Open the settings window",
     "s_2babe1bab7456b5b": "Could not save memory",
     "s_2be25ce2315f1633": "No matching saved models",
@@ -3293,6 +3328,7 @@ export const sourceCatalogs = {
     "s_381796352dc0301d": "Settings were saved but could not be applied. Please try again",
     "s_3819d5e4aa5dba68": "Pen",
     "s_382c0306b7f3e138": "Same as the current conversation’s Stop button",
+    "s_38725be8afc17556": "Shortcuts do not run while recording. Changes take effect when saved.",
     "s_38744132b501a1eb": "Question",
     "s_38c043e08502e710": "Personalization",
     "s_38cd88ed8b3ddbf1": "Copy full output",
@@ -3360,10 +3396,12 @@ export const sourceCatalogs = {
     "s_3f2ced879297c8fa": "Session grant",
     "s_3f36ff3a3639808c": "Open the Skill directory for this workspace",
     "s_3f4ebc4aad9793b6": "Selected",
+    "s_3f9e489b9e4d2c5b": "Collapse console",
     "s_3f9e9d6f0302baa0": "Task started.",
     "s_3fa2541fd877cdaa": "The side chat request failed. Try again.",
     "s_3fa4b23d8bce61c3": "System information",
     "s_3fb2a97b1f76c492": "Could not close the suggestion:",
+    "s_3fb779128cca91a8": "Edit shortcut",
     "s_3fcd6eb9531fea24": "Models and Permissions",
     "s_3fd47edce45b3603": "closure",
     "s_3fd89a939277f7bd": "Reuse a saved model connection",
@@ -3530,6 +3568,7 @@ export const sourceCatalogs = {
     "s_4e033adb8cd398ff": "Copy attachment name",
     "s_4e55dcd70d111b0c": "Unable to get folder path",
     "s_4e6fd0e28c55860b": "deactivate",
+    "s_4e8c405c2b796248": "This combination is reserved by the system, browser or text editor. Choose another combination.",
     "s_4eafa9e925b30bcd": "Custom",
     "s_4eb2c65beb7f5731": "Use downloaded version",
     "s_4ef515abfdb8690d": "Installation package",
@@ -3563,6 +3602,7 @@ export const sourceCatalogs = {
     "s_515429adda43aa79": "Security Center",
     "s_516359e3015bc5d7": "No diff to copy",
     "s_517484e7f24726ef": "Running in the background",
+    "s_517821b0c539feb4": "Using custom paths",
     "s_51a4a56a75aa376c": "Add console logs to chat",
     "s_51a75f4634dfa859": "one",
     "s_51b77d06758f8bf7": "Could not load activity:",
@@ -3575,7 +3615,6 @@ export const sourceCatalogs = {
     "s_5253040db8643c85": "Task",
     "s_5262e309f037b4f0": "There are no background tasks for the current session.",
     "s_526cb1883acbd3dd": "Preview tab",
-    "s_527020721f1d24c9": "Close the console (Ctrl+`)",
     "s_5292ab1a36c56a6b": "Archive",
     "s_52a93fc8c6b557ee": "This backend does not support streaming side chat. Update ACECode and try again.",
     "s_52b06532811be3e4": "Duplicates another rule",
@@ -3635,6 +3674,7 @@ export const sourceCatalogs = {
     "s_577feeefb88d35cf": "Edit project",
     "s_5781473201569d72": "Command ran outside the sandbox",
     "s_57b070922e60d5c4": "allow network access",
+    "s_57cb3a025f981aca": "Global skills pagination",
     "s_57d2858750d28004": "Palette",
     "s_57e4fcb2dad50b5c": "Remote Web mode enabled",
     "s_57eb46dacc97defb": "Show the last active time on the right of each task row; when off, it is still available in the hover card",
@@ -3683,6 +3723,7 @@ export const sourceCatalogs = {
     "s_5cb34fe41f5f9c77": "No matching models were found in the catalog. You can still enter a model ID manually.",
     "s_5cf720c783899644": "Leave blank to use the model IDs as-is",
     "s_5d02c355dcc5bc82": "Search tasks",
+    "s_5d1795923987ec7d": "(next)",
     "s_5d24aa8ce6bedc23": "Search tasks, projects, or settings",
     "s_5d31027802e2d944": "The current content has not changed",
     "s_5d344e9b4013d978": "Open keyboard shortcuts and focus search",
@@ -3705,6 +3746,7 @@ export const sourceCatalogs = {
     "s_5ed9104315e191ce": "Configure bot",
     "s_5efd57456cbc23c5": "or run",
     "s_5f04b51460b1e8d6": "Allowed by headless YOLO",
+    "s_5f1ec17ffc7c4d8e": "One directory per line, searched in order. Earlier paths take priority for duplicate skills. Saving an empty list disables ordinary directory scanning.",
     "s_5f2cfbfecf9fc4a6": "Quick access",
     "s_5f53727059cdc69a": "Enter your answer",
     "s_5f5a4c5fb8ab71d6": "The input box is currently unavailable",
@@ -3747,6 +3789,7 @@ export const sourceCatalogs = {
     "s_64088d8cd78a0e89": "Thinking…",
     "s_641778357a5e8a41": "View configuration schema",
     "s_643a1b94e9498780": "Trusted hook",
+    "s_64568afad9efa616": "Items per page",
     "s_6492494fbe805292": "Describe your idea, create your theme",
     "s_64ded447c5bdd6ea": "Verify and continue",
     "s_64e9f3e72b149b27": "This page exited unexpectedly. Reload it.",
@@ -3777,6 +3820,7 @@ export const sourceCatalogs = {
     "s_6744b4c6a9aa0038": "Closed",
     "s_674f9ac747ebfd69": "The upgrade has been installed, click to view restart options",
     "s_67a1de4cea20e015": "Open model settings",
+    "s_67ee0d22e90a49f5": "Saved. Skill scan paths updated.",
     "s_681139c14b0eea8e": "{{p0}} and others ({{p1}} in total)",
     "s_6820f44987bb2ae6": "Retry sending",
     "s_682d211b7142758a": "Modified",
@@ -3788,6 +3832,7 @@ export const sourceCatalogs = {
     "s_68675d4b37dc5bc1": "Git Bash was not found automatically. Please enter",
     "s_68a09a528d4cb4a6": "Unarchived",
     "s_68b455b6cdbf83a4": "Export Mermaid source",
+    "s_68c0c2cab6899682": "This shortcut is already used by “{{p0}}”. Choose another combination.",
     "s_68ec0a1ef12b104e": "This page requires authentication",
     "s_68f22858a36d6ac9": "Model list has been refreshed",
     "s_690ebc03284945a8": "The request has timed out",
@@ -3895,6 +3940,7 @@ export const sourceCatalogs = {
     "s_72ccb1274a093efb": "Enter the bot's AppID and AppSecret from QQ Open Platform. They are verified before saving.",
     "s_72dde8dfef88d37d": "Confirm to add",
     "s_72ec61d7855c86a1": "Request timeout (seconds)",
+    "s_7310f2c21a738bd0": "(previous)",
     "s_737c725c1321d260": "Saved {{p0}}. Leave blank to keep it",
     "s_73952aa91a9366b5": "Switched to",
     "s_73ae35f541bc8124": "Copy attachment address",
@@ -3931,6 +3977,7 @@ export const sourceCatalogs = {
     "s_75dfaf262f476b6c": "Unarchiving…",
     "s_75e8c9e1324b05c4": "Permission denied",
     "s_760f9739d4cbcc55": "Enable task completion notifications",
+    "s_7622b58750bc7c55": "Open console",
     "s_7626053cb6469500": "Waiting for xAI authorization",
     "s_76420433f22d1c80": "Export",
     "s_764c924f22a0564b": "Folder link",
@@ -3964,11 +4011,11 @@ export const sourceCatalogs = {
     "s_78e5c1be3c1a2347": "Kettlebell",
     "s_78ea07a31cd96f65": "Starting from this version, new token usage will be recorded, and historical sessions will not be backfilled.",
     "s_79167440a990362e": "Session exported:{{p0}}",
+    "s_7917e52536a24669": "Close console",
     "s_79209170acff4896": "Waiting for approval",
     "s_79383e9981843085": "Read web core information",
     "s_7948c26c9630a0cc": "Senior development engineer",
     "s_79612d07708f27c8": "Platform status",
-    "s_7967bb84220ae3d1": "There are no skills in this workspace; they can be found by placing them in the project's.acecode/skills directory.",
     "s_797644874d78c30a": "Clipboard unavailable",
     "s_79ee5900e8dc266b": "{{p0}} pairing request",
     "s_79f326be4409d51f": "Project",
@@ -4063,6 +4110,7 @@ export const sourceCatalogs = {
     "s_8143449ded6af56c": "Expand project",
     "s_81508b76150acb3d": "Leave empty to search PATH",
     "s_817af552ff22fdff": "Loading failed:",
+    "s_817fe9a6a8fa909f": "Record shortcut",
     "s_81b430b696435180": "WeChat",
     "s_81c9f5ef56c3acfd": "summary title generation local model summary model session title",
     "s_81ee43758501ff89": "For example, 128000",
@@ -4164,6 +4212,7 @@ export const sourceCatalogs = {
     "s_8a32f1c8f96d5905": "Sandbox backend unavailable: {{p0}}",
     "s_8a687fb42860ccd0": "Reasoning depth: {{p0}}",
     "s_8a721474fd137ec7": "Checking for updates failed:",
+    "s_8a8542f6964852dc": "Next page",
     "s_8a85cf0cab5e43e4": "Loading failed (HTTP {{p0}})",
     "s_8a99be840844819a": "Stopping…",
     "s_8ad47a9757f7f39b": "Dark mode",
@@ -4266,6 +4315,7 @@ export const sourceCatalogs = {
     "s_93056bbdb0cb427b": "/{{p0}} does not currently support attachments or context, please submit text questions only",
     "s_930d70a879021dd7": "Restore your network connection, then try again.",
     "s_930ee3c6483b98c6": "Hide full goal",
+    "s_9314516c66885dc4": "Save paths",
     "s_932b072e3e03d2ad": "Not allowed by global policy; this expert can still enable it",
     "s_934054a9de617aad": "Failed to load custom directive:",
     "s_9344597efd4950cc": "Execution failed",
@@ -4287,9 +4337,12 @@ export const sourceCatalogs = {
     "s_9477f35309b3d9f3": "This expert is provided by the current project and can only be viewed and dispatched.",
     "s_947821324c97b7e5": "Command not recorded",
     "s_949cf55bb66e100d": "Plugins configured in config.json",
+    "s_94ab83f1fcb5b7b9": "Edit shortcut: {{p0}}{{p1}}",
     "s_94c37ae7b384c7d9": "discover diagnosis",
     "s_94f60d2252d6b686": "Page temporarily unavailable",
     "s_9558b453affd1197": "Changed file directory tree",
+    "s_9564346d90b8b453": "{{p0}} skill pagination",
+    "s_958e80e994443818": "Click the field below, then press the new key combination",
     "s_959711ef9b3f25c6": "Capabilities {{p0}}",
     "s_959bca4a9cf42d60": "Hook not found",
     "s_95a6dd0452629c54": "File security",
@@ -4392,6 +4445,7 @@ export const sourceCatalogs = {
     "s_9fa433be4c58ee49": "Agent Browser",
     "s_9fa9840d7aa93802": "Theme-colored arrow with ACE at the bottom right",
     "s_9fc9368cc2c409a3": "No plugins configured",
+    "s_9fcad048086de1f8": "${ACECODE_DATA_DIR} is the data directory; ${XDG_CONFIG_HOME} and ${XDG_CACHE_HOME} default to ~/.config and ~/.cache. Paths with other unset variables are skipped.",
     "s_9fd56f7aae1ca61d": "Show hidden items",
     "s_9fef8ee282a01ab9": "The local model catalog is incomplete. Update ACECode or refresh the catalog.",
     "s_9ff545329109ea65": "Owner: {{p0}}",
@@ -4523,6 +4577,7 @@ export const sourceCatalogs = {
     "s_ac8e7ffd9e3458ab": "No sandbox is available; unknown commands require approval",
     "s_acae259f56e1fc3e": "The browser page has been closed",
     "s_acb60e5e17fe5e0a": "The currently installed ACECode is the latest version.",
+    "s_acf6e8244ae05b33": "Page {{p0}} / {{p1}}, {{p2}} items",
     "s_acfc4e74a650e7df": "Next step",
     "s_acfc92e72a99cc1a": "Remote Web mode cannot be enabled in dangerous mode",
     "s_ad06511b816a27fe": "{{p0}} days Tokens",
@@ -4630,7 +4685,6 @@ export const sourceCatalogs = {
     "s_b8f88aeead1520c8": "Accessibility",
     "s_b913e107ad8b0d83": "End time must be later than start time",
     "s_b91472f6f25b1041": "Enter message or /command…",
-    "s_b91b8a344a77fca6": "Directory path is empty",
     "s_b9238eb0c9178901": "The theme action failed. Try again.",
     "s_b925ae46007cd1f0": "Owner binding QR code",
     "s_b92b399d2820c415": "Clear saved key",
@@ -4642,6 +4696,7 @@ export const sourceCatalogs = {
     "s_b97d204a445b008d": "Update service returned invalid response",
     "s_b9865b178892458e": "Copilot login has started",
     "s_b9881117e54db03e": "Queued until tasks in the current directory finish.",
+    "s_b9a211063977fc57": "Failed to load Skill scan paths:",
     "s_b9a9f6c29b6d7f50": "Enter an HTTP or HTTPS address",
     "s_b9e7a008a930dba2": "Copy preview information",
     "s_b9f07dc1e2f18bba": "New expert",
@@ -4736,6 +4791,7 @@ export const sourceCatalogs = {
     "s_c2277872cdcec9e0": "Unsaved changes",
     "s_c237834f0849d424": "{{p0}}: {{p1}} tokens used",
     "s_c23f7ae7d246d7e4": "No opencode sessions to import",
+    "s_c270560004b02761": "Include Ctrl, Cmd or Alt, or use a function key to preserve normal typing.",
     "s_c27916570d04cf33": "The current workspace is not registered with the background service",
     "s_c2a497830ef74215": "latest version",
     "s_c2b732b196ccc7f3": "Conversation has been completely deleted",
@@ -4800,6 +4856,7 @@ export const sourceCatalogs = {
     "s_c98e118e0a43f078": "Models",
     "s_c9ab94fde1e49d6b": "1 manager assigned",
     "s_c9b87f516a38ea36": "five",
+    "s_c9b9ae7a61444ab7": "Previous page",
     "s_c9c2e9f16df28557": "This desktop version cannot save files. Update the app and try again.",
     "s_c9f9e18b06233971": "Add rule",
     "s_ca0e02c309a977df": "Default mode",
@@ -4807,7 +4864,6 @@ export const sourceCatalogs = {
     "s_ca2999f99ae929cf": "Tool {{p0}} is waiting for permission confirmation",
     "s_ca36bb18781eb5c0": "Could not read the folder: {{p0}}",
     "s_ca3b53e14e9b3c6f": "This message is not forkable (no ID)",
-    "s_ca403795aaaa05b8": "Collapse console (Ctrl+`)",
     "s_ca4353258c1aa8b6": "Add scheduled task with AI",
     "s_ca478c91d3839a44": "Enter API key",
     "s_ca48ad24f64e90a1": "Help summarize the current conversation",
@@ -4853,6 +4909,7 @@ export const sourceCatalogs = {
     "s_ce5419d398b3aae8": "(Optional, leave blank to always take effect)",
     "s_ce5b1bb1da5e76f1": "Unzipping the installation package",
     "s_ce70cddf9261401d": "Return to the message input and keep your draft",
+    "s_ce79d2e77461ae05": "Using default paths",
     "s_ce99adb25bdca08b": "The background process will be stopped the next time you exit",
     "s_cea5fddb03aa0275": "Previous version notes from the upgrade service",
     "s_ceb33e0328a6f776": "Failed to save scheduled task",
@@ -4927,6 +4984,7 @@ export const sourceCatalogs = {
     "s_d593d21fca298b8f": "WeChat bot",
     "s_d5d126f6c79d9b11": "All workspaces",
     "s_d5d360963aa38a66": "Failed to open session:",
+    "s_d5db7a478068a1f7": "Failed to save Skill scan paths:",
     "s_d5e75e3452a056c7": "Failed to submit interjection:",
     "s_d5f5a7a010731feb": "today",
     "s_d61b27abfe74268f": "Detecting models…",
@@ -4984,7 +5042,6 @@ export const sourceCatalogs = {
     "s_da8649278bb4f113": "Select shell",
     "s_da9688984cdcb675": "No tasks yet",
     "s_daa0e755d325add8": "Money",
-    "s_daaac36c202b72a7": "Open console (Ctrl+`)",
     "s_dac3ffabca3f2d31": "Effective date range",
     "s_dae07c51f743dd55": "Page response timed out",
     "s_dae661d17c2dd8f0": "idle",
@@ -5034,12 +5091,14 @@ export const sourceCatalogs = {
     "s_deb6051740064edd": "Use memory",
     "s_dec96df98f052d22": "Open LINE Developers",
     "s_deeceedbed503b78": "Daily code health inspection",
+    "s_df0ee0cbc554323b": "Relative paths are searched from the workspace up through its ancestors; absolute and ~ paths are global. ${ENV} environment variables are supported.",
     "s_df359a6a54eab051": "Manage lifecycle hooks via configuration and enabled plugins.",
     "s_df3d58c7d84b85f2": "Settings",
     "s_df4c0ce7af6b33d1": "Please select an opencode session to import",
     "s_df6aca03747ecd4b": "Paw print",
     "s_df7d927c6260c252": "Rules directory: {{p0}}",
     "s_dfb802238b38fbd4": "Enabled",
+    "s_dfbbbe21c658be44": "No skills in this workspace. Set Skill scan paths in Configuration.",
     "s_dfcf27a99f8030d5": "Save expert",
     "s_dfd1bea66a52f491": "Trying again…",
     "s_e005e6e25e18c527": "Refresh file list",
@@ -5172,7 +5231,6 @@ export const sourceCatalogs = {
     "s_ebd8027daae319aa": "Search conversations, workspaces and settings",
     "s_ec7a11c7061bc164": "Migrating workspace…",
     "s_ec869826ec67f839": "Some Agent Browser data could not be copied. You may need to sign in again after restarting.",
-    "s_ec9bbc8139d8bdd1": "Specialize",
     "s_ecdf5ea03d83b916": "line messaging api channel secret webhook cloudflared bot im channel messaging connect disconnect",
     "s_ece45f7651c8c206": "The Agent Browser Desktop bridge is unavailable",
     "s_ed100f18801746c9": "Command rules saved",
diff --git a/web/src/lib/api.js b/web/src/lib/api.js
index a01ada64f..8c74e0c12 100644
--- a/web/src/lib/api.js
+++ b/web/src/lib/api.js
@@ -582,6 +582,8 @@ export function createApi(base = null) {
       `/api/skills/${encodeURIComponent(name)}` + (workspaceHash ? '?workspace=' + encodeURIComponent(workspaceHash) : ''),
       {enabled: en}, base),
     getSkillBody:     (name)         => request('GET',    `/api/skills/${encodeURIComponent(name)}/body`, undefined, base),
+    getSkillScanPaths: ()            => request('GET', '/api/config/skill-paths', undefined, base),
+    setSkillScanPaths: (paths)       => request('PUT', '/api/config/skill-paths', { paths }, base),
     getMcp:           (workspace = '') => request('GET', '/api/mcp' + mcpScopeQuery(workspace), undefined, base),
     getMcpSchema:     () => request('GET', '/api/mcp/schema', undefined, base),
     putMcp:           (cfg, workspace = '') => request('PUT', '/api/mcp' + mcpScopeQuery(workspace), cfg, base),
diff --git a/web/src/lib/appShortcuts.js b/web/src/lib/appShortcuts.js
index bf085f9b7..dbc7287f7 100644
--- a/web/src/lib/appShortcuts.js
+++ b/web/src/lib/appShortcuts.js
@@ -1,49 +1,16 @@
 // Shared by keyboard dispatch, settings help and terminal forwarding.
-const binding = (code, key, extra = {}) => ({ code, key, ...extra });
-export const APP_SHORTCUT_BROWSER_GUARD = Symbol('ace-shortcut-browser-guard');
-export const APP_SHORTCUTS = Object.freeze({
-  newSession: binding('KeyN', 'N', { alt: true }),
-  focusInput: binding('KeyI', 'I', { alt: true }),
-  toggleSidebar: binding('KeyB', 'B', { alt: true }),
-  toggleRightPanel: binding('KeyE', 'E', { alt: true }),
-  previewPresentation: binding('F11', 'F11', { control: true }),
-  settings: binding('Comma', ','),
-  shortcuts: binding('Slash', '/'),
-  stop: binding('Period', '.', { shift: true }),
-  forward: binding('Minus', '-'),
-  back: binding('Minus', '-', { shift: true }),
-  reasoningUp: binding('Period', '>', { alt: true, optionalShift: true }),
-  reasoningDown: binding('Comma', '<', { alt: true, optionalShift: true }),
-  search: binding('KeyK', 'K'),
-  console: binding('Backquote', '`', { control: true }),
-});
-
-export function isMacShortcutHost(win = globalThis.window) {
-  if (win?.__ACECODE_OS__) return win.__ACECODE_OS__ === 'macos';
-  return /Mac|iPhone|iPad/i.test(win?.navigator?.platform || '');
-}
-
+import { APP_SHORTCUTS, effectiveShortcut, isMacShortcutHost, bindingLabel, matchesShortcutBinding } from './shortcutBindings.js';
+export { APP_SHORTCUTS, isMacShortcutHost } from './shortcutBindings.js';
+export { APP_SHORTCUT_BROWSER_GUARD } from './shortcutBindings.js';
 export function matchAppShortcut(event) {
-  if (!event || event.isComposing || event.nativeEvent?.isComposing
-      || event.keyCode === 229 || event.which === 229 || event.getModifierState?.('AltGraph')) return null;
-  for (const [id, spec] of Object.entries(APP_SHORTCUTS)) {
-    if (spec.control ? (!event.ctrlKey || event.metaKey) : (!event.ctrlKey && !event.metaKey)) continue;
-    if (!spec.control && event.ctrlKey && event.metaKey) continue;
-    if (Boolean(event.altKey) !== Boolean(spec.alt)) continue;
-    if (!spec.optionalShift && Boolean(event.shiftKey) !== Boolean(spec.shift)) continue;
-    const key = String(event.key || '').toLowerCase();
-    const punctuation = { Period: ['.', '>'], Comma: [',', '<'], Minus: ['-', '_'] };
-    if (event.code === spec.code || key === spec.key.toLowerCase()
-        || punctuation[spec.code]?.includes(key)) return id;
+  for (const id of Object.keys(APP_SHORTCUTS)) {
+    if (matchesShortcutBinding(event, effectiveShortcut(id))) return id;
   }
   return null;
 }
 
 export function shortcutLabel(id, mac = isMacShortcutHost()) {
-  const spec = APP_SHORTCUTS[id];
-  if (!spec) return '';
-  return [spec.control || !mac ? 'Ctrl' : 'Cmd', spec.alt && (mac ? 'Option' : 'Alt'),
-    spec.shift && 'Shift', spec.key].filter(Boolean).join('+');
+  return bindingLabel(effectiveShortcut(id), mac);
 }
 
 export function withAppShortcutHint(label, id) {
@@ -73,7 +40,6 @@ export function appShortcutContextAllows(id, target, doc = globalThis.document)
 }
 
 export function shortcutCatalog(mac = isMacShortcutHost()) {
-  const mod = mac ? 'Cmd' : 'Ctrl';
   const rows = [
     ['newSession', '会话操作', '新建会话', '在当前工作区新建会话'],
     ['focusInput', '会话操作', '聚焦消息输入框', '回到当前输入框，保留草稿'],
@@ -89,15 +55,17 @@ export function shortcutCatalog(mac = isMacShortcutHost()) {
     ['console', '界面导航', '展开／收起控制台', '控制台可用时生效'],
     ['settings', '界面导航', '打开设置', '打开设置窗口'],
     ['shortcuts', '界面导航', '打开快捷键页签', '进入快捷键并聚焦搜索栏'],
-    ['find', '输入与编辑', '当前会话内查找', '在打开的会话中查找文本', `${mod}+F`],
-    ['send', '输入与编辑', '发送消息', '在消息输入框中生效', 'Enter'],
-    ['newline', '输入与编辑', '输入框换行', '在消息输入框中生效', 'Shift+Enter'],
-    ['history', '输入与编辑', '浏览输入历史', '输入框为空时向上浏览，历史浏览中可向下返回', '↑ / ↓'],
-    ['save', '输入与编辑', '保存正在编辑的文件', '文件编辑器聚焦时生效', `${mod}+S`],
-    ['dismiss', '输入与编辑', '关闭当前浮层／弹窗', '优先关闭最上层可关闭的浮层', 'Esc'],
+    ['find', '输入与编辑', '当前会话内查找', '在打开的会话中查找文本'],
+    ['send', '输入与编辑', '发送消息', '在消息输入框中生效'],
+    ['newline', '输入与编辑', '输入框换行', '在消息输入框中生效'],
+    ['history', '输入与编辑', '浏览输入历史', '输入框为空时向上浏览，历史浏览中可向下返回'],
+    ['save', '输入与编辑', '保存正在编辑的文件', '文件编辑器聚焦时生效'],
+    ['dismiss', '输入与编辑', '关闭当前浮层／弹窗', '优先关闭最上层可关闭的浮层'],
   ];
-  return rows.map(([id, group, title, description, keys]) => ({ id, group, title, description,
-    keys: keys || shortcutLabel(id, mac) }));
+  return rows.map(([id, group, title, description]) => {
+    const bindings = id === 'history' ? ['historyPrevious', 'historyNext'] : [id];
+    return { id, group, title, description, bindings, keys: bindings.map((key) => shortcutLabel(key, mac)).join(' / ') };
+  });
 }
 
 export function filterShortcuts(rows, query) {
diff --git a/web/src/lib/browserDefaults.js b/web/src/lib/browserDefaults.js
index 68b010df9..8988cbd47 100644
--- a/web/src/lib/browserDefaults.js
+++ b/web/src/lib/browserDefaults.js
@@ -4,6 +4,7 @@
 import { isFindShortcut } from './globalFind.js';
 import { isDesktopShell } from './desktopShellMode.js';
 import { APP_SHORTCUT_BROWSER_GUARD, matchAppShortcut } from './appShortcuts.js';
+import { CONTEXT_SHORTCUTS, isShortcut, isShortcutRecording } from './shortcutBindings.js';
 
 const ZOOM_SHORTCUT_KEYS = new Set(['+', '=', '-', '_', '0']);
 const ZOOM_SHORTCUT_CODES = new Set([
@@ -27,7 +28,8 @@ export function isBrowserZoomShortcut(event) {
 }
 
 export function isBlockedBrowserDefaultShortcut(event) {
-  return event?.key === 'F5' || isBrowserZoomShortcut(event) || isFindShortcut(event);
+  const nativeFind = (event?.ctrlKey || event?.metaKey) && !event?.altKey && event?.key?.toLowerCase() === 'f';
+  return event?.key === 'F5' || isBrowserZoomShortcut(event) || nativeFind || isFindShortcut(event);
 }
 
 export function installBrowserDefaultGuards(target = globalThis.window) {
@@ -48,6 +50,7 @@ export function installBrowserDefaultGuards(target = globalThis.window) {
     if (hasZoomModifier(event)) event.preventDefault();
   };
   const onKeyDown = (event) => {
+    if (isShortcutRecording(event)) return;
     if (renderedSelects && event.key === 'Escape') {
       const select = event.target?.closest?.('select');
       if (select?.matches(':open') && target.getComputedStyle(select).appearance === 'base-select') {
@@ -56,14 +59,15 @@ export function installBrowserDefaultGuards(target = globalThis.window) {
         return;
       }
     }
-    // These two zoom-shaped chords belong to ACECode history navigation.
+    // Configured app chords take priority over browser defaults.
     const shortcut = matchAppShortcut(event);
-    if (shortcut === 'forward' || shortcut === 'back') {
+    const browserDefault = isBlockedBrowserDefaultShortcut(event);
+    if (browserDefault && (shortcut || Object.keys(CONTEXT_SHORTCUTS).some(id => isShortcut(event, id)))) {
       event.preventDefault();
       event[APP_SHORTCUT_BROWSER_GUARD] = true;
       return;
     }
-    if (isBlockedBrowserDefaultShortcut(event)) event.preventDefault();
+    if (browserDefault) event.preventDefault();
   };
 
   const activeCapture = { capture: true, passive: false };
diff --git a/web/src/lib/browserDefaults.test.js b/web/src/lib/browserDefaults.test.js
index bd1de0ff7..4154f2d50 100644
--- a/web/src/lib/browserDefaults.test.js
+++ b/web/src/lib/browserDefaults.test.js
@@ -77,7 +77,7 @@ function pickerEscape(win, { open = true, appearance = 'base-select' } = {}) {
   const select = { appearance, matches: () => open };
   Object.defineProperties(event, {
     key: { value: 'Escape' },
-    target: { value: { closest: () => select } },
+    target: { value: { closest: selector => selector === 'select' ? select : null } },
   });
   win.dispatchEvent(event);
   return event;
diff --git a/web/src/lib/chatFileDropFeedbackArchitecture.test.js b/web/src/lib/chatFileDropFeedbackArchitecture.test.js
index c511f3f81..ec848c56a 100644
--- a/web/src/lib/chatFileDropFeedbackArchitecture.test.js
+++ b/web/src/lib/chatFileDropFeedbackArchitecture.test.js
@@ -90,7 +90,11 @@ run('desktop file drag activates on entry and acceptance without async foregroun
   const dropFocus = webHost.slice(webHost.indexOf('bool WebHost::focus_after_file_drop()'), webHost.indexOf('bool WebHost::open_dev_tools()'));
   assert.match(dropFocus, /AttachThreadInput\(current_thread, foreground_thread, TRUE\)/);
   assert.match(dropFocus, /AttachThreadInput\(current_thread, foreground_thread, FALSE\)/);
-  assert.match(dropFocus, /MoveFocus\(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC\)/);
+  assert.match(dropFocus, /return focus_active_webview\(\)/);
+  const focusHost = readCppSource('desktop/web_host_focus.hpp');
+  assert.match(focusHost, /GetForegroundWindow\(\) != hwnd/);
+  assert.match(focusHost, /MoveFocus\(COREWEBVIEW2_MOVE_FOCUS_REASON_PROGRAMMATIC\)/);
+  assert.doesNotMatch(focusHost, /SetForegroundWindow|AttachThreadInput|HWND_TOPMOST/);
   assert.doesNotMatch(dropFocus, /HWND_TOPMOST|activate_notification_window/);
 });
 
diff --git a/web/src/lib/composerCaretRestore.js b/web/src/lib/composerCaretRestore.js
index dc201d399..65dcf9195 100644
--- a/web/src/lib/composerCaretRestore.js
+++ b/web/src/lib/composerCaretRestore.js
@@ -40,26 +40,6 @@ function clampOffset(value, max) {
 }
 
 const DESKTOP_WINDOW_FOCUS_EVENT = 'acecode:desktop-window-focus';
-const TERMINAL_FOCUS_REGION_SELECTOR = '[data-ace-focus-region="terminal"]';
-
-function meaningfulFocusElement(element, documentRef) {
-  if (!element) return null;
-  if (element === documentRef?.body || element === documentRef?.documentElement) return null;
-  return element;
-}
-
-function liveTerminalFocusRegion(element) {
-  if (!element || typeof element.closest !== 'function') return null;
-  let region = null;
-  try {
-    region = element.closest(TERMINAL_FOCUS_REGION_SELECTOR);
-  } catch {
-    return null;
-  }
-  if (!region || region.isConnected === false) return null;
-  if (region.getAttribute?.('data-collapsed') === 'true') return null;
-  return region;
-}
 
 function readTextareaSelection(textareaElement) {
   if (!textareaElement) return null;
@@ -157,32 +137,116 @@ export function bindDesktopComposerAutoFocus({
 } = {}) {
   if (!enabled || typeof onFocus !== 'function' || !win || !documentRef) return () => {};
 
-  let lastFocusedElement = meaningfulFocusElement(documentRef.activeElement, documentRef);
-  const rememberFocusOwner = (event) => {
-    const element = meaningfulFocusElement(event?.target || documentRef.activeElement, documentRef);
-    if (element) lastFocusedElement = element;
+  let disposed = false;
+  let generation = 0;
+  let pending = false;
+  let nativeActivationPending = false;
+  let composing = false;
+  let frame = 0;
+  let timer = 0;
+  const cancel = () => {
+    generation += 1;
+    pending = false;
+    nativeActivationPending = false;
+    win.cancelAnimationFrame(frame);
+    win.clearTimeout(timer);
+    frame = timer = 0;
   };
-  const currentFocusOwner = () => (
-    meaningfulFocusElement(documentRef.activeElement, documentRef) || lastFocusedElement
+  const available = () => (
+    !disposed && !composing && documentRef.visibilityState !== 'hidden'
+    && !documentRef.querySelector?.('[role="dialog"], .ace-global-find')
   );
-  const focusIfCurrentWindow = () => {
-    if (documentRef.visibilityState === 'hidden') return;
-    const blockingSurface = documentRef.querySelector?.('[role="dialog"], .ace-global-find');
-    if (blockingSurface) return;
-    if (liveTerminalFocusRegion(currentFocusOwner())) return;
-    onFocus();
+  const focusIfCurrentWindow = (event) => {
+    if (pending) return;
+    const native = event?.type === DESKTOP_WINDOW_FOCUS_EVENT || nativeActivationPending;
+    if (!available()) {
+      // Restore can notify native activation before WebView reports visible.
+      // Keep that intent until visibility catches up; the OS bridge still
+      // rejects it if the user has already switched to another application.
+      if (native && documentRef.visibilityState === 'hidden') nativeActivationPending = true;
+      return;
+    }
+    nativeActivationPending = false;
+    // Native activation may precede DOM focus. The bridge checks the OS window
+    // instead; visibility/pageshow alone must never activate a background page.
+    if (!native && documentRef.hasFocus?.() === false) return;
+    pending = true;
+    const request = ++generation;
+    const current = () => request === generation && available();
+    const canFocus = () => current() && documentRef.hasFocus?.() !== false;
+    const restore = (result) => {
+      if (request !== generation || disposed) return;
+      if (!available()) { cancel(); return; }
+      if (result?.ok === false) { cancel(); return; }
+      frame = win.requestAnimationFrame(() => {
+        frame = 0;
+        if (!canFocus()) { cancel(); return; }
+        onFocus(canFocus);
+        // One bounded retry covers native restore/layout and Slate commit order.
+        // Recheck every time; clicks, typing, blur and cleanup cancel this work.
+        timer = win.setTimeout(() => {
+          timer = 0;
+          if (canFocus()) onFocus(canFocus);
+          pending = false;
+        }, 80);
+      });
+    };
+    frame = win.requestAnimationFrame(() => {
+      frame = 0;
+      if (!current()) { cancel(); return; }
+      // A focused document already receives keyboard input. Repeating MoveFocus
+      // can terminate a newly started IME composition while its promise is pending.
+      if (documentRef.hasFocus?.() === true || typeof win.aceDesktop_focusActiveWebview !== 'function') {
+        restore();
+        return;
+      }
+      try {
+        Promise.resolve(win.aceDesktop_focusActiveWebview()).then(restore, () => {
+          if (current()) cancel();
+        });
+      } catch {
+        cancel();
+      }
+    });
   };
   const onVisibilityChange = () => {
     if (documentRef.visibilityState === 'visible') focusIfCurrentWindow();
+    else onCompositionEnd();
+  };
+  const onCompositionStart = () => {
+    composing = true;
+    cancel();
+  };
+  const onCompositionEnd = () => {
+    composing = false;
+    cancel();
   };
 
-  documentRef.addEventListener('focusin', rememberFocusOwner);
+  // A native blur can end composition without delivering compositionend to a
+  // disappearing editor. Do not leave the next window activation blocked.
+  win.addEventListener('blur', onCompositionEnd);
+  documentRef.addEventListener('pointerdown', cancel, true);
+  documentRef.addEventListener('keydown', cancel, true);
+  // IMEs and native text services can edit without a keydown. MoveFocus during
+  // composition commits the candidate in WebView2, so cancel before the bridge.
+  documentRef.addEventListener('beforeinput', cancel, true);
+  documentRef.addEventListener('input', cancel, true);
+  documentRef.addEventListener('compositionstart', onCompositionStart, true);
+  documentRef.addEventListener('compositionend', onCompositionEnd, true);
   win.addEventListener('focus', focusIfCurrentWindow);
   win.addEventListener('pageshow', focusIfCurrentWindow);
   win.addEventListener(DESKTOP_WINDOW_FOCUS_EVENT, focusIfCurrentWindow);
   documentRef.addEventListener('visibilitychange', onVisibilityChange);
   return () => {
-    documentRef.removeEventListener('focusin', rememberFocusOwner);
+    disposed = true;
+    cancel();
+    win.removeEventListener('blur', onCompositionEnd);
+    documentRef.removeEventListener('pointerdown', cancel, true);
+    documentRef.removeEventListener('keydown', cancel, true);
+    documentRef.removeEventListener('beforeinput', cancel, true);
+    documentRef.removeEventListener('input', cancel, true);
+    documentRef.removeEventListener('compositionstart', onCompositionStart, true);
+    documentRef.removeEventListener('compositionend', onCompositionEnd, true);
     win.removeEventListener('focus', focusIfCurrentWindow);
     win.removeEventListener('pageshow', focusIfCurrentWindow);
     win.removeEventListener(DESKTOP_WINDOW_FOCUS_EVENT, focusIfCurrentWindow);
diff --git a/web/src/lib/composerCaretRestore.test.js b/web/src/lib/composerCaretRestore.test.js
index 039c83b56..9b9dfc098 100644
--- a/web/src/lib/composerCaretRestore.test.js
+++ b/web/src/lib/composerCaretRestore.test.js
@@ -287,129 +287,201 @@ run('integrated terminal advertises the desktop focus region contract', () => {
   );
 });
 
-run('desktop composer auto-focus follows focus visibility events and cleans up', () => {
+function focusFixture() {
   const win = eventTarget();
+  const frames = new Map();
+  const timers = new Map();
+  let id = 0;
+  Object.assign(win, {
+    requestAnimationFrame: (fn) => { frames.set(++id, fn); return id; },
+    cancelAnimationFrame: (key) => frames.delete(key),
+    setTimeout: (fn) => { timers.set(++id, fn); return id; },
+    clearTimeout: (key) => timers.delete(key),
+  });
   const documentRef = Object.assign(eventTarget(), {
-    visibilityState: 'visible',
-    querySelector: () => null,
+    visibilityState: 'visible', querySelector: () => null, hasFocus: () => true,
   });
-  let focusCalls = 0;
+  const calls = [];
   const cleanup = bindDesktopComposerAutoFocus({
-    enabled: true,
-    onFocus: () => { focusCalls += 1; },
-    win,
-    documentRef,
+    enabled: true, win, documentRef, onFocus: (guard) => calls.push(guard),
   });
+  const flush = (queue) => { const entries = [...queue.values()]; queue.clear(); entries.forEach(fn => fn()); };
+  return { win, documentRef, calls, cleanup,
+    frame: () => flush(frames), timer: () => flush(timers),
+    restore: () => { flush(frames); flush(frames); },
+  };
+}
 
-  assert.equal(win.listenerCount('focus'), 1);
-  assert.equal(win.listenerCount('pageshow'), 1);
-  assert.equal(win.listenerCount('acecode:desktop-window-focus'), 1);
-  assert.equal(documentRef.listenerCount('focusin'), 1);
-  assert.equal(documentRef.listenerCount('visibilitychange'), 1);
-  win.dispatch('focus');
-  win.dispatch('pageshow');
-  win.dispatch('acecode:desktop-window-focus');
-  assert.equal(focusCalls, 3);
-
-  documentRef.visibilityState = 'hidden';
-  win.dispatch('focus');
-  documentRef.dispatch('visibilitychange');
-  assert.equal(focusCalls, 3);
-
-  documentRef.visibilityState = 'visible';
-  documentRef.dispatch('visibilitychange');
-  assert.equal(focusCalls, 4);
+run('activation notifications coalesce and cleanup cancels pending restore', () => {
+  const f = focusFixture();
+  f.win.dispatch('focus');
+  f.win.dispatch('pageshow');
+  f.win.dispatch('acecode:desktop-window-focus');
+  f.restore();
+  assert.equal(f.calls.length, 1);
+  f.cleanup();
+  f.timer();
+  assert.equal(f.calls.length, 1);
+  assert.equal(f.calls[0](), false);
+  for (const type of ['focus', 'blur', 'pageshow', 'acecode:desktop-window-focus']) {
+    assert.equal(f.win.listenerCount(type), 0);
+  }
+  for (const type of ['visibilitychange', 'pointerdown', 'keydown', 'beforeinput', 'input', 'compositionstart', 'compositionend']) {
+    assert.equal(f.documentRef.listenerCount(type), 0);
+  }
+});
 
-  cleanup();
-  win.dispatch('focus');
-  win.dispatch('acecode:desktop-window-focus');
-  assert.equal(focusCalls, 4);
-  assert.equal(win.listenerCount('focus'), 0);
-  assert.equal(win.listenerCount('acecode:desktop-window-focus'), 0);
-  assert.equal(documentRef.listenerCount('focusin'), 0);
-  assert.equal(documentRef.listenerCount('visibilitychange'), 0);
+run('activation always returns to chat even after using the terminal', () => {
+  const f = focusFixture();
+  f.documentRef.activeElement = terminalFocusTarget();
+  f.win.dispatch('acecode:desktop-window-focus');
+  f.restore();
+  assert.equal(f.calls.length, 1);
+  f.cleanup();
 });
 
-run('desktop composer auto-focus preserves expanded terminal ownership on reactivation', () => {
-  const win = eventTarget();
-  const body = element('body');
-  const html = element('html');
-  const documentRef = Object.assign(eventTarget(), {
-    activeElement: body,
-    body,
-    documentElement: html,
-    visibilityState: 'visible',
-    querySelector: () => null,
-  });
-  const terminalInput = terminalFocusTarget();
-  let focusCalls = 0;
-  const cleanup = bindDesktopComposerAutoFocus({
-    enabled: true,
-    onFocus: () => { focusCalls += 1; },
-    win,
-    documentRef,
+run('hidden and background pages never restore from visibility alone', () => {
+  const f = focusFixture();
+  f.documentRef.visibilityState = 'hidden';
+  f.win.dispatch('focus'); f.restore();
+  assert.equal(f.calls.length, 0);
+  f.documentRef.visibilityState = 'visible';
+  f.documentRef.hasFocus = () => false;
+  f.documentRef.dispatch('visibilitychange'); f.restore();
+  assert.equal(f.calls.length, 0);
+  f.documentRef.hasFocus = () => true;
+  f.documentRef.dispatch('visibilitychange'); f.restore();
+  assert.equal(f.calls.length, 1);
+  f.cleanup();
+});
+
+{
+  const f = focusFixture();
+  let nativeCalls = 0;
+  f.win.aceDesktop_focusActiveWebview = () => {
+    nativeCalls += 1;
+    f.documentRef.hasFocus = () => true;
+    return { ok: true };
+  };
+  f.documentRef.visibilityState = 'hidden';
+  f.documentRef.hasFocus = () => false;
+  f.win.dispatch('acecode:desktop-window-focus'); f.restore();
+  assert.equal(nativeCalls, 0);
+  f.documentRef.visibilityState = 'visible';
+  f.documentRef.dispatch('visibilitychange'); f.frame();
+  await Promise.resolve();
+  f.frame();
+  assert.equal(nativeCalls, 1);
+  assert.equal(f.calls.length, 1);
+  f.cleanup();
+  console.log('[pass] native activation arriving before visibility restores the unfocused WebView');
+}
+
+for (const event of ['blur', 'pointerdown', 'keydown', 'beforeinput', 'input', 'compositionstart', 'compositionend', 'visibilitychange']) {
+  run(`${event} cancels delayed focus and the Slate retry guard`, () => {
+    const f = focusFixture();
+    f.win.dispatch('focus'); f.restore();
+    assert.equal(f.calls.length, 1);
+    if (event === 'visibilitychange') f.documentRef.visibilityState = 'hidden';
+    (event === 'blur' ? f.win : f.documentRef).dispatch(event);
+    f.timer();
+    assert.equal(f.calls.length, 1);
+    assert.equal(f.calls[0](), false);
+    f.cleanup();
   });
+}
 
-  documentRef.activeElement = terminalInput;
-  documentRef.dispatch('focusin', { target: terminalInput });
-  documentRef.activeElement = body;
-  win.dispatch('focus');
-  win.dispatch('acecode:desktop-window-focus');
-  documentRef.dispatch('visibilitychange');
-  assert.equal(focusCalls, 0);
-  cleanup();
+run('a modal opened during the pending restore blocks focus', () => {
+  const f = focusFixture();
+  f.win.dispatch('focus');
+  f.documentRef.querySelector = () => ({ role: 'dialog' });
+  f.restore(); f.timer();
+  assert.equal(f.calls.length, 0);
+  f.cleanup();
 });
 
-run('desktop composer auto-focus resumes after focus leaves or closes the terminal', () => {
-  const win = eventTarget();
-  const body = element('body');
-  const html = element('html');
-  const documentRef = Object.assign(eventTarget(), {
-    activeElement: body,
-    body,
-    documentElement: html,
-    visibilityState: 'visible',
-    querySelector: () => null,
-  });
-  let focusCalls = 0;
-  const cleanup = bindDesktopComposerAutoFocus({
-    enabled: true,
-    onFocus: () => { focusCalls += 1; },
-    win,
-    documentRef,
-  });
+run('activation during IME never reaches the native focus bridge and resumes after composition ends', () => {
+  const f = focusFixture();
+  let nativeCalls = 0;
+  f.win.aceDesktop_focusActiveWebview = () => { nativeCalls += 1; return {ok:true}; };
+  f.documentRef.dispatch('compositionstart');
+  f.win.dispatch('acecode:desktop-window-focus');
+  f.win.dispatch('focus');
+  f.restore(); f.timer();
+  assert.equal(nativeCalls, 0);
+  assert.equal(f.calls.length, 0);
+  f.documentRef.dispatch('compositionend');
+  f.documentRef.hasFocus = () => false;
+  f.win.dispatch('acecode:desktop-window-focus');
+  f.frame();
+  assert.equal(nativeCalls, 1);
+  f.cleanup();
+});
 
-  const terminalInput = terminalFocusTarget();
-  const composerInput = textarea('draft');
-  documentRef.dispatch('focusin', { target: terminalInput });
-  documentRef.dispatch('focusin', { target: composerInput });
-  win.dispatch('focus');
-  assert.equal(focusCalls, 1);
-
-  const collapsedTerminalInput = terminalFocusTarget({ collapsed: true });
-  documentRef.dispatch('focusin', { target: collapsedTerminalInput });
-  win.dispatch('focus');
-  assert.equal(focusCalls, 2);
-  cleanup();
+run('an already focused document restores chat without repeating native MoveFocus', () => {
+  const f = focusFixture();
+  let nativeCalls = 0;
+  f.win.aceDesktop_focusActiveWebview = () => { nativeCalls += 1; return {ok:true}; };
+  f.win.dispatch('acecode:desktop-window-focus');
+  f.restore();
+  assert.equal(nativeCalls, 0);
+  assert.equal(f.calls.length, 1);
+  f.cleanup();
 });
 
-run('desktop composer auto-focus does not steal focus through a modal surface', () => {
-  const win = eventTarget();
-  const documentRef = Object.assign(eventTarget(), {
-    visibilityState: 'visible',
-    querySelector: () => ({ role: 'dialog' }),
-  });
-  let focusCalls = 0;
-  const cleanup = bindDesktopComposerAutoFocus({
-    enabled: true,
-    onFocus: () => { focusCalls += 1; },
-    win,
-    documentRef,
+for (const interruptedBy of ['blur', 'hidden']) {
+  run(`composition interrupted by ${interruptedBy} cannot block the next activation`, () => {
+    const f = focusFixture();
+    f.documentRef.dispatch('compositionstart');
+    if (interruptedBy === 'blur') f.win.dispatch('blur');
+    else {
+      f.documentRef.visibilityState = 'hidden';
+      f.documentRef.dispatch('visibilitychange');
+    }
+    f.documentRef.visibilityState = 'visible';
+    f.win.dispatch('acecode:desktop-window-focus');
+    f.restore();
+    assert.equal(f.calls.length, 1);
+    f.cleanup();
   });
+}
 
-  win.dispatch('focus');
-  assert.equal(focusCalls, 0);
-  cleanup();
+for (const outcome of ['success', 'background', 'reject', 'cleanup', 'blur', 'modal', 'compositionstart', 'beforeinput']) {
+  const f = focusFixture();
+  let resolve, reject;
+  let nativeCalls = 0;
+  f.win.aceDesktop_focusActiveWebview = () => {
+    nativeCalls += 1;
+    return new Promise((yes, no) => { resolve = yes; reject = no; });
+  };
+  f.documentRef.hasFocus = () => false;
+  f.win.dispatch('acecode:desktop-window-focus'); f.frame();
+  assert.equal(nativeCalls, 1);
+  assert.equal(f.calls.length, 0);
+  f.win.dispatch('focus');
+  if (outcome === 'cleanup') f.cleanup();
+  if (outcome === 'blur') f.win.dispatch('blur');
+  if (outcome === 'compositionstart' || outcome === 'beforeinput') f.documentRef.dispatch(outcome);
+  if (outcome === 'modal') f.documentRef.querySelector = () => ({ role: 'dialog' });
+  if (outcome === 'reject') reject(new Error('closed'));
+  else {
+    f.documentRef.hasFocus = () => true;
+    resolve({ ok: outcome !== 'background' });
+  }
+  await Promise.resolve();
+  f.restore(); f.timer();
+  assert.equal(f.calls.length, outcome === 'success' ? 2 : 0, outcome);
+  assert.equal(nativeCalls, 1);
+  f.cleanup();
+  console.log(`[pass] native focus handoff: ${outcome}`);
+}
+
+run('desktop composer auto-focus does not steal focus through a modal surface', () => {
+  const f = focusFixture();
+  f.documentRef.querySelector = () => ({ role: 'dialog' });
+  f.win.dispatch('focus'); f.restore();
+  assert.equal(f.calls.length, 0);
+  f.cleanup();
 });
 
 run('desktop composer auto-focus stays inert when disabled', () => {
diff --git a/web/src/lib/composerDropdownKeyboard.js b/web/src/lib/composerDropdownKeyboard.js
index 9b8a01831..47c26ea65 100644
--- a/web/src/lib/composerDropdownKeyboard.js
+++ b/web/src/lib/composerDropdownKeyboard.js
@@ -1,7 +1,9 @@
 // Completion menus own only unmodified keys. Modified keys belong to the
+import { isDismissShortcut } from './shortcutBindings.js';
 // composer (selection, word/document navigation, and inserting a line break).
 export function shouldHandleComposerDropdownKey(event) {
   if (!event || event.defaultPrevented) return false;
+  if (isDismissShortcut(event)) return true;
   const nativeEvent = event.nativeEvent || event;
   return !event.shiftKey
     && !event.ctrlKey
diff --git a/web/src/lib/desktopOfficeState.js b/web/src/lib/desktopOfficeState.js
index a6f076806..afcd35508 100644
--- a/web/src/lib/desktopOfficeState.js
+++ b/web/src/lib/desktopOfficeState.js
@@ -1,5 +1,6 @@
 import { normalizeTokenBudget } from './tokenBudget.js';
 import { toolActivityVerb, toolIconName, toolIconSvg } from './toolIcons.js';
+import { sessionAvatarIdentity, stableSeed } from './officeCharacters.js';
 
 export const OFFICE_LIMIT = 5;
 export const OFFICE_WORKER_SEATS = 7;
@@ -9,9 +10,7 @@ export const officeSessionRef = value => ({
   workspaceHash: String(value?.workspaceHash || value?.workspace_hash || ''),
 });
 export function stableOfficeSeed(value) {
-  let hash = 2166136261;
-  for (const c of String(value)) hash = Math.imul(hash ^ c.codePointAt(0), 16777619);
-  return hash >>> 0;
+  return stableSeed(value);
 }
 export function recentOffices(sessions = []) {
   const unique = new Map();
@@ -79,12 +78,13 @@ export function officeActor(session, rootId) {
   const context = normalizeTokenBudget({usage: session.token_usage, contextWindow: session.context_window});
   const shownTool = state === 'work' || state === 'wait' || state === 'permission' || phase === 'tool_planning' ? tool : '';
   const path = String(session.agent_path || (root ? '/root' : ''));
+  const avatarIdentity = sessionAvatarIdentity(session);
   return {
     id, root, name: root ? 'Maestro' : String(session.title || session.agent_path?.split('/').pop() || session.summary || 'Agent'),
     path, parentPath: path.includes('/', 1) ? path.slice(0, path.lastIndexOf('/')) : '',
     state, label, detail, tool: shownTool, icon: shownTool ? toolIconName(shownTool) : '',
     iconSvg: shownTool ? toolIconSvg(shownTool) : '', busy,
-    seed: stableOfficeSeed(id), contextKnown: context.known,
+    avatarIdentity, seed: stableOfficeSeed(avatarIdentity || id), contextKnown: context.known,
     contextRatio: context.usedRatio, contextTokens: context.usedTokens, contextLimit: context.limitTokens,
     compactId: String(a.compact_id || ''), seq: Number(a.seq) || 0,
     transfers: Array.isArray(a.transfers) ? a.transfers : [],
diff --git a/web/src/lib/expertComponentsArchitecture.test.js b/web/src/lib/expertComponentsArchitecture.test.js
index 00ce7e535..8b31aaf42 100644
--- a/web/src/lib/expertComponentsArchitecture.test.js
+++ b/web/src/lib/expertComponentsArchitecture.test.js
@@ -82,7 +82,7 @@ test('new expert split control stages Expert Manager without sending and keeps t
   assert.equal((page.match(/role="menuitem"/g) || []).length, 1);
   assert.match(page, />\s*高级模式\s*</);
   assert.match(page, /data-ace-native-overlay="overlap"/);
-  assert.match(page, /event\.key === 'Escape'/);
+  assert.match(page, /isDismissShortcut\(event\)/);
   assert.match(page, /creationMenuButtonRef\.current\?\.focus\(\)/);
   assert.match(page, /document\.addEventListener\('pointerdown'/);
   assert.match(page, /setEditor\(\{ editing: false, form: emptyExpertForm\('agent'\) \}\)/);
diff --git a/web/src/lib/fullscreenHeatWave.js b/web/src/lib/fullscreenHeatWave.js
index f5e8f7ebc..b26fff475 100644
--- a/web/src/lib/fullscreenHeatWave.js
+++ b/web/src/lib/fullscreenHeatWave.js
@@ -1,8 +1,9 @@
 import { HEAT_DURATION, MAP_RANGE } from './heatWaveShader.js';
+import { isShortcutRecording } from './shortcutBindings.js';
 import { createHeatWaveRenderer } from './heatWaveRenderer.js';
 
 export function isFullscreenHeatWaveShortcut(event) {
-  return !!(event && event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey
+  return !!(event && !isShortcutRecording(event) && event.ctrlKey && !event.metaKey && !event.altKey && !event.shiftKey
     && !event.isComposing && event.keyCode !== 229
     && (event.code === 'KeyO' || event.key?.toLowerCase() === 'o'));
 }
diff --git a/web/src/lib/globalFind.js b/web/src/lib/globalFind.js
index 2da0ae78f..dfc3698ef 100644
--- a/web/src/lib/globalFind.js
+++ b/web/src/lib/globalFind.js
@@ -1,4 +1,5 @@
 import { markTextMatches, unwrapMarks } from './domTextMarks.js';
+import { isCustomShortcut, isShortcut, isShortcutRecording } from './shortcutBindings.js';
 
 const FIND_HIGHLIGHT = 'ace-global-find-match';
 const FIND_ACTIVE_HIGHLIGHT = 'ace-global-find-active';
@@ -10,7 +11,9 @@ function hasFindModifier(event) {
 }
 
 export function isFindShortcut(event) {
-  if (!event || event.altKey) return false;
+  if (!event || isShortcutRecording(event)) return false;
+  if (isCustomShortcut('find')) return isShortcut(event, 'find');
+  if (event.altKey) return false;
   const key = typeof event.key === 'string' ? event.key.toLowerCase() : '';
   const code = typeof event.code === 'string' ? event.code.toLowerCase() : '';
   if ((key === 'f3' || code === 'f3') && !event.ctrlKey && !event.metaKey) {
diff --git a/web/src/lib/imageLightboxArchitecture.test.js b/web/src/lib/imageLightboxArchitecture.test.js
index 4641b2d7d..100196473 100644
--- a/web/src/lib/imageLightboxArchitecture.test.js
+++ b/web/src/lib/imageLightboxArchitecture.test.js
@@ -30,7 +30,7 @@ run('shared image lightbox owns bounded wheel zoom and captured left drag', () =
   assert.match(component, /aria-label="缩小预览"/);
   assert.match(component, /aria-label="放大预览"/);
   assert.match(component, /aria-label="适应窗口"/);
-  assert.match(component, /event\.key !== 'Escape'/);
+  assert.match(component, /!isDismissShortcut\(event\)/);
 });
 
 run('shared image lightbox retains caller metadata and backdrop boundaries', () => {
diff --git a/web/src/lib/inputHistoryNavigation.js b/web/src/lib/inputHistoryNavigation.js
index 900a20c7d..f2e948f60 100644
--- a/web/src/lib/inputHistoryNavigation.js
+++ b/web/src/lib/inputHistoryNavigation.js
@@ -1,4 +1,5 @@
 import { composerContentFromMessage, composerContentSignature, composerContentText } from './composerContent.js';
+import { isShortcut } from './shortcutBindings.js';
 
 // hasNonTextContent:输入框里还有粘贴块 / 附件等不在编辑器文本里的内容。此时编辑器
 // 为空不代表输入框为空,上箭头不能进入历史(否则几 MB 的粘贴会被历史条目静默替换);
@@ -82,6 +83,7 @@ export function buildComposerHistory({ cwdHistory = [], transcriptItems = [] } =
 
 export function shouldNavigateInputHistory({
   key,
+  code,
   value = '',
   editedSinceHistory = false,
   historyLength = 0,
@@ -92,23 +94,23 @@ export function shouldNavigateInputHistory({
   metaKey = false,
   shiftKey = false,
 } = {}) {
-  if (altKey || ctrlKey || metaKey || shiftKey) return false;
+  const event = { key, code, altKey, ctrlKey, metaKey, shiftKey };
   if (!isInputHistoryNavigationMode({ value, editedSinceHistory, hasNonTextContent, historyPointer })) return false;
-  if (key === 'ArrowUp') return historyLength > 0;
-  if (key === 'ArrowDown') return historyPointer >= 0;
+  if (isShortcut(event, 'historyPrevious')) return historyLength > 0;
+  if (isShortcut(event, 'historyNext')) return historyPointer >= 0;
   return false;
 }
 
-export function getNextInputHistoryPointer({ key, historyLength = 0, historyPointer = -1 } = {}) {
+export function getNextInputHistoryPointer({ key, code, altKey, ctrlKey, metaKey, shiftKey, historyLength = 0, historyPointer = -1 } = {}) {
   const count = Math.max(0, Math.trunc(Number(historyLength) || 0));
   const pointer = Number.isInteger(historyPointer) ? historyPointer : -1;
 
-  if (key === 'ArrowUp') {
+  if (isShortcut({ key, code, altKey, ctrlKey, metaKey, shiftKey }, 'historyPrevious')) {
     if (count === 0) return -1;
     return pointer === -1 ? count - 1 : Math.max(0, pointer - 1);
   }
 
-  if (key === 'ArrowDown') {
+  if (isShortcut({ key, code, altKey, ctrlKey, metaKey, shiftKey }, 'historyNext')) {
     if (pointer < 0) return -1;
     const next = pointer + 1;
     return next >= count ? -1 : next;
diff --git a/web/src/lib/officeCharacters.js b/web/src/lib/officeCharacters.js
new file mode 100644
index 000000000..472357a03
--- /dev/null
+++ b/web/src/lib/officeCharacters.js
@@ -0,0 +1,19 @@
+import '../../../assets/desktop_pet/office_characters.js';
+
+export const { stableSeed, stableLook, characterSprite } = globalThis.ACEOfficeCharacters;
+
+export function expertAvatarIdentity(expert = {}) {
+  if (expert.avatar_identity) return String(expert.avatar_identity);
+  const id = String(expert.id || '');
+  if (!id) return '';
+  if (expert.references_existing_experts) return `expert:${expert.lead_expert_id || id}`;
+  if (expert.type === 'team' && expert.lead_agent_id) return `expert:${id}/${expert.lead_agent_id}`;
+  return `expert:${id}`;
+}
+
+export function sessionAvatarIdentity(session = {}) {
+  if (session.expert?.avatar_identity) return String(session.expert.avatar_identity);
+  const id = String(session.expert_id || session.expert?.id || '');
+  const member = String(session.expert_member_id || session.expert?.member_id || '');
+  return id ? `expert:${id}${member ? `/${member}` : ''}` : '';
+}
diff --git a/web/src/lib/officeCharacters.test.js b/web/src/lib/officeCharacters.test.js
new file mode 100644
index 000000000..6a2165bc8
--- /dev/null
+++ b/web/src/lib/officeCharacters.test.js
@@ -0,0 +1,33 @@
+import assert from 'node:assert/strict';
+import { test } from 'node:test';
+import { expertAvatarIdentity, sessionAvatarIdentity, stableLook, stableSeed } from './officeCharacters.js';
+import { officeActor } from './desktopOfficeState.js';
+import { normalizeSubagentTask } from './subagentTasks.js';
+
+test('team member portrait stays the same across sessions and office actors', () => {
+  const expert = { id: 'opc-value-designer', avatar_identity: 'expert:opc-value-designer' };
+  const identity = expertAvatarIdentity(expert);
+  const source = { id: 'child-one', expert_id: 'opc-team', expert_member_id: expert.id,
+    expert: { id: 'opc-team', member_id: expert.id, avatar_identity: identity }, busy: true };
+  const first = officeActor(source, 'root');
+  const second = officeActor({ ...source, id: 'child-two' }, 'root');
+  assert.equal(first.avatarIdentity, identity);
+  assert.equal(first.seed, stableSeed(identity));
+  assert.deepEqual(stableLook(first.seed), stableLook(second.seed));
+  assert.equal(sessionAvatarIdentity(normalizeSubagentTask(source)), identity);
+});
+
+test('team leader, internal members and generic sessions retain distinct identities', () => {
+  assert.equal(expertAvatarIdentity({ id: 'team', references_existing_experts: true,
+    lead_expert_id: 'leader' }), 'expert:leader');
+  assert.equal(expertAvatarIdentity({ id: 'team', type: 'team', lead_agent_id: 'leader' }), 'expert:team/leader');
+  const root = officeActor({ id: 'root', expert: { avatar_identity: 'expert:leader' } }, 'root');
+  assert.equal(root.seed, stableSeed('expert:leader'));
+  assert.equal(root.avatarIdentity, 'expert:leader');
+  assert.equal(officeActor({ id: 'root' }, 'root').avatarIdentity, '');
+});
+
+test('custom avatar metadata survives task normalization', () => {
+  const expert = { avatar_identity: 'expert:custom', avatar_url: '/api/experts/custom/avatar' };
+  assert.deepEqual(normalizeSubagentTask({ id: 'child', expert }).expert, expert);
+});
diff --git a/web/src/lib/presentationPreview.js b/web/src/lib/presentationPreview.js
index 462b2f25b..65b3c5f31 100644
--- a/web/src/lib/presentationPreview.js
+++ b/web/src/lib/presentationPreview.js
@@ -1,3 +1,4 @@
+import { effectiveShortcut, shortcutEventVariants } from './shortcutBindings.js';
 import {
   OFFICE_PREVIEW_ZOOM_DEFAULT,
   OFFICE_PREVIEW_ZOOM_MAX,
@@ -96,6 +97,7 @@ export function presentationFrameDocument(rendererSource, channel, scrollbarStyl
     (() => {
       const source = ${source};
       const channel = ${frameChannel};
+      let presentationKeys = ${JSON.stringify(shortcutEventVariants(effectiveShortcut('previewPresentation')))};
       const viewport = document.getElementById('ace-presentation-viewport');
       const stage = document.getElementById('ace-presentation-stage');
       const root = document.getElementById('ace-presentation-root');
@@ -183,14 +185,19 @@ export function presentationFrameDocument(rendererSource, channel, scrollbarStyl
         send('contextmenu', '', { x: event.clientX, y: event.clientY });
       });
       window.addEventListener('keydown', (event) => {
-        if (event.key !== 'F11' || !event.ctrlKey || event.altKey || event.shiftKey || event.metaKey
-            || event.isComposing || event.keyCode === 229) return;
+        if (event.isComposing || event.keyCode === 229 || !presentationKeys.some((key) =>
+          key.code === event.code && key.ctrlKey === event.ctrlKey && key.metaKey === event.metaKey
+          && key.altKey === event.altKey && key.shiftKey === event.shiftKey)) return;
         event.preventDefault();
         if (!event.repeat) send('presentation');
       });
       window.addEventListener('message', async (event) => {
         const data = event.data || {};
         if (event.source !== parent || data.source !== source || data.channel !== channel) return;
+        if (data.status === 'shortcuts' && Array.isArray(data.keys)) {
+          presentationKeys = data.keys;
+          return;
+        }
         if (data.status === 'ping') {
           send('ready');
           return;
diff --git a/web/src/lib/previewWorkbenchArchitecture.test.js b/web/src/lib/previewWorkbenchArchitecture.test.js
index 9a9239b2b..37fa079f6 100644
--- a/web/src/lib/previewWorkbenchArchitecture.test.js
+++ b/web/src/lib/previewWorkbenchArchitecture.test.js
@@ -36,7 +36,7 @@ run('preview plus menu exposes exactly file, browser and side chat actions', ()
   assert.doesNotMatch(menu, /终端|onOpenTerminal/);
   assert.match(preview, /aria-haspopup="menu"/);
   assert.match(preview, /data-ace-native-overlay="overlap"/);
-  assert.match(preview, /event\.key === 'Escape'/);
+  assert.match(preview, /isDismissShortcut\(event\)/);
 });
 
 run('preview plus button follows the last tab until measured overflow pins it', () => {
@@ -163,7 +163,7 @@ run('editable file details open directly with highlighted source or semantic Mar
   assert.match(markdownEditor, /markdownToSlate\(normalizedValue\)/);
   assert.match(markdownEditor, /slateToMarkdown\(legalDocument\(document\)\)/);
   assert.match(markdownEditor, /compositionRef\.current\.active/);
-  assert.match(markdownEditor, /event\.key\.toLowerCase\(\) === 's'/);
+  assert.match(markdownEditor, /isShortcut\(event, 'save'\)/);
 });
 
 run('editing reuses the original preview chrome without save status or Markdown toolbar', () => {
diff --git a/web/src/lib/questionPickerInteraction.test.js b/web/src/lib/questionPickerInteraction.test.js
index 5cffe09b5..5b25d834d 100644
--- a/web/src/lib/questionPickerInteraction.test.js
+++ b/web/src/lib/questionPickerInteraction.test.js
@@ -1,4 +1,5 @@
 import assert from 'node:assert/strict';
+import { isDismissShortcut } from './shortcutBindings.js';
 import { readFileSync } from 'node:fs';
 import vm from 'node:vm';
 import React from 'react';
@@ -23,7 +24,7 @@ function harness(questions) {
   let request = { request_id: 'r1', session_id: 's1', questions };
   const changed = (before, after) => !before || after.some((value, index) => value !== before[index]);
   const Component = vm.runInNewContext(`${transformed.code}; QuestionPicker;`, {
-    React, clsx, ...helpers, VsIcon: () => null,
+    React, clsx, isDismissShortcut, ...helpers, VsIcon: () => null,
     connection: { sendQuestionAnswer: (payload) => sent.push(JSON.parse(JSON.stringify(payload))) },
     window: { getSelection: () => null },
     requestAnimationFrame: (callback) => callback(),
diff --git a/web/src/lib/richComposerFocus.test.js b/web/src/lib/richComposerFocus.test.js
index 533b83c5b..08831a0a6 100644
--- a/web/src/lib/richComposerFocus.test.js
+++ b/web/src/lib/richComposerFocus.test.js
@@ -13,18 +13,20 @@ traverse(ast, {
 });
 assert.ok(method, 'The production composer must expose imperative focus');
 
-function fixture({ pending = false, selection = true, domFailure = false } = {}) {
+function fixture({ pending = false, renderPending = false, composing = false, settling = false, selection = true, domFailure = false } = {}) {
   const state = { focused: 0, repairs: 0, frames: [] };
   const editor = { children: [], selection: selection ? {} : null, operations: pending ? [{}] : [] };
   const editableRef = { current: { isConnected: true } };
+  const renderPendingRef = { current: renderPending };
+  const compositionStateRef = { current: { active: composing, settling } };
   const scope = {
-    editor, editableRef, latestTextRef: { current: '' },
+    editor, editableRef, renderPendingRef, compositionStateRef, latestTextRef: { current: '' },
     composerSelectionFromPlainTextRange: () => ({}),
     Transforms: { select: (target, value) => {
       target.selection = value;
       target.operations.push({ type: 'set_selection' });
     } },
-    ReactEditor: { focus: () => {
+    ReactEditor: { isComposing: () => composing, focus: () => {
       state.focused += 1;
       if (domFailure) { domFailure = false; throw new Error('DOM mapping pending'); }
     } },
@@ -32,9 +34,10 @@ function fixture({ pending = false, selection = true, domFailure = false } = {})
     window: { requestAnimationFrame: (callback) => { state.frames.push(callback); } },
   };
   const focus = vm.runInNewContext(`({ ${method} }).focus`, scope);
-  return { state, editor, editableRef, focus,
+  return { state, editor, editableRef, compositionStateRef, focus,
     flush() {
       editor.operations = [];
+      renderPendingRef.current = false;
       const frames = state.frames.splice(0);
       frames.forEach((callback) => callback());
     },
@@ -81,6 +84,15 @@ run('a disconnected editor is never focused', () => {
   assert.equal(test.state.frames.length, 0);
 });
 
+run('a cancelled window activation cannot focus after a pending Slate commit', () => {
+  const test = fixture({ pending: true });
+  let active = true;
+  test.focus({ canFocus: () => active });
+  active = false;
+  test.flush();
+  assert.equal(test.state.focused, 0);
+});
+
 run('a missing DOM mapping gets one guarded retry after a frame', () => {
   const test = fixture({ domFailure: true });
   test.focus();
@@ -95,3 +107,29 @@ run('an already synchronized editor focuses immediately', () => {
   assert.equal(test.state.focused, 1);
   assert.equal(test.state.frames.length, 0);
 });
+
+for (const options of [{composing:true}, {settling:true}]) {
+  run('focus cannot change selection during IME composition or its commit microtask: '+JSON.stringify(options), () => {
+    const test = fixture({...options, selection:false});
+    test.focus();
+    assert.equal(test.editor.selection, null);
+    assert.equal(test.state.focused, 0);
+    assert.equal(test.state.frames.length, 0);
+  });
+}
+
+run('focus waits for React to render even after Slate operations have flushed', () => {
+  const test = fixture({renderPending:true});
+  test.focus();
+  assert.equal(test.state.focused, 0);
+  test.flush();
+  assert.equal(test.state.focused, 1);
+});
+
+run('composition starting during a pending focus retry retains the IME range', () => {
+  const test = fixture({pending:true});
+  test.focus();
+  test.compositionStateRef.current.active = true;
+  test.flush();
+  assert.equal(test.state.focused, 0);
+});
diff --git a/web/src/lib/richComposerKeyboard.test.js b/web/src/lib/richComposerKeyboard.test.js
index e07cd6b83..2f579147b 100644
--- a/web/src/lib/richComposerKeyboard.test.js
+++ b/web/src/lib/richComposerKeyboard.test.js
@@ -8,6 +8,7 @@ import * as contentModel from './composerContent.js';
 import { composerDraftEditFingerprint } from './composerDraft.js';
 import { withComposerImageAttachments } from './composerImagePresentation.js';
 import { isUserComposerEdit } from './inputHistoryNavigation.js';
+import { composerShortcutAction, shortcutEventConsumed } from './shortcutBindings.js';
 import * as composerModel from './richComposerModel.js';
 import * as composerSelection from './composerSelection.js';
 import { formatSessionReferenceToken } from './sessionReference.js';
@@ -68,6 +69,8 @@ function fixture({ kind = 'path', key = 'Backspace', selected = false } = {}) {
     editor.selection = composerModel.composerSelectionFromPlainTextRange(editor.children, 0, tokens[kind].length);
   }
   Object.assign(context, {
+    composerShortcutAction,
+    shortcutEventConsumed,
     editor,
     disabled: false,
     submitOnEnter: true,
diff --git a/web/src/lib/runTests.js b/web/src/lib/runTests.js
index 7219ede0b..b5af2c4e9 100644
--- a/web/src/lib/runTests.js
+++ b/web/src/lib/runTests.js
@@ -1,4 +1,5 @@
 import './desktopOffice.test.js';
+import './officeCharacters.test.js';
 import './htmlPreview.test.js';
 import './desktopOfficePreferences.test.js';
 import './questionPicker.test.js';
@@ -46,6 +47,7 @@ import './imageLightboxTransform.test.js';
 import './imageLightboxArchitecture.test.js';
 import './framelessResize.test.js';
 import './sessionStatus.test.js';
+import './sessionTitleAnimation.test.js';
 import './codeBlockCopy.test.js';
 import './createdFileSource.test.js';
 import './shellCommandPresentation.test.js';
@@ -229,6 +231,7 @@ import './searchSessions.test.js';
 import './searchExperienceArchitecture.test.js';
 import './useGlobalShortcut.test.js';
 import './appShortcuts.test.js';
+import './shortcutBindings.test.js';
 import './searchPaletteShortcut.test.js';
 import './browserCompatibility.test.js';
 import './browserDefaults.test.js';
diff --git a/web/src/lib/searchExperienceArchitecture.test.js b/web/src/lib/searchExperienceArchitecture.test.js
index 5c81ff74f..6eba8b017 100644
--- a/web/src/lib/searchExperienceArchitecture.test.js
+++ b/web/src/lib/searchExperienceArchitecture.test.js
@@ -102,7 +102,7 @@ run('every search palette exit converges on local abort and server cancellation'
   assert.match(palette, /search\.controller\?\.abort\(\)/);
   assert.match(palette, /api\.cancelSessionSearch\(search\.requestId\)/);
   assert.match(palette, /return \(\) => cancelSearch\(search\)/);
-  assert.match(palette, /event\.key === 'Escape'[\s\S]*closePalette\(\)/);
+  assert.match(palette, /isDismissShortcut\(event\)[\s\S]*closePalette\(\)/);
   assert.match(palette, /onClick=\{closePalette\}/);
   assert.match(palette, /event\.target === event\.currentTarget\) closePalette\(\)/);
   assert.match(palette, /\[open, query, searchRevision, cancelSearch\]/);
diff --git a/web/src/lib/searchPaletteShortcut.js b/web/src/lib/searchPaletteShortcut.js
index 86f30e6d4..bbbe3d098 100644
--- a/web/src/lib/searchPaletteShortcut.js
+++ b/web/src/lib/searchPaletteShortcut.js
@@ -4,6 +4,7 @@
 // 控制台(xterm)的放行名单都从这里取,改键位只改这一个文件。
 
 import { APP_SHORTCUTS, matchAppShortcut } from './appShortcuts.js';
+import { bindingLabel, effectiveShortcut, isCustomShortcut } from './shortcutBindings.js';
 
 export const SEARCH_PALETTE_SHORTCUT = Object.freeze({ key: APP_SHORTCUTS.search.key.toLowerCase(), ctrl: true, meta: true });
 
@@ -26,6 +27,7 @@ function isMacHost(win) {
 
 // 面向用户的按键文案:macOS 显示 ⌘K,其它平台 Ctrl+K。
 export function searchPaletteShortcutLabel(win = typeof window !== 'undefined' ? window : undefined) {
+  if (isCustomShortcut('search')) return bindingLabel(effectiveShortcut('search'), isMacHost(win));
   return isMacHost(win) ? '⌘K' : 'Ctrl+K';
 }
 
diff --git a/web/src/lib/selectionAnnotationsArchitecture.test.js b/web/src/lib/selectionAnnotationsArchitecture.test.js
index 6dfdc0990..cbfe02fe7 100644
--- a/web/src/lib/selectionAnnotationsArchitecture.test.js
+++ b/web/src/lib/selectionAnnotationsArchitecture.test.js
@@ -27,7 +27,7 @@ run('selection toolbar keeps the exact quote and annotation contract', () => {
   assert.ok(annotationIndex > quoteIndex);
   assert.match(popover, /role="toolbar" aria-label="选中文本操作"/);
   assert.match(popover, /event\.key === 'Enter' && !event\.shiftKey/);
-  assert.match(popover, /event\.key === 'Escape'/);
+  assert.match(popover, /isDismissShortcut\(event\)/);
   assert.match(popover, /maxLength=\{MAX_SELECTION_ANNOTATION_CHARS\}/);
   assert.match(popover, /document\.addEventListener\('pointerdown'/);
 });
diff --git a/web/src/lib/sessionNavigationMaskArchitecture.test.js b/web/src/lib/sessionNavigationMaskArchitecture.test.js
index 19d9c5e93..77977ea0b 100644
--- a/web/src/lib/sessionNavigationMaskArchitecture.test.js
+++ b/web/src/lib/sessionNavigationMaskArchitecture.test.js
@@ -133,7 +133,7 @@ run('session navigation mask blocks the viewport and exposes accessible progress
   assert.match(mask, /tabIndex=\{0\}[\s\S]*autoFocus/);
   // Esc 走 onKeyDown 分流到 onCancel,其余按键仍然被吞掉。
   assert.match(mask, /onKeyDown=\{onKeyDown\}/);
-  assert.match(mask, /event\.key === 'Escape'/);
+  assert.match(mask, /isDismissShortcut\(event\)/);
   assert.match(mask, /onCancel\(\)/);
   assert.match(mask, /onPointerDown=\{stopInteraction\}/);
   // 遮罩本身仍然不持有任何计时器 —— 生命周期归 App 管。
diff --git a/web/src/lib/sessionTitleAnimation.js b/web/src/lib/sessionTitleAnimation.js
new file mode 100644
index 000000000..e21b74827
--- /dev/null
+++ b/web/src/lib/sessionTitleAnimation.js
@@ -0,0 +1,86 @@
+export function sessionTitleAnimationKey(session = {}) {
+  session = session || {};
+  const id = session.sessionId || session.session_id || session.id || '';
+  if (!id) return '';
+  const hash = session.workspaceHash || session.workspace_hash || '';
+  const scope = session.noWorkspace || session.no_workspace
+    ? 'no-workspace' : (hash === '__local__' ? '' : hash);
+  // A resumed header may carry a daemon port that the same sidebar row omits.
+  return JSON.stringify([scope, id]);
+}
+
+const segmenter = typeof Intl?.Segmenter === 'function'
+  ? new Intl.Segmenter(undefined, { granularity: 'grapheme' }) : null;
+
+export function titleGraphemes(title) {
+  // Older WebViews show the complete title rather than split composed characters.
+  return segmenter ? Array.from(segmenter.segment(title), (part) => part.segment) : [title];
+}
+
+// One clock and immutable snapshot per visible session, shared by all title surfaces.
+export function createSessionTitleAnimationStore({
+  now, schedule, cancel, shouldAnimate = () => true, reducedMotion = () => false,
+}) {
+  const records = new Map();
+  let pending = null;
+  const ensure = (key) => {
+    if (!records.has(key)) records.set(key, { listeners: new Set(), frame: null });
+    return records.get(key);
+  };
+  const publish = (record, text, typing) => {
+    if (record.frame?.title === record.title && record.frame?.text === text && record.frame?.typing === typing) return;
+    record.frame = { title: record.title, text, typing };
+    for (const listener of record.listeners) listener();
+  };
+  const isRunning = () => [...records.values()].some((record) => record.frame?.typing);
+  const tick = () => {
+    pending = null;
+    const time = now();
+    for (const record of records.values()) {
+      if (!record.frame?.typing) continue;
+      // Retain brief title-change feedback even when Windows disables UI animations.
+      const duration = reducedMotion() ? Math.min(320, record.duration) : record.duration;
+      const progress = shouldAnimate() ? Math.min(1, (time - record.startedAt) / duration) : 1;
+      const count = 1 + Math.floor(progress * (record.characters.length - 1));
+      publish(record, record.characters.slice(0, count).join(''), progress < 1);
+    }
+    if (isRunning()) pending = schedule(tick);
+  };
+  const stopIdleClock = () => {
+    if (!isRunning() && pending !== null) {
+      cancel(pending);
+      pending = null;
+    }
+  };
+  return {
+    subscribe(key, listener) {
+      if (!key) return () => {};
+      const record = ensure(key);
+      record.listeners.add(listener);
+      return () => {
+        record.listeners.delete(listener);
+        if (!record.listeners.size) records.delete(key);
+        stopIdleClock();
+      };
+    },
+    getSnapshot(key) { return records.get(key)?.frame || null; },
+    start(key, title) {
+      if (!key) return;
+      const record = ensure(key);
+      if (record.title === title) return;
+      record.title = title;
+      record.characters = titleGraphemes(title);
+      record.startedAt = now();
+      record.duration = Math.min(650, Math.max(180, record.characters.length * 28));
+      const typing = shouldAnimate() && record.characters.length > 1;
+      publish(record, typing ? record.characters[0] : title, typing);
+      if (typing && pending === null) pending = schedule(tick);
+      stopIdleClock();
+    },
+    finish(key) {
+      const record = records.get(key);
+      if (record?.frame?.typing) publish(record, record.title, false);
+      stopIdleClock();
+    },
+  };
+}
diff --git a/web/src/lib/sessionTitleAnimation.test.js b/web/src/lib/sessionTitleAnimation.test.js
new file mode 100644
index 000000000..d26fc1098
--- /dev/null
+++ b/web/src/lib/sessionTitleAnimation.test.js
@@ -0,0 +1,122 @@
+import assert from 'node:assert/strict';
+import { createSessionTitleAnimationStore, sessionTitleAnimationKey, titleGraphemes } from './sessionTitleAnimation.js';
+
+function harness() {
+  let time = 0;
+  let nextId = 0;
+  let animate = true;
+  let reduced = false;
+  const scheduled = new Map();
+  const store = createSessionTitleAnimationStore({
+    now: () => time,
+    schedule: (callback) => { scheduled.set(++nextId, callback); return nextId; },
+    cancel: (id) => scheduled.delete(id),
+    shouldAnimate: () => animate,
+    reducedMotion: () => reduced,
+  });
+  return { store, scheduled,
+    reduceMotion: () => { reduced = true; },
+    hide: () => { animate = false; },
+    advance(ms) {
+      time += ms;
+      const callbacks = [...scheduled.values()];
+      scheduled.clear();
+      callbacks.forEach((callback) => callback());
+    },
+  };
+}
+
+function test(name, fn) {
+  fn();
+  console.log(`[pass] ${name}`);
+}
+
+test('title animation shares progress, ignores duplicate updates and removes cursor at completion', () => {
+  const h = harness();
+  let top, sidebar;
+  const a = h.store.subscribe('session', () => { top = h.store.getSnapshot('session'); });
+  const b = h.store.subscribe('session', () => { sidebar = h.store.getSnapshot('session'); });
+  assert.equal(h.store.getSnapshot('session'), null);
+  h.store.start('session', '修改会话标题的效果');
+  assert.equal(top.text, '修');
+  assert.equal(top, sidebar);
+  h.advance(100);
+  const partial = top;
+  assert.ok(partial.text.length > 1 && partial.typing);
+  h.store.start('session', '修改会话标题的效果');
+  assert.equal(top, partial);
+  assert.equal(h.scheduled.size, 1);
+  h.advance(550);
+  assert.equal(top.text, '修改会话标题的效果');
+  assert.equal(top.typing, false);
+  assert.equal(top, sidebar);
+  assert.equal(h.scheduled.size, 0);
+  h.store.start('session', top.title);
+  assert.equal(h.scheduled.size, 0);
+  a(); b();
+  assert.equal(h.store.getSnapshot('session'), null);
+});
+
+test('new title interrupts old title even when both start with the same character', () => {
+  const h = harness();
+  const release = h.store.subscribe('session', () => {});
+  h.store.start('session', '标题甲');
+  h.store.start('session', '标题乙');
+  assert.equal(h.store.getSnapshot('session').title, '标题乙');
+  h.advance(90);
+  assert.equal(h.store.getSnapshot('session').text, '标题');
+  release();
+  assert.equal(h.scheduled.size, 0);
+  assert.equal(h.store.getSnapshot('session'), null);
+});
+
+test('Unicode graphemes remain whole and long titles finish within the cap', () => {
+  assert.deepEqual(titleGraphemes('中e\u0301\u{1F469}\u200D\u{1F4BB}'), ['中', 'e\u0301', '\u{1F469}\u200D\u{1F4BB}']);
+  const h = harness();
+  h.store.subscribe('session', () => {});
+  const title = '中文'.repeat(200);
+  h.store.start('session', title);
+  h.advance(650);
+  assert.deepEqual(h.store.getSnapshot('session'), { title, text: title, typing: false });
+});
+
+test('hidden completion stops the animation clock', () => {
+  const h = harness();
+  h.store.subscribe('session', () => {});
+  h.store.start('session', '正在生成标题');
+  h.store.finish('session');
+  assert.equal(h.store.getSnapshot('session').typing, false);
+  assert.equal(h.scheduled.size, 0);
+  h.hide();
+  h.store.start('session', '直接显示完整标题');
+  assert.equal(h.store.getSnapshot('session').text, '直接显示完整标题');
+  assert.equal(h.store.getSnapshot('session').typing, false);
+  assert.equal(h.scheduled.size, 0);
+});
+
+test('reduced motion retains synchronized partial text and finishes within 320ms', () => {
+  const h = harness();
+  let top, sidebar;
+  h.store.subscribe('session', () => { top = h.store.getSnapshot('session'); });
+  h.store.subscribe('session', () => { sidebar = h.store.getSnapshot('session'); });
+  h.reduceMotion();
+  const title = '减少动态效果仍然需要看到会话标题的逐字反馈';
+  h.store.start('session', title);
+  h.advance(100);
+  assert.equal(top, sidebar);
+  assert.equal(top.typing, true);
+  assert.ok(top.text.length > 1 && top.text.length < title.length);
+  h.advance(220);
+  assert.deepEqual(top, {title, text:title, typing:false});
+  assert.equal(h.scheduled.size, 0);
+});
+
+test('title identities normalize wire fields and isolate workspace and no-workspace sessions', () => {
+  assert.equal(sessionTitleAnimationKey(null), '');
+  assert.equal(sessionTitleAnimationKey({ id: '1', workspace_hash: 'work' }),
+    sessionTitleAnimationKey({ sessionId: '1', workspaceHash: 'work', port: 28080 }));
+  assert.equal(sessionTitleAnimationKey({ id: '1', no_workspace: true, workspace_hash: 'stale' }),
+    sessionTitleAnimationKey({ sessionId: '1', noWorkspace: true }));
+  assert.notEqual(sessionTitleAnimationKey({ id: '1', workspace_hash: 'a' }),
+    sessionTitleAnimationKey({ id: '1', workspace_hash: 'b' }));
+});
diff --git a/web/src/lib/sessionTranscript.js b/web/src/lib/sessionTranscript.js
index a9866b669..395d8ad96 100644
--- a/web/src/lib/sessionTranscript.js
+++ b/web/src/lib/sessionTranscript.js
@@ -312,7 +312,7 @@ function appendTrajectoryPartialText(next, kind, text) {
   if (!text) return;
   const current = next.trajectoryPartial && typeof next.trajectoryPartial === 'object'
     ? next.trajectoryPartial
-    : { step: null, blocks: [] };
+    : { turnId: next.activeTurnId || '', step: null, blocks: [] };
   const blocks = Array.isArray(current.blocks)
     ? current.blocks.map((block) => ({ ...block }))
     : [];
@@ -388,6 +388,14 @@ function eventSeq(msg) {
 
 function isStaleSequencedEvent(state, msg) {
   const seq = eventSeq(msg);
+  // HTTP catch-up can advance the body watermark before the WebSocket delivers
+  // an unseen rename. Metadata has its own ordering; unrelated tokens cannot
+  // make a title stale. Each field still rejects an older rename/summary.
+  if (msg?.type === 'session_updated' && seq !== null) {
+    const payload = msg.payload || {};
+    if ((Object.prototype.hasOwnProperty.call(payload, 'title') && seq > (state?.titleEventSeq || 0))
+      || (Object.prototype.hasOwnProperty.call(payload, 'summary') && seq > (state?.summaryEventSeq || 0))) return false;
+  }
   return seq !== null && seq <= (state?.lastSeq || 0);
 }
 
@@ -1295,6 +1303,10 @@ export function createTranscriptState(overrides = {}) {
     title: '',
     titleSource: '',
     summary: '',
+    titleEventSeq: 0,
+    summaryEventSeq: 0,
+    titleRevision: 0,
+    summaryRevision: 0,
     // 服务端会话的蜂群模式 off | star | mesh。
     swarmMode: 'off',
     status: 'idle',
@@ -1387,6 +1399,7 @@ export function reduceTranscriptEvent(state, msg) {
     case 'model_step_start': {
       const step = Number(p.step_index);
       next.trajectoryPartial = {
+        turnId: next.activeTurnId || '',
         turn: Math.max(1, (Number(next.turns) || 0) + 1),
         step: Number.isInteger(step) && step > 0 ? step : null,
         blocks: [],
@@ -1780,14 +1793,22 @@ export function reduceTranscriptEvent(state, msg) {
     case 'session_updated': {
       // 显示标题的唯一来源:title(用户改名 / 大模型生成)与 summary(无标题时
       // 的兜底,服务端已截到 80 字节)。侧栏 Sidebar 对同一事件做同样的合并。
-      if (Object.prototype.hasOwnProperty.call(p, 'title')) {
+      const seq = eventSeq(msg);
+      if (Object.prototype.hasOwnProperty.call(p, 'title')
+        && (seq === null || seq > (current.titleEventSeq || 0))) {
         next.title = p.title || '';
         next.titleSource = String(p.title_source || '');
+        next.titleEventSeq = seq ?? current.titleEventSeq;
+        next.titleRevision = (current.titleRevision || 0) + 1;
       }
-      if (Object.prototype.hasOwnProperty.call(p, 'summary')) {
+      if (Object.prototype.hasOwnProperty.call(p, 'summary')
+        && (seq === null || seq > (current.summaryEventSeq || 0))) {
         next.summary = typeof p.summary === 'string' ? p.summary : '';
+        next.summaryEventSeq = seq ?? current.summaryEventSeq;
+        next.summaryRevision = (current.summaryRevision || 0) + 1;
       }
-      if (Object.prototype.hasOwnProperty.call(p, 'swarm_mode')) {
+      if (Object.prototype.hasOwnProperty.call(p, 'swarm_mode')
+        && (seq === null || seq > (current.lastSeq || 0))) {
         next.swarmMode = normalizeSwarmMode(p.swarm_mode);
       }
       break;
@@ -1964,12 +1985,16 @@ export async function fetchCompletedTurnHistory(api, sid, state) {
   return tail;
 }
 
-export function loadTranscriptHistory(state, data = {}) {
+export function loadTranscriptHistory(state, data = {}, requestState = state) {
   const current = state || createTranscriptState();
   let next = createTranscriptState({
     title: current.title || '',
     titleSource: current.titleSource || '',
     summary: current.summary || '',
+    titleEventSeq: current.titleEventSeq || 0,
+    summaryEventSeq: current.summaryEventSeq || 0,
+    titleRevision: current.titleRevision || 0,
+    summaryRevision: current.summaryRevision || 0,
     swarmMode: normalizeSwarmMode(current.swarmMode),
     status: current.status || 'idle',
     isLive: !!current.isLive,
@@ -2051,6 +2076,9 @@ export function loadTranscriptHistory(state, data = {}) {
   if (data.busy === true) {
     next.busy = true;
     next.activeTurnId = String(data.active_turn_id || data.activeTurnId || '');
+    if (next.trajectoryPartial && !next.trajectoryPartial.turnId) {
+      next.trajectoryPartial.turnId = next.activeTurnId;
+    }
     next.status = 'running';
   } else if (data.busy === false && next.status !== 'error') {
     settlePendingAbort(next, {}, data.last_turn_outcome || 'aborted');
@@ -2065,6 +2093,21 @@ export function loadTranscriptHistory(state, data = {}) {
   // Local acceptance is not part of the server event ring yet. A concurrent
   // history refresh must not erase input already acknowledged over HTTP.
   preserveAcceptedInputs(next, current);
+  // A snapshot describes the state when the request was served. A rename that
+  // arrived while it was in flight must survive, including an explicit clear.
+  if ((current.titleRevision || 0) !== (requestState?.titleRevision || 0)
+    && next.titleEventSeq <= current.titleEventSeq) {
+    next.title = current.title;
+    next.titleSource = current.titleSource;
+    next.titleEventSeq = current.titleEventSeq;
+    next.titleRevision = current.titleRevision;
+  }
+  if ((current.summaryRevision || 0) !== (requestState?.summaryRevision || 0)
+    && next.summaryEventSeq <= current.summaryEventSeq) {
+    next.summary = current.summary;
+    next.summaryEventSeq = current.summaryEventSeq;
+    next.summaryRevision = current.summaryRevision;
+  }
   if (current.abortPending && next.busy &&
       (!next.activeTurnId || next.activeTurnId === current.abortTurnId)) {
     next.abortPending = true;
@@ -2182,10 +2225,11 @@ export function useSessionTranscript(sessionRef, options = {}) {
   const pageRequestRef = useRef(null);
   const reloadHistoryTail = useCallback(async () => {
     const scope = historyScopeRef.current;
+    const requestState = store.getState();
     const data = await api.getMessages(sid, { limit: HISTORY_PAGE_SIZE });
     if (historyScopeRef.current !== scope) return null;
     store.commit((previous) => preserveLiveAssistantTailOnLoad(
-      preserveLiveRuntimeOnLoad(loadTranscriptHistory(previous, data).state, previous), previous,
+      preserveLiveRuntimeOnLoad(loadTranscriptHistory(previous, data, requestState).state, previous), previous,
     ));
     return data;
   }, [api, sid, store]);
@@ -2283,6 +2327,7 @@ export function useSessionTranscript(sessionRef, options = {}) {
     ensureSessionOpen(sid);
 
     let off = false;
+    const requestState = store.getState();
     api.getMessages(sid, { limit: HISTORY_PAGE_SIZE }).then((data) => {
       if (off) return;
       loadingHistoryRef.current = false;
@@ -2297,7 +2342,7 @@ export function useSessionTranscript(sessionRef, options = {}) {
       // 读取当前状态、与实时尾巴合并、写回必须是一次原子提交:拆成多步读写会
       // 重新打开“基于过期快照计算”的窗口。
       const nextState = store.commit((prevState) => {
-        const loaded = loadTranscriptHistory(prevState, data || {});
+        const loaded = loadTranscriptHistory(prevState, data || {}, requestState);
         loadEffects = loaded.effects;
         // A recovery audit/live event can arrive after the disk read's fixed
         // boundary but before its response. Reapply it without emitting effects twice.
@@ -2327,6 +2372,7 @@ export function useSessionTranscript(sessionRef, options = {}) {
         busy: !!nextState.busy,
       });
       if (replaySince !== null) {
+        const catchupState = store.getState();
         api.getMessages(sid, replaySince).then((replayData) => {
           if (off) return;
           const replayEvents = Array.isArray(replayData)
@@ -2346,7 +2392,7 @@ export function useSessionTranscript(sessionRef, options = {}) {
           if (loadedSeq === 0 && Array.isArray(replayData?.messages)) {
             let refreshEffects = [];
             store.commit((prevState) => {
-              const refreshed = loadTranscriptHistory(prevState, replayData);
+              const refreshed = loadTranscriptHistory(prevState, replayData, catchupState);
               refreshEffects = refreshed.effects;
               const refreshedState = {
                 ...refreshed.state,
diff --git a/web/src/lib/sessionTranscript.test.js b/web/src/lib/sessionTranscript.test.js
index edb524f44..a6a327343 100644
--- a/web/src/lib/sessionTranscript.test.js
+++ b/web/src/lib/sessionTranscript.test.js
@@ -916,6 +916,35 @@ run('session_updated 更新 transcript title 与 title_source', () => {
 
 // 触发场景:用户消息落盘,daemon 只推 session_updated{summary}。
 // 期望行为:summary 刷新,已有的 title / title_source 保持。
+run('title and summary order independently without replaying body events or stale swarm state', () => {
+  let state = createTranscriptState({ lastSeq: 30, swarmMode: 'on' });
+  state = reduceTranscriptEvent(state, { type: 'session_updated', seq: 20,
+    payload: { title: '最新标题', title_source: 'generated' } }).state;
+  state = reduceTranscriptEvent(state, { type: 'session_updated', seq: 19,
+    payload: { title: '旧标题', summary: '首次到达的摘要', swarm_mode: 'off' } }).state;
+  assert.equal(state.title, '最新标题');
+  assert.equal(state.summary, '首次到达的摘要');
+  assert.equal(state.swarmMode, 'on');
+  assert.equal(state.lastSeq, 30);
+  const staleBody = reduceTranscriptEvent(state, { type: 'token', seq: 29, payload: { text: 'duplicate' } }).state;
+  assert.equal(staleBody, state);
+  const duplicateTitle = reduceTranscriptEvent(state, { type: 'session_updated', seq: 20, payload: { title: '最新标题' } }).state;
+  assert.equal(duplicateTitle, state);
+});
+
+run('late history preserves a concurrent explicit title clear and summary update', () => {
+  const requestState = createTranscriptState({ title: '原来的标题' });
+  const live = reduceTranscriptEvent(requestState, { type: 'session_updated', seq: 7,
+    payload: { title: '', title_source: 'user-cleared', summary: '新摘要' } }).state;
+  const loaded = loadTranscriptHistory(live, { messages: [], title: '原来的标题', summary: '旧摘要' }, requestState).state;
+  assert.equal(loaded.title, '');
+  assert.equal(loaded.titleSource, 'user-cleared');
+  assert.equal(loaded.summary, '新摘要');
+  assert.equal(transcriptDisplayTitle(loaded, {}), '新摘要');
+  const fresh = loadTranscriptHistory(live, { title: '后来的快照', summary: '后来的摘要' }, live).state;
+  assert.equal(fresh.title, '后来的快照', 'a request started after the update can still adopt a fresh snapshot');
+});
+
 run('session_updated 只带 summary 时刷新 summary,不动 title', () => {
   const state = reduceTranscriptEvent(
     createTranscriptState({ title: '生成的标题', titleSource: 'generated', summary: '旧摘要' }),
@@ -2511,6 +2540,7 @@ run('reasoning 只进入 DeepSeek 轨迹 partial 且不追加到可见 assistant
   assert.equal(state.items[0].role, 'assistant');
   assert.equal(state.items[0].content, 'visible');
   assert.deepEqual(state.trajectoryPartial, {
+    turnId: 'turn-live',
     turn: 1,
     step: 2,
     blocks: [
@@ -2525,6 +2555,18 @@ run('reasoning 只进入 DeepSeek 轨迹 partial 且不追加到可见 assistant
   assert.equal(ended.trajectoryPartial, null);
 });
 
+run('busy 历史快照为缺少开始事件的轨迹流式回复恢复稳定回合身份', () => {
+  const loaded = loadTranscriptHistory(createTranscriptState(), {
+    messages: [], busy: true, active_turn_id: 'restored-turn', turn_count: 6,
+    events: [
+      { type: 'model_step_start', payload: { step_index: 1 }, seq: 1 },
+      { type: 'token', payload: { text: 'seventh reply' }, seq: 2 },
+    ],
+  }).state;
+  assert.equal(loaded.trajectoryPartial.turnId, 'restored-turn');
+  assert.deepEqual(loaded.trajectoryPartial.blocks, [{ kind: 'text', text: 'seventh reply' }]);
+});
+
 run('transcript_replace 替换可见 transcript 并清理 token usage', () => {
   const previous = reduceMany([
     { type: 'message', payload: { id: 'u-old', role: 'user', content: 'old prompt' }, seq: 1 },
diff --git a/web/src/lib/sessionTranscriptRecovery.test.js b/web/src/lib/sessionTranscriptRecovery.test.js
index 44d561bf1..03708450e 100644
--- a/web/src/lib/sessionTranscriptRecovery.test.js
+++ b/web/src/lib/sessionTranscriptRecovery.test.js
@@ -16,6 +16,7 @@ const body = source.replace(imports, '').replace(/^export /gm, '');
 
 function harness() {
   const slots = [], requests = [], retained = [];
+  const listeners = new Set();
   let cursor = 0, effects = [];
   let poll = () => {};
   const changed = (previous, next) => !previous || next.some((value, i) => value !== previous[i]);
@@ -48,12 +49,15 @@ function harness() {
       getMessages: (sid, since) => new Promise((resolve, reject) => requests.push({ sid, since, resolve, reject })),
     }),
     connection: {
-      reconfigure() {}, addEventListener() {}, removeEventListener() {},
+      reconfigure() {},
+      addEventListener(_type, listener) { listeners.add(listener); },
+      removeEventListener(_type, listener) { listeners.delete(listener); },
       retainSession: (sid) => retained.push(sid), releaseSession() {},
     },
   });
   return {
     requests, retained, poll: () => poll(),
+    emit(msg) { for (const listener of listeners) listener({ detail: msg }); },
     render(ref, options = {}) {
       cursor = 0; effects = [];
       const result = hook(ref, { live: true, ...options });
@@ -66,6 +70,34 @@ function harness() {
 const flush = async () => { for (let i = 0; i < 6; i++) await Promise.resolve(); };
 const history = { messages: [{ role: 'user', content: 'saved history', ts: 1 }], events: [] };
 
+const titles = harness();
+const titleRef = { sessionId: 'title-race', active: true, title: '原标题' };
+titles.render(titleRef);
+titles.requests[0].resolve({ ...history, title: '原标题', busy: false });
+await flush();
+titles.emit({ session_id: 'title-race', type: 'token', seq: 20, payload: { text: 'reply' } });
+titles.emit({ session_id: 'title-race', type: 'session_updated', seq: 19,
+  payload: { title: '自动命名的新标题', title_source: 'generated' } });
+assert.equal(titles.render(titleRef).title, '自动命名的新标题', 'body sequence must not discard an unseen title update');
+titles.emit({ session_id: 'title-race', type: 'session_updated', seq: 18,
+  payload: { title: '更旧的自动标题', title_source: 'generated' } });
+assert.equal(titles.render(titleRef).title, '自动命名的新标题', 'older title events must not undo newer metadata');
+titles.unmount();
+console.log('[pass] title metadata arriving behind body events updates the header without navigation');
+
+const titleRefresh = harness();
+titleRefresh.render(titleRef);
+titleRefresh.requests[0].resolve({ ...history, title: '原标题', busy: true });
+await flush();
+assert.equal(titleRefresh.requests.length, 2, 'busy session requests catch-up');
+titleRefresh.emit({ session_id: 'title-race', type: 'session_updated', seq: 3,
+  payload: { title: '请求发出后生成的新标题', title_source: 'generated' } });
+titleRefresh.requests[1].resolve({ ...history, title: '原标题', busy: false });
+await flush();
+assert.equal(titleRefresh.render(titleRef).title, '请求发出后生成的新标题', 'late history response must not roll back live title');
+titleRefresh.unmount();
+console.log('[pass] in-flight history cannot overwrite a newer generated title');
+
 const h = harness();
 const pending = { sessionId: 's1', resumePending: true };
 h.render(pending);
diff --git a/web/src/lib/settingsSearch.js b/web/src/lib/settingsSearch.js
index 9411e095c..ef71b4bff 100644
--- a/web/src/lib/settingsSearch.js
+++ b/web/src/lib/settingsSearch.js
@@ -22,6 +22,7 @@ export function settingsSearchEntries(developerModeUnlocked = false) {
     ['appearance', '消息自动折叠', '会话 conversation messages auto collapse fold expand tools'],
     ['shortcuts', '搜索快捷键', 'keyboard shortcuts hotkeys 快捷键 键盘 搜索 前进 后退 思维深度 Ctrl Alt Cmd'],
     ['config', '升级服务 URL', 'upgrade update service url'],
+    ['config', 'Skill 扫描路径', 'skill skills scan search paths directories 技能 扫描 搜索 路径 目录'],
     ['config', 'Python 工具', 'python uv ruff mypy path directory'],
     ['config', 'Node.js 工具', 'node nodejs npm pnpm tsx path directory'],
     ['config', 'C# 工具', 'csharp dotnet roslyn sdk path directory'],
diff --git a/web/src/lib/settingsSearch.test.js b/web/src/lib/settingsSearch.test.js
index e6147a8ed..19f65a945 100644
--- a/web/src/lib/settingsSearch.test.js
+++ b/web/src/lib/settingsSearch.test.js
@@ -10,6 +10,8 @@ assert.equal(searchSettings(entries, 'NODE.JS')[0].label, 'Node.js 工具');
 assert.equal(searchSettings(entries, 'font size')[0].section, 'appearance');
 assert.ok(searchSettings(entries, 'path').length > 3);
 assert.equal(searchSettings(entries, 'upgrade')[0].section, 'config');
+assert.equal(searchSettings(entries, 'Skill 扫描路径')[0].section, 'config');
+assert.equal(searchSettings(entries, 'skill scan paths')[0].label, 'Skill 扫描路径');
 console.log('[pass] bilingual settings search, ranking, cross-section and empty queries');
 
 // 全局搜索面板 → 设置窗口的选中项对齐(settingsSearchResultIndex)。
diff --git a/web/src/lib/settingsWindowArchitecture.test.js b/web/src/lib/settingsWindowArchitecture.test.js
index 33d2236f0..3a67a6af0 100644
--- a/web/src/lib/settingsWindowArchitecture.test.js
+++ b/web/src/lib/settingsWindowArchitecture.test.js
@@ -54,9 +54,9 @@ run('Settings uses a blocking mask and an accessible expandable dialog', () => {
 // 修复前的表现:设置窗口只能点遮罩或关闭按钮关闭,按 Esc 没有任何反应。
 run('Settings window closes on Escape but yields to nested modals', () => {
   const settings = source('components/SettingsPage.jsx');
-  const escapeEffect = between(settings, "if (event.key !== 'Escape'", 'const onMaskClick');
+  const escapeEffect = between(settings, "if (!isDismissShortcut(event)", 'const onMaskClick');
 
-  assert.match(escapeEffect, /event\.defaultPrevented \|\| event\.isComposing\) return;/);
+  assert.match(escapeEffect, /shortcutEventConsumed\(event\) \|\| event\.isComposing\) return;/);
   assert.match(escapeEffect, /document\.querySelector\('\[data-ace-modal-dialog="true"\]'\)\) return;/);
   assert.match(escapeEffect, /close\(\);/);
   assert.match(escapeEffect, /document\.addEventListener\('keydown', onKeyDown\);/);
@@ -73,7 +73,7 @@ run('Settings window closes on Escape but yields to nested modals', () => {
 run('Settings search only swallows Escape while it has a query to clear', () => {
   const search = source('components/SettingsSearch.jsx');
 
-  assert.match(search, /if \(event\.key === 'Escape' && query\) \{ event\.stopPropagation\(\); onQuery\(''\); \}/);
+  assert.match(search, /if \(isDismissShortcut\(event\) && query\) \{ event\.stopPropagation\(\); onQuery\(''\); \}/);
 });
 
 run('Settings panel keeps normal caps and an exact 13px expanded inset', () => {
diff --git a/web/src/lib/shortcutBindings.js b/web/src/lib/shortcutBindings.js
new file mode 100644
index 000000000..f0836f40e
--- /dev/null
+++ b/web/src/lib/shortcutBindings.js
@@ -0,0 +1,219 @@
+import { readWithFallback, writeSafely } from './usePreference.js';
+
+const binding = (code, key, extra = {}) => Object.freeze({ code, key, ...extra });
+export const APP_SHORTCUTS = Object.freeze({
+  newSession: binding('KeyN', 'N', { alt: true }),
+  focusInput: binding('KeyI', 'I', { alt: true }),
+  toggleSidebar: binding('KeyB', 'B', { alt: true }),
+  toggleRightPanel: binding('KeyE', 'E', { alt: true }),
+  previewPresentation: binding('F11', 'F11', { control: true }),
+  settings: binding('Comma', ','), shortcuts: binding('Slash', '/'),
+  stop: binding('Period', '.', { shift: true }),
+  forward: binding('Minus', '-'), back: binding('Minus', '-', { shift: true }),
+  reasoningUp: binding('Period', '>', { alt: true, optionalShift: true }),
+  reasoningDown: binding('Comma', '<', { alt: true, optionalShift: true }),
+  search: binding('KeyK', 'K'), console: binding('Backquote', '`', { control: true }),
+});
+export const CONTEXT_SHORTCUTS = Object.freeze({
+  find: binding('KeyF', 'F', { optionalShift: true }),
+  send: binding('Enter', 'Enter', { unmodified: true }),
+  newline: binding('Enter', 'Enter', { unmodified: true, shift: true }),
+  historyPrevious: binding('ArrowUp', '↑', { unmodified: true }),
+  historyNext: binding('ArrowDown', '↓', { unmodified: true }),
+  save: binding('KeyS', 'S'),
+  dismiss: binding('Escape', 'Esc', { unmodified: true }),
+});
+export const DEFAULT_SHORTCUTS = Object.freeze({ ...APP_SHORTCUTS, ...CONTEXT_SHORTCUTS });
+export const SHORTCUT_STORAGE_KEY = 'acecode.shortcuts.v1';
+export const APP_SHORTCUT_BROWSER_GUARD = Symbol('ace-shortcut-browser-guard');
+const EMPTY = Object.freeze({});
+const KEY_NAMES = Object.freeze({
+  Comma: ',', Period: '.', Slash: '/', Backslash: '\\', Semicolon: ';', Quote: "'",
+  BracketLeft: '[', BracketRight: ']', Minus: '-', Equal: '=', Backquote: '`',
+  Enter: 'Enter', Escape: 'Esc', Space: 'Space', Backspace: 'Backspace', Delete: 'Delete',
+  ArrowUp: '↑', ArrowDown: '↓', ArrowLeft: '←', ArrowRight: '→',
+  Home: 'Home', End: 'End', PageUp: 'PageUp', PageDown: 'PageDown', Insert: 'Insert',
+});
+const keyName = (code) => KEY_NAMES[code] || (/^Key[A-Z]$/.test(code) ? code.slice(3)
+  : /^Digit[0-9]$/.test(code) ? code.slice(5) : /^F([1-9]|1[0-2])$/.test(code) ? code : '');
+export const isMacShortcutHost = (win = globalThis.window) => win?.__ACECODE_OS__
+  ? win.__ACECODE_OS__ === 'macos' : /Mac|iPhone|iPad/i.test(win?.navigator?.platform || '');
+
+export function isShortcutRecording(event) {
+  return !!event?.target?.closest?.('[data-shortcut-recorder]');
+}
+export function isShortcutComposing(event) {
+  return !event || event.isComposing || event.nativeEvent?.isComposing
+    || event.keyCode === 229 || event.which === 229 || event.nativeEvent?.keyCode === 229
+    || event.nativeEvent?.which === 229 || event.getModifierState?.('AltGraph');
+}
+
+// Stored overrides use explicit modifiers. Legacy defaults keep Ctrl/Cmd parity.
+export function matchesShortcutBinding(event, spec) {
+  if (!spec || isShortcutComposing(event) || isShortcutRecording(event)) return false;
+  if (spec.modifiers) {
+    if (Boolean(event.ctrlKey) !== spec.modifiers.ctrl || Boolean(event.metaKey) !== spec.modifiers.meta) return false;
+  } else if (spec.unmodified) {
+    if (event.ctrlKey || event.metaKey) return false;
+  } else if (spec.control ? (!event.ctrlKey || event.metaKey)
+    : ((!event.ctrlKey && !event.metaKey) || (event.ctrlKey && event.metaKey))) return false;
+  if (Boolean(event.altKey) !== Boolean(spec.alt)) return false;
+  if (!spec.optionalShift && Boolean(event.shiftKey) !== Boolean(spec.shift)) return false;
+  // Captured chords are physical and exact. Defaults retain their existing
+  // logical-key fallback (including alternate layouts and the numpad minus).
+  if (event.code === spec.code) return true;
+  if (spec.modifiers && event.code) return false;
+  const key = String(event.key || '').toLowerCase();
+  const aliases = { Period: ['.', '>'], Comma: [',', '<'], Minus: ['-', '_'], Escape: ['escape', 'esc'],
+    ArrowUp: ['arrowup', '↑'], ArrowDown: ['arrowdown', '↓'] };
+  return key === spec.key.toLowerCase() || aliases[spec.code]?.includes(key) || false;
+}
+
+export function bindingLabel(spec, mac = isMacShortcutHost()) {
+  if (!spec) return '';
+  const modifiers = spec.modifiers
+    ? [spec.modifiers.ctrl && 'Ctrl', spec.modifiers.meta && 'Cmd']
+    : [!spec.unmodified && (spec.control || !mac ? 'Ctrl' : 'Cmd')];
+  return [...modifiers, spec.alt && (mac ? 'Option' : 'Alt'), spec.shift && 'Shift', spec.key].filter(Boolean).join('+');
+}
+
+export function captureShortcut(event) {
+  if (isShortcutComposing(event) || event.repeat) return null;
+  const code = event.code || (event.key === 'Escape' ? 'Escape' : event.key);
+  const key = keyName(code);
+  if (!key) return null;
+  return { code, key, modifiers: { ctrl: !!event.ctrlKey, meta: !!event.metaKey },
+    alt: !!event.altKey, shift: !!event.shiftKey };
+}
+
+export function shortcutEventVariants(spec) {
+  const variants = [];
+  for (const ctrlKey of [false, true]) for (const metaKey of [false, true]) {
+    for (const altKey of [false, true]) for (const shiftKey of [false, true]) {
+      const event = { key: spec.key, code: spec.code, ctrlKey, metaKey, altKey, shiftKey };
+      if (matchesShortcutBinding(event, spec)) variants.push(event);
+    }
+  }
+  return variants;
+}
+
+function validOverride(value) {
+  return value && keyName(value.code) && value.key === keyName(value.code)
+    && typeof value.modifiers?.ctrl === 'boolean' && typeof value.modifiers?.meta === 'boolean'
+    && typeof value.alt === 'boolean' && typeof value.shift === 'boolean'
+    && !(value.modifiers.ctrl && value.modifiers.meta);
+}
+
+function keyReservation(id, spec) {
+  const primary = spec.modifiers?.ctrl || spec.modifiers?.meta;
+  if (!primary && !spec.alt && !/^F\d+$/.test(spec.code)) {
+    const allowed = { send: ['Enter'], newline: ['Enter'], historyPrevious: ['ArrowUp', 'ArrowDown'],
+      historyNext: ['ArrowUp', 'ArrowDown'], dismiss: ['Escape'] };
+    if (!allowed[id]?.includes(spec.code)) return 'modifier';
+  }
+  // These chords are browser/OS focus, editing or native-window commands.
+  if (spec.code === 'Tab' || (spec.code === 'F11' && !primary && !spec.alt)
+      || (spec.alt && spec.code === 'F4') || (spec.modifiers?.meta && !isMacShortcutHost())
+      || (primary && !spec.alt && ['KeyC', 'KeyV', 'KeyX', 'KeyA', 'KeyZ', 'KeyY', 'KeyL', 'KeyT', 'KeyW', 'KeyN', 'KeyR', 'KeyO'].includes(spec.code))
+      || (!primary && spec.alt && ['ArrowLeft', 'ArrowRight'].includes(spec.code))) return 'reserved';
+  if (spec.code === 'F3' && id !== 'find') return 'reserved';
+  return null;
+}
+
+export function shortcutBindingsConflict(a, b) {
+  if (a.code !== b.code) return false;
+  for (const ctrlKey of [false, true]) for (const metaKey of [false, true]) {
+    for (const altKey of [false, true]) for (const shiftKey of [false, true]) {
+      const event = { code: a.code, ctrlKey, metaKey, altKey, shiftKey };
+      if (matchesShortcutBinding(event, a) && matchesShortcutBinding(event, b)) return true;
+    }
+  }
+  return false;
+}
+
+export function validateShortcut(id, spec, overrides = EMPTY) {
+  if (!Object.hasOwn(DEFAULT_SHORTCUTS, id)) return { reason: 'invalid' };
+  if (spec !== DEFAULT_SHORTCUTS[id] && !validOverride(spec)) return { reason: 'invalid' };
+  const reserved = spec.modifiers && keyReservation(id, spec);
+  if (reserved) return { reason: reserved };
+  for (const [other, original] of Object.entries(DEFAULT_SHORTCUTS)) {
+    if (other !== id && shortcutBindingsConflict(spec, overrides[other] || original)) return { reason: 'conflict', conflict: other };
+  }
+  return null;
+}
+
+function normalizeOverrides(value) {
+  if (!value || typeof value !== 'object' || Array.isArray(value)) return EMPTY;
+  const result = {};
+  for (const [id, spec] of Object.entries(value)) {
+    if (!Object.hasOwn(DEFAULT_SHORTCUTS, id) || !validOverride(spec) || keyReservation(id, spec)) continue;
+    result[id] = Object.freeze({ code: spec.code, key: spec.key,
+      modifiers: Object.freeze({ ctrl: spec.modifiers.ctrl, meta: spec.modifiers.meta }), alt: spec.alt, shift: spec.shift });
+  }
+  if (Object.entries(result).some(([id, spec]) => validateShortcut(id, spec, result))) return EMPTY;
+  return Object.freeze(result);
+}
+
+export function createShortcutStore(storage, events) {
+  const read = () => normalizeOverrides(readWithFallback(SHORTCUT_STORAGE_KEY, EMPTY, null, storage));
+  let current = read();
+  const listeners = new Set();
+  const notify = () => { for (const listener of listeners) listener(); };
+  const onStorage = (event) => {
+    if (event.key !== SHORTCUT_STORAGE_KEY && event.key !== null) return;
+    current = read(); notify();
+  };
+  return {
+    getSnapshot: () => current,
+    subscribe(listener) {
+      if (!listeners.size) { events?.addEventListener('storage', onStorage); current = read(); }
+      listeners.add(listener);
+      return () => { listeners.delete(listener); if (!listeners.size) events?.removeEventListener('storage', onStorage); };
+    },
+    save(id, value) {
+      // Read again before write so other windows' changes are not overwritten.
+      const latest = read();
+      const issue = validateShortcut(id, value || DEFAULT_SHORTCUTS[id], latest);
+      if (issue) return { ok: false, ...issue };
+      const next = { ...latest };
+      if (value) next[id] = value; else delete next[id];
+      if (!writeSafely(SHORTCUT_STORAGE_KEY, next, storage)) return { ok: false, reason: 'storage' };
+      current = normalizeOverrides(next); notify();
+      return { ok: true };
+    },
+  };
+}
+
+let singleton;
+export function shortcutStore() {
+  if (!singleton) {
+    let storage = null;
+    try { storage = globalThis.localStorage; } catch { /* Saving reports unavailable storage. */ }
+    singleton = createShortcutStore(storage, globalThis.window);
+  }
+  return singleton;
+}
+export const getShortcutOverrides = () => shortcutStore().getSnapshot();
+export const effectiveShortcut = (id, overrides = getShortcutOverrides()) => overrides[id] || DEFAULT_SHORTCUTS[id];
+export const isCustomShortcut = (id) => Object.hasOwn(getShortcutOverrides(), id);
+export const isShortcut = (event, id) => matchesShortcutBinding(event, effectiveShortcut(id));
+export const isDismissShortcut = (event) => isShortcut(event, 'dismiss');
+export const shortcutEventConsumed = (event) => event.defaultPrevented
+  && !(event.nativeEvent || event)[APP_SHORTCUT_BROWSER_GUARD];
+
+export function composerShortcutAction(event, desktop = false, overrides = getShortcutOverrides()) {
+  if (isShortcutComposing(event)) return null;
+  const matches = (id) => matchesShortcutBinding(event, effectiveShortcut(id, overrides));
+  const custom = (id) => Object.hasOwn(overrides, id);
+  if (matches('send')) return 'send';
+  if (matches('newline')) {
+    // Preserve the editor's native Shift+Enter/soft-break behavior by default.
+    if (!custom('newline') && event.key === 'Enter' && event.shiftKey
+        && !event.ctrlKey && !event.metaKey && !event.altKey) return null;
+    return 'newline';
+  }
+  if (event.key === 'Enter' && event.ctrlKey && desktop) return custom('newline') ? 'ignore' : 'newline';
+  if (event.key === 'Enter' && !event.shiftKey && !custom('send')) return 'send';
+  if (custom('newline') && matchesShortcutBinding(event, CONTEXT_SHORTCUTS.newline)) return 'ignore';
+  return null;
+}
diff --git a/web/src/lib/shortcutBindings.test.js b/web/src/lib/shortcutBindings.test.js
new file mode 100644
index 000000000..95de4ec57
--- /dev/null
+++ b/web/src/lib/shortcutBindings.test.js
@@ -0,0 +1,70 @@
+import assert from 'node:assert/strict';
+import { APP_SHORTCUTS, SHORTCUT_STORAGE_KEY, bindingLabel, captureShortcut, createShortcutStore,
+  composerShortcutAction, effectiveShortcut, matchesShortcutBinding, shortcutBindingsConflict, shortcutEventVariants, validateShortcut } from './shortcutBindings.js';
+
+const chord = (code, extra = {}) => captureShortcut({ code, ctrlKey: true, altKey: true, ...extra });
+const memory = () => {
+  const data = new Map();
+  return { getItem: key => data.get(key) ?? null, setItem: (key, value) => data.set(key, value), data };
+};
+const storage = memory();
+const events = new EventTarget();
+const store = createShortcutStore(storage, events);
+let notifications = 0;
+const unsubscribe = store.subscribe(() => notifications++);
+const custom = chord('KeyJ');
+assert.deepEqual(store.save('newSession', custom), { ok: true });
+assert.equal(notifications, 1);
+assert.equal(bindingLabel(effectiveShortcut('newSession', store.getSnapshot())), 'Ctrl+Alt+J');
+assert.equal(matchesShortcutBinding({ code: 'KeyN', ctrlKey: true, altKey: true }, effectiveShortcut('newSession', store.getSnapshot())), false);
+assert.equal(matchesShortcutBinding({ code: 'KeyJ', ctrlKey: true, altKey: true }, effectiveShortcut('newSession', store.getSnapshot())), true);
+const reloaded = createShortcutStore(storage, events);
+assert.deepEqual(reloaded.getSnapshot(), store.getSnapshot());
+assert.deepEqual(store.save('focusInput', custom), { ok: false, reason: 'conflict', conflict: 'newSession' });
+assert.deepEqual(store.save('newSession', chord('Period', { shiftKey: true })), { ok: false, reason: 'conflict', conflict: 'reasoningUp' });
+assert.equal(store.save('newSession', chord('KeyC', { altKey: false })).reason, 'reserved');
+assert.equal(store.save('newSession', chord('KeyJ', { ctrlKey: false, altKey: false })).reason, 'modifier');
+assert.equal(store.save('newSession', chord('F11', { ctrlKey: false, altKey: false })).reason, 'reserved');
+assert.equal(store.save('missing', custom).reason, 'invalid');
+assert.equal(store.save('newSession', { ...custom, code: 'NotAKey' }).reason, 'invalid');
+assert.equal(store.save('newSession', { ...custom, key: '<script>' }).reason, 'invalid');
+assert.deepEqual(store.save('focusInput', chord('KeyN')), { ok: true });
+assert.equal(store.save('newSession', null).reason, 'conflict', 'restoring cannot silently steal another binding');
+assert.deepEqual(store.save('focusInput', null), { ok: true });
+assert.deepEqual(store.save('newSession', null), { ok: true });
+assert.deepEqual(store.getSnapshot(), {});
+assert.deepEqual(store.save('newSession', custom), { ok: true });
+const before = store.getSnapshot();
+storage.setItem = () => { throw new Error('quota exceeded'); };
+assert.deepEqual(store.save('newSession', chord('KeyU')), { ok: false, reason: 'storage' });
+assert.equal(store.getSnapshot(), before, 'failed save keeps active bindings');
+assert.deepEqual(createShortcutStore(null).save('newSession', custom), { ok: false, reason: 'storage' });
+storage.data.set(SHORTCUT_STORAGE_KEY, JSON.stringify({ newSession: chord('KeyU') }));
+const storageEvent = new Event('storage');
+Object.defineProperty(storageEvent, 'key', { value: SHORTCUT_STORAGE_KEY });
+events.dispatchEvent(storageEvent);
+assert.equal(store.getSnapshot().newSession.code, 'KeyU');
+unsubscribe();
+const malformed = memory();
+malformed.setItem(SHORTCUT_STORAGE_KEY, '{broken');
+assert.deepEqual(createShortcutStore(malformed).getSnapshot(), {});
+malformed.setItem(SHORTCUT_STORAGE_KEY, JSON.stringify({ newSession: chord('KeyI') }));
+assert.deepEqual(createShortcutStore(malformed).getSnapshot(), {}, 'conflicting storage falls back to valid defaults');
+assert.equal(captureShortcut({ code: 'ControlLeft', ctrlKey: true }), null);
+assert.equal(captureShortcut({ code: 'KeyJ', ctrlKey: true, isComposing: true }), null);
+assert.equal(captureShortcut({ code: 'KeyJ', ctrlKey: true, repeat: true }), null);
+assert.equal(captureShortcut({ code: 'KeyJ', ctrlKey: true, getModifierState: () => true }), null);
+assert.equal(matchesShortcutBinding({ code: 'KeyJ', ctrlKey: true, altKey: true, target: { closest: () => ({}) } }, custom), false);
+assert.equal(matchesShortcutBinding({ code: 'KeyJ', ctrlKey: true, altKey: true, shiftKey: true }, custom), false);
+assert.equal(composerShortcutAction({ key: 'Enter', code: 'Enter', ctrlKey: true }, true, { newline: chord('KeyJ') }), 'ignore', 'old desktop newline must not become a send action');
+assert.equal(composerShortcutAction({ key: 'Enter', code: 'Enter' }, false, { send: chord('KeyJ') }), null);
+assert.equal(composerShortcutAction({ key: 'Enter', code: 'Enter', ctrlKey: true }, true, {}), 'newline');
+assert.equal(shortcutBindingsConflict(APP_SHORTCUTS.reasoningUp, chord('Period', { shiftKey: true })), true);
+assert.equal(shortcutBindingsConflict(APP_SHORTCUTS.reasoningUp, chord('Comma')), false);
+assert.equal(matchesShortcutBinding({ key: '-', code: 'NumpadSubtract', ctrlKey: true }, APP_SHORTCUTS.forward), true);
+assert.equal(matchesShortcutBinding({ key: 'k', code: 'KeyT', ctrlKey: true }, APP_SHORTCUTS.search), true);
+assert.deepEqual(shortcutEventVariants(custom), [{ key: 'J', code: 'KeyJ', ctrlKey: true, metaKey: false, altKey: true, shiftKey: false }]);
+for (const [id, code, extra] of [['send', 'Enter', { altKey: false }], ['newline', 'KeyJ', {}], ['save', 'KeyG', {}], ['dismiss', 'KeyQ', {}], ['find', 'KeyF', {}], ['historyPrevious', 'ArrowUp', {}]]) {
+  assert.equal(validateShortcut(id, chord(code, extra)), null, id);
+}
+console.log('[pass] editable shortcuts: persistence, conflicts, reset, storage failure, window sync, corruption, capture and contexts');
diff --git a/web/src/lib/sidebarTitleMarqueeArchitecture.test.js b/web/src/lib/sidebarTitleMarqueeArchitecture.test.js
index 54a9e6ae5..2ad639bb1 100644
--- a/web/src/lib/sidebarTitleMarqueeArchitecture.test.js
+++ b/web/src/lib/sidebarTitleMarqueeArchitecture.test.js
@@ -27,7 +27,7 @@ function test(name, fn) {
 // 与顶部标题栏不一致、且长度不受限的文本。
 test('SessionRow measures only its non-editing title viewport', () => {
   const sidebar = source('components/Sidebar.jsx');
-  const titleStart = sidebar.indexOf('function SidebarSessionTitle({ title })');
+  const titleStart = sidebar.indexOf('function SidebarSessionTitle({ title, animation })');
   const rowStart = sidebar.indexOf('\nfunction SessionRow({', titleStart);
   const rowEnd = sidebar.indexOf('\nfunction OpencodeImportSelectAllCheckbox(', rowStart);
   assert.ok(titleStart >= 0 && rowStart > titleStart && rowEnd > rowStart);
@@ -42,8 +42,8 @@ test('SessionRow measures only its non-editing title viewport', () => {
   assert.match(titleComponent, /observer\?\.observe\(content\)/);
   assert.match(titleComponent, /document\.fonts\?\.ready/);
   assert.match(titleComponent, /metrics\.overflowing && 'is-overflowing'/);
-  assert.match(titleComponent, /metrics\.overflowing && 'is-marquee-ready'/);
-  assert.doesNotMatch(titleComponent, /\btitle=\{/);
+  assert.match(titleComponent, /metrics\.overflowing && !animation\?\.typing && 'is-marquee-ready'/);
+  assert.doesNotMatch(titleComponent, /<span[^>]*\btitle=\{/);
   assert.match(row, /const title = sessionDisplayTitle\(s, s\.name \|\| ''\);/);
   assert.match(
     row,
@@ -51,7 +51,7 @@ test('SessionRow measures only its non-editing title viewport', () => {
   );
   assert.match(
     row,
-    /\{editing \? \([\s\S]*?<input[\s\S]*?\) : \([\s\S]*?<SidebarSessionTitle title=\{title\} \/>/,
+    /\{editing \? \([\s\S]*?<input[\s\S]*?\) : \([\s\S]*?<SidebarSessionTitle title=\{title\} animation=\{titleAnimation\} \/>/,
   );
   assert.doesNotMatch(row, /className="block min-w-0 truncate"/);
   assert.doesNotMatch(row, /getMessages\(/);
diff --git a/web/src/lib/skillsSettings.js b/web/src/lib/skillsSettings.js
index 728b6fe0a..2871af4f9 100644
--- a/web/src/lib/skillsSettings.js
+++ b/web/src/lib/skillsSettings.js
@@ -25,6 +25,25 @@ export function filterSkills(skills, query) {
     s.description.toLowerCase().includes(q));
 }
 
+export const SKILL_PAGE_SIZES = [20, 50, 100];
+export const DEFAULT_SKILL_PAGE_SIZE = 50;
+
+export function isSkillPageSize(value) {
+  return SKILL_PAGE_SIZES.includes(value);
+}
+
+// Filter the complete catalog first, then slice before creating card elements.
+// Clamp to a valid page after refresh/deletion; empty lists retain page 1.
+export function paginateSkills(skills, requestedPage = 1, requestedSize = DEFAULT_SKILL_PAGE_SIZE) {
+  const list = Array.isArray(skills) ? skills : [];
+  const pageSize = isSkillPageSize(requestedSize) ? requestedSize : DEFAULT_SKILL_PAGE_SIZE;
+  const total = list.length;
+  const pageCount = Math.max(1, Math.ceil(total / pageSize));
+  const page = Math.min(pageCount, Math.max(1, Number.isFinite(requestedPage) ? Math.floor(requestedPage) : 1));
+  const offset = (page - 1) * pageSize;
+  return { items: list.slice(offset, offset + pageSize), page, pageCount, pageSize, total };
+}
+
 // 按来源分成「项目技能」「全局技能」两个列表,保持原有顺序。
 export function groupSkillsBySource(skills) {
   const project = [];
diff --git a/web/src/lib/skillsSettings.test.js b/web/src/lib/skillsSettings.test.js
index 5f54ac966..43c8f89ba 100644
--- a/web/src/lib/skillsSettings.test.js
+++ b/web/src/lib/skillsSettings.test.js
@@ -12,11 +12,15 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import {
+  DEFAULT_SKILL_PAGE_SIZE,
+  SKILL_PAGE_SIZES,
   enabledRatioLabel,
   filterSkills,
   groupSkillsBySource,
+  isSkillPageSize,
   normalizeSkillList,
   normalizeWorkspaceList,
+  paginateSkills,
   skillsEnabledSummary,
   workspaceAutoExpand,
 } from './skillsSettings.js';
@@ -87,6 +91,55 @@ run('filterSkills 无命中返回空数组', () => {
   assert.deepEqual(filterSkills(SKILLS, 'nonexistent-keyword'), []);
 });
 
+run('skill pagination defaults to 50 and covers 20/50/100 without gaps', () => {
+  assert.equal(DEFAULT_SKILL_PAGE_SIZE, 50);
+  assert.deepEqual(SKILL_PAGE_SIZES, [20, 50, 100]);
+  const skills = Array.from({ length: 237 }, (_, i) => ({ name: `skill-${i}`, description: '', enabled: i % 2 === 0 }));
+  assert.equal(paginateSkills(skills).items.length, 50);
+  for (const size of SKILL_PAGE_SIZES) {
+    assert.equal(isSkillPageSize(size), true);
+    const all = [];
+    const pageCount = Math.ceil(skills.length / size);
+    for (let page = 1; page <= pageCount; page += 1) {
+      const result = paginateSkills(skills, page, size);
+      assert.equal(result.page, page);
+      assert.equal(result.pageCount, pageCount);
+      assert.equal(result.total, skills.length);
+      assert.ok(result.items.length <= size);
+      all.push(...result.items);
+    }
+    assert.deepEqual(all, skills);
+  }
+  for (const invalid of [0, 1, 25, 200, '50', null, undefined, NaN]) {
+    assert.equal(isSkillPageSize(invalid), false);
+    assert.equal(paginateSkills(skills, 1, invalid).pageSize, 50);
+  }
+});
+
+run('skill pagination clamps after deletion and handles empty catalogs', () => {
+  const skills = Array.from({ length: 51 }, (_, i) => ({ name: `skill-${i}` }));
+  const last = paginateSkills(skills, 9);
+  assert.equal(last.page, 2);
+  assert.deepEqual(last.items, [skills[50]]);
+  const shortened = paginateSkills(skills.slice(0, 30), last.page);
+  assert.equal(shortened.page, 1);
+  assert.equal(shortened.items.length, 30);
+  for (const empty of [[], null, undefined]) {
+    assert.deepEqual(paginateSkills(empty, 9), { items: [], page: 1, pageCount: 1, pageSize: 50, total: 0 });
+  }
+  for (const invalid of [-1, 0, NaN, Infinity]) assert.equal(paginateSkills(skills, invalid).page, 1);
+});
+
+run('skill pagination searches the full catalog and keeps full enabled totals', () => {
+  const skills = Array.from({ length: 120 }, (_, i) => ({ name: `skill-${i}`, description: i === 119 ? 'needle' : '', enabled: true }));
+  assert.equal(paginateSkills(skills).items.some((skill) => skill.description === 'needle'), false);
+  const result = paginateSkills(filterSkills(skills, 'needle'));
+  assert.deepEqual(result.items, [skills[119]]);
+  assert.equal(result.total, 1);
+  assert.equal(skillsEnabledSummary(skills).total, 120);
+  assert.equal(skillsEnabledSummary(skills).enabled, 120);
+});
+
 run('groupSkillsBySource 项目/全局二分并保序', () => {
   const { project, global } = groupSkillsBySource(SKILLS);
   assert.deepEqual(project.map((s) => s.name), ['code-review']);
diff --git a/web/src/lib/slateComposerArchitecture.test.js b/web/src/lib/slateComposerArchitecture.test.js
index 75cb6e2f8..ca05c85a4 100644
--- a/web/src/lib/slateComposerArchitecture.test.js
+++ b/web/src/lib/slateComposerArchitecture.test.js
@@ -106,17 +106,9 @@ run('imperative focus retries after an external Slate document replacement', ()
 
 run('desktop Ctrl+Enter inserts a line break while plain Enter still submits', () => {
   const composer = source('components/RichComposer.jsx');
-  const enter = composer.indexOf("event.key === 'Enter'");
-  const desktopCtrlEnter = composer.indexOf('event.ctrlKey && isDesktopShell()', enter);
-  const insertBreak = composer.indexOf('editor.insertBreak()', desktopCtrlEnter);
-  const plainEnter = composer.indexOf('if (!event.shiftKey)', insertBreak);
-  const submit = composer.indexOf('onSubmit?.()', plainEnter);
-
-  assert.ok(enter >= 0);
-  assert.ok(desktopCtrlEnter > enter);
-  assert.ok(insertBreak > desktopCtrlEnter);
-  assert.ok(plainEnter > insertBreak);
-  assert.ok(submit > plainEnter);
+  assert.match(composer, /composerShortcutAction\(event, isDesktopShell\(\)\)/);
+  assert.match(composer, /shortcutAction === 'newline'\) editor\.insertBreak\(\)/);
+  assert.match(composer, /shortcutAction === 'send' && !event\.repeat\) onSubmit\?\.\(\)/);
 });
 
 run('placeholder stays top-aligned without the inset shorthand', () => {
diff --git a/web/src/lib/subagentTasks.js b/web/src/lib/subagentTasks.js
index c969e452d..61a802739 100644
--- a/web/src/lib/subagentTasks.js
+++ b/web/src/lib/subagentTasks.js
@@ -51,6 +51,7 @@ export function normalizeSubagentTask(session) {
     toolCount: 0,
     lastTool: '',
     model: String(session.model || ''),
+    expert: session.expert || null,
   };
 }
 
diff --git a/web/src/lib/tokenBudgetPanelArchitecture.test.js b/web/src/lib/tokenBudgetPanelArchitecture.test.js
index 24d33e3b8..9ebb8f4f3 100644
--- a/web/src/lib/tokenBudgetPanelArchitecture.test.js
+++ b/web/src/lib/tokenBudgetPanelArchitecture.test.js
@@ -60,7 +60,7 @@ run('token panel anchors to pointer coordinates, bridges hover, and supports pin
   assert.match(component, /showPanel\(\s*'click'/);
   assert.match(component, /resolveTokenBudgetPanelState\(current, geometry, mode\)/);
   assert.match(component, /data-panel-mode=\{panel\?\.mode \|\| undefined\}/);
-  assert.match(component, /event\.key === 'Escape'/);
+  assert.match(component, /isDismissShortcut\(event\)/);
   assert.match(component, /panelRef\.current\?\.contains\(event\.target\)/);
 });
 
diff --git a/web/src/lib/trajectoryModel.js b/web/src/lib/trajectoryModel.js
index 038036cf4..f5de6a54d 100644
--- a/web/src/lib/trajectoryModel.js
+++ b/web/src/lib/trajectoryModel.js
@@ -748,20 +748,20 @@ export function buildDeepSeekTrajectory(records = []) {
   const turns = [];
   const turnById = new Map();
   const compactions = new Map();
+  const pendingInputs = [];
   let current = null;
   let nextTurn = 1;
   let order = 0;
 
-  const openTurn = (id, forceNew = false) => {
+  const openTurn = (id) => {
     const key = id ? String(id) : '';
-    if (!forceNew && key && turnById.has(key)) {
-      current = turnById.get(key);
-      return current;
+    let turn = key ? turnById.get(key) : current;
+    if (!turn) {
+      turn = makeTurn(nextTurn++, key);
+      turns.push(turn);
+      if (key) turnById.set(key, turn);
     }
-    if (!forceNew && current && (!key || current.id === key)) return current;
-    const turn = makeTurn(nextTurn++, key || `turn-${nextTurn}`);
-    turns.push(turn);
-    if (key) turnById.set(key, turn);
+    turn.inputs.push(...pendingInputs.splice(0));
     current = turn;
     return turn;
   };
@@ -811,37 +811,37 @@ export function buildDeepSeekTrajectory(records = []) {
       continue;
     }
     if (type === 'turn_start') {
-      const turn = openTurn(payload.turn_id || payload.user_message_id, true);
+      // Message is normally recorded before turn_start. Both identify one turn,
+      // including older producers whose turn_id differs from user_message_id.
+      const turn = openTurn(turnById.has(String(payload.user_message_id))
+        ? payload.user_message_id
+        : (payload.turn_id || payload.user_message_id));
       for (const alias of [payload.turn_id, payload.user_message_id]) {
         if (alias) turnById.set(String(alias), turn);
       }
       continue;
     }
     if (type === 'turn_end' || type === 'legacy_turn_end') {
-      openTurn(payload.turn_id || payload.user_message_uuid);
       current = null;
       continue;
     }
     if (type === 'legacy_user_message') {
-      openTurn(payload.uuid || payload.id || `legacy-${record.legacy_index}`, true)
+      openTurn(payload.uuid || payload.id || `legacy-${record.legacy_index}`)
         .inputs.push({ order, record });
       continue;
     }
     if (type === 'message' && payload.role === 'user' && !payload.is_meta) {
       const id = payload.id || payload.uuid || payload.message_id;
-      const turn = openTurn(id);
-      if (!turn.inputs.some((entry) => entry.record?.payload?.role === 'user')) {
-        turn.inputs.push({ order, record });
-      } else if (turn.id !== id) {
-        openTurn(id, true).inputs.push({ order, record });
-      } else {
-        turn.inputs.push({ order, record });
-      }
+      const turn = payload.metadata?.turn_steer
+        ? openTurn(payload.metadata.turn_id || current?.id || id)
+        : (payload.metadata?.synthetic_user_prompt && current ? current : openTurn(id));
+      turn.inputs.push({ order, record });
       continue;
     }
     const input = normalizeInputRecord(record);
     if (input) {
-      (current || openTurn('')).inputs.push({ order, record });
+      // Initial request context is an input to the next turn, not a turn itself.
+      (current?.inputs || pendingInputs).push({ order, record });
       continue;
     }
     if (type === 'legacy_context'
@@ -893,7 +893,9 @@ export function buildDeepSeekTrajectory(records = []) {
     }
   }
 
+  if (pendingInputs.length > 0) openTurn('');
   const nodes = [];
+  const inputTurns = new Map();
   const requests = [];
   const runningCalls = [];
   const callSchemas = new Map();
@@ -903,7 +905,10 @@ export function buildDeepSeekTrajectory(records = []) {
   for (const turn of turns) {
     for (const { record } of turn.inputs.sort((left, right) => left.order - right.order)) {
       const node = runtimeInputNode(record, ++fallback);
-      if (node) nodes.push(node);
+      if (node) {
+        nodes.push(node);
+        inputTurns.set(node.seq, turn.number);
+      }
     }
 
     const steps = [...turn.steps.values()].sort((left, right) => left.order - right.order);
@@ -1058,6 +1063,7 @@ export function buildDeepSeekTrajectory(records = []) {
   requests.sort((left, right) => left.startSeq - right.startSeq);
   const projectedTurns = deriveTrajectoryLayout({
     nodes,
+    inputTurns,
     partial: null,
     runningCalls,
     requests,
@@ -1069,10 +1075,13 @@ export function buildDeepSeekTrajectory(records = []) {
     requestNumbers: buildRequestNumbers(nodes, requests),
     historyStartSeq: finiteNumber(firstRecorded?.sequence) ?? undefined,
     nodes,
+    inputTurns,
+    turnNumbersById: new Map([...turnById].map(([id, turn]) => [id, turn.number])),
     runningCalls,
     requests,
     callSchemas,
     latestTurnNumber: turns.at(-1)?.number,
+    unidentifiedTurnNumber: current?.id === '' ? current.number : undefined,
   };
 }
 
@@ -1080,35 +1089,33 @@ export function buildDeepSeekTrajectory(records = []) {
 export function resolveDeepSeekTrajectoryPartial(projection, livePartial) {
   if (!projection || !livePartial) return null;
   const partialStep = finiteNumber(livePartial.step);
-  const partialTurn = finiteNumber(livePartial.turn);
+  const turnId = String(livePartial.turnId || '');
+  const partialTurn = turnId
+    ? (projection.turnNumbersById?.get(turnId)
+      ?? finiteNumber(projection.unidentifiedTurnNumber)
+      ?? (finiteNumber(projection.latestTurnNumber) ?? 0) + 1)
+    : finiteNumber(livePartial.turn);
   const requests = Array.isArray(projection.requests) ? projection.requests : [];
   const partialRequest = [...requests].reverse().find((request) => (
     request.purpose === 'assistant'
-      && request.status === 'running'
       && (partialTurn === null || request.turn === partialTurn)
       && (partialStep === null || request.step === partialStep)
   ));
-  if (partialRequest === undefined) {
-    if (partialStep === null) return null;
-    return {
-      turn: partialTurn
-        ?? finiteNumber(projection.latestTurnNumber)
-        ?? 1,
-      step: partialStep,
-      blocks: Array.isArray(livePartial.blocks)
-        ? livePartial.blocks.map((block) => ({ ...block }))
-        : [],
-    };
-  }
+  // HTTP may finish a step before the WebSocket clears its token accumulator.
+  if (partialRequest && partialRequest.status !== 'running') return null;
+  const turn = partialRequest?.turn
+    ?? partialTurn
+    ?? finiteNumber(projection.latestTurnNumber)
+    ?? 1;
+  const step = partialRequest?.step ?? partialStep;
   const nodes = Array.isArray(projection.nodes) ? projection.nodes : [];
   if (nodes.some((node) => (
-    node.kind === 'assistant'
-      && node.turn === partialRequest.turn
-      && node.step === partialRequest.step
+    node.kind === 'assistant' && node.turn === turn && node.step === step
   ))) return null;
+  if (step === null) return null;
   return {
-    turn: partialRequest.turn,
-    step: partialRequest.step,
+    turn,
+    step,
     blocks: Array.isArray(livePartial.blocks)
       ? livePartial.blocks.map((block) => ({ ...block }))
       : [],
diff --git a/web/src/lib/trajectoryModel.test.js b/web/src/lib/trajectoryModel.test.js
index d0a00104a..0c6852f5b 100644
--- a/web/src/lib/trajectoryModel.test.js
+++ b/web/src/lib/trajectoryModel.test.js
@@ -1,4 +1,5 @@
 import assert from 'node:assert/strict';
+import { deriveTrajectoryLayout } from '../components/trajectory/deepseek/layout.ts';
 
 import {
   buildDeepSeekTrajectory,
@@ -25,6 +26,123 @@ const recorded = (sequence, timestamp, type, payload = {}) => ({
   payload,
 });
 
+function liveTurnRecords(count = 4) {
+  const records = [{
+    sequence: null, legacy_index: 0, type: 'legacy_context',
+    payload: { role: 'user', is_meta: true, content: 'request context' },
+  }];
+  const append = (type, payload) => records.push(recorded(records.length, 1000 + records.length, type, payload));
+  for (let turn = 1; turn <= count; turn += 1) {
+    const id = `user-${turn}`;
+    // The daemon writes the user Message before start_user_turn records turn_start.
+    append('message', { role: 'user', id, content: `input ${turn}` });
+    append('turn_start', { turn_id: id, user_message_id: id });
+    append('model_step_start', { step_index: 1 });
+    append('model_request', { step_index: 1, messages: [{ role: 'system', content: `prompt ${turn}` }] });
+    append('model_response', { step_index: 1, content: `answer ${turn}` });
+    append('turn_end', { turn_id: id });
+  }
+  return records;
+}
+
+run('real daemon ordering counts context, input and turn_start as one turn', () => {
+  const records = liveTurnRecords();
+  const projection = buildDeepSeekTrajectory(records);
+  assert.deepEqual(projection.turns.map((turn) => turn.turn), [1, 2, 3, 4]);
+  assert.deepEqual(projection.requests.map((request) => request.turn), [1, 2, 3, 4]);
+  for (const turn of projection.turns) {
+    const cells = turn.groups.flatMap((group) => group.cells);
+    assert.equal(cells.find((cell) => cell.kind === 'user').previewMarkdown, `input ${turn.turn}`);
+    assert.equal(cells.find((cell) => cell.kind === 'message').outputDetail, `answer ${turn.turn}`);
+  }
+});
+
+run('every incremental prefix keeps inputs in their own turn before assistant output', () => {
+  const records = liveTurnRecords();
+  let merged = [];
+  for (const record of records) {
+    merged = mergeTrajectoryRecords(merged, [record]);
+    const projection = buildDeepSeekTrajectory(merged);
+    const turnNumbers = projection.turns.map((turn) => turn.turn);
+    assert.deepEqual(turnNumbers, [...turnNumbers].sort((a, b) => a - b));
+    for (const turn of projection.turns) {
+      const inputs = turn.groups.flatMap((group) => group.cells).filter((cell) => cell.kind === 'user');
+      for (const input of inputs) assert.equal(input.previewMarkdown, `input ${turn.turn}`);
+    }
+    const userCount = merged.filter((r) => r.type === 'message' && r.payload.role === 'user').length;
+    assert.equal(projection.latestTurnNumber, Math.max(1, userCount));
+  }
+});
+
+run('user-first lifecycle aliases and repeated start markers reuse the input turn', () => {
+  const projection = buildDeepSeekTrajectory([
+    recorded(1, 1, 'message', { id: 'user-id', role: 'user', content: 'input' }),
+    recorded(2, 2, 'turn_start', { turn_id: 'turn-id', user_message_id: 'user-id' }),
+    recorded(3, 3, 'turn_start', { turn_id: 'turn-id', user_message_id: 'user-id' }),
+    recorded(4, 4, 'model_request', { step_index: 1 }),
+    recorded(5, 5, 'turn_end', { turn_id: 'turn-id' }),
+    recorded(6, 6, 'turn_end', { turn_id: 'unknown-tail-boundary' }),
+  ]);
+  assert.equal(projection.latestTurnNumber, 1);
+  assert.deepEqual(projection.turns.map((turn) => turn.turn), [1]);
+});
+
+run('inputs from a turn without an assistant never move to a later reply', () => {
+  const records = liveTurnRecords(2).filter((record) => !(record.type === 'model_response' && record.payload.content === 'answer 1'));
+  const projection = buildDeepSeekTrajectory(records);
+  assert.deepEqual(projection.turns.map((turn) => turn.turn), [1, 2]);
+  for (const turn of projection.turns) {
+    const user = turn.groups.flatMap((group) => group.cells).find((cell) => cell.kind === 'user');
+    assert.equal(user.previewMarkdown, `input ${turn.turn}`);
+  }
+});
+
+run('live identity overrides an outdated ordinal before and after trajectory polling', () => {
+  const all = liveTurnRecords(7);
+  const previous = all.slice(0, -6);
+  const live = { turnId: 'user-7', turn: 2, step: 1, blocks: [{ kind: 'text', text: 'stream seven' }] };
+  for (let count = previous.length; count < all.length - 1; count += 1) {
+    const projection = buildDeepSeekTrajectory(all.slice(0, count));
+    const partial = resolveDeepSeekTrajectoryPartial(projection, live);
+    assert.equal(partial.turn, 7);
+    const turns = deriveTrajectoryLayout({ ...projection, partial });
+    assert.deepEqual(turns.map((turn) => turn.turn), [1, 2, 3, 4, 5, 6, 7]);
+    assert.equal(turns.at(-1).groups.at(-1).cells.at(-1).outputDetail, 'stream seven');
+  }
+  assert.equal(resolveDeepSeekTrajectoryPartial(buildDeepSeekTrajectory(all.slice(0, -1)), live), null);
+  assert.equal(resolveDeepSeekTrajectoryPartial(buildDeepSeekTrajectory(all), live), null);
+});
+
+run('failed durable request suppresses a lingering partial even without assistant content', () => {
+  const records = liveTurnRecords(1);
+  records.find((record) => record.type === 'model_response').payload = { step_index: 1, status: 'error', content: '' };
+  assert.equal(resolveDeepSeekTrajectoryPartial(buildDeepSeekTrajectory(records), {
+    turnId: 'user-1', turn: 1, step: 1, blocks: [{ kind: 'text', text: 'old partial' }],
+  }), null);
+});
+
+run('initial context and a tail page without lifecycle identity do not push live output into a phantom turn', () => {
+  const all = liveTurnRecords(1);
+  const live = { turnId: 'user-1', turn: 12, step: 1, blocks: [{ kind: 'text', text: 'live' }] };
+  for (const records of [[], all.slice(0, 1), all.slice(0, 2), all.slice(0, 5), all.slice(3, 5)]) {
+    const projection = buildDeepSeekTrajectory(records);
+    const partial = resolveDeepSeekTrajectoryPartial(projection, live);
+    assert.equal(partial.turn, 1);
+    assert.deepEqual(deriveTrajectoryLayout({ ...projection, partial }).map((turn) => turn.turn), [1]);
+  }
+});
+
+run('steering and synthetic tool input stay in the current user turn', () => {
+  const all = liveTurnRecords(1);
+  all.splice(5, 0,
+    recorded(4.1, 5, 'message', { role: 'user', id: 'steer', content: 'steering', metadata: { turn_steer: true, turn_id: 'user-1' } }),
+    recorded(4.2, 6, 'message', { role: 'user', id: 'tool-input', content: 'tool input', metadata: { synthetic_user_prompt: true } }),
+  );
+  const projection = buildDeepSeekTrajectory(all);
+  assert.deepEqual(projection.turns.map((turn) => turn.turn), [1]);
+  assert.equal(projection.turns[0].groups.flatMap((group) => group.cells).filter((cell) => cell.kind === 'user').length, 3);
+});
+
 run('ACE records project into DeepSeek Message and Step groups', () => {
   const projection = buildDeepSeekTrajectory([
     recorded(1, 1000, 'turn_start', { turn_id: 'turn-1', started_at_ms: 1000 }),
diff --git a/web/src/lib/useAppShortcuts.js b/web/src/lib/useAppShortcuts.js
index 53eb7be0d..e3d287a3b 100644
--- a/web/src/lib/useAppShortcuts.js
+++ b/web/src/lib/useAppShortcuts.js
@@ -1,8 +1,10 @@
 import { useEffect, useRef } from 'react';
 import { APP_SHORTCUT_BROWSER_GUARD, appShortcutContextAllows, matchAppShortcut } from './appShortcuts.js';
+import { useShortcutPreferences } from './useShortcutPreferences.js';
 
 // Actions stay with their React owner; one event is consumed at most once.
 export function useAppShortcuts(handlers) {
+  useShortcutPreferences();
   const latest = useRef(handlers);
   latest.current = handlers;
   useEffect(() => {
diff --git a/web/src/lib/useSessionTitleAnimation.js b/web/src/lib/useSessionTitleAnimation.js
new file mode 100644
index 000000000..db5e33f2c
--- /dev/null
+++ b/web/src/lib/useSessionTitleAnimation.js
@@ -0,0 +1,48 @@
+import { useCallback, useEffect, useLayoutEffect, useRef, useState, useSyncExternalStore } from 'react';
+import { createSessionTitleAnimationStore, sessionTitleAnimationKey } from './sessionTitleAnimation.js';
+
+const reducedMotionQuery = '(prefers-reduced-motion: reduce)';
+const store = createSessionTitleAnimationStore({
+  now: () => performance.now(),
+  schedule: (tick) => requestAnimationFrame(tick),
+  cancel: (id) => cancelAnimationFrame(id),
+  shouldAnimate: () => !document.hidden,
+  reducedMotion: () => window.matchMedia?.(reducedMotionQuery).matches === true,
+});
+const serverSnapshot = () => null;
+
+export function useSessionTitleAnimation(session, title, ready = true) {
+  const key = sessionTitleAnimationKey(session);
+  const previous = useRef({ key, title, ready });
+  const [target, setTarget] = useState(null);
+  const subscribe = useCallback((listener) => store.subscribe(key, listener), [key]);
+  const getSnapshot = useCallback(() => store.getSnapshot(key), [key]);
+  const snapshot = useSyncExternalStore(subscribe, getSnapshot, serverSnapshot);
+
+  useLayoutEffect(() => {
+    const before = previous.current;
+    previous.current = { key, title, ready };
+    if (ready && before.ready && key === before.key && title !== before.title) {
+      setTarget({ key, title });
+      store.start(key, title);
+    } else if (!ready || !before.ready || key !== before.key) {
+      setTarget(null);
+    }
+  }, [key, title, ready]);
+
+  const animation = ready && target?.key === key && target?.title === title && snapshot?.title === title
+    ? snapshot : null;
+  const typing = Boolean(animation?.typing);
+  useEffect(() => {
+    if (!typing) return undefined;
+    const finishIfHidden = () => {
+      if (document.hidden) store.finish(key);
+    };
+    finishIfHidden();
+    document.addEventListener('visibilitychange', finishIfHidden);
+    return () => {
+      document.removeEventListener('visibilitychange', finishIfHidden);
+    };
+  }, [key, typing]);
+  return animation;
+}
diff --git a/web/src/lib/useShortcutPreferences.js b/web/src/lib/useShortcutPreferences.js
new file mode 100644
index 000000000..59505c8e5
--- /dev/null
+++ b/web/src/lib/useShortcutPreferences.js
@@ -0,0 +1,7 @@
+import { useSyncExternalStore } from 'react';
+import { shortcutStore } from './shortcutBindings.js';
+
+export function useShortcutPreferences() {
+  const store = shortcutStore();
+  return useSyncExternalStore(store.subscribe, store.getSnapshot, store.getSnapshot);
+}
diff --git a/web/src/lib/workspaceIcons.test.js b/web/src/lib/workspaceIcons.test.js
index 48efc37ee..ce6fe4a53 100644
--- a/web/src/lib/workspaceIcons.test.js
+++ b/web/src/lib/workspaceIcons.test.js
@@ -120,7 +120,7 @@ test('折叠 / 展开两态接到侧栏与选图标网格', () => {
 // 真实点击、焦点和草稿保留由 test-context-image-paste.mjs 覆盖。
 test('收起选图标层保留编辑项目对话框', () => {
   const picker = source('components/WorkspaceIconPicker.jsx');
-  assert.ok(picker.includes("event.key !== 'Escape'"));
+  assert.ok(picker.includes('!isDismissShortcut(event)'));
   const modal = source('components/EditWorkspaceModal.jsx');
   assert.match(modal, /<Modal[\s\S]*?dismissOnBackdrop=\{false\}[\s\S]*?labelledBy="ace-edit-workspace-title"/);
   assert.ok(modal.includes('setPickerOpen((open) => !open)'));
diff --git a/web/src/styles/globals.css b/web/src/styles/globals.css
index 1d5b74f98..452ff20b6 100644
--- a/web/src/styles/globals.css
+++ b/web/src/styles/globals.css
@@ -2324,6 +2324,44 @@ body {
 .ace-sidebar-session-row {
   position: relative;
 }
+.ace-session-title-transition {
+  position: relative;
+  display: inline-block;
+  max-width: 100%;
+  vertical-align: bottom;
+  white-space: nowrap;
+  text-overflow: inherit;
+}
+.ace-session-title-complete {
+  display: block;
+  overflow: hidden;
+  text-overflow: inherit;
+  transition: none;
+}
+.ace-session-title-transition[data-title-typing="true"] .ace-session-title-complete {
+  opacity: 0;
+}
+.ace-session-title-typing {
+  position: absolute;
+  top: 0;
+  left: 0;
+  max-width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+}
+.ace-session-title-cursor {
+  display: inline-block;
+  width: 0.8em;
+  height: 0.8em;
+  margin-left: 2px;
+  vertical-align: -0.12em;
+  background: #000;
+  transition: none;
+}
+[data-theme="dark"] .ace-session-title-cursor {
+  outline: 1px solid rgba(255, 255, 255, 0.75);
+  outline-offset: -1px;
+}
 .ace-sidebar-session-title-viewport {
   display: block;
   min-width: 0;
diff --git a/web/vite.config.js b/web/vite.config.js
index 0998a2a5a..1e3e7fc7f 100644
--- a/web/vite.config.js
+++ b/web/vite.config.js
@@ -14,7 +14,8 @@ const daemonProxyHeaders = daemonToken ? { 'X-ACECode-Token': daemonToken } : un
 // 用 viteSingleFile 把 JS/CSS 全部 inline 进 index.html — 一来 daemon 只需要
 // serve 单个文件,二来绕开 Crow keep-alive 在多资源连接复用时丢 Content-Type
 // 的已知问题(同一 TCP 连接的第二个请求会回空 body / 空头)。
-// 代价:bundle 不能拆 chunk,首屏 ~250KB(gzip 后 ~70KB),对内嵌部署完全 OK。
+// 代价:bundle 不能拆 chunk。原生资源生成器压缩存储产物,静态资源路由协商
+// gzip 传输;单文件布局仍保留,拆 chunk 需要另行验证上述连接兼容性。
 //
 // dev 模式下跑 `pnpm dev` 起 Vite 5173；/api 与 /ws 默认代理到 127.0.0.1:28080。
 // scripts/dev_web 会为它启动的 Vite 进程设置 ACECODE_DAEMON_PORT，以代理到该工作树的 daemon。