linkchat-extension-spire 0.3.0 → 0.4.2

package/README.md

@@ -1,16 +1,16 @@
-# Spire for LinkChat — 0.3.0
+# Spire for LinkChat — 0.4.2
 
 按需安装的频道合作卡牌爬塔 TUI。需要支持扩展 API 1 的 LinkChatCLI **0.7.0-beta.2 及以上**（旧宿主只支持键盘）；推荐使用 **0.7.4 及以上**以包含备用屏幕行定位修复；路线图与目标的颜色要 **0.7.3 及以上**，更旧的宿主会把颜色剥离，以及管理员安装并启用 `linkchat-spire` 后端包；后端规则版本 `spire-tui-4`、内容版本 `0.1.0-alpha.2.dev17`，存档版本不一致时明确拒绝加载，不会静默升级进行中的局。
 
-离线包安装：`linkchat extension install spire --from /绝对路径/linkchat-extension-spire-0.3.0.tgz`；省略 `--from` 时从官方 registry 安装 `linkchat-extension-spire@latest`。安装后重新打开 LinkChat，输入 `/spire`。2–4 人同频道创建或加入房间，各自准备后开始。断线或退出会暂停整局；所有人重新准备后继续。
+离线包安装：`linkchat extension install spire --from /绝对路径/linkchat-extension-spire-0.4.2.tgz`；省略 `--from` 时从官方 registry 安装 `linkchat-extension-spire@latest`。安装后重新打开 LinkChat，输入 `/spire`。2–4 人同频道创建或加入房间，各自准备后开始。断线或退出会暂停整局；所有人重新准备后继续。
 
 ## 操作
 
-**战斗**：我方在左、敌人在右（默认 80×25 终端使用紧凑双栏，队友在左、敌人在右；有效宽度不足 68 列或高度不足 24 行时改为上下分区）；每个信息块自上而下是意图、名称、格挡与血条、生命、增益、减益，多个意图字段会换行而不是被截断。手牌竖排并编号 1–9、0：数字键只把光标移到该位置，Enter 才是执行；每页最多十项，PgUp/PgDn 翻页，方向键跨页时页码同步。能量右侧是固定的 `[E 结束回合]` 按钮，和 E 键共用同一套校验，按钮会显示 `[已结束回合]` 或 `[等待队友]`。
+**战斗**：我方在左、敌人在右（只保留左右分组和上下排列两种布局；至少 68×24 时按 G 切换，窗口不足时自动上下排列，放大后恢复所选布局）；每个信息块自上而下是意图、名称、格挡与血条、生命、Buff、DeBuff，多个意图字段会换行而不是被截断。手牌竖排，选中项显示箭头，不显示列表序号；方向键选择、Enter 执行；方向键跨页时列表自动跟随焦点。能量右侧是固定的 `[E 结束回合 X]`（X 为当前回合数） 按钮，和 E 键共用同一套校验，按钮会显示 `[已结束回合]` 或 `[等待队友]`。
 
 **选择单体目标**：不再弹出目标名单。使用需要目标的牌或药水后，合法目标会加上边框，直接用键鼠选中战场上的那个实体（名称、血条、状态都属于同一目标）：左右键循环、Enter 或单击提交、Esc 取消本地未提交的操作且不消耗任何东西。目标死亡、牌被消耗或阶段变化时会重新校验，点击不会因为列表重排落到别的身份上。战斗之外使用单体药水时仍给出目标列表。
 
-**地图**：开局先确认当前角色或选择其他角色，再显示路线。M 打开／关闭地图，战斗中查看地图不会提交路线投票。普通视图按真实七列格位纵向分层，起点在下、向上前进；每个房间保留编号（如 `05-C`）和类型。`●` 当前位置、`✓` 已走过、数字为当前可选路线；黄色强调选中房间、普通出边和目标，投票人数仍在房间名后显示。↑ 查看更高层、↓ 查看更低层，←/→ 浏览同层房间，数字键定位可选路线，Enter 对选中的可达房间提交本人路线投票；悬停只查看，单击可达房间即投票。详情显示带编号的真实后继，飞靴额外可达单独列出，不画成普通地图边。`C` 回到当前位置，`F` 切换紧凑连接表，滚轮向上查看更高层、向下查看更低层；窄屏或高度不足时自动显示连接表，每行保留来源和目标编号、类型。地图阶段不再显示底部节点列表；直接在地图选点，底部保留详情和操作提示，Tab 查看其他面板。地图视图最低支持 40 列、12 行；暂停和缺少地图数据时仍保留操作列表。未知房间始终显示为未知。
+**地图**：开局先确认当前角色或选择其他角色，再显示路线。M 打开／关闭地图，战斗中查看地图不会提交路线投票。普通视图按真实七列格位纵向分层，起点在下、向上前进；每个房间保留编号（如 `05-C`）和类型。`●` 当前位置、`✓` 已走过、黄色强调选中房间、普通出边和目标，投票人数仍在房间名后显示。↑ 查看更高层、↓ 查看更低层，←/→ 浏览同层房间，数字键定位可选路线，Enter 对选中的可达房间提交本人路线投票；悬停只查看，单击可达房间即投票。详情显示带编号的真实后继，飞靴额外可达单独列出，不画成普通地图边。`C` 回到当前位置，`F` 切换紧凑连接表，滚轮向上查看更高层、向下查看更低层；窄屏或高度不足时自动显示连接表，每行保留来源和目标编号、类型。地图阶段不再显示底部节点列表；直接在地图选点，底部保留详情和操作提示，方向键在地图边缘继续移动可进入装备或顶部入口。地图视图最低支持 40 列、12 行；暂停和缺少地图数据时仍保留操作列表。未知房间始终显示为未知。
 
 **商店**：分类页签（卡牌 / 遗物 / 药水 / 删牌服务）+ 竖向商品列表 + 右侧详情（窄窗口改为列表下方的展开页）。详情显示当前实际价格、半价状态、购买后余额；买不起时显示还差多少并禁止提交，药水栏满时给出"管理药水栏"入口。选中商品后点击 `[购买]` 或按 Enter 即成交，不再二次确认。删牌服务会先给出价格，选完牌再确认费用与目标。`离开商店` 始终在列表里。`[`、`]` 切换分类。
 
@@ -18,9 +18,15 @@
 
 **宝箱**：单人时点选遗物即为一次明确的领取，客户端会在服务端确认后接着领取同一件遗物（按 reward ID 精确匹配，结果不明时不会猜）；多人保留投票、分配、领取三个阶段，投票按钮本身就是确认。
 
-**其他**：Tab 依次查看行动、牌组、遗物、药水、状态、日志，标签随窗口宽度换行；抽牌堆、消耗堆和弃牌堆仅在战斗中显示于能量栏下一行，依次位于左、中、右，点击或按 A / S / D 查看（药水面板的 D 仍为丢弃药水），Esc 返回；Esc 返回或暂停退出；药水面板 D 丢弃药水；多选可用数字键定位、空格勾选、确认行提交，规则允许空选时会给出明确的取消项。请求结果不明时按 R 重试同一操作，不会重复出牌。
+**装备与详情**：顶部常驻本人遗物、药水实际槽位（含空槽）及“牌组 N · D”。遗物显示计数；过长的栏可横向翻页。悬停或方向键选择在底部显示完整说明，移出恢复键盘焦点；`?` 查看全文。药水点击或 Enter 打开“使用／丢弃”，丢弃需确认；自动药水及事件锁定状态会明确标注。火堆升级列表悬停或键盘选中即可查看升级前后，确认才执行升级。
 
-**鼠标**（需要客户端宿主 0.7.0 及以上）：鼠标移到某行即高亮该行（等同选中），**单击即生效**；点顶部面板名切换面板；滚轮滚动列表（地图页滚动地图），弹窗有长说明时滚轮翻页。游戏界面会接管鼠标，想在终端里选中或复制文本请按住 Shift 拖拽。旧宿主上鼠标点击不会生效。
+**快捷键**：`D` 总牌组、`A` 抽牌堆、`S` 弃牌堆、`X` 消耗堆、`M` 地图、`E` 结束回合、`V` 完整战斗日志、`G` 切换战斗布局。地图仍用 `C` 定位当前位置。方向键按画面位置在主操作、单位、装备、牌堆和顶部入口间移动；Enter 确认，Esc 返回主操作或关闭弹窗。Tab、PageUp、PageDown 已移除。牌堆查看、日志与弹窗用 Esc 返回并恢复位置。`D` 不再丢弃药水。请求结果不明时 `R` 重试原操作。
+
+**战斗日志**：每场独立保存完整记录，战后结算保留至下一战；常规快照仅带最近 20 条。默认隐藏底部日志预览；`V` 或点击顶部“战斗日志”打开按回合分组的完整记录，最新记录在最上方，打开从顶部开始，↑↓ / 滚轮滚动，在记录首尾继续按 ↑↓ 自动读取相邻页，← 较新 / → 较旧读取前后页（每页 100 条）。抽牌等私有信息仅本人可见，不显示洗牌顺序；旧局早期日志可能不完整。敌人意图按原作声明顺序显示剑、盾、强化、减益等符号，攻击显示对本人伤害与次数，隐藏底层执行参数。
+
+列表与地图节点前均不显示数字定位标号。
+
+**鼠标**（需要客户端宿主 0.7.0 及以上）：鼠标移到某行即高亮该行（等同选中），**单击即生效**；点顶部牌组或日志入口打开查看；遗物悬停查看，药水点击打开操作菜单；滚轮滚动列表（地图页滚动地图），弹窗有长说明时滚轮翻页。游戏界面会接管鼠标，想在终端里选中或复制文本请按住 Shift 拖拽。旧宿主上鼠标点击不会生效。
 
 ## 内容
 
@@ -32,10 +38,14 @@
 
 扩展只提供游戏界面，存档在服务器，卸载扩展不会删除存档。正式客户端 0.6.3 不包含扩展功能。此版本为正式版。
 
-## 协议 5 配套更新
+## 协议 6 配套更新
 
-本版必须与协议 5 的 Spire 后端一起更新。协议 1–4 会明确提示版本不匹配并阻止游戏操作。聊天 CLI 主程序无需重新发布。
+本版必须与协议 6 的 Spire 后端一起更新。协议 1–4 会明确提示版本不匹配并阻止游戏操作。聊天 CLI 主程序无需重新发布。
 
 升级预览按当前牌堆读取卡牌，保留战斗中的临时费用；队友面板关闭后恢复原选择。水晶球支持方向键、Enter、空格和鼠标操作。
 
-进阶 A0–A10 全部开放，默认 A0。在创建房间前选择“新局难度”，创建后固定；继续已有单人存档保留原等级。扩展 0.3.0 使用游戏协议 5，需要配套后端。
+进阶 A0–A10 全部开放，默认 A0。在创建房间前选择“新局难度”，创建后固定；继续已有单人存档保留原等级。扩展 0.4.2 使用游戏协议 6，需要配套后端。
+
+悬停详情靠窗口底部对齐，长说明最多预览三行，`?` 查看全文。
+
+单位格挡值以盾牌显示（例如 `⛨ 12`），我方、敌人及详情使用相同格式。

package/index.js

@@ -1,10 +1,9 @@
 import { randomUUID } from 'node:crypto';
-const PROTOCOL = 5;
+const PROTOCOL = 6;
 const VERSION_ERROR = 'Spire 客户端与服务器版本不匹配，请配套升级。';
 const BASE = '/api/games/spire/rooms';
 const hpText = creature => creature.awaitingRevive ? '0（待复活）' : creature.hpDisplay === 'infinite' && creature.hp > 0 ? '∞' : `${creature.hp}/${creature.maxHp}`;
 export const phases = { lobby: '等待队友', map: '路线投票', combat: '战斗', reward: '战利品', rest: '休息', shop: '商店', event: '事件', treasure: '宝箱', actComplete: '本幕完成', ending: '结局事件', victory: '通关', defeat: '攀登结束', abandoned: '已放弃' };
-const tabs = ['action', 'deck', 'relics', 'potions', 'status', 'log'];
 const tabNames = {action:'行动',deck:'牌组',draw:'抽牌堆',discard:'弃牌堆',exhaust:'消耗堆',relics:'遗物',potions:'药水',status:'状态',log:'日志'};
 const powerNames = {strength:'力量',dexterity:'敏捷',weak:'虚弱',vulnerable:'易伤',frail:'脆弱',rage:'狂怒',thorns:'反伤',demonForm:'恶魔形态',darkEmbrace:'黑暗之拥',feelNoPain:'无惧疼痛',rupture:'撕裂',noDraw:'无法抽牌',noBlock:'无法从卡牌获得格挡',darkShackles:'黑暗枷锁',slow:'缓慢',slippery:'滑溜',paperCuts:'纸割'};
 Object.assign(powerNames, {juggling:'杂耍',aggression:'侵略',barricade:'壁垒',corruption:'腐化',colossus:'巨像',crimsonMantle:'猩红披风',cruelty:'残酷',inferno:'炼狱',juggernaut:'势不可挡',pyre:'柴堆',plating:'覆甲',unmovable:'坚如磐石',freeAttack:'免费攻击',vicious:'凶狠',tank:'坦克',guarded:'被守护',covered:'被掩护',intercept:'拦截',oneTwoPunch:'连环拳',stampede:'奔踏',calamity:'灾祸',tagTeam:'接力',knockdown:'击倒',beaconOfHope:'希望灯塔',fasten:'紧固',prepTime:'准备时间',retainHand:'保留手牌',nostalgia:'怀旧',automation:'自动化',panache:'华丽',bomb:'炸弹',rollingBoulder:'滚石',theGambit:'赌局',coordinate:'协同',blockNextTurn:'下回合格挡',setupStrike:'临时力量',vigor:'活力',artifact:'人工制品',poison:'中毒',strangle:'绞杀',freeSkill:'免费技能',drawNextTurn:'下回合抽牌',focus:'集中',temporaryFocus:'临时集中',freePower:'免费能力',energyNextTurn:'下回合能量',temporaryStrengthDown:'临时力量降低',doom:'灾厄',hang:'绞刑',debilitate:'衰弱',sicEm:'咬住',veilpiercer:'虚无免费'});
@@ -117,9 +116,6 @@ function place(cells, width) {
   }
   return { text: cut(out, width), placed };
 }
-function mapRouteIndex(id, options) {
-  return (options ?? []).findIndex(row => row.action?.type === 'vote' && row.action.node === id);
-}
 // One glyph per set of directions, so a corner always joins the lines that meet.
 const JOIN = {
   u: '│', d: '│', l: '─', r: '─', ud: '│', ul: '┘', ur: '└', dl: '┐', dr: '┌', lr: '─',
@@ -132,8 +128,7 @@ const joinGlyph = directions => {
 };
 const mapCode = node => `${String(node.row).padStart(2, '0')}-${String.fromCharCode(65 + node.col)}`;
 function mapLabel(view, data, node, options) {
-  const route = mapRouteIndex(node.id, options);
-  return `${node.id === view.current ? '● ' : data.visited.has(node.id) ? '✓ ' : ''}${route >= 0 ? route + 1 : ''}[${node.type}]`;
+  return `${node.id === view.current ? '● ' : data.visited.has(node.id) ? '✓ ' : ''}[${node.type}]`;
 }
 function mapPaint(view, data, node, label, focus) {
   const child = data.byId.get(focus)?.children?.includes(node.id);
@@ -313,9 +308,72 @@ export function createScreen(ctx) {
   const me = () => state?.players.find(p => p.id === ctx.user.id);
   let characterConfirmed=false, mapOpen, mapReturnTab=0;
   const needsCharacterChoice=()=>!characterConfirmed && !state?.paused && ['lobby','map'].includes(state?.phase) && state?.options.some(row=>row.action?.type==='character');
-  let pileView;
-  const activeTab = () => pileView ?? tabs[tab];
-  function openPile(key) { if(state?.phase!=='combat' || modal)return; pileView=key; index=0;selected=undefined;listPage=0;changed(); }
+  let pileView, pileReturn, focusRegion='action', focusIndex=0, hovered, focusControl;
+  const equipmentOffset={relics:0,potions:0};
+  const activeTab = () => pileView ?? 'action';
+  function closePile() {
+    pileView=undefined;
+    if(pileReturn){({index,selected,listPage,focusRegion,focusIndex,mapOpen}=pileReturn);pileReturn=undefined;}
+    changed();
+  }
+  function openPile(key) {
+    if(!state || modal || (key!=='deck' && state.phase!=='combat'))return;
+    if(!pileView)pileReturn={index,selected,listPage,focusRegion,focusIndex,mapOpen};
+    pileView=key;mapOpen=false;focusRegion='action';hovered=undefined;index=0;selected=undefined;listPage=0;changed();
+  }
+  const regionItems = region => !state ? [] : region==='relics' ? state.self.relics.map(r=>({...r,id:r.id??r.key})) :
+    region==='potions' ? Array.from({length:state.self.potionCapacity??3},(_,i)=>state.self.potions[i]??{id:`empty:${i}`,name:'空槽',description:'没有药水',empty:true}) :
+    region==='units' ? [...state.players,...state.enemies.filter(e=>e.hp>0||e.awaitingRevive)] :
+    region==='entries' ? [{id:'deck',name:`牌组 ${state.self.deck.length} · D`,description:'查看永久总牌组 · U 升级预览'},{id:'log',name:'战斗日志 · V',description:'查看当前战斗完整记录'}] : [];
+  function focusItem(){return regionItems(focusRegion)[focusIndex];}
+  function detailText(){
+    const row=hovered?.row ?? (focusRegion==='action' ? items()[index] : focusItem());
+    if(!row)return '方向键移动焦点 · Enter 操作 · Esc 返回 · ? 完整说明';
+    if(row.hp!==undefined)return `${row.name} · ${hpText(row)} HP · ⛨ ${row.block??0} · ${row.intent?intentLines(row.intent,row,state).join(' · '):resourcesText(row)} · ${powersText(row.powers,row.monologueInstances)}`;
+    return [row.name??row.card?.name,row.description??row.card?.description??row.label,
+      row.counter!==undefined?`当前计数 ${row.counter}`:'',row.usage==='Automatic'?'自动触发，不能主动使用':'',
+      (hovered?.region??focusRegion)==='potions' && state?.self.potionsLocked?'事件锁定：不能使用或丢弃':''].filter(Boolean).join(' · ');
+  }
+  function potionMenu(potion){
+    if(!potion || potion.empty)return;
+    const id=potion.id;
+    choose(`${potion.name} · 药水操作`,[{id:'use',label:'使用'},{id:'drop',label:'丢弃'},{id:'back',label:'返回'}],answer=>{
+      const current=state.self.potions.find(p=>p.id===id);
+      if(!current){note='这瓶药水已不在栏中。';changed();return;}
+      if(answer.id==='back'){changed();return;}
+      if(state.self.potionsLocked){note='事件锁定：不能使用或丢弃药水。';changed();return;}
+      if(!canAct())return;
+      if(answer.id==='drop'){
+        choose('丢弃这瓶药水？',[{id:'no',label:'保留'},{id:'yes',label:'丢弃'}],row=>{if(row.id==='yes')void submit({type:'dropPotion',potion:id});else changed();});return;
+      }
+      if(current.usage==='Automatic'){note='这瓶药水会自动触发，不能主动使用。';changed();return;}
+      if(state.paused || (state.phase==='combat'?me()?.done:current.usage!=='AnyTime')){note='当前不能使用这瓶药水。';changed();return;}
+      const action={type:'potion',potion:id,phaseId:state.phaseId,label:current.name};
+      if(current.target==='AnyEnemy'||current.key==='FirePotion')beginTargeting(action,'enemy','选择药水目标');
+      else if(current.target==='AnyPlayer'&&state.players.filter(p=>p.hp>0).length>1)beginTargeting(action,'ally','选择药水目标');
+      else {delete action.label;void submit(action);}
+    });
+  }
+  async function openLog(cursor={},atEnd=false){
+    if(!state || !roomId)return;
+    const battle=state.battleLog?.battleId, originRoom=roomId;
+    if(!battle){note='当前没有战斗日志。';changed();return;}
+    const previous=modal?.battleLog ? {selected:modal.previousSelected,index:modal.previousIndex,page:modal.previousPage} : {selected,index,page:listPage};
+    await guard(async()=>{
+      const pageCursor=Object.keys(cursor).length?cursor:{before:String((state.battleLog?.last??Number.MAX_SAFE_INTEGER-1)+1)};
+      const query=new URLSearchParams({battleId:String(battle),limit:'100',...pageCursor});
+      const body=await ctx.request(`${BASE}/${originRoom}/logs?${query}`);
+      if(roomId!==originRoom || state.battleLog?.battleId!==battle)return;
+      const rows=[];let turn;
+      for(const entry of [...body.entries].reverse().filter(entry=>entry.kind!=='pile')){
+        if(entry.turn!==turn){turn=entry.turn;rows.push({id:`turn:${entry.id}`,label:`── 回合 ${turn} ──`,separator:true});}
+        rows.push({id:String(entry.id),label:`${entry.id}. ${entry.text}${entry.source?.name?` [${entry.source.name}]`:''}`});
+      }
+      choose(`战斗日志 · ${body.total} 条${body.incomplete?' · 早期记录可能不完整':''} · ← 较新 / → 较旧`,rows.length?rows:[{id:'empty',label:'暂无记录'}],()=>changed());
+      Object.assign(modal,{battleLog:body,previousSelected:previous.selected,previousIndex:previous.index,previousPage:previous.page});
+      if(atEnd)moveTo(rows.length-1);
+    });
+  }
   const logItems = () => state.log.map((entry, i) => typeof entry === 'string' ? {id:String(i),label:entry} : {id:String(entry.id),label:entry.text});
   // A phase this build cannot render stays read only, so nothing is submitted.
   const canAct = () => !!state && online && synced && !busy && !pending && !unsupported;
@@ -326,10 +384,7 @@ export function createScreen(ctx) {
     if (!state) return [];
     if(needsCharacterChoice())return [{id:'keepCharacter',label:`使用当前角色：${me()?.characterName??me()?.character??'铁甲战士'}`},...state.options.filter(row=>row.action?.type==='character')];
     if (['deck','draw','discard','exhaust'].includes(activeTab())) return (state.self[activeTab()] ?? []).map(cardItem);
-    if (activeTab() === 'relics') return state.self.relics.map(r => ({ id: r.id ?? r.key, label: `${r.name}：${r.description}` }));
-    if (activeTab() === 'potions') return state.self.potions.map(p => ({ id: p.id, label: `${p.name}：${p.description}`, potion: p }));
-    if (activeTab() === 'log') return logItems();
-    if (activeTab() === 'status') return [...state.players,...state.enemies.filter(e=>e.hp>0 || e.awaitingRevive)].map(p=>({id:String(p.id),label:`${p.name} ${hpText(p)} HP · 格挡 ${p.block} · ${powersText(p.powers, p.monologueInstances)}${resourcesText(p) ? ` · ${resourcesText(p)}` : ''}`}));
+
     if (state.pendingChoice && !state.paused) return state.options.map(row => row.pick ? {...row,label:`${picked.has(row.pick) ? '[x]' : '[ ]'} ${row.label}`} : row.id === 'confirmChoice' ? {...row,label:`确认选择（${picked.size}/${state.pendingChoice.maximum}）`} : row);
     if (state.pendingDecision && !state.paused) {
       const decision = state.pendingDecision;
@@ -403,11 +458,16 @@ export function createScreen(ctx) {
       mapFocus=undefined; mapAnchor=undefined; mapScroll=undefined;
     }
     if (state?.phaseId !== s.phaseId || state?.paused !== s.paused) {
-      modal = undefined; mapOpen=undefined; pileView=undefined; selected = undefined; index = 0; tab = 0;
+      modal = undefined; mapOpen=undefined; pileView=undefined;pileReturn=undefined;focusRegion='action';focusIndex=0;hovered=undefined; selected = undefined; index = 0; tab = 0;
       rewardLog = new Map(); rewardOpen = undefined; rewardPick = new Map(); skipQueue = []; skipKnown = new Set();
     }
     if (s.leaseId) { leaseId = s.leaseId; synced = true; }
+    const revisionChanged=state?.revision!==s.revision;
     state = s; loading = false;
+    if(revisionChanged){hovered=undefined;upgradeHoverCache.clear();upgradeHoverToken++;}
+    focusIndex=Math.max(0,Math.min(focusIndex,regionItems(focusRegion).length-1));
+    if(!['action','controls'].includes(focusRegion)&&!regionItems(focusRegion).length)focusRegion='action';
+    if(modal?.upgradePicker && revisionChanged)void hoverUpgrade();
     if (modal?.validFor && !modal.validFor(s)) { modal=undefined; selected=undefined; index=0; note='奖励已失效，请重新选择。'; }
     if (!pending && (note.startsWith('已连接') || note.startsWith('连接中断'))) note = '';
     // The chained claim waits for the pick to be confirmed, then submits the exact
@@ -467,13 +527,26 @@ export function createScreen(ctx) {
   function choose(title, candidates, acceptChoice) {
     modal = { title, items: candidates, accept: acceptChoice, previousSelected: selected, previousIndex: index, previousPage: listPage }; listPage = 0; index = 0; selected = candidates[0]?.id; changed();
   }
+  const upgradeHoverCache=new Map();let upgradeHoverToken=0;
+  async function hoverUpgrade(){
+    if(!modal?.upgradePicker)return;
+    const row=items()[index];if(!row?.card)return;
+    const key=`${roomId}:${state.revision}:${row.id}`, token=++upgradeHoverToken, currentModal=modal;
+    const show=body=>{if(modal!==currentModal || items()[index]?.id!==row.id || token!==upgradeHoverToken)return;
+      modal.upgradeDetail=`升级前：${body.before.name} [${body.before.cost}] ${body.before.description}\n升级后：${body.after.name} [${body.after.cost}] ${body.after.description}`;changed();};
+    modal.upgradeDetail='正在读取升级预览…';changed();
+    if(upgradeHoverCache.has(key)){show(upgradeHoverCache.get(key));return;}
+    try{const body=await ctx.request(`${BASE}/${roomId}/previews/upgrade`,'POST',{cardId:row.id,source:'deck'});upgradeHoverCache.set(key,body);show(body);}
+    catch(error){if(modal===currentModal && token===upgradeHoverToken){modal.upgradeDetail=errorText(error);changed();}}
+  }
   function deckChoice(mode, callback) {
     const cards = state.self.deck.filter(c => mode === 'deckUpgrade' ? (!c.upgraded && !['status', 'curse', 'quest'].includes(c.kind)) : mode === 'deckEnchant' ? (c.canSown !== false && !c.sown && !c.inky && !c.enchantment && !['status', 'curse', 'quest'].includes(c.kind)) : c.removable !== false);
     if (!cards.length) { note = '没有符合条件的牌。'; changed(); return; }
     choose('选择牌组中的牌', cards.map(cardItem), row => {
-      if (mode === 'deckUpgrade') { void previewUpgrade(row.id, 'deck', callback); return; }
+      if (mode === 'deckUpgrade') { callback(row.id); return; }
       callback(row.id);
     });
+    if(mode==='deckUpgrade'){modal.upgradePicker=true;void hoverUpgrade();}
   }
   async function previewUpgrade(cardId, source, confirmUpgrade) {
     if (!roomId || !canAct() || !cardId) return;
@@ -512,10 +585,88 @@ export function createScreen(ctx) {
   }
   // The keyboard branches and clicks move the same state through these, so the
   // two input paths cannot drift apart.
-  function switchTab(next) { pileView=undefined; tab = ((next % tabs.length) + tabs.length) % tabs.length; index = 0; selected = undefined; changed(); }
-  function moveTo(next) { const list = items(); index = Math.max(0, Math.min(Number.isFinite(next) ? next : 0, list.length - 1)); selected = list[index]?.id; changed(); }
+  const navKinds=new Set(['item','equipment','entry','entity','pile','endTurn','inspect','node','mapCenter','mapFull']);
+  function focusKey(hit){return `${hit.kind}:${hit.region??''}:${hit.id}`;}
+  function currentHit(){
+    if(focusRegion==='action')return hits.find(h=>mapNavigation()?h.kind==='node'&&h.id===(mapFocus??state.mapView.current):h.kind==='item'&&h.id===items()[index]?.id);
+    if(focusRegion==='units')return hits.find(h=>h.kind==='entity'&&String(h.id)===String(focusItem()?.id));
+    if(focusRegion==='entries')return hits.find(h=>h.kind==='entry'&&h.id===focusItem()?.id);
+    if(focusRegion==='controls')return hits.find(h=>focusKey(h)===focusControl);
+    return hits.find(h=>h.kind==='equipment'&&h.region===focusRegion&&h.index===focusIndex);
+  }
+  function selectHit(hit){
+    hovered=undefined;
+    if(hit.kind==='item'){focusRegion='action';moveTo(items().findIndex(row=>row.id===hit.id));}
+    else if(hit.kind==='node'){focusRegion='action';mapFocus=hit.id;mapAnchor=hit.id;mapScroll=undefined;}
+    else if(hit.kind==='equipment'){focusRegion=hit.region;focusIndex=hit.index;}
+    else if(hit.kind==='entity'){focusRegion='units';focusIndex=regionItems('units').findIndex(row=>String(row.id)===String(hit.id));}
+    else if(hit.kind==='entry'){focusRegion='entries';focusIndex=regionItems('entries').findIndex(row=>row.id===hit.id);}
+    else{focusRegion='controls';focusControl=focusKey(hit);}
+    changed();
+  }
+  function spatialMove(direction,skipLocal=false){
+    hovered=undefined;
+    screen.render(columns,height);
+    if(!skipLocal && focusRegion==='action' && !mapNavigation() && ['up','down'].includes(direction)){
+      const next=index+(direction==='up'?-1:1);
+      if(next>=0&&next<items().length){moveTo(next);return;}
+    }
+    if(['relics','potions'].includes(focusRegion)&&['left','right'].includes(direction)){
+      const next=focusIndex+(direction==='left'?-1:1);
+      if(next>=0&&next<regionItems(focusRegion).length){focusIndex=next;changed();return;}
+    }
+    if(focusRegion==='units'){
+      const enemies=state.enemies.filter(e=>e.hp>0||e.awaitingRevive),at=enemies.findIndex(e=>String(e.id)===String(focusItem()?.id));
+      const vertical=true;
+      if(at>=0 && (vertical?['up','down']:['left','right']).includes(direction)){
+        const next=at+(['up','left'].includes(direction)?-1:1);
+        if(next>=0&&next<enemies.length){focusIndex=regionItems('units').findIndex(row=>String(row.id)===String(enemies[next].id));changed();return;}
+      }
+    }
+    const current=currentHit()??hits.find(h=>navKinds.has(h.kind));
+    if(!current)return;
+    const point=h=>({x:h.col+Math.min(Number.isFinite(h.width)?h.width:columns,24)/2,y:h.row+(h.height-1)/2});
+    const origin=point(current),vertical=['up','down'].includes(direction),sign=['up','left'].includes(direction)?-1:1;
+    let candidates=hits.filter(h=>navKinds.has(h.kind)&&h!==current&&!(h.kind==='item'&&items().find(r=>r.id===h.id)?.separator));
+    if(focusRegion==='action' && (skipLocal||['up','down'].includes(direction)))candidates=candidates.filter(h=>h.kind!==(mapNavigation()?'node':'item'));
+    const score=h=>{const p=point(h),forward=sign*(vertical?p.y-origin.y:p.x-origin.x),cross=Math.abs(vertical?p.x-origin.x:p.y-origin.y);return {h,forward,cross,score:forward+cross*(vertical?1:100)};};
+    const choices=candidates.map(score).filter(p=>p.forward>0).sort((a,b)=>a.score-b.score);
+    if(choices.length){selectHit(choices[0].h);return;}
+    // A boundary wraps to the opposite edge, keeping every region reachable.
+    const wrap=candidates.map(score).sort((a,b)=>a.forward-b.forward||a.cross-b.cross);
+    if(wrap.length)selectHit(wrap[0].h);
+  }
+  function showFocusedDetail(){
+    const text=detailText(),title=focusItem()?.name??'详情';
+    choose(title,wrapText(text,Math.max(1,columns-4)).map((label,i)=>({id:String(i),label})),()=>changed());
+  }
+  function activateFocus(){
+    if(focusRegion==='action'){confirm();return;}
+    const row=focusItem(),hit=currentHit();
+    if(focusRegion==='potions')potionMenu(row);
+    else if(focusRegion==='entries'){if(row?.id==='deck')openPile('deck');else void openLog();}
+    else if(focusRegion==='units'||focusRegion==='relics')showFocusedDetail();
+    else if(hit?.kind==='pile')openPile(hit.id);
+    else if(hit?.kind==='endTurn')endTurn();
+    else if(hit?.kind==='inspect')void inspectPlayer(Number(hit.id));
+    else if(hit?.kind==='mapCenter'){mapScroll=undefined;mapAnchor=undefined;mapFocus=undefined;mapFull=false;changed();}
+    else if(hit?.kind==='mapFull'){mapFull=!mapFull;mapScroll=undefined;changed();}
+  }
+  function paintFocus(frame){
+    if(modal||targeting||!state)return;
+    const hit=currentHit();if(!hit||!frame[hit.row])return;
+    if(focusRegion==='action')return;
+    const text=frame[hit.row].text;let col=0,start=0,end=text.length;
+    for(const char of text){const next=col+displayWidth(char);if(next<=hit.col)start+=char.length;if(next>hit.col+Math.min(hit.width,columns)){end=start;break;}col=next;}
+    // Highlight only the focused control, not its neighbours on the same row.
+    let offset=0;col=0;end=text.length;
+    for(const char of text){if(col>=hit.col+Math.min(hit.width,columns)){end=offset;break;}col+=displayWidth(char);offset+=char.length;}
+    frame[hit.row].text=text.slice(0,start)+'\x1b[7m'+text.slice(start,end)+'\x1b[27m'+text.slice(end);
+  }
+  function moveTo(next) { const list = items(); index = Math.max(0, Math.min(Number.isFinite(next) ? next : 0, list.length - 1)); selected = list[index]?.id; changed();if(modal?.upgradePicker)void hoverUpgrade(); }
   function pageDetail(delta) { modal.detailOffset = Math.max(0, (modal.detailOffset ?? 0) + delta); changed(); }
   function clickRow(id) {
+    focusRegion='action';hovered=undefined;
     const list = items(), at = list.findIndex(row => row.id === id);
     // A pushed state can replace the list under a click: re-anchor and never let
     // the cursor clamp confirm a row the player never saw.
@@ -524,71 +675,23 @@ export function createScreen(ctx) {
     confirm();
   }
   function intentLines(v, enemy, state) {
-    const intents = [];
-    if (!v) return intents;
-    if (v.damage) intents.push(`攻击 ${v.damageByTarget?.[ctx.user.id] ?? v.damage}×${v.hits ?? 1}（对我；全队受击）`);
-    if (v.strength) intents.push(`力量 +${v.strength}`);
-    if (v.vigor) intents.push(`下一次攻击伤害 +${v.vigor}`);
-    if (v.vitalSpark) intents.push(`污染强度 +${v.vitalSpark}`);
-    if (v.ritual) intents.push(`仪式 +${v.ritual}（从下次行动结束起获得力量）`);
-    if (v.block) intents.push(`格挡 +${v.block}`);
-    if (v.moveBlock) intents.push(`格挡基础值 +${v.moveBlock}`);
-    if (v.dexterity) intents.push(`敏捷 +${v.dexterity}`);
-    if (v.status) {
-      const pile = v.statusPile === 'hand' ? '手中' : v.statusPile === 'draw' ? '抽牌堆' : '弃牌堆';
-      intents.push(`加入 ${v.count + (v.statusExtra ?? 0)} 张状态牌（${pile}）`);
-    } else if (v.statusExtra) intents.push(`额外加入 ${v.statusExtra} 张状态牌`);
-    for (const [key,amount] of Object.entries(v.debuffs ?? {})) intents.push(`${powerNames[key] ?? key} ${amount < 0 ? '持续至施加者死亡' : amount}`);
-    if (v.knowledge) intents.push('知识诅咒：每人选择一种代价');
-    if (v.healPerPlayer) intents.push(`恢复 ${v.healPerPlayer * state.players.length} HP`);
-    if (v.stunned) intents.push('眩晕：跳过本次行动');
-    if (v.sleep) intents.push('沉睡');
-    if (v.revive) intents.push('复活');
-    if (v.reviveIllusion) intents.push('幻象恢复全部生命');
-    if (v.summonEnemy) intents.push(`召唤 ${v.summonEnemy}`);
-    if (v.bloat) intents.push('召唤一枚气体炸弹');
-    if (v.ratBackup) intents.push('召唤一只双尾鼠');
-    if (v.stealGold) intents.push(`窃取每人至多 ${v.stealGold} 金币`);
-    if (v.wakeGremlin) intents.push('起身');
-    if (v.escapeEnemy) intents.push('逃跑');
-    if (v.soar) intents.push('飞翔：攻击承伤减半');
-    if (v.land) intents.push('落地：结束飞翔');
-    if (v.fabricate) intents.push(v.fabricate === 2 ? '制造防御与攻击机器人各一台' : '制造一台攻击机器人');
-    if (v.guardFabricator) intents.push(`制造者格挡 +${v.guardFabricator}`);
-    if (v.layEggs) intents.push(`产下至多 ${v.layEggs} 枚蛋`);
-    if (v.hatchEgg) intents.push('孵化：清除仆从以外状态并恢复幼体生命');
-    if (v.stealCard) intents.push('窃取抽牌堆或弃牌堆的一张原始牌');
-    if (v.flutter) intents.push(`振翅 ${v.flutter}（按人数缩放）`);
-    if (enemy.stolenCards?.length) intents.push(`窃走你的牌：${enemy.stolenCards.map(c => c.name).join('、')}`);
-    if (v.teamStrength) intents.push(`全体敌人力量 +${v.teamStrength}`);
-    if (v.reattach) intents.push('重连：其他体节存活则恢复生命');
-    if (v.liquify) intents.push('流沙倒计时 4；每人抽牌堆、弃牌堆各加入 3 张拼命逃脱');
-    if (v.hiveSpit) intents.push('强化蜂巢与力量；蜂巢达到 3 层后改为力量 +2');
-    if (v.thornsBefore) intents.push(`反伤 ${signed(v.thornsBefore)}`);
-    if (v.thornsAfter) intents.push(`反伤 ${signed(v.thornsAfter)}`);
-    if (v.plow) intents.push(`冲锋：生命降至 ${v.plow} 后转阶段`);
-    if (v.selfKill) intents.push('自爆：行动后自身死亡');
-    if (v.intangible) intents.push(`无实体 ${v.intangible}`);
-    if (v.beckon) intents.push('塞入 2 张「召唤」（抽牌堆与弃牌堆各 1 张）');
-    if (v.burrowed) intents.push(`钻地 ${v.burrowed}：保留格挡，破盾后眩晕`);
-    if (v.allyStrength) intents.push(`友军力量 +${v.allyStrength}`);
-    if (v.steam) intents.push(`蒸汽压力 +${v.steam}`);
-    for (const [key, value] of Object.entries(v)) {
-      if (renderedIntentKeys.includes(key) || key in internalIntentKeys) continue;
-      // A field the rules just added is shown as the raw field, never dropped.
-      intents.push(`原始字段 ${key}=${JSON.stringify(value)}`);
-    }
-    return intents;
+    const symbols={attack:'⚔',defend:'⛨',buff:'↑',debuff:'↓',status:'↓',heal:'♥',summon:'⊕',sleep:'zZ',stun:'…',escape:'↗',unknown:'?',deathBlow:'☠'};
+    const names={attack:'攻击',defend:'防御',buff:'Buff',debuff:'DeBuff',status:'状态牌',heal:'治疗',summon:'召唤',sleep:'沉睡',stun:'眩晕',escape:'逃跑',unknown:'未知',deathBlow:'致命攻击'};
+    const declared=enemy.intentDisplay ?? (v?.damage?[{type:'attack',damage:v.damageByTarget?.[ctx.user.id]??v.damage,hits:v.hits??1}]:[{type:v?.sleep?'sleep':'unknown'}]);
+    return declared.filter(part=>part.type!=='hidden').map(part=>`${symbols[part.type]??'?'} ${names[part.type]??'未知'}${part.damage!==undefined?` ${part.damage}${(part.hits??1)>1?`×${part.hits}`:''}`:''}${part.count!==undefined?` ${part.count}`:''}`);
   }
+
   function hoverRow(id) {
+    focusRegion='action';
     const at = items().findIndex(row => row.id === id);
     if (at >= 0) moveTo(at);
   }
-  function tabSpans(labels) { let from = 0; return labels.map((label, index) => { const span = { tab: index, from, to: from + displayWidth(label) }; from = span.to + 3; return span; }); }
   // --- battlefield ------------------------------------------------------------
   const BAR_CELLS = 10;
-  const MIN_BLOCK = 18;
-  const wideBattlefield = () => columns >= 100 && height >= 30;
+  let battleLayout='columns';
+  const canSwitchLayout=()=>columns>=68&&height>=24;
+  const sideBySide=()=>canSwitchLayout()&&battleLayout==='columns';
+  function toggleLayout(){if(!canSwitchLayout())return;battleLayout=battleLayout==='columns'?'stacked':'columns';changed();}
   function healthBar(current, maximum) {
     const ratio = maximum > 0 ? Math.max(0, Math.min(1, current / maximum)) : 0;
     const filled = Math.max(0, Math.min(BAR_CELLS, Math.round(ratio * BAR_CELLS)));
@@ -637,27 +740,6 @@ export function createScreen(ctx) {
     if (line) lines.push(line);
     return lines.length ? lines : [''];
   }
-  function statLines(creature, extras = [], width) {
-    const entries = powerEntries(creature);
-    const buffs = entries.filter(entry => !debuffPowers.has(entry.key)).map(entry => entry.text);
-    const debuffs = entries.filter(entry => debuffPowers.has(entry.key)).map(entry => entry.text);
-    const wrap = (value, prefix) => {
-      if (!width) return [prefix + value];
-      return wrapText(prefix + value, width).map((line, index) => index ? `  ${line}` : line);
-    };
-    return [`格挡 ${creature.block} ${healthBar(creature.hp, creature.maxHp)}`, `${hpText(creature)} HP`,
-            ...wrap(buffs.join(' · ') || '无', '增益：'), ...wrap(debuffs.join(' · ') || '无', '减益：'),
-            ...extras.flatMap(value => width ? wrapText(value, width) : [value])];
-  }
-  function enemyBlock(enemy, width) {
-    const intents = intentLines(enemy.intent, enemy, state);
-    const head = intents.length
-      ? (width ? wrapText(intents.join(' · '), width) : [intents.join(' · ')])
-      : ['（本回合无行动）'];
-    return [...head, enemy.name, ...statLines(enemy, [], width)];
-  }
-  // Narrow screens stack the two sides as sections; one line per creature keeps
-  // every number and both power lists visible instead of shrinking blocks.
   function compactLines(creature, arena, width, room = 1) {
     const head = arena === 'ally'
       ? `${creature.id === ctx.user.id ? '› ' : ''}${creature.name}${creature.characterName ? ` · ${creature.characterName}` : ''}${creature.done ? ' · 已结束' : ''}`
@@ -667,8 +749,8 @@ export function createScreen(ctx) {
     const buffs = entries.filter(entry => !debuffPowers.has(entry.key)).map(entry => entry.text);
     const debuffs = entries.filter(entry => debuffPowers.has(entry.key)).map(entry => entry.text);
     const resources = arena === 'ally' ? resourcesText(creature) : '';
-    const text = [head, `${hpText(creature)} HP · 格挡 ${creature.block}`, intent,
-            `增益：${buffs.join(' · ') || '无'}`, `减益：${debuffs.join(' · ') || '无'}`, resources]
+    const text = [head, `${hpText(creature)} HP · ⛨ ${creature.block}`, intent,
+            `Buff：${buffs.join(' · ') || '无'}`, `DeBuff：${debuffs.join(' · ') || '无'}`, resources]
       .filter(Boolean).join(' · ');
     if (!width) return [text];
     // Two lines at most: a tight frame keeps one cut row per creature so nobody
@@ -857,6 +939,7 @@ function mapHeader(width, view) {
   }
   function sphereMove(dx, dy) {
     const view = sphereView(); if (!view) return;
+    if((dx<0&&sphereCursor.x===0)||(dx>0&&sphereCursor.x===view.width-1)||(dy<0&&sphereCursor.y===0)||(dy>0&&sphereCursor.y===view.height-1)){spatialMove(dx<0?'left':dx>0?'right':dy<0?'up':'down',true);return;}
     sphereCursor = { x: Math.max(0, Math.min(view.width - 1, sphereCursor.x + dx)),
                      y: Math.max(0, Math.min(view.height - 1, sphereCursor.y + dy)) };
     changed();
@@ -872,7 +955,7 @@ function mapHeader(width, view) {
   // Teammate detail. Read only, and paged on the server: the client asks for a
   // page and shows what comes back, so it never holds a second copy of anyone's
   // deck and never has to keep one in step.
-  async function inspectPlayer(id, page = 0) {
+  async function inspectPlayer(id, page = 0, atEnd=false) {
     if (!roomId || !canAct()) return;
     await guard(async () => {
       const body = await ctx.request(`${BASE}/${roomId}/players/${id}/inspection?page=${page}`);
@@ -886,6 +969,7 @@ function mapHeader(width, view) {
         () => { anchor(); changed(); });
       if(previous)Object.assign(modal,previous);
       modal.inspection={id,page,pages,total:body.total};
+      if(atEnd)moveTo(modal.items.length-1);
       changed();
     });
   }
@@ -903,18 +987,18 @@ function mapHeader(width, view) {
   }
   function endTurnLabel() {
     const own = me();
-    if ((own?.hp ?? 0) <= 0) return '[已倒下]';
+    if ((own?.hp ?? 0) <= 0) return `[已倒下 ${state.turn}]`;
     if (state?.phase !== 'combat') return '';
     const control = endTurnState();
-    if (control.canUndoEndTurn) return '[E 撤销结束回合]';
-    if (control.canEndTurn) return state.paused ? '[等待继续]' : '[E 结束回合]';
-    return state.paused ? '[等待继续]' : `[${control.reason || '等待结算'}]`;
+    if (control.canUndoEndTurn) return `[E 撤销结束回合 ${state.turn}]`;
+    if (control.canEndTurn) return state.paused ? `[等待继续 ${state.turn}]` : `[E 结束回合 ${state.turn}]`;
+    return state.paused ? `[等待继续 ${state.turn}]` : `[${control.reason || '等待结算'} ${state.turn}]`;
   }
   function inspectEntity(id) {
     const enemy = (state.enemies ?? []).find(entry => entry.id === id);
     const player = (state.players ?? []).find(entry => String(entry.id) === id);
-    if (enemy) choose(`${enemy.name} · Esc 返回`, [intentLines(enemy.intent, enemy, state).join(' · ') || '（本回合无行动）', `${hpText(enemy)} HP · 格挡 ${enemy.block} · ${powersText(enemy.powers)}`].map((label, index) => ({ id: `detail${index}`, label })), () => { anchor(); changed(); });
-    else if (player) choose(`${player.name} · Esc 返回`, [`${hpText(player)} HP · 格挡 ${player.block} · ${powersText(player.powers)}`].map((label, index) => ({ id: `detail${index}`, label })), () => { anchor(); changed(); });
+    if (enemy) choose(`${enemy.name} · Esc 返回`, [intentLines(enemy.intent, enemy, state).join(' · ') || '（本回合无行动）', `${hpText(enemy)} HP · ⛨ ${enemy.block} · ${powersText(enemy.powers)}`].map((label, index) => ({ id: `detail${index}`, label })), () => { anchor(); changed(); });
+    else if (player) choose(`${player.name} · Esc 返回`, [`${hpText(player)} HP · ⛨ ${player.block} · ${powersText(player.powers)}`].map((label, index) => ({ id: `detail${index}`, label })), () => { anchor(); changed(); });
   }
   // §C: a legal target is marked by colour — enemies red, allies blue — and the
   // one being aimed at is the brighter shade.
@@ -955,8 +1039,8 @@ function mapHeader(width, view) {
     // there, so the list stays the surface for that case alone.
     if (state?.phase !== 'combat') {
       const rows = arena === 'enemy'
-        ? (state?.enemies ?? []).filter(e => e.hp > 0).map(e => ({ id: e.id, label: `${e.name} · ${hpText(e)} HP · 格挡 ${e.block}` }))
-        : (state?.players ?? []).filter(p => p.hp > 0 && p.id !== ctx.user.id).map(p => ({ id: String(p.id), playerId: p.id, label: `${p.name} · ${p.hp}/${p.maxHp} HP · 格挡 ${p.block}` }));
+        ? (state?.enemies ?? []).filter(e => e.hp > 0).map(e => ({ id: e.id, label: `${e.name} · ${hpText(e)} HP · ⛨ ${e.block}` }))
+        : (state?.players ?? []).filter(p => p.hp > 0 && p.id !== ctx.user.id).map(p => ({ id: String(p.id), playerId: p.id, label: `${p.name} · ${p.hp}/${p.maxHp} HP · ⛨ ${p.block}` }));
       if (!rows.length) { note = arena === 'enemy' ? '没有可攻击的敌人。' : '没有存活的其他队友。'; changed(); return; }
       choose(title, rows, row => void submit({ ...payloadOf(action), target: arena === 'ally' ? row.playerId : row.id }));
       return;
@@ -979,7 +1063,7 @@ function mapHeader(width, view) {
     void submit({ ...payloadOf(action), target: arena === 'ally' ? Number(id) : id });
   }
   function confirm() {
-    if (busy || pending) return;
+    if (busy || pending || modal?.battleLog) return;
     anchor(); const row = items()[index]; if (!row) return;
     if (modal) { const current = modal; modal = undefined; selected = current.previousSelected; index = current.previousIndex; listPage = current.previousPage ?? 0; current.accept(row); return; }
     if (!roomId) {
@@ -1007,16 +1091,6 @@ function mapHeader(width, view) {
       changed();return;
     }
     if (tab === 0 && !pileView && row.card) { cardAction(row.card); return; }
-    if (activeTab() === 'potions' && row.potion) {
-      if (state.self.potionsLocked) { note = '请先完成事件交易，当前不能使用或丢弃药水。'; changed(); return; }
-      if (row.potion.usage === 'Automatic') { note = '这瓶药水会自动生效，不能主动使用。'; changed(); return; }
-      if (state.paused || (state.phase === 'combat' ? me()?.done : row.potion.usage !== 'AnyTime')) { note = '当前不能使用这瓶药水。'; changed(); return; }
-      const action = { type: 'potion', potion: row.id, phaseId: state.phaseId };
-      // §C: a potion with a single target is aimed at the same region as a card.
-      if (row.potion.target === 'AnyEnemy' || row.potion.key === 'FirePotion') beginTargeting({ ...action, label: row.potion.name ?? '药水' }, 'enemy', '选择药水目标');
-      else if (row.potion.target === 'AnyPlayer' && state.players.filter(p => p.hp > 0).length > 1) beginTargeting({ ...action, label: row.potion.name ?? '药水' }, 'ally', '选择药水目标');
-      else void submit(action); return;
-    }
     if (tab === 0 && row.group && row.id === row.group) { if (row.open) rewardPick.delete(row.group); rewardOpen = row.open ? undefined : row.group; changed(); return; }
     if (tab === 0 && row.candidate && row.action) {
       // Picking a card reward's card is the deliberate claim.
@@ -1134,7 +1208,7 @@ function mapHeader(width, view) {
   // The drawing reads the view state and the party; this supplies both.
   const mapLines = (view, width) => drawMap(view, width,
     { full: mapFull, scroll: mapScroll, anchor: mapAnchor, focus:mapFocus, height:mapBudget, players: state?.players, options: state?.options });
-  const mapNavigation = () => !modal && !targeting && !needsCharacterChoice() && tab===0 && (mapOpen??state?.phase==='map') && !state?.paused && !state.pendingChoice && !state.pendingDecision && Boolean(state.mapView?.nodes?.length);
+  const mapNavigation = () => !modal && !targeting && !pileView && !needsCharacterChoice() && tab===0 && (mapOpen??state?.phase==='map') && !state?.paused && !state.pendingChoice && !state.pendingDecision && Boolean(state.mapView?.nodes?.length);
   const screen = {
     render(width, rows) {
       columns = width; height = rows; hits = [];
@@ -1143,8 +1217,37 @@ function mapHeader(width, view) {
       if (width < 40 || rows < (mapNavigation()?12:20)) { add(`请扩大终端至至少 40 列、${mapNavigation()?12:20} 行。`, 'title'); add('Esc 返回聊天', 'muted'); return frame; }
       const own = me();
       const heading = needsCharacterChoice() ? '选择初始角色' : state ? `A${state.ascension ?? 0} · ${state.act ? `第 ${state.act.index + 1} 幕 ${state.act.name} · ` : ''}第 ${state.floor} 层 · ${phases[state.phase]}${state.paused ? ' · 暂停' : ''}` : `Spire · ${ctx.channel.name} · 合作房间`;
-      const status = state ? `金币 ${own?.gold ?? 0} · 药水 ${(own?.potions ?? []).length}/${own?.potionCapacity ?? 3} · ${state.online?.includes(ctx.user.id) ? '已连接' : '离线'}` : '';
+      const status = state ? `金币 ${own?.gold ?? 0} · 药水 ${state.self.potions.length}/${state.self.potionCapacity ?? 3}` : '';
       add(status ? pad(cut(heading, Math.max(8, width - displayWidth(status) - 2)), width - displayWidth(status)) + status : cut(heading, width), 'title');
+      if(state){
+        const entries=regionItems('entries'), labels=entries.map((row,i)=>`${focusRegion==='entries'&&focusIndex===i?'› ':''}${row.name}`);
+        const right=Math.max(0,width-displayWidth(labels[0]));
+        mark({kind:'entry',id:'log',col:0,width:displayWidth(labels[1])});
+        mark({kind:'entry',id:'deck',col:right,width:displayWidth(labels[0])});
+        add(pad(labels[1],right)+labels[0],'muted');
+        for(const region of ['relics','potions']){
+          const list=regionItems(region);let from=Math.min(equipmentOffset[region],Math.max(0,list.length-1));
+          const wanted=focusRegion===region?Math.max(0,Math.min(focusIndex,list.length-1)):from;
+          if(wanted<from)from=wanted;
+          const label=row=>`${row.name}${row.counter!==undefined?`(${row.counter})`:''}`;
+          while(from<wanted && displayWidth(list.slice(from,wanted+1).map(label).join(' · '))>width-14)from++;
+          equipmentOffset[region]=Math.max(0,from);
+          let text=(region==='relics'?'遗物':'药水')+' ';let shown=0;
+          for(let i=from;i<list.length;i++){
+            const part=cut(`${focusRegion===region&&focusIndex===i?'›':''}${label(list[i])}`,Math.max(4,width-14));
+            if(displayWidth(text+' '+part)>width-5)break;
+            const col=displayWidth(text);mark({kind:'equipment',region,id:list[i].id,index:i,col,width:displayWidth(part)});
+            text+=part+' · ';shown++;
+          }
+          if(!list.length)text+='无';
+          if(from>0||from+shown<list.length){
+            mark({kind:'equipmentPage',region,delta:-1,col:width-5,width:2});
+            mark({kind:'equipmentPage',region,delta:1,col:width-2,width:2});
+            text=pad(cut(text,width-5),width-5)+'‹  ›';
+          }
+          add(cut(text,width),'muted');
+        }
+      }
       if(mapNavigation()) {
         const view=state.mapView, head=mapHeader(width,view), headerRow=frame.length;
         add(head.text,'muted');
@@ -1157,45 +1260,42 @@ function mapHeader(width, view) {
         }
         while(frame.length<rows-5)add('');
         add(cut(`本幕${drawn.compact?'连接表':'路线'} · ${drawn.from+1}–${Math.min(drawn.total,drawn.from+drawn.span)}/${drawn.total} · ↑ 前进 · 滚轮查看`,width),'muted');
-        add(cut(mapDetailText(view,mapData(view)),width),'muted');
+        add(cut(focusRegion==='action'&&!hovered?mapDetailText(view,mapData(view)):detailText(),width),'muted');
         add(cut(busy?'操作处理中…':pending?note:note||(!synced?'等待服务器确认状态…':''),width),pending?'error':'muted');
         add(cut(state.phase==='map'?'↑↓←→ 选节点 · Enter / 单击 投票 · C 定位 · F 总览':'↑↓←→ 查看节点 · 仅查看路线 · M 返回',width),'muted');
-        mark({kind:'tab',advance:true});
-        add(cut('[面板 Tab] · M 关闭地图 · 悬停查看',width),'muted');
+        add(cut('方向键焦点 · D 牌组 · V 日志 · M 关闭地图',width),'muted');
         hits=hits.filter(hit=>hit.row<rows);
-        return frame.slice(0,rows);
+        paintFocus(frame);return frame.slice(0,rows);
       }
       if (unsupported) add(`此扩展版本不认识该阶段「${unsupported}」，请在更新扩展后继续（当前只读）。`, 'error');
       if (targeting) add(cut(`正在使用：${targeting.label}   ·   点击目标或 ←/→ 选择 · Enter 确认 · Esc 取消`, width), 'selected');
       if (state) {
         if (state.phase === 'combat') {
-          add(`回合 ${state.turn}${own?.done ? ' · 你已结束回合' : ' · 你的回合'}`, 'muted');
           const alive = state.enemies.filter(e => e.hp > 0 || e.awaitingRevive);
-          const chosen = targetIndex();
+          const chosen = focusRegion==='units'&&!targeting?alive.findIndex(e=>String(e.id)===String(focusItem()?.id)):targetIndex();
           const party = [own, ...state.players.filter(p => p.id !== ctx.user.id)];
-          const partyBlocks = party.map(p => allyBlock(p));
           const legalEnemy = enemy => Boolean(targeting && enemy && targeting.arena === 'enemy' && targetIds().includes(enemy.id));
           const legalAlly = id => Boolean(targeting && targeting.arena === 'ally' && targetIds().includes(id));
-          if(width>=68 && rows>=24 && !wideBattlefield()) {
+          if(sideBySide()) {
             // Medium terminals keep the two teams side by side. Party members
             // stack in the left column; enemies page independently on the right.
             const leftWidth=Math.floor((width-3)/2),rightWidth=width-leftWidth-3;
-            const budget=Math.max(4,rows-frame.length-10);
-            const room=Math.max(2,Math.min(5,Math.floor(budget/party.length)));
+            const budget=Math.max(4,rows-frame.length-13);
+            const room=Math.max(2,Math.min(7,Math.floor(budget/party.length)));
             const perPage=Math.max(1,Math.floor(budget/room));
             const pages=Math.max(1,Math.ceil(alive.length/perPage));
             if(chosen>=0)enemyPage=Math.floor(chosen/perPage);
             enemyPage=Math.max(0,Math.min(pages-1,enemyPage??0));
             const shown=alive.slice(enemyPage*perPage,(enemyPage+1)*perPage);
             const compactBlock=(creature,arena,span)=>{
-              const name=`${arena==='ally'&&creature.id===ctx.user.id?'› ':''}${creature.name}${creature.done?' · 已结束':''}`;
-              const health=`${hpText(creature)} HP · 格挡 ${creature.block}`;
+              const name=`${focusRegion==='units'&&String(focusItem()?.id)===String(creature.id)?'› ':arena==='ally'&&creature.id===ctx.user.id?'› ':''}${creature.name}${creature.done?' · 已结束':''}`;
+              const health=`${hpText(creature)} HP · ⛨ ${creature.block}`;
               const intent=arena==='enemy'?intentLines(creature.intent,creature,state).join(' · '):resourcesText(creature);
               const powers=powerEntries(creature).map(p=>p.text).join(' · ');
               const body=[name,health];
               if(room>=4)body.push(healthBar(creature.hp,creature.maxHp));
               if(room>=3)body.push(intent||powers||'无额外状态');
-              if(room>=5)body.push(intent?powers:'');
+              if(room>=6){const entries=powerEntries(creature),buffs=entries.filter(e=>!debuffPowers.has(e.key)).map(e=>e.text),debuffs=entries.filter(e=>debuffPowers.has(e.key)).map(e=>e.text);body.push(`Buff：${buffs.join(' · ')||'无'}`,`DeBuff：${debuffs.join(' · ')||'无'}`);}else if(room>=5)body.push(intent?powers:'');
               return body.map(line=>displayWidth(line)>span-2?cut(line,span-3)+'…':line);
             };
             const columns=[party.map(p=>({id:String(p.id),lines:compactBlock(p,'ally',leftWidth),legal:legalAlly(String(p.id))})),
@@ -1209,40 +1309,7 @@ function mapHeader(width, view) {
               hits.push({kind:'entity',id:entry.id,row:startRow+top,col:side?leftWidth+3:0,width:side?rightWidth:leftWidth,height:room});
             }));
             for(let i=0;i<Math.max(...rendered.map(c=>c.length));i++)add(pad(rendered[0][i]??'',leftWidth)+' │ '+(rendered[1][i]??''));
-            if(pages>1){mark({kind:'enemyPage',pages});add(`敌人 ${enemyPage+1}/${pages} 页 · ←/→ 或点击翻页`,'muted');}
-          } else if (wideBattlefield()) {
-            // The party column is as wide as what it prints (a fixed third used to
-            // cut 增益/减益 short); the enemies share what is left.
-            const natural = Math.max(MIN_BLOCK - 2, ...partyBlocks.flat().map(line => displayWidth(line)));
-            let allyWidth = Math.max(MIN_BLOCK, Math.min(Math.floor(width * 0.42), natural + 2));
-            const perPage = Math.max(1, Math.floor((width + 2 - partyBlocks.length * (allyWidth + 2)) / (MIN_BLOCK + 2)));
-            const pages = Math.max(1, Math.ceil(alive.length / perPage));
-            if (chosen >= 0) enemyPage = Math.floor(chosen / perPage);
-            enemyPage = Math.max(0, Math.min(pages - 1, enemyPage ?? 0));
-            const shown = alive.slice(enemyPage * perPage, enemyPage * perPage + perPage);
-            const gaps = 2 * Math.max(0, partyBlocks.length + shown.length - 1);
-            if (shown.length && width - gaps - allyWidth * partyBlocks.length < MIN_BLOCK * shown.length) {
-              allyWidth = Math.max(MIN_BLOCK, Math.floor((width - gaps - MIN_BLOCK * shown.length) / Math.max(1, partyBlocks.length)));
-            }
-            const foeWidth = shown.length ? Math.max(MIN_BLOCK, Math.floor((width - gaps - allyWidth * partyBlocks.length) / shown.length)) : 0;
-            const widths = [...party.map(() => allyWidth), ...shown.map(() => foeWidth)];
-            const blocks = [
-              // §B: the party block keeps the enemy block's row count so names, bars
-              // and power lines sit on the same rows across the battlefield.
-              ...party.map(player => ({ id: String(player?.id), lines: ['', ...allyBlock(player, allyWidth - 2)], legal: legalAlly(String(player?.id)) })),
-              ...shown.map(enemy => ({ id: enemy.id, lines: enemyBlock(enemy, foeWidth - 2), legal: legalEnemy(enemy) })),
-            ];
-            const body = blocks.map(entry => entry.legal ? tint(entry.lines, targetTint(entry, targeting.arena), aimed(entry)) : entry.lines);
-            const tall = Math.max(...body.map(lines => lines.length));
-            const startRow = frame.length;
-            for (let line = 0; line < tall; line++) add(body.map((lines, index) => pad(cut(lines[line] ?? '', widths[index] - 2), widths[index])).join('  '), 'text');
-            blocks.forEach((entry, index) => hits.push({
-              kind: 'entity', id: entry.id,
-              row: startRow, col: widths.slice(0, index).reduce((total, value) => total + value + 2, 0),
-              width: widths[index], height: tall,
-            }));
-            if (pages > 1) add(`敌人 ${enemyPage + 1}/${pages} 页 · 共 ${alive.length} 名 · PgUp/PgDn 翻页`, 'muted');
-            add('─'.repeat(Math.max(0, width)), 'muted');
+            if(pages>1){mark({kind:'enemyPage',pages});add(`敌人 ${enemyPage+1}/${pages} 页 · 方向键选择 · 自动翻页`,'muted');}
           } else {
             const budget = Math.max(2, rows - frame.length - 12);
             const room = budget >= party.length * 2 ? 2 : 1;
@@ -1264,7 +1331,7 @@ function mapHeader(width, view) {
               for (const line of shownLines) add(line, 'text');
               hits.push({ kind: 'entity', id: entry.id, row: top, col: 0, width, height: shownLines.length });
             }
-            if (pages > 1) add(`敌人 ${enemyPage + 1}/${pages} 页 · 共 ${alive.length} 名 · PgUp/PgDn 翻页`, 'muted');
+            if (pages > 1) add(`敌人 ${enemyPage + 1}/${pages} 页 · 共 ${alive.length} 名 · 方向键继续浏览`, 'muted');
           }
           const usable = own?.energy ?? 0;
           const capacity = own?.energyCapacity ?? usable;
@@ -1277,8 +1344,8 @@ function mapHeader(width, view) {
           if (!modal) mark({ kind: 'endTurn', id: 'endTurn', col: buttonAt, width: displayWidth(button) });
           add(pad(energy, buttonAt) + button, 'title');
           const piles=[['draw','A','抽牌堆',state.self.draw?.length??state.self.drawCount??0],
-            ['exhaust','S','消耗堆',state.self.exhaust?.length??state.self.exhaustCount??0],
-            ['discard','D','弃牌堆',state.self.discard.length]];
+            ['exhaust','X','消耗堆',state.self.exhaust?.length??state.self.exhaustCount??0],
+            ['discard','S','弃牌堆',state.self.discard.length]];
           const pileLabels=piles.map(([,key,name,count])=>width<60?`${key} ${name.slice(0,2)}(${count})`:`[${key} ${name}（${count}）]`);
           const positions=[0,Math.floor((width-displayWidth(pileLabels[1]))/2),width-displayWidth(pileLabels[2])];
           if(!modal)for(let i=0;i<piles.length;i++)mark({kind:'pile',id:piles[i][0],col:positions[i],width:displayWidth(pileLabels[i])});
@@ -1294,7 +1361,7 @@ function mapHeader(width, view) {
             // Clicking a teammate is the same act as pressing P on them. The
             // mark is taken before the line is pushed, while the row still is
             // the one it will land on.
-            if (player.id !== ctx.user.id && !modal) mark({ kind: 'inspect', id: String(player.id), width: displayWidth(rowText) });
+            if (!modal) mark({ kind: 'entity', id: String(player.id), width: displayWidth(rowText) });
             add(rowText, player.id === ctx.user.id ? 'selected' : 'text');
           }
           if (['event', 'ending', 'victory'].includes(state.phase) && state.eventProgress?.description) add(state.eventProgress.description, 'muted');
@@ -1308,44 +1375,32 @@ function mapHeader(width, view) {
           }
 
         }
-        const labels = tabs.map((key, i) => {
-          const count = ['deck', 'draw', 'discard', 'exhaust'].includes(key) ? state.self[key]?.length ?? (key === 'draw' ? state.self.drawCount : key === 'exhaust' ? state.self.exhaustCount : 0) : undefined;
-          const label = tabNames[key] + (count === undefined ? '' : `（${count}）`);
-          return !pileView && i === tab ? `[${label}]` : label;
-        });
         const decision = state.pendingChoice ?? state.pendingDecision;
-        if(modal || (tab===0 && decision)) {
-          add(modal?.title ?? `${decision.owner===ctx.user.id?'':'等待队友 · '}${decision.title}`,'title');
-        }else {
-          let text='',spans=[];
-          const flush=()=>{mark({kind:'tab',spans});add(text,'title');text='';spans=[];};
-          for(let i=0;i<labels.length;i++){
-            const label=labels[i];
-            if(text && displayWidth(text+' · '+label)>width)flush();
-            const from=displayWidth(text)+(text?3:0);
-            text+=(text?' · ':'')+label;spans.push({tab:i,from,to:from+displayWidth(label)});
-          }
-          if(text)flush();
-          if(pileView)add(`${tabNames[pileView]} · Esc 返回 · Tab 切换面板`,'title');
-        }
+        if(modal || (tab===0 && decision))add(modal?.title ?? `${decision.owner===ctx.user.id?'':'等待队友 · '}${decision.title}`,'title');
+        else if(pileView)add(`${tabNames[pileView]} · Esc 返回 · U 升级预览`,'title');
         if (modal?.detail) {
           const lines = ctx.wrap(modal.detail, Math.max(1, width - 2));
           const count = Math.max(1, Math.min(6, rows - frame.length - 9));
           modal.detailOffset = Math.min(modal.detailOffset ?? 0, Math.max(0, lines.length - count));
           mark({ kind: 'detail' });
           for (const line of lines.slice(modal.detailOffset, modal.detailOffset + count)) add(line);
-          if (lines.length > count) add('PgUp/PgDn 查看完整说明', 'muted');
+          if (lines.length > count) add('↑↓ 浏览 · 到边缘继续滚动说明', 'muted');
         }
       } else add('频道成员可加入 · R 刷新房间列表', 'muted');
       if (loading) add('正在加载…', 'muted');
-      const footerRows=activeTab()==='potions' && !modal ? 2 : 1;
-      const logLines = state?.phase === 'combat' && !modal && activeTab() !== 'log' ? Math.min(2, Math.max(0, rows - frame.length - footerRows - 3)) : 0;
+      const detailRows=state && (!modal || modal.upgradePicker) ? 3 : 0;
+      const footerRows=1+detailRows;
       if (state && state.phase!=='combat') add('');                                          // breathing room above the list
-      anchor(); const list = items(), available = Math.max(1, rows - frame.length - footerRows - 1 - (logLines ? logLines + 1 : 0));
+      anchor(); const list = items(), available = Math.max(1, rows - frame.length - footerRows - 1);
       pageSize = available;
+      listPage=Math.floor(Math.max(0,index)/available);
       const maxPage = Math.max(0, Math.ceil(list.length / available) - 1);
       listPage = Math.max(0, Math.min(maxPage, listPage));
       const start = listPage * available;
+      const cards=list.filter(row=>row.card).map(row=>row.card);
+      const cardNameWidth=Math.min(Math.max(4,...cards.map(card=>displayWidth(card.name))),Math.max(8,Math.floor(width*.4)));
+      const cardCostWidth=Math.max(3,...cards.map(card=>displayWidth(`[${card.cost}]`)));
+      const rowLabel=row=>row.card?`${pad(cut(row.card.name,cardNameWidth),cardNameWidth)}  ${pad(`[${row.card.cost}]`,cardCostWidth)}  ${row.card.description}`:row.label;
       if (!list.length && !loading) add(pileView ? `${tabNames[pileView]}为空。Esc 返回战斗。` : state?.phase === 'combat' && !state.paused ? '没有手牌。按 E 结束回合。' : '等待队友，或按 Esc 返回聊天。', 'muted');
       // §E: a wide frame puts the shop's detail beside the goods; a narrow one
       // expands it below the list instead.
@@ -1364,12 +1419,11 @@ function mapHeader(width, view) {
           for (const button of pane.buttons[slot] ?? []) hits.push({ ...button, row: frame.length - 1, col: paneAt + button.at, height: 1 });
           continue;
         }
-        const badge = i - start + 1 === 10 ? '0' : String(i - start + 1);
-        const rowText = `${i === index ? '›' : ' '} [${badge}] ${list[i].label}`;
-        if (!paneAt) { mark({ kind: 'item', id: list[i].id }); add(rowText, i === index ? 'selected' : 'text'); continue; }
+        const rowText = `${i === index && (modal||focusRegion==='action') ? '›' : ' '} ${rowLabel(list[i])}`;
+        if (!paneAt) { mark({ kind: 'item', id: list[i].id }); add(rowText, i === index && (modal||focusRegion==='action') ? 'selected' : 'text'); continue; }
         const slot = i - start;
         mark({ kind: 'item', id: list[i].id, width: paneAt });
-        add(pad(cut(rowText, paneAt - 2), paneAt) + (pane.lines[slot] ?? ''), i === index ? 'selected' : 'text');
+        add(pad(cut(rowText, paneAt - 2), paneAt) + (pane.lines[slot] ?? ''), i === index && (modal||focusRegion==='action') ? 'selected' : 'text');
         for (const button of pane.buttons[slot] ?? []) hits.push({ ...button, row: frame.length - 1, col: paneAt + button.at, height: 1 });
       }
       if (pane) {
@@ -1382,20 +1436,30 @@ function mapHeader(width, view) {
           for (const button of pane.buttons[slot] ?? []) hits.push({ ...button, row: at, col: (paneAt ?? 0) + button.at, height: 1 });
         }
       }
-      if (maxPage > 0) add(`第 ${listPage + 1}/${maxPage + 1} 页 · PgUp/PgDn 翻页 · 共 ${list.length} 项`, 'muted');
-      while (frame.length < rows - footerRows - (logLines ? logLines + 1 : 0)) add('');
-      if (logLines) {
-        add('战斗日志', 'muted');
-        const recent = logItems().slice(-logLines);
-        for (let i = 0; i < logLines; i++) add(recent[i]?.label ?? '', 'muted');
-      }
+      if (maxPage > 0) add(`第 ${listPage + 1}/${maxPage + 1} 页 · 方向键继续浏览 · 共 ${list.length} 项`, 'muted');
+      while (frame.length < rows - footerRows) add('');
       add(busy ? '操作处理中…' : pending ? note : note || (state && !synced ? '等待服务器确认状态…' : ''), pending ? 'error' : 'muted');
-      if(activeTab()==='potions' && !modal)add('D 丢弃药水', 'muted');
+      if(detailRows){const detail=wrapText(modal?.upgradeDetail??detailText(),width).slice(0,detailRows);for(let i=detail.length;i<detailRows;i++)add('');for(const line of detail)add(cut(line,width),'muted');}
+      if(frame.length>rows && detailRows){const tail=frame.splice(-detailRows);frame.splice(rows-detailRows);frame.push(...tail);}
       const visible = Math.min(rows, frame.length); hits = hits.filter(hit => hit.row < visible);
-      return frame.slice(0, rows);
+      paintFocus(frame);return frame.slice(0, rows);
     },
     key(key) {
       const name = key.name, value = key.value?.toLowerCase();
+      if(['tab','pageup','pagedown'].includes(name))return;
+      if(!modal && !targeting && state){
+        if(value==='d' && !key.ctrl){openPile('deck');return;}
+        if(value==='v'){void openLog();return;}
+        if(value==='g' && state.phase==='combat'&&!mapNavigation()){toggleLayout();return;}
+        if(name==='escape' && pileView){closePile();return;}
+        if(focusRegion!=='action' && ['home','end'].includes(name)){focusIndex=name==='home'?0:Math.max(0,regionItems(focusRegion).length-1);hovered=undefined;changed();return;}
+        if(focusRegion!=='action' && ['return','enter'].includes(name)){activateFocus();return;}
+      }
+      if(modal?.battleLog && ['left','right'].includes(name)){
+        const cursor=name==='left'?modal.battleLog.after:modal.battleLog.before;
+        if(cursor!=null)void openLog({[name==='left'?'after':'before']:String(cursor)});
+        return;
+      }
       if (targeting) {
         const ids = targetIds();
         if (name === 'escape') { cancelTargeting(); return; }
@@ -1405,11 +1469,6 @@ function mapHeader(width, view) {
           targeting.id = ids[(at + step + ids.length) % ids.length];
           changed(); return;
         }
-        if (['pageup', 'pagedown', 'home', 'end'].includes(name)) {
-          const at = name === 'home' ? 0 : name === 'end' ? ids.length - 1 : (Math.max(0, ids.indexOf(targeting.id)) + (name === 'pageup' ? -5 : 5));
-          targeting.id = ids[Math.max(0, Math.min(ids.length - 1, at))];
-          changed(); return;
-        }
         if (name === 'return' || name === 'enter') { submitTarget(targeting.id); return; }
         if (value === 'e') { cancelTargeting(); return; }
       }
@@ -1421,16 +1480,11 @@ function mapHeader(width, view) {
       if (mapNavigation()) {
         if (value === 'c') { mapScroll = undefined; mapFocus = undefined; mapAnchor = undefined; mapFull = false; changed(); return; }
         if (value === 'f') { mapFull = !mapFull; mapScroll=undefined; changed(); return; }
-        if(tab===0 && ['left','right','up','down'].includes(name)) {
+        if(focusRegion==='action' && tab===0 && ['left','right','up','down'].includes(name)) {
           const data=mapData(state.mapView), here=data.byId.get(mapFocus)??data.current??data.nodes[0];
           const candidates=data.nodes.filter(n=> name==='left'? n.row===here.row&&n.col<here.col : name==='right'? n.row===here.row&&n.col>here.col : name==='up'?n.row>here.row:n.row<here.row);
           candidates.sort((a,b)=>Math.abs(a.row-here.row)-Math.abs(b.row-here.row)||Math.abs(a.col-here.col)-Math.abs(b.col-here.col));
-          if(candidates[0]){mapFocus=candidates[0].id;mapAnchor=mapFocus;mapScroll=undefined;}
-          changed();return;
-        }
-        if(['pageup','pagedown','home','end'].includes(name)){
-          const drawn=mapLines(state.mapView,columns),max=Math.max(0,drawn.total-drawn.span);
-          mapScroll=name==='home'?max:name==='end'?0:Math.max(0,Math.min(max,(mapScroll??drawn.from)+(name==='pageup'?1:-1)*Math.max(1,drawn.span-1)));
+          if(candidates[0]){mapFocus=candidates[0].id;mapAnchor=mapFocus;mapScroll=undefined;}else spatialMove(name,true);
           changed();return;
         }
         if(/^[0-9]$/.test(value??'')){
@@ -1438,19 +1492,18 @@ function mapHeader(width, view) {
           if(routes[at]){mapFocus=routes[at].action.node;mapAnchor=mapFocus;mapScroll=undefined;changed();}
           return;
         }
-        if(['return','enter'].includes(name)){
+        if(focusRegion==='action' && ['return','enter'].includes(name)){
           const row=state.phase==='map' && state.options.find(row=>row.action?.type==='vote' && row.action.node===(mapFocus??state.mapView.current));
           if(row)void submit({...row.action,phaseId:state.phaseId});
           return;
         }
       }
-      if(mapNavigation() && ['a','s','d','e',' '].includes(value))return;
-      if(!modal && !targeting && !pileView && tab===0 && state?.phase==='combat' && ['left','right'].includes(name)){enemyPage=Math.max(0,enemyPage+(name==='right'?1:-1));changed();return;}
-      if(!modal && !targeting && state?.phase==='combat' && ['a','s','d'].includes(value) && !(value==='d' && activeTab()==='potions')){openPile({a:'draw',s:'exhaust',d:'discard'}[value]);return;}
-      if(name==='escape' && pileView && !modal){pileView=undefined;index=0;selected=undefined;changed();return;}
+      if(mapNavigation() && ['a','s','x','e',' '].includes(value))return;
+      if(!modal && !targeting && state?.phase==='combat' && ['a','s','x'].includes(value)){openPile({a:'draw',s:'discard',x:'exhaust'}[value]);return;}
+      if(name==='escape' && pileView && !modal){closePile();return;}
       // The board takes the arrows before the option list does, or moving on
       // the grid would scroll the rows underneath it.
-      if (columns>=40 && height>=20 && sphereView() && !sphereView().finished && tab===0 && !pileView && !modal && !targeting) {
+      if (focusRegion==='action' && columns>=40 && height>=20 && sphereView() && !sphereView().finished && tab===0 && !pileView && !modal && !targeting) {
         if (name === 'up') { sphereMove(0, -1); return; }
         if (name === 'down') { sphereMove(0, 1); return; }
         if (name === 'left') { sphereMove(-1, 0); return; }
@@ -1462,6 +1515,7 @@ function mapHeader(width, view) {
         if (value === ' ' || name === 'space' || name === 'return' || name === 'enter') { sphereUse(); return; }
         if (value === 't') { sphereTool(); return; }
       }
+      if(!modal && !targeting && state && ['up','down','left','right'].includes(name)){spatialMove(name);return;}
       if (value === ' ' && !modal && !targeting) {
         const row = items()[index];
         if (row?.pick) {
@@ -1481,14 +1535,16 @@ function mapHeader(width, view) {
         return;
       }
       if (name === 'escape' || key.ctrl && ['c', 'd'].includes(name)) {
-        if (modal) { selected = modal.previousSelected; index = modal.previousIndex; listPage = modal.previousPage ?? 0; modal = undefined; anchor(); changed(); }
+        if (modal) { selected = modal.previousSelected; index = modal.previousIndex; listPage = modal.previousPage ?? 0; modal = modal.previousModal; anchor(); changed(); }
+        else if(focusRegion!=='action'){focusRegion='action';hovered=undefined;changed();}
         else ctx.closeScreen(); return;
       }
       if (columns < 40 || height < (mapNavigation()?12:20)) return;
-      if (value === '?' && !modal) {
+      if (value === '?' && (!modal || modal.upgradePicker)) {
         const row = items()[index];
-        const lines = ctx.wrap(row?.label ?? '方向键选择，Enter 确认；全部玩家结束回合后敌人行动。退出或掉线会暂停整局。', Math.max(1, columns - 4));
-        choose('说明 · ↑↓ 滚动 · Esc 返回', lines.map((label, i) => ({ id: String(i), label })), () => { anchor(); changed(); }); return;
+        const previousPicker=modal?.upgradePicker?modal:undefined;
+        const lines = ctx.wrap(modal?.upgradeDetail ?? (detailText() || '方向键选择，Enter 确认'), Math.max(1, columns - 4));
+        choose('说明 · ↑↓ 滚动 · Esc 返回', lines.map((label, i) => ({ id: String(i), label })), () => {if(previousPicker)modal=previousPicker;anchor(); changed(); });if(previousPicker)modal.previousModal=previousPicker;return;
       }
       if (value === 'r' && !busy) {
         if (pending && online && synced) void submit(pending.action, true);
@@ -1498,7 +1554,6 @@ function mapHeader(width, view) {
       if (value === 'b' && roomId && !busy) {
         void guard(async () => { connection?.close(); connection = undefined; roomId = undefined; state = undefined; modal = undefined; pending = undefined; online = synced = false; selected = 'create'; index = 0; await loadRooms(); }); return;
       }
-      if (name === 'tab' && !modal && state) { switchTab(tab + (key.shift ? -1 : 1)); return; }
       // The key and the button share one entry point.
       if (value === 'e' && !modal && !targeting) { endTurn(); return; }
       if (value === 'p' && !modal && !targeting && state) {
@@ -1521,20 +1576,15 @@ function mapHeader(width, view) {
         return;
       }
       if (name === 'space' && !modal && tab===0 && state?.pendingChoice?.maximum>1) { confirm();return; }
-      if (value === 'd' && !modal && activeTab() === 'potions' && canAct()) {
-        if (state.self.potionsLocked) { note = '请先完成事件交易，当前不能使用或丢弃药水。'; changed(); return; }
-        const row = items()[index]; if (row?.potion) choose('丢弃这瓶药水？', [{ id: 'no', label: '保留' }, { id: 'yes', label: '丢弃' }], answer => { if (answer.id === 'yes') void submit({ type: 'dropPotion', potion: row.id }); else changed(); }); return;
-      }
-      if (modal?.inspection && ['pageup','pagedown'].includes(name)) {
-        const wanted = modal.inspection.page + (name === 'pageup' ? -1 : 1);
-        if (wanted < 0 || wanted >= modal.inspection.pages) return;
-        void inspectPlayer(modal.inspection.id, wanted); return;
-      }
-      if (modal?.detail && ['pageup','pagedown'].includes(name)) { pageDetail(name === 'pageup' ? -3 : 3); return; }
-      if (name === 'pageup' || name === 'pagedown') {
-        const pages = Math.max(1, Math.ceil(items().length / pageSize));
-        listPage = Math.max(0, Math.min(pages - 1, listPage + (name === 'pagedown' ? 1 : -1)));
-        moveTo(listPage * pageSize); return;
+      if(modal && ['up','down'].includes(name)){
+        const step=name==='up'?-1:1,boundary=index+step<0||index+step>=items().length;
+        if(boundary && modal.battleLog){
+          const cursor=step<0?modal.battleLog.after:modal.battleLog.before;
+          if(cursor!=null&&!busy)void openLog({[step<0?'after':'before']:String(cursor)},step<0);
+          return;
+        }
+        if(boundary && modal.inspection){const view=modal.inspection,page=view.page+step;if(page>=0&&page<view.pages)void inspectPlayer(view.id,page,step<0);return;}
+        if(modal.detail && boundary){pageDetail(step);return;}
       }
       if (['up', 'down', 'home', 'end'].includes(name)) {
         const list = items();
@@ -1547,6 +1597,27 @@ function mapHeader(width, view) {
     },
     mouse(event) {
       if (columns < 40 || height < (mapNavigation()?12:20)) return;
+      if(!modal && !targeting){
+        const hit=hitAt(event.x,event.y);
+        if(event.action==='move'){
+          let next;
+          if(hit?.kind==='equipment')next={region:hit.region,row:regionItems(hit.region).find(row=>row.id===hit.id)};
+          else if(hit?.kind==='entity')next={region:'units',row:regionItems('units').find(row=>String(row.id)===String(hit.id))};
+          if(hovered?.row?.id!==next?.row?.id){hovered=next;changed();}
+          if(next)return;
+        }
+        if(event.action==='press' && event.button==='left'){
+          if(hit?.kind==='entry'){if(hit.id==='deck')openPile('deck');else void openLog();return;}
+          if(hit?.kind==='equipmentPage'){
+            equipmentOffset[hit.region]=Math.max(0,Math.min(regionItems(hit.region).length-1,equipmentOffset[hit.region]+hit.delta));
+            focusRegion=hit.region;focusIndex=equipmentOffset[hit.region];hovered=undefined;changed();return;
+          }
+          if(hit?.kind==='equipment'){
+            focusRegion=hit.region;focusIndex=hit.index;hovered=undefined;
+            if(hit.region==='potions')potionMenu(focusItem());else changed();return;
+          }
+        }
+      }
       if (event.action === 'move') {
         // Hover lights a row, or shows which target the pointer is on.
         const pointed = hitAt(event.x, event.y);
@@ -1556,6 +1627,7 @@ function mapHeader(width, view) {
         }
         // §D: hovering a map node looks at it; pointing never submits.
         if (pointed?.kind === 'node') {
+          focusRegion='action';
           if (mapFocus !== pointed.id) { mapFocus = pointed.id; changed(); }
           return;
         }
@@ -1566,6 +1638,7 @@ function mapHeader(width, view) {
       if (event.button === 'left') {
         const hit = hitAt(event.x, event.y);
         if (hit?.kind === 'node') {
+          focusRegion='action';
           // §D: clicking a room you can travel to is the vote itself; any other
           // room is only looked at, and parks the view there.
           mapFocus = hit.id; mapAnchor = hit.id; mapScroll = undefined;
@@ -1585,7 +1658,7 @@ function mapHeader(width, view) {
           void submit(row.action);
           return;
         }
-        if (hit?.kind === 'managePotions') { switchTab(tabs.indexOf('potions')); return; }
+        if (hit?.kind === 'managePotions') { focusRegion='potions';focusIndex=0;changed();return; }
         if (hit?.kind === 'mapCenter') { mapScroll = undefined; mapFocus = undefined; mapAnchor = undefined; mapFull = false; changed(); return; }
         if (hit?.kind === 'mapFull') { mapFull = !mapFull; mapScroll = undefined; changed(); return; }
         if (hit?.kind === 'endTurn') { endTurn(); return; }
@@ -1597,7 +1670,7 @@ function mapHeader(width, view) {
       }
       if (event.button === 'wheel-up' || event.button === 'wheel-down') {
         const step = event.button === 'wheel-up' ? -1 : 1;
-        // An open detail pane pages first, exactly like PgUp/PgDn do.
+        // An open detail pane pages first, before moving the option list.
         if (modal?.detail) { pageDetail(step * 3); return; }
         // §D: on the map the wheel looks around the act instead of moving the cursor.
         if (mapNavigation()) {
@@ -1612,10 +1685,7 @@ function mapHeader(width, view) {
       const hit = hitAt(event.x, event.y);
       if (!hit) return;
       if (hit.kind === 'item') { clickRow(hit.id); return; }
-      if (hit.kind === 'tab' && !modal && state) {
-        const span = hit.spans?.find(range => event.x >= range.from && event.x < range.to);
-        if (span) switchTab(span.tab); else if (hit.advance) switchTab(tab + 1);
-      }
+
     },
   };
   return { screen, start: () => guard(loadRooms), stop: () => { closed = true; connection?.close(); }, accept };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkchat-extension-spire",
-  "version": "0.3.0",
+  "version": "0.4.2",
   "type": "module",
   "description": "Optional cooperative card-climbing TUI for LinkChat",
   "license": "UNLICENSED",