@zhin.js/plugin-blackjack 1.1.18 → 1.1.19

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

@@ -1,6 +1,6 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { replyGameOperation, gamePlayerFromInput } from '@zhin.js/game-kit';
 import { defineCommand } from 'zhin.js/command';
-import { messageFromCommandInput } from '@zhin.js/game-kit';
 import { getBjHelp, runBjCommand } from "../../../lib/bj-command.js";
 import { resolveGameServices } from "../../../lib/runtime-store.js";
 function normalizeBjAction(raw) {
@@ -16,12 +16,13 @@ function normalizeBjAction(raw) {
 export default defineCommand({
     description: 'Blackjack',
     params: { action: { type: 'string', default: '' } },
-    async execute({ params, input, use, locale, formatCommand }) {
+    async execute({ params, input, use, locale, formatCommand, session }) {
         const action = normalizeBjAction(String(params.action ?? ''));
         if (!action || action === 'help')
             return getBjHelp({ locale, formatCommand });
         const services = resolveGameServices({ use });
-        const message = messageFromCommandInput(input, { locale, formatCommand });
-        return runBjCommand(services, message, action);
+        const message = gamePlayerFromInput(input, { locale, formatCommand });
+        await replyGameOperation({ session: services, player: message, reply: session?.reply,
+            run: () => runBjCommand(services, message, action) });
     },
 });

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

@@ -1,5 +1,5 @@
+import { replyGameOperation, gamePlayerFromInput } from '@zhin.js/game-kit';
 import { defineCommand } from 'zhin.js/command';
-import { messageFromCommandInput } from '@zhin.js/game-kit';
 import { getBjHelp, runBjCommand } from '../../../src/bj-command.js';
 import { resolveGameServices } from '../../../src/runtime-store.js';
 
@@ -14,11 +14,12 @@ function normalizeBjAction(raw: string): string {
 export default defineCommand({
   description: 'Blackjack',
   params: { action: { type: 'string', default: '' } },
-  async execute({ params, input, use, locale, formatCommand }) {
+  async execute({ params, input, use, locale, formatCommand, session }) {
     const action = normalizeBjAction(String(params.action ?? ''));
     if (!action || action === 'help') return getBjHelp({ locale, formatCommand });
     const services = resolveGameServices({ use });
-    const message = messageFromCommandInput(input, { locale, formatCommand });
-    return runBjCommand(services, message, action);
+    const message = gamePlayerFromInput(input, { locale, formatCommand });
+    await replyGameOperation({ session: services, player: message, reply: session?.reply,
+      run: () => runBjCommand(services, message, action) });
   },
 });

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

package/lib/bj-command.js

@@ -1,23 +1,25 @@
-import { formatGameHelp, gameCommandFeedback } from '@zhin.js/game-kit';
+import { channelKey, formatGameHelp, gameCommandFeedback } from '@zhin.js/game-kit';
 import { continueGame, handleChoice, startGame } from './game-flow.js';
 export function getBjHelp(message = {}) {
-    return formatGameHelp(message, { 'zh-CN': "🃏 **21 点**", en: "🃏 **Blackjack**" }, 'bj', ['start', 'continue', 'quit'], { 'zh-CN': "尽量让手牌点数接近 21 且不超过，比庄家大即获胜。对局中点击要牌或停牌。", en: "Get as close to 21 as possible without going over, and beat the dealer. Choose Hit or Stand during play." });
+    return formatGameHelp({ presentation: message, title: { 'zh-CN': "🃏 **21 点**", en: "🃏 **Blackjack**" }, commandPath: 'bj', actions: ['start', 'continue', 'quit'], footer: { 'zh-CN': "尽量让手牌点数接近 21 且不超过，比庄家大即获胜。对局中点击要牌或停牌。", en: "Get as close to 21 as possible without going over, and beat the dealer. Choose Hit or Stand during play." } });
 }
 export const BJ_HELP = getBjHelp();
 export async function runBjCommand(services, message, action) {
-    const a = action.trim().toLowerCase() || 'help';
-    if (a === 'help' || a === '帮助')
-        return getBjHelp(message);
-    if (a === 'start' || a === '开始')
-        return (await startGame(services, message)) ?? '';
-    if (a === 'continue' || a === '继续')
-        return continueGame(services, message);
-    if (a === 'quit' || a === '放弃') {
-        const session = await services.getActiveForUser(`${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`, message.$sender.id);
-        if (!session)
-            return gameCommandFeedback(message, 'noGame');
-        return (await handleChoice(services, message, session.id, 'quit')) ?? '';
-    }
-    return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getBjHelp(message);
+    return services.runInScope({ scope: channelKey(message), run: async () => {
+            const a = action.trim().toLowerCase() || 'help';
+            if (a === 'help' || a === '帮助')
+                return getBjHelp(message);
+            if (a === 'start' || a === '开始')
+                return (await startGame(services, message)) ?? '';
+            if (a === 'continue' || a === '继续')
+                return continueGame(services, message);
+            if (a === 'quit' || a === '放弃') {
+                const session = await services.getActiveForUser(channelKey(message), message.sender.id);
+                if (!session)
+                    return gameCommandFeedback(message, 'noGame');
+                return (await handleChoice(services, message, session.id, 'quit')) ?? '';
+            }
+            return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getBjHelp(message);
+        } });
 }
 //# sourceMappingURL=bj-command.js.map

package/lib/bj-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"bj-command.js","sourceRoot":"","sources":["../src/bj-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAyD,MAAM,mBAAmB,CAAC;AAC/H,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGvE,MAAM,UAAU,SAAS,CAAC,UAA6D,EAAE;IACvF,OAAO,cAAc,CAAC,OAAO,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE,IAAI,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,EACpH,EAAE,OAAO,EAAE,uCAAuC,EAAE,EAAE,EAAE,0GAA0G,EAAE,CAAC,CAAC;AAC1K,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAwB,EACxB,OAAwB,EACxB,MAAc;IAEd,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC;IAChD,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;IACnF,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC3E,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;QAC/B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAC7C,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,SAAS,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE,EAAE,EAC1F,OAAO,CAAC,OAAO,CAAC,EAAE,CACnB,CAAC;QACF,IAAI,CAAC,OAAO;YAAE,OAAO,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC5D,OAAO,CAAC,MAAM,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;IAC3E,CAAC;IACD,OAAO,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;AACvF,CAAC"}
+{"version":3,"file":"bj-command.js","sourceRoot":"","sources":["../src/bj-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,mBAAmB,EAAoD,MAAM,mBAAmB,CAAC;AACtI,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGvE,MAAM,UAAU,SAAS,CAAC,UAAwD,EAAE;IAClF,OAAO,cAAc,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,kBAAkB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,uCAAuC,EAAE,EAAE,EAAE,0GAA0G,EAAE,EAAE,CAAC,CAAC;AACvV,CAAC;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,EAAE,CAAC;AAEnC,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,QAAwB,EACxB,OAAmB,EACnB,MAAc;IAEd,OAAO,QAAQ,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,KAAK,IAAI,EAAE;YACvE,MAAM,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,MAAM,CAAC;YAChD,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC;YAC1D,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,CAAC,MAAM,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;YACnF,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,IAAI;gBAAE,OAAO,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YAC3E,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,IAAI,EAAE,CAAC;gBAC/B,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,gBAAgB,CAC7C,UAAU,CAAC,OAAO,CAAC,EACnB,OAAO,CAAC,MAAM,CAAC,EAAE,CAClB,CAAC;gBACF,IAAI,CAAC,OAAO;oBAAE,OAAO,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;gBAC5D,OAAO,CAAC,MAAM,YAAY,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3E,CAAC;YACD,OAAO,mBAAmB,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,GAAG,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC;QACvF,CAAC,EAAE,CAAC,CAAC;AACP,CAAC"}

package/lib/game-flow.d.ts

@@ -1,7 +1,7 @@
-import type { GameMessageLike, GameReply } from '@zhin.js/game-kit';
+import { type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import { BJ_PREFIX, handValue, TARGET } from './engine.js';
 import { type SessionService } from './session-service.js';
-export declare function startGame(services: SessionService, message: GameMessageLike): Promise<GameReply | undefined>;
-export declare function continueGame(services: SessionService, message: GameMessageLike): Promise<GameReply>;
-export declare function handleChoice(services: SessionService, message: GameMessageLike, sessionId: string, choiceId: string): Promise<GameReply | null>;
+export declare function startGame(services: SessionService, message: GamePlayer): Promise<GameReply | undefined>;
+export declare function continueGame(services: SessionService, message: GamePlayer): Promise<GameReply>;
+export declare function handleChoice(services: SessionService, message: GamePlayer, sessionId: string, choiceId: string): Promise<GameReply | null>;
 export { BJ_PREFIX, handValue, TARGET };

package/lib/game-flow.js

@@ -1,4 +1,5 @@
 import { createMessages, resolveLocale } from 'zhin.js/i18n';
+import { channelKey } from '@zhin.js/game-kit';
 import { BJ_PREFIX, compareHands, dealerShouldHit, handValue, TARGET, } from './engine.js';
 import { parseCards, parseDeck } from './session-service.js';
 import { buildBjView, naturalOutcome, playerBust } from './view.js';
@@ -8,7 +9,7 @@ import { buildBjView, naturalOutcome, playerBust } from './view.js';
  * and the choice middleware return fresh text each turn.
  */
 function renderView(session, message, terminal = false, revealDealer = false) {
-    return buildBjView(session, terminal, revealDealer, message.$channel.type);
+    return buildBjView(session, terminal, revealDealer, message.target.kind);
 }
 async function finishRound(services, message, session, status) {
     await services.updateSession(session.id, { status });
@@ -26,74 +27,80 @@ async function dealerPlay(deck, dealer) {
     return hand;
 }
 export async function startGame(services, message) {
-    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');
-        }
-        return messages(locale, 'text2', { p0: active.player_name });
-    }
-    const session = await services.createSession(message);
-    const natural = naturalOutcome(session);
-    if (natural) {
-        return finishRound(services, message, session, natural);
-    }
-    return renderView(session, message);
+    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');
+                }
+                return messages(locale, 'text2', { p0: active.player_name });
+            }
+            const session = await services.createSession(message);
+            const natural = naturalOutcome(session);
+            if (natural) {
+                return finishRound(services, message, session, natural);
+            }
+            return renderView(session, message);
+        } });
 }
 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(session, message);
+    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(session, message);
+        } });
 }
 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, 'text4');
-    if (session.player_id !== message.$sender.id)
-        return messages(locale, 'text5');
-    if (session.status !== 'active' && choiceId === 'restart') {
-        await services.updateSession(session.id, { status: 'aborted' });
-        return (await startGame(services, message)) ?? null;
-    }
-    if (session.status !== 'active')
-        return messages(locale, 'text6');
-    if (choiceId === 'quit') {
-        await services.updateSession(session.id, { status: 'aborted' });
-        return renderView((await services.getById(session.id)), message, true, true);
-    }
-    const deck = parseDeck(session.deck_json);
-    let player = parseCards(session.player_cards_json);
-    let dealer = parseCards(session.dealer_cards_json);
-    if (choiceId === 'hit') {
-        const card = deck.pop();
-        if (!card)
-            return messages(locale, 'text7');
-        player = [...player, card];
-        await services.updateSession(session.id, {
-            deck_json: JSON.stringify(deck),
-            player_cards_json: JSON.stringify(player),
-        });
-        if (playerBust({ ...session, player_cards_json: JSON.stringify(player) })) {
-            return finishRound(services, message, session, 'lost');
-        }
-        const updated = (await services.getById(session.id));
-        return renderView(updated, message);
-    }
-    if (choiceId !== 'stand')
-        return messages(locale, 'text8');
-    dealer = await dealerPlay(deck, dealer);
-    await services.updateSession(session.id, {
-        deck_json: JSON.stringify(deck),
-        dealer_cards_json: JSON.stringify(dealer),
-    });
-    const outcome = compareHands(player, dealer);
-    const status = outcome === 'won' ? 'won' : outcome === 'lost' ? 'lost' : 'draw';
-    return finishRound(services, message, session, status);
+    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.player_id !== message.sender.id)
+                return messages(locale, 'text5');
+            if (session.status !== 'active' && choiceId === 'restart') {
+                await services.updateSession(session.id, { status: 'aborted' });
+                return (await startGame(services, message)) ?? null;
+            }
+            if (session.status !== 'active')
+                return messages(locale, 'text6');
+            if (choiceId === 'quit') {
+                await services.updateSession(session.id, { status: 'aborted' });
+                return renderView((await services.getById(session.id)), message, true, true);
+            }
+            const deck = parseDeck(session.deck_json);
+            let player = parseCards(session.player_cards_json);
+            let dealer = parseCards(session.dealer_cards_json);
+            if (choiceId === 'hit') {
+                const card = deck.pop();
+                if (!card)
+                    return messages(locale, 'text7');
+                player = [...player, card];
+                await services.updateSession(session.id, {
+                    deck_json: JSON.stringify(deck),
+                    player_cards_json: JSON.stringify(player),
+                });
+                if (playerBust({ ...session, player_cards_json: JSON.stringify(player) })) {
+                    return finishRound(services, message, session, 'lost');
+                }
+                const updated = (await services.getById(session.id));
+                return renderView(updated, message);
+            }
+            if (choiceId !== 'stand')
+                return messages(locale, 'text8');
+            dealer = await dealerPlay(deck, dealer);
+            await services.updateSession(session.id, {
+                deck_json: JSON.stringify(deck),
+                dealer_cards_json: JSON.stringify(dealer),
+            });
+            const outcome = compareHands(player, dealer);
+            const status = outcome === 'won' ? 'won' : outcome === 'lost' ? 'lost' : 'draw';
+            return finishRound(services, message, session, status);
+        } });
 }
 export { BJ_PREFIX, handValue, TARGET };
 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,SAAS,EACT,YAAY,EACZ,eAAe,EACf,SAAS,EACT,MAAM,GACP,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,SAAS,EAAuB,MAAM,sBAAsB,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEpE;;;;GAIG;AACH,SAAS,UAAU,CACjB,OAAqB,EACrB,OAAmB,EACnB,QAAQ,GAAG,KAAK,EAChB,YAAY,GAAG,KAAK;IAEpB,OAAO,WAAW,CAAC,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;AAC3E,CAAC;AAED,KAAK,UAAU,WAAW,CACxB,QAAwB,EACxB,OAAmB,EACnB,OAAqB,EACrB,MAA8B;IAE9B,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,CAAC;IACtD,OAAO,UAAU,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAClD,CAAC;AAED,KAAK,UAAU,UAAU,CACvB,IAAc,EACd,MAAgB;IAEhB,MAAM,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC;IACzB,OAAO,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,IAAI;YAAE,MAAM;QACjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClB,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,SAAS,CAC7B,QAAwB,EACxB,OAAmB;IAEnB,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,CAAC,CAAC;gBACnC,CAAC;gBACD,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;YAC/D,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;YACtD,MAAM,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;YACxC,IAAI,OAAO,EAAE,CAAC;gBACZ,OAAO,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;YAC1D,CAAC;YACD,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,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,OAAO,CAAC,CAAC;YAC/C,IAAI,OAAO,CAAC,SAAS,KAAK,OAAO,CAAC,MAAM,CAAC,EAAE;gBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAE9E,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;gBAC1D,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,CAAC,CAAC,IAAI,IAAI,CAAC;YACtD,CAAC;YAED,IAAI,OAAO,CAAC,MAAM,KAAK,QAAQ;gBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAElE,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,UAAU,CAAC,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YAChF,CAAC;YAED,MAAM,IAAI,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;YAC1C,IAAI,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YACnD,IAAI,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;YAEnD,IAAI,QAAQ,KAAK,KAAK,EAAE,CAAC;gBACvB,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;gBACxB,IAAI,CAAC,IAAI;oBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAC5C,MAAM,GAAG,CAAC,GAAG,MAAM,EAAE,IAAI,CAAC,CAAC;gBAC3B,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE;oBACvC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;oBAC/B,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;iBAC1C,CAAC,CAAC;gBACH,IAAI,UAAU,CAAC,EAAE,GAAG,OAAO,EAAE,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC1E,OAAO,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;gBACzD,CAAC;gBACD,MAAM,OAAO,GAAG,CAAC,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAE,CAAC;gBACtD,OAAO,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YACtC,CAAC;YAED,IAAI,QAAQ,KAAK,OAAO;gBAAE,OAAO,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAE3D,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACxC,MAAM,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,EAAE;gBACvC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;gBAC/B,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;aAC1C,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YAC7C,MAAM,MAAM,GACV,OAAO,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC;YACnE,OAAO,WAAW,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACzD,CAAC,EAAE,CAAC,CAAC;AACP,CAAC;AAED,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC;AAExC,MAAM,QAAQ,GAAG,cAAc,CAAC;IAC9B,KAAK,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE,EAAE,EAAE,yEAAyE,EAAE;IAC/H,KAAK,EAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,EAAE,EAAE,4CAA4C,EAAE;IAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE,EAAE,EAAE,oCAAoC,EAAE;IAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,6BAA6B,EAAE;IAC/D,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,sCAAsC,EAAE;IAC1E,KAAK,EAAE,EAAE,OAAO,EAAE,gBAAgB,EAAE,EAAE,EAAE,yCAAyC,EAAE;IACnF,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,oBAAoB,EAAE;IACrD,KAAK,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,iBAAiB,EAAE;CACnD,CAAC,CAAC"}

package/lib/session-service.d.ts

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

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 { freshDeck } 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: String(message.$sender.name ?? message.$sender.id),
+            player_id: message.sender.id,
+            player_name: String(message.sender.name ?? message.sender.id),
             deck_json: JSON.stringify(deck),
             player_cards_json: JSON.stringify(playerCards),
             dealer_cards_json: JSON.stringify(dealerCards),
@@ -41,7 +36,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":"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"}
+{"version":3,"file":"session-service.js","sourceRoot":"","sources":["../src/session-service.ts"],"names":[],"mappings":"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"}

package/middlewares/bj-alias/index.js

@@ -1,5 +1,5 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineGameCommandAliasMiddleware, messageFromCommandInput } from '@zhin.js/game-kit';
+import { replyGameOperation, defineGameCommandAliasMiddleware, gamePlayerFromInput } from '@zhin.js/game-kit';
 import { getBjHelp, runBjCommand } from "../../lib/bj-command.js";
 import { resolveGameServices } from "../../lib/runtime-store.js";
 function normalizeBjAction(raw) {
@@ -15,13 +15,17 @@ function normalizeBjAction(raw) {
 export default defineGameCommandAliasMiddleware({
     aliases: ['21点', 'bj'],
     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 = normalizeBjAction(String(action ?? ''));
-        if (!normalized || normalized === 'help')
-            return getBjHelp(message);
+        if (!normalized || normalized === 'help') {
+            await context.input.$reply(getBjHelp(presentation));
+            return true;
+        }
+        const message = gamePlayerFromInput(input, presentation);
         const services = resolveGameServices(context);
-        return runBjCommand(services, message, normalized);
+        await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+            run: () => runBjCommand(services, message, normalized) });
+        return true;
     },
 });

package/middlewares/bj-alias/index.ts

@@ -1,4 +1,4 @@
-import { defineGameCommandAliasMiddleware, messageFromCommandInput } from '@zhin.js/game-kit';
+import { replyGameOperation, defineGameCommandAliasMiddleware, gamePlayerFromInput } from '@zhin.js/game-kit';
 import { getBjHelp, runBjCommand } from '../../src/bj-command.js';
 import { resolveGameServices } from '../../src/runtime-store.js';
 
@@ -13,12 +13,15 @@ function normalizeBjAction(raw: string): string {
 export default defineGameCommandAliasMiddleware({
   aliases: ['21点', 'bj'],
   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 = normalizeBjAction(String(action ?? ''));
-    if (!normalized || normalized === 'help') return getBjHelp(message);
+    if (!normalized || normalized === 'help') { await context.input.$reply(getBjHelp(presentation)); return true; }
+    const message = gamePlayerFromInput(input, presentation);
     const services = resolveGameServices(context);
-    return runBjCommand(services, message, normalized);
+    await replyGameOperation({ session: services, player: message, reply: content => context.input.$reply(content),
+      run: () => runBjCommand(services, message, normalized) });
+    return true;
   },
 });

package/middlewares/bj-choice/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 { BJ_PREFIX, handleChoice } from "../../lib/game-flow.js";
 /**
@@ -10,13 +10,17 @@ import { BJ_PREFIX, handleChoice } 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 (!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,9 +29,8 @@ 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;
                 }
             }
@@ -35,7 +38,7 @@ export default defineMiddleware({
             return;
         }
         // 不按 status 过滤取本频道本人最近一局：终局 session 也要能命中 restart 分支
-        const session = await services.getLatestForUser(ch, message.$sender.id);
+        const session = await services.getLatestForUser(ch, message.sender.id);
         if (!session) {
             await next();
             return;
@@ -47,9 +50,8 @@ export default defineMiddleware({
             const payload = resolveGameTextPayload(raw, map);
             const parsed = payload ? parseChoicePayload(payload, BJ_PREFIX) : null;
             if (parsed?.choiceId === 'restart') {
-                const reply = await handleChoice(services, message, parsed.sessionId, 'restart');
-                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, 'restart') });
                 return;
             }
             await next();
@@ -66,8 +68,7 @@ export default defineMiddleware({
             await next();
             return;
         }
-        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) });
     },
 });

package/middlewares/bj-choice/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 { BJ_PREFIX, handleChoice } from '../../src/game-flow.js';
 
@@ -17,13 +18,14 @@ import { BJ_PREFIX, handleChoice } 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 (!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;
         }
       }
@@ -43,7 +45,7 @@ export default defineMiddleware<Message>({
     }
 
     // 不按 status 过滤取本频道本人最近一局：终局 session 也要能命中 restart 分支
-    const session = await services.getLatestForUser(ch, message.$sender.id);
+    const session = await services.getLatestForUser(ch, message.sender.id);
     if (!session) {
       await next();
       return;
@@ -56,8 +58,8 @@ export default defineMiddleware<Message>({
       const payload = resolveGameTextPayload(raw, map);
       const parsed = payload ? parseChoicePayload(payload, BJ_PREFIX) : null;
       if (parsed?.choiceId === 'restart') {
-        const reply = await handleChoice(services, message, parsed.sessionId, 'restart');
-        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, 'restart') });
         return;
       }
       await next();
@@ -76,7 +78,7 @@ export default defineMiddleware<Message>({
       return;
     }
 
-    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) });
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-blackjack",
-  "version": "1.1.18",
+  "version": "1.1.19",
   "description": "Zhin.js 21 点（Blackjack）(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.54",
+    "@zhin.js/game-kit": "1.1.19"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "zhin.js": "1.1.18"
+    "zhin.js": "1.1.19"
   },
   "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.12",
+    "@zhin.js/middleware": "^1.1.11",
+    "zhin.js": "^1.1.19"
   },
   "peerDependenciesMeta": {
     "@zhin.js/command": {

package/src/bj-command.ts

@@ -1,30 +1,31 @@
-import { formatGameHelp, gameCommandFeedback, gameCommandHint, type GameMessageLike, type GameReply } from '@zhin.js/game-kit';
+import { channelKey, formatGameHelp, gameCommandFeedback, gameCommandHint, type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import { continueGame, handleChoice, startGame } from './game-flow.js';
 import type { SessionService } from './session-service.js';
 
-export function getBjHelp(message: Pick<GameMessageLike, 'locale' | 'formatCommand'> = {}): string {
-  return formatGameHelp(message, { 'zh-CN': "🃏 **21 点**", en: "🃏 **Blackjack**" }, 'bj', ['start', 'continue', 'quit'],
-    { 'zh-CN': "尽量让手牌点数接近 21 且不超过，比庄家大即获胜。对局中点击要牌或停牌。", en: "Get as close to 21 as possible without going over, and beat the dealer. Choose Hit or Stand during play." });
+export function getBjHelp(message: Pick<GamePlayer, 'locale' | 'formatCommand'> = {}): string {
+  return formatGameHelp({ presentation: message, title: { 'zh-CN': "🃏 **21 点**", en: "🃏 **Blackjack**" }, commandPath: 'bj', actions: ['start', 'continue', 'quit'], footer: { 'zh-CN': "尽量让手牌点数接近 21 且不超过，比庄家大即获胜。对局中点击要牌或停牌。", en: "Get as close to 21 as possible without going over, and beat the dealer. Choose Hit or Stand during play." } });
 }
 
 export const BJ_HELP = getBjHelp();
 
 export async function runBjCommand(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   action: string,
 ): Promise<GameReply> {
-  const a = action.trim().toLowerCase() || 'help';
-  if (a === 'help' || a === '帮助') return getBjHelp(message);
-  if (a === 'start' || a === '开始') return (await startGame(services, message)) ?? '';
-  if (a === 'continue' || a === '继续') return continueGame(services, message);
-  if (a === 'quit' || a === '放弃') {
-    const session = await services.getActiveForUser(
-      `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`,
-      message.$sender.id,
-    );
-    if (!session) return gameCommandFeedback(message, 'noGame');
-    return (await handleChoice(services, message, session.id, 'quit')) ?? '';
-  }
-  return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getBjHelp(message);
+  return services.runInScope({ scope: channelKey(message), run: async () => {
+    const a = action.trim().toLowerCase() || 'help';
+    if (a === 'help' || a === '帮助') return getBjHelp(message);
+    if (a === 'start' || a === '开始') return (await startGame(services, message)) ?? '';
+    if (a === 'continue' || a === '继续') return continueGame(services, message);
+    if (a === 'quit' || a === '放弃') {
+      const session = await services.getActiveForUser(
+        channelKey(message),
+        message.sender.id,
+      );
+      if (!session) return gameCommandFeedback(message, 'noGame');
+      return (await handleChoice(services, message, session.id, 'quit')) ?? '';
+    }
+    return gameCommandFeedback(message, 'unknown', action) + '\n\n' + getBjHelp(message);
+  } });
 }

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 {
   BJ_PREFIX,
   compareHands,
@@ -19,16 +19,16 @@ import { buildBjView, naturalOutcome, playerBust } from './view.js';
  */
 function renderView(
   session: BjSessionRow,
-  message: GameMessageLike,
+  message: GamePlayer,
   terminal = false,
   revealDealer = false,
 ): GameReply {
-  return buildBjView(session, terminal, revealDealer, message.$channel.type);
+  return buildBjView(session, terminal, revealDealer, message.target.kind);
 }
 
 async function finishRound(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   session: BjSessionRow,
   status: BjSessionRow['status'],
 ): Promise<GameReply> {
@@ -52,91 +52,97 @@ async function dealerPlay(
 
 export async function startGame(
   services: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
 ): 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');
+  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');
+      }
+      return messages(locale, 'text2', { p0: active.player_name });
     }
-    return messages(locale, 'text2', { p0: active.player_name });
-  }
-  const session = await services.createSession(message);
-  const natural = naturalOutcome(session);
-  if (natural) {
-    return finishRound(services, message, session, natural);
-  }
-  return renderView(session, message);
+    const session = await services.createSession(message);
+    const natural = naturalOutcome(session);
+    if (natural) {
+      return finishRound(services, message, session, natural);
+    }
+    return renderView(session, message);
+  } });
 }
 
 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(session, message);
+  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(session, message);
+  } });
 }
 
 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, 'text4');
-  if (session.player_id !== message.$sender.id) return messages(locale, 'text5');
-
-  if (session.status !== 'active' && choiceId === 'restart') {
-    await services.updateSession(session.id, { status: 'aborted' });
-    return (await startGame(services, message)) ?? 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, 'text4');
+    if (session.player_id !== message.sender.id) return messages(locale, 'text5');
+
+    if (session.status !== 'active' && choiceId === 'restart') {
+      await services.updateSession(session.id, { status: 'aborted' });
+      return (await startGame(services, message)) ?? null;
+    }
 
-  if (session.status !== 'active') return messages(locale, 'text6');
+    if (session.status !== 'active') return messages(locale, 'text6');
 
-  if (choiceId === 'quit') {
-    await services.updateSession(session.id, { status: 'aborted' });
-    return renderView((await services.getById(session.id))!, message, true, true);
-  }
+    if (choiceId === 'quit') {
+      await services.updateSession(session.id, { status: 'aborted' });
+      return renderView((await services.getById(session.id))!, message, true, true);
+    }
 
-  const deck = parseDeck(session.deck_json);
-  let player = parseCards(session.player_cards_json);
-  let dealer = parseCards(session.dealer_cards_json);
+    const deck = parseDeck(session.deck_json);
+    let player = parseCards(session.player_cards_json);
+    let dealer = parseCards(session.dealer_cards_json);
+
+    if (choiceId === 'hit') {
+      const card = deck.pop();
+      if (!card) return messages(locale, 'text7');
+      player = [...player, card];
+      await services.updateSession(session.id, {
+        deck_json: JSON.stringify(deck),
+        player_cards_json: JSON.stringify(player),
+      });
+      if (playerBust({ ...session, player_cards_json: JSON.stringify(player) })) {
+        return finishRound(services, message, session, 'lost');
+      }
+      const updated = (await services.getById(session.id))!;
+      return renderView(updated, message);
+    }
 
-  if (choiceId === 'hit') {
-    const card = deck.pop();
-    if (!card) return messages(locale, 'text7');
-    player = [...player, card];
+    if (choiceId !== 'stand') return messages(locale, 'text8');
+
+    dealer = await dealerPlay(deck, dealer);
     await services.updateSession(session.id, {
       deck_json: JSON.stringify(deck),
-      player_cards_json: JSON.stringify(player),
+      dealer_cards_json: JSON.stringify(dealer),
     });
-    if (playerBust({ ...session, player_cards_json: JSON.stringify(player) })) {
-      return finishRound(services, message, session, 'lost');
-    }
-    const updated = (await services.getById(session.id))!;
-    return renderView(updated, message);
-  }
-
-  if (choiceId !== 'stand') return messages(locale, 'text8');
-
-  dealer = await dealerPlay(deck, dealer);
-  await services.updateSession(session.id, {
-    deck_json: JSON.stringify(deck),
-    dealer_cards_json: JSON.stringify(dealer),
-  });
-  const outcome = compareHands(player, dealer);
-  const status: BjSessionRow['status'] =
-    outcome === 'won' ? 'won' : outcome === 'lost' ? 'lost' : 'draw';
-  return finishRound(services, message, session, status);
+    const outcome = compareHands(player, dealer);
+    const status: BjSessionRow['status'] =
+      outcome === 'won' ? 'won' : outcome === 'lost' ? 'lost' : 'draw';
+    return finishRound(services, message, session, status);
+  } });
 }
 
 export { BJ_PREFIX, handValue, TARGET };

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 type { BjSessionRow } from './models.js';
@@ -31,21 +30,16 @@ export class SessionService extends BaseSessionService<BjSessionRow> {
     });
   }
 
-  async createSession(message: GameMessageLike): Promise<BjSessionRow> {
+  async createSession(message: GamePlayer): Promise<BjSessionRow> {
     const deck = freshDeck();
     const playerCards = [deck.pop()!, deck.pop()!];
     const dealerCards = [deck.pop()!, deck.pop()!];
     const now = Date.now();
-    const row: BjSessionRow = {
+    const row: Omit<BjSessionRow, '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: String(message.$sender.name ?? message.$sender.id),
+      player_id: message.sender.id,
+      player_name: String(message.sender.name ?? message.sender.id),
       deck_json: JSON.stringify(deck),
       player_cards_json: JSON.stringify(playerCards),
       dealer_cards_json: JSON.stringify(dealerCards),
@@ -53,7 +47,7 @@ export class SessionService extends BaseSessionService<BjSessionRow> {
       updated_at: now,
       created_at: now,
     };
-    return this.createRow(row);
+    return this.createRow({ target: message.target, fields: row });
   }
 }