linkchat-extension-spire 0.1.0 → 0.1.8

package/README.md

@@ -1,8 +1,8 @@
-# Spire for LinkChat — 0.1.0
+# Spire for LinkChat — 0.1.8
 
-按需安装的频道合作卡牌爬塔 TUI。需要支持扩展 API 1 的 LinkChatCLI **0.7.0-beta.2 及以上**（旧宿主只支持键盘，见下），以及管理员安装并启用 `linkchat-spire` 后端包；后端规则版本 `spire-tui-2`、内容版本 `0.1.0-alpha.2.dev17`，存档版本不一致时明确拒绝加载，不会静默升级进行中的局。
+按需安装的频道合作卡牌爬塔 TUI。需要支持扩展 API 1 的 LinkChatCLI **0.7.0-beta.2 及以上**（旧宿主只支持键盘）；路线图与目标的颜色要 **0.7.3 及以上**，更旧的宿主会把颜色剥离，以及管理员安装并启用 `linkchat-spire` 后端包；后端规则版本 `spire-tui-2`、内容版本 `0.1.0-alpha.2.dev17`，存档版本不一致时明确拒绝加载，不会静默升级进行中的局。
 
-离线包安装：`linkchat extension install spire --from /绝对路径/linkchat-extension-spire-0.1.0.tgz`；省略 `--from` 时从官方 registry 安装 `linkchat-extension-spire@beta`。安装后重新打开 LinkChat，输入 `/spire`。2–4 人同频道创建或加入房间，各自准备后开始。断线或退出会暂停整局；所有人重新准备后继续。
+离线包安装：`linkchat extension install spire --from /绝对路径/linkchat-extension-spire-0.1.8.tgz`；省略 `--from` 时从官方 registry 安装 `linkchat-extension-spire@latest`。安装后重新打开 LinkChat，输入 `/spire`。2–4 人同频道创建或加入房间，各自准备后开始。断线或退出会暂停整局；所有人重新准备后继续。
 
 ## 操作
 
@@ -10,7 +10,7 @@
 
 **选择单体目标**：不再弹出目标名单。使用需要目标的牌或药水后，合法目标会加上边框，直接用键鼠选中战场上的那个实体（名称、血条、状态都属于同一目标）：左右键循环、Enter 或单击提交、Esc 取消本地未提交的操作且不消耗任何东西。目标死亡、牌被消耗或阶段变化时会重新校验，点击不会因为列表重排落到别的身份上。战斗之外使用单体药水时仍给出目标列表。
 
-**地图**：按后端给出的真实节点与连线绘制，`●` 当前位置、`✓` 已走过、带编号的是可前往的房间、灰色为暂不可达。悬停或点击只查看房间类型与真实后继，未知房间始终显示为未知；点击可达节点只是高亮，Enter 或"确认前往"才提交路线投票（多人提交的是本人一票）。`[回到当前位置 C]`、`[查看全图 F]` 可点，滚轮查看地图其余部分。
+**地图**：普通视图按真实七列格位纵向分层，起点在下、向上前进；每个房间保留编号（如 `05-C`）和类型。`●` 当前位置、`✓` 已走过、数字为当前可选路线；黄色强调选中房间、普通出边和目标，投票人数仍在房间名后显示。↑ 查看更高层、↓ 查看更低层，←/→ 浏览同层房间，数字键定位可选路线，Enter 对选中的可达房间提交本人路线投票；悬停只查看，单击可达房间即投票。详情显示带编号的真实后继，飞靴额外可达单独列出，不画成普通地图边。`C` 回到当前位置，`F` 切换紧凑连接表，滚轮向上查看更高层、向下查看更低层；窄屏或高度不足时自动显示连接表，每行保留来源和目标编号、类型。地图阶段不再显示底部节点列表；直接在地图选点，底部保留详情和操作提示，Tab 查看其他面板。地图视图最低支持 40 列、12 行；暂停和缺少地图数据时仍保留操作列表。未知房间始终显示为未知。
 
 **商店**：分类页签（卡牌 / 遗物 / 药水 / 删牌服务）+ 竖向商品列表 + 右侧详情（窄窗口改为列表下方的展开页）。详情显示当前实际价格、半价状态、购买后余额；买不起时显示还差多少并禁止提交，药水栏满时给出"管理药水栏"入口。选中商品后点击 `[购买]` 或按 Enter 即成交，不再二次确认。删牌服务会先给出价格，选完牌再确认费用与目标。`离开商店` 始终在列表里。`[`、`]` 切换分类。
 
@@ -20,11 +20,11 @@
 
 **其他**：Tab 依次查看牌组、抽牌堆、弃牌堆、消耗堆、遗物、药水、状态、日志；Esc 返回或暂停退出；药水面板 D 丢弃药水；多选可用数字键定位、空格勾选、确认行提交，规则允许空选时会给出明确的取消项。请求结果不明时按 R 重试同一操作，不会重复出牌。
 
-**鼠标**（需要客户端宿主 0.7.0-beta.3 及以上）：鼠标移到某行即高亮该行（等同选中），**单击即生效**；点顶部面板名切换面板；滚轮滚动列表（地图页滚动地图），弹窗有长说明时滚轮翻页。游戏界面会接管鼠标，想在终端里选中或复制文本请按住 Shift 拖拽。旧宿主上鼠标点击不会生效。
+**鼠标**（需要客户端宿主 0.7.0 及以上）：鼠标移到某行即高亮该行（等同选中），**单击即生效**；点顶部面板名切换面板；滚轮滚动列表（地图页滚动地图），弹窗有长说明时滚轮翻页。游戏界面会接管鼠标，想在终端里选中或复制文本请按住 Shift 拖拽。旧宿主上鼠标点击不会生效。
 
 ## 内容
 
-五位角色：铁甲战士（80 生命）、静默猎手（70）、故障机器人（75）、摄政王（75）、亡灵契约师（66）。三幕路线：首幕在蔓生之地与地下码头之间抽取，随后进入巢穴与荣光，每幕 13–15 层，各有自己的事件池与古神。
+五位角色：铁甲战士（80 生命）、静默猎手（70）、故障机器人（75）、储君（75）、亡灵契约师（66）。三幕路线：首幕在蔓生之地与地下码头之间抽取，随后进入巢穴与荣光，每幕 13–15 层，各有自己的事件池与古神。
 
 规则参考 v0.111.0 并与之一致：596 张牌（攻击 198、技能 246、能力 113，另有状态 17、诅咒 18、任务 4）、298 件遗物、64 种药水、80 组遭遇、108 种敌人、57 个事件。中文文本自行编写；分支地图与内容抽取为精选内容适配，不兼容原作种子、存档及联机。无原游戏程序、美术、音频或反编译源码。
 

package/index.js

@@ -81,6 +81,195 @@ export const internalIntentKeys = {
   sleeping: '引擎以 asleep 力量表示沉睡，本字段是数据标记',
 };
 const signed = value => `${value > 0 ? '+' : ''}${value}`;
+// --- act map (§D) -----------------------------------------------------------
+function mapData(view) {
+  const nodes = (view?.nodes ?? []).filter(node => node && typeof node.id === 'string');
+  const byId = new Map(nodes.map(node => [node.id, node]));
+  const rows = new Map();
+  for (const node of nodes) {
+    if (!rows.has(node.row)) rows.set(node.row, []);
+    rows.get(node.row).push(node);
+  }
+  for (const list of rows.values()) list.sort((left, right) => left.col - right.col);
+  return { nodes, byId, rows, keys: [...rows.keys()].sort((left, right) => right - left),
+           current: byId.get(view.current), reachable: new Set(view.reachable ?? []), visited: new Set(view.path ?? []) };
+}
+// Places cells at display columns, so the frame stays aligned whatever the
+// terminal's character widths are.
+function place(cells, width) {
+  let out = '', at = 0;
+  const placed = [];
+  for (const cell of [...cells].sort((left, right) => left.at - right.at)) {
+    if (cell.at < at) continue;
+    out += ' '.repeat(cell.at - at) + cell.text;
+    placed.push({ ...cell, from: cell.at, width: displayWidth(cell.text) });
+    at = cell.at + displayWidth(cell.text);
+  }
+  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: '─',
+  udl: '┤', udr: '├', ulr: '┴', dlr: '┬', udlr: '┼',
+};
+const joinGlyph = directions => {
+  const set = new Set(directions);
+  const key = `${set.has('u') ? 'u' : ''}${set.has('d') ? 'd' : ''}${set.has('l') ? 'l' : ''}${set.has('r') ? 'r' : ''}`;
+  return JOIN[key] ?? '─';
+};
+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}]`;
+}
+function mapPaint(view, data, node, label, focus) {
+  const child = data.byId.get(focus)?.children?.includes(node.id);
+  const colour = node.id === focus || child ? '\x1b[1;93m' : node.id === view.current ? '\x1b[1;96m' : data.reachable.has(node.id) ? '\x1b[92m' : '\x1b[90m';
+  return `${colour}${label}\x1b[0m`;
+}
+function mapVotes(node, players) {
+  const seats = (players ?? []).filter(player => player.vote === node.id).length;
+  return seats ? { text: `\x1b[33m${seats}\x1b[0m`, width: 1 } : { text: '', width: 0 };
+}
+function drawMap(view, width, session = {}) {
+  const data = mapData(view), layers = [...data.rows.keys()].sort((a,b) => a-b);
+  const focus = session.focus ?? view.current;
+  const labels = new Map(data.nodes.map(n => [n.id, mapLabel(view, data, n, session.options)]));
+  const slot = Math.max(12, ...data.nodes.map(n => displayWidth(labels.get(n.id)) + mapVotes(n, session.players).width + 2));
+  const cols = Math.max(6, ...data.nodes.map(n => n.col)) + 1;
+  const unsafeGap = layers.some((layer,i)=>{
+    const rooms=data.rows.get(layer), next=data.rows.get(layers[i+1])??[];
+    const edges=rooms.flatMap(n=>(n.children??[]).map(id=>[n,data.byId.get(id)]).filter(([,kid])=>kid));
+    return edges.some(([a,b])=>b.row!==layers[i+1] || (Math.abs(a.col-b.col)>1 && rooms.length>1 && next.length>1)) ||
+      edges.some(([a,b])=>edges.some(([c,d])=>(a.col-c.col)*(b.col-d.col)<0));
+  });
+  const compact = session.full || cols * slot > width || (session.height??24)<7 || unsafeGap;
+  const blocks = [];
+  const cell = (n, col, text) => ({id:n.id, row:0, col, width:displayWidth(text), height:1});
+  const plainRow = text => ({text, cells:[], tone:'muted'});
+  for (let i=0; i<layers.length; i++) {
+    const rooms = data.rows.get(layers[i]), block = [];
+    if (compact) {
+      for (const n of rooms) {
+        const label = `${mapCode(n)} ${labels.get(n.id)}`;
+        const kids = (n.children ?? []).map(id => data.byId.get(id)).filter(Boolean);
+        const targets=kids.length ? kids.map(k=>`${mapCode(k)}[${k.type}]`) : ['终点'];
+        let suffix='';
+        const emit=()=>block.push({text:mapPaint(view,data,n,label,focus)+mapVotes(n,session.players).text+suffix,cells:[cell(n,0,label)],tone:'text'});
+        for(const target of targets){
+          const next=`${suffix?' ·':' →'} ${target}`;
+          if(suffix && displayWidth(label+suffix+next)+mapVotes(n,session.players).width>width){emit();suffix='';}
+          suffix+=`${suffix?' ·':' →'} ${target}`;
+        }
+        emit();
+      }
+    } else {
+      for (const codes of [true,false]) {
+        const pieces = rooms.map(n => {
+          const text = codes ? mapCode(n) : labels.get(n.id);
+          return {at:n.col*slot, text:mapPaint(view,data,n,text,focus)+(codes?'':mapVotes(n,session.players).text), node:n, plain:text};
+        });
+        const placed = place(pieces,width);
+        block.push({text:placed.text,tone:'text',cells:placed.placed.map(e=>cell(e.node,e.from,e.plain))});
+      }
+      if (i+1<layers.length) {
+        const ink = Array.from({length:3},()=>new Map());
+        const put=(y,x,dirs,owner)=>{
+          let c=ink[y].get(x); if(!c){c={dirs:new Set(),owners:new Set()};ink[y].set(x,c);}
+          for(const d of dirs)c.dirs.add(d);c.owners.add(owner);
+        };
+        const horizontal=(y,a,b,owner)=>{
+          for(let x=Math.min(a,b);x<=Math.max(a,b);x++)put(y,x,`${x>Math.min(a,b)?'l':''}${x<Math.max(a,b)?'r':''}`,owner);
+        };
+        const edges=rooms.flatMap(n=>(n.children??[]).map(id=>[n,data.byId.get(id)]).filter(([,kid])=>kid));
+        // Original noncrossing edges use separate midpoint tracks. Branches
+        // share the source row; merges share only the destination row.
+        for(const [n,kid] of edges){
+          const a=n.col*slot+2,b=kid.col*slot+2,m=Math.round((a+b)/2);
+          horizontal(0,a,m,n.id);put(0,a,'u',n.id);put(0,m,'d',n.id);
+          put(1,m,'ud',n.id);
+          horizontal(2,m,b,n.id);put(2,m,'u',n.id);put(2,b,'d',n.id);
+        }
+        for(const row of ink){
+          const pieces=[...row].map(([at,c])=>({at,text:`${c.owners.has(focus)?'\x1b[1;93m':'\x1b[90m'}${joinGlyph(c.dirs)}\x1b[0m`}));
+          block.push(plainRow(place(pieces,width).text));
+        }
+      }
+    }
+    blocks.push(block);
+  }
+  const budget=Math.max(3,session.height??24);
+  const anchor=data.byId.get(session.anchor)??data.current;
+  const home=Math.max(0,layers.indexOf(anchor?.row));
+  let from=Math.max(0,Math.min(blocks.length-1,session.scroll??Math.max(0,home-1)));
+  let lines=[],span=0;
+  // Scroll offsets count from the bottom (the beginning of the act).
+  // Reverse layers, but keep same-layer rooms and wrapped targets in reading order.
+  if(compact){
+    const all=[...blocks].reverse().flat();
+    const focusId=session.anchor??anchor?.id;
+    const focusEnd=all.findLastIndex(line=>line.cells.some(c=>c.id===focusId));
+    const offset=Math.max(0,Math.min(Math.max(0,all.length-budget),session.scroll??(focusEnd>=0?all.length-focusEnd-1:0)));
+    const start=Math.max(0,all.length-budget-offset);
+    lines=all.slice(start,start+budget);
+    return {lines,from:offset,span:lines.length,total:all.length,height:lines.length,compact:true};
+  }
+  // Show the focused layer even if the preceding layer uses the whole budget.
+  if(session.scroll===undefined && from<home && blocks[from].length+2>budget)from=home;
+  for(let i=from;i<blocks.length;i++){
+    const last=i===blocks.length-1;
+    if(lines.length+blocks[i].length>budget){
+      if(lines.length+2<=budget){lines.push(...blocks[i].slice(0,2));span++;}
+      break;
+    }
+    lines.push(...blocks[i]);span++;
+    if(last)break;
+  }
+  // Remove dangling connectors at the viewport boundary.
+  while(lines.length && !lines.at(-1).cells.length)lines.pop();
+  // Reflect the geometry vertically, including each connector's directions.
+  // Labels remain code-above-type; neither text nor ANSI escapes are mirrored.
+  const mirror={'┌':'└','└':'┌','┐':'┘','┘':'┐','┬':'┴','┴':'┬'};
+  lines.reverse();
+  for(let i=0;i<lines.length;i++){
+    if(lines[i].cells.length){
+      [lines[i],lines[i+1]]=[lines[i+1],lines[i]];
+      i++;
+    }else lines[i]={...lines[i],text:lines[i].text.replace(/[┌└┐┘┬┴]/g,ch=>mirror[ch])};
+  }
+  return {lines,from,span,total:layers.length,height:lines.length,compact:false};
+}
+
+// The package ships without dependencies, so the tab strip is measured here.
+// Its labels are tabNames (CJK), pile counts in fullwidth parens, brackets.
+const wideChar = character => { const code = character.codePointAt(0); return code >= 0x1100 && (code <= 0x115f || (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) || (code >= 0xac00 && code <= 0xd7a3) || (code >= 0xf900 && code <= 0xfaff) || (code >= 0xfe30 && code <= 0xfe6f) || (code >= 0xff00 && code <= 0xff60) || (code >= 0xffe0 && code <= 0xffe6)); };
+// A coloured digit is zero columns wide: measuring and cutting step over the
+// escape sequences instead of counting their characters.
+const ESCAPE_END = /[a-zA-Z]/;
+const displayWidth = text => {
+  let width = 0, escape = false;
+  for (const character of String(text)) {
+    if (escape) { if (ESCAPE_END.test(character)) escape = false; continue; }
+    if (character === '\x1b') { escape = true; continue; }
+    width += wideChar(character) ? 2 : 1;
+  }
+  return width;
+};
+const pad = (text, width) => text + ' '.repeat(Math.max(0, width - displayWidth(text)));
+function cut(text, width) {
+  let out = '', used = 0, escape = false, trimmed = false;
+  for (const character of text) {
+    if (escape) { out += character; if (ESCAPE_END.test(character)) escape = false; continue; }
+    if (character === '\x1b') { out += character; escape = true; continue; }
+    const size = wideChar(character) ? 2 : 1;
+    if (used + size > width) { trimmed = true; break; }
+    out += character; used += size;
+  }
+  return trimmed && out.includes('\x1b') ? `${out}\x1b[0m` : out;
+}
 export function createScreen(ctx) {
   let state, roomId, leaseId, connection, online = false, synced = false, rooms = [], loading = true, busy = false, closed = false;
   let tab = 0, selected = 'create', index = 0, modal, note = '', pending, columns = 80, height = 24, serverProtocol = 1, unsupported;
@@ -90,16 +279,17 @@ export function createScreen(ctx) {
   let enemyPage = 0;              // the enemy block page the battlefield is showing
   let listPage = 0;               // the 1-9/0 page of the item list
   let pageSize = 10;              // how many items a page holds at the current size
-  let mapScroll;                  // the map row the view starts at (undefined follows the position)
+  let mapBudget = 10;
+  let mapScroll;                  // the map row the view starts at (undefined follows the anchor)
+  let mapAnchor;                  // the room the viewport is parked on (a click or 回到当前位置)
   let mapFocus;                   // the node being looked at on the map, never a submitted route
-  let mapFull = false;            // §D 查看全图: every row of the act, markers only
+  let mapFull = false;            // compact adjacency overview, with room types retained
   let chain;                      // §G: the claim that follows this player's own treasure pick
   let rewardLog = new Map();      // §F reward id -> claimed / skipped; display only, never a receipt
   let rewardOpen;                 // §F the card reward whose candidates are expanded
   let rewardPick = new Map();     // §F the candidate chosen in each card reward
   let skipQueue = [];             // §F the server skip rows still to run, in reward order
   let skipKnown = new Set();      // §F the rows that existed when the skip was confirmed
-  let shopTab = 'card';           // §E the shop category the goods list shows
   const picked = new Set(); let choiceReturn;
   const changed = () => { if (!closed && !ctx.signal.aborted) ctx.redraw(); };
   const errorText = e => e instanceof Error ? e.message : '游戏请求失败。';
@@ -152,24 +342,15 @@ export function createScreen(ctx) {
         const open = rewardOpen === group.key;
         rows.push({ id: group.key, label: `${open ? '▾' : '▸'} ${group.title}  ${status}`, group: group.key, open });
         if (!open) continue;
-        for (const row of group.candidates) rows.push({ ...row, label: `　${rewardPick.get(group.key) === row.id ? '[x]' : '[ ]'} ${row.label.replace(/^奖励 \d+：/, '')}`, candidate: true, group: group.key });
-        rows.push({ id: `claim:${group.key}`, label: '　[领取所选卡牌]', group: group.key });
-        if (group.skips.length) rows.push({ id: `skip:${group.key}`, label: '　[跳过这份卡牌奖励]', action: group.skips[0].action, group: group.key, skipped: true });
+        // Picking the card is the claim: no separate 领取 row, and the way past a
+        // card reward is 跳过剩余奖励并离开 at the end of the list.
+        for (const row of group.candidates) rows.push({ ...row, label: `　${row.label.replace(/^奖励 \d+：/, '')}`, candidate: true, group: group.key });
         for (const row of group.others) rows.push({ ...row, label: `　${row.label}`, group: group.key });
-        rows.push({ id: `back:${group.key}`, label: '　[返回奖励清单]' });
       }
       rows.push(rows.length ? { id: 'skipAll', label: '跳过剩余奖励并离开' }
         : { id: 'rewardDone', label: state.players.length > 1 ? '奖励已结算 · 等待队友' : '奖励已结算 · 等待继续' });
       return rows;
     }
-    if (state.phase === 'map' && !state.paused && Array.isArray(state.mapView?.nodes)) {
-      // §D: the map only highlights; going there is this explicit row (or Enter
-      // on the route itself).
-      const rows = [...state.options];
-      const route = rows.find(row => row.action?.type === 'vote' && (row.id === selected || row.id === mapFocus));
-      rows.push({ id: 'mapConfirm', label: route ? `确认前往：${route.label}` : '确认前往（先选择一条路线）', action: route?.action });
-      return rows;
-    }
     return state.options;
   }
   function anchor() {
@@ -194,6 +375,9 @@ export function createScreen(ctx) {
         choiceReturn=undefined;
       }
     }
+    if (state?.mapView?.current !== s.mapView?.current || state?.act?.index !== s.act?.index) {
+      mapFocus=undefined; mapAnchor=undefined; mapScroll=undefined;
+    }
     if (state?.phaseId !== s.phaseId || state?.paused !== s.paused) {
       modal = undefined; selected = undefined; index = 0; tab = 0;
       rewardLog = new Map(); rewardOpen = undefined; rewardPick = new Map(); skipQueue = []; skipKnown = new Set();
@@ -349,10 +533,6 @@ export function createScreen(ctx) {
     const at = items().findIndex(row => row.id === id);
     if (at >= 0) moveTo(at);
   }
-  // The package ships without dependencies, so the tab strip is measured here.
-  // Its labels are tabNames (CJK), pile counts in fullwidth parens, brackets.
-  const wideChar = character => { const code = character.codePointAt(0); return code >= 0x1100 && (code <= 0x115f || (code >= 0x2e80 && code <= 0xa4cf && code !== 0x303f) || (code >= 0xac00 && code <= 0xd7a3) || (code >= 0xf900 && code <= 0xfaff) || (code >= 0xfe30 && code <= 0xfe6f) || (code >= 0xff00 && code <= 0xff60) || (code >= 0xffe0 && code <= 0xffe6)); };
-  const displayWidth = text => [...text].reduce((total, character) => total + (wideChar(character) ? 2 : 1), 0);
   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;
@@ -376,16 +556,6 @@ export function createScreen(ctx) {
     }
     return [buffs, debuffs];
   }
-  const pad = (text, width) => text + ' '.repeat(Math.max(0, width - displayWidth(text)));
-  function cut(text, width) {
-    let out = '', used = 0;
-    for (const character of text) {
-      const size = wideChar(character) ? 2 : 1;
-      if (used + size > width) break;
-      out += character; used += size;
-    }
-    return out;
-  }
   function powerEntries(creature) {
     const monologues = creature.monologueInstances ?? [];
     return Object.entries(creature.powers ?? {}).filter(([, value]) => value !== 0).flatMap(([key, value]) =>
@@ -460,85 +630,9 @@ export function createScreen(ctx) {
     return [`${player.id === ctx.user.id ? '› ' : ''}${player.name}${player.characterName ? ` · ${player.characterName}` : ''}${player.done ? ' · 已结束' : ''}`,
             ...statLines(player, resources ? [resources] : [], width)];
   }
-  // --- act map (§D) -----------------------------------------------------------
-  const MAP_CELL = 12;
-  function mapData(view) {
-    const nodes = (view?.nodes ?? []).filter(node => node && typeof node.id === 'string');
-    const byId = new Map(nodes.map(node => [node.id, node]));
-    const rows = new Map();
-    for (const node of nodes) {
-      if (!rows.has(node.row)) rows.set(node.row, []);
-      rows.get(node.row).push(node);
-    }
-    for (const list of rows.values()) list.sort((left, right) => left.col - right.col);
-    return { byId, rows, keys: [...rows.keys()].sort((left, right) => right - left),
-             current: byId.get(view.current), reachable: new Set(view.reachable ?? []), visited: new Set(view.path ?? []) };
-  }
-  // Places cells at display columns, so the frame stays aligned whatever the
-  // terminal's character widths are.
-  function place(cells, width) {
-    let out = '', at = 0;
-    const placed = [];
-    for (const cell of [...cells].sort((left, right) => left.at - right.at)) {
-      if (cell.at < at) continue;
-      out += ' '.repeat(cell.at - at) + cell.text;
-      placed.push({ ...cell, from: cell.at, width: displayWidth(cell.text) });
-      at = cell.at + displayWidth(cell.text);
-    }
-    return { text: cut(out, width), placed };
-  }
-  function mapRouteIndex(id) {
-    return (state.options ?? []).findIndex(row => row.action?.type === 'vote' && row.action.node === id);
-  }
-  function mapLines(view, width, budget) {
-    const data = mapData(view);
-    const cell = Math.max(7, Math.min(MAP_CELL, Math.floor((width - 2) / 7)));
-    const span = Math.max(1, Math.min(7, Math.floor((width - 2) / cell)));
-    const follow = data.byId.get(mapFocus) ?? data.current;
-    const center = follow ? follow.col : Math.floor((span - 1) / 2);
-    const from = Math.max(0, Math.min(7 - span, center - Math.floor(span / 2)));
-    const at = col => 1 + (col - from) * cell;
-    const shown = col => col >= from && col < from + span;
-    const body = mapFull ? data.keys.length : Math.max(1, Math.floor((budget - 2) / 2));
-    const followAt = data.keys.indexOf(follow ? follow.row : data.keys[0]);
-    const top = Math.max(0, Math.min(data.keys.length - body, mapScroll ?? (followAt < 0 ? 0 : followAt - 2)));
-    const lines = [];
-    for (let index = top; index < Math.min(data.keys.length, top + body); index++) {
-      const key = data.keys[index];
-      const above = mapFull ? [] : data.rows.get(data.keys[index - 1]) ?? [];
-      const cells = [];
-      for (const node of data.rows.get(key) ?? []) {
-        if (!shown(node.col)) continue;
-        const route = mapRouteIndex(node.id);
-        const label = mapFull ? (node.id === view.current ? '●' : data.visited.has(node.id) ? '✓' : data.reachable.has(node.id) ? '◆' : '·')
-          : `${route >= 0 ? route + 1 : ''}[${node.type}]`;
-        const inset = mapFull ? 0 : Math.max(0, Math.floor((cell - displayWidth(label)) / 2));
-        const text = ' '.repeat(inset) + label;
-        cells.push({ text, at: at(node.col), node,
-                     tone: node.id === view.current ? 'selected' : data.reachable.has(node.id) ? 'text' : 'muted' });
-      }
-      const links = [];
-      if (above.length) for (const parent of data.rows.get(key) ?? []) {
-        for (const child of above) {
-          if (!(parent.children ?? []).includes(child.id) || !shown(child.col) || !shown(parent.col)) continue;
-          links.push(child.col === parent.col
-            ? { text: '│', at: at(child.col) + Math.floor((mapFull ? 1 : cell) / 2) }
-            : { text: child.col < parent.col ? '╲' : '╱', at: Math.floor((at(child.col) + at(parent.col) + (mapFull ? 1 : cell)) / 2) });
-        }
-      }
-      if (links.length) lines.push({ text: place(links, width).text, tone: 'muted', cells: [] });
-      // The frame carries one tone per row, so the row reads as the state of its
-      // nodes: the position wins, then a reachable neighbour, then grey.
-      const tone = cells.some(item => item.node.id === view.current) ? 'selected'
-        : cells.some(item => data.reachable.has(item.node.id)) ? 'text' : 'muted';
-      const drawn = place(cells, width);
-      lines.push({ text: drawn.text, tone, cells: drawn.placed });
-    }
-    return { lines, top, body, total: data.keys.length };
-  }
-  function mapHeader(width, view) {
-    const left = `路线选择 · ${view.act?.name ?? ''}`.trim();
-    const buttons = ['[回到当前位置 C]', '[查看全图 F]'];
+function mapHeader(width, view) {
+    const left = `路线选择 · ${state?.act?.name ?? view.act?.name ?? ''}`.trim();
+    const buttons = width<70 ? ['[当前位置 C]', '[总览 F]'] : ['[回到当前位置 C]', '[紧凑总览 F]'];
     const right = buttons.join(' ');
     const head = cut(left, Math.max(8, width - displayWidth(right) - 1));
     const out = pad(head, Math.max(8, width - displayWidth(right))) + right;
@@ -550,9 +644,10 @@ export function createScreen(ctx) {
     const node = data.byId.get(mapFocus ?? view.current);
     if (!node) return '悬停或点击节点查看房间类型与真实后继。';
     const successors = (node.children ?? []).map(id => data.byId.get(id)).filter(Boolean)
-      .map(next => `[${next.type}]`).join(' ') || '无';
+      .map(next => `${mapCode(next)}[${next.type}]`).join(' ') || '无';
     const standing = node.id === view.current ? '当前位置' : data.reachable.has(node.id) ? '可前往' : data.visited.has(node.id) ? '已走过' : '暂不可达 · 仅查看';
-    return `选中：${node.type} · ${standing} · 后继：${successors}`;
+    const extra = node.id === view.current ? (view.reachable ?? []).filter(id => !(node.children ?? []).includes(id)).map(id => data.byId.get(id)).filter(Boolean).map(n => `${mapCode(n)}[${n.type}]`).join(' ') : '';
+    return `选中：${node.type} · ${standing} · ${mapCode(node)} · 后继：${successors}${extra ? ` · 飞靴额外可达：${extra}` : ''}`;
   }
   // --- shop (§E) ---------------------------------------------------------------
   const SHOP_TABS = [['card', '卡牌'], ['relic', '遗物'], ['potion', '药水'], ['removal', '删牌服务']];
@@ -564,11 +659,19 @@ export function createScreen(ctx) {
   function shopRows() {
     const rows = state.options ?? [];
     const leave = rows.filter(row => row.action?.type === 'continue');
-    const goods = shopTab === 'removal' ? rows.filter(row => row.action?.type === 'removeCard')
-      : rows.filter(row => row.action?.type === 'buy' && (row.shop?.kind ?? 'card') === shopTab);
-    // Anything the shop branch cannot place — a nested reward, a forced choice —
-    // keeps the generic list instead of disappearing.
-    return goods.length || leave.length ? [...goods, ...leave] : rows;
+    const sections = [];
+    for (const [kind, name] of shopCategories()) {
+      const goods = rows.filter(row => (row.action?.type === 'buy' && (row.shop?.kind ?? 'card') === kind)
+        || (kind === 'removal' && row.action?.type === 'removeCard'));
+      if (!goods.length) continue;
+      sections.push({ id: `section:${kind}`, label: `--${name}--`, separator: true });
+      sections.push(...goods);
+    }
+    if (!sections.length) return rows;
+    const listed = new Set(sections.map(row => row.id));
+    // Anything the shop cannot place — a nested reward, a forced choice — keeps
+    // the generic list instead of disappearing.
+    return [...sections, ...rows.filter(row => !listed.has(row.id) && !leave.includes(row)), ...leave];
   }
   // The pane is the same block every time: what it is, what it does, what it
   // costs, and the one button that pays for it.
@@ -681,6 +784,21 @@ export function createScreen(ctx) {
     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.
+  const TINTS = { enemy: 31, enemyHot: 91, ally: 34, allyHot: 94 };
+  const targetTint = (entry, arena) => `\x1b[${entry.id === targeting?.id ? TINTS[`${arena}Hot`] : TINTS[arena]}m`;
+  // Colour is invisible on a host that strips it, so the aimed block also says so
+  // in plain text, on its first line that has something to show.
+  const aimed = entry => entry.id === targeting?.id ? '▶' : '';
+  const tint = (lines, colour, mark) => {
+    let marked = false;
+    return lines.map(line => {
+      const lead = !marked && mark && line.trim() ? mark : '';
+      if (lead) marked = true;
+      return `${colour}${lead}${line}\x1b[0m`;
+    });
+  };
   function framed(lines, width, style) {
     const [left, right] = style === 'current' ? ['║', '║'] : ['│', '│'];
     const [topLeft, topRight, bottomLeft, bottomRight, bar] = style === 'current' ? ['╔', '╗', '╚', '╝', '═'] : ['┌', '┐', '└', '┘', '─'];
@@ -763,7 +881,13 @@ export function createScreen(ctx) {
       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) { rewardPick.set(row.group, row.id); changed(); return; }   // §F: a candidate is chosen, never claimed
+    if (tab === 0 && row.candidate && row.action) {
+      // Picking a card reward's card is the deliberate claim.
+      const action = { ...row.action, phaseId: state.phaseId };
+      rewardLog.set(row.group, '已领取');
+      void submit(action);
+      return;
+    }
     if (tab === 0 && row.group && row.id.startsWith('claim:')) {
       // §F: the deliberate claim: a card reward claims the chosen candidate, any
       // other reward claims by its own row.
@@ -829,7 +953,6 @@ export function createScreen(ctx) {
         void submit(action);
       }
       else if (row.group) {
-        if (row.id.startsWith('back:')) { rewardOpen = undefined; changed(); return; }
         if (row.skipped) rewardLog.set(row.group, '已跳过'); else if (row.action) rewardLog.set(row.group, '已领取');
         if (row.action) void submit({ ...row.action, phaseId: state.phaseId });
         else changed();
@@ -871,16 +994,40 @@ export function createScreen(ctx) {
       else void submit(row.action);
     }
   }
+  // 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 && tab===0 && state?.phase==='map' && !state.paused && !state.pendingChoice && !state.pendingDecision && Boolean(state.mapView?.nodes?.length);
   const screen = {
     render(width, rows) {
       columns = width; height = rows; hits = [];
       const frame = [], add = (text, tone = 'text') => frame.push({ text, tone });
       const mark = hit => hits.push({ row: frame.length, col: 0, width: Infinity, height: 1, ...hit });
-      if (width < 40 || rows < 20) { add('请扩大终端至至少 40 列、20 行。', 'title'); add('Esc 返回聊天', 'muted'); return frame; }
+      if (width < 40 || rows < (mapNavigation()?12:20)) { add(`请扩大终端至至少 40 列、${mapNavigation()?12:20} 行。`, 'title'); add('Esc 返回聊天', 'muted'); return frame; }
       const own = me();
       const heading = state ? `${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) ? '已连接' : '离线'}` : '';
       add(status ? pad(cut(heading, Math.max(8, width - displayWidth(status) - 2)), width - displayWidth(status)) + status : cut(heading, width), 'title');
+      if(mapNavigation()) {
+        const view=state.mapView, head=mapHeader(width,view), headerRow=frame.length;
+        add(head.text,'muted');
+        for(const button of head.buttons) hits.push({kind:button.id,id:button.id,row:headerRow,col:button.at,width:button.width,height:1});
+        mapBudget=Math.max(3,rows-frame.length-5);
+        const drawn=mapLines(view,width);
+        for(const line of drawn.lines){
+          const row=frame.length;add(line.text,line.tone);
+          for(const cell of line.cells)hits.push({kind:'node',id:cell.id,row,col:cell.col,width:cell.width,height:1});
+        }
+        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(busy?'操作处理中…':pending?note:note||(!synced?'等待服务器确认状态…':''),width),pending?'error':'muted');
+        add(cut('↑↓←→ 选节点 · Enter / 单击 投票 · C 定位 · F 总览',width),'muted');
+        mark({kind:'tab',advance:true});
+        add(cut('[面板 Tab] · 悬停查看 · Esc 返回 · R 重试',width),'muted');
+        hits=hits.filter(hit=>hit.row<rows);
+        return frame.slice(0,rows);
+      }
       if (unsupported) add(`此扩展版本不认识该阶段「${unsupported}」，请在更新扩展后继续（当前只读）。`, 'error');
       if (targeting) add(cut(`正在使用：${targeting.label}   ·   点击目标或 ←/→ 选择 · Enter 确认 · Esc 取消`, width), 'selected');
       if (state) {
@@ -914,7 +1061,7 @@ export function createScreen(ctx) {
               ...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, index) => entry.legal ? framed(entry.lines, widths[index], targeting.id === entry.id ? 'current' : 'legal') : entry.lines);
+            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');
@@ -942,8 +1089,8 @@ export function createScreen(ctx) {
             ];
             for (const entry of section) {
               const top = frame.length;
-              const shownLines = entry.legal ? framed(entry.lines, Math.max(20, width - 2), targeting.id === entry.id ? 'current' : 'legal') : entry.lines;
-              for (const line of shownLines) add(line, entry.legal ? 'selected' : 'text');
+              const shownLines = entry.legal ? tint(entry.lines, targetTint(entry, targeting.arena), aimed(entry)) : entry.lines;
+              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');
@@ -952,7 +1099,9 @@ export function createScreen(ctx) {
           const capacity = own?.energyCapacity ?? usable;
           const orbs = '●'.repeat(Math.max(0, usable)) + '○'.repeat(Math.max(0, capacity - usable));
           const button = (own?.hp ?? 0) <= 0 ? '[已倒下]' : own?.done ? '[已结束回合]' : (!canAct() || state.paused) ? '[等待队友]' : '[E 结束回合]';
-          const energy = `能量 ${orbs ? `${orbs} ` : ''}${usable}/${capacity}`;
+          // §2: the Regent's stars are a resource of the same row as the energy.
+          const stars = own?.character === 'regent' || (own?.stars ?? 0) > 0 ? `星星 ${own?.stars ?? 0}` : '';
+          const energy = `能量 ${orbs ? `${orbs} ` : ''}${usable}/${capacity}${stars ? `   ${stars}` : ''}`;
           const buttonAt = Math.max(8, width - displayWidth(button) - 1);
           if (!modal) mark({ kind: 'endTurn', id: 'endTurn', col: buttonAt, width: displayWidth(button) });
           add(pad(energy, buttonAt) + button, 'title');
@@ -965,35 +1114,8 @@ export function createScreen(ctx) {
             const flag = !here ? '离线' : state.paused || state.phase === 'lobby' ? (player.ready ? '已准备' : '') : player.done ? '已完成' : '';
             add(cut(`${player.id === ctx.user.id ? '› ' : '  '}${player.name}${player.characterName ? ` · ${player.characterName}` : ''} ${hpText(player)} HP · 金币 ${player.gold ?? 0}${flag ? ` · ${flag}` : ''}${player.vote ? ` · 已投票 ${player.vote}` : ''}`, width), player.id === ctx.user.id ? 'selected' : 'text');
           }
-          if (state.phase === 'shop') {
-            // §E: categories, then the goods list, then the detail pane.
-            const tabs = shopCategories();
-            if (!tabs.some(([kind]) => kind === shopTab)) shopTab = tabs[0]?.[0] ?? 'card';
-            const labels = tabs.map(([kind, name]) => kind === shopTab ? `[${name}]` : name);
-            const head = frame.length;
-            add(labels.join('   '), 'muted');
-            hits.push({ kind: 'shoptab', id: 'shoptab', row: head, col: 0, width, height: 1,
-                        spans: tabSpans(labels).map((span, index) => ({ ...span, category: tabs[index][0] })) });
-          }
           if (['event', 'ending', 'victory'].includes(state.phase) && state.eventProgress?.description) add(state.eventProgress.description, 'muted');
-          if (state.phase === 'map' && Array.isArray(state.mapView?.nodes) && state.mapView.nodes.length) {
-            // §D: the real act map, drawn from the backend's nodes and edges only.
-            const head = mapHeader(width, state.mapView);
-            const headRow = frame.length;
-            add(head.text, 'muted');
-            for (const button of head.buttons) hits.push({ kind: button.id, id: button.id, row: headRow, col: button.at, width: button.width, height: 1 });
-            const drawn = mapLines(state.mapView, width, Math.max(3, rows - frame.length - 11));
-            for (const line of drawn.lines) {
-              const top = frame.length;
-              add(line.text, line.tone);
-              for (const cell of line.cells) hits.push({ kind: 'node', id: cell.node.id, row: top, col: cell.from, width: cell.width, height: 1 });
-            }
-            if (drawn.total > drawn.body || mapFull) add(`本幕 ${drawn.total} 行 · 显示第 ${drawn.top + 1}–${Math.min(drawn.total, drawn.top + drawn.body)} 行 · 滚轮查看`, 'muted');
-            // A cramped frame spends its rows on the map itself: the legend and
-            // the hint are the first things to go, never the nodes.
-            add(mapDetailText(state.mapView, mapData(state.mapView)), 'muted');
-            if (rows >= 26 || drawn.body >= 4) add('图例：数字 可前往 · ● 当前位置 · ✓ 已走过 · 其他 暂不可达 · 点击节点仅查看', 'muted');
-          }
+
         }
         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;
@@ -1014,6 +1136,7 @@ export function createScreen(ctx) {
       } else add('频道成员可加入 · R 刷新房间列表', 'muted');
       if (loading) add('正在加载…', 'muted');
       const logLines = state?.phase === 'combat' && !modal && activeTab() !== 'log' ? Math.min(2, Math.max(0, rows - frame.length - 8)) : 0;
+      if (state) add('');                                          // breathing room above the list
       anchor(); const list = items(), available = Math.max(1, rows - frame.length - 3 - (logLines ? logLines + 1 : 0));
       pageSize = available;
       const maxPage = Math.max(0, Math.ceil(list.length / available) - 1);
@@ -1026,6 +1149,17 @@ export function createScreen(ctx) {
         ? shopPane(width >= 100 ? Math.max(24, Math.floor(width * 0.42)) : width, list[index], width < 100) : undefined;
       const paneAt = pane && width >= 100 ? Math.max(20, width - pane.width) : undefined;
       for (let i = start; i < Math.min(list.length, start + available); i++) {
+        if (list[i].separator) {
+          // A heading keeps its place in the row count, so the detail pane's own
+          // lines still line up with the rows beside them.
+          mark({ kind: 'item', id: list[i].id });
+          const heading = `  ${list[i].label}`;
+          if (!paneAt) { add(heading, 'muted'); continue; }
+          const slot = i - start;
+          add(pad(cut(heading, paneAt - 2), paneAt) + (pane.lines[slot] ?? ''), 'muted');
+          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; }
@@ -1076,15 +1210,31 @@ export function createScreen(ctx) {
         if (name === 'return' || name === 'enter') { submitTarget(targeting.id); return; }
         if (value === 'e') { cancelTargeting(); return; }
       }
-      if (!modal && state?.phase === 'shop' && (value === '[' || value === ']')) {
-        const tabs = shopCategories();
-        const at = Math.max(0, tabs.findIndex(([kind]) => kind === shopTab));
-        shopTab = tabs[(at + (value === ']' ? 1 : tabs.length - 1)) % Math.max(1, tabs.length)]?.[0] ?? shopTab;
-        index = 0; selected = undefined; changed(); return;
-      }
-      if (!modal && state?.phase === 'map' && Array.isArray(state.mapView?.nodes)) {
-        if (value === 'c') { mapScroll = undefined; mapFocus = undefined; changed(); return; }
-        if (value === 'f') { mapFull = !mapFull; changed(); return; }
+      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)) {
+          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)));
+          changed();return;
+        }
+        if(/^[0-9]$/.test(value??'')){
+          const routes=state.options.filter(row=>row.action?.type==='vote'),at=value==='0'?9:Number(value)-1;
+          if(routes[at]){mapFocus=routes[at].action.node;mapAnchor=mapFocus;mapScroll=undefined;changed();}
+          return;
+        }
+        if(['return','enter'].includes(name)){
+          const row=items().find(row=>row.action?.type==='vote' && row.action.node===(mapFocus??state.mapView.current));
+          if(row)void submit({...row.action,phaseId:state.phaseId});
+          return;
+        }
       }
       if (value === ' ' && !modal && !targeting) {
         const row = items()[index];
@@ -1101,14 +1251,14 @@ export function createScreen(ctx) {
       // never play a card by itself. Enter, or a click, is what acts.
       if (!modal && !targeting && /^[0-9]$/.test(value ?? '')) {
         const list = items(), at = listPage * pageSize + (value === '0' ? 9 : Number(value) - 1);
-        if (at < list.length) moveTo(at);
+        if (at < list.length) { moveTo(at); if(state?.phase==='map' && tab===0){mapFocus=list[at].action?.node;mapAnchor=mapFocus;mapScroll=undefined;} }
         return;
       }
       if (name === 'escape' || key.ctrl && ['c', 'd'].includes(name)) {
         if (modal) { selected = modal.previousSelected; index = modal.previousIndex; modal = undefined; anchor(); changed(); }
         else ctx.closeScreen(); return;
       }
-      if (columns < 38 || height < 20) return;
+      if (columns < 40 || height < (mapNavigation()?12:20)) return;
       if (value === '?' && !modal) {
         const row = items()[index];
         const lines = ctx.wrap(row?.label ?? '方向键选择，Enter 确认；全部玩家结束回合后敌人行动。退出或掉线会暂停整局。', Math.max(1, columns - 4));
@@ -1147,7 +1297,7 @@ export function createScreen(ctx) {
       if (name === 'return' || name === 'enter') confirm();
     },
     mouse(event) {
-      if (columns < 38 || height < 20) return;
+      if (columns < 40 || height < (mapNavigation()?12:20)) return;
       if (event.action === 'move') {
         // Hover lights a row, or shows which target the pointer is on.
         const pointed = hitAt(event.x, event.y);
@@ -1167,16 +1317,12 @@ export function createScreen(ctx) {
       if (event.button === 'left') {
         const hit = hitAt(event.x, event.y);
         if (hit?.kind === 'node') {
-          // §D: a click highlights the node (and its route when it is reachable);
-          // going there is the confirm row or Enter.
-          mapFocus = hit.id;
-          const route = items().findIndex(row => row.action?.type === 'vote' && row.id === hit.id);
-          if (route >= 0) moveTo(route); else changed();
-          return;
-        }
-        if (hit?.kind === 'shoptab') {
-          const span = hit.spans?.find(range => event.x >= range.from && event.x < range.to);
-          if (span) { shopTab = span.category; index = 0; selected = undefined; changed(); }
+          // §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;
+          const row = items().find(row => row.action?.type === 'vote' && row.id === hit.id);
+          if (row) { void submit({ ...row.action, phaseId: state.phaseId }); return; }
+          changed();
           return;
         }
         if (hit?.kind === 'shopBuy') {
@@ -1188,7 +1334,7 @@ export function createScreen(ctx) {
           return;
         }
         if (hit?.kind === 'managePotions') { switchTab(tabs.indexOf('potions')); return; }
-        if (hit?.kind === 'mapCenter') { mapScroll = undefined; mapFocus = undefined; mapFull = false; 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; }
         if (hit?.kind === 'entity') {
@@ -1202,10 +1348,10 @@ export function createScreen(ctx) {
         // An open detail pane pages first, exactly like PgUp/PgDn do.
         if (modal?.detail) { pageDetail(step * 3); return; }
         // §D: on the map the wheel looks around the act instead of moving the cursor.
-        if (state?.phase === 'map' && Array.isArray(state.mapView?.nodes)) {
-          const drawn = mapLines(state.mapView, columns, Math.max(3, height - 12));
-          mapScroll = Math.max(0, Math.min(drawn.total - drawn.body, (mapScroll ?? drawn.top) + step));
-          mapFull = false; changed(); return;
+        if (mapNavigation()) {
+          const drawn = mapLines(state.mapView, columns);
+          mapScroll = Math.max(0, Math.min(Math.max(0, drawn.total - drawn.span), (mapScroll ?? drawn.from) - step));
+          changed(); return;
         }
         moveTo(index + step);
         return;
@@ -1227,3 +1373,7 @@ export async function run(context) {
   try { const page = context.openScreen(game.screen); void game.start(); await page; }
   finally { game.stop(); }
 }
+
+
+// Exported so a test can read a drawn act back the way a player does.
+export { drawMap };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkchat-extension-spire",
-  "version": "0.1.0",
+  "version": "0.1.8",
   "type": "module",
   "description": "Optional cooperative card-climbing TUI for LinkChat",
   "license": "UNLICENSED",
@@ -22,7 +22,6 @@
     "directory": "extensions/spire"
   },
   "publishConfig": {
-    "access": "public",
-    "tag": "beta"
+    "access": "public"
   }
 }