@zhin.js/plugin-idiom-chain 1.1.17 → 1.1.19

package/lib/session-service.js

@@ -1,4 +1,4 @@
-import { BaseSessionService, channelKey, generateSessionId, } from '@zhin.js/game-kit';
+import { BaseSessionService, generateSessionId, } from '@zhin.js/game-kit';
 export function parseUsed(value) {
     if (Array.isArray(value))
         return new Set(value.filter((x) => typeof x === 'string'));
@@ -28,13 +28,8 @@ export class SessionService extends BaseSessionService {
         const row = {
             id: generateSessionId(),
             locale: message.locale ?? 'zh-CN',
-            adapter: String(message.$adapter),
-            endpoint: message.$endpoint,
-            channel_type: message.$channel.type,
-            channel_id: message.$channel.id,
-            channel_key: channelKey(message),
-            player_id: message.$sender.id,
-            player_name: message.$sender.name?.trim() || message.$sender.id,
+            player_id: message.sender.id,
+            player_name: message.sender.name?.trim() || message.sender.id,
             last_idiom: starter.text,
             next_char: starter.nextChar,
             match_mode: starter.matchMode,
@@ -50,7 +45,7 @@ export class SessionService extends BaseSessionService {
             updated_at: now,
             created_at: now,
         };
-        return this.createRow(row);
+        return this.createRow({ target: message.target, fields: row });
     }
 }
 export function createServices(db) {

package/lib/session-service.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-service.js","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,UAAU,EACV,iBAAiB,GAGlB,MAAM,mBAAmB,CAAC;AAM3B,MAAM,UAAU,SAAS,CAAC,KAAkC;IAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC;IAClG,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC;IAC1D,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;IACrG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAgB;IAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,kBAAmC;IACrE,YAAY,EAAiB;QAC3B,KAAK,CAAC,EAAqD,EAAE;YAC3D,MAAM,EAAE,OAAO;YACf,KAAK,EAAE,sBAAsB;YAC7B,UAAU,EAAE,CAAC,WAAW,CAAC;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,OAAwB,EACxB,OAAiF;QAEjF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAoB;YAC3B,EAAE,EAAE,iBAAiB,EAAE;YACvB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO;YACjC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;YACjC,QAAQ,EAAE,OAAO,CAAC,SAAS;YAC3B,YAAY,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI;YACnC,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE;YAC/B,WAAW,EAAE,UAAU,CAAC,OAAO,CAAC;YAChC,SAAS,EAAE,OAAO,CAAC,OAAO,CAAC,EAAE;YAC7B,WAAW,EAAE,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC/D,UAAU,EAAE,OAAO,CAAC,IAAI;YACxB,SAAS,EAAE,OAAO,CAAC,QAAQ;YAC3B,UAAU,EAAE,OAAO,CAAC,SAAS;YAC7B,WAAW,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,YAAY,EAAE,CAAC;YACf,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,CAAC;YACd,WAAW,EAAE,CAAC;YACd,UAAU,EAAE,CAAC;YACb,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,QAAQ;YAChB,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,GAAG;SAChB,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,EAAiB;IAC9C,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC"}
+{"version":3,"file":"session-service.js","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,kBAAkB,EAClB,iBAAiB,GAGlB,MAAM,mBAAmB,CAAC;AAM3B,MAAM,UAAU,SAAS,CAAC,KAAkC;IAC1D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC;IAClG,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,GAAG,EAAE,CAAC;IAC1D,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,CAAC;IACrG,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,GAAG,EAAE,CAAC;IACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,GAAgB;IAC5C,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,kBAAmC;IACrE,YAAY,EAAiB;QAC3B,KAAK,CAAC,EAAqD,EAAE;YAC3D,MAAM,EAAE,OAAO;YACf,KAAK,EAAE,sBAAsB;YAC7B,UAAU,EAAE,CAAC,WAAW,CAAC;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,OAAmB,EACnB,OAAiF;QAEjF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,GAAG,GAAkG;YACzG,EAAE,EAAE,iBAAiB,EAAE;YACvB,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,OAAO;YACjC,SAAS,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE;YAC5B,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,OAAO,CAAC,MAAM,CAAC,EAAE;YAC7D,UAAU,EAAE,OAAO,CAAC,IAAI;YACxB,SAAS,EAAE,OAAO,CAAC,QAAQ;YAC3B,UAAU,EAAE,OAAO,CAAC,SAAS;YAC7B,WAAW,EAAE,aAAa,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YACjD,YAAY,EAAE,CAAC;YACf,SAAS,EAAE,CAAC;YACZ,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,CAAC;YACd,WAAW,EAAE,CAAC;YACd,UAAU,EAAE,CAAC;YACb,IAAI,EAAE,QAAQ;YACd,MAAM,EAAE,QAAQ;YAChB,UAAU,EAAE,GAAG;YACf,UAAU,EAAE,GAAG;SAChB,CAAC;QACF,OAAO,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;IACjE,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAAC,EAAiB;IAC9C,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC"}

package/middlewares/chain-alias/index.js

@@ -1,20 +1,24 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineGameCommandAliasMiddleware, isChainAction, messageFromCommandInput, normalizeChainAction, } from '@zhin.js/game-kit';
+import { replyGameOperation, defineGameCommandAliasMiddleware, isChainAction, gamePlayerFromInput, normalizeChainAction, } from '@zhin.js/game-kit';
 import { getChainHelp, runChainCommand } from "../../lib/chain-command.js";
 import { resolveGameServices } from "../../lib/runtime-store.js";
 export default defineGameCommandAliasMiddleware({
     aliases: ['接龙', 'chain'],
     async run(action, input, context) {
-        const message = messageFromCommandInput(input, {
-            formatCommand: (path) => context.input.formatCommand?.(path, context.owner.id),
-        });
+        const presentation = { locale: context.input.locale,
+            formatCommand: (path) => context.input.formatCommand?.(path, context.owner.id) };
         const normalized = normalizeChainAction(String(action ?? ''));
-        if (normalized === 'help')
-            return getChainHelp(message);
+        if (normalized === 'help') {
+            await context.input.$reply(getChainHelp(presentation));
+            return true;
+        }
         // action 无法识别：放行给后续中间件，避免劫持普通聊天
         if (!isChainAction(normalized))
-            return null;
+            return false;
+        const message = gamePlayerFromInput(input, presentation);
         const services = resolveGameServices(context);
-        return runChainCommand(services, message, normalized);
+        await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+            run: () => runChainCommand(services, message, normalized) });
+        return true;
     },
 });

package/middlewares/chain-alias/index.ts

@@ -1,7 +1,8 @@
 import {
+  replyGameOperation,
   defineGameCommandAliasMiddleware,
   isChainAction,
-  messageFromCommandInput,
+  gamePlayerFromInput,
   normalizeChainAction,
 } from '@zhin.js/game-kit';
 import { getChainHelp, runChainCommand } from '../../src/chain-command.js';
@@ -10,14 +11,17 @@ import { resolveGameServices } from '../../src/runtime-store.js';
 export default defineGameCommandAliasMiddleware({
   aliases: ['接龙', 'chain'],
   async run(action, input, context) {
-    const message = messageFromCommandInput(input, {
-      formatCommand: (path) => context.input.formatCommand?.(path, context.owner.id),
-    });
+    const presentation = { locale: context.input.locale,
+      formatCommand: (path: string) => context.input.formatCommand?.(path, context.owner.id) };
+
     const normalized = normalizeChainAction(String(action ?? ''));
-    if (normalized === 'help') return getChainHelp(message);
+    if (normalized === 'help') { await context.input.$reply(getChainHelp(presentation)); return true; }
     // action 无法识别：放行给后续中间件，避免劫持普通聊天
-    if (!isChainAction(normalized)) return null;
+    if (!isChainAction(normalized)) return false;
+    const message = gamePlayerFromInput(input, presentation);
     const services = resolveGameServices(context);
-    return runChainCommand(services, message, normalized);
+    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => runChainCommand(services, message, normalized) });
+    return true;
   },
 });

package/middlewares/chain-text/index.js

@@ -1,6 +1,6 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { replyGameOperation, buildChoiceFallbackMap, channelKey, gamePlayerFromInput, parseChoicePayload, resolveGameTextPayload, } from '@zhin.js/game-kit';
 import { defineMiddleware } from 'zhin.js/middleware';
-import { buildChoiceFallbackMap, channelKey, messageFromCommandInput, parseChoicePayload, resolveGameTextPayload, } from '@zhin.js/game-kit';
 import { resolveGameServices } from "../../lib/runtime-store.js";
 import { CHAIN_PREFIX, handleChoice, processIdiomText } from "../../lib/game-flow.js";
 /**
@@ -10,13 +10,17 @@ import { CHAIN_PREFIX, handleChoice, processIdiomText } from "../../lib/game-flo
 export default defineMiddleware({
     target: 'inbound',
     async handle(context, next) {
+        if (!context.input.sender?.id) {
+            await next();
+            return;
+        }
         const raw = context.input.content?.trim() ?? '';
         if (!raw) {
             await next();
             return;
         }
         const services = resolveGameServices(context);
-        const message = messageFromCommandInput(context.input);
+        const message = gamePlayerFromInput(context.input);
         const ch = channelKey(message);
         // 直接 payload（QQ 指令预填 / Sandbox action→text）
         const payloadFromText = resolveGameTextPayload(raw);
@@ -25,16 +29,15 @@ export default defineMiddleware({
             if (parsed) {
                 const session = await services.getById(parsed.sessionId);
                 if (session?.channel_key === ch) {
-                    const reply = await handleChoice(services, message, parsed.sessionId, parsed.choiceId);
-                    if (reply)
-                        await context.input.$reply(reply);
+                    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+                        run: () => handleChoice(services, message, parsed.sessionId, parsed.choiceId) });
                     return;
                 }
             }
             await next();
             return;
         }
-        const session = await services.getActiveForUser(ch, message.$sender.id);
+        const session = await services.getActiveForUser(ch, message.sender.id);
         if (!session) {
             await next();
             return;
@@ -48,17 +51,15 @@ export default defineMiddleware({
             const payload = resolveGameTextPayload(raw, map);
             const parsed = payload ? parseChoicePayload(payload, CHAIN_PREFIX) : null;
             if (parsed?.sessionId === session.id) {
-                const reply = await handleChoice(services, message, session.id, parsed.choiceId);
-                if (reply)
-                    await context.input.$reply(reply);
+                await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+                    run: () => handleChoice(services, message, session.id, parsed.choiceId) });
                 return;
             }
         }
         // 仅把 2-8 个汉字的纯文本当成语作答，其余放行
         if (/^[\u4e00-\u9fff]{2,8}$/.test(raw)) {
-            const reply = await processIdiomText(services, message, raw);
-            if (reply)
-                await context.input.$reply(reply);
+            await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+                run: () => processIdiomText(services, message, raw) });
             return;
         }
         await next();

package/middlewares/chain-text/index.ts

@@ -1,12 +1,13 @@
-import { defineMiddleware } from 'zhin.js/middleware';
-import type { Message } from '@zhin.js/core/runtime';
 import {
+  replyGameOperation,
   buildChoiceFallbackMap,
   channelKey,
-  messageFromCommandInput,
+  gamePlayerFromInput,
   parseChoicePayload,
   resolveGameTextPayload,
 } from '@zhin.js/game-kit';
+import { defineMiddleware } from 'zhin.js/middleware';
+import type { Message } from '@zhin.js/core/runtime';
 import { resolveGameServices } from '../../src/runtime-store.js';
 import { CHAIN_PREFIX, handleChoice, processIdiomText } from '../../src/game-flow.js';
 
@@ -17,13 +18,14 @@ import { CHAIN_PREFIX, handleChoice, processIdiomText } from '../../src/game-flo
 export default defineMiddleware<Message>({
   target: 'inbound',
   async handle(context, next) {
+    if (!context.input.sender?.id) { await next(); return; }
     const raw = context.input.content?.trim() ?? '';
     if (!raw) {
       await next();
       return;
     }
     const services = resolveGameServices(context);
-    const message = messageFromCommandInput(context.input);
+    const message = gamePlayerFromInput(context.input);
     const ch = channelKey(message);
 
     // 直接 payload（QQ 指令预填 / Sandbox action→text）
@@ -33,8 +35,8 @@ export default defineMiddleware<Message>({
       if (parsed) {
         const session = await services.getById(parsed.sessionId);
         if (session?.channel_key === ch) {
-          const reply = await handleChoice(services, message, parsed.sessionId, parsed.choiceId);
-          if (reply) await context.input.$reply(reply);
+          await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => handleChoice(services, message, parsed.sessionId, parsed.choiceId) });
           return;
         }
       }
@@ -42,7 +44,7 @@ export default defineMiddleware<Message>({
       return;
     }
 
-    const session = await services.getActiveForUser(ch, message.$sender.id);
+    const session = await services.getActiveForUser(ch, message.sender.id);
     if (!session) {
       await next();
       return;
@@ -57,16 +59,16 @@ export default defineMiddleware<Message>({
       const payload = resolveGameTextPayload(raw, map);
       const parsed = payload ? parseChoicePayload(payload, CHAIN_PREFIX) : null;
       if (parsed?.sessionId === session.id) {
-        const reply = await handleChoice(services, message, session.id, parsed.choiceId);
-        if (reply) await context.input.$reply(reply);
+        await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => handleChoice(services, message, session.id, parsed.choiceId) });
         return;
       }
     }
 
     // 仅把 2-8 个汉字的纯文本当成语作答，其余放行
     if (/^[\u4e00-\u9fff]{2,8}$/.test(raw)) {
-      const reply = await processIdiomText(services, message, raw);
-      if (reply) await context.input.$reply(reply);
+      await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => processIdiomText(services, message, raw) });
       return;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-idiom-chain",
-  "version": "1.1.17",
+  "version": "1.1.19",
   "description": "Zhin.js 成语接龙 — 四字成语文字接龙 (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -24,13 +24,13 @@
   "license": "MIT",
   "dependencies": {
     "chinese-idiom-chengyu": "^1.1.0",
-    "@zhin.js/core": "1.1.52",
-    "@zhin.js/game-kit": "1.1.17"
+    "@zhin.js/core": "1.1.54",
+    "@zhin.js/game-kit": "1.1.19"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "zhin.js": "1.1.17"
+    "zhin.js": "1.1.19"
   },
   "repository": {
     "type": "git",
@@ -67,9 +67,9 @@
     "plugins": []
   },
   "peerDependencies": {
-    "@zhin.js/command": "^1.1.11",
-    "@zhin.js/middleware": "^1.1.10",
-    "zhin.js": "^1.1.17"
+    "@zhin.js/command": "^1.1.12",
+    "@zhin.js/middleware": "^1.1.11",
+    "zhin.js": "^1.1.19"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {

package/src/chain-command.ts

@@ -1,4 +1,4 @@
-import { formatGameHelp, gameCommandFeedback, gameCommandHint, channelKey, type GameMessageLike, type GameReply } from '@zhin.js/game-kit';
+import { formatGameHelp, gameCommandFeedback, gameCommandHint, channelKey, type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import { createMessages } from 'zhin.js/i18n';
 import { continueGame, startGame } from './game-flow.js';
 import { idiomCount, modeLabel, promptLine, type MatchMode } from './engine.js';
@@ -15,10 +15,10 @@ const messages = createMessages({
   quit: { 'zh-CN': '已放弃成语接龙。', en: 'You quit the idiom chain.' },
 });
 
-export function getChainHelp(message: Pick<GameMessageLike, 'locale' | 'formatCommand'> = {}): string {
+export function getChainHelp(message: Pick<GamePlayer, 'locale' | 'formatCommand'> = {}): string {
   const locale = message.locale ?? 'zh-CN';
   const command = message.formatCommand?.('chain');
-  return [formatGameHelp(message, { 'zh-CN': '📜 成语接龙（文字接龙 · 四字成语）', en: '📜 Chinese Idiom Chain' }, 'chain', ['continue', 'quit']),
+  return [formatGameHelp({ presentation: message, title: { 'zh-CN': '📜 成语接龙（文字接龙 · 四字成语）', en: '📜 Chinese Idiom Chain' }, commandPath: 'chain', actions: ['continue', 'quit'] }),
     messages(locale, 'dictionary', { count: idiomCount() }),
     ...(command ? [messages(locale, 'pinyin', { command: command + ' start_pinyin' }), messages(locale, 'char', { command: command + ' start_char' })] : []),
     messages(locale, 'instructions'),
@@ -28,37 +28,39 @@ export const CHAIN_HELP = getChainHelp();
 
 export async function runChainCommand(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   action: string,
 ): Promise<GameReply> {
-  const ch = channelKey(message);
-  const userId = message.$sender.id;
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const ch = channelKey(message);
+    const userId = message.sender.id;
 
-  if (!action || action === 'help') {
-    const active = await services.getActiveByChannel(ch);
-    const lines = [getChainHelp(message), ''];
-    if (active) {
-      const mode: MatchMode = active.match_mode === 'char' ? 'char' : 'pinyin';
-      lines.push(
-        messages(active.locale ?? undefined, 'active', { player: active.player_name, mode: modeLabel(mode, active.locale ?? undefined), playerScore: active.player_score, botScore: active.bot_score, streak: active.streak }),
-      );
-      if (active.last_idiom) lines.push(promptLine(active.last_idiom, mode, active.locale ?? undefined));
-    } else {
-      lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'chain', 'start_pinyin'));
+    if (!action || action === 'help') {
+      const active = await services.getActiveByChannel(ch);
+      const lines = [getChainHelp(message), ''];
+      if (active) {
+        const mode: MatchMode = active.match_mode === 'char' ? 'char' : 'pinyin';
+        lines.push(
+          messages(active.locale ?? undefined, 'active', { player: active.player_name, mode: modeLabel(mode, active.locale ?? undefined), playerScore: active.player_score, botScore: active.bot_score, streak: active.streak }),
+        );
+        if (active.last_idiom) lines.push(promptLine(active.last_idiom, mode, active.locale ?? undefined));
+      } else {
+        lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'chain', 'start_pinyin'));
+      }
+      return lines.join('\n');
     }
-    return lines.join('\n');
-  }
 
-  if (action === 'start_pinyin') return (await startGame(services, message, 'pinyin')) ?? '';
-  if (action === 'start_char') return (await startGame(services, message, 'char')) ?? '';
-  if (action === 'continue') return continueGame(services, message);
+    if (action === 'start_pinyin') return (await startGame(services, message, 'pinyin')) ?? '';
+    if (action === 'start_char') return (await startGame(services, message, 'char')) ?? '';
+    if (action === 'continue') return continueGame(services, message);
 
-  if (action === 'quit') {
-    const row = await services.getActiveForUser(ch, userId);
-    if (!row) return gameCommandFeedback(message, 'noGame');
-    await services.updateSession(row.id, { status: 'aborted' });
-    return messages(row.locale ?? undefined, 'quit');
-  }
+    if (action === 'quit') {
+      const row = await services.getActiveForUser(ch, userId);
+      if (!row) return gameCommandFeedback(message, 'noGame');
+      await services.updateSession(row.id, { status: 'aborted' });
+      return messages(row.locale ?? undefined, 'quit');
+    }
 
-  return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getChainHelp(message);
+    return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getChainHelp(message);
+  } });
 }