cortico 0.1.0 → 0.1.1

package/src/worlds/minecraft/until.ts

@@ -0,0 +1,75 @@
+/**
+ * 早停名单:find 与 tunnel 声明的 `until`,把类别名摊成方块 id,一路上撞见就收工。
+ *
+ * 只认名单与判定,收不收工由技能自己决定。
+ */
+import type { Bot } from 'mineflayer';
+import { UNTIL_CATEGORIES } from './skills.ts';
+import { matchBlockIds } from './travel.ts';
+import { canSeeBlockAt } from './terrain.ts';
+import { zhName } from './names.ts';
+
+/**
+ * `until` 的早停名单 → 方块 id 集合。
+ *
+ * `#类别` 先探一次 registry 的 tag 数据面(本仓库钉住的版本没有这一面,留着是为了
+ * 将来有了就自动走过去),取不到落到 `UNTIL_CATEGORIES` 那几个内置类别。
+ * 认不出的名字不抛错 —— 早停是这一单的副条件,它认不出来不该把整步判死;
+ * 认不出哪几个由回执点名(静默吃掉参数是这条链上最贵的一类失败)。
+ */
+export function untilBlockIds(bot: Bot, until: readonly string[]): { ids: number[]; unknown: string[] } {
+  const byName = bot.registry.blocksByName as Record<string, { id: number; name: string }>;
+  const tags = (bot.registry as unknown as { blockTags?: Record<string, string[]> }).blockTags;
+  const ids = new Set<number>();
+  const unknown: string[] = [];
+  for (const raw of until) {
+    const name = raw.replace(/^minecraft:/, '');
+    if (name.startsWith('#')) {
+      const bare = name.slice(1);
+      const tagged = tags?.[bare] ?? tags?.[`minecraft:${bare}`] ?? null;
+      if (tagged) {
+        for (const n of tagged) {
+          const b = byName[n.replace(/^minecraft:/, '')];
+          if (b) ids.add(b.id);
+        }
+        continue;
+      }
+      const pred = UNTIL_CATEGORIES[bare];
+      if (!pred) { unknown.push(name); continue; }
+      for (const b of Object.values(byName)) if (pred(b.name)) ids.add(b.id);
+      continue;
+    }
+    const matched = matchBlockIds(bot, name);
+    if (matched.length === 0) { unknown.push(name); continue; }
+    for (const id of matched) ids.add(id);
+  }
+  return { ids: [...ids], unknown };
+}
+
+/** `until` 命中的那一格 */
+export interface UntilHit { x: number; y: number; z: number; what: string }
+
+/**
+ * 周身有没有碰到早停名单里的东西。
+ *
+ * `visible` = 只认看得见的:行军途中用这一档(与 find 自己的感知规则同源)。
+ * 挖通道那一档不设视线闸 —— 铲子下去露出来的那一面本来就贴着脸,视线判据在坑里没意义。
+ */
+export function untilHit(bot: Bot, ids: readonly number[], radius: number, visible: boolean): UntilHit | null {
+  if (ids.length === 0) return null;
+  const found = bot.findBlocks({ matching: [...ids], maxDistance: radius, count: 16 });
+  const p = found.find((q) => !visible || canSeeBlockAt(bot, q));
+  if (!p) return null;
+  return { x: p.x, y: p.y, z: p.z, what: zhName(bot.blockAt(p)?.name ?? 'unknown') };
+}
+
+/** 行军途中每走完一段扫一次早停的半径(格) */
+export const UNTIL_TRAVEL_RADIUS = 16;
+/** 挖通道每挖完一格扫一次早停的半径(格):坑壁上露出来的那一圈 */
+export const UNTIL_DIG_RADIUS = 4;
+
+/** 认不出的早停名字那一句;全认得出返回空串 */
+export function untilUnknownNote(unknown: readonly string[]): string {
+  return unknown.length > 0 ? `(until 里的 ${unknown.join('、')} 认不出来,这几样没算进去)` : '';
+}
+

package/src/worlds/terminal/world.ts

@@ -74,7 +74,8 @@ 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 ? '' : ' No speech is recorded in the retained terminal history.'),
+    + (spokenBefore ? '' : ' Nothing has been said here before.')
+    + ' You may say hello and introduce yourself.',
   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`
@@ -251,6 +252,8 @@ interface TerminalWorldOptions {
 
 const NAME_MAX = 32;
 const TEXT_MAX = 4000;
+/** 按钮标签进事件正文前的长度上限。 */
+const LABEL_MAX = 40;
 
 /** 一条消息最多带几张图,单张解码后的字节上限。与面板侧的上限一致。 */
 const IMAGES_MAX = 8;
@@ -606,8 +609,8 @@ export class TerminalWorld implements World {
         this.sendJson(client.peer, { type: 'sys', text: t.botNotConnected });
         return;
       }
-      // 事件引用单行标签；没有标签时不产生事件。
-      const label = typeof msg.label === 'string' ? msg.label.replace(/\s+/g, ' ').trim() : '';
+      // 标签逐字进事件正文,所以压成一行并截断;没有标签就没有可引用的事实,这一帧作废。
+      const label = typeof msg.label === 'string' ? msg.label.replace(/\s+/g, ' ').trim().slice(0, LABEL_MAX) : '';
       if (!label) return;
       const host = this.host;
       host.pushEvent(
@@ -628,11 +631,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 })
+      .range({ source: this.id, limit: 50 })
       .some((e) => e.type === 'terminal.message' || e.type === 'terminal.self');
   }
 

package/src/providers/console/config.ts

@@ -1,21 +0,0 @@
-import type { ConfigGroup } from '../../core/config-schema.ts';
-import type { LLMProviderEntry } from '../../core/types.ts';
-import type { Language } from '../../core/language.ts';
-import { text } from './strings.ts';
-
-export function connectionGroup(name: string, entry: LLMProviderEntry, language: Language): ConfigGroup {
-  const S = text(language);
-  const prefix = `providers.${name}.`;
-  return {
-    id: `llm.${entry.kind}.${name}.connection`,
-    owner: `provider:${entry.kind}`,
-    schema: {
-      type: 'object', title: name, description: S.connectionDescription,
-      properties: {
-        [`${prefix}baseUrl`]: { type: 'string', title: S.baseUrl, 'x-hot': true },
-        [`${prefix}secret`]: { type: 'string', title: S.secret, description: S.secretDescription, 'x-hot': true },
-        [`${prefix}multimodal`]: { type: 'boolean', title: S.multimodal, 'x-hot': true },
-      },
-    },
-  };
-}

package/src/providers/llamacpp/config.ts

@@ -1,36 +0,0 @@
-import type { ConfigGroup, ConfigProperty } from '../../core/config-schema.ts';
-import type { Language } from '../../core/language.ts';
-import type { LLMProviderEntry } from '../../core/types.ts';
-import { backendChoices, llamacppOptions } from './options.ts';
-import { panel } from './strings.ts';
-
-export function runtimeConfig(name: string, entry: LLMProviderEntry, language: Language): ConfigGroup[] {
-  if (!llamacppOptions(entry).runtime) return [];
-  const S = panel[language];
-  const group = (id: string, title: string, properties: Record<string, ConfigProperty>): ConfigGroup => ({
-    id: `llm.llamacpp.${name}.${id}`,
-    owner: 'provider:llamacpp',
-    schema: {
-      type: 'object', title,
-      properties: Object.fromEntries(Object.entries(properties).map(([path, property]) => [
-        `providers.${name}.options.${path}`, { ...property, 'x-hot': true },
-      ])),
-    },
-  });
-  return [
-    group('runtime', S.runtimeSection, {
-      'runtime.release': { type: 'string', title: S.release, description: S.releaseHint },
-      'runtime.backend': { type: 'string', title: S.backend, enum: backendChoices() },
-      'runtime.runtimeDir': {
-        type: 'string', title: S.runtimeDir, description: S.runtimeDirHint, 'x-path': { kind: 'directory' },
-      },
-    }),
-    group('launch', S.launchSection, {
-      'launch.contextSize': { type: 'integer', title: S.contextSize, minimum: 1, description: S.launchSectionDesc },
-      'launch.nGpuLayers': { type: 'integer', title: S.nGpuLayers, minimum: 0 },
-      'launch.parallel': { type: 'integer', title: S.parallel, minimum: 1 },
-      'launch.extraArgs': { type: 'string', title: S.extraArgs, description: S.extraArgsHint },
-      autoStart: { type: 'boolean', title: S.autoStart },
-    }),
-  ];
-}

package/src/providers/openai-responses-compat/config.ts

@@ -1,20 +0,0 @@
-import type { ConfigGroup } from '../../core/config-schema.ts';
-import type { LLMProviderEntry } from '../../core/types.ts';
-import type { Language } from '../../core/language.ts';
-import { text } from './strings.ts';
-
-export function protocolConfig(name: string, entry: LLMProviderEntry, language: Language): ConfigGroup[] {
-  const S = text(language);
-  return [{
-    id: `llm.${entry.kind}.${name}.protocol`,
-    owner: `provider:${entry.kind}`,
-    schema: {
-      type: 'object', title: name,
-      properties: {
-        [`providers.${name}.options.endpointPath`]: {
-          type: 'string', title: S.endpointPath, description: S.endpointPathDescription, 'x-hot': true,
-        },
-      },
-    },
-  }];
-}