@zhin.js/plugin-word-riddle 1.1.18 → 1.1.20

package/commands/riddle/[[action]]/index.js

@@ -1,17 +1,18 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { replyGameOperation, gamePlayerFromInput, normalizeRiddleAction } from '@zhin.js/game-kit';
 import { defineCommand } from 'zhin.js/command';
-import { messageFromCommandInput, normalizeRiddleAction } from '@zhin.js/game-kit';
 import { getRiddleHelp, runRiddleCommand } from "../../../lib/riddle-command.js";
 import { resolveGameServices } from "../../../lib/runtime-store.js";
 export default defineCommand({
     description: 'Word Riddle',
     params: { action: { type: 'string', default: '' } },
-    async execute({ params, input, use, locale, formatCommand }) {
+    async execute({ params, input, use, locale, formatCommand, session }) {
         const action = normalizeRiddleAction(String(params.action ?? ''));
         if (!action || action === 'help')
             return getRiddleHelp({ locale, formatCommand });
         const services = resolveGameServices({ use });
-        const message = messageFromCommandInput(input, { locale, formatCommand });
-        return runRiddleCommand(services, message, action);
+        const message = gamePlayerFromInput(input, { locale, formatCommand });
+        await replyGameOperation({ session: services, player: message, reply: session?.reply,
+            run: () => runRiddleCommand(services, message, action) });
     },
 });

package/commands/riddle/[[action]]/index.ts

@@ -1,16 +1,17 @@
+import { replyGameOperation, gamePlayerFromInput, normalizeRiddleAction } from '@zhin.js/game-kit';
 import { defineCommand } from 'zhin.js/command';
-import { messageFromCommandInput, normalizeRiddleAction } from '@zhin.js/game-kit';
 import { getRiddleHelp, runRiddleCommand } from '../../../src/riddle-command.js';
 import { resolveGameServices } from '../../../src/runtime-store.js';
 
 export default defineCommand({
   description: 'Word Riddle',
   params: { action: { type: 'string', default: '' } },
-  async execute({ params, input, use, locale, formatCommand }) {
+  async execute({ params, input, use, locale, formatCommand, session }) {
     const action = normalizeRiddleAction(String(params.action ?? ''));
     if (!action || action === 'help') return getRiddleHelp({ locale, formatCommand });
     const services = resolveGameServices({ use });
-    const message = messageFromCommandInput(input, { locale, formatCommand });
-    return runRiddleCommand(services, message, action);
+    const message = gamePlayerFromInput(input, { locale, formatCommand });
+    await replyGameOperation({ session: services, player: message, reply: session?.reply,
+      run: () => runRiddleCommand(services, message, action) });
   },
 });

package/lib/game-flow.d.ts

@@ -1,9 +1,9 @@
-import type { GameMessageLike, GameReply } from '@zhin.js/game-kit';
+import { type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import { RIDDLE_PREFIX } from './engine.js';
 import type { RiddleType } from './riddles-catalog.js';
 import { type SessionService } from './session-service.js';
-export declare function startGame(services: SessionService, message: GameMessageLike, mode: RiddleType): Promise<GameReply | undefined>;
-export declare function continueGame(services: SessionService, message: GameMessageLike): Promise<GameReply>;
-export declare function processAnswerText(services: SessionService, message: GameMessageLike, raw: string): Promise<GameReply | null>;
-export declare function handleChoice(services: SessionService, message: GameMessageLike, sessionId: string, choiceId: string): Promise<GameReply | null>;
+export declare function startGame(services: SessionService, message: GamePlayer, mode: RiddleType): Promise<GameReply | undefined>;
+export declare function continueGame(services: SessionService, message: GamePlayer): Promise<GameReply>;
+export declare function processAnswerText(services: SessionService, message: GamePlayer, raw: string): Promise<GameReply | null>;
+export declare function handleChoice(services: SessionService, message: GamePlayer, sessionId: string, choiceId: string): Promise<GameReply | null>;
 export { RIDDLE_PREFIX };

package/lib/game-flow.js

@@ -1,4 +1,5 @@
 import { createMessages, resolveLocale } from 'zhin.js/i18n';
+import { channelKey } from '@zhin.js/game-kit';
 import { answersFor, checkAnswer, getRiddleById, normalizeAnswer, RIDDLE_PREFIX, typeLabel, } from './engine.js';
 import { currentRiddleId, parseQueue, } from './session-service.js';
 import { buildRiddleView, MAX_WRONG } from './view.js';
@@ -8,7 +9,7 @@ import { buildRiddleView, MAX_WRONG } from './view.js';
  * and the text middleware return fresh text each turn.
  */
 function renderView(message, session, eventLines = []) {
-    return buildRiddleView(session, eventLines, message.$channel.type);
+    return buildRiddleView(session, eventLines, message.target.kind);
 }
 async function advanceQuestion(services, session) {
     const queue = parseQueue(session.queue);
@@ -22,111 +23,119 @@ async function advanceQuestion(services, session) {
     return (await services.getById(session.id));
 }
 export async function startGame(services, message, mode) {
-    const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
-    const active = await services.getActiveByChannel(ch);
-    const locale = resolveLocale(active ? active.locale : message.locale);
-    if (active) {
-        if (active.player_id === message.$sender.id) {
-            return messages(locale, 'text1', { p0: typeLabel(active.mode, locale) });
-        }
-        return messages(locale, 'text2', { p0: active.player_name });
-    }
-    const session = await services.createSession(message, mode);
-    return renderView(message, session);
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const ch = channelKey(message);
+            const active = await services.getActiveByChannel(ch);
+            const locale = resolveLocale(active ? active.locale : message.locale);
+            if (active) {
+                if (active.player_id === message.sender.id) {
+                    return messages(locale, 'text1', { p0: typeLabel(active.mode, locale) });
+                }
+                return messages(locale, 'text2', { p0: active.player_name });
+            }
+            const session = await services.createSession(message, mode);
+            return renderView(message, session);
+        } });
 }
 export async function continueGame(services, message) {
-    const session = await services.getActiveForUser(`${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`, message.$sender.id);
-    const locale = resolveLocale(session ? session.locale : message.locale);
-    if (!session)
-        return messages(locale, 'text3');
-    return renderView(message, session);
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const session = await services.getActiveForUser(channelKey(message), message.sender.id);
+            const locale = resolveLocale(session ? session.locale : message.locale);
+            if (!session)
+                return messages(locale, 'text3');
+            return renderView(message, session);
+        } });
 }
 export async function processAnswerText(services, message, raw) {
-    const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
-    const session = await services.getActiveForUser(ch, message.$sender.id);
-    const locale = resolveLocale(session ? session.locale : message.locale);
-    if (!session || session.status !== 'active')
-        return null;
-    const riddleId = currentRiddleId(session);
-    const entry = riddleId ? getRiddleById(riddleId) : undefined;
-    if (!entry)
-        return null;
-    // 格式不合规（字数与答案不符）只提示、不扣失误：避免闲聊（「好的」「谢谢」）被累计判负
-    const normalized = normalizeAnswer(raw);
-    if (!answersFor(entry).some((a) => a.length === normalized.length)) {
-        return messages(locale, 'text4', { p0: entry.answer.length });
-    }
-    if (checkAnswer(entry, raw)) {
-        const streak = session.streak + 1;
-        const best = Math.max(session.best_streak, streak);
-        await services.updateSession(session.id, {
-            score: session.score + 10 + Math.min(streak, 5),
-            streak,
-            best_streak: best,
-            wrong_count: 0,
-        });
-        const after = await advanceQuestion(services, (await services.getById(session.id)));
-        const explain = entry.explanation ? `\n📖 ${entry.explanation}` : '';
-        return renderView(message, after, [
-            messages(locale, 'text5', { p0: entry.answer, p1: explain }),
-            messages(locale, 'text6', { p0: 10 + Math.min(streak, 5) }),
-        ]);
-    }
-    const wrong = session.wrong_count + 1;
-    if (wrong >= MAX_WRONG) {
-        await services.updateSession(session.id, { wrong_count: wrong, streak: 0 });
-        const after = await advanceQuestion(services, (await services.getById(session.id)));
-        return renderView(message, after, [
-            messages(locale, 'text7', { p0: entry.answer }),
-            messages(locale, 'text8'),
-        ]);
-    }
-    await services.updateSession(session.id, { wrong_count: wrong, streak: 0 });
-    const updated = (await services.getById(session.id));
-    return renderView(message, updated, [messages(locale, 'text9')]);
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const ch = channelKey(message);
+            const session = await services.getActiveForUser(ch, message.sender.id);
+            const locale = resolveLocale(session ? session.locale : message.locale);
+            if (!session || session.status !== 'active')
+                return null;
+            const riddleId = currentRiddleId(session);
+            const entry = riddleId ? getRiddleById(riddleId) : undefined;
+            if (!entry)
+                return null;
+            // 格式不合规（字数与答案不符）只提示、不扣失误：避免闲聊（「好的」「谢谢」）被累计判负
+            const normalized = normalizeAnswer(raw);
+            if (!answersFor(entry).some((a) => a.length === normalized.length)) {
+                return messages(locale, 'text4', { p0: entry.answer.length });
+            }
+            if (checkAnswer(entry, raw)) {
+                const streak = session.streak + 1;
+                const best = Math.max(session.best_streak, streak);
+                await services.updateSession(session.id, {
+                    score: session.score + 10 + Math.min(streak, 5),
+                    streak,
+                    best_streak: best,
+                    wrong_count: 0,
+                });
+                const after = await advanceQuestion(services, (await services.getById(session.id)));
+                const explain = entry.explanation ? `\n📖 ${entry.explanation}` : '';
+                return renderView(message, after, [
+                    messages(locale, 'text5', { p0: entry.answer, p1: explain }),
+                    messages(locale, 'text6', { p0: 10 + Math.min(streak, 5) }),
+                ]);
+            }
+            const wrong = session.wrong_count + 1;
+            if (wrong >= MAX_WRONG) {
+                await services.updateSession(session.id, { wrong_count: wrong, streak: 0 });
+                const after = await advanceQuestion(services, (await services.getById(session.id)));
+                return renderView(message, after, [
+                    messages(locale, 'text7', { p0: entry.answer }),
+                    messages(locale, 'text8'),
+                ]);
+            }
+            await services.updateSession(session.id, { wrong_count: wrong, streak: 0 });
+            const updated = (await services.getById(session.id));
+            return renderView(message, updated, [messages(locale, 'text9')]);
+        } });
 }
 export async function handleChoice(services, message, sessionId, choiceId) {
-    const session = await services.getById(sessionId);
-    const locale = resolveLocale(session ? session.locale : message.locale);
-    if (!session)
-        return messages(locale, 'text10');
-    if (session.player_id !== message.$sender.id)
-        return messages(locale, 'text11');
-    if (choiceId === 'restart_char') {
-        await services.updateSession(session.id, { status: 'aborted' });
-        return (await startGame(services, message, 'char')) ?? null;
-    }
-    if (choiceId === 'restart_idiom') {
-        await services.updateSession(session.id, { status: 'aborted' });
-        return (await startGame(services, message, 'idiom')) ?? null;
-    }
-    if (session.status !== 'active')
-        return messages(locale, 'text12');
-    const riddleId = currentRiddleId(session);
-    const entry = riddleId ? getRiddleById(riddleId) : undefined;
-    if (!entry)
-        return messages(locale, 'text13');
-    if (choiceId === 'hint') {
-        const hint = entry.hint ?? messages(locale, 'text14', { p0: entry.answer.length });
-        await services.updateSession(session.id, { hints_used: session.hints_used + 1, streak: 0 });
-        const updated = (await services.getById(session.id));
-        return renderView(message, updated, [
-            messages(locale, 'text15', { p0: hint }),
-            messages(locale, 'text16'),
-        ]);
-    }
-    if (choiceId === 'skip') {
-        await services.updateSession(session.id, { streak: 0 });
-        const after = await advanceQuestion(services, session);
-        return renderView(message, after, [
-            messages(locale, 'text17', { p0: entry.answer }),
-        ]);
-    }
-    if (choiceId === 'quit') {
-        await services.updateSession(session.id, { status: 'aborted' });
-        return messages(locale, 'text18');
-    }
-    return messages(locale, 'text19');
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const session = await services.getById(sessionId);
+            const locale = resolveLocale(session ? session.locale : message.locale);
+            if (!session)
+                return messages(locale, 'text10');
+            if (session.player_id !== message.sender.id)
+                return messages(locale, 'text11');
+            if (choiceId === 'restart_char') {
+                await services.updateSession(session.id, { status: 'aborted' });
+                return (await startGame(services, message, 'char')) ?? null;
+            }
+            if (choiceId === 'restart_idiom') {
+                await services.updateSession(session.id, { status: 'aborted' });
+                return (await startGame(services, message, 'idiom')) ?? null;
+            }
+            if (session.status !== 'active')
+                return messages(locale, 'text12');
+            const riddleId = currentRiddleId(session);
+            const entry = riddleId ? getRiddleById(riddleId) : undefined;
+            if (!entry)
+                return messages(locale, 'text13');
+            if (choiceId === 'hint') {
+                const hint = entry.hint ?? messages(locale, 'text14', { p0: entry.answer.length });
+                await services.updateSession(session.id, { hints_used: session.hints_used + 1, streak: 0 });
+                const updated = (await services.getById(session.id));
+                return renderView(message, updated, [
+                    messages(locale, 'text15', { p0: hint }),
+                    messages(locale, 'text16'),
+                ]);
+            }
+            if (choiceId === 'skip') {
+                await services.updateSession(session.id, { streak: 0 });
+                const after = await advanceQuestion(services, session);
+                return renderView(message, after, [
+                    messages(locale, 'text17', { p0: entry.answer }),
+                ]);
+            }
+            if (choiceId === 'quit') {
+                await services.updateSession(session.id, { status: 'aborted' });
+                return messages(locale, 'text18');
+            }
+            return messages(locale, 'text19');
+        } });
 }
 export { RIDDLE_PREFIX };
 const messages = createMessages({

package/lib/game-flow.js.map

@@ -1 +1 @@
-{"version":3,"file":"game-flow.js","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"game-flow.js","sourceRoot":"","sources":["../src/game-flow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,UAAU,EAAmC,MAAM,mBAAmB,CAAC;AAChF,OAAO,EACL,UAAU,EACV,WAAW,EACX,aAAa,EACb,eAAe,EACf,aAAa,EACb,SAAS,GACV,MAAM,aAAa,CAAC;AAGrB,OAAO,EACL,eAAe,EACf,UAAU,GAEX,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEvD;;;;GAIG;AACH,SAAS,UAAU,CACjB,OAAmB,EACnB,OAAyB,EACzB,aAAuB,EAAE;IAEzB,OAAO,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AACnE,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,QAAwB,EACxB,OAAyB;IAEzB,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxC,MAAM,SAAS,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAC;IACpC,IAAI,SAAS,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;QAC9B,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;IACtG,CAAC;SAAM,CAAC;QACN,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC,CAAC;IACjF,CAAC;IACD,OAAO,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,CAAC;AAC/C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,QAAwB,EACxB,OAAmB,EACnB,IAAgB;IAEhB,OAAO,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/B,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;YACrD,MAAM,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACtE,IAAI,MAAM,EAAE,CAAC;gBACX,IAAI,MAAM,CAAC,SAAS,KAAK,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC;oBAC3C,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,SAAS,CAAC,MAAM,CAAC,IAAkB,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;gBACzF,CAAC;gBACD,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;YAC/D,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YAC5D,OAAO,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC,EAAE,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAwB,EACxB,OAAmB;IAEnB,OAAO,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAC7C,UAAU,CAAC,OAAO,CAAC,EACnB,OAAO,CAAC,MAAM,CAAC,EAAE,CAClB,CAAC;YACF,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,OAAO;gBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAC/C,OAAO,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACtC,CAAC,EAAE,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,QAAwB,EACxB,OAAmB,EACnB,GAAW;IAEX,OAAO,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;YAC/B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,EAAE,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACvE,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ;gBAAE,OAAO,IAAI,CAAC;YAEzD,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,IAAI,CAAC,KAAK;gBAAE,OAAO,IAAI,CAAC;YAExB,6CAA6C;YAC7C,MAAM,UAAU,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;YACxC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACnE,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAChE,CAAC;YAED,IAAI,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;gBAC5B,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC;gBAClC,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;gBACnD,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE;oBACvC,KAAK,EAAE,OAAO,CAAC,KAAK,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;oBAC/C,MAAM;oBACN,WAAW,EAAE,IAAI;oBACjB,WAAW,EAAE,CAAC;iBACf,CAAC,CAAC;gBACH,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,CAAC,CAAC;gBACrF,MAAM,OAAO,GAAG,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,QAAQ,KAAK,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBACrE,OAAO,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE;oBAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;oBAC5D,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;iBAC5D,CAAC,CAAC;YACL,CAAC;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC;YACtC,IAAI,KAAK,IAAI,SAAS,EAAE,CAAC;gBACvB,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC5E,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,CAAC,CAAC;gBACrF,OAAO,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE;oBAChC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;oBAC/C,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;iBAC1B,CAAC,CAAC;YACL,CAAC;YAED,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;YAC5E,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,CAAC;YACtD,OAAO,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QACnE,CAAC,EAAE,CAAC,CAAC;AACP,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAwB,EACxB,OAAmB,EACnB,SAAiB,EACjB,QAAgB;IAEhB,OAAO,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAClD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YACxE,IAAI,CAAC,OAAO;gBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAChD,IAAI,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,MAAM,CAAC,EAAE;gBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAE/E,IAAI,QAAQ,KAAK,cAAc,EAAE,CAAC;gBAChC,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAChE,OAAO,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,IAAI,CAAC;YAC9D,CAAC;YACD,IAAI,QAAQ,KAAK,eAAe,EAAE,CAAC;gBACjC,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAChE,OAAO,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,IAAI,IAAI,CAAC;YAC/D,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ;gBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAEnE,MAAM,QAAQ,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;YAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;YAC7D,IAAI,CAAC,KAAK;gBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAE9C,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACxB,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;gBACnF,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC5F,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,CAAC;gBACtD,OAAO,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE;oBAClC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;oBACxC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC;iBAC3B,CAAC,CAAC;YACL,CAAC;YAED,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACxB,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;gBACxD,MAAM,KAAK,GAAG,MAAM,eAAe,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;gBACvD,OAAO,UAAU,CAAC,OAAO,EAAE,KAAK,EAAE;oBAChC,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC;iBACjD,CAAC,CAAC;YACL,CAAC;YAED,IAAI,QAAQ,KAAK,MAAM,EAAE,CAAC;gBACxB,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;gBAChE,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YACpC,CAAC;YAED,OAAO,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;QACpC,CAAC,EAAE,CAAC,CAAC;AACP,CAAC;AAED,OAAO,EAAE,aAAa,EAAE,CAAC;AAEzB,MAAM,QAAQ,GAAG,cAAc,CAAC;IAC9B,KAAK,EAAE,EAAE,OAAO,EAAE,iCAAiC,EAAE,EAAE,EAAE,6EAA6E,EAAE;IACxI,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE,0CAA0C,EAAE;IACpF,KAAK,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,iCAAiC,EAAE;IACvE,KAAK,EAAE,EAAE,OAAO,EAAE,yBAAyB,EAAE,EAAE,EAAE,oEAAoE,EAAE;IACvH,KAAK,EAAE,EAAE,OAAO,EAAE,sBAAsB,EAAE,EAAE,EAAE,iCAAiC,EAAE;IACjF,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,EAAE,cAAc,EAAE;IACjD,KAAK,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,EAAE,oBAAoB,EAAE;IAC/D,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,+CAA+C,EAAE;IACtF,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,yBAAyB,EAAE;IAC9D,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,6BAA6B,EAAE;IAChE,MAAM,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,6CAA6C,EAAE;IAClF,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,uBAAuB,EAAE;IAC1D,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,4BAA4B,EAAE;IAC9D,MAAM,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,gCAAgC,EAAE;IACxE,MAAM,EAAE,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,EAAE,eAAe,EAAE;IACtD,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,gBAAgB,EAAE;IACnD,MAAM,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,EAAE,EAAE,8BAA8B,EAAE;IAC5E,MAAM,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,4BAA4B,EAAE;IAC/D,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,iBAAiB,EAAE;CACpD,CAAC,CAAC"}

package/lib/riddle-command.d.ts

@@ -1,5 +1,5 @@
-import { type GameMessageLike, type GameReply } from '@zhin.js/game-kit';
+import { type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import type { SessionService } from './session-service.js';
-export declare function getRiddleHelp(message?: Pick<GameMessageLike, 'locale' | 'formatCommand'>): string;
+export declare function getRiddleHelp(message?: Pick<GamePlayer, 'locale' | 'formatCommand'>): string;
 export declare const RIDDLE_HELP: string;
-export declare function runRiddleCommand(services: SessionService, message: GameMessageLike, action: string): Promise<GameReply>;
+export declare function runRiddleCommand(services: SessionService, message: GamePlayer, action: string): Promise<GameReply>;

package/lib/riddle-command.js

@@ -15,7 +15,7 @@ const messages = createMessages({
 export function getRiddleHelp(message = {}) {
     const locale = message.locale ?? 'zh-CN';
     const command = message.formatCommand?.('riddle');
-    return [formatGameHelp(message, { 'zh-CN': '🧩 猜谜（字谜 + 猜成语）', en: '🧩 Chinese Character and Idiom Riddles' }, 'riddle', ['start', 'continue', 'quit']),
+    return [formatGameHelp({ presentation: message, title: { 'zh-CN': '🧩 猜谜（字谜 + 猜成语）', en: '🧩 Chinese Character and Idiom Riddles' }, commandPath: 'riddle', actions: ['start', 'continue', 'quit'] }),
         messages(locale, 'counts', { chars: counts.char.toLocaleString(locale), idioms: counts.idiom.toLocaleString(locale) }),
         ...(command ? [messages(locale, 'char', { command: command + ' char' }), messages(locale, 'idiom', { command: command + ' idiom' })] : []),
         messages(locale, 'instructions'),
@@ -32,32 +32,34 @@ function parseMode(action) {
     return null;
 }
 export async function runRiddleCommand(services, message, action) {
-    const ch = channelKey(message);
-    const userId = message.$sender.id;
-    if (!action || action === 'help') {
-        const active = await services.getActiveByChannel(ch);
-        const lines = [getRiddleHelp(message), ''];
-        if (active) {
-            lines.push(messages(active.locale ?? undefined, 'active', { mode: typeLabel(active.mode, active.locale ?? undefined), score: active.score, streak: active.streak }));
-        }
-        else {
-            lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'riddle'));
-        }
-        return lines.join('\n');
-    }
-    const mode = parseMode(action);
-    if (mode)
-        return (await startGame(services, message, mode)) ?? '';
-    if (action === 'continue' || action === '继续') {
-        return continueGame(services, message);
-    }
-    if (action === 'quit' || action === '放弃') {
-        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' + getRiddleHelp(message);
+    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 = [getRiddleHelp(message), ''];
+                if (active) {
+                    lines.push(messages(active.locale ?? undefined, 'active', { mode: typeLabel(active.mode, active.locale ?? undefined), score: active.score, streak: active.streak }));
+                }
+                else {
+                    lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'riddle'));
+                }
+                return lines.join('\n');
+            }
+            const mode = parseMode(action);
+            if (mode)
+                return (await startGame(services, message, mode)) ?? '';
+            if (action === 'continue' || action === '继续') {
+                return continueGame(services, message);
+            }
+            if (action === 'quit' || action === '放弃') {
+                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' + getRiddleHelp(message);
+        } });
 }
 //# sourceMappingURL=riddle-command.js.map

package/lib/riddle-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"riddle-command.js","sourceRoot":"","sources":["../src/riddle-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,eAAe,EAAE,UAAU,EAAwC,MAAM,mBAAmB,CAAC;AAC3I,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAmB,MAAM,sBAAsB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC,MAAM,MAAM,GAAG,WAAW,EAAE,CAAC;AAG7B,MAAM,QAAQ,GAAG,cAAc,CAAC;IAC9B,MAAM,EAAE,EAAE,OAAO,EAAE,8BAA8B,EAAE,EAAE,EAAE,oDAAoD,EAAE;IAC7G,IAAI,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,uCAAuC,EAAE;IAClF,KAAK,EAAE,EAAE,OAAO,EAAE,mBAAmB,EAAE,EAAE,EAAE,mCAAmC,EAAE;IAChF,YAAY,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE,EAAE,EAAE,oGAAoG,EAAE;IACjK,MAAM,EAAE,EAAE,OAAO,EAAE,uCAAuC,EAAE,EAAE,EAAE,mDAAmD,EAAE;IACrH,IAAI,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,2BAA2B,EAAE;CAC7D,CAAC,CAAC;AAEH,MAAM,UAAU,aAAa,CAAC,UAA6D,EAAE;IAC3F,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,OAAO,CAAC;IACzC,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,CAAC;IAClD,OAAO,CAAC,cAAc,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,EAAE,wCAAwC,EAAE,EAAE,QAAQ,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QACpJ,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;QACtH,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC,EAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1I,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;KACjC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AACD,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,EAAE,CAAC;AAE3C,SAAS,SAAS,CAAC,MAAc;IAC/B,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACxD,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,OAAO,CAAC;IAC1D,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC;IACzD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAwB,EACxB,OAAwB,EACxB,MAAc;IAEd,MAAM,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;IAElC,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACjC,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,KAAK,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,MAAM,EAAE,CAAC;YACX,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,IAAI,SAAS,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,SAAS,CAAC,MAAM,CAAC,IAAkB,EAAE,MAAM,CAAC,MAAM,IAAI,SAAS,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrL,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;QACzF,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;IAC/B,IAAI,IAAI;QAAE,OAAO,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;IAElE,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAC7C,OAAO,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACzC,CAAC;IAED,IAAI,MAAM,KAAK,MAAM,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACzC,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACxD,IAAI,CAAC,GAAG;YAAE,OAAO,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QACxD,MAAM,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QAC5D,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,SAAS,EAAE,MAAM,CAAC,CAAC;IACnD,CAAC;IAED,OAAO,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;AAC3F,CAAC"}
+{"version":3,"file":"riddle-command.js","sourceRoot":"","sources":["../src/riddle-command.ts"],"names":[],"mappings":"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"}

package/lib/session-service.d.ts

@@ -1,12 +1,12 @@
 import type { Database, Models } from '@zhin.js/core';
-import { BaseSessionService, type GameMessageLike } from '@zhin.js/game-kit';
+import { BaseSessionService, type GamePlayer } from '@zhin.js/game-kit';
 import { type RiddleType } from './riddles-catalog.js';
 import type { RiddleSessionRow } from './models.js';
 export type RiddleDatabase = Database<unknown, Models, string>;
 export declare function parseQueue(value: string | string[] | unknown): string[];
 export declare class SessionService extends BaseSessionService<RiddleSessionRow> {
     constructor(db: RiddleDatabase);
-    createSession(message: GameMessageLike, mode: RiddleType): Promise<RiddleSessionRow>;
+    createSession(message: GamePlayer, mode: RiddleType): Promise<RiddleSessionRow>;
 }
 export declare function createServices(db: RiddleDatabase): SessionService;
 export declare function currentRiddleId(session: RiddleSessionRow): string | null;

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';
 import { pickRoundQueue } from './riddles-catalog.js';
 export function parseQueue(value) {
     if (Array.isArray(value))
@@ -27,13 +27,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,
             mode,
             queue: JSON.stringify(queue),
             index: 0,
@@ -46,7 +41,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;AAC3B,OAAO,EAAE,cAAc,EAAmB,MAAM,sBAAsB,CAAC;AAKvE,MAAM,UAAU,UAAU,CAAC,KAAkC;IAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC;IACzF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACnD,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,kBAAoC;IACtE,YAAY,EAAkB;QAC5B,KAAK,CAAC,EAAsD,EAAE;YAC5D,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE,sBAAsB;YAC7B,UAAU,EAAE,CAAC,WAAW,CAAC;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAwB,EAAE,IAAgB;QAC5D,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpD,MAAM,GAAG,GAAqB;YAC5B,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,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAC5B,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,CAAC;YACd,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,CAAC;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,EAAkB;IAC/C,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC;AAGD,MAAM,UAAU,eAAe,CAAC,OAAyB;IACvD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;AACtC,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;AAC3B,OAAO,EAAE,cAAc,EAAmB,MAAM,sBAAsB,CAAC;AAKvE,MAAM,UAAU,UAAU,CAAC,KAAkC;IAC3D,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC;IACzF,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACnD,IAAI,CAAC;QACH,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC5B,OAAO,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACrF,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,OAAO,cAAe,SAAQ,kBAAoC;IACtE,YAAY,EAAkB;QAC5B,KAAK,CAAC,EAAsD,EAAE;YAC5D,MAAM,EAAE,QAAQ;YAChB,KAAK,EAAE,sBAAsB;YAC7B,UAAU,EAAE,CAAC,WAAW,CAAC;SAC1B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAmB,EAAE,IAAgB;QACvD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACvB,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QACpD,MAAM,GAAG,GAAmG;YAC1G,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,IAAI;YACJ,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC;YAC5B,KAAK,EAAE,CAAC;YACR,KAAK,EAAE,CAAC;YACR,MAAM,EAAE,CAAC;YACT,WAAW,EAAE,CAAC;YACd,UAAU,EAAE,CAAC;YACb,WAAW,EAAE,CAAC;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,EAAkB;IAC/C,OAAO,IAAI,cAAc,CAAC,EAAE,CAAC,CAAC;AAChC,CAAC;AAGD,MAAM,UAAU,eAAe,CAAC,OAAyB;IACvD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxC,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC;AACtC,CAAC"}

package/middlewares/riddle-alias/index.js

@@ -1,20 +1,24 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineGameCommandAliasMiddleware, isRiddleAction, messageFromCommandInput, normalizeRiddleAction, } from '@zhin.js/game-kit';
+import { replyGameOperation, defineGameCommandAliasMiddleware, isRiddleAction, gamePlayerFromInput, normalizeRiddleAction, } from '@zhin.js/game-kit';
 import { getRiddleHelp, runRiddleCommand } from "../../lib/riddle-command.js";
 import { resolveGameServices } from "../../lib/runtime-store.js";
 export default defineGameCommandAliasMiddleware({
     aliases: ['猜谜', 'riddle'],
     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 = normalizeRiddleAction(String(action ?? ''));
-        if (normalized === 'help')
-            return getRiddleHelp(message);
+        if (normalized === 'help') {
+            await context.input.$reply(getRiddleHelp(presentation));
+            return true;
+        }
         // action 无法识别：放行给后续中间件，避免劫持普通聊天
         if (!isRiddleAction(normalized))
-            return null;
+            return false;
+        const message = gamePlayerFromInput(input, presentation);
         const services = resolveGameServices(context);
-        return runRiddleCommand(services, message, normalized);
+        await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+            run: () => runRiddleCommand(services, message, normalized) });
+        return true;
     },
 });

package/middlewares/riddle-alias/index.ts

@@ -1,7 +1,8 @@
 import {
+  replyGameOperation,
   defineGameCommandAliasMiddleware,
   isRiddleAction,
-  messageFromCommandInput,
+  gamePlayerFromInput,
   normalizeRiddleAction,
 } from '@zhin.js/game-kit';
 import { getRiddleHelp, runRiddleCommand } from '../../src/riddle-command.js';
@@ -10,14 +11,17 @@ import { resolveGameServices } from '../../src/runtime-store.js';
 export default defineGameCommandAliasMiddleware({
   aliases: ['猜谜', 'riddle'],
   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 = normalizeRiddleAction(String(action ?? ''));
-    if (normalized === 'help') return getRiddleHelp(message);
+    if (normalized === 'help') { await context.input.$reply(getRiddleHelp(presentation)); return true; }
     // action 无法识别：放行给后续中间件，避免劫持普通聊天
-    if (!isRiddleAction(normalized)) return null;
+    if (!isRiddleAction(normalized)) return false;
+    const message = gamePlayerFromInput(input, presentation);
     const services = resolveGameServices(context);
-    return runRiddleCommand(services, message, normalized);
+    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => runRiddleCommand(services, message, normalized) });
+    return true;
   },
 });

package/middlewares/riddle-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 { handleChoice, processAnswerText, RIDDLE_PREFIX } from "../../lib/game-flow.js";
 /**
@@ -10,13 +10,17 @@ import { handleChoice, processAnswerText, RIDDLE_PREFIX } from "../../lib/game-f
 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, RIDDLE_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;
             }
         }
         // 仅把 1-8 个汉字的纯文本当谜底作答，其余放行
         if (/^[\u4e00-\u9fff]{1,8}$/.test(raw)) {
-            const reply = await processAnswerText(services, message, raw);
-            if (reply)
-                await context.input.$reply(reply);
+            await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+                run: () => processAnswerText(services, message, raw) });
             return;
         }
         await next();

package/middlewares/riddle-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 { handleChoice, processAnswerText, RIDDLE_PREFIX } from '../../src/game-flow.js';
 
@@ -17,13 +18,14 @@ import { handleChoice, processAnswerText, RIDDLE_PREFIX } from '../../src/game-f
 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, RIDDLE_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;
       }
     }
 
     // 仅把 1-8 个汉字的纯文本当谜底作答，其余放行
     if (/^[\u4e00-\u9fff]{1,8}$/.test(raw)) {
-      const reply = await processAnswerText(services, message, raw);
-      if (reply) await context.input.$reply(reply);
+      await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => processAnswerText(services, message, raw) });
       return;
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-word-riddle",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "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.53",
-    "@zhin.js/game-kit": "1.1.18"
+    "@zhin.js/core": "1.1.55",
+    "@zhin.js/game-kit": "1.1.20"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "zhin.js": "1.1.18"
+    "zhin.js": "1.1.20"
   },
   "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.18"
+    "@zhin.js/command": "^1.1.13",
+    "@zhin.js/middleware": "^1.1.12",
+    "zhin.js": "^1.1.20"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {

package/src/game-flow.ts

@@ -1,5 +1,5 @@
 import { createMessages, resolveLocale } from 'zhin.js/i18n';
-import type { GameMessageLike, GameReply } from '@zhin.js/game-kit';
+import { channelKey, type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import {
   answersFor,
   checkAnswer,
@@ -23,11 +23,11 @@ import { buildRiddleView, MAX_WRONG } from './view.js';
  * and the text middleware return fresh text each turn.
  */
 function renderView(
-  message: GameMessageLike,
+  message: GamePlayer,
   session: RiddleSessionRow,
   eventLines: string[] = [],
 ): GameReply {
-  return buildRiddleView(session, eventLines, message.$channel.type);
+  return buildRiddleView(session, eventLines, message.target.kind);
 }
 
 async function advanceQuestion(
@@ -46,138 +46,146 @@ async function advanceQuestion(
 
 export async function startGame(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   mode: RiddleType,
 ): Promise<GameReply | undefined> {
-  const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
-  const active = await services.getActiveByChannel(ch);
-  const locale = resolveLocale(active ? active.locale : message.locale);
-  if (active) {
-    if (active.player_id === message.$sender.id) {
-      return messages(locale, 'text1', { p0: typeLabel(active.mode as RiddleType, locale) });
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const ch = channelKey(message);
+    const active = await services.getActiveByChannel(ch);
+    const locale = resolveLocale(active ? active.locale : message.locale);
+    if (active) {
+      if (active.player_id === message.sender.id) {
+        return messages(locale, 'text1', { p0: typeLabel(active.mode as RiddleType, locale) });
+      }
+      return messages(locale, 'text2', { p0: active.player_name });
     }
-    return messages(locale, 'text2', { p0: active.player_name });
-  }
 
-  const session = await services.createSession(message, mode);
-  return renderView(message, session);
+    const session = await services.createSession(message, mode);
+    return renderView(message, session);
+  } });
 }
 
 export async function continueGame(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
 ): Promise<GameReply> {
-  const session = await services.getActiveForUser(
-    `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`,
-    message.$sender.id,
-  );
-  const locale = resolveLocale(session ? session.locale : message.locale);
-  if (!session) return messages(locale, 'text3');
-  return renderView(message, session);
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const session = await services.getActiveForUser(
+      channelKey(message),
+      message.sender.id,
+    );
+    const locale = resolveLocale(session ? session.locale : message.locale);
+    if (!session) return messages(locale, 'text3');
+    return renderView(message, session);
+  } });
 }
 
 export async function processAnswerText(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   raw: string,
 ): Promise<GameReply | null> {
-  const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
-  const session = await services.getActiveForUser(ch, message.$sender.id);
-  const locale = resolveLocale(session ? session.locale : message.locale);
-  if (!session || session.status !== 'active') return null;
-
-  const riddleId = currentRiddleId(session);
-  const entry = riddleId ? getRiddleById(riddleId) : undefined;
-  if (!entry) return null;
-
-  // 格式不合规（字数与答案不符）只提示、不扣失误：避免闲聊（「好的」「谢谢」）被累计判负
-  const normalized = normalizeAnswer(raw);
-  if (!answersFor(entry).some((a) => a.length === normalized.length)) {
-    return messages(locale, 'text4', { p0: entry.answer.length });
-  }
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const ch = channelKey(message);
+    const session = await services.getActiveForUser(ch, message.sender.id);
+    const locale = resolveLocale(session ? session.locale : message.locale);
+    if (!session || session.status !== 'active') return null;
+
+    const riddleId = currentRiddleId(session);
+    const entry = riddleId ? getRiddleById(riddleId) : undefined;
+    if (!entry) return null;
+
+    // 格式不合规（字数与答案不符）只提示、不扣失误：避免闲聊（「好的」「谢谢」）被累计判负
+    const normalized = normalizeAnswer(raw);
+    if (!answersFor(entry).some((a) => a.length === normalized.length)) {
+      return messages(locale, 'text4', { p0: entry.answer.length });
+    }
 
-  if (checkAnswer(entry, raw)) {
-    const streak = session.streak + 1;
-    const best = Math.max(session.best_streak, streak);
-    await services.updateSession(session.id, {
-      score: session.score + 10 + Math.min(streak, 5),
-      streak,
-      best_streak: best,
-      wrong_count: 0,
-    });
-    const after = await advanceQuestion(services, (await services.getById(session.id))!);
-    const explain = entry.explanation ? `\n📖 ${entry.explanation}` : '';
-    return renderView(message, after, [
-      messages(locale, 'text5', { p0: entry.answer, p1: explain }),
-      messages(locale, 'text6', { p0: 10 + Math.min(streak, 5) }),
-    ]);
-  }
+    if (checkAnswer(entry, raw)) {
+      const streak = session.streak + 1;
+      const best = Math.max(session.best_streak, streak);
+      await services.updateSession(session.id, {
+        score: session.score + 10 + Math.min(streak, 5),
+        streak,
+        best_streak: best,
+        wrong_count: 0,
+      });
+      const after = await advanceQuestion(services, (await services.getById(session.id))!);
+      const explain = entry.explanation ? `\n📖 ${entry.explanation}` : '';
+      return renderView(message, after, [
+        messages(locale, 'text5', { p0: entry.answer, p1: explain }),
+        messages(locale, 'text6', { p0: 10 + Math.min(streak, 5) }),
+      ]);
+    }
 
-  const wrong = session.wrong_count + 1;
-  if (wrong >= MAX_WRONG) {
-    await services.updateSession(session.id, { wrong_count: wrong, streak: 0 });
-    const after = await advanceQuestion(services, (await services.getById(session.id))!);
-    return renderView(message, after, [
-      messages(locale, 'text7', { p0: entry.answer }),
-      messages(locale, 'text8'),
-    ]);
-  }
+    const wrong = session.wrong_count + 1;
+    if (wrong >= MAX_WRONG) {
+      await services.updateSession(session.id, { wrong_count: wrong, streak: 0 });
+      const after = await advanceQuestion(services, (await services.getById(session.id))!);
+      return renderView(message, after, [
+        messages(locale, 'text7', { p0: entry.answer }),
+        messages(locale, 'text8'),
+      ]);
+    }
 
-  await services.updateSession(session.id, { wrong_count: wrong, streak: 0 });
-  const updated = (await services.getById(session.id))!;
-  return renderView(message, updated, [messages(locale, 'text9')]);
+    await services.updateSession(session.id, { wrong_count: wrong, streak: 0 });
+    const updated = (await services.getById(session.id))!;
+    return renderView(message, updated, [messages(locale, 'text9')]);
+  } });
 }
 
 export async function handleChoice(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   sessionId: string,
   choiceId: string,
 ): Promise<GameReply | null> {
-  const session = await services.getById(sessionId);
-  const locale = resolveLocale(session ? session.locale : message.locale);
-  if (!session) return messages(locale, 'text10');
-  if (session.player_id !== message.$sender.id) return messages(locale, 'text11');
-
-  if (choiceId === 'restart_char') {
-    await services.updateSession(session.id, { status: 'aborted' });
-    return (await startGame(services, message, 'char')) ?? null;
-  }
-  if (choiceId === 'restart_idiom') {
-    await services.updateSession(session.id, { status: 'aborted' });
-    return (await startGame(services, message, 'idiom')) ?? null;
-  }
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const session = await services.getById(sessionId);
+    const locale = resolveLocale(session ? session.locale : message.locale);
+    if (!session) return messages(locale, 'text10');
+    if (session.player_id !== message.sender.id) return messages(locale, 'text11');
+
+    if (choiceId === 'restart_char') {
+      await services.updateSession(session.id, { status: 'aborted' });
+      return (await startGame(services, message, 'char')) ?? null;
+    }
+    if (choiceId === 'restart_idiom') {
+      await services.updateSession(session.id, { status: 'aborted' });
+      return (await startGame(services, message, 'idiom')) ?? null;
+    }
 
-  if (session.status !== 'active') return messages(locale, 'text12');
+    if (session.status !== 'active') return messages(locale, 'text12');
 
-  const riddleId = currentRiddleId(session);
-  const entry = riddleId ? getRiddleById(riddleId) : undefined;
-  if (!entry) return messages(locale, 'text13');
+    const riddleId = currentRiddleId(session);
+    const entry = riddleId ? getRiddleById(riddleId) : undefined;
+    if (!entry) return messages(locale, 'text13');
 
-  if (choiceId === 'hint') {
-    const hint = entry.hint ?? messages(locale, 'text14', { p0: entry.answer.length });
-    await services.updateSession(session.id, { hints_used: session.hints_used + 1, streak: 0 });
-    const updated = (await services.getById(session.id))!;
-    return renderView(message, updated, [
-      messages(locale, 'text15', { p0: hint }),
-      messages(locale, 'text16'),
-    ]);
-  }
+    if (choiceId === 'hint') {
+      const hint = entry.hint ?? messages(locale, 'text14', { p0: entry.answer.length });
+      await services.updateSession(session.id, { hints_used: session.hints_used + 1, streak: 0 });
+      const updated = (await services.getById(session.id))!;
+      return renderView(message, updated, [
+        messages(locale, 'text15', { p0: hint }),
+        messages(locale, 'text16'),
+      ]);
+    }
 
-  if (choiceId === 'skip') {
-    await services.updateSession(session.id, { streak: 0 });
-    const after = await advanceQuestion(services, session);
-    return renderView(message, after, [
-      messages(locale, 'text17', { p0: entry.answer }),
-    ]);
-  }
+    if (choiceId === 'skip') {
+      await services.updateSession(session.id, { streak: 0 });
+      const after = await advanceQuestion(services, session);
+      return renderView(message, after, [
+        messages(locale, 'text17', { p0: entry.answer }),
+      ]);
+    }
 
-  if (choiceId === 'quit') {
-    await services.updateSession(session.id, { status: 'aborted' });
-    return messages(locale, 'text18');
-  }
+    if (choiceId === 'quit') {
+      await services.updateSession(session.id, { status: 'aborted' });
+      return messages(locale, 'text18');
+    }
 
-  return messages(locale, 'text19');
+    return messages(locale, 'text19');
+  } });
 }
 
 export { RIDDLE_PREFIX };

package/src/riddle-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 { riddleCount, type RiddleType } from './riddles-catalog.js';
@@ -18,10 +18,10 @@ const messages = createMessages({
   quit: { 'zh-CN': '已放弃猜谜。', en: 'You quit the riddle game.' },
 });
 
-export function getRiddleHelp(message: Pick<GameMessageLike, 'locale' | 'formatCommand'> = {}): string {
+export function getRiddleHelp(message: Pick<GamePlayer, 'locale' | 'formatCommand'> = {}): string {
   const locale = message.locale ?? 'zh-CN';
   const command = message.formatCommand?.('riddle');
-  return [formatGameHelp(message, { 'zh-CN': '🧩 猜谜（字谜 + 猜成语）', en: '🧩 Chinese Character and Idiom Riddles' }, 'riddle', ['start', 'continue', 'quit']),
+  return [formatGameHelp({ presentation: message, title: { 'zh-CN': '🧩 猜谜（字谜 + 猜成语）', en: '🧩 Chinese Character and Idiom Riddles' }, commandPath: 'riddle', actions: ['start', 'continue', 'quit'] }),
     messages(locale, 'counts', { chars: counts.char.toLocaleString(locale), idioms: counts.idiom.toLocaleString(locale) }),
     ...(command ? [messages(locale, 'char', { command: command + ' char' }), messages(locale, 'idiom', { command: command + ' idiom' })] : []),
     messages(locale, 'instructions'),
@@ -38,36 +38,38 @@ function parseMode(action: string): RiddleType | null {
 
 export async function runRiddleCommand(
   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 = [getRiddleHelp(message), ''];
-    if (active) {
-      lines.push(messages(active.locale ?? undefined, 'active', { mode: typeLabel(active.mode as RiddleType, active.locale ?? undefined), score: active.score, streak: active.streak }));
-    } else {
-      lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'riddle'));
+    if (!action || action === 'help') {
+      const active = await services.getActiveByChannel(ch);
+      const lines = [getRiddleHelp(message), ''];
+      if (active) {
+        lines.push(messages(active.locale ?? undefined, 'active', { mode: typeLabel(active.mode as RiddleType, active.locale ?? undefined), score: active.score, streak: active.streak }));
+      } else {
+        lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'riddle'));
+      }
+      return lines.join('\n');
     }
-    return lines.join('\n');
-  }
 
-  const mode = parseMode(action);
-  if (mode) return (await startGame(services, message, mode)) ?? '';
+    const mode = parseMode(action);
+    if (mode) return (await startGame(services, message, mode)) ?? '';
 
-  if (action === 'continue' || action === '继续') {
-    return continueGame(services, message);
-  }
+    if (action === 'continue' || action === '继续') {
+      return continueGame(services, message);
+    }
 
-  if (action === 'quit' || action === '放弃') {
-    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' || action === '放弃') {
+      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' + getRiddleHelp(message);
+    return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getRiddleHelp(message);
+  } });
 }

package/src/session-service.ts

@@ -1,9 +1,8 @@
 import type { Database, Models } from '@zhin.js/core';
 import {
   BaseSessionService,
-  channelKey,
   generateSessionId,
-  type GameMessageLike,
+  type GamePlayer,
   type GameSessionDatabase,
 } from '@zhin.js/game-kit';
 import { pickRoundQueue, type RiddleType } from './riddles-catalog.js';
@@ -31,19 +30,14 @@ export class SessionService extends BaseSessionService<RiddleSessionRow> {
     });
   }
 
-  async createSession(message: GameMessageLike, mode: RiddleType): Promise<RiddleSessionRow> {
+  async createSession(message: GamePlayer, mode: RiddleType): Promise<RiddleSessionRow> {
     const now = Date.now();
     const queue = pickRoundQueue(mode).map((r) => r.id);
-    const row: RiddleSessionRow = {
+    const row: Omit<RiddleSessionRow, 'channel_key' | 'adapter' | 'endpoint' | 'channel_type' | 'channel_id'> = {
       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,
       mode,
       queue: JSON.stringify(queue),
       index: 0,
@@ -56,7 +50,7 @@ export class SessionService extends BaseSessionService<RiddleSessionRow> {
       updated_at: now,
       created_at: now,
     };
-    return this.createRow(row);
+    return this.createRow({ target: message.target, fields: row });
   }
 }