cortico 0.1.1 → 0.1.2

package/src/worlds/minecraft/mineflayer-fixes.ts

@@ -8,7 +8,10 @@
  * 一律本地换位，原版服务端不换。一次换位两边状态就此分家，之后所有合成都在错的格子上做。
  *
  * 光照段随包到来时必须按 nibble 原序落位,prismarine-chunk 把它当长整型数组读了。
+ *
+ * 水平碰撞停在离方块面 `WALL_GAP` 处:服务端拒绝包围盒恰好贴着方块侧面的位置(见 `installWallGap`)。
  */
+import { createRequire } from 'node:module';
 import type { Bot } from 'mineflayer';
 import type { Logger } from '../../core/types.ts';
 import type { MinecraftLog } from './log.ts';
@@ -36,6 +39,11 @@ const DIG_CONFIRM_FACTOR = 3;
 const DIG_GROUND_WAIT_MS = 600;
 /** 服务端认账比本地定时器晚这么多就记一条:整片挖掘不刷屏,慢的那些留痕 */
 const DIG_SLOW_ACK_MS = 200;
+/**
+ * 水平碰撞停在离方块面这么远的地方。服务端只要缝隙大于零就收(实测 1e-7 也收),
+ * 取 1e-5 让坐标到三千万格时的浮点误差也吃不掉它。
+ */
+export const WALL_GAP = 1e-5;
 
 const sleep = (ms: number): Promise<void> => new Promise((r) => setTimeout(r, ms));
 
@@ -136,7 +144,53 @@ export function installMineflayerFixes(
   installConfirmedCraft(bot, diag, trace, (n) => { tracing += n; }, showTempo);
   installLightRelay(bot, log, diag);
   installDismountFix(bot, diag);
-  log.info(`mineflayer 修补已装上:合成取服务端产物、放置短超时重发、附魔按组件格式计入挖掘、挖掘等服务端改掉那一格、stateId 认当前窗口、光照段重新落位${diag ? '' : '(没给 World 日志,包流不留痕)'}`);
+  installWallGap();
+  log.info(`mineflayer 修补已装上:合成取服务端产物、放置短超时重发、附魔按组件格式计入挖掘、挖掘等服务端改掉那一格、stateId 认当前窗口、光照段重新落位、水平碰撞留缝${diag ? '' : '(没给 World 日志,包流不留痕)'}`);
+}
+
+/** 原型上的标记:同一进程里多个连接、多份模块实例只改一次 */
+const WALL_GAP_MARK = Symbol.for('cortico.minecraft.wallGap');
+
+interface PhysicsBox {
+  minX: number; minY: number; minZ: number; maxX: number; maxY: number; maxZ: number;
+  computeOffsetX(other: PhysicsBox, offset: number): number;
+  computeOffsetZ(other: PhysicsBox, offset: number): number;
+}
+
+/**
+ * 1.21.11 的服务端把「包围盒恰好贴着方块侧面」的位置当成撞进方块:不打 moved wrongly,
+ * 静默把人传送回上一个好位置(1.21.10 及更早照收)。prismarine-physics 的碰撞解算恰好停在
+ * 贴面处,于是贴墙、上台阶、贴墙起跳每一拍都被打回,人钉在原地。竖直方向贴面照收,这里只改 X/Z:
+ * 朝方块走的那一步停在离面 `WALL_GAP` 处;已经贴着(服务端传送来的位置就是贴面的)
+ * 再往里走时退开同样的距离。bot 的物理与寻路器的模拟共用这一个类,一处改两处生效。
+ */
+export function installWallGap(): void {
+  const mfRequire = createRequire(createRequire(import.meta.url).resolve('mineflayer/package.json'));
+  const AABB = mfRequire('prismarine-physics/lib/aabb.js') as { prototype: PhysicsBox & { [WALL_GAP_MARK]?: true } };
+  const proto = AABB.prototype;
+  if (proto[WALL_GAP_MARK]) return;
+  // this 是方块的盒子,other 是正在挪的实体的盒子(prismarine-physics 这么调)
+  proto.computeOffsetX = function (this: PhysicsBox, other: PhysicsBox, offsetX: number): number {
+    if (other.maxY > this.minY && other.minY < this.maxY && other.maxZ > this.minZ && other.minZ < this.maxZ) {
+      if (offsetX > 0 && other.maxX <= this.minX + WALL_GAP) {
+        offsetX = Math.min(this.minX - other.maxX - WALL_GAP, offsetX);
+      } else if (offsetX < 0 && other.minX >= this.maxX - WALL_GAP) {
+        offsetX = Math.max(this.maxX - other.minX + WALL_GAP, offsetX);
+      }
+    }
+    return offsetX;
+  };
+  proto.computeOffsetZ = function (this: PhysicsBox, other: PhysicsBox, offsetZ: number): number {
+    if (other.maxX > this.minX && other.minX < this.maxX && other.maxY > this.minY && other.minY < this.maxY) {
+      if (offsetZ > 0 && other.maxZ <= this.minZ + WALL_GAP) {
+        offsetZ = Math.min(this.minZ - other.maxZ - WALL_GAP, offsetZ);
+      } else if (offsetZ < 0 && other.minZ >= this.maxZ - WALL_GAP) {
+        offsetZ = Math.max(this.maxZ - other.minZ + WALL_GAP, offsetZ);
+      }
+    }
+    return offsetZ;
+  };
+  proto[WALL_GAP_MARK] = true;
 }
 
 /**

package/src/worlds/qq/normalize.ts

@@ -178,6 +178,9 @@ export function renderSegmentsPlain(segments: Segment[]): string {
       case 'image':
         parts.push({ text: '[图片]', isToken: true });
         break;
+      case 'record':
+        parts.push({ text: '[语音]', isToken: true });
+        break;
       case 'face': {
         const name = QFACE_NAMES[String(data.id ?? '')];
         parts.push({ text: name ? `[表情:${name}]` : '[QQ表情]', isToken: true });
@@ -253,6 +256,11 @@ export function renderIncoming(
         parts.push({ text: renderImage(data), isToken: true });
         break;
       }
+      // 语音条的音频不随消息到达,取回它要另一次动作调用;这里只说这是一条语音。
+      case 'record': {
+        parts.push({ text: '[语音]', isToken: true });
+        break;
+      }
       case 'face': {
         const name = QFACE_NAMES[String(data.id ?? '')];
         parts.push({ text: name ? `[表情:${name}]` : '[QQ表情]', isToken: true });
@@ -301,14 +309,20 @@ interface OutgoingArgs {
   reply_to_message_id?: number | string;
   /** 图片base64(不含data:前缀);有则编译成image段(OneBot base64://) */
   image_base64?: string;
+  /** 语音base64(不含data:前缀);有则整条消息只有这一个record段 */
+  record_base64?: string;
 }
 
 /**
  * 出站 → segment数组:reply段(如有)在前,然后image段(如有),最后text段
  * (text非空才加——支持只发图不带字)。
+ * 语音条独占一条消息:QQ 的 record 段不与别的段同发,给了它就只发它。
  * 不做 @ 编译：agent 写出的“@某人”作为纯文本原样发出。
  */
 export function buildOutgoing(args: OutgoingArgs): Segment[] {
+  if (args.record_base64) {
+    return [{ type: 'record', data: { file: `base64://${args.record_base64}` } }];
+  }
   const segments: Segment[] = [];
   if (args.reply_to_message_id !== undefined) {
     segments.push({ type: 'reply', data: { id: String(args.reply_to_message_id) } });

package/src/worlds/qq/world.ts

@@ -109,6 +109,8 @@ interface PendingDraft {
   replyMessageId?: number | string;
   /** 要发送的图片的句柄(`log:` 她看见过的 / `mem:` 她收藏的);无=纯文本 */
   imageRef?: string;
+  /** 要发送的语音的句柄;语音条独占一条消息,与 text、imageRef 互斥 */
+  voiceRef?: string;
 }
 
 interface ForwardNode {
@@ -1235,7 +1237,14 @@ export class QQWorld implements World {
   /** 实际发送到目标会话,回录 qq.self,返回回执文本 */
   private async sendToTarget(
     target: Conv,
-    opts: { text: string; replyMessageId?: number | string; imageRef?: string; imageBytes?: Uint8Array },
+    opts: {
+      text: string;
+      replyMessageId?: number | string;
+      imageRef?: string;
+      imageBytes?: Uint8Array;
+      voiceRef?: string;
+      voiceBytes?: Uint8Array;
+    },
   ): Promise<string> {
     const host = this.host!;
     const driver = this.driver!;
@@ -1247,6 +1256,7 @@ export class QQWorld implements World {
       text: opts.text,
       reply_to_message_id: opts.replyMessageId,
       image_base64: imageBase64,
+      ...(opts.voiceBytes ? { record_base64: Buffer.from(opts.voiceBytes).toString('base64') } : {}),
     });
     const action = target.kind === 'group' ? 'send_group_msg' : 'send_private_msg';
     const params =
@@ -1259,7 +1269,13 @@ export class QQWorld implements World {
     // 回录正文:文字 + (如有)图片标记,保证自己发的图在历史里也可见。
     // 行首保留平台消息号,使历史查询结果可引用自身消息。
     const imgMark = opts.imageRef ? `[图片: ${opts.imageRef}]` : '';
-    const selfBody = [opts.text, imgMark].filter(Boolean).join(' ');
+    const voiceMark = opts.voiceRef ? `[语音: ${opts.voiceRef}]` : '';
+    const selfBody = [opts.text, imgMark, voiceMark].filter(Boolean).join(' ');
+    const selfBlob = opts.imageRef
+      ? { handle: opts.imageRef, fallbackText: '你发出的图片' }
+      : opts.voiceRef
+        ? { handle: opts.voiceRef, fallbackText: '你发出的语音' }
+        : null;
     const idTag = messageId !== undefined ? `#${messageId} ` : '';
     const env = await host.pushEvent(
       {
@@ -1267,8 +1283,8 @@ export class QQWorld implements World {
         ts: nowIso(this.timezone),
         source: this.id,
         text: `${idTag}[${this.convLabel(target)} ${shortTime(this.timezone)}] 你: ${selfBody}`,
-        // 发出去的图按句柄附在自己这条记录上:时间线与吃图的模型都看得到发了什么
-        ...(opts.imageRef ? { blobs: [{ handle: opts.imageRef, fallbackText: '你发出的图片' }] } : {}),
+        // 发出去的图和语音按句柄附在自己这条记录上:时间线与吃这些类型的模型都看得到发了什么
+        ...(selfBlob ? { blobs: [selfBlob] } : {}),
         senderKey: String(driver.identity?.selfId ?? 'self'),
         meta: {
           message_id: messageId,
@@ -1320,6 +1336,13 @@ export class QQWorld implements World {
               'Optional. An image to send, given by handle: a log: handle from a [blob ...] line you saw, '
               + 'or a mem: handle of one kept in your workspace.',
           },
+          voice: {
+            type: 'string',
+            description:
+              'Optional. Audio to send as a QQ voice bar, given by handle the same way as image. '
+              + 'A voice bar is a message of its own: leave text, image and reply_to out. '
+              + 'The protocol end converts the audio it accepts (wav, mp3) to what QQ plays.',
+          },
           reply_to: {
             type: 'string',
             description:
@@ -1335,7 +1358,12 @@ export class QQWorld implements World {
         const rawText = typeof args.text === 'string' ? args.text : '';
         const imageArg =
           typeof args.image === 'string' && args.image.trim() ? args.image.trim() : undefined;
-        if (!rawText.trim() && !imageArg) return '[bad input] provide at least one of text or image';
+        const voiceArg =
+          typeof args.voice === 'string' && args.voice.trim() ? args.voice.trim() : undefined;
+        if (!rawText.trim() && !imageArg && !voiceArg) return '[bad input] provide at least one of text, image or voice';
+        if (voiceArg && (rawText.trim() || imageArg || (args.reply_to !== undefined && args.reply_to !== null && String(args.reply_to) !== ''))) {
+          return '[bad input] a voice bar is a message of its own; it carries no text, image or quote-reply';
+        }
         // 纯空白正文视为不带字(避免只发图时混进一个空白 text 段)
         const text = rawText.trim() ? rawText : '';
 
@@ -1373,7 +1401,17 @@ export class QQWorld implements World {
             : `[will send image: ${imageArg}]`;
         }
 
-        this.pendingDraft = { target, text, replyMessageId: rep.mid, imageRef };
+        // 语音:同样按句柄确认取得到,MIME 必须是音频
+        let voiceRef: string | undefined;
+        if (voiceArg) {
+          const got = host.blob(voiceArg);
+          if (!got) return `[send failed] no blob for ${voiceArg}; use a log: handle from a [blob ...] line or a mem: handle from your workspace`;
+          if (!got.mime.startsWith('audio/')) return `[send failed] ${voiceArg} is ${got.mime}, not audio`;
+          voiceRef = voiceArg;
+          previewLine = `[will send voice: ${voiceArg}]`;
+        }
+
+        this.pendingDraft = { target, text, replyMessageId: rep.mid, imageRef, voiceRef };
 
         // 排出当下已积、尚未投递的QQ会话事件(consume-once)。正文不能伪装成
         // draft 工具结果:交回 loop 按常规投递,本轮下一次推理前它们就在眼前,
@@ -1382,7 +1420,7 @@ export class QQWorld implements World {
         ctx.queueExternalEvents?.(drained);
 
         const lines = [`[draft staged → ${this.targetDesc(target)}]`];
-        lines.push(text.trim() ? `Text: ${text}` : '(image only, no text)');
+        lines.push(text.trim() ? `Text: ${text}` : voiceRef ? '(voice bar, no text)' : '(image only, no text)');
         if (previewLine) lines.push(previewLine);
         lines.push(
           '',
@@ -1433,11 +1471,19 @@ export class QQWorld implements World {
               if (!got) return `[send failed] blob ${draft.imageRef} is gone (draft kept)`;
               imageBytes = got.bytes;
             }
+            let voiceBytes: Uint8Array | undefined;
+            if (draft.voiceRef) {
+              const got = host.blob(draft.voiceRef);
+              if (!got) return `[send failed] blob ${draft.voiceRef} is gone (draft kept)`;
+              voiceBytes = got.bytes;
+            }
             const receipt = await this.sendToTarget(draft.target, {
               text: draft.text,
               replyMessageId: draft.replyMessageId,
               imageRef: draft.imageRef,
               imageBytes,
+              voiceRef: draft.voiceRef,
+              voiceBytes,
             });
             this.pendingDraft = null; // 成功才清;失败保留草稿,可再 confirm 重试
             return receipt;

package/src/worlds/terminal/world.ts

@@ -74,8 +74,7 @@ const MODEL_TEXT = {
   selfLine: (time: string, text: string) => `[${time}] you: ${text}`,
   inviteLine: (time: string, name: string, label: string, spokenBefore: boolean) =>
     `[${time}] ${name} pressed the "${label}" button on the terminal.`
-    + (spokenBefore ? '' : ' Nothing has been said here before.')
-    + ' You may say hello and introduce yourself.',
+    + (spokenBefore ? '' : ' No speech is recorded in the retained terminal history.'),
   imageFallback: (from: string, i: number, total: number) => `image ${i}/${total} from ${from}`,
   deliveredTo: (delivered: number, names: string[]) =>
     `Sent to the chat channel on the console's "Terminal" page; ${delivered} connection${delivered === 1 ? '' : 's'} online right now`
@@ -631,11 +630,11 @@ export class TerminalWorld implements World {
     this.sendJson(client.peer, { type: 'sys', text: t.unknownType(String(msg.type)) });
   }
 
-  /** 这个终端上有没有人说过话。末尾几十条够判断:这颗按钮只在事件库还空着时露面。 */
+  /** 已保存的终端事件里有没有人说过话。 */
   private spokenBefore(): boolean {
     if (!this.host) return false;
     return this.host.store
-      .range({ source: this.id, limit: 50 })
+      .range({ source: this.id })
       .some((e) => e.type === 'terminal.message' || e.type === 'terminal.self');
   }