@zhin.js/plugin-blackjack 0.0.2 → 0.0.4

package/commands/bj/[action:string=].ts

@@ -1,6 +1,6 @@
 import { defineCommand } from '@zhin.js/command';
 import { messageFromCommandInput } from '@zhin.js/game-kit';
-import { BJ_HELP, runBjCommandText } from '../../src/bj-command.js';
+import { BJ_HELP, runBjCommand } from '../../src/bj-command.js';
 import { resolveGameServices } from '../../src/runtime-store.js';
 
 function normalizeBjAction(raw: string): string {
@@ -18,6 +18,6 @@ export default defineCommand({
     if (!action || action === 'help') return BJ_HELP;
     const services = resolveGameServices({ use, owner });
     const message = messageFromCommandInput(input);
-    return runBjCommandText(services, message, action);
+    return runBjCommand(services, message, action);
   },
 });

package/lib/bj-command.d.ts

@@ -1,6 +1,4 @@
-import type { Message, Plugin } from '@zhin.js/core';
+import type { GameMessageLike } from '@zhin.js/game-kit';
 import type { SessionService } from './session-service.js';
 export declare const BJ_HELP: string;
-export declare function runBjCommand(plugin: Plugin | null, services: SessionService, message: Message<any>, action: string): Promise<string | undefined>;
-/** Plugin Runtime / smoke: text-only, no Adapter.editMessage. */
-export declare function runBjCommandText(services: SessionService, message: Message<any>, action: string): Promise<string>;
+export declare function runBjCommand(services: SessionService, message: GameMessageLike, action: string): Promise<string>;

package/lib/bj-command.js

@@ -8,18 +8,14 @@ export const BJ_HELP = [
     '• `/21点 继续` — 刷新界面',
     '• 对局中点击 **要牌** / **停牌**',
 ].join('\n');
-export async function runBjCommand(plugin, services, message, action) {
+export async function runBjCommand(services, message, action) {
     const a = action.trim().toLowerCase() || 'help';
     if (a === 'help' || a === '帮助')
         return BJ_HELP;
     if (a === 'start' || a === '开始')
-        return startGame(plugin, services, message);
+        return (await startGame(services, message)) ?? '';
     if (a === 'continue' || a === '继续')
-        return continueGame(plugin, services, message);
+        return continueGame(services, message);
     return `未知操作「${action}」。发送 \`/21点 帮助\`。`;
 }
-/** Plugin Runtime / smoke: text-only, no Adapter.editMessage. */
-export async function runBjCommandText(services, message, action) {
-    return (await runBjCommand(null, services, message, action)) ?? '';
-}
 //# 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":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGzD,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,aAAa;IACb,EAAE;IACF,4BAA4B;IAC5B,EAAE;IACF,kBAAkB;IAClB,oBAAoB;IACpB,yBAAyB;CAC1B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAqB,EACrB,QAAwB,EACxB,OAAqB,EACrB,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,OAAO,CAAC;IAC/C,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,SAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC,KAAK,UAAU,IAAI,CAAC,KAAK,IAAI;QAAE,OAAO,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnF,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAC3C,CAAC;AAED,iEAAiE;AACjE,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,QAAwB,EACxB,OAAqB,EACrB,MAAc;IAEd,OAAO,CAAC,MAAM,YAAY,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;AACrE,CAAC"}
+{"version":3,"file":"bj-command.js","sourceRoot":"","sources":["../src/bj-command.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGzD,MAAM,CAAC,MAAM,OAAO,GAAG;IACrB,aAAa;IACb,EAAE;IACF,4BAA4B;IAC5B,EAAE;IACF,kBAAkB;IAClB,oBAAoB;IACpB,yBAAyB;CAC1B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAEb,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,OAAO,CAAC;IAC/C,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,OAAO,QAAQ,MAAM,mBAAmB,CAAC;AAC3C,CAAC"}

package/lib/game-flow.d.ts

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

package/lib/game-flow.js

@@ -2,30 +2,16 @@ import { plainTextFromSendContent, recordGameOutcome } 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';
-async function sendOrEditView(plugin, services, message, session, terminal = false, revealDealer = false) {
+/**
+ * Plugin Runtime: render the board as text. Interactive in-place board editing
+ * (the old Adapter.editMessage path) is not part of the runtime flow; commands
+ * and the choice middleware return fresh text each turn.
+ */
+function renderView(session, message, terminal = false, revealDealer = false) {
     const content = buildBjView(session, terminal, revealDealer, message.$channel.type);
-    if (!plugin)
-        return plainTextFromSendContent(content);
-    const adapter = plugin.root.inject(message.$adapter);
-    if (session.board_message_id) {
-        const msgId = await adapter.editMessage({
-            messageId: session.board_message_id,
-            context: String(message.$adapter),
-            endpoint: message.$endpoint,
-            id: message.$channel.id,
-            type: message.$channel.type,
-            content,
-        });
-        if (msgId !== session.board_message_id) {
-            await services.updateSession(session.id, { board_message_id: msgId });
-        }
-        return;
-    }
-    const msgId = await message.$reply?.(content);
-    if (msgId)
-        await services.updateSession(session.id, { board_message_id: msgId });
+    return plainTextFromSendContent(content);
 }
-async function finishRound(plugin, services, message, session, status) {
+async function finishRound(services, message, session, status) {
     await services.updateSession(session.id, { status });
     const updated = (await services.getById(session.id));
     if (status === 'won')
@@ -34,7 +20,7 @@ async function finishRound(plugin, services, message, session, status) {
         void recordGameOutcome(message, 'blackjack', 'lost');
     else if (status === 'draw')
         void recordGameOutcome(message, 'blackjack', 'draw');
-    return sendOrEditView(plugin, services, message, updated, true, true);
+    return renderView(updated, message, true, true);
 }
 async function dealerPlay(deck, dealer) {
     const hand = [...dealer];
@@ -46,7 +32,7 @@ async function dealerPlay(deck, dealer) {
     }
     return hand;
 }
-export async function startGame(plugin, services, message) {
+export async function startGame(services, message) {
     const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
     const active = await services.getActiveByChannel(ch);
     if (active) {
@@ -58,22 +44,17 @@ export async function startGame(plugin, services, message) {
     const session = await services.createSession(message);
     const natural = naturalOutcome(session);
     if (natural) {
-        const text = await finishRound(plugin, services, message, session, natural);
-        return typeof text === 'string' ? text : undefined;
+        return finishRound(services, message, session, natural);
     }
-    const text = await sendOrEditView(plugin, services, message, session);
-    return typeof text === 'string' ? text : undefined;
+    return renderView(session, message);
 }
-export async function continueGame(plugin, services, 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);
     if (!session)
         return '你没有进行中的 21 点，发送「21点 开始」。';
-    const text = await sendOrEditView(plugin, services, message, session);
-    if (typeof text === 'string')
-        return text;
-    return '已刷新 21 点界面。';
+    return renderView(session, message);
 }
-export async function handleChoice(plugin, services, message, sessionId, choiceId) {
+export async function handleChoice(services, message, sessionId, choiceId) {
     const session = await services.getById(sessionId);
     if (!session)
         return '对局不存在。';
@@ -81,8 +62,7 @@ export async function handleChoice(plugin, services, message, sessionId, choiceI
         return '这是别人的对局。';
     if (session.status !== 'active' && choiceId === 'restart') {
         await services.updateSession(session.id, { status: 'aborted' });
-        // text-only 模式（plugin===null）下 startGame 的唯一输出就是返回文本
-        return (await startGame(plugin, services, message)) ?? null;
+        return (await startGame(services, message)) ?? null;
     }
     if (session.status !== 'active')
         return '对局已结束，请点击再来一局。';
@@ -99,12 +79,10 @@ export async function handleChoice(plugin, services, message, sessionId, choiceI
             player_cards_json: JSON.stringify(player),
         });
         if (playerBust({ ...session, player_cards_json: JSON.stringify(player) })) {
-            const text = await finishRound(plugin, services, message, session, 'lost');
-            return typeof text === 'string' ? text : null;
+            return finishRound(services, message, session, 'lost');
         }
         const updated = (await services.getById(session.id));
-        const text = await sendOrEditView(plugin, services, message, updated);
-        return typeof text === 'string' ? text : null;
+        return renderView(updated, message);
     }
     if (choiceId !== 'stand')
         return '无效操作。';
@@ -115,8 +93,7 @@ export async function handleChoice(plugin, services, message, sessionId, choiceI
     });
     const outcome = compareHands(player, dealer);
     const status = outcome === 'won' ? 'won' : outcome === 'lost' ? 'lost' : 'draw';
-    const text = await finishRound(plugin, services, message, session, status);
-    return typeof text === 'string' ? text : null;
+    return finishRound(services, message, session, status);
 }
 export { BJ_PREFIX, handValue, TARGET };
 //# sourceMappingURL=game-flow.js.map

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/session-service.d.ts

@@ -1,12 +1,15 @@
-import type { Database, Message, Models } from '@zhin.js/core';
+import type { Database, Models } from '@zhin.js/core';
+import { type GameMessageLike } from '@zhin.js/game-kit';
 import type { BjSessionRow } from './models.js';
 export type BjDatabase = Database<unknown, Models, string>;
 export declare class SessionService {
     private readonly db;
     constructor(db: BjDatabase);
-    createSession(message: Message<any>): Promise<BjSessionRow>;
+    createSession(message: GameMessageLike): Promise<BjSessionRow>;
     getById(id: string): Promise<BjSessionRow | null>;
     getActiveForUser(channelKeyValue: string, userId: string): Promise<BjSessionRow | null>;
+    /** 本频道本人最近一局（不按 status 过滤），供终局「回复 1 再来一局」restart 用。 */
+    getLatestForUser(channelKeyValue: string, userId: string): Promise<BjSessionRow | null>;
     getActiveByChannel(channelKeyValue: string): Promise<BjSessionRow | null>;
     getActiveByBoardMessageId(messageId: string): Promise<BjSessionRow | null>;
     updateSession(id: string, patch: Partial<BjSessionRow>): Promise<void>;

package/lib/session-service.js

@@ -47,6 +47,17 @@ export class SessionService {
         });
         return rows[0] ?? null;
     }
+    /** 本频道本人最近一局（不按 status 过滤），供终局「回复 1 再来一局」restart 用。 */
+    async getLatestForUser(channelKeyValue, userId) {
+        const rows = await getModel(this.db).findAll({
+            channel_key: channelKeyValue,
+            player_id: userId,
+        });
+        if (rows.length === 0)
+            return null;
+        // updated_at 可能同毫秒平局，此时取靠后的行（更接近最近创建的一局）
+        return rows.reduce((latest, row) => (row.updated_at >= latest.updated_at ? row : latest));
+    }
     async getActiveByChannel(channelKeyValue) {
         const rows = await getModel(this.db).findAll({
             channel_key: channelKeyValue,

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.ts

@@ -1,5 +1,5 @@
 import { defineGameCommandAliasMiddleware, messageFromCommandInput } from '@zhin.js/game-kit';
-import { BJ_HELP, runBjCommandText } from '../src/bj-command.js';
+import { BJ_HELP, runBjCommand } from '../src/bj-command.js';
 import { resolveGameServices } from '../src/runtime-store.js';
 
 function normalizeBjAction(raw: string): string {
@@ -17,6 +17,6 @@ export default defineGameCommandAliasMiddleware({
     if (!normalized || normalized === 'help') return BJ_HELP;
     const services = resolveGameServices(context);
     const message = messageFromCommandInput(input);
-    return runBjCommandText(services, message, normalized);
+    return runBjCommand(services, message, normalized);
   },
 });

package/middlewares/bj-choice.ts

@@ -33,7 +33,7 @@ export default defineMiddleware<Message>({
       if (parsed) {
         const session = await services.getById(parsed.sessionId);
         if (session?.channel_key === ch) {
-          const reply = await handleChoice(null, services, message, parsed.sessionId, parsed.choiceId);
+          const reply = await handleChoice(services, message, parsed.sessionId, parsed.choiceId);
           if (reply) await context.input.$reply(reply);
           return;
         }
@@ -42,7 +42,8 @@ export default defineMiddleware<Message>({
       return;
     }
 
-    const session = await services.getActiveForUser(ch, message.$sender.id);
+    // 不按 status 过滤取本频道本人最近一局：终局 session 也要能命中 restart 分支
+    const session = await services.getLatestForUser(ch, message.$sender.id);
     if (!session) {
       await next();
       return;
@@ -55,7 +56,7 @@ 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(null, services, message, parsed.sessionId, 'restart');
+        const reply = await handleChoice(services, message, parsed.sessionId, 'restart');
         if (reply) await context.input.$reply(reply);
         return;
       }
@@ -74,7 +75,7 @@ export default defineMiddleware<Message>({
       return;
     }
 
-    const reply = await handleChoice(null, services, message, session.id, parsed.choiceId);
+    const reply = await handleChoice(services, message, session.id, parsed.choiceId);
     if (reply) await context.input.$reply(reply);
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-blackjack",
-  "version": "0.0.2",
+  "version": "0.0.4",
   "description": "Zhin.js 21 点（Blackjack）(Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -24,11 +24,11 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "@zhin.js/command": "1.0.1",
-    "@zhin.js/core": "1.3.5",
-    "@zhin.js/game-kit": "1.0.2",
-    "@zhin.js/middleware": "1.0.1",
-    "@zhin.js/plugin-runtime": "1.0.1"
+    "@zhin.js/command": "1.0.3",
+    "@zhin.js/core": "1.4.1",
+    "@zhin.js/game-kit": "2.0.1",
+    "@zhin.js/middleware": "1.0.3",
+    "@zhin.js/plugin-runtime": "1.1.1"
   },
   "devDependencies": {
     "typescript": "^6.0.3",

package/src/bj-command.ts

@@ -1,4 +1,4 @@
-import type { Message, Plugin } from '@zhin.js/core';
+import type { GameMessageLike } from '@zhin.js/game-kit';
 import { continueGame, startGame } from './game-flow.js';
 import type { SessionService } from './session-service.js';
 
@@ -13,23 +13,13 @@ export const BJ_HELP = [
 ].join('\n');
 
 export async function runBjCommand(
-  plugin: Plugin | null,
   services: SessionService,
-  message: Message<any>,
+  message: GameMessageLike,
   action: string,
-): Promise<string | undefined> {
+): Promise<string> {
   const a = action.trim().toLowerCase() || 'help';
   if (a === 'help' || a === '帮助') return BJ_HELP;
-  if (a === 'start' || a === '开始') return startGame(plugin, services, message);
-  if (a === 'continue' || a === '继续') return continueGame(plugin, services, message);
+  if (a === 'start' || a === '开始') return (await startGame(services, message)) ?? '';
+  if (a === 'continue' || a === '继续') return continueGame(services, message);
   return `未知操作「${action}」。发送 \`/21点 帮助\`。`;
 }
-
-/** Plugin Runtime / smoke: text-only, no Adapter.editMessage. */
-export async function runBjCommandText(
-  services: SessionService,
-  message: Message<any>,
-  action: string,
-): Promise<string> {
-  return (await runBjCommand(null, services, message, action)) ?? '';
-}

package/src/game-flow.ts

@@ -1,5 +1,4 @@
-import type { Adapter, Message, Plugin } from '@zhin.js/core';
-import { plainTextFromSendContent, recordGameOutcome } from '@zhin.js/game-kit';
+import { plainTextFromSendContent, recordGameOutcome, type GameMessageLike } from '@zhin.js/game-kit';
 import {
   BJ_PREFIX,
   compareHands,
@@ -12,51 +11,33 @@ import { parseCards, parseDeck, type SessionService } from './session-service.js
 
 import { buildBjView, naturalOutcome, playerBust } from './view.js';
 
-async function sendOrEditView(
-  plugin: Plugin | null,
-  services: SessionService,
-  message: Message<any>,
+/**
+ * Plugin Runtime: render the board as text. Interactive in-place board editing
+ * (the old Adapter.editMessage path) is not part of the runtime flow; commands
+ * and the choice middleware return fresh text each turn.
+ */
+function renderView(
   session: BjSessionRow,
+  message: GameMessageLike,
   terminal = false,
   revealDealer = false,
-): Promise<string | void> {
+): string {
   const content = buildBjView(session, terminal, revealDealer, message.$channel.type);
-  if (!plugin) return plainTextFromSendContent(content);
-
-  const adapter = plugin.root.inject(message.$adapter) as Adapter;
-
-  if (session.board_message_id) {
-    const msgId = await adapter.editMessage({
-      messageId: session.board_message_id,
-      context: String(message.$adapter),
-      endpoint: message.$endpoint,
-      id: message.$channel.id,
-      type: message.$channel.type,
-      content,
-    });
-    if (msgId !== session.board_message_id) {
-      await services.updateSession(session.id, { board_message_id: msgId });
-    }
-    return;
-  }
-
-  const msgId = await message.$reply?.(content);
-  if (msgId) await services.updateSession(session.id, { board_message_id: msgId });
+  return plainTextFromSendContent(content);
 }
 
 async function finishRound(
-  plugin: Plugin | null,
   services: SessionService,
-  message: Message<any>,
+  message: GameMessageLike,
   session: BjSessionRow,
   status: BjSessionRow['status'],
-): Promise<string | void> {
+): Promise<string> {
   await services.updateSession(session.id, { status });
   const updated = (await services.getById(session.id))!;
   if (status === 'won') void recordGameOutcome(message, 'blackjack', 'won', 30);
   else if (status === 'lost') void recordGameOutcome(message, 'blackjack', 'lost');
   else if (status === 'draw') void recordGameOutcome(message, 'blackjack', 'draw');
-  return sendOrEditView(plugin, services, message, updated, true, true);
+  return renderView(updated, message, true, true);
 }
 
 async function dealerPlay(
@@ -73,9 +54,8 @@ async function dealerPlay(
 }
 
 export async function startGame(
-  plugin: Plugin | null,
   services: SessionService,
-  message: Message<any>,
+  message: GameMessageLike,
 ): Promise<string | undefined> {
   const ch = `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`;
   const active = await services.getActiveByChannel(ch);
@@ -88,32 +68,26 @@ export async function startGame(
   const session = await services.createSession(message);
   const natural = naturalOutcome(session);
   if (natural) {
-    const text = await finishRound(plugin, services, message, session, natural);
-    return typeof text === 'string' ? text : undefined;
+    return finishRound(services, message, session, natural);
   }
-  const text = await sendOrEditView(plugin, services, message, session);
-  return typeof text === 'string' ? text : undefined;
+  return renderView(session, message);
 }
 
 export async function continueGame(
-  plugin: Plugin | null,
   services: SessionService,
-  message: Message<any>,
+  message: GameMessageLike,
 ): Promise<string> {
   const session = await services.getActiveForUser(
     `${message.$adapter}-${message.$endpoint}-${message.$channel.type}:${message.$channel.id}`,
     message.$sender.id,
   );
   if (!session) return '你没有进行中的 21 点，发送「21点 开始」。';
-  const text = await sendOrEditView(plugin, services, message, session);
-  if (typeof text === 'string') return text;
-  return '已刷新 21 点界面。';
+  return renderView(session, message);
 }
 
 export async function handleChoice(
-  plugin: Plugin | null,
   services: SessionService,
-  message: Message<any>,
+  message: GameMessageLike,
   sessionId: string,
   choiceId: string,
 ): Promise<string | null> {
@@ -123,8 +97,7 @@ export async function handleChoice(
 
   if (session.status !== 'active' && choiceId === 'restart') {
     await services.updateSession(session.id, { status: 'aborted' });
-    // text-only 模式（plugin===null）下 startGame 的唯一输出就是返回文本
-    return (await startGame(plugin, services, message)) ?? null;
+    return (await startGame(services, message)) ?? null;
   }
 
   if (session.status !== 'active') return '对局已结束，请点击再来一局。';
@@ -142,12 +115,10 @@ export async function handleChoice(
       player_cards_json: JSON.stringify(player),
     });
     if (playerBust({ ...session, player_cards_json: JSON.stringify(player) })) {
-      const text = await finishRound(plugin, services, message, session, 'lost');
-      return typeof text === 'string' ? text : null;
+      return finishRound(services, message, session, 'lost');
     }
     const updated = (await services.getById(session.id))!;
-    const text = await sendOrEditView(plugin, services, message, updated);
-    return typeof text === 'string' ? text : null;
+    return renderView(updated, message);
   }
 
   if (choiceId !== 'stand') return '无效操作。';
@@ -160,8 +131,7 @@ export async function handleChoice(
   const outcome = compareHands(player, dealer);
   const status: BjSessionRow['status'] =
     outcome === 'won' ? 'won' : outcome === 'lost' ? 'lost' : 'draw';
-  const text = await finishRound(plugin, services, message, session, status);
-  return typeof text === 'string' ? text : null;
+  return finishRound(services, message, session, status);
 }
 
 export { BJ_PREFIX, handValue, TARGET };

package/src/session-service.ts

@@ -1,5 +1,5 @@
-import type { Database, Message, Models, RelatedModel } from '@zhin.js/core';
-import { channelKey, generateSessionId } from '@zhin.js/game-kit';
+import type { Database, Models, RelatedModel } from '@zhin.js/core';
+import { channelKey, generateSessionId, type GameMessageLike } from '@zhin.js/game-kit';
 import type { BjSessionRow } from './models.js';
 import { freshDeck } from './engine.js';
 
@@ -15,7 +15,7 @@ function getModel(db: BjDatabase): RelatedModel<unknown, Models, 'bj_sessions'>
 export class SessionService {
   constructor(private readonly db: BjDatabase) {}
 
-  async createSession(message: Message<any>): Promise<BjSessionRow> {
+  async createSession(message: GameMessageLike): Promise<BjSessionRow> {
     const deck = freshDeck();
     const playerCards = [deck.pop()!, deck.pop()!];
     const dealerCards = [deck.pop()!, deck.pop()!];
@@ -54,6 +54,17 @@ export class SessionService {
     return rows[0] ?? null;
   }
 
+  /** 本频道本人最近一局（不按 status 过滤），供终局「回复 1 再来一局」restart 用。 */
+  async getLatestForUser(channelKeyValue: string, userId: string): Promise<BjSessionRow | null> {
+    const rows = await getModel(this.db).findAll({
+      channel_key: channelKeyValue,
+      player_id: userId,
+    });
+    if (rows.length === 0) return null;
+    // updated_at 可能同毫秒平局，此时取靠后的行（更接近最近创建的一局）
+    return rows.reduce((latest, row) => (row.updated_at >= latest.updated_at ? row : latest));
+  }
+
   async getActiveByChannel(channelKeyValue: string): Promise<BjSessionRow | null> {
     const rows = await getModel(this.db).findAll({
       channel_key: channelKeyValue,