@zhin.js/plugin-music 1.1.15 → 1.1.17

package/lib/session.js.map

@@ -1 +1 @@
-{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AASA,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAExC,MAAM,UAAU,UAAU,CACxB,UAAkB,EAClB,cAAsB,EACtB,QAAgB;IAEhB,OAAO,GAAG,UAAU,IAAI,cAAc,IAAI,QAAQ,EAAE,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAIjC;IACC,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;IAClC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,KAAK,CAAC,YAAY,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACrF,MAAM,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IAChD,IAAI,CAAC,UAAU,IAAI,CAAC,cAAc,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC7D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,QAAQ,EAAE,CAAC;AAClD,CAAC;AAED,iDAAiD;AACjD,MAAM,OAAO,mBAAmB;IACrB,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC5C,UAAU,CAAS;IACnB,IAAI,CAAe;IAE5B,YACE,SAAS,GAAG,iBAAiB,EAC7B,MAAoB,IAAI,CAAC,GAAG;QAE5B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,MAAqB;QACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAC/B,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACtD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,YAAY;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC9C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF"}
+{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAwB,MAAM,sBAAsB,CAAC;AAWhF,MAAM,iBAAiB,GAAG,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;AAExC,MAAM,UAAU,UAAU,CACxB,YAA6B,EAC7B,QAAgB;IAEhB,OAAO,IAAI,CAAC,SAAS,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;AACtE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAIrB;IACX,MAAM,YAAY,GAAG,KAAK,EAAE,YAAY,CAAC;IACzC,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAM,EAAE,EAAE,CAAC;IACnC,IAAI,CAAC,YAAY,EAAE,QAAQ,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,IAAI,CAAC,YAAY,CAAC,EAAE;WAChF,CAAC,CAAC,SAAS,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC;WAC5D,OAAO,QAAQ,KAAK,QAAQ,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC5D,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;AACpC,CAAC;AAED,iDAAiD;AACjD,MAAM,OAAO,mBAAmB;IACrB,QAAQ,GAAG,IAAI,GAAG,EAAyB,CAAC;IAC5C,UAAU,CAAS;IACnB,IAAI,CAAe;IAE5B,YACE,SAAS,GAAG,iBAAiB,EAC7B,MAAoB,IAAI,CAAC,GAAG;QAE5B,IAAI,CAAC,UAAU,GAAG,SAAS,CAAC;QAC5B,IAAI,CAAC,IAAI,GAAG,GAAG,CAAC;IAClB,CAAC;IAED,GAAG,CAAC,GAAW,EAAE,MAAqB;QACpC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAED,GAAG,CAAC,GAAW;QACb,MAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,CAAC,OAAO;YAAE,OAAO,SAAS,CAAC;QAC/B,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;YACtD,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC1B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IAED,YAAY;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAC3C,IAAI,GAAG,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;gBAC9C,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;YAC5B,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC;IACxB,CAAC;CACF"}

package/middlewares/music-selection/index.js

@@ -1,8 +1,9 @@
 // Generated by build-plugin-runtime-entries.mjs. Do not edit.
+import { resolveLocale } from 'zhin.js/i18n';
+import { messages as t, sourceName as displayName } from "../../lib/i18n.js";
 import { defineMiddleware } from 'zhin.js/middleware';
 import { sessionKey, resolveMessageIds } from "../../lib/session.js";
 import { shareMusicDetail, buildMusicShareSegment } from "../../lib/music-lib.js";
-import { SOURCE_DISPLAY_NAME } from "../../lib/config.js";
 import { musicRuntimeToken } from "../../lib/runtime.js";
 export default defineMiddleware({
     target: 'inbound',
@@ -17,16 +18,17 @@ export default defineMiddleware({
             await next();
             return;
         }
-        const key = sessionKey(ids.endpointId, ids.conversationId, ids.senderId);
+        const key = sessionKey(ids.conversation, ids.senderId);
         const runtime = context.use(musicRuntimeToken);
         const pending = runtime.sessions.get(key);
         if (!pending) {
             await next();
             return;
         }
-        if (raw === '取消') {
+        const locale = resolveLocale(pending.locale);
+        if (raw === (locale === 'en' ? 'cancel' : '取消')) {
             runtime.sessions.delete(key);
-            await context.input.$reply('已取消点歌');
+            await context.input.$reply(t(locale, 'cancelSelection'));
             return;
         }
         const num = parseInt(raw, 10);
@@ -36,10 +38,10 @@ export default defineMiddleware({
         }
         runtime.sessions.delete(key);
         const selected = pending.results[num - 1];
-        const sourceName = SOURCE_DISPLAY_NAME[selected.source] ?? selected.source;
-        const detailResult = await shareMusicDetail(runtime, selected.id, selected.source);
+        const sourceName = displayName(selected.source, locale) ?? selected.source;
+        const detailResult = await shareMusicDetail(runtime, selected.id, selected.source, locale);
         if (!detailResult.success) {
-            await context.input.$reply(`[${sourceName}] 获取"${selected.title}"播放信息失败：${detailResult.error}`);
+            await context.input.$reply(t(locale, 'detailFailed', { source: sourceName, title: selected.title, error: detailResult.error }));
             return;
         }
         const segment = buildMusicShareSegment(detailResult.music);

package/middlewares/music-selection/index.ts

@@ -1,8 +1,9 @@
+import { resolveLocale } from 'zhin.js/i18n';
+import { messages as t, sourceName as displayName } from '../../src/i18n.js';
 import { defineMiddleware } from 'zhin.js/middleware';
 import type { Message } from '@zhin.js/core/runtime';
 import { sessionKey, resolveMessageIds } from '../../src/session.js';
 import { shareMusicDetail, buildMusicShareSegment } from '../../src/music-lib.js';
-import { SOURCE_DISPLAY_NAME } from '../../src/config.js';
 import { musicRuntimeToken } from '../../src/runtime.js';
 
 export default defineMiddleware<Message>({
@@ -20,7 +21,7 @@ export default defineMiddleware<Message>({
       return;
     }
 
-    const key = sessionKey(ids.endpointId, ids.conversationId, ids.senderId);
+    const key = sessionKey(ids.conversation, ids.senderId);
     const runtime = context.use(musicRuntimeToken);
     const pending = runtime.sessions.get(key);
     if (!pending) {
@@ -28,9 +29,10 @@ export default defineMiddleware<Message>({
       return;
     }
 
-    if (raw === '取消') {
+    const locale = resolveLocale(pending.locale);
+    if (raw === (locale === 'en' ? 'cancel' : '取消')) {
       runtime.sessions.delete(key);
-      await context.input.$reply('已取消点歌');
+      await context.input.$reply(t(locale, 'cancelSelection'));
       return;
     }
 
@@ -42,16 +44,17 @@ export default defineMiddleware<Message>({
 
     runtime.sessions.delete(key);
     const selected = pending.results[num - 1]!;
-    const sourceName = SOURCE_DISPLAY_NAME[selected.source] ?? selected.source;
+    const sourceName = displayName(selected.source, locale) ?? selected.source;
 
     const detailResult = await shareMusicDetail(
       runtime,
       selected.id,
       selected.source,
+      locale,
     );
     if (!detailResult.success) {
       await context.input.$reply(
-        `[${sourceName}] 获取"${selected.title}"播放信息失败：${detailResult.error}`,
+        t(locale, 'detailFailed', { source: sourceName, title: selected.title, error: detailResult.error }),
       );
       return;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/plugin-music",
-  "version": "1.1.15",
+  "version": "1.1.17",
   "description": "Music search and sharing plugin for Zhin.js (Plugin Runtime)",
   "type": "module",
   "main": "./lib/index.js",
@@ -42,21 +42,22 @@
   },
   "license": "MIT",
   "dependencies": {
-    "@zhin.js/core": "1.1.50",
-    "@zhin.js/tool": "1.1.9",
-    "@zhin.js/skill": "1.1.9"
+    "@zhin.js/core": "1.1.52",
+    "@zhin.js/im-contract": "1.1.8",
+    "@zhin.js/tool": "1.1.11",
+    "@zhin.js/skill": "1.1.10"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "zhin.js": "1.1.15"
+    "zhin.js": "1.1.17"
   },
   "peerDependencies": {
-    "@zhin.js/adapter-icqq": "^1.1.15",
-    "@zhin.js/command": "^1.1.10",
-    "@zhin.js/component": "^1.1.9",
-    "@zhin.js/middleware": "^1.1.9",
-    "zhin.js": "^1.1.15"
+    "@zhin.js/adapter-icqq": "^1.1.17",
+    "@zhin.js/command": "^1.1.11",
+    "@zhin.js/component": "^1.1.10",
+    "@zhin.js/middleware": "^1.1.10",
+    "zhin.js": "^1.1.17"
   },
   "peerDependenciesMeta": {
     "@zhin.js/adapter-icqq": {

package/skills/music/tools/music-share/index.js

@@ -17,5 +17,5 @@ export default defineAgentTool({
         required: ['id', 'source'],
     },
     requiresApproval: 'never',
-    execute: ({ id, source }, context) => shareMusicDetail(context.use(musicRuntimeToken), String(id), source),
+    execute: ({ id, source }, context) => shareMusicDetail(context.use(musicRuntimeToken), String(id), source, context.locale),
 });

package/skills/music/tools/music-share/index.ts

@@ -22,5 +22,5 @@ export default defineAgentTool<{
   },
   requiresApproval: 'never',
   execute: ({ id, source }, context) =>
-    shareMusicDetail(context.use(musicRuntimeToken), String(id), source),
+    shareMusicDetail(context.use(musicRuntimeToken), String(id), source, context.locale),
 });

package/src/i18n.ts

@@ -0,0 +1,50 @@
+import { createMessages, type Locale } from 'zhin.js/i18n';
+import type { MusicSource } from './types.js';
+import { SOURCE_DISPLAY_NAME } from './config.js';
+export const messages = createMessages({
+  loginAborted: { 'zh-CN': '登录已取消', en: 'Login cancelled.' },
+  keyword: { 'zh-CN': "请输入歌曲名称", en: "Enter a song name." },
+  usage: { 'zh-CN': "用法：{command}", en: "Usage: {command}" },
+  sources: { 'zh-CN': "支持音乐源：{sources}", en: "Music sources: {sources}" },
+  noResults: { 'zh-CN': "[{source}] 未找到相关歌曲", en: "[{source}] No matching songs found." },
+  noMatch: { 'zh-CN': "[{source}] 未找到\"{keyword}\"相关歌曲", en: "[{source}] No songs found for \"{keyword}\"." },
+  results: { 'zh-CN': "[{source}] 搜索结果：\n{lines}\n\n回复序号播放，回复\"取消\"取消选择", en: "[{source}] Search results:\n{lines}\n\nReply with a number to play, or \"cancel\" to cancel." },
+  unsupported: { 'zh-CN': "不支持的音乐源：{source}", en: "Unsupported music source: {source}" },
+  cancelSelection: { 'zh-CN': "已取消点歌", en: "Music selection cancelled." },
+  detailFailed: { 'zh-CN': "[{source}] 获取\"{title}\"播放信息失败：{error}", en: "[{source}] Could not load \"{title}\": {error}" },
+  credentials: { 'zh-CN': "--- 音乐凭证状态 ---", en: "--- Music credentials ---" },
+  unset: { 'zh-CN': "未配置", en: "Not configured" },
+  count: { 'zh-CN': "{keys} ({count} 项)", en: "{keys} ({count} entries)" },
+  credentialUnset: { 'zh-CN': "[{source}] 凭证 {key} 未设置", en: "[{source}] Credential {key} is not set." },
+  saved: { 'zh-CN': "[{source}] 凭证 {key} 已保存", en: "[{source}] Credential {key} saved." },
+  deleted: { 'zh-CN': "[{source}] 凭证 {key} 已删除", en: "[{source}] Credential {key} deleted." },
+  conversation: { 'zh-CN': "无法识别会话信息，请在群聊或私聊中使用", en: "Cannot identify this conversation. Use a group or private chat." },
+  cancelLogin: { 'zh-CN': "已取消登录", en: "Login cancelled." },
+  noLogin: { 'zh-CN': "没有进行中的登录会话", en: "There is no active login session." },
+  platform: { 'zh-CN': "不支持的平台：{platform}\n支持：qq, netease", en: "Unsupported platform: {platform}\nSupported: qq, netease" },
+  active: { 'zh-CN': "正在进行 {source} 登录，请先完成", en: "A {source} login is in progress. Complete it first." },
+  cancelHint: { 'zh-CN': "发送\"{command}\"可中止", en: "Send \"{command}\" to cancel." },
+  qrFailed: { 'zh-CN': "[{source}] 获取二维码失败：{error}", en: "[{source}] Could not obtain a QR code: {error}" },
+  noReply: { 'zh-CN': "无法发送消息", en: "Cannot send a reply." },
+  scan: { 'zh-CN': "[{source}] 请使用 {source} App 扫描二维码登录：", en: "[{source}] Scan the QR code with the {source} app to sign in:" },
+  valid: { 'zh-CN': "二维码有效期 2 分钟", en: "The QR code is valid for 2 minutes." },
+  success: { 'zh-CN': "登录成功！cookie 已自动保存，现在可以搜索和播放高品质音乐了", en: "Signed in. The cookie has been saved; you can now search and play high-quality music." },
+  waiting: { 'zh-CN': "等待扫码...", en: "Waiting for scan..." },
+  scanned: { 'zh-CN': "已扫码，请在手机上确认登录", en: "Scanned. Confirm the login on your phone." },
+  expired: { 'zh-CN': "二维码已过期，请重新发起登录", en: "The QR code has expired. Start a new login." },
+  confirmed: { 'zh-CN': "登录成功", en: "Signed in." },
+  unknown: { 'zh-CN': "未知状态", en: "Unknown status" },
+  pollFailed: { 'zh-CN': "轮询失败：{error}", en: "Login polling failed: {error}" },
+  pollError: { 'zh-CN': "轮询异常：{error}", en: "Login polling error: {error}" },
+  timeout: { 'zh-CN': "登录超时，请重试", en: "Login timed out. Try again." },
+  neteaseQr: { 'zh-CN': "获取网易云登录二维码失败", en: "Could not obtain a NetEase login QR code." },
+  emptyResponse: { 'zh-CN': "服务端返回空响应 (HTTP {status})", en: "The server returned an empty response (HTTP {status})." },
+  cookieFailed: { 'zh-CN': "登录成功但获取 cookie 失败", en: "Signed in, but could not retrieve the cookie." },
+});
+const EN_SOURCE_NAMES: Record<MusicSource, string> = { qq: 'QQ Music', netease: 'NetEase Cloud Music', kuwo: 'Kuwo', kugou: 'Kugou' };
+export function sourceName(source: MusicSource, locale: Locale = 'zh-CN'): string {
+  return locale === 'en' ? EN_SOURCE_NAMES[source] : SOURCE_DISPLAY_NAME[source];
+}
+export function usage(locale: Locale, command: string | undefined): string {
+  return command === undefined ? '' : messages(locale, 'usage', { command });
+}

package/src/login/index.ts

@@ -1,3 +1,7 @@
+import type { Locale } from 'zhin.js/i18n';
+import type { ConversationRef } from '@zhin.js/im-contract';
+import { sessionKey } from '../session.js';
+import { messages as t } from '../i18n.js';
 import type { QrLoginProvider, QrLoginSource, QrPollResult } from './types.js';
 import { QQLoginProvider } from './qq.js';
 import { NeteaseLoginProvider } from './netease.js';
@@ -6,6 +10,7 @@ import type { CredentialStore } from '../credential-store.js';
 export type { QrLoginSource, QrPollResult, QrLoginProvider } from './types.js';
 
 export interface QrLoginSession {
+  locale: Locale;
   source: QrLoginSource;
   pollData: Record<string, string>;
   timestamp: number;
@@ -17,11 +22,10 @@ const POLL_INTERVAL_MS = 3_000;
 const MAX_POLLS = Math.ceil(LOGIN_TIMEOUT_MS / POLL_INTERVAL_MS);
 
 export function loginSessionKey(
-  endpointId: string,
-  conversationId: string,
+  conversation: ConversationRef,
   senderId: string,
 ): string {
-  return `login:${endpointId}:${conversationId}:${senderId}`;
+  return `login:${sessionKey(conversation, senderId)}`;
 }
 
 /** Generation-owned QR login coordinator. */
@@ -69,11 +73,13 @@ export class QrLoginRuntime {
   async start(
     source: QrLoginSource,
     key: string,
+    locale: Locale = 'zh-CN',
   ): Promise<{ imageSegment: { type: 'image'; data: Record<string, unknown> } }> {
     const existing = this.#active.get(key);
     if (existing && !existing.aborted) existing.aborted = true;
     const session: QrLoginSession = {
       source,
+      locale,
       pollData: {},
       timestamp: this.#now(),
       aborted: false,
@@ -81,9 +87,9 @@ export class QrLoginRuntime {
     this.#active.set(key, session);
 
     try {
-      const result = await this.#providers[source].createQr();
+      const result = await this.#providers[source].createQr(locale);
       if (session.aborted || this.#active.get(key) !== session) {
-        throw new Error('登录已取消');
+        throw new Error(t(locale, 'loginAborted'));
       }
       session.pollData = result.pollData;
       return { imageSegment: result.imageSegment };
@@ -98,7 +104,7 @@ export class QrLoginRuntime {
     onStatus: (result: QrPollResult) => Promise<void>,
   ): Promise<QrPollResult> {
     const session = this.#active.get(key);
-    if (!session) return { status: 'error', message: '没有进行中的登录会话' };
+    if (!session) return { status: 'error', message: t('zh-CN', 'noLogin') };
 
     const provider = this.#providers[session.source];
     let lastStatus = '';
@@ -106,10 +112,10 @@ export class QrLoginRuntime {
       for (let i = 0; i < MAX_POLLS; i++) {
         if (session.aborted) {
           this.#active.delete(key);
-          return { status: 'error', message: '登录已取消' };
+          return { status: 'error', message: t(session.locale, 'loginAborted') };
         }
 
-        const result = await provider.pollQr(session.pollData);
+        const result = await provider.pollQr(session.pollData, session.locale);
         if (result.status !== lastStatus) {
           lastStatus = result.status;
           await onStatus(result);
@@ -129,12 +135,12 @@ export class QrLoginRuntime {
       this.#active.delete(key);
       return {
         status: 'error',
-        message: `轮询异常：${error instanceof Error ? error.message : String(error)}`,
+        message: t(session.locale, 'pollError', { error: error instanceof Error ? error.message : String(error) }),
       };
     }
 
     this.#active.delete(key);
-    return { status: 'expired', message: '登录超时，请重试' };
+    return { status: 'expired', message: t(session.locale, 'timeout') };
   }
 
   pruneExpired(): void {

package/src/login/netease.ts

@@ -1,10 +1,12 @@
+import type { Locale } from 'zhin.js/i18n';
+import { messages as t } from '../i18n.js';
 import type { QrLoginProvider, QrCreateResult, QrPollResult } from './types.js';
 import { extractSetCookies } from './types.js';
 
 const QR_IMAGE_API = 'https://api.qrserver.com/v1/create-qr-code/';
 
 export class NeteaseLoginProvider implements QrLoginProvider {
-  async createQr(): Promise<QrCreateResult> {
+  async createQr(locale: Locale = 'zh-CN'): Promise<QrCreateResult> {
     const timestampMs = Date.now();
     const keyResp = await fetch(
       `https://music.163.com/api/login/qrcode/unikey?type=1&timestamp=${timestampMs}`,
@@ -16,7 +18,7 @@ export class NeteaseLoginProvider implements QrLoginProvider {
     );
     const keyData = (await keyResp.json()) as { code: number; unikey?: string };
     if (keyData.code !== 200 || !keyData.unikey) {
-      throw new Error('获取网易云登录二维码失败');
+      throw new Error(t(locale, 'neteaseQr'));
     }
 
     const loginUrl = `https://music.163.com/login?codekey=${keyData.unikey}`;
@@ -28,7 +30,7 @@ export class NeteaseLoginProvider implements QrLoginProvider {
     };
   }
 
-  async pollQr(pollData: Record<string, string>): Promise<QrPollResult> {
+  async pollQr(pollData: Record<string, string>, locale: Locale = 'zh-CN'): Promise<QrPollResult> {
     const { unikey } = pollData;
     try {
       const response = await fetch(
@@ -43,26 +45,26 @@ export class NeteaseLoginProvider implements QrLoginProvider {
 
       switch (data.code) {
         case 801:
-          return { status: 'waiting', message: '等待扫码...' };
+          return { status: 'waiting', message: t(locale, 'waiting') };
         case 802:
-          return { status: 'scanned', message: '已扫码，请在手机上确认登录' };
+          return { status: 'scanned', message: t(locale, 'scanned') };
         case 800:
-          return { status: 'expired', message: '二维码已过期，请重新发起登录' };
+          return { status: 'expired', message: t(locale, 'expired') };
         case 803: {
           const cookie = extractSetCookies(response.headers);
           return {
             status: 'confirmed',
-            message: '登录成功',
+            message: t(locale, 'confirmed'),
             cookie: cookie || undefined,
           };
         }
         default:
-          return { status: 'error', message: data.message ?? '未知状态' };
+          return { status: 'error', message: data.message ?? t(locale, 'unknown') };
       }
     } catch (err) {
       return {
         status: 'error',
-        message: `轮询失败：${err instanceof Error ? err.message : String(err)}`,
+        message: t(locale, 'pollFailed', { error: err instanceof Error ? err.message : String(err) }),
       };
     }
   }

package/src/login/qq.ts

@@ -1,3 +1,5 @@
+import type { Locale } from 'zhin.js/i18n';
+import { messages as t } from '../i18n.js';
 import type { QrLoginProvider, QrCreateResult, QrPollResult } from './types.js';
 import { extractSetCookies } from './types.js';
 
@@ -75,7 +77,7 @@ export class QQLoginProvider implements QrLoginProvider {
     };
   }
 
-  async pollQr(pollData: Record<string, string>): Promise<QrPollResult> {
+  async pollQr(pollData: Record<string, string>, locale: Locale = 'zh-CN'): Promise<QrPollResult> {
     const { ptqrtoken, qrsig, loginSig } = pollData;
     const url = new URL('https://ssl.ptlogin2.qq.com/ptqrlogin');
     url.searchParams.set('u1', 'https://y.qq.com/');
@@ -107,32 +109,32 @@ export class QQLoginProvider implements QrLoginProvider {
       const text = await response.text();
 
       if (text.includes('二维码未失效')) {
-        return { status: 'waiting', message: '等待扫码...' };
+        return { status: 'waiting', message: t(locale, 'waiting') };
       }
       if (text.includes('二维码认证中') || text.includes('已扫码')) {
-        return { status: 'scanned', message: '已扫码，请在手机上确认登录' };
+        return { status: 'scanned', message: t(locale, 'scanned') };
       }
       if (text.includes('二维码已失效')) {
-        return { status: 'expired', message: '二维码已过期，请重新发起登录' };
+        return { status: 'expired', message: t(locale, 'expired') };
       }
       if (text.includes('登录成功') || text.includes('ptsigx')) {
-        return this.handleLoginSuccess(text, response.headers);
+        return this.handleLoginSuccess(text, response.headers, locale);
       }
 
       if (!text) {
-        return { status: 'error', message: `服务端返回空响应 (HTTP ${response.status})` };
+        return { status: 'error', message: t(locale, 'emptyResponse', { status: response.status }) };
       }
 
-      return { status: 'waiting', message: '等待扫码...' };
+      return { status: 'waiting', message: t(locale, 'waiting') };
     } catch (err) {
       return {
         status: 'error',
-        message: `轮询失败：${err instanceof Error ? err.message : String(err)}`,
+        message: t(locale, 'pollFailed', { error: err instanceof Error ? err.message : String(err) }),
       };
     }
   }
 
-  private async handleLoginSuccess(text: string, headers: Headers): Promise<QrPollResult> {
+  private async handleLoginSuccess(text: string, headers: Headers, locale: Locale): Promise<QrPollResult> {
     const redirectMatch = text.match(/'(https?:\/\/[^']+)'/);
     if (redirectMatch) {
       const redirectResp = await fetch(redirectMatch[1]!, {
@@ -141,13 +143,13 @@ export class QQLoginProvider implements QrLoginProvider {
       });
       const cookie = extractSetCookies(redirectResp.headers);
       if (cookie) {
-        return { status: 'confirmed', message: '登录成功', cookie };
+        return { status: 'confirmed', message: t(locale, 'confirmed'), cookie };
       }
     }
     const cookie = extractSetCookies(headers);
     return {
       status: cookie ? 'confirmed' : 'error',
-      message: cookie ? '登录成功' : '登录成功但获取 cookie 失败',
+      message: t(locale, cookie ? 'confirmed' : 'cookieFailed'),
       cookie: cookie || undefined,
     };
   }

package/src/login/types.ts

@@ -1,3 +1,4 @@
+import type { Locale } from 'zhin.js/i18n';
 export type QrLoginSource = 'qq' | 'netease';
 
 export interface QrPollResult {
@@ -12,8 +13,8 @@ export interface QrCreateResult {
 }
 
 export interface QrLoginProvider {
-  createQr(): Promise<QrCreateResult>;
-  pollQr(pollData: Record<string, string>): Promise<QrPollResult>;
+  createQr(locale?: Locale): Promise<QrCreateResult>;
+  pollQr(pollData: Record<string, string>, locale?: Locale): Promise<QrPollResult>;
 }
 
 export function extractSetCookies(headers: Headers): string {

package/src/music-lib.ts

@@ -1,4 +1,6 @@
-import { sourceConfigMap, SOURCE_DISPLAY_NAME, formatDuration } from './config.js';
+import type { Locale } from 'zhin.js/i18n';
+import { messages as t, sourceName as displayName } from './i18n.js';
+import { sourceConfigMap, formatDuration } from './config.js';
 import type { MusicInfo, MusicDetail, MusicSource } from './types.js';
 import type { MusicRuntime } from './runtime.js';
 
@@ -26,10 +28,10 @@ export async function searchMusic(
   };
 }
 
-export async function shareMusicDetail(runtime: MusicRuntime, id: string, source: MusicSource) {
+export async function shareMusicDetail(runtime: MusicRuntime, id: string, source: MusicSource, locale: Locale = 'zh-CN') {
   const service = runtime.services[source];
   if (!service) {
-    return { success: false as const, error: `不支持的音乐源: ${source}` };
+    return { success: false as const, error: t(locale, 'unsupported', { source }) };
   }
   try {
     const detail = await service.getDetail(id);
@@ -42,16 +44,16 @@ export async function shareMusicDetail(runtime: MusicRuntime, id: string, source
   }
 }
 
-export function formatSearchResults(results: readonly MusicInfo[], source: MusicSource): string {
-  const sourceName = SOURCE_DISPLAY_NAME[source] ?? source;
-  if (results.length === 0) return `[${sourceName}] 未找到相关歌曲`;
+export function formatSearchResults(results: readonly MusicInfo[], source: MusicSource, locale: Locale = 'zh-CN'): string {
+  const sourceName = displayName(source, locale) ?? source;
+  if (results.length === 0) return t(locale, 'noResults', { source: sourceName });
   const lines = results.map((m, i) => {
     const parts = [m.title];
     if (m.artist) parts.push(m.artist);
     const duration = m.duration ? ` [${formatDuration(m.duration)}]` : '';
     return `${i + 1}. ${parts.join(' - ')}${duration}`;
   });
-  return `[${sourceName}] 搜索结果：\n${lines.join('\n')}\n\n回复序号播放，回复"取消"取消选择`;
+  return t(locale, 'results', { source: sourceName, lines: lines.join('\n') });
 }
 
 export function buildMusicShareSegment(detail: MusicDetail) {

package/src/session.ts

@@ -1,6 +1,9 @@
+import type { Locale } from 'zhin.js/i18n';
+import { conversationRefKey, type ConversationRef } from '@zhin.js/im-contract';
 import type { MusicInfo, MusicSource } from './types.js';
 
 export interface PendingSearch {
+  readonly locale?: Locale;
   readonly results: readonly MusicInfo[];
   readonly source: MusicSource;
   readonly keyword: string;
@@ -10,24 +13,23 @@ export interface PendingSearch {
 const SEARCH_TIMEOUT_MS = 3 * 60 * 1000;
 
 export function sessionKey(
-  endpointId: string,
-  conversationId: string,
+  conversation: ConversationRef,
   senderId: string,
 ): string {
-  return `${endpointId}:${conversationId}:${senderId}`;
+  return JSON.stringify([conversationRefKey(conversation), senderId]);
 }
 
 export function resolveMessageIds(input: {
   metadata?: Record<string, unknown>;
-  conversation?: { id?: unknown; endpoint?: { id?: unknown } };
+  conversation?: ConversationRef;
   sender?: { id?: unknown };
-}): { endpointId: string; conversationId: string; senderId: string } | null {
-  const meta = input.metadata ?? {};
-  const endpointId = String(meta.endpointId ?? input.conversation?.endpoint?.id ?? '');
-  const conversationId = String(input.conversation?.id ?? '');
-  const senderId = String(input.sender?.id ?? '');
-  if (!endpointId || !conversationId || !senderId) return null;
-  return { endpointId, conversationId, senderId };
+} | undefined): { conversation: ConversationRef; senderId: string } | null {
+  const conversation = input?.conversation;
+  const senderId = input?.sender?.id;
+  if (!conversation?.endpoint?.id || !conversation.endpoint.adapter || !conversation.id
+    || !['private', 'group', 'channel'].includes(conversation.kind)
+    || typeof senderId !== 'string' || !senderId) return null;
+  return { conversation, senderId };
 }
 
 /** Generation-owned pending music selections. */