koishi-plugin-ciyi 2.2.1 → 2.3.0

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.3.0 · 2026-09-26
+
+四张卡片重新排版：页脚贴合卡片圆角、提示不再被截成省略号，图例单独成行，结果卡去掉压边的字印，量高与绘制共用同一组版式常量。 主指令在 help 列表里补回描述；去掉「.显示」显示模式指令，有图只发图、出图失败才退回文字；多轮输入不再追加计时说明。
+
 # 2.2.0 · 2026-09-26
 
 图片同时保留文字线索与排行榜；修复奖牌数字对比度；裸词冲突保护。

package/DESIGN_SYSTEM.md

@@ -13,12 +13,12 @@
 
 ## 输出、交互与内容
 
-1. 图文模式只发渲染图，不附文字；完整文字只在用户切到「文字」模式时出现。图片的等价文字随图片标记，切换到文字模式时展开，因此不会在群里重复刷屏。
-2. `插件主指令.显示 文字` / `插件主指令.显示 图文` 切换个人显示偏好；同一机器人中的这些插件共享选择。设置保存在内存，重启恢复图文。文本回复不能把后续条目无提示地压掉；较长管理列表分页。
+1. 有渲染图时只发图片，不附同内容的文字，避免在群里重复刷屏；图片生成失败时才退回文字。插件不提供个人显示模式开关。
+2. 每个插件的主指令都带描述，`help` 列表右侧不留空；主指令先于任何子指令注册（Koishi 会忽略已存在指令的描述）。文本回复不能把后续条目无提示地压掉；较长管理列表分页。
 3. 裸输入必须符合词法、对局状态及参与条件。多个插件匹配时不执行，要求明确完整指令；完整指令继续可用。
 4. 回复说明当前结果、未完成原因和可执行的下一步，不用管理员日志替代用户可用的反馈。退款、赔付与渲染失败不能伪装成功。
 5. 破坏性清空需展示范围、不可撤销性和限时确认码。确认码限制到同一机器人、平台、用户与频道，使用后立即失效。
-6. 多轮输入允许 5 分钟等待，发送「延长」重新计时，发送「取消」退出。斗牛、21 点提供延长等待入口。文字模式不主动撤回已发出的说明。
+6. 多轮输入等待 5 分钟，提问里写明可回复的内容与「取消」，不再追加计时说明。对局内的短窗口（如 21 点保险、投降）提供显式跳过，全员表态后立即进入下一阶段，而不是提供「延长」。
 7. 货币发放先写入核对记录，入账结果不明确时保留待核对状态，不自动重发。管理员核对实际流水并按需人工补发后标记确认；确认操作自身不转账。
 
 ## 内容边界
@@ -44,7 +44,7 @@ node markdown-to-image-service/scripts/sync-design-system.mjs --check
 
 官方色彩算法可在源仓库安装开发依赖后通过 `node scripts/build-material-colors.mjs` 重建，再同步消费者。
 
-回归检查覆盖：24 个源色相的明暗角色对比度、奖牌前景、图表填充/轨道差异、浏览器/服务端 HCT 一致性、文字输出与身份隔离、输入冲突、可延长输入、入账异常、清空确认和 Wordle 并发/渲染失败。工作区截图脚本为 `scripts/verify-rendering.ts`，需 Puppeteer Core 和可用 Chromium。
+回归检查覆盖：24 个源色相的明暗角色对比度、奖牌前景、图表填充/轨道差异、浏览器/服务端 HCT 一致性、主指令描述、输入冲突、入账异常、清空确认和 Wordle 并发/渲染失败。工作区截图脚本为 `scripts/verify-rendering.ts`，需 Puppeteer Core 和可用 Chromium。
 
 ## 本轮改动对应关系
 
@@ -53,9 +53,9 @@ node markdown-to-image-service/scripts/sync-design-system.mjs --check
 | 共享设计规范 | 官方 HCT、2025 动态颜色角色、共享字阶与间距、同步与哈希校验 |
 | Markdown | M3 明暗主题；旧主题名按明暗迁移；代码高亮与 Mermaid 使用 M3 角色；长代码可换行 |
 | message-counter / monetary-rank | M3 角色与共享图表字阶、HCT 头像配色、完整文字榜单；保留昵称截断 |
-| Wordle | 替换复制的 NYT 外观；状态符号与图例；明暗角色；文字棋盘；异常释放并发锁；安全解析模式编号 |
-| MCDLE | 历史猜测完整文字属性；两列属性卡减少超宽表格 |
+| Wordle | 替换复制的 NYT 外观；状态符号与图例；明暗角色；异常释放并发锁；安全解析模式编号；裸词只在确定是猜测时回应 |
+| MCDLE | 猜测按行排成一张表，方便逐项对照；单句页脚居中 |
 | 2048 / ciyi | 数字与奖牌前景按实际对比度选色 |
-| 斗牛 / 21 点 | 付款核对记录、如实反馈退款失败、明确下注金额、延长操作窗口 |
+| 斗牛 / 21 点 | 付款核对记录、如实反馈退款失败、明确下注金额、可显式跳过的短窗口 |
 | sentinel | 完整封印列表按每页 10 位展示 |
-| 其余插件 | 图文双通道、个人文字模式、可取消/延长输入与上下文反馈 |
+| 其余插件 | 渲染失败退回文字、可取消输入与上下文反馈 |

package/README.md

@@ -27,6 +27,6 @@ yarn add koishi-plugin-ciyi
 
 ## 显示与交互
 
-发送 `ciyi.显示 文字` 或 `ciyi.显示 图文` 切换个人显示偏好。同一机器人中的配套插件共享选择，重启后恢复图文。图文模式中的信息图片附带文字说明；作品素材与感官测试的适用边界见 [设计系统](./DESIGN_SYSTEM.md)。
+有渲染图时只发图片，不再附带同内容的文字；图片生成失败时才退回文字。作品素材与感官测试的适用边界见 [设计系统](./DESIGN_SYSTEM.md)。
 
-本次更新：图片同时保留文字线索与排行榜；修复奖牌数字对比度；裸词冲突保护。
+本次更新：四张卡片重新排版：页脚贴合卡片圆角、提示不再被截成省略号，图例单独成行，结果卡去掉压边的字印，量高与绘制共用同一组版式常量。 主指令在 help 列表里补回描述；去掉「.显示」显示模式指令，有图只发图、出图失败才退回文字；多轮输入不再追加计时说明。

package/lib/index.js

@@ -36,28 +36,13 @@ var import_koishi = require("koishi");
 var KEY = Symbol.for("araea.koishi.ux.v1");
 function state(ctx) {
   const root = ctx.root;
-  return root[KEY] ??= { modes: /* @__PURE__ */ new Map(), owners: /* @__PURE__ */ new Set() };
+  return root[KEY] ??= { owners: /* @__PURE__ */ new Set() };
 }
 __name(state, "state");
-var userKey = /* @__PURE__ */ __name((session) => `${session.platform}:${session.selfId}:${session.userId}`, "userKey");
-function usePresentation(ctx, command) {
-  const shared = state(ctx);
-  ctx.command(`${command}.显示 [mode:string]`, "选择图文或文字输出").action(({ session }, mode) => {
-    if (!mode) return `当前：${shared.modes.get(userKey(session)) ? "文字" : "图文"}。发送「${command}.显示 文字」或「${command}.显示 图文」。设置对本机器人各插件生效，重启后恢复图文。`;
-    if (!["文字", "图文"].includes(mode)) return "请选择「文字」或「图文」。";
-    shared.modes.set(userKey(session), mode === "文字");
-    return `已切换为${mode}输出。`;
-  });
-  return {
-    textOnly: /* @__PURE__ */ __name((session) => shared.modes.get(userKey(session)) === true, "textOnly"),
-    /** 图文模式只给图片；图片缺失或用户选了文字模式时才退回文字。 */
-    present(session, image, text) {
-      if (!image || shared.modes.get(userKey(session))) return text;
-      return import_koishi.h.normalize(image);
-    }
-  };
+function present(image, text) {
+  return image ? import_koishi.h.normalize(image) : text;
 }
-__name(usePresentation, "usePresentation");
+__name(present, "present");
 function registerDirectInput(ctx, name2, matches) {
   const owner = { name: name2, matches };
   state(ctx).owners.add(owner);
@@ -5340,12 +5325,86 @@ function textLeftFit(ctx, text, x, y, maxWidth, font, color, offsetY = 0) {
   textLeft(ctx, ellipsize(text, maxWidth, fontSizeOf(font)), x, y, font, color, offsetY);
 }
 __name(textLeftFit, "textLeftFit");
-function drawCard(ctx, x, y, w, h3) {
-  fillRound(ctx, x, y, w, h3, s(SHAPE.extraLarge), C.surfaceContainerLowest);
+var L = {
+  margin: 16,
+  pad: 24,
+  gap: 20,
+  headerTop: 20,
+  seal: 48,
+  headerBottom: 18,
+  footerPadY: 14,
+  footerLine: 20,
+  sectionTitle: 20,
+  sectionGap: 12
+};
+var HEADER_H = L.headerTop + L.seal + L.headerBottom;
+function cornerRect(ctx, x, y, w, h3, [tl, tr, br, bl]) {
+  ctx.beginPath();
+  ctx.moveTo(x + tl, y);
+  ctx.lineTo(x + w - tr, y);
+  if (tr) ctx.arcTo(x + w, y, x + w, y + tr, tr);
+  else ctx.lineTo(x + w, y);
+  ctx.lineTo(x + w, y + h3 - br);
+  if (br) ctx.arcTo(x + w, y + h3, x + w - br, y + h3, br);
+  else ctx.lineTo(x + w, y + h3);
+  ctx.lineTo(x + bl, y + h3);
+  if (bl) ctx.arcTo(x, y + h3, x, y + h3 - bl, bl);
+  else ctx.lineTo(x, y + h3);
+  ctx.lineTo(x, y + tl);
+  if (tl) ctx.arcTo(x, y, x + tl, y, tl);
+  else ctx.lineTo(x, y);
+  ctx.closePath();
+}
+__name(cornerRect, "cornerRect");
+function hline(ctx, x0, x1, y, color, dash) {
+  ctx.save();
+  ctx.strokeStyle = color;
+  ctx.lineWidth = s(1);
+  if (dash) ctx.setLineDash(dash);
+  ctx.beginPath();
+  ctx.moveTo(x0, y);
+  ctx.lineTo(x1, y);
+  ctx.stroke();
+  ctx.restore();
+}
+__name(hline, "hline");
+function footerRows(innerW, lines) {
+  const fs = s(TYPE.labelMedium.size);
+  const avail = innerW - s(L.pad) * 2 - s(24);
+  const rows = [];
+  for (const line of lines) {
+    const lw = line.left ? textWidth(line.left, fs) : 0;
+    const rw = line.right ? textWidth(line.right, fs) : 0;
+    if (line.left && line.right && lw + rw > avail) rows.push({ left: line.left }, { left: line.right });
+    else rows.push(line);
+  }
+  return rows;
 }
-__name(drawCard, "drawCard");
+__name(footerRows, "footerRows");
+function footerHeight(innerW, lines) {
+  return s(L.footerPadY) * 2 + footerRows(innerW, lines).length * s(L.footerLine);
+}
+__name(footerHeight, "footerHeight");
+function drawFooter(ctx, ix, iy, iw, ih, lines) {
+  const rows = footerRows(iw, lines);
+  const h3 = footerHeight(iw, lines);
+  const y = iy + ih - h3;
+  const r = s(SHAPE.extraLarge);
+  ctx.fillStyle = C.surfaceContainerLow;
+  cornerRect(ctx, ix, y, iw, h3, [0, 0, r, r]);
+  ctx.fill();
+  hline(ctx, ix, ix + iw, y, C.outlineVariant);
+  const font = `${s(TYPE.labelMedium.size)}px ${FONT_SANS}`;
+  const maxW = iw - s(L.pad) * 2;
+  rows.forEach((row, i) => {
+    const cy = y + s(L.footerPadY) + s(L.footerLine) * (i + 0.5);
+    if (row.left) textLeft(ctx, ellipsize(row.left, maxW, s(TYPE.labelMedium.size)), ix + s(L.pad), cy, font, C.onSurfaceVariant);
+    if (row.right) textRight(ctx, row.right, ix + iw - s(L.pad), cy, font, C.onSurfaceVariant);
+  });
+}
+__name(drawFooter, "drawFooter");
 async function toPng(service, innerW, innerH, draw) {
-  const margin = s(18);
+  const margin = s(L.margin);
   const canvasW = margin * 2 + innerW;
   const canvasH = margin * 2 + innerH;
   const canvas = await service.createCanvas(canvasW, canvasH);
@@ -5353,7 +5412,7 @@ async function toPng(service, innerW, innerH, draw) {
   try {
     ctx.fillStyle = C.surface;
     ctx.fillRect(0, 0, canvasW, canvasH);
-    drawCard(ctx, margin, margin, innerW, innerH);
+    fillRound(ctx, margin, margin, innerW, innerH, s(SHAPE.extraLarge), C.surfaceContainerLowest);
     draw(ctx, margin, margin, innerW, innerH);
     return await canvas.toBuffer("image/png");
   } finally {
@@ -5451,700 +5510,354 @@ function drawWordGrid(ctx, x, y, word, size, mask) {
 }
 __name(drawWordGrid, "drawWordGrid");
 function drawSeal(ctx, x, y, size, lines) {
-  fillRound(ctx, x, y, size, size, s(SHAPE.extraLarge), C.primary);
-  const fs = s(TYPE.titleLarge.size);
-  const lh = fs * 1.06;
-  const total = lh * lines.length;
-  let cy = y + size / 2 - total / 2 + lh / 2;
+  fillRound(ctx, x, y, size, size, s(SHAPE.large), C.primary);
+  const fs = s(TYPE.titleMedium.size);
+  const lh = fs * 1.1;
+  let cy = y + size / 2 - lh * lines.length / 2 + lh / 2;
   for (const line of lines) {
-    textCenter(ctx, line, x + size / 2, cy, `${EMPHASIZED_WEIGHT.title} ${fs}px ${FONT_SANS}`, C.onPrimary);
+    textCenter(ctx, line, x + size / 2, cy, `${EMPHASIZED_WEIGHT.title} ${fs}px ${FONT_SANS}`, C.onPrimary, cjkOffset(fs));
     cy += lh;
   }
 }
 __name(drawSeal, "drawSeal");
-function drawHeader(ctx, innerX, innerY, innerW, sub, right) {
-  const padX = s(22);
-  const padTop = s(19);
-  const padBottom = s(16);
-  const sealSize = s(52);
-  const h3 = padTop + sealSize + padBottom;
-  drawSeal(ctx, innerX + padX, innerY + padTop, sealSize, ["词", "意"]);
-  const brandX = innerX + padX + sealSize + s(15);
-  textLeft(
-    ctx,
-    "词意",
-    brandX,
-    innerY + padTop + s(14),
-    `${EMPHASIZED_WEIGHT.headline} ${s(TYPE.headlineMedium.size)}px ${FONT_SANS}`,
-    C.onSurface
-  );
-  textLeft(
-    ctx,
-    "ci yi",
-    brandX,
-    innerY + padTop + s(36),
-    `italic ${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
-    C.onSurfaceVariant
-  );
-  const subRight = right ? innerX + innerW - padX - s(150) : innerX + innerW - padX;
-  textLeftFit(
-    ctx,
-    sub,
-    brandX,
-    innerY + padTop + s(58),
-    subRight - brandX,
-    `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`,
-    C.onSurfaceVariant
-  );
+function drawHeader(ctx, ix, iy, iw, sub, right) {
+  const x = ix + s(L.pad);
+  const top = iy + s(L.headerTop);
+  const seal = s(L.seal);
+  drawSeal(ctx, x, top, seal, ["词", "意"]);
+  const tx = x + seal + s(16);
+  const rightW = right ? Math.max(textWidth(right.big, s(TYPE.headlineMedium.size)), textWidth(right.cap, s(TYPE.labelMedium.size))) + s(24) : 0;
+  textLeft(ctx, "词意", tx, top + s(14), `${EMPHASIZED_WEIGHT.headline} ${s(TYPE.titleLarge.size)}px ${FONT_SANS}`, C.onSurface);
+  textLeftFit(ctx, sub, tx, top + s(37), ix + iw - s(L.pad) - rightW - tx, `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
   if (right) {
-    const rx = innerX + innerW - padX;
-    textRight(
-      ctx,
-      right.big,
-      rx,
-      innerY + padTop + s(16),
-      `${EMPHASIZED_WEIGHT.headline} ${s(TYPE.headlineLarge.size)}px ${FONT_NUM}`,
-      C.primary
-    );
-    textRight(
-      ctx,
-      right.cap,
-      rx,
-      innerY + padTop + s(44),
-      `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
-      C.onSurfaceVariant
-    );
+    const rx = ix + iw - s(L.pad);
+    textRight(ctx, right.big, rx, top + s(16), `${EMPHASIZED_WEIGHT.headline} ${s(TYPE.headlineMedium.size)}px ${FONT_NUM}`, C.primary);
+    textRight(ctx, right.cap, rx, top + s(40), `${s(TYPE.labelMedium.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
   }
-  const lineY = innerY + h3;
-  ctx.strokeStyle = C.outlineVariant;
-  ctx.lineWidth = s(1);
-  ctx.beginPath();
-  ctx.moveTo(innerX, lineY);
-  ctx.lineTo(innerX + innerW, lineY);
-  ctx.stroke();
-  fillRound(ctx, innerX + padX, lineY - s(1.5), s(54), s(3), s(SHAPE.full), C.primary);
-  return h3;
+  hline(ctx, ix, ix + iw, iy + s(HEADER_H), C.outlineVariant);
+  return s(HEADER_H);
 }
 __name(drawHeader, "drawHeader");
-function drawFooter(ctx, innerX, y, innerW, legendItems, tip) {
-  const padX = s(22);
-  const padY = s(12);
-  const h3 = s(36);
-  const inset = s(10);
-  fillRound(
-    ctx,
-    innerX + inset,
-    y,
-    innerW - inset * 2,
-    h3 + padY * 2,
-    s(SHAPE.large),
-    C.surfaceContainerLow
-  );
-  ctx.strokeStyle = C.outlineVariant;
-  ctx.lineWidth = s(1);
-  ctx.beginPath();
-  ctx.moveTo(innerX, y);
-  ctx.lineTo(innerX + innerW, y);
-  ctx.stroke();
-  let lx = innerX + padX;
-  const cy = y + padY + h3 / 2;
-  for (const { tier, range } of legendItems) {
-    fillRound(ctx, lx, cy - s(4.5), s(9), s(9), s(SHAPE.full), tier.color);
-    lx += s(9) + s(6);
-    textLeft(ctx, tier.name, lx, cy, `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
-    lx += textWidth(tier.name, s(TYPE.labelSmall.size)) + s(4);
-    textLeft(ctx, range, lx, cy, `${s(TYPE.labelSmall.size)}px ${FONT_NUM}`, C.onSurfaceVariant);
-    lx += textWidth(range, s(TYPE.labelSmall.size)) + s(13);
-  }
-  const tipFont = `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`;
-  const maxTipWidth = legendItems.length ? s(145) : innerW - padX * 2;
-  textRight(
-    ctx,
-    ellipsize(tip, maxTipWidth, s(TYPE.labelSmall.size)),
-    innerX + innerW - padX,
-    cy,
-    tipFont,
-    C.onSurfaceVariant
-  );
-  return h3 + padY * 2;
-}
-__name(drawFooter, "drawFooter");
-function drawLegendFull(ctx, x, y, w) {
-  const colW = w / 2;
-  const rowH = s(30);
-  for (let i = 0; i < TIERS.length; i++) {
-    const t = TIERS[i];
-    const cx = x + i % 2 * colW;
-    const cy = y + Math.floor(i / 2) * rowH;
-    fillRound(ctx, cx, cy - s(4.5), s(9), s(9), s(SHAPE.full), t.color);
-    textLeft(ctx, t.name, cx + s(15), cy, `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
-    textLeft(ctx, tierRange(i), cx + s(52), cy, `${s(TYPE.labelSmall.size)}px ${FONT_NUM}`, C.onSurfaceVariant);
-    textLeft(ctx, t.note, cx + s(100), cy, `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
-  }
-  return rowH * Math.ceil(TIERS.length / 2) + s(8);
-}
-__name(drawLegendFull, "drawLegendFull");
-function drawSectionTitle(ctx, x, y, w, title) {
-  fillRound(ctx, x, y - s(1), s(3), s(12), s(SHAPE.full), C.primary);
-  textLeft(
-    ctx,
-    title,
-    x + s(15),
-    y + s(5),
-    `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelMedium.size)}px ${FONT_SANS}`,
-    C.onSurfaceVariant
-  );
-  const tw = textWidth(title, s(TYPE.labelMedium.size));
-  ctx.strokeStyle = C.outlineVariant;
-  ctx.lineWidth = s(1);
-  ctx.beginPath();
-  ctx.moveTo(x + s(15) + tw + s(9), y + s(5));
-  ctx.lineTo(x + w, y + s(5));
-  ctx.stroke();
-  return s(24);
+function drawSectionTitle(ctx, x, y, title) {
+  const h3 = s(L.sectionTitle);
+  fillRound(ctx, x, y + h3 / 2 - s(7), s(4), s(14), s(SHAPE.full), C.primary);
+  textLeft(ctx, title, x + s(12), y + h3 / 2, `${EMPHASIZED_WEIGHT.title} ${s(TYPE.titleSmall.size)}px ${FONT_SANS}`, C.onSurface);
+  return h3 + s(L.sectionGap);
 }
 __name(drawSectionTitle, "drawSectionTitle");
 function drawPanel(ctx, x, y, w, h3) {
   fillRound(ctx, x, y, w, h3, s(SHAPE.large), C.surfaceContainer);
 }
 __name(drawPanel, "drawPanel");
+var NEAR_BAR_W = 80;
 function drawNearBar(ctx, x, y, pct, tier) {
-  const barW = s(88);
+  const barW = s(NEAR_BAR_W);
   const barH = s(8);
   const gap = s(3);
   const fillW = Math.max(barH, barW * pct / 100);
   const top = y - barH / 2;
   fillRound(ctx, x, top, fillW, barH, s(SHAPE.full), tier.color);
   if (fillW + gap < barW) {
-    fillRound(
-      ctx,
-      x + fillW + gap,
-      top,
-      barW - fillW - gap,
-      barH,
-      s(SHAPE.full),
-      C.surfaceContainerHighest
-    );
+    fillRound(ctx, x + fillW + gap, top, barW - fillW - gap, barH, s(SHAPE.full), C.surfaceContainerHighest);
   }
-  textLeft(
-    ctx,
-    tier.name,
-    x + barW + s(9),
-    y,
-    `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelMedium.size)}px ${FONT_SANS}`,
-    tier.color
-  );
+  textLeft(ctx, tier.name, x + barW + s(10), y, `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, tier.color);
 }
 __name(drawNearBar, "drawNearBar");
-function measureBoard(opts) {
-  const innerW = s(680);
-  const rowH = s(50);
-  const gapH = s(28);
-  const headerH = s(87);
-  const tableHeadH = s(32);
-  const padV = s(20);
-  const footerH = s(60);
-  let rows = opts.rows.length;
-  for (const r of opts.rows) if (r.gapBefore) rows += 1;
-  const innerH = headerH + padV + tableHeadH + rows * rowH + (rows > 0 ? 0 : gapH) + padV + footerH;
-  return { innerW, innerH, rowH };
+var TABLE = { head: 32, row: 56, gap: 32 };
+var COLS = [
+  { key: "no", label: "序", w: 30 },
+  { key: "nb", label: "更近的词", w: 84 },
+  { key: "gw", label: "猜测", w: 96 },
+  { key: "fb", label: "更远的词", w: 84 },
+  { key: "rk", label: "排名", w: 88 },
+  { key: "mt", label: "亲疏", w: 136 }
+];
+function boardHeight(rows) {
+  const gaps = rows.filter((r) => r.gapBefore).length;
+  return s(TABLE.head) + rows.length * s(TABLE.row) + gaps * s(TABLE.gap);
 }
-__name(measureBoard, "measureBoard");
-function drawBoardTable(ctx, x, y, w, opts, rowH) {
-  const accentW = s(3);
-  const gutter = s(10);
-  const tableW = w - s(44);
-  const cx = x + s(22);
-  const usable = Math.max(tableW - gutter, s(1));
-  const natural = [32, 72, 88, 72, 72, 148];
-  const naturalSum = natural.reduce((a, b) => a + b, 0);
-  const scale = usable / naturalSum;
-  const cols = {
-    no: natural[0] * scale,
-    nb: natural[1] * scale,
-    gw: natural[2] * scale,
-    rk: natural[4] * scale,
-    mt: natural[5] * scale
-  };
-  const bx = cx + gutter;
-  const nb0 = bx + cols.no;
-  const gw0 = nb0 + cols.nb;
-  const nb1 = gw0 + cols.gw;
-  const rk0 = nb1 + cols.nb;
-  const mt0 = rk0 + cols.rk;
-  const noX = bx + s(2);
-  const meterBlockW = s(88) + s(9) + textWidth("咫尺", s(TYPE.labelMedium.size));
-  const mtX = mt0 + Math.max(0, (cols.mt - meterBlockW) / 2);
-  const headY = y;
-  const fs = s(TYPE.labelSmall.size);
-  textLeft(ctx, "序", noX, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
-  textCenter(ctx, "更近 ◀", nb0 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
-  textCenter(ctx, "猜测", gw0 + cols.gw / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
-  textCenter(ctx, "▶ 更远", nb1 + cols.nb / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
-  textCenter(ctx, "排名", rk0 + cols.rk / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
-  textCenter(ctx, "亲疏", mt0 + cols.mt / 2, headY, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
-  let ry = y + s(22);
+__name(boardHeight, "boardHeight");
+function drawBoardTable(ctx, x, y, w, rows, total) {
+  const sum = COLS.reduce((a, c) => a + c.w, 0);
+  const scale = w / s(sum);
+  const edges = {};
+  let cx = x;
+  for (const col of COLS) {
+    const cw = s(col.w) * scale;
+    edges[col.key] = { x: cx, w: cw };
+    cx += cw;
+  }
+  const mid = /* @__PURE__ */ __name((key) => edges[key].x + edges[key].w / 2, "mid");
+  const labelFont = `${s(TYPE.labelMedium.size)}px ${FONT_SANS}`;
+  const headY = y + s(TABLE.head) / 2;
+  textLeft(ctx, "序", x + s(8), headY, labelFont, C.onSurfaceVariant);
+  for (const col of COLS.slice(1, 5)) textCenter(ctx, col.label, mid(col.key), headY, labelFont, C.onSurfaceVariant);
+  const meterW = s(NEAR_BAR_W) + s(10) + textWidth("咫尺", s(TYPE.labelLarge.size));
+  const meterX = edges.mt.x + Math.max(0, (edges.mt.w - meterW) / 2);
+  textCenter(ctx, "亲疏", meterX + meterW / 2, headY, labelFont, C.onSurfaceVariant);
+  hline(ctx, x, x + w, y + s(TABLE.head), C.outline);
+  let ry = y + s(TABLE.head);
   let ordinal = 0;
-  for (const row of opts.rows) {
+  for (const row of rows) {
     if (row.gapBefore) {
-      ry += s(8);
-      textCenter(
-        ctx,
-        `…… 另有 ${row.gapBefore} 词未列`,
-        cx + tableW / 2,
-        ry + s(10),
-        `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
-        C.onSurfaceVariant
-      );
-      ctx.strokeStyle = C.outlineVariant;
-      ctx.beginPath();
-      ctx.moveTo(cx, ry + s(20));
-      ctx.lineTo(cx + tableW, ry + s(20));
-      ctx.stroke();
-      ry += s(28);
+      const cy = ry + s(TABLE.gap) / 2;
+      const label = `中间还有 ${row.gapBefore} 词`;
+      const lw = textWidth(label, s(TYPE.labelMedium.size)) + s(24);
+      hline(ctx, x, x + w / 2 - lw / 2, cy, C.outlineVariant, [s(4), s(4)]);
+      hline(ctx, x + w / 2 + lw / 2, x + w, cy, C.outlineVariant, [s(4), s(4)]);
+      textCenter(ctx, label, x + w / 2, cy, labelFont, C.onSurfaceVariant);
+      ry += s(TABLE.gap);
+    } else if (ordinal > 0) {
+      hline(ctx, x, x + w, ry, C.outlineVariant);
     }
     ordinal += 1;
     const { history, fresh } = row;
     const tier = tierOf(history.rank);
-    const pct = nearness(history.rank, opts.total);
+    const rowH = s(TABLE.row);
     const midY = ry + rowH / 2;
     if (fresh) {
-      fillRound(ctx, cx, ry, tableW, rowH, s(SHAPE.medium), FRESH);
-      fillRound(ctx, cx, ry + s(4), accentW, rowH - s(8), s(SHAPE.full), C.primary);
+      fillRound(ctx, x, ry + s(3), w, rowH - s(6), s(SHAPE.medium), FRESH);
+      fillRound(ctx, x, ry + s(12), s(4), rowH - s(24), s(SHAPE.full), C.primary);
     }
-    ctx.strokeStyle = ordinal === 1 ? C.outline : C.outlineVariant;
-    ctx.lineWidth = s(1);
-    ctx.beginPath();
-    ctx.moveTo(cx, ry);
-    ctx.lineTo(cx + tableW, ry);
-    ctx.stroke();
-    textLeft(
-      ctx,
-      String(ordinal).padStart(2, "0"),
-      noX,
-      midY,
-      `${s(TYPE.labelMedium.size)}px ${FONT_NUM}`,
-      C.onSurfaceVariant
-    );
-    const nbX = nb0 + (cols.nb - gridWidth(history.leftHint, "sm")) / 2;
-    drawWordGrid(ctx, nbX, midY - s(13), history.leftHint, "sm", 0);
-    const gwX = gw0 + (cols.gw - gridWidth(history.guess, "md")) / 2;
-    drawWordGrid(ctx, gwX, midY - s(17), history.guess, "md");
-    const rbX = nb1 + (cols.nb - gridWidth(history.rightHint, "sm")) / 2;
-    drawWordGrid(ctx, rbX, midY - s(13), history.rightHint, "sm", 1);
+    textLeft(ctx, String(ordinal).padStart(2, "0"), x + s(8), midY, `${s(TYPE.labelLarge.size)}px ${FONT_NUM}`, C.onSurfaceVariant);
+    drawWordGrid(ctx, mid("nb") - gridWidth(history.leftHint, "sm") / 2, midY - s(GRID.sm.cell) / 2, history.leftHint, "sm", 0);
+    drawWordGrid(ctx, mid("gw") - gridWidth(history.guess, "md") / 2, midY - s(GRID.md.cell) / 2, history.guess, "md");
+    drawWordGrid(ctx, mid("fb") - gridWidth(history.rightHint, "sm") / 2, midY - s(GRID.sm.cell) / 2, history.rightHint, "sm", 1);
     const rankText = String(history.rank);
-    const rankFont = `${EMPHASIZED_WEIGHT.title} ${s(TYPE.titleLarge.size)}px ${FONT_NUM}`;
-    const rankWidth = textWidth(rankText, s(TYPE.titleLarge.size));
-    const hashW = textWidth("#", s(TYPE.labelMedium.size));
-    const rankBlock = hashW + s(3) + rankWidth;
-    const rankLeft = rk0 + (cols.rk - rankBlock) / 2;
-    textLeft(ctx, "#", rankLeft, midY, `${s(TYPE.labelMedium.size)}px ${FONT_NUM}`, C.onSurfaceVariant);
-    textLeft(ctx, rankText, rankLeft + hashW + s(3), midY, rankFont, tier.color);
-    drawNearBar(ctx, mtX, midY, pct, tier);
+    const hashFs = s(TYPE.labelLarge.size);
+    const rankFs = s(TYPE.titleLarge.size);
+    const block = textWidth("#", hashFs) + s(2) + textWidth(rankText, rankFs);
+    const left = mid("rk") - block / 2;
+    textLeft(ctx, "#", left, midY, `${hashFs}px ${FONT_NUM}`, C.onSurfaceVariant);
+    textLeft(ctx, rankText, left + textWidth("#", hashFs) + s(2), midY, `${EMPHASIZED_WEIGHT.title} ${rankFs}px ${FONT_NUM}`, tier.color);
+    drawNearBar(ctx, meterX, midY, nearness(history.rank, total), tier);
     ry += rowH;
   }
   return ry - y;
 }
 __name(drawBoardTable, "drawBoardTable");
+var LEGEND_H = 28;
+function drawLegendRow(ctx, x, y, w) {
+  const slot = w / TIERS.length;
+  const fs = s(TYPE.labelMedium.size);
+  const cy = y + s(LEGEND_H) / 2;
+  TIERS.forEach((tier, i) => {
+    const label = `${tier.name} ${tierRange(i)}`;
+    const itemW = s(8) + s(6) + textWidth(label, fs);
+    const lx = x + slot * i + (slot - itemW) / 2;
+    fillRound(ctx, lx, cy - s(4), s(8), s(8), s(SHAPE.full), tier.color);
+    textLeft(ctx, tier.name, lx + s(14), cy, `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+    textLeft(ctx, tierRange(i), lx + s(14) + textWidth(tier.name + " ", fs), cy, `${fs}px ${FONT_NUM}`, C.onSurfaceVariant);
+  });
+}
+__name(drawLegendRow, "drawLegendRow");
+var BOARD_W = 680;
 function renderBoardCard(service, opts) {
-  const { innerW, innerH, rowH } = measureBoard(opts);
+  const innerW = s(BOARD_W);
+  const footer = [{ left: opts.tip }];
+  const tableH = boardHeight(opts.rows);
+  const innerH = s(HEADER_H) + s(L.gap) + tableH + s(L.gap) + s(LEGEND_H) + s(L.gap) + footerHeight(innerW, footer);
   const best = opts.rows.length ? `#${opts.rows.reduce((m, r) => Math.min(m, r.history.rank), Infinity)}` : "—";
   return toPng(service, innerW, innerH, (ctx, ix, iy, iw, ih) => {
-    let y = iy + drawHeader(ctx, ix, iy, iw, `每日挑战 · 第 ${opts.attempts} 次猜测`, {
-      big: best,
-      cap: "当前最佳"
-    });
-    y += s(20);
-    drawBoardTable(ctx, ix, y, iw, opts, rowH);
-    drawFooter(
-      ctx,
-      ix,
-      iy + ih - s(60),
-      iw,
-      TIERS.map((tier, i) => ({ tier, range: tierRange(i) })),
-      opts.tip
-    );
+    let y = iy + drawHeader(ctx, ix, iy, iw, `每日挑战 · 第 ${opts.attempts} 次猜测`, { big: best, cap: "当前最佳" });
+    y += s(L.gap);
+    y += drawBoardTable(ctx, ix + s(L.pad), y, iw - s(L.pad) * 2, opts.rows, opts.total);
+    y += s(L.gap);
+    drawLegendRow(ctx, ix + s(L.pad), y, iw - s(L.pad) * 2);
+    drawFooter(ctx, ix, iy, iw, ih, footer);
   });
 }
 __name(renderBoardCard, "renderBoardCard");
 function renderIntroCard(service, opts) {
-  const innerW = s(720);
-  const innerH = s(716);
+  const innerW = s(BOARD_W);
+  const footer = [{ left: "一日一词，猜中即止，次日零点换题", right: "词库与语义排序来自「词影」" }];
+  const usage2 = [
+    ["开始", "ciyi.猜 山水", `开题并报一个两字词${opts.middleware ? "；开题后可直接发词" : ""}`],
+    ["切换", "ciyi.裸词 开/关", "改本频道的续猜方式"],
+    ["排行", "ciyi.排行榜", "看谁猜中得最多"]
+  ];
+  const notes = [
+    "这一行是说：「企业」与今日答案的意思相近程度，排在第 467 位。",
+    "两侧各藏一字：左边是比它更近的词，右边是比它更远的词。",
+    "名次越小，离答案越近；#1 就是答案本身。"
+  ];
+  const sample = [{ history: { guess: "企业", rank: 467, leftHint: "良好", rightHint: "地产" } }];
+  const panelPad = 16;
+  const usageRow = 36;
+  const noteLine = 22;
+  const legendRow = 30;
+  const sectionHead = s(L.sectionTitle) + s(L.sectionGap);
+  const usageH = s(panelPad) * 2 + usage2.length * s(usageRow);
+  const readH = s(panelPad) * 2 + boardHeight(sample) + s(12) + notes.length * s(noteLine);
+  const tierH = s(panelPad) * 2 + Math.ceil(TIERS.length / 2) * s(legendRow);
+  const innerH = s(HEADER_H) + s(L.gap) + sectionHead + usageH + s(L.gap) + sectionHead + readH + s(L.gap) + sectionHead + tierH + s(L.gap) + footerHeight(innerW, footer);
   return toPng(service, innerW, innerH, (ctx, ix, iy, iw, ih) => {
-    let y = iy + drawHeader(ctx, ix, iy, iw, "按意思远近找词 · 每日一题", {
-      big: opts.words.toLocaleString(),
-      cap: "词库容量"
+    const x = ix + s(L.pad);
+    const w = iw - s(L.pad) * 2;
+    let y = iy + drawHeader(ctx, ix, iy, iw, "按意思远近找词 · 每日一题", { big: opts.words.toLocaleString(), cap: "词库容量" });
+    y += s(L.gap);
+    y += drawSectionTitle(ctx, x, y, "玩法");
+    drawPanel(ctx, x, y, w, usageH);
+    usage2.forEach(([key, command, desc], i) => {
+      const cy = y + s(panelPad) + s(usageRow) * (i + 0.5);
+      textLeft(ctx, key, x + s(panelPad), cy, `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, C.primary);
+      textLeft(ctx, command, x + s(72), cy, `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`, C.onSurface);
+      textLeftFit(ctx, desc, x + s(200), cy, w - s(200) - s(panelPad), `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
     });
-    y += s(20);
-    y += drawSectionTitle(ctx, ix + s(22), y, iw - s(44), "玩法");
-    y += s(11);
-    const p1h = s(104);
-    drawPanel(ctx, ix + s(22), y, iw - s(44), p1h);
-    textLeft(ctx, "开始", ix + s(38), y + s(24), `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, C.primary);
-    textLeft(
-      ctx,
-      "ciyi.猜 山水",
-      ix + s(96),
-      y + s(24),
-      `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`,
-      C.onSurface
-    );
-    textLeftFit(
-      ctx,
-      `开题并报一个两字词${opts.middleware ? "；开题后可直接发词" : ""}`,
-      ix + s(230),
-      y + s(24),
-      iw - s(268),
-      `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
-      C.onSurface
-    );
-    textLeft(ctx, "切换", ix + s(38), y + s(52), `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, C.primary);
-    textLeft(
-      ctx,
-      "ciyi.裸词 开/关",
-      ix + s(96),
-      y + s(52),
-      `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`,
-      C.onSurface
-    );
-    textLeftFit(
-      ctx,
-      "临时改本频道的续猜方式",
-      ix + s(230),
-      y + s(52),
-      iw - s(268),
-      `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
-      C.onSurface
-    );
-    textLeft(ctx, "排行", ix + s(38), y + s(80), `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, C.primary);
-    textLeft(
-      ctx,
-      "ciyi.排行榜",
-      ix + s(96),
-      y + s(80),
-      `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`,
-      C.onSurface
-    );
-    textLeft(
-      ctx,
-      "看谁猜中得最多",
-      ix + s(230),
-      y + s(80),
-      `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
-      C.onSurface
-    );
-    y += p1h + s(19);
-    y += drawSectionTitle(ctx, ix + s(22), y, iw - s(44), "读板");
-    y += s(11);
-    const sampleH = s(172);
-    drawPanel(ctx, ix + s(22), y, iw - s(44), sampleH);
-    drawBoardTable(
-      ctx,
-      ix + s(22),
-      y + s(10),
-      iw - s(44),
-      {
-        rows: [{ history: { guess: "企业", rank: 467, leftHint: "良好", rightHint: "地产" } }],
-        total: opts.total,
-        attempts: 1,
-        tip: ""
-      },
-      s(50)
-    );
-    textLeft(
-      ctx,
-      "这一行是说：「企业」与今日答案的意思相近程度，排在第 467 位。",
-      ix + s(38),
-      y + s(104),
-      `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`,
-      C.onSurfaceVariant
-    );
-    textLeft(
-      ctx,
-      "两侧空格各藏一字：左邻更近，右邻更远。",
-      ix + s(38),
-      y + s(126),
-      `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`,
-      C.onSurfaceVariant
-    );
-    textLeft(
-      ctx,
-      "名次越小，离答案越近；#1 就是答案本身。",
-      ix + s(38),
-      y + s(148),
-      `${s(TYPE.bodySmall.size)}px ${FONT_SANS}`,
-      C.onSurfaceVariant
-    );
-    y += sampleH + s(19);
-    y += drawSectionTitle(ctx, ix + s(22), y, iw - s(44), "亲疏");
-    y += s(11);
-    const tierH = s(112);
-    drawPanel(ctx, ix + s(22), y, iw - s(44), tierH);
-    drawLegendFull(ctx, ix + s(38), y + s(18), iw - s(80));
-    y += tierH;
-    drawFooter(
-      ctx,
-      ix,
-      iy + ih - s(60),
-      iw,
-      [],
-      "词库与语义排序来自「词影」"
-    );
-    textLeft(
-      ctx,
-      "一日一词，猜中即止，次日零点换题",
-      ix + s(22),
-      iy + ih - s(30),
-      `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
-      C.onSurfaceVariant
-    );
+    y += usageH + s(L.gap);
+    y += drawSectionTitle(ctx, x, y, "读板");
+    drawPanel(ctx, x, y, w, readH);
+    let ry = y + s(panelPad);
+    ry += drawBoardTable(ctx, x + s(panelPad), ry, w - s(panelPad) * 2, sample, opts.total) + s(12);
+    for (const note of notes) {
+      textLeftFit(ctx, note, x + s(panelPad), ry + s(noteLine) / 2, w - s(panelPad) * 2, `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
+      ry += s(noteLine);
+    }
+    y += readH + s(L.gap);
+    y += drawSectionTitle(ctx, x, y, "亲疏");
+    drawPanel(ctx, x, y, w, tierH);
+    const colW = (w - s(panelPad) * 2) / 2;
+    const fs = s(TYPE.bodyMedium.size);
+    TIERS.forEach((tier, i) => {
+      const cx = x + s(panelPad) + i % 2 * colW;
+      const cy = y + s(panelPad) + s(legendRow) * (Math.floor(i / 2) + 0.5);
+      fillRound(ctx, cx, cy - s(5), s(10), s(10), s(SHAPE.full), tier.color);
+      textLeft(ctx, tier.name, cx + s(18), cy, `${EMPHASIZED_WEIGHT.label} ${fs}px ${FONT_SANS}`, tier.color);
+      textLeft(ctx, tierRange(i), cx + s(60), cy, `${fs}px ${FONT_NUM}`, C.onSurfaceVariant);
+      textLeftFit(ctx, tier.note, cx + s(124), cy, colW - s(132), `${fs}px ${FONT_SANS}`, C.onSurfaceVariant);
+    });
+    drawFooter(ctx, ix, iy, iw, ih, footer);
   });
 }
 __name(renderIntroCard, "renderIntroCard");
 function renderWinCard(service, opts) {
-  const innerW = s(720);
-  const innerH = s(420);
+  const innerW = s(BOARD_W);
+  const quip = opts.closest === null ? "一击即中，今日无需第二次落笔" : `从 #${opts.closest} 一步跨到 #1`;
+  const footer = [
+    { left: `${opts.username} 拿下今日一词 · ${quip}` },
+    { left: opts.canStartToday ? "发送「ciyi.猜 两字词」开启今日新题" : "明日零点换新题 · 发送「ciyi.排行榜」看看榜单" }
+  ];
+  const panelPad = 20;
+  const labelH = 20;
+  const answerW = gridWidth(opts.answer, "lg");
+  const chipH = 32;
+  const chipGap = 8;
+  const chipFs = s(TYPE.labelLarge.size);
+  const w = innerW - s(L.pad) * 2;
+  const rightX = s(panelPad) + answerW + s(32);
+  const rightW = w - rightX - s(panelPad);
+  const chips = [];
+  let cx = 0;
+  let row = 0;
+  for (const word of opts.neighbors) {
+    const fitted = ellipsize(word, s(120), chipFs);
+    const cw = textWidth(fitted, chipFs) + s(28);
+    if (cx > 0 && cx + cw > rightW) {
+      cx = 0;
+      row += 1;
+    }
+    chips.push({ word: fitted, x: cx, row, w: cw });
+    cx += cw + s(chipGap);
+  }
+  const chipRows = chips.length ? row + 1 : 1;
+  const leftH = s(labelH) + s(12) + s(GRID.lg.cell);
+  const rightH = s(labelH) + s(12) + chipRows * s(chipH) + (chipRows - 1) * s(chipGap);
+  const revealH = s(panelPad) * 2 + Math.max(leftH, rightH);
+  const statH = 76;
+  const innerH = s(HEADER_H) + s(L.gap) + revealH + s(12) + s(statH) + s(L.gap) + footerHeight(innerW, footer);
   return toPng(service, innerW, innerH, (ctx, ix, iy, iw, ih) => {
-    let y = iy + drawHeader(ctx, ix, iy, iw, "每日挑战 · 已封题");
-    y += s(20);
-    const revealH = s(130);
-    drawPanel(ctx, ix + s(22), y, iw - s(44), revealH);
-    drawSeal(ctx, ix + iw - s(80), y - s(13), s(42), ["中"]);
-    textLeft(ctx, "今日答案", ix + s(38), y + s(24), `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
-    drawWordGrid(ctx, ix + s(38), y + s(40), opts.answer, "lg");
-    const ax = ix + iw - s(310);
-    if (opts.neighbors.length) {
-      textLeft(ctx, "意思最近的几个词", ax, y + s(24), `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
-      let nx = ax;
-      let ny = y + s(48);
-      const chipFont = `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`;
-      const chipRight = ix + iw - s(38);
-      for (const word of opts.neighbors) {
-        const fittedWord = ellipsize(word, s(116), s(TYPE.labelLarge.size));
-        const pw = textWidth(fittedWord, s(TYPE.labelLarge.size)) + s(20);
-        if (nx !== ax && nx + pw > chipRight) {
-          nx = ax;
-          ny += s(36);
-        }
-        if (ny + s(14) > y + revealH - s(12)) break;
-        fillRound(ctx, nx, ny - s(14), pw, s(28), s(SHAPE.full), C.secondaryContainer);
-        textCenter(
-          ctx,
-          fittedWord,
-          nx + pw / 2,
-          ny,
-          chipFont,
-          C.onSecondaryContainer,
-          cjkOffset(s(TYPE.labelLarge.size))
-        );
-        nx += pw + s(7);
+    const x = ix + s(L.pad);
+    let y = iy + drawHeader(ctx, ix, iy, iw, "每日挑战 · 已猜中");
+    y += s(L.gap);
+    drawPanel(ctx, x, y, w, revealH);
+    const top = y + s(panelPad);
+    const labelFont = `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`;
+    textLeft(ctx, "今日答案", x + s(panelPad), top + s(labelH) / 2, labelFont, C.onSurfaceVariant);
+    drawWordGrid(ctx, x + s(panelPad), top + s(labelH) + s(12), opts.answer, "lg");
+    const rx = x + rightX;
+    if (chips.length) {
+      textLeft(ctx, "意思最近的词", rx, top + s(labelH) / 2, labelFont, C.onSurfaceVariant);
+      const chipTop = top + s(labelH) + s(12);
+      for (const chip of chips) {
+        const cy = chipTop + chip.row * (s(chipH) + s(chipGap));
+        fillRound(ctx, rx + chip.x, cy, chip.w, s(chipH), s(SHAPE.full), C.secondaryContainer);
+        textCenter(ctx, chip.word, rx + chip.x + chip.w / 2, cy + s(chipH) / 2, `${chipFs}px ${FONT_SANS}`, C.onSecondaryContainer, cjkOffset(chipFs));
       }
     } else {
-      textLeft(
-        ctx,
-        "今日一词，就此收笔。",
-        ax,
-        y + s(50),
-        `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
-        C.onSurfaceVariant
-      );
+      textLeft(ctx, "今日一词，就此收笔。", rx, top + s(labelH) + s(12) + s(GRID.lg.cell) / 2, `${s(TYPE.bodyLarge.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
     }
-    y += revealH + s(14);
-    const statW = (iw - s(44) - s(20)) / 3;
+    y += revealH + s(12);
     const stats = [
       { n: String(opts.attempts), u: "次", c: "本局猜测" },
       { n: opts.closest === null ? "—" : `#${opts.closest}`, u: "", c: "此前最接近" },
       { n: String(opts.score), u: "次", c: "累计猜中" }
     ];
-    for (let i = 0; i < 3; i++) {
-      const sx = ix + s(22) + i * (statW + s(10));
-      drawPanel(ctx, sx, y, statW, s(56));
-      textLeft(
-        ctx,
-        stats[i].n,
-        sx + s(14),
-        y + s(22),
-        `${EMPHASIZED_WEIGHT.headline} ${s(TYPE.headlineSmall.size)}px ${FONT_NUM}`,
-        C.primary
-      );
-      if (stats[i].u) {
-        textLeft(
-          ctx,
-          stats[i].u,
-          sx + s(14) + textWidth(stats[i].n, s(TYPE.headlineSmall.size)) + s(3),
-          y + s(26),
-          `${s(TYPE.labelMedium.size)}px ${FONT_SANS}`,
-          C.onSurfaceVariant
-        );
-      }
-      textLeft(
-        ctx,
-        stats[i].c,
-        sx + s(14),
-        y + s(44),
-        `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
-        C.onSurfaceVariant
-      );
-    }
-    const quip = opts.closest === null ? "一击即中，今日无需第二次落笔" : `从 #${opts.closest} 一步跨到 #1`;
-    const footerTip = opts.canStartToday ? "ciyi.猜 山水 · 开启今日新题" : "明日零点换新题 · ciyi.排行榜";
-    drawFooter(
-      ctx,
-      ix,
-      iy + ih - s(60),
-      iw,
-      [],
-      footerTip
-    );
-    const footerFont = `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`;
-    const footerTipWidth = textWidth(footerTip, s(TYPE.labelSmall.size));
-    textLeftFit(
-      ctx,
-      `${opts.username} 拿下今日一词 · ${quip}`,
-      ix + s(22),
-      iy + ih - s(30),
-      iw - s(62) - footerTipWidth,
-      footerFont,
-      C.onSurfaceVariant
-    );
+    const statW = (w - s(12) * 2) / 3;
+    stats.forEach((stat, i) => {
+      const sx = x + i * (statW + s(12));
+      drawPanel(ctx, sx, y, statW, s(statH));
+      const numFs = s(TYPE.headlineSmall.size);
+      textLeft(ctx, stat.n, sx + s(16), y + s(28), `${EMPHASIZED_WEIGHT.headline} ${numFs}px ${FONT_NUM}`, C.primary);
+      if (stat.u) textLeft(ctx, stat.u, sx + s(16) + textWidth(stat.n, numFs) + s(4), y + s(31), `${s(TYPE.labelLarge.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
+      textLeft(ctx, stat.c, sx + s(16), y + s(56), `${s(TYPE.labelMedium.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
+    });
+    drawFooter(ctx, ix, iy, iw, ih, footer);
   });
 }
 __name(renderWinCard, "renderWinCard");
 function renderRankCard(service, opts) {
-  const innerW = s(640);
-  const rankPadX = s(32);
-  const rankInnerPad = s(20);
-  const headerH = s(87);
-  const contentGap = s(20);
-  const rowH = s(52);
-  const emptyH = s(92);
-  const hiddenH = opts.hidden > 0 ? s(36) : 0;
-  const footerGap = s(20);
-  const footerH = s(60);
-  const contentH = opts.entries.length ? opts.entries.length * rowH + hiddenH : emptyH;
-  const innerH = headerH + contentGap + contentH + footerGap + footerH;
+  const innerW = s(600);
+  const footer = [{ left: "每猜中一日之词，记一次", right: "发送「ciyi.猜 两字词」参与" }];
+  const rowH = 56;
+  const hiddenH = opts.hidden > 0 ? 40 : 0;
+  const emptyH = 96;
+  const contentH = opts.entries.length ? s(8) * 2 + opts.entries.length * s(rowH) + s(hiddenH) : s(emptyH);
+  const innerH = s(HEADER_H) + s(L.gap) + contentH + s(L.gap) + footerHeight(innerW, footer);
   return toPng(service, innerW, innerH, (ctx, ix, iy, iw, ih) => {
-    const panelX = ix + rankPadX;
-    const panelW = iw - rankPadX * 2;
-    const contentLeft = panelX + rankInnerPad;
-    const contentRight = panelX + panelW - rankInnerPad;
-    let y = iy + drawHeader(ctx, ix, iy, iw, "每日挑战 · 累计猜中", {
-      big: String(opts.players),
-      cap: "上榜人数"
-    });
-    y += s(20);
-    drawPanel(ctx, panelX, y, panelW, contentH);
+    const x = ix + s(L.pad);
+    const w = iw - s(L.pad) * 2;
+    let y = iy + drawHeader(ctx, ix, iy, iw, "每日挑战 · 累计猜中", { big: String(opts.players), cap: "上榜人数" });
+    y += s(L.gap);
+    drawPanel(ctx, x, y, w, contentH);
     if (!opts.entries.length) {
-      textCenter(
-        ctx,
-        "排行榜还空着",
-        panelX + panelW / 2,
-        y + s(31),
-        `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
-        C.onSurfaceVariant
-      );
-      textCenter(
-        ctx,
-        "今日第一个猜中的人，会写在这里。",
-        panelX + panelW / 2,
-        y + s(61),
-        `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`,
-        C.onSurfaceVariant
-      );
+      textCenter(ctx, "排行榜还空着", x + w / 2, y + s(34), `${EMPHASIZED_WEIGHT.title} ${s(TYPE.titleMedium.size)}px ${FONT_SANS}`, C.onSurface);
+      textCenter(ctx, "今日第一个猜中的人，会写在这里。", x + w / 2, y + s(62), `${s(TYPE.bodyMedium.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
     } else {
-      let ry = y;
-      for (let i = 0; i < opts.entries.length; i++) {
-        const e = opts.entries[i];
-        const midY = ry + rowH / 2;
-        if (e.me) {
-          fillRound(ctx, panelX, ry, panelW, rowH, s(SHAPE.medium), FRESH);
-        }
-        if (i > 0) {
-          ctx.strokeStyle = C.outlineVariant;
-          ctx.beginPath();
-          ctx.moveTo(contentLeft, ry);
-          ctx.lineTo(contentRight, ry);
-          ctx.stroke();
-        }
-        const posSize = s(30);
-        const px = contentLeft;
-        const py = midY - posSize / 2;
+      const left = x + s(16);
+      const right = x + w - s(16);
+      let ry = y + s(8);
+      opts.entries.forEach((e, i) => {
+        const midY = ry + s(rowH) / 2;
+        if (e.me) fillRound(ctx, x + s(6), ry + s(3), w - s(12), s(rowH) - s(6), s(SHAPE.medium), FRESH);
+        if (i > 0 && !e.me && !opts.entries[i - 1].me) hline(ctx, left, right, ry, C.outlineVariant);
         const podium = [MEDAL.gold, MEDAL.silver, MEDAL.bronze];
         const pc = i < 3 ? { bg: podium[i], fg: onColor(podium[i]) } : { bg: C.surfaceContainerHighest, fg: C.onSurfaceVariant };
-        fillRound(ctx, px, py, posSize, posSize, s(SHAPE.full), pc.bg);
-        textCenter(
-          ctx,
-          String(i + 1),
-          px + posSize / 2,
-          midY,
-          `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelLarge.size)}px ${FONT_NUM}`,
-          pc.fg
-        );
-        const name2 = e.username || "无名氏";
-        const nameX = px + posSize + s(14);
-        const nameFont = `${s(TYPE.titleMedium.size)}px ${FONT_SANS}`;
+        const pos = s(32);
+        fillRound(ctx, left, midY - pos / 2, pos, pos, s(SHAPE.full), pc.bg);
+        textCenter(ctx, String(i + 1), left + pos / 2, midY, `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelLarge.size)}px ${FONT_NUM}`, pc.fg);
         const score = String(e.score);
-        const unitFont = s(TYPE.labelSmall.size);
-        const unitW = textWidth("次", unitFont);
-        const scoreFont = s(TYPE.titleLarge.size);
-        const scoreRight = contentRight - unitW - s(8);
-        const scoreLeft = scoreRight - textWidth(score, scoreFont);
-        const meWidth = e.me ? textWidth("我", s(TYPE.labelSmall.size)) + s(18) : 0;
-        const fittedName = ellipsize(
-          name2,
-          Math.max(0, scoreLeft - s(16) - nameX - meWidth),
-          s(TYPE.titleMedium.size)
-        );
-        textLeft(ctx, fittedName, nameX, midY, nameFont, C.onSurface);
+        const scoreFs = s(TYPE.titleLarge.size);
+        const unitFs = s(TYPE.labelLarge.size);
+        const scoreRight = right - textWidth("次", unitFs) - s(6);
+        const nameX = left + pos + s(14);
+        const meW = e.me ? textWidth("我", s(TYPE.labelMedium.size)) + s(20) : 0;
+        const nameFs = s(TYPE.titleMedium.size);
+        const name2 = ellipsize(e.username || "无名氏", scoreRight - textWidth(score, scoreFs) - s(20) - nameX - meW, nameFs);
+        textLeft(ctx, name2, nameX, midY, `${nameFs}px ${FONT_SANS}`, C.onSurface);
         if (e.me) {
-          const nw = textWidth(fittedName, s(TYPE.titleMedium.size));
-          textLeft(
-            ctx,
-            "我",
-            nameX + nw + s(8),
-            midY,
-            `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
-            C.primary
-          );
+          const bx = nameX + textWidth(name2, nameFs) + s(8);
+          fillRound(ctx, bx, midY - s(10), meW - s(8), s(20), s(SHAPE.full), C.primary);
+          textCenter(ctx, "我", bx + (meW - s(8)) / 2, midY, `${EMPHASIZED_WEIGHT.label} ${s(TYPE.labelMedium.size)}px ${FONT_SANS}`, C.onPrimary);
         }
-        textRight(
-          ctx,
-          score,
-          scoreRight,
-          midY,
-          `${EMPHASIZED_WEIGHT.title} ${scoreFont}px ${FONT_NUM}`,
-          C.onSurface
-        );
-        textRight(ctx, "次", contentRight, midY, `${unitFont}px ${FONT_SANS}`, C.onSurfaceVariant);
-        ry += rowH;
-      }
+        textRight(ctx, score, scoreRight, midY, `${EMPHASIZED_WEIGHT.title} ${scoreFs}px ${FONT_NUM}`, C.onSurface);
+        textRight(ctx, "次", right, midY, `${unitFs}px ${FONT_SANS}`, C.onSurfaceVariant);
+        ry += s(rowH);
+      });
       if (opts.hidden > 0) {
-        textLeft(
-          ctx,
-          `…… 另有 ${opts.hidden} 人在榜`,
-          contentLeft,
-          ry + s(16),
-          `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
-          C.onSurfaceVariant
-        );
+        textCenter(ctx, `另有 ${opts.hidden} 人在榜`, x + w / 2, ry + s(hiddenH) / 2, `${s(TYPE.labelMedium.size)}px ${FONT_SANS}`, C.onSurfaceVariant);
       }
     }
-    drawFooter(
-      ctx,
-      ix,
-      iy + ih - s(60),
-      iw,
-      [],
-      "ciyi.猜 山水"
-    );
-    textLeft(
-      ctx,
-      "每猜中一日之词，记一次",
-      panelX,
-      iy + ih - s(30),
-      `${s(TYPE.labelSmall.size)}px ${FONT_SANS}`,
-      C.onSurfaceVariant
-    );
+    drawFooter(ctx, ix, iy, iw, ih, footer);
   });
 }
 __name(renderRankCard, "renderRankCard");
@@ -6217,7 +5930,6 @@ function resolveMiddlewareSwitch(config, override, action) {
 }
 __name(resolveMiddlewareSwitch, "resolveMiddlewareSwitch");
 function apply(ctx, cfg) {
-  const presentation = usePresentation(ctx, "ciyi");
   ctx.model.extend(
     "ciyi",
     {
@@ -6490,7 +6202,7 @@ function apply(ctx, cfg) {
   async function send(session, content) {
     const ids = await session.send(content);
     const messageId = ids?.[0];
-    if (presentation.textOnly(session) || !cfg.retractDelay || !messageId) return;
+    if (!cfg.retractDelay || !messageId) return;
     const previous = lastMessage.get(session.channelId);
     if (previous) {
       const passed = Date.now() - previous.timestamp;
@@ -6504,12 +6216,12 @@ function apply(ctx, cfg) {
   }
   __name(send, "send");
   async function sendCard(session, render, fallback) {
-    const image = presentation.textOnly(session) ? null : await renderCard(render);
+    const image = await renderCard(render);
     const prefix = [];
     if (cfg.quoteReply && session.messageId) prefix.push(import_koishi2.h.quote(session.messageId));
     if (cfg.atReply) prefix.push(import_koishi2.h.at(session.userId), (0, import_koishi2.h)("p"));
     if (image) {
-      await send(session, [...prefix, ...import_koishi2.h.normalize(presentation.present(session, image, import_koishi2.h.text(fallback)))]);
+      await send(session, [...prefix, ...import_koishi2.h.normalize(present(image, import_koishi2.h.text(fallback)))]);
       return;
     }
     await send(session, [...prefix, import_koishi2.h.text(fallback)]);

package/lib/ux.d.ts

@@ -3,29 +3,11 @@ type Owner = {
     name: string;
     matches: (session: Session) => boolean | Promise<boolean>;
 };
-/** 图文模式默认只发渲染图；完整文字只在用户切到「文字」模式时出现。偏好只影响本人。 */
-export declare function usePresentation(ctx: Context, command: string): {
-    textOnly: (session: Session) => boolean;
-    /** 图文模式只给图片；图片缺失或用户选了文字模式时才退回文字。 */
-    present(session: Session, image: h.Fragment | null | undefined, text: h.Fragment): h.Fragment;
-};
+/** 渲染图优先，只发图片；图片缺失时才退回等价文字。 */
+export declare function present(image: h.Fragment | null | undefined, text: h.Fragment): h.Fragment;
 /** Plugins register their active input grammar; overlapping messages are never executed. */
 export declare function registerDirectInput(ctx: Context, name: string, matches: Owner['matches']): void;
 export declare function directInputConflict(ctx: Context, session: Session): Promise<boolean>;
-/** No hidden time limit: users can extend the non-game input step without losing context. */
-export declare function promptInput(session: Session, instruction: string): Promise<string | undefined>;
-export declare const IMAGE_FAILURE = "\u56FE\u7247\u6682\u65F6\u65E0\u6CD5\u751F\u6210\uFF0C\u5DF2\u4FDD\u7559\u6587\u5B57\u5185\u5BB9\u3002\u53EF\u4EE5\u7A0D\u540E\u91CD\u8BD5\uFF1B\u82E5\u6301\u7EED\u5931\u8D25\uFF0C\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002";
-/**
- * 渲染图的等价文字。图文模式随图片一起丢掉、文字模式展开成正文，
- * 因此它永远不会原样发到聊天平台。
- */
-export declare const IMAGE_TEXT_TYPE = "ux-image-text";
-export declare function imageText(text: h.Fragment): h;
-/** 图文模式：保留图片与普通文字，去掉图片的等价文字。 */
-export declare function imagesOnly(content: h.Fragment): h[];
-/** 文字模式：去掉图片，把等价文字展开成普通文本。 */
-export declare function withoutImages(content: h.Fragment): h[];
-/** 发送前的统一选择：文字模式去掉图片，图文模式去掉等价文字。 */
-export declare function choosePresentation(content: h.Fragment, textOnly: boolean): h[];
-export declare function isTextOnly(ctx: Context, session: Session): boolean;
+/** 等待下一句回复。提问本身已经写明了可回复的内容与「取消」，这里不再追加说明。 */
+export declare function promptInput(session: Session): Promise<string | undefined>;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-ciyi",
   "description": "Koishi 群聊猜词：每天一个两字词，支持续猜和排行榜。",
-  "version": "2.2.1",
+  "version": "2.3.0",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [