@zhin.js/plugin-dungeon-expedition 1.1.18 → 1.1.20

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

@@ -1,16 +1,18 @@
 // 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 { getDungeonHelp, normalizeDungeonAction, runDungeonCommand, } from "../../../lib/dungeon-command.js";
 import { resolveGameServices } from "../../../lib/runtime-store.js";
 export default defineCommand({
     description: 'Multiplayer dungeon expedition',
     params: { action: { type: 'string', default: '' } },
-    async execute({ params, input, use, locale, formatCommand }) {
+    async execute({ params, input, use, locale, formatCommand, session }) {
         const rawAction = String(params.action ?? '');
         if (normalizeDungeonAction(rawAction) === 'help')
             return getDungeonHelp({ locale, formatCommand });
         const service = resolveGameServices({ use });
-        return runDungeonCommand(service, messageFromCommandInput(input, { locale, formatCommand }), rawAction);
+        const player = gamePlayerFromInput(input, { locale, formatCommand });
+        await replyGameOperation({ session: service, player, reply: session?.reply,
+            run: () => runDungeonCommand(service, player, rawAction) });
     },
 });

package/commands/dungeon/[[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 {
   getDungeonHelp,
   normalizeDungeonAction,
@@ -10,14 +10,12 @@ import { resolveGameServices } from '../../../src/runtime-store.js';
 export default defineCommand({
   description: 'Multiplayer dungeon expedition',
   params: { action: { type: 'string', default: '' } },
-  async execute({ params, input, use, locale, formatCommand }) {
+  async execute({ params, input, use, locale, formatCommand, session }) {
     const rawAction = String(params.action ?? '');
     if (normalizeDungeonAction(rawAction) === 'help') return getDungeonHelp({ locale, formatCommand });
     const service = resolveGameServices({ use });
-    return runDungeonCommand(
-      service,
-      messageFromCommandInput(input, { locale, formatCommand }),
-      rawAction,
-    );
+    const player = gamePlayerFromInput(input, { locale, formatCommand });
+    await replyGameOperation({ session: service, player, reply: session?.reply,
+      run: () => runDungeonCommand(service, player, rawAction) });
   },
 });

package/lib/dungeon-command.d.ts

@@ -1,6 +1,6 @@
-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 getDungeonHelp(message?: Pick<GameMessageLike, 'locale' | 'formatCommand'>): string;
+export declare function getDungeonHelp(message?: Pick<GamePlayer, 'locale' | 'formatCommand'>): string;
 export declare const DUNGEON_HELP: string;
 export declare function normalizeDungeonAction(action: string): string | null;
-export declare function runDungeonCommand(service: SessionService, message: GameMessageLike, rawAction: string): Promise<GameReply>;
+export declare function runDungeonCommand(service: SessionService, message: GamePlayer, rawAction: string): Promise<GameReply>;

package/lib/dungeon-command.js

@@ -55,16 +55,18 @@ export function normalizeDungeonAction(action) {
     return ACTION_ALIASES[action.trim().toLowerCase()] ?? null;
 }
 export async function runDungeonCommand(service, message, rawAction) {
-    const action = normalizeDungeonAction(rawAction);
-    if (!action || action === 'help')
-        return getDungeonHelp(message);
-    if (action === 'create')
-        return startDungeon(service, message);
-    if (action === 'status')
-        return continueDungeon(service, message);
-    const session = await service.getActiveByChannel(channelKey(message));
-    if (!session)
-        return messages(message.locale, 'empty') + gameCommandHint(message, 'dungeon');
-    return handleDungeonChoice(service, message, dungeonSessionToken(session), action);
+    return service.runInScope({ scope: channelKey(message), run: async () => {
+            const action = normalizeDungeonAction(rawAction);
+            if (!action || action === 'help')
+                return getDungeonHelp(message);
+            if (action === 'create')
+                return startDungeon(service, message);
+            if (action === 'status')
+                return continueDungeon(service, message);
+            const session = await service.getActiveByChannel(channelKey(message));
+            if (!session)
+                return messages(message.locale, 'empty') + gameCommandHint(message, 'dungeon');
+            return handleDungeonChoice(service, message, dungeonSessionToken(session), action);
+        } });
 }
 //# sourceMappingURL=dungeon-command.js.map

package/lib/dungeon-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"dungeon-command.js","sourceRoot":"","sources":["../src/dungeon-command.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dungeon-command.js","sourceRoot":"","sources":["../src/dungeon-command.ts"],"names":[],"mappings":"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"}

package/lib/game-flow.d.ts

@@ -1,7 +1,7 @@
-import { type GameMessageLike, type GameReply } from '@zhin.js/game-kit';
+import { type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import type { DungeonSessionRow } from './models.js';
 import { type SessionService } from './session-service.js';
-export declare function startDungeon(service: SessionService, message: GameMessageLike): Promise<GameReply>;
-export declare function continueDungeon(service: SessionService, message: GameMessageLike): Promise<GameReply>;
-export declare function handleDungeonChoice(service: SessionService, message: GameMessageLike, sessionToken: string, choiceId: string): Promise<GameReply>;
+export declare function startDungeon(service: SessionService, message: GamePlayer): Promise<GameReply>;
+export declare function continueDungeon(service: SessionService, message: GamePlayer): Promise<GameReply>;
+export declare function handleDungeonChoice(service: SessionService, message: GamePlayer, sessionToken: string, choiceId: string): Promise<GameReply>;
 export declare function commandActionId(session: DungeonSessionRow, actorId: string, choiceId: string): string;

package/lib/game-flow.js

@@ -4,73 +4,79 @@ import { DungeonRuleError, } from './engine.js';
 import { stateFromSession, } from './session-service.js';
 import { buildDungeonView, parseDungeonSessionToken, } from './view.js';
 export async function startDungeon(service, message) {
-    const active = await service.getActiveByChannel(channelKey(message));
-    if (active)
-        return buildDungeonView(active, stateFromSession(active), message.$channel.type);
-    try {
-        const session = await service.createSession(message);
-        return buildDungeonView(session, stateFromSession(session), message.$channel.type);
-    }
-    catch (error) {
-        if (error instanceof GameSessionConflictError)
-            return error.format(message.locale);
-        throw error;
-    }
+    return service.runInScope({ scope: channelKey(message), run: async () => {
+            const active = await service.getActiveByChannel(channelKey(message));
+            if (active)
+                return buildDungeonView(active, stateFromSession(active), message.target.kind);
+            try {
+                const session = await service.createSession(message);
+                return buildDungeonView(session, stateFromSession(session), message.target.kind);
+            }
+            catch (error) {
+                if (error instanceof GameSessionConflictError)
+                    return error.format(message.locale);
+                throw error;
+            }
+        } });
 }
 export async function continueDungeon(service, message) {
-    const locale = resolveLocale(message.locale);
-    const session = await service.getActiveByChannel(channelKey(message));
-    if (!session)
-        return messages(locale, 'text1');
-    return buildDungeonView(session, stateFromSession(session), message.$channel.type);
+    return service.runInScope({ scope: channelKey(message), run: async () => {
+            const locale = resolveLocale(message.locale);
+            const session = await service.getActiveByChannel(channelKey(message));
+            if (!session)
+                return messages(locale, 'text1');
+            return buildDungeonView(session, stateFromSession(session), message.target.kind);
+        } });
 }
 export async function handleDungeonChoice(service, message, sessionToken, choiceId) {
-    let locale = resolveLocale(message.locale);
-    const token = parseDungeonSessionToken(sessionToken);
-    if (!token)
-        return messages(locale, 'text2');
-    const session = await service.getById(token.sessionId);
-    if (!session || session.channel_key !== channelKey(message)) {
-        return messages(locale, 'text3');
-    }
-    locale = resolveLocale(session.locale);
-    if (choiceId === 'restart') {
-        if (session.status === 'active')
-            return messages(locale, 'text4');
-        if (session.owner_id !== message.$sender.id)
-            return messages(locale, 'text5');
-        return startDungeon(service, message);
-    }
-    const action = actionFromChoice(choiceId, message);
-    if (!action)
-        return messages(locale, 'text6');
-    try {
-        const result = await service.performAction({
-            sessionId: session.id,
-            actorId: message.$sender.id,
-            actorName: message.$sender.name?.trim() || message.$sender.id,
-            action,
-            expectedRevision: token.revision,
-            actionId: `${session.id}:${token.revision}:${message.$sender.id}:${choiceId}`,
-        });
-        return buildDungeonView(result.session, stateFromSession(result.session), message.$channel.type);
-    }
-    catch (error) {
-        if (error instanceof DungeonRuleError)
-            return error.message;
-        if (error instanceof GameSessionConflictError)
-            return error.format(locale);
-        if (error instanceof SessionRevisionConflictError) {
-            const latest = await service.getById(session.id);
-            if (!latest)
-                return messages(locale, 'text7');
-            const view = buildDungeonView(latest, stateFromSession(latest), message.$channel.type);
-            return Array.isArray(view)
-                ? [messages(locale, 'text8'), ...view]
-                : [messages(locale, 'text8'), view];
-        }
-        throw error;
-    }
+    return service.runInScope({ scope: channelKey(message), run: async () => {
+            let locale = resolveLocale(message.locale);
+            const token = parseDungeonSessionToken(sessionToken);
+            if (!token)
+                return messages(locale, 'text2');
+            const session = await service.getById(token.sessionId);
+            if (!session || session.channel_key !== channelKey(message)) {
+                return messages(locale, 'text3');
+            }
+            locale = resolveLocale(session.locale);
+            if (choiceId === 'restart') {
+                if (session.status === 'active')
+                    return messages(locale, 'text4');
+                if (session.owner_id !== message.sender.id)
+                    return messages(locale, 'text5');
+                return startDungeon(service, message);
+            }
+            const action = actionFromChoice(choiceId, message);
+            if (!action)
+                return messages(locale, 'text6');
+            try {
+                const result = await service.performAction({
+                    sessionId: session.id,
+                    actorId: message.sender.id,
+                    actorName: message.sender.name?.trim() || message.sender.id,
+                    action,
+                    expectedRevision: token.revision,
+                    actionId: `${session.id}:${token.revision}:${message.sender.id}:${choiceId}`,
+                });
+                return buildDungeonView(result.session, stateFromSession(result.session), message.target.kind);
+            }
+            catch (error) {
+                if (error instanceof DungeonRuleError)
+                    return error.message;
+                if (error instanceof GameSessionConflictError)
+                    return error.format(locale);
+                if (error instanceof SessionRevisionConflictError) {
+                    const latest = await service.getById(session.id);
+                    if (!latest)
+                        return messages(locale, 'text7');
+                    const view = buildDungeonView(latest, stateFromSession(latest), message.target.kind);
+                    return Array.isArray(view)
+                        ? [messages(locale, 'text8'), ...view]
+                        : [messages(locale, 'text8'), view];
+                }
+                throw error;
+            }
+        } });
 }
 export function commandActionId(session, actorId, choiceId) {
     return `${session.id}:${session.revision}:${actorId}:${choiceId}`;
@@ -79,7 +85,7 @@ function actionFromChoice(choiceId, message) {
     if (choiceId === 'join') {
         return {
             type: 'join',
-            name: message.$sender.name?.trim() || message.$sender.id,
+            name: message.sender.name?.trim() || message.sender.id,
         };
     }
     if (choiceId === 'ready')

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,5 +1,5 @@
 import type { Database, Models } from '@zhin.js/core';
-import { VersionedSessionService, type GameMessageLike, type SessionMutationResult } from '@zhin.js/game-kit';
+import { VersionedSessionService, type GamePlayer, type SessionMutationResult } from '@zhin.js/game-kit';
 import { type DungeonAction, type DungeonState } from './engine.js';
 import type { DungeonSessionRow } from './models.js';
 export type DungeonDatabase = Database<unknown, Models, string>;
@@ -13,7 +13,7 @@ export interface PerformDungeonActionOptions {
 }
 export declare class SessionService extends VersionedSessionService<DungeonSessionRow> {
     constructor(database: DungeonDatabase);
-    createSession(message: GameMessageLike, seed?: string | number): Promise<DungeonSessionRow>;
+    createSession(message: GamePlayer, seed?: string | number): Promise<DungeonSessionRow>;
     getActiveForUser(channelKeyValue: string, userId: string): Promise<DungeonSessionRow | null>;
     performAction(options: PerformDungeonActionOptions): Promise<SessionMutationResult<DungeonSessionRow>>;
 }

package/lib/session-service.js

@@ -1,4 +1,4 @@
-import { DeterministicRandom, VersionedSessionService, channelKey, generateCompactId, } from '@zhin.js/game-kit';
+import { DeterministicRandom, VersionedSessionService, generateCompactId, } from '@zhin.js/game-kit';
 import { activePlayer, applyDungeonAction, createDungeonState, decodeDungeonState, } from './engine.js';
 export class SessionService extends VersionedSessionService {
     constructor(database) {
@@ -12,30 +12,28 @@ export class SessionService extends VersionedSessionService {
     async createSession(message, seed) {
         const now = Date.now();
         const id = generateCompactId('dng_');
-        const ownerName = message.$sender.name?.trim() || message.$sender.id;
-        const state = createDungeonState(message.$sender.id, ownerName, message.locale);
+        const ownerName = message.sender.name?.trim() || message.sender.id;
+        const state = createDungeonState(message.sender.id, ownerName, message.locale);
         const random = DeterministicRandom.fromSeed(seed ?? id);
         return this.createRow({
-            id,
-            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),
-            owner_id: message.$sender.id,
-            owner_name: ownerName,
-            state_json: JSON.stringify(state),
-            phase: state.phase,
-            turn: activePlayer(state)?.id ?? '',
-            rng_state: random.state,
-            schema_version: state.schemaVersion,
-            revision: 0,
-            processed_actions: '[]',
-            deadline_at: now + 5 * 60_000,
-            status: 'active',
-            updated_at: now,
-            created_at: now,
+            target: message.target,
+            fields: {
+                id,
+                locale: message.locale ?? 'zh-CN',
+                owner_id: message.sender.id,
+                owner_name: ownerName,
+                state_json: JSON.stringify(state),
+                phase: state.phase,
+                turn: activePlayer(state)?.id ?? '',
+                rng_state: random.state,
+                schema_version: state.schemaVersion,
+                revision: 0,
+                processed_actions: '[]',
+                deadline_at: now + 5 * 60_000,
+                status: 'active',
+                updated_at: now,
+                created_at: now,
+            },
         });
     }
     async getActiveForUser(channelKeyValue, userId) {

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/dungeon-alias/index.js

@@ -1,12 +1,21 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
-import { defineGameCommandAliasMiddleware, messageFromCommandInput, } from '@zhin.js/game-kit';
-import { normalizeDungeonAction, runDungeonCommand, } from "../../lib/dungeon-command.js";
+import { replyGameOperation, defineGameCommandAliasMiddleware, gamePlayerFromInput } from '@zhin.js/game-kit';
+import { normalizeDungeonAction, getDungeonHelp, runDungeonCommand, } from "../../lib/dungeon-command.js";
 import { resolveGameServices } from "../../lib/runtime-store.js";
 export default defineGameCommandAliasMiddleware({
     aliases: ['地牢', 'dungeon'],
     async run(action, input, context) {
-        if (normalizeDungeonAction(action) === null)
-            return null;
-        return runDungeonCommand(resolveGameServices(context), messageFromCommandInput(input), action);
+        const normalized = normalizeDungeonAction(action);
+        if (normalized === null)
+            return false;
+        if (normalized === 'help') {
+            await context.input.$reply(getDungeonHelp({ locale: context.input.locale,
+                formatCommand: path => context.input.formatCommand?.(path, context.owner.id) }));
+            return true;
+        }
+        const services = resolveGameServices(context), player = gamePlayerFromInput(input);
+        await replyGameOperation({ session: services, player, reply: content => context.input.$reply(content),
+            run: () => runDungeonCommand(services, player, action) });
+        return true;
     },
 });

package/middlewares/dungeon-alias/index.ts

@@ -1,9 +1,7 @@
-import {
-  defineGameCommandAliasMiddleware,
-  messageFromCommandInput,
-} from '@zhin.js/game-kit';
+import { replyGameOperation, defineGameCommandAliasMiddleware, gamePlayerFromInput } from '@zhin.js/game-kit';
 import {
   normalizeDungeonAction,
+  getDungeonHelp,
   runDungeonCommand,
 } from '../../src/dungeon-command.js';
 import { resolveGameServices } from '../../src/runtime-store.js';
@@ -11,11 +9,16 @@ import { resolveGameServices } from '../../src/runtime-store.js';
 export default defineGameCommandAliasMiddleware({
   aliases: ['地牢', 'dungeon'],
   async run(action, input, context) {
-    if (normalizeDungeonAction(action) === null) return null;
-    return runDungeonCommand(
-      resolveGameServices(context),
-      messageFromCommandInput(input),
-      action,
-    );
+    const normalized = normalizeDungeonAction(action);
+    if (normalized === null) return false;
+    if (normalized === 'help') {
+      await context.input.$reply(getDungeonHelp({ locale: context.input.locale,
+        formatCommand: path => context.input.formatCommand?.(path, context.owner.id) }));
+      return true;
+    }
+    const services = resolveGameServices(context), player = gamePlayerFromInput(input);
+    await replyGameOperation({ session: services, player, reply: content => context.input.$reply(content),
+      run: () => runDungeonCommand(services, player, action) });
+    return true;
   },
 });

package/middlewares/dungeon-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 { handleDungeonChoice } from "../../lib/game-flow.js";
 import { resolveGameServices } from "../../lib/runtime-store.js";
 import { stateFromSession } from "../../lib/session-service.js";
@@ -8,19 +8,23 @@ import { DUNGEON_PREFIX, choicesForState, dungeonSessionToken, } from "../../lib
 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 service = resolveGameServices(context);
-        const message = messageFromCommandInput(context.input);
+        const message = gamePlayerFromInput(context.input);
         const payloadFromText = resolveGameTextPayload(raw);
         if (payloadFromText?.startsWith(`${DUNGEON_PREFIX}:`)) {
             const parsed = parseChoicePayload(payloadFromText, DUNGEON_PREFIX);
             if (parsed) {
-                const reply = await handleDungeonChoice(service, message, parsed.sessionId, parsed.choiceId);
-                await context.input.$reply(reply);
+                await replyGameOperation({ session: service, player: message, reply: content => context.input.$reply(content),
+                    run: () => handleDungeonChoice(service, message, parsed.sessionId, parsed.choiceId) });
                 return;
             }
             await next();
@@ -39,7 +43,7 @@ export default defineMiddleware({
             await next();
             return;
         }
-        const reply = await handleDungeonChoice(service, message, parsed.sessionId, parsed.choiceId);
-        await context.input.$reply(reply);
+        await replyGameOperation({ session: service, player: message, reply: content => context.input.$reply(content),
+            run: () => handleDungeonChoice(service, message, parsed.sessionId, parsed.choiceId) });
     },
 });

package/middlewares/dungeon-choice/index.ts

@@ -1,12 +1,13 @@
-import type { Message } from '@zhin.js/core/runtime';
-import { defineMiddleware } from 'zhin.js/middleware';
 import {
+  replyGameOperation,
   buildChoiceFallbackMap,
   channelKey,
-  messageFromCommandInput,
+  gamePlayerFromInput,
   parseChoicePayload,
   resolveGameTextPayload,
 } from '@zhin.js/game-kit';
+import type { Message } from '@zhin.js/core/runtime';
+import { defineMiddleware } from 'zhin.js/middleware';
 import { handleDungeonChoice } from '../../src/game-flow.js';
 import { resolveGameServices } from '../../src/runtime-store.js';
 import { stateFromSession } from '../../src/session-service.js';
@@ -19,24 +20,25 @@ import {
 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 service = resolveGameServices(context);
-    const message = messageFromCommandInput(context.input);
+    const message = gamePlayerFromInput(context.input);
     const payloadFromText = resolveGameTextPayload(raw);
     if (payloadFromText?.startsWith(`${DUNGEON_PREFIX}:`)) {
       const parsed = parseChoicePayload(payloadFromText, DUNGEON_PREFIX);
       if (parsed) {
-        const reply = await handleDungeonChoice(
+        await replyGameOperation({ session: service, player: message, reply: content => context.input.$reply(content),
+      run: () => handleDungeonChoice(
           service,
           message,
           parsed.sessionId,
           parsed.choiceId,
-        );
-        await context.input.$reply(reply);
+        ) });
         return;
       }
       await next();
@@ -60,12 +62,12 @@ export default defineMiddleware<Message>({
       await next();
       return;
     }
-    const reply = await handleDungeonChoice(
+    await replyGameOperation({ session: service, player: message, reply: content => context.input.$reply(content),
+      run: () => handleDungeonChoice(
       service,
       message,
       parsed.sessionId,
       parsed.choiceId,
-    );
-    await context.input.$reply(reply);
+    ) });
   },
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-dungeon-expedition",
-  "version": "1.1.18",
+  "version": "1.1.20",
   "description": "Zhin.js multiplayer deterministic dungeon expedition",
   "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/dungeon-command.ts

@@ -1,5 +1,5 @@
 import { createMessages } from 'zhin.js/i18n';
-import { gameCommandHint, channelKey, type GameMessageLike, type GameReply } from '@zhin.js/game-kit';
+import { gameCommandHint, channelKey, type GamePlayer, type GameReply } from '@zhin.js/game-kit';
 import {
   continueDungeon,
   handleDungeonChoice,
@@ -20,7 +20,7 @@ const messages = createMessages({
   abort: { 'zh-CN': '队长结束远征', en: 'Leader ends the expedition' },
   empty: { 'zh-CN': '当前频道没有远征队。', en: 'This channel has no expedition party.' },
 });
-export function getDungeonHelp(message: Pick<GameMessageLike, 'locale' | 'formatCommand'> = {}): string {
+export function getDungeonHelp(message: Pick<GamePlayer, 'locale' | 'formatCommand'> = {}): string {
   const command = message.formatCommand?.('dungeon');
   const actions = ['start', 'join', 'ready', 'go', 'explore', 'attack', 'defend', 'potion', 'status', 'abort'] as const;
   return [messages(message.locale, 'title'), ...(command === undefined ? [] : actions.map(action => `${command} ${action} — ${messages(message.locale, action)}`))].join('\n');
@@ -65,20 +65,22 @@ export function normalizeDungeonAction(action: string): string | null {
 
 export async function runDungeonCommand(
   service: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   rawAction: string,
 ): Promise<GameReply> {
-  const action = normalizeDungeonAction(rawAction);
-  if (!action || action === 'help') return getDungeonHelp(message);
-  if (action === 'create') return startDungeon(service, message);
-  if (action === 'status') return continueDungeon(service, message);
+  return service.runInScope({ scope: channelKey(message), run: async () => {
+    const action = normalizeDungeonAction(rawAction);
+    if (!action || action === 'help') return getDungeonHelp(message);
+    if (action === 'create') return startDungeon(service, message);
+    if (action === 'status') return continueDungeon(service, message);
 
-  const session = await service.getActiveByChannel(channelKey(message));
-  if (!session) return messages(message.locale, 'empty') + gameCommandHint(message, 'dungeon');
-  return handleDungeonChoice(
-    service,
-    message,
-    dungeonSessionToken(session),
-    action,
-  );
+    const session = await service.getActiveByChannel(channelKey(message));
+    if (!session) return messages(message.locale, 'empty') + gameCommandHint(message, 'dungeon');
+    return handleDungeonChoice(
+      service,
+      message,
+      dungeonSessionToken(session),
+      action,
+    );
+  } });
 }

package/src/game-flow.ts

@@ -3,7 +3,7 @@ import {
   GameSessionConflictError,
   SessionRevisionConflictError,
   channelKey,
-  type GameMessageLike,
+  type GamePlayer,
   type GameReply,
 } from '@zhin.js/game-kit';
 import {
@@ -22,81 +22,87 @@ import {
 
 export async function startDungeon(
   service: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
 ): Promise<GameReply> {
-  const active = await service.getActiveByChannel(channelKey(message));
-  if (active) return buildDungeonView(active, stateFromSession(active), message.$channel.type);
-  try {
-    const session = await service.createSession(message);
-    return buildDungeonView(session, stateFromSession(session), message.$channel.type);
-  } catch (error) {
-    if (error instanceof GameSessionConflictError) return error.format(message.locale);
-    throw error;
-  }
+  return service.runInScope({ scope: channelKey(message), run: async () => {
+    const active = await service.getActiveByChannel(channelKey(message));
+    if (active) return buildDungeonView(active, stateFromSession(active), message.target.kind);
+    try {
+      const session = await service.createSession(message);
+      return buildDungeonView(session, stateFromSession(session), message.target.kind);
+    } catch (error) {
+      if (error instanceof GameSessionConflictError) return error.format(message.locale);
+      throw error;
+    }
+  } });
 }
 
 export async function continueDungeon(
   service: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
 ): Promise<GameReply> {
-  const locale = resolveLocale(message.locale);
-  const session = await service.getActiveByChannel(channelKey(message));
-  if (!session) return messages(locale, 'text1');
-  return buildDungeonView(session, stateFromSession(session), message.$channel.type);
+  return service.runInScope({ scope: channelKey(message), run: async () => {
+    const locale = resolveLocale(message.locale);
+    const session = await service.getActiveByChannel(channelKey(message));
+    if (!session) return messages(locale, 'text1');
+    return buildDungeonView(session, stateFromSession(session), message.target.kind);
+  } });
 }
 
 export async function handleDungeonChoice(
   service: SessionService,
-  message: GameMessageLike,
+  message: GamePlayer,
   sessionToken: string,
   choiceId: string,
 ): Promise<GameReply> {
-  let locale = resolveLocale(message.locale);
-  const token = parseDungeonSessionToken(sessionToken);
-  if (!token) return messages(locale, 'text2');
-  const session = await service.getById(token.sessionId);
-  if (!session || session.channel_key !== channelKey(message)) {
-    return messages(locale, 'text3');
-  }
-  locale = resolveLocale(session.locale);
-  if (choiceId === 'restart') {
-    if (session.status === 'active') return messages(locale, 'text4');
-    if (session.owner_id !== message.$sender.id) return messages(locale, 'text5');
-    return startDungeon(service, message);
-  }
-  const action = actionFromChoice(choiceId, message);
-  if (!action) return messages(locale, 'text6');
-  try {
-    const result = await service.performAction({
-      sessionId: session.id,
-      actorId: message.$sender.id,
-      actorName: message.$sender.name?.trim() || message.$sender.id,
-      action,
-      expectedRevision: token.revision,
-      actionId: `${session.id}:${token.revision}:${message.$sender.id}:${choiceId}`,
-    });
-    return buildDungeonView(
-      result.session,
-      stateFromSession(result.session),
-      message.$channel.type,
-    );
-  } catch (error) {
-    if (error instanceof DungeonRuleError) return error.message;
-    if (error instanceof GameSessionConflictError) return error.format(locale);
-    if (error instanceof SessionRevisionConflictError) {
-      const latest = await service.getById(session.id);
-      if (!latest) return messages(locale, 'text7');
-      const view = buildDungeonView(
-        latest,
-        stateFromSession(latest),
-        message.$channel.type,
+  return service.runInScope({ scope: channelKey(message), run: async () => {
+    let locale = resolveLocale(message.locale);
+    const token = parseDungeonSessionToken(sessionToken);
+    if (!token) return messages(locale, 'text2');
+    const session = await service.getById(token.sessionId);
+    if (!session || session.channel_key !== channelKey(message)) {
+      return messages(locale, 'text3');
+    }
+    locale = resolveLocale(session.locale);
+    if (choiceId === 'restart') {
+      if (session.status === 'active') return messages(locale, 'text4');
+      if (session.owner_id !== message.sender.id) return messages(locale, 'text5');
+      return startDungeon(service, message);
+    }
+    const action = actionFromChoice(choiceId, message);
+    if (!action) return messages(locale, 'text6');
+    try {
+      const result = await service.performAction({
+        sessionId: session.id,
+        actorId: message.sender.id,
+        actorName: message.sender.name?.trim() || message.sender.id,
+        action,
+        expectedRevision: token.revision,
+        actionId: `${session.id}:${token.revision}:${message.sender.id}:${choiceId}`,
+      });
+      return buildDungeonView(
+        result.session,
+        stateFromSession(result.session),
+        message.target.kind,
       );
-      return Array.isArray(view)
-        ? [messages(locale, 'text8'), ...view]
-        : [messages(locale, 'text8'), view];
+    } catch (error) {
+      if (error instanceof DungeonRuleError) return error.message;
+      if (error instanceof GameSessionConflictError) return error.format(locale);
+      if (error instanceof SessionRevisionConflictError) {
+        const latest = await service.getById(session.id);
+        if (!latest) return messages(locale, 'text7');
+        const view = buildDungeonView(
+          latest,
+          stateFromSession(latest),
+          message.target.kind,
+        );
+        return Array.isArray(view)
+          ? [messages(locale, 'text8'), ...view]
+          : [messages(locale, 'text8'), view];
+      }
+      throw error;
     }
-    throw error;
-  }
+  } });
 }
 
 export function commandActionId(
@@ -109,12 +115,12 @@ export function commandActionId(
 
 function actionFromChoice(
   choiceId: string,
-  message: GameMessageLike,
+  message: GamePlayer,
 ): DungeonAction | null {
   if (choiceId === 'join') {
     return {
       type: 'join',
-      name: message.$sender.name?.trim() || message.$sender.id,
+      name: message.sender.name?.trim() || message.sender.id,
     };
   }
   if (choiceId === 'ready') return { type: 'ready' };

package/src/session-service.ts

@@ -2,9 +2,8 @@ import type { Database, Models } from '@zhin.js/core';
 import {
   DeterministicRandom,
   VersionedSessionService,
-  channelKey,
   generateCompactId,
-  type GameMessageLike,
+  type GamePlayer,
   type GameOutcome,
   type GameSessionDatabase,
   type SessionMutationResult,
@@ -41,35 +40,33 @@ export class SessionService extends VersionedSessionService<DungeonSessionRow> {
   }
 
   async createSession(
-    message: GameMessageLike,
+    message: GamePlayer,
     seed?: string | number,
   ): Promise<DungeonSessionRow> {
     const now = Date.now();
     const id = generateCompactId('dng_');
-    const ownerName = message.$sender.name?.trim() || message.$sender.id;
-    const state = createDungeonState(message.$sender.id, ownerName, message.locale);
+    const ownerName = message.sender.name?.trim() || message.sender.id;
+    const state = createDungeonState(message.sender.id, ownerName, message.locale);
     const random = DeterministicRandom.fromSeed(seed ?? id);
     return this.createRow({
-      id,
-      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),
-      owner_id: message.$sender.id,
-      owner_name: ownerName,
-      state_json: JSON.stringify(state),
-      phase: state.phase,
-      turn: activePlayer(state)?.id ?? '',
-      rng_state: random.state,
-      schema_version: state.schemaVersion,
-      revision: 0,
-      processed_actions: '[]',
-      deadline_at: now + 5 * 60_000,
-      status: 'active',
-      updated_at: now,
-      created_at: now,
+      target: message.target,
+      fields: {
+        id,
+        locale: message.locale ?? 'zh-CN',
+        owner_id: message.sender.id,
+        owner_name: ownerName,
+        state_json: JSON.stringify(state),
+        phase: state.phase,
+        turn: activePlayer(state)?.id ?? '',
+        rng_state: random.state,
+        schema_version: state.schemaVersion,
+        revision: 0,
+        processed_actions: '[]',
+        deadline_at: now + 5 * 60_000,
+        status: 'active',
+        updated_at: now,
+        created_at: now,
+      },
     });
   }