@zhin.js/plugin-guess-number 1.1.18 → 1.1.20

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

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

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

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

package/lib/game-flow.d.ts

@@ -1,5 +1,5 @@
-import type { GameMessageLike, 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 startGame(services: SessionService, message: GameMessageLike): Promise<GameReply>;
-export declare function processGuess(services: SessionService, message: GameMessageLike, value: number): Promise<GameReply | null>;
-export declare function handleGuessChoice(services: SessionService, message: GameMessageLike, sessionId: string, choiceId: string): Promise<GameReply>;
+export declare function startGame(services: SessionService, message: GamePlayer): Promise<GameReply>;
+export declare function processGuess(services: SessionService, message: GamePlayer, value: number): Promise<GameReply | null>;
+export declare function handleGuessChoice(services: SessionService, message: GamePlayer, sessionId: string, choiceId: string): Promise<GameReply>;

package/lib/game-flow.js

@@ -1,69 +1,76 @@
 import { createMessages, resolveLocale } from 'zhin.js/i18n';
+import { channelKey } from '@zhin.js/game-kit';
 import { evaluateGuess, hintText, MAX, MIN } from './engine.js';
 import { buildGuessView } from './view.js';
 export async function startGame(services, message) {
-    const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
-    const mine = await services.getActiveForUser(ch, message.$sender.id);
-    const locale = resolveLocale(mine ? mine.locale : message.locale);
-    if (mine) {
-        return buildGuessView(mine, [messages(locale, 'text1')], message.$channel.type);
-    }
-    const session = await services.createSession(message);
-    return buildGuessView(session, [], message.$channel.type);
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const ch = channelKey(message);
+            const mine = await services.getActiveForUser(ch, message.sender.id);
+            const locale = resolveLocale(mine ? mine.locale : message.locale);
+            if (mine) {
+                return buildGuessView(mine, [messages(locale, 'text1')], message.target.kind);
+            }
+            const session = await services.createSession(message);
+            return buildGuessView(session, [], message.target.kind);
+        } });
 }
 export async function processGuess(services, message, value) {
-    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)
-        return null;
-    const result = evaluateGuess(session.secret, value);
-    if (result === 'invalid') {
-        return messages(locale, 'text2', { p0: MIN, p1: MAX });
-    }
-    const attempts = session.attempts + 1;
-    if (result === 'win') {
-        await services.updateSession(session.id, { attempts, status: 'won' });
-        const updated = (await services.getById(session.id));
-        return buildGuessView(updated, [messages(locale, 'text3', { p0: attempts })], message.$channel.type);
-    }
-    if (attempts >= session.max_attempts) {
-        await services.updateSession(session.id, { attempts, status: 'lost' });
-        const updated = (await services.getById(session.id));
-        return buildGuessView(updated, [], message.$channel.type);
-    }
-    let rangeMin = session.range_min;
-    let rangeMax = session.range_max;
-    if (result === 'low')
-        rangeMin = Math.max(rangeMin, value + 1);
-    else
-        rangeMax = Math.min(rangeMax, value - 1);
-    await services.updateSession(session.id, { attempts, range_min: rangeMin, range_max: rangeMax });
-    const updated = (await services.getById(session.id));
-    return buildGuessView(updated, [hintText(result, rangeMin, rangeMax, locale)], message.$channel.type);
+    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)
+                return null;
+            const result = evaluateGuess(session.secret, value);
+            if (result === 'invalid') {
+                return messages(locale, 'text2', { p0: MIN, p1: MAX });
+            }
+            const attempts = session.attempts + 1;
+            if (result === 'win') {
+                await services.updateSession(session.id, { attempts, status: 'won' });
+                const updated = (await services.getById(session.id));
+                return buildGuessView(updated, [messages(locale, 'text3', { p0: attempts })], message.target.kind);
+            }
+            if (attempts >= session.max_attempts) {
+                await services.updateSession(session.id, { attempts, status: 'lost' });
+                const updated = (await services.getById(session.id));
+                return buildGuessView(updated, [], message.target.kind);
+            }
+            let rangeMin = session.range_min;
+            let rangeMax = session.range_max;
+            if (result === 'low')
+                rangeMin = Math.max(rangeMin, value + 1);
+            else
+                rangeMax = Math.min(rangeMax, value - 1);
+            await services.updateSession(session.id, { attempts, range_min: rangeMin, range_max: rangeMax });
+            const updated = (await services.getById(session.id));
+            return buildGuessView(updated, [hintText(result, rangeMin, rangeMax, locale)], message.target.kind);
+        } });
 }
 export async function handleGuessChoice(services, message, sessionId, choiceId) {
-    const session = await services.getById(sessionId);
-    const locale = resolveLocale(session ? session.locale : message.locale);
-    if (!session)
-        return messages(locale, 'text4');
-    if (session.channel_key
-        !== `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`) {
-        return messages(locale, 'text5');
-    }
-    if (session.player_id !== message.$sender.id)
-        return messages(locale, 'text6');
-    if (choiceId === 'restart' && session.status !== 'active') {
-        return startGame(services, message);
-    }
-    if (choiceId === 'quit' && session.status === 'active') {
-        await services.updateSession(session.id, { status: 'aborted' });
-        const updated = (await services.getById(session.id));
-        return buildGuessView(updated, [messages(locale, 'text7')], message.$channel.type);
-    }
-    return session.status === 'active'
-        ? messages(locale, 'text8')
-        : buildGuessView(session, [], message.$channel.type);
+    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, 'text4');
+            if (session.channel_key
+                !== channelKey(message)) {
+                return messages(locale, 'text5');
+            }
+            if (session.player_id !== message.sender.id)
+                return messages(locale, 'text6');
+            if (choiceId === 'restart' && session.status !== 'active') {
+                return startGame(services, message);
+            }
+            if (choiceId === 'quit' && session.status === 'active') {
+                await services.updateSession(session.id, { status: 'aborted' });
+                const updated = (await services.getById(session.id));
+                return buildGuessView(updated, [messages(locale, 'text7')], message.target.kind);
+            }
+            return session.status === 'active'
+                ? messages(locale, 'text8')
+                : buildGuessView(session, [], message.target.kind);
+        } });
 }
 const messages = createMessages({
     text1: { 'zh-CN': "你已有进行中的一局，请继续猜数字。", en: "You already have an active game. Keep guessing." },

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":"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"}

package/lib/guess-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 getGuessHelp(message?: Pick<GameMessageLike, 'locale' | 'formatCommand'>): string;
+export declare function getGuessHelp(message?: Pick<GamePlayer, 'locale' | 'formatCommand'>): string;
 export declare const GUESS_HELP: string;
-export declare function runGuessCommand(services: SessionService, message: GameMessageLike, action: string): Promise<GameReply>;
+export declare function runGuessCommand(services: SessionService, message: GamePlayer, action: string): Promise<GameReply>;

package/lib/guess-command.js

@@ -3,34 +3,36 @@ import { createMessages } from 'zhin.js/i18n';
 import { startGame } from './game-flow.js';
 import { buildGuessView } from './view.js';
 export function getGuessHelp(message = {}) {
-    return formatGameHelp(message, { 'zh-CN': "猜数字（1~100，7 次机会）", en: "Guess the Number (1–100, seven guesses)" }, 'guess', ['start', 'quit'], { 'zh-CN': "进行中直接回复范围内的整数。", en: "During a game, reply with an integer in the range." });
+    return formatGameHelp({ presentation: message, title: { 'zh-CN': "猜数字（1~100，7 次机会）", en: "Guess the Number (1–100, seven guesses)" }, commandPath: 'guess', actions: ['start', 'quit'], footer: { 'zh-CN': "进行中直接回复范围内的整数。", en: "During a game, reply with an integer in the range." } });
 }
 export const GUESS_HELP = getGuessHelp();
 export async function runGuessCommand(services, message, action) {
-    const ch = channelKey(message);
-    const userId = message.$sender.id;
-    if (!action || action === 'help') {
-        const active = await services.getActiveForUser(ch, userId);
-        const lines = [getGuessHelp(message), ''];
-        if (active) {
-            return buildGuessView(active, [getGuessHelp(message)], message.$channel.type);
-        }
-        else {
-            lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'guess'));
-        }
-        return lines.join('\n');
-    }
-    if (action === 'start')
-        return startGame(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' });
-        const updated = (await services.getById(row.id));
-        return buildGuessView(updated, [messages(row.locale ?? undefined, 'text1')], message.$channel.type);
-    }
-    return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getGuessHelp(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.getActiveForUser(ch, userId);
+                const lines = [getGuessHelp(message), ''];
+                if (active) {
+                    return buildGuessView(active, [getGuessHelp(message)], message.target.kind);
+                }
+                else {
+                    lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'guess'));
+                }
+                return lines.join('\n');
+            }
+            if (action === 'start')
+                return startGame(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' });
+                const updated = (await services.getById(row.id));
+                return buildGuessView(updated, [messages(row.locale ?? undefined, 'text1')], message.target.kind);
+            }
+            return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getGuessHelp(message);
+        } });
 }
 const messages = createMessages({
     text1: { 'zh-CN': "已放弃本局。", en: "You quit this game." },

package/lib/guess-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"guess-command.js","sourceRoot":"","sources":["../src/guess-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,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAE3C,MAAM,UAAU,YAAY,CAAC,UAA6D,EAAE;IAC1F,OAAO,cAAc,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,kBAAkB,EAAE,EAAE,EAAE,yCAAyC,EAAE,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC,EACvI,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE,oDAAoD,EAAE,CAAC,CAAC;AAC7F,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,YAAY,EAAE,CAAC;AAEzC,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,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,gBAAgB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAC3D,MAAM,KAAK,GAAG,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,cAAc,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChF,CAAC;aAAM,CAAC;YACN,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;QACxF,CAAC;QACD,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAED,IAAI,MAAM,KAAK,OAAO;QAAE,OAAO,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAE5D,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,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,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAE,CAAC;QAClD,OAAO,cAAc,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,IAAI,SAAS,EAAE,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACtG,CAAC;IAED,OAAO,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,CAAC;AAC1F,CAAC;AAED,MAAM,QAAQ,GAAG,cAAc,CAAC;IAC9B,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,qBAAqB,EAAE;CACxD,CAAC,CAAC"}
+{"version":3,"file":"guess-command.js","sourceRoot":"","sources":["../src/guess-command.ts"],"names":[],"mappings":"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"}

package/lib/session-service.d.ts

@@ -1,9 +1,9 @@
 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 { GuessSessionRow } from './models.js';
 export type GuessDatabase = Database<unknown, Models, string>;
 export declare class SessionService extends BaseSessionService<GuessSessionRow> {
     constructor(db: GuessDatabase);
-    createSession(message: GameMessageLike): Promise<GuessSessionRow>;
+    createSession(message: GamePlayer): Promise<GuessSessionRow>;
 }
 export declare function createServices(db: GuessDatabase): SessionService;

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 { MAX, MAX_ATTEMPTS, MIN, newSecret } from './engine.js';
 export class SessionService extends BaseSessionService {
     constructor(db) {
@@ -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,
             secret: newSecret(),
             range_min: MIN,
             range_max: MAX,
@@ -43,7 +38,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,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAKhE,MAAM,OAAO,cAAe,SAAQ,kBAAmC;IACrE,YAAY,EAAiB;QAC3B,KAAK,CAAC,EAAqD,EAAE;YAC3D,MAAM,EAAE,OAAO;YACf,KAAK,EAAE,gBAAgB;YACvB,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK;gBACpD,CAAC,CAAC,CAAC;wBACC,MAAM,EAAE,OAAO,CAAC,SAAS;wBACzB,QAAQ,EAAE,OAAO,CAAC,WAAW;wBAC7B,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,IAAI,CAAC,GAAG,CACb,CAAC,EACD,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAC5C,GAAG,EAAE;qBACP,CAAC;gBACJ,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM;oBACzB,CAAC,CAAC,CAAC;4BACC,MAAM,EAAE,OAAO,CAAC,SAAS;4BACzB,QAAQ,EAAE,OAAO,CAAC,WAAW;4BAC7B,MAAM,EAAE,MAAM;yBACf,CAAC;oBACJ,CAAC,CAAC,EAAE;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAwB;QAC1C,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,MAAM,EAAE,SAAS,EAAE;YACnB,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;YACd,QAAQ,EAAE,CAAC;YACX,YAAY,EAAE,YAAY;YAC1B,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;AAC3B,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAKhE,MAAM,OAAO,cAAe,SAAQ,kBAAmC;IACrE,YAAY,EAAiB;QAC3B,KAAK,CAAC,EAAqD,EAAE;YAC3D,MAAM,EAAE,OAAO;YACf,KAAK,EAAE,gBAAgB;YACvB,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,eAAe,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,KAAK;gBACpD,CAAC,CAAC,CAAC;wBACC,MAAM,EAAE,OAAO,CAAC,SAAS;wBACzB,QAAQ,EAAE,OAAO,CAAC,WAAW;wBAC7B,MAAM,EAAE,KAAK;wBACb,KAAK,EAAE,IAAI,CAAC,GAAG,CACb,CAAC,EACD,OAAO,CAAC,YAAY,GAAG,OAAO,CAAC,QAAQ,GAAG,CAAC,CAC5C,GAAG,EAAE;qBACP,CAAC;gBACJ,CAAC,CAAC,OAAO,CAAC,MAAM,KAAK,MAAM;oBACzB,CAAC,CAAC,CAAC;4BACC,MAAM,EAAE,OAAO,CAAC,SAAS;4BACzB,QAAQ,EAAE,OAAO,CAAC,WAAW;4BAC7B,MAAM,EAAE,MAAM;yBACf,CAAC;oBACJ,CAAC,CAAC,EAAE;SACT,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAmB;QACrC,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,MAAM,EAAE,SAAS,EAAE;YACnB,SAAS,EAAE,GAAG;YACd,SAAS,EAAE,GAAG;YACd,QAAQ,EAAE,CAAC;YACX,YAAY,EAAE,YAAY;YAC1B,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/guess-alias/index.js

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

package/middlewares/guess-alias/index.ts

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

package/middlewares/guess-choice/index.js

@@ -1,12 +1,16 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { replyGameOperation, gamePlayerFromInput, parseChoicePayload, resolveGameTextPayload } from '@zhin.js/game-kit';
 import { defineMiddleware } from 'zhin.js/middleware';
-import { messageFromCommandInput, parseChoicePayload, resolveGameTextPayload, } from '@zhin.js/game-kit';
 import { handleGuessChoice } from "../../lib/game-flow.js";
 import { resolveGameServices } from "../../lib/runtime-store.js";
 import { GUESS_PREFIX } from "../../lib/view.js";
 export default defineMiddleware({
     target: 'inbound',
     async handle(context, next) {
+        if (!context.input.sender?.id) {
+            await next();
+            return;
+        }
         const raw = context.input.content?.trim() ?? '';
         const payload = resolveGameTextPayload(raw);
         if (!payload?.startsWith(`${GUESS_PREFIX}:`)) {
@@ -19,7 +23,8 @@ export default defineMiddleware({
             return;
         }
         const services = resolveGameServices(context);
-        const reply = await handleGuessChoice(services, messageFromCommandInput(context.input), parsed.sessionId, parsed.choiceId);
-        await context.input.$reply(reply);
+        const message = gamePlayerFromInput(context.input);
+        await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+            run: () => handleGuessChoice(services, message, parsed.sessionId, parsed.choiceId) });
     },
 });

package/middlewares/guess-choice/index.ts

@@ -1,10 +1,6 @@
+import { replyGameOperation, gamePlayerFromInput, parseChoicePayload, resolveGameTextPayload } from '@zhin.js/game-kit';
 import type { Message } from '@zhin.js/core/runtime';
 import { defineMiddleware } from 'zhin.js/middleware';
-import {
-  messageFromCommandInput,
-  parseChoicePayload,
-  resolveGameTextPayload,
-} from '@zhin.js/game-kit';
 import { handleGuessChoice } from '../../src/game-flow.js';
 import { resolveGameServices } from '../../src/runtime-store.js';
 import { GUESS_PREFIX } from '../../src/view.js';
@@ -12,6 +8,7 @@ import { GUESS_PREFIX } from '../../src/view.js';
 export default defineMiddleware<Message>({
   target: 'inbound',
   async handle(context, next) {
+    if (!context.input.sender?.id) { await next(); return; }
     const raw = context.input.content?.trim() ?? '';
     const payload = resolveGameTextPayload(raw);
     if (!payload?.startsWith(`${GUESS_PREFIX}:`)) {
@@ -24,12 +21,13 @@ export default defineMiddleware<Message>({
       return;
     }
     const services = resolveGameServices(context);
-    const reply = await handleGuessChoice(
+    const message = gamePlayerFromInput(context.input);
+    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => handleGuessChoice(
       services,
-      messageFromCommandInput(context.input),
+      message,
       parsed.sessionId,
       parsed.choiceId,
-    );
-    await context.input.$reply(reply);
+    ) });
   },
 });

package/middlewares/guess-digit/index.js

@@ -1,23 +1,24 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { replyGameOperation, gamePlayerFromInput } from '@zhin.js/game-kit';
 import { defineMiddleware } from 'zhin.js/middleware';
-import { messageFromCommandInput } from '@zhin.js/game-kit';
 import { resolveGameServices } from "../../lib/runtime-store.js";
 import { processGuess } from "../../lib/game-flow.js";
 export default defineMiddleware({
     target: 'inbound',
     async handle(context, next) {
+        if (!context.input.sender?.id) {
+            await next();
+            return;
+        }
         const raw = context.input.content?.trim() ?? '';
         if (!/^(\d+)$/.test(raw)) {
             await next();
             return;
         }
         const services = resolveGameServices(context);
-        const message = messageFromCommandInput(context.input);
-        const reply = await processGuess(services, message, Number(raw));
-        if (reply) {
-            await context.input.$reply(reply);
-            return;
-        }
+        const message = gamePlayerFromInput(context.input);
+        await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+            run: () => processGuess(services, message, Number(raw)) });
         await next();
     },
 });

package/middlewares/guess-digit/index.ts

@@ -1,24 +1,22 @@
+import { replyGameOperation, gamePlayerFromInput } from '@zhin.js/game-kit';
 import { defineMiddleware } from 'zhin.js/middleware';
 import type { Message } from '@zhin.js/core/runtime';
-import { messageFromCommandInput } from '@zhin.js/game-kit';
 import { resolveGameServices } from '../../src/runtime-store.js';
 import { processGuess } from '../../src/game-flow.js';
 
 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 (!/^(\d+)$/.test(raw)) {
       await next();
       return;
     }
     const services = resolveGameServices(context);
-    const message = messageFromCommandInput(context.input);
-    const reply = await processGuess(services, message, Number(raw));
-    if (reply) {
-      await context.input.$reply(reply);
-      return;
-    }
+    const message = gamePlayerFromInput(context.input);
+    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => processGuess(services, message, Number(raw)) });
     await next();
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-guess-number",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Zhin.js 猜数字 — 1~100 七步之内猜中 (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -23,13 +23,13 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@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",
@@ -66,9 +66,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,101 +1,107 @@
 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 { evaluateGuess, hintText, MAX, MIN } from './engine.js';
 import type { SessionService } from './session-service.js';
 import { buildGuessView } from './view.js';
 
 export async function startGame(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
 ): Promise<GameReply> {
-  const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
-  const mine = await services.getActiveForUser(ch, message.$sender.id);
-  const locale = resolveLocale(mine ? mine.locale : message.locale);
-  if (mine) {
-    return buildGuessView(
-      mine,
-      [messages(locale, 'text1')],
-      message.$channel.type,
-    );
-  }
-  const session = await services.createSession(message);
-  return buildGuessView(session, [], message.$channel.type);
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const ch = channelKey(message);
+    const mine = await services.getActiveForUser(ch, message.sender.id);
+    const locale = resolveLocale(mine ? mine.locale : message.locale);
+    if (mine) {
+      return buildGuessView(
+        mine,
+        [messages(locale, 'text1')],
+        message.target.kind,
+      );
+    }
+    const session = await services.createSession(message);
+    return buildGuessView(session, [], message.target.kind);
+  } });
 }
 
 export async function processGuess(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   value: number,
 ): 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) return null;
+  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) return null;
 
-  const result = evaluateGuess(session.secret, value);
-  if (result === 'invalid') {
-    return messages(locale, 'text2', { p0: MIN, p1: MAX });
-  }
+    const result = evaluateGuess(session.secret, value);
+    if (result === 'invalid') {
+      return messages(locale, 'text2', { p0: MIN, p1: MAX });
+    }
 
-  const attempts = session.attempts + 1;
+    const attempts = session.attempts + 1;
 
-  if (result === 'win') {
-    await services.updateSession(session.id, { attempts, status: 'won' });
-    const updated = (await services.getById(session.id))!;
-    return buildGuessView(
-      updated,
-      [messages(locale, 'text3', { p0: attempts })],
-      message.$channel.type,
-    );
-  }
+    if (result === 'win') {
+      await services.updateSession(session.id, { attempts, status: 'won' });
+      const updated = (await services.getById(session.id))!;
+      return buildGuessView(
+        updated,
+        [messages(locale, 'text3', { p0: attempts })],
+        message.target.kind,
+      );
+    }
 
-  if (attempts >= session.max_attempts) {
-    await services.updateSession(session.id, { attempts, status: 'lost' });
-    const updated = (await services.getById(session.id))!;
-    return buildGuessView(updated, [], message.$channel.type);
-  }
+    if (attempts >= session.max_attempts) {
+      await services.updateSession(session.id, { attempts, status: 'lost' });
+      const updated = (await services.getById(session.id))!;
+      return buildGuessView(updated, [], message.target.kind);
+    }
 
-  let rangeMin = session.range_min;
-  let rangeMax = session.range_max;
-  if (result === 'low') rangeMin = Math.max(rangeMin, value + 1);
-  else rangeMax = Math.min(rangeMax, value - 1);
+    let rangeMin = session.range_min;
+    let rangeMax = session.range_max;
+    if (result === 'low') rangeMin = Math.max(rangeMin, value + 1);
+    else rangeMax = Math.min(rangeMax, value - 1);
 
-  await services.updateSession(session.id, { attempts, range_min: rangeMin, range_max: rangeMax });
+    await services.updateSession(session.id, { attempts, range_min: rangeMin, range_max: rangeMax });
 
-  const updated = (await services.getById(session.id))!;
-  return buildGuessView(
-    updated,
-    [hintText(result, rangeMin, rangeMax, locale)],
-    message.$channel.type,
-  );
+    const updated = (await services.getById(session.id))!;
+    return buildGuessView(
+      updated,
+      [hintText(result, rangeMin, rangeMax, locale)],
+      message.target.kind,
+    );
+  } });
 }
 
 export async function handleGuessChoice(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   sessionId: string,
   choiceId: string,
 ): Promise<GameReply> {
-  const session = await services.getById(sessionId);
-  const locale = resolveLocale(session ? session.locale : message.locale);
-  if (!session) return messages(locale, 'text4');
-  if (session.channel_key
-    !== `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`) {
-    return messages(locale, 'text5');
-  }
-  if (session.player_id !== message.$sender.id) return messages(locale, 'text6');
+  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, 'text4');
+    if (session.channel_key
+      !== channelKey(message)) {
+      return messages(locale, 'text5');
+    }
+    if (session.player_id !== message.sender.id) return messages(locale, 'text6');
 
-  if (choiceId === 'restart' && session.status !== 'active') {
-    return startGame(services, message);
-  }
-  if (choiceId === 'quit' && session.status === 'active') {
-    await services.updateSession(session.id, { status: 'aborted' });
-    const updated = (await services.getById(session.id))!;
-    return buildGuessView(updated, [messages(locale, 'text7')], message.$channel.type);
-  }
-  return session.status === 'active'
-    ? messages(locale, 'text8')
-    : buildGuessView(session, [], message.$channel.type);
+    if (choiceId === 'restart' && session.status !== 'active') {
+      return startGame(services, message);
+    }
+    if (choiceId === 'quit' && session.status === 'active') {
+      await services.updateSession(session.id, { status: 'aborted' });
+      const updated = (await services.getById(session.id))!;
+      return buildGuessView(updated, [messages(locale, 'text7')], message.target.kind);
+    }
+    return session.status === 'active'
+      ? messages(locale, 'text8')
+      : buildGuessView(session, [], message.target.kind);
+  } });
 }
 
 const messages = createMessages({

package/src/guess-command.ts

@@ -1,46 +1,47 @@
-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 { startGame } from './game-flow.js';
 import type { SessionService } from './session-service.js';
 import { buildGuessView } from './view.js';
 
-export function getGuessHelp(message: Pick<GameMessageLike, 'locale' | 'formatCommand'> = {}): string {
-  return formatGameHelp(message, { 'zh-CN': "猜数字（1~100，7 次机会）", en: "Guess the Number (1–100, seven guesses)" }, 'guess', ['start', 'quit'],
-    { 'zh-CN': "进行中直接回复范围内的整数。", en: "During a game, reply with an integer in the range." });
+export function getGuessHelp(message: Pick<GamePlayer, 'locale' | 'formatCommand'> = {}): string {
+  return formatGameHelp({ presentation: message, title: { 'zh-CN': "猜数字（1~100，7 次机会）", en: "Guess the Number (1–100, seven guesses)" }, commandPath: 'guess', actions: ['start', 'quit'], footer: { 'zh-CN': "进行中直接回复范围内的整数。", en: "During a game, reply with an integer in the range." } });
 }
 
 export const GUESS_HELP = getGuessHelp();
 
 export async function runGuessCommand(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   action: string,
 ): Promise<GameReply> {
-  const ch = channelKey(message);
-  const userId = message.$sender.id;
-
-  if (!action || action === 'help') {
-    const active = await services.getActiveForUser(ch, userId);
-    const lines = [getGuessHelp(message), ''];
-    if (active) {
-      return buildGuessView(active, [getGuessHelp(message)], message.$channel.type);
-    } else {
-      lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'guess'));
+  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.getActiveForUser(ch, userId);
+      const lines = [getGuessHelp(message), ''];
+      if (active) {
+        return buildGuessView(active, [getGuessHelp(message)], message.target.kind);
+      } else {
+        lines.push(gameCommandFeedback(message, 'noGame'), gameCommandHint(message, 'guess'));
+      }
+      return lines.join('\n');
     }
-    return lines.join('\n');
-  }
 
-  if (action === 'start') return startGame(services, message);
+    if (action === 'start') return startGame(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' });
-    const updated = (await services.getById(row.id))!;
-    return buildGuessView(updated, [messages(row.locale ?? undefined, 'text1')], message.$channel.type);
-  }
+    if (action === 'quit') {
+      const row = await services.getActiveForUser(ch, userId);
+      if (!row) return gameCommandFeedback(message, 'noGame');
+      await services.updateSession(row.id, { status: 'aborted' });
+      const updated = (await services.getById(row.id))!;
+      return buildGuessView(updated, [messages(row.locale ?? undefined, 'text1')], message.target.kind);
+    }
 
-  return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getGuessHelp(message);
+    return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getGuessHelp(message);
+  } });
 }
 
 const messages = createMessages({

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 { MAX, MAX_ATTEMPTS, MIN, newSecret } from './engine.js';
@@ -37,18 +36,13 @@ export class SessionService extends BaseSessionService<GuessSessionRow> {
     });
   }
 
-  async createSession(message: GameMessageLike): Promise<GuessSessionRow> {
+  async createSession(message: GamePlayer): Promise<GuessSessionRow> {
     const now = Date.now();
-    const row: GuessSessionRow = {
+    const row: Omit<GuessSessionRow, '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,
       secret: newSecret(),
       range_min: MIN,
       range_max: MAX,
@@ -58,7 +52,7 @@ export class SessionService extends BaseSessionService<GuessSessionRow> {
       updated_at: now,
       created_at: now,
     };
-    return this.createRow(row);
+    return this.createRow({ target: message.target, fields: row });
   }
 }