cortico-world-bloom-kpect 0.3.2-dev.v7.4 → 0.3.2-dev.v7.5

package/dist/index.js

@@ -1,11 +1,50 @@
+// bin/join-bot.mjs
+import { randomBytes, randomUUID } from "node:crypto";
+import { readFile, writeFile, rename, unlink } from "node:fs/promises";
+async function joinBot(file, url, name, signal, resume = false) {
+  if (!name || name.length > 20 || /[\u0000-\u001f\u007f]/.test(name)) throw Error("\u5C45\u6C11\u6635\u79F0\u9700\u4E3A 1\u201320 \u4E2A\u5B57\u7B26");
+  let credentials;
+  try {
+    credentials = JSON.parse(await readFile(file, "utf8"));
+  } catch (error) {
+    if (error.code !== "ENOENT") throw error;
+    credentials = { url, name, token: randomBytes(32).toString("hex"), requestId: randomUUID() };
+    await writeFile(file, JSON.stringify(credentials, null, 2), { flag: "wx", mode: 384 });
+  }
+  if (credentials.url !== url || credentials.name !== name) throw Error("\u51ED\u636E\u5C5E\u4E8E\u5176\u4ED6\u5C0F\u9547\u6216\u6635\u79F0\uFF0C\u8BF7\u4F7F\u7528\u539F\u5165\u9547\u6635\u79F0\u548C\u670D\u52A1\u5668");
+  if (!/^[A-Za-z0-9_-]{32,128}$/.test(credentials.token) || !credentials.requestId) throw Error("\u672C\u673A\u5165\u9547\u51ED\u636E\u635F\u574F");
+  if (resume && credentials.member?.id) return { credentials };
+  const response = await fetch(url + "/api/join", {
+    method: "POST",
+    redirect: "error",
+    headers: { "Content-Type": "application/json" },
+    body: JSON.stringify({ name, kind: "bot", clientToken: credentials.token, requestId: credentials.requestId }),
+    signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(3e4)]) : AbortSignal.timeout(3e4)
+  });
+  const result = await response.json();
+  if (!response.ok) throw Error("\u5165\u9547\u5931\u8D25 HTTP " + response.status + " " + String(result.code ?? "").replace(/[^A-Z0-9_]/g, "").slice(0, 80));
+  if (!result.member?.id || result.member.kind !== "bot") throw Error("\u5165\u9547\u54CD\u5E94\u7F3A\u5C11 Bot \u8EAB\u4EFD");
+  credentials.member = result.member;
+  const temporary = file + "." + randomUUID() + ".tmp";
+  try {
+    await writeFile(temporary, JSON.stringify(credentials, null, 2), { flag: "wx", mode: 384 });
+    await rename(temporary, file);
+  } finally {
+    await unlink(temporary).catch((error) => {
+      if (error.code !== "ENOENT") throw error;
+    });
+  }
+  return { credentials, result };
+}
+
 // src/index.ts
 import { join as join2 } from "node:path";
 import { fileURLToPath } from "node:url";
-import { readFile as readFile2, writeFile as writeFile2, mkdir as mkdir2 } from "node:fs/promises";
+import { readFile as readFile3, writeFile as writeFile3, mkdir as mkdir2 } from "node:fs/promises";
 
 // src/transport.ts
 import { createHash } from "node:crypto";
-import { mkdir, readFile, writeFile, unlink, realpath } from "node:fs/promises";
+import { mkdir, readFile as readFile2, writeFile as writeFile2, unlink as unlink2, realpath } from "node:fs/promises";
 import { join, resolve } from "node:path";
 var mutationLocks = /* @__PURE__ */ new Set();
 function serverUrl(input) {
@@ -52,10 +91,10 @@ var BloomTransport = class {
     await mkdir(this.dir, { recursive: true });
     const binding = join(this.dir, "server-" + createHash("sha256").update(token).digest("hex") + ".json");
     try {
-      await writeFile(binding, JSON.stringify({ url }), { flag: "wx", mode: 384 });
+      await writeFile2(binding, JSON.stringify({ url }), { flag: "wx", mode: 384 });
     } catch (error) {
       if (error.code !== "EEXIST") throw error;
-      if (JSON.parse(await readFile(binding, "utf8")).url !== url) throw Error("\u6B64Bot\u4EE4\u724C\u5DF2\u7ED1\u5B9A\u53E6\u4E00\u670D\u52A1\u5668\uFF0C\u8BF7\u4F7F\u7528\u65B0\u670D\u52A1\u5668\u72EC\u7ACB\u7B7E\u53D1\u7684\u4EE4\u724C");
+      if (JSON.parse(await readFile2(binding, "utf8")).url !== url) throw Error("\u6B64Bot\u4EE4\u724C\u5DF2\u7ED1\u5B9A\u53E6\u4E00\u670D\u52A1\u5668\uFF0C\u8BF7\u4F7F\u7528\u65B0\u670D\u52A1\u5668\u72EC\u7ACB\u7B7E\u53D1\u7684\u4EE4\u724C");
     }
     const response = await fetch(url + "/api/" + endpoint, { method: body ? "POST" : "GET", redirect: "error", headers: { Authorization: "Bearer " + token, "Content-Type": "application/json" }, ...body ? { body: JSON.stringify(body) } : {}, signal: AbortSignal.any([AbortSignal.timeout(2e4), ...signal ? [signal] : []]) }).catch(() => {
       throw Error("\u82B1\u8BED\u4E61\u8FDE\u63A5\u4E2D\u65AD\u6216\u8D85\u65F6\uFF1B\u5DF2\u63D0\u4EA4\u52A8\u4F5C\u7684\u7ED3\u679C\u53EF\u80FD\u672A\u77E5\uFF0C\u8BF7\u4FDD\u7559\u539FrequestId");
@@ -88,7 +127,7 @@ var BloomTransport = class {
   }
   async pending() {
     try {
-      return JSON.parse(await readFile(join(this.dir, "pending.json"), "utf8"));
+      return JSON.parse(await readFile2(join(this.dir, "pending.json"), "utf8"));
     } catch (e) {
       if (e.code === "ENOENT") return null;
       throw Error("\u672A\u89E3\u51B3\u8BF7\u6C42\u8BB0\u5F55\u635F\u574F\uFF0C\u8BF7\u64CD\u4F5C\u8005\u6838\u67E5\uFF0C\u4E0D\u81EA\u52A8\u8986\u76D6");
@@ -106,13 +145,13 @@ var BloomTransport = class {
       const identity = this.identity().key, old = await this.pending(), payload = JSON.stringify({ endpoint, body });
       if (old && (old.identity !== identity || old.payload !== payload)) throw Error("\u6709\u672A\u89E3\u51B3\u52A8\u4F5C\uFF0C\u8BF7\u5148\u7528\u539FrequestId\u548C\u76F8\u540C\u53C2\u6570\u91CD\u8BD5\uFF1B\u4E0D\u80FD\u6362\u670D\u52A1\u5668\u3001\u4EE4\u724C\u6216\u8BF7\u6C42\u7ED5\u8FC7");
       if (signal?.aborted) throw Error("\u8BF7\u6C42\u5DF2\u53D6\u6D88\uFF0C\u5C1A\u672A\u63D0\u4EA4");
-      if (!old) await writeFile(join(this.dir, "pending.json"), JSON.stringify({ identity, payload, requestId: body.requestId }), { flag: "wx", mode: 384 });
+      if (!old) await writeFile2(join(this.dir, "pending.json"), JSON.stringify({ identity, payload, requestId: body.requestId }), { flag: "wx", mode: 384 });
       try {
         const result = await this.request(endpoint, body, signal, identity);
-        await unlink(join(this.dir, "pending.json"));
+        await unlink2(join(this.dir, "pending.json"));
         return result;
       } catch (error) {
-        if (error instanceof BloomHttpError && error.status >= 400 && error.status < 500 && error.code !== "CONCURRENT_UPDATE") await unlink(join(this.dir, "pending.json"));
+        if (error instanceof BloomHttpError && error.status >= 400 && error.status < 500 && error.code !== "CONCURRENT_UPDATE") await unlink2(join(this.dir, "pending.json"));
         throw error;
       }
     } finally {
@@ -168,9 +207,12 @@ function decisionSummary(state, now = Date.now()) {
   if (Array.isArray(state.jobs)) {
     const known = state.jobs.filter((job) => finite(job.remaining) && finite(job.fundedRemaining) && finite(job.reward) && finite(job.energy) && typeof job.done === "boolean");
     const incomeRemaining = state.economyV7?.incomeRemaining;
-    const candidates = known.filter((job) => !state.activeAction && finite(me.energy) && me.energy >= job.energy && (!finite(incomeRemaining) || job.reward <= incomeRemaining) && !job.done && !job.unavailableReason && job.remaining > 0 && job.fundedRemaining > 0);
-    const ready = candidates.filter((job) => job.location === me.location), travel = candidates.filter((job) => job.location !== me.location);
+    const shiftsLeft = Math.max(0, 3 - known.filter((job) => job.done).length);
+    const candidates = known.filter((job) => shiftsLeft > 0 && !job.signedUp && !state.activeAction && finite(me.energy) && me.energy >= job.energy && (!finite(incomeRemaining) || job.reward <= incomeRemaining) && !job.done && !job.unavailableReason && job.remaining > 0 && job.fundedRemaining > 0);
+    const ready = candidates.filter((job) => job.location === me.location && job.available !== false), travel = candidates.filter((job) => job.location !== me.location);
     out.work = { readyHere: ready.map((job) => job.id), needsTravel: travel.map((job) => job.id), sharedBudget: true };
+    const signup = known.find((job) => job.signedUp);
+    if (signup) out.work.waitingForPartner = { jobId: signup.id, cancelAction: "cancelTeamWork" };
     if (finite(incomeRemaining)) out.work.incomeRemaining = incomeRemaining;
     if (known.length !== state.jobs.length || !finite(me.energy)) out.work.needsCheck = true;
     if (finite(state.economy?.workRemaining)) {
@@ -182,7 +224,7 @@ function decisionSummary(state, now = Date.now()) {
         spent += job.reward;
         count++;
       }
-      out.work.affordableTypesUpperBound = count;
+      out.work.affordableTypesUpperBound = Math.min(count, shiftsLeft);
     }
     parts.push(`\u8FD9\u91CC\u53EF\u63A5${ready.length}\u7C7B\u5DE5\u4F5C\uFF0C\u6362\u5730\u70B9\u53EF\u8003\u8651${travel.length}\u7C7B\uFF08\u5171\u7528\u5DE5\u8D44\u6C60\uFF0C\u540D\u989D\u4E0D\u76F8\u52A0${out.work.needsCheck ? "\uFF1B\u90E8\u5206\u4FE1\u606F\u5F85\u67E5" : ""}\uFF09`);
   }
@@ -364,9 +406,10 @@ var StateNotifications = class {
 };
 
 // src/index.ts
-var defaults = () => ({ enabled: false, serverUrl: "", tokenEnvName: "CORTICO_BLOOM_TOKEN", allowActions: false, allowChat: false, receivePrivateMessages: false, pollIntervalSec: 60, stateEventIntervalSec: 300, stateWakeMode: "important", watchChannels: "town,lounge,notice" });
+var defaults = () => ({ enabled: false, serverUrl: "", tokenEnvName: "CORTICO_BLOOM_TOKEN", registrationName: "", allowActions: false, allowChat: false, receivePrivateMessages: false, pollIntervalSec: 60, stateEventIntervalSec: 300, stateWakeMode: "important", watchChannels: "town,lounge,notice" });
 var config = { id: "world:bloom", owner: "world:bloom", schema: { type: "object", title: "\u82B1\u8BED\u4E61\u8FDE\u63A5\u4E0E\u81EA\u4E3B\u6743\u9650", properties: {
   "worlds.bloom.serverUrl": { type: "string", title: "\u82B1\u8BED\u4E61\u670D\u52A1\u5668\u5730\u5740", description: "\u8FDC\u7A0B\u4F7F\u7528HTTPS\uFF1B\u672C\u673A\u53EF\u7528http://127.0.0.1:4173\u3002\u4E0D\u5F97\u586B\u5199\u542B\u4EE4\u724C\u7684URL\u3002" },
+  "worlds.bloom.registrationName": { type: "string", title: "\u65B0 Bot \u5165\u9547\u6635\u79F0", description: "\u65B0 Bot \u586B\u5199\u6635\u79F0\u540E\u542F\u7528\u5373\u53EF\u6CE8\u518C\u3002\u51ED\u636E\u4FDD\u5B58\u5728\u5F53\u524D Cortico \u6570\u636E\u76EE\u5F55\uFF1B\u91CD\u542F\u6CBF\u7528\u539F\u6635\u79F0\u3002\u5DF2\u6709\u73AF\u5883\u4EE4\u724C\u4F18\u5148\u3002" },
   "worlds.bloom.tokenEnvName": { type: "string", title: "Bot\u4EE4\u724C\u73AF\u5883\u53D8\u91CF\u540D", description: "\u586B\u5199\u53D8\u91CF\u540D\uFF1B\u4EE4\u724C\u503C\u4FDD\u5B58\u5728\u90E8\u7F72.env\u4E2D\u3002\u6BCF\u4E2ABot\u4F7F\u7528\u72EC\u7ACB\u4EE4\u724C\u3002" },
   "worlds.bloom.allowActions": { type: "boolean", title: "\u5141\u8BB8\u81EA\u4E3B\u6E38\u620F\u52A8\u4F5C", description: "\u4ECD\u53D7\u670D\u52A1\u5668\u5F53\u524D\u6743\u9650\u3001\u6D88\u8D39\u3001\u8D60\u793C\u548C\u635F\u5931\u989D\u5EA6\u9650\u5236\u3002" },
   "worlds.bloom.allowChat": { type: "boolean", title: "\u5141\u8BB8\u81EA\u4E3B\u6E38\u620F\u5185\u53D1\u8A00" },
@@ -379,7 +422,7 @@ var config = { id: "world:bloom", owner: "world:bloom", schema: { type: "object"
 var BloomWorld = class {
   constructor(ctx) {
     this.ctx = ctx;
-    this.transport = new BloomTransport(() => ({ url: ctx.cfg.serverUrl, token: ctx.secret(ctx.cfg.tokenEnvName) }), join2(ctx.dataDir, "bloom-transport"));
+    this.transport = new BloomTransport(() => this.connection(), join2(ctx.dataDir, "bloom-transport"));
   }
   ctx;
   id = "bloom";
@@ -404,6 +447,23 @@ var BloomWorld = class {
   tableSubscriptions = /* @__PURE__ */ new Set();
   receivingPrivateMessages = false;
   privateSince = 0;
+  localBot;
+  connection() {
+    const { serverUrl: url, tokenEnvName, registrationName } = this.ctx.cfg;
+    const local = this.localBot;
+    const token = this.ctx.secret(tokenEnvName) || (local && local.url === serverUrl(url) && local.name === registrationName?.trim() ? local.token : "");
+    return { url, token };
+  }
+  async prepareRegistration(signal) {
+    if (this.connection().token) return;
+    const name = this.ctx.cfg.registrationName?.trim();
+    if (!name) throw Error("\u65B0 Bot \u8BF7\u586B\u5199\u5165\u9547\u6635\u79F0\uFF1B\u5DF2\u6709\u5C45\u6C11\u8BF7\u914D\u7F6E\u672C\u4EBA\u7684\u4EE4\u724C");
+    const url = serverUrl(this.ctx.cfg.serverUrl), dir = join2(this.ctx.dataDir, "bloom-transport");
+    await mkdir2(dir, { recursive: true });
+    const { credentials } = await joinBot(join2(dir, "registration.json"), url, name, signal, true);
+    signal.throwIfAborted();
+    this.localBot = { url, name, token: credentials.token };
+  }
   envPromptVars() {
     return { "bloom.permissions": `\u6E38\u620F\u52A8\u4F5C${this.ctx.cfg.allowActions ? "\u5141\u8BB8" : "\u6682\u505C"}\uFF0C\u6E38\u620F\u5185\u53D1\u8A00${this.ctx.cfg.allowChat ? "\u5141\u8BB8" : "\u6682\u505C"}\uFF0C\u63A5\u6536\u79C1\u4FE1${this.ctx.cfg.receivePrivateMessages ? "\u5F00\u542F" : "\u5173\u95ED"}\uFF1B\u8BF7\u67E5\u8BE2\u5B9E\u65F6\u72B6\u6001` };
   }
@@ -494,6 +554,7 @@ var BloomWorld = class {
       }
     };
     try {
+      if (!this.connection().token) await this.prepareRegistration(signal);
       key = this.transport.identity().key;
       const freshState = () => fresh() && revision === this.observationRevision;
       const state = await this.observe(signal);
@@ -504,7 +565,7 @@ var BloomWorld = class {
         if (!freshState()) return;
         let cursors = {};
         try {
-          cursors = JSON.parse(await readFile2(join2(this.ctx.dataDir, "bloom-transport", "cursors-" + key + ".json"), "utf8"));
+          cursors = JSON.parse(await readFile3(join2(this.ctx.dataDir, "bloom-transport", "cursors-" + key + ".json"), "utf8"));
         } catch (e) {
           if (e.code !== "ENOENT") throw Error("\u9891\u9053\u6E38\u6807\u635F\u574F\uFF0C\u8BF7\u64CD\u4F5C\u8005\u68C0\u67E5");
         }
@@ -616,7 +677,7 @@ var BloomWorld = class {
         if (!fresh()) return;
         await mkdir2(join2(this.ctx.dataDir, "bloom-transport"), { recursive: true });
         if (!fresh()) return;
-        await writeFile2(join2(this.ctx.dataDir, "bloom-transport", "cursors-" + key + ".json"), cursorData, { mode: 384 });
+        await writeFile3(join2(this.ctx.dataDir, "bloom-transport", "cursors-" + key + ".json"), cursorData, { mode: 384 });
       });
       await this.cursorWrites;
       if (!fresh()) return;
@@ -624,11 +685,12 @@ var BloomWorld = class {
       if (!fresh()) return;
       this.error = "";
       this.failures = 0;
-    } catch {
+    } catch (error) {
       if (!this.current(generation) || signal.aborted || revision !== this.observationRevision) return;
       this.failures++;
-      if (this.error !== "\u82B1\u8BED\u4E61\u89C2\u5BDF\u5931\u8D25\uFF1B\u8BF7\u67E5\u8BE2\u72B6\u6001\u5DE5\u5177\u6838\u5BF9\u670D\u52A1\u5668\u3001\u4EE4\u724C\u6216\u9891\u9053\u6743\u9650") {
-        this.error = "\u82B1\u8BED\u4E61\u89C2\u5BDF\u5931\u8D25\uFF1B\u8BF7\u67E5\u8BE2\u72B6\u6001\u5DE5\u5177\u6838\u5BF9\u670D\u52A1\u5668\u3001\u4EE4\u724C\u6216\u9891\u9053\u6743\u9650";
+      const detail = !key && error instanceof Error && /^(新 Bot 请填写|居民昵称需为|入镇失败 HTTP|凭据属于|本机入镇凭据损坏)/.test(error.message) ? error.message : "\u82B1\u8BED\u4E61\u89C2\u5BDF\u5931\u8D25\uFF1B\u8BF7\u67E5\u8BE2\u72B6\u6001\u5DE5\u5177\u6838\u5BF9\u670D\u52A1\u5668\u3001\u4EE4\u724C\u6216\u9891\u9053\u6743\u9650";
+      if (this.error !== detail) {
+        this.error = detail;
         try {
           await this.event("connection", { connected: false, error: this.error }, generation);
         } catch {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cortico-world-bloom-kpect",
-  "version": "0.3.2-dev.v7.4",
+  "version": "0.3.2-dev.v7.5",
   "description": "花语乡 Project Bloom（群 1132517396）：让 Cortico Bot 自主生活、交易、送礼与交流的 World 扩展",
   "type": "module",
   "main": "./dist/index.js",

package/src/index.ts

@@ -1,3 +1,4 @@
+import {joinBot} from '../bin/join-bot.mjs';
 import {join} from 'node:path';
 import {fileURLToPath} from 'node:url';
 import {readFile,writeFile,mkdir} from 'node:fs/promises';
@@ -10,10 +11,11 @@ export {StateNotifications} from './state-notifications';
 export {BloomTransport,BloomHttpError,serverUrl} from './transport';
 export {selectState,eventVersion,stateEvent,compactReceipt} from './observation';
 
-export type BloomConfig={enabled:boolean;serverUrl:string;tokenEnvName:string;allowActions:boolean;allowChat:boolean;receivePrivateMessages:boolean;pollIntervalSec:number;stateEventIntervalSec:number;stateWakeMode:'important'|'all'|'off';watchChannels:string};
-export const defaults=():BloomConfig=>({enabled:false,serverUrl:'',tokenEnvName:'CORTICO_BLOOM_TOKEN',allowActions:false,allowChat:false,receivePrivateMessages:false,pollIntervalSec:60,stateEventIntervalSec:300,stateWakeMode:'important',watchChannels:'town,lounge,notice'});
+export type BloomConfig={enabled:boolean;serverUrl:string;tokenEnvName:string;registrationName?:string;allowActions:boolean;allowChat:boolean;receivePrivateMessages:boolean;pollIntervalSec:number;stateEventIntervalSec:number;stateWakeMode:'important'|'all'|'off';watchChannels:string};
+export const defaults=():BloomConfig=>({enabled:false,serverUrl:'',tokenEnvName:'CORTICO_BLOOM_TOKEN',registrationName:'',allowActions:false,allowChat:false,receivePrivateMessages:false,pollIntervalSec:60,stateEventIntervalSec:300,stateWakeMode:'important',watchChannels:'town,lounge,notice'});
 const config:ConfigGroup={id:'world:bloom',owner:'world:bloom',schema:{type:'object',title:'花语乡连接与自主权限',properties:{
  'worlds.bloom.serverUrl':{type:'string',title:'花语乡服务器地址',description:'远程使用HTTPS；本机可用http://127.0.0.1:4173。不得填写含令牌的URL。'},
+ 'worlds.bloom.registrationName':{type:'string',title:'新 Bot 入镇昵称',description:'新 Bot 填写昵称后启用即可注册。凭据保存在当前 Cortico 数据目录；重启沿用原昵称。已有环境令牌优先。'},
  'worlds.bloom.tokenEnvName':{type:'string',title:'Bot令牌环境变量名',description:'填写变量名；令牌值保存在部署.env中。每个Bot使用独立令牌。'},
  'worlds.bloom.allowActions':{type:'boolean',title:'允许自主游戏动作',description:'仍受服务器当前权限、消费、赠礼和损失额度限制。'},
  'worlds.bloom.allowChat':{type:'boolean',title:'允许自主游戏内发言'},
@@ -31,7 +33,24 @@ export class BloomWorld implements World{
  private prompts=new Map<string,{revision:number;sent:number}>();
  private tableSubscriptions=new Set<string>();
  private receivingPrivateMessages=false;private privateSince=0;
- constructor(private ctx:WorldContext<BloomConfig>){this.transport=new BloomTransport(()=>({url:ctx.cfg.serverUrl,token:ctx.secret(ctx.cfg.tokenEnvName)}),join(ctx.dataDir,'bloom-transport'));}
+ private localBot?:{url:string;name:string;token:string};
+ private connection(){
+  const {serverUrl:url,tokenEnvName,registrationName}=this.ctx.cfg;
+  const local=this.localBot;
+  const token=this.ctx.secret(tokenEnvName)||(local&&local.url===serverUrl(url)&&local.name===registrationName?.trim()?local.token:'');
+  return {url,token};
+ }
+ private async prepareRegistration(signal:AbortSignal){
+  if(this.connection().token)return;
+  const name=this.ctx.cfg.registrationName?.trim();
+  if(!name)throw Error('新 Bot 请填写入镇昵称；已有居民请配置本人的令牌');
+  const url=serverUrl(this.ctx.cfg.serverUrl),dir=join(this.ctx.dataDir,'bloom-transport');
+  await mkdir(dir,{recursive:true});
+  const {credentials}=await joinBot(join(dir,'registration.json'),url,name,signal,true);
+  signal.throwIfAborted();
+  this.localBot={url,name,token:credentials.token};
+ }
+ constructor(private ctx:WorldContext<BloomConfig>){this.transport=new BloomTransport(()=>this.connection(),join(ctx.dataDir,'bloom-transport'));}
  envPromptVars(){return {'bloom.permissions':`游戏动作${this.ctx.cfg.allowActions?'允许':'暂停'}，游戏内发言${this.ctx.cfg.allowChat?'允许':'暂停'}，接收私信${this.ctx.cfg.receivePrivateMessages?'开启':'关闭'}；请查询实时状态`};}
  webUi(){return {label:'花语乡 Project Bloom',config:[config],lamps:[{label:'花语乡连接',state:this.error?'error' as const:this.fingerprint?'online' as const:'offline' as const,detail:this.error||'通过观察工具查询当前连接'}],promptDocs:[{key:'worlds.bloom.envPrompt',title:'花语乡生活与安全',description:'状态、交易、赠礼和不可信消息边界',path:fileURLToPath(new URL('../ENV_PROMPT.md',import.meta.url)),role:'envPrompt' as const,vars:[{name:'bloom.permissions',description:'实时自主权限'}]}]};}
  private current(generation:number){return !this.stopped&&generation===this.generation;}
@@ -76,6 +95,7 @@ export class BloomWorld implements World{
   let key='';
   const fresh=()=>{if(!this.current(generation)||signal.aborted)return false;try{return this.transport.identity().key===key;}catch{return false;}};
   try{
+   if(!this.connection().token)await this.prepareRegistration(signal);
    key=this.transport.identity().key;
    const freshState=()=>fresh()&&revision===this.observationRevision;
    const state=await this.observe(signal);if(!freshState())return;
@@ -164,11 +184,12 @@ export class BloomWorld implements World{
    await this.cursorWrites;if(!fresh())return;
    if(this.error)await this.event('connection',{connected:true},generation);
    if(!fresh())return;this.error='';this.failures=0;
-  }catch{
+  }catch(error){
    if(!this.current(generation)||signal.aborted||revision!==this.observationRevision)return;
    this.failures++;
-   if(this.error!=='花语乡观察失败；请查询状态工具核对服务器、令牌或频道权限'){
-    this.error='花语乡观察失败；请查询状态工具核对服务器、令牌或频道权限';
+   const detail=!key&&error instanceof Error&&/^(新 Bot 请填写|居民昵称需为|入镇失败 HTTP|凭据属于|本机入镇凭据损坏)/.test(error.message)?error.message:'花语乡观察失败；请查询状态工具核对服务器、令牌或频道权限';
+   if(this.error!==detail){
+    this.error=detail;
     try{await this.event('connection',{connected:false,error:this.error},generation);}catch{/* A host rejection must never escape a background poll. */}
    }
   }

package/src/observation.ts

@@ -1,82 +1,84 @@
-// Projection happens only after the authenticated server has filtered the resident view.
-type State=Record<string,any>;
-export const coreSections=['clock','me','activeAction','onboarding','plots','claims','botSafety','contentPolicy','quiz','parlor','economyV7','marketRegulation','whale'] as const;
-const legacySections=['clock','me','activeAction','onboarding','plots','claims','availableActions','nearby','jobs','neighbors','home','life','leisure','quiz','parlor','porch','seasonal','belongings','crafting','economy','custody','housing','trade','orders','botSafety','contentPolicy'];
-export const stateSections=[...new Set([...legacySections,'economyV7','marketRegulation','whale','careers','chat','titles','shops','locations','residents','catalog','recipes','market','mailbox','visits','visitingHome','projects','caravan','registeredEvents','chronicle','donation','television','houses','ledger','activity','finance','publicBudget','publicSpending','buybackPolicies','todayRecommendation','npcReplies','observer','observedResidentId','pendingFeatures'])];
-function normalized(state:State):State{return {...state,nearby:state.locations?.find((l:{id:string})=>l.id===state.me?.location),neighbors:state.residents};}
-function pick(state:State,keys:readonly string[]){return Object.fromEntries(keys.filter(key=>state[key]!==undefined).map(key=>[key,state[key]]));}
-function compactEconomy(value:State){return {...pick(value,['day','earnedToday','incomeRemaining','pendingIncome','publicCustody','custodyProtectedUntil','nextIncomeResetAt']),policy:pick(value.policy??{},['dailyIncomeLimit','idleWalletThreshold','idleAfterMs'])};}
-function compactMarket(value:State){return {...pick(value,['policy','limits','transactionsUsedMinute','transactionsUsedHour','feeRule']),...(value.resources?{resources:{location:value.resources.location,availableKinds:value.resources.items?.filter((x:State)=>x.remaining>0).length??0,totalKinds:value.resources.items?.length??0,nextRefillAt:value.resources.nextRefillAt}}:{})};}
-function compactWhale(value:State){
- if(!value.joined)return pick(value,['name','joined','open','initialCash']);
- const me=value.me??{},prizes=me.prizes??[];
- return {...pick(value,['name','joined','open','currency','catchingUp','weekEndsAt']),rules:pick(value.rules??{},['dailyLimitPercent','feePercent','tradesPerHour','minWeeklyTrades','minWeeklyDays']),stocks:value.stocks?.map((s:State)=>pick(s,['id','price','changePercent'])),me:{...pick(me,['cash','netWorth','rank','holdings','tradesThisWeek','daysThisWeek','tradesRemainingThisHour']),prizes:[...prizes.filter((p:State)=>p.rank===1&&!p.claimedTitle),...prizes.filter((p:State)=>p.claimedTitle).slice(-3)]}};
-}
-function summaries(source:State){return {...(source.economyV7!==undefined?{economyV7:source.economyV7===null?null:compactEconomy(source.economyV7)}:{}),...(source.marketRegulation!==undefined?{marketRegulation:source.marketRegulation===null?null:compactMarket(source.marketRegulation)}:{}),...(source.whale!==undefined?{whale:source.whale===null?null:compactWhale(source.whale)}:{})};}
-const finite=(value:unknown):value is number=>typeof value==='number'&&Number.isFinite(value);
-/** Decision hints use server fields only and never participate in eventVersion. */
-export function decisionSummary(state:State,now=Date.now()):State{
- const me=state.me??{},parts:string[]=[],out:State={};
- if(typeof state.clock?.weather==='string'){out.weather=state.clock.weather;parts.push(`天气${state.clock.weather}`);}
- if(finite(me.energy)){out.energy=me.energy;parts.push(`体力${me.energy}`);}
- if(state.activeAction){out.busy=pick(state.activeAction,['id','type','endsAt','finishAt']);parts.push('当前有进行中的动作');}
- if(Array.isArray(state.plots)){
-  const ready=state.plots.filter((plot:State)=>plot.crop&&!plot.busy&&(plot.mature===true||finite(plot.maturesAt)&&plot.maturesAt<=(finite(state.clock?.serverNow)?state.clock.serverNow:now)));
-  out.crops={ready:ready.length,plotIds:ready.map((plot:State)=>plot.id).filter((id:unknown)=>typeof id==='string')};parts.push(`成熟待收${ready.length}块`);
- }
- if(Array.isArray(state.jobs)){
-  const known=state.jobs.filter((job:State)=>finite(job.remaining)&&finite(job.fundedRemaining)&&finite(job.reward)&&finite(job.energy)&&typeof job.done==='boolean');
-  const incomeRemaining=state.economyV7?.incomeRemaining;
-  const candidates=known.filter((job:State)=>!state.activeAction&&finite(me.energy)&&me.energy>=job.energy&&(!finite(incomeRemaining)||job.reward<=incomeRemaining)&&!job.done&&!job.unavailableReason&&job.remaining>0&&job.fundedRemaining>0);
-  const ready=candidates.filter((job:State)=>job.location===me.location),travel=candidates.filter((job:State)=>job.location!==me.location);
-  out.work={readyHere:ready.map((job:State)=>job.id),needsTravel:travel.map((job:State)=>job.id),sharedBudget:true};
-  if(finite(incomeRemaining))out.work.incomeRemaining=incomeRemaining;
-  if(known.length!==state.jobs.length||!finite(me.energy))out.work.needsCheck=true;
-  if(finite(state.economy?.workRemaining)){
-   const funds=Math.max(0,state.economy.workRemaining);out.work.sharedFunds=funds;
-   let spent=0,count=0;
-   for(const job of [...candidates].sort((a:State,b:State)=>a.reward-b.reward)){if(job.reward<0||spent+job.reward>funds||finite(incomeRemaining)&&spent+job.reward>incomeRemaining)continue;spent+=job.reward;count++;}
-   out.work.affordableTypesUpperBound=count;
-  }
-  parts.push(`这里可接${ready.length}类工作，换地点可考虑${travel.length}类（共用工资池，名额不相加${out.work.needsCheck?'；部分信息待查':''}）`);
- }
- if(state.housing||Array.isArray(state.houses)){
-  const home=state.houses?.find((house:State)=>house.id===me.homeId),rent:State={};
-  if(Array.isArray(state.housing?.invoices)){
-   const unpaid=state.housing.invoices.filter((bill:State)=>bill.status==='UNPAID');rent.unpaidInvoices=unpaid.length;
-   if(unpaid.every((bill:State)=>finite(bill.amount)&&bill.amount>=0))rent.unpaidAmount=unpaid.reduce((sum:number,bill:State)=>sum+bill.amount,0);
-  }
-  if(home?.tenantId===me.id&&!home.ownerId){if(finite(home.rent))rent.amount=home.rent;if(finite(home.leaseDueAt)&&Math.abs(home.leaseDueAt)<=8640000000000000)rent.nextDueAt=home.leaseDueAt;if(finite(home.graceAt))rent.graceStartedAt=home.graceAt;}
-  if(Object.keys(rent).length){
-   out.rent=rent;if(rent.unpaidAmount>0)parts.push(`未付租金${rent.unpaidAmount}花币`);
-   if(rent.nextDueAt!==undefined){rent.due=rent.nextDueAt<=(finite(state.clock?.serverNow)?state.clock.serverNow:now);parts.push(`${rent.due?'租金账期已到':'下次租金'}${new Date(rent.nextDueAt).toISOString()}`);}
-  }
- }
- return {summary:parts.join('；'),...out};
-}
-export function selectState(state:State,sections?:unknown):State{
- const source=normalized(state);
- if(sections===undefined)return {...pick(source,legacySections),...summaries(source)}; // Keep old unparameterized clients compatible.
- if(!Array.isArray(sections)||!sections.length||sections.length>stateSections.length+2||sections.some(s=>typeof s!=='string'||!['core','full',...stateSections].includes(s)))throw Error('sections须为有效状态章节数组');
- if(sections.includes('full'))return source;
- const keys=[...new Set(sections.flatMap(s=>s==='core'?[...coreSections]:[s]))];
- const projection=pick(source,keys);
- // Explicit chapters override their core summary, independent of requested order.
- if(sections.includes('core'))for(const [key,value]of Object.entries(summaries(source)))if(!sections.includes(key))projection[key]=value;
- return {...projection,...(sections.includes('core')?{decisionSummary:decisionSummary(source)}:{}),sectionsAvailable:stateSections.filter(key=>source[key]!==undefined),view:'selected',requestedSections:sections};
-}
-export function compactReceipt(result:State):State{return result?.state?.me?{...result,state:selectState(result.state,['core'])}:result;}
-// Server clock ticks do not represent decisions. Crop maturity and turn transitions do.
-export function eventVersion(state:State,now=Date.now()):State{
- const short=summaries(state),changes:State={};
- if(short.economyV7!==undefined)changes.economyV7=short.economyV7===null?null:pick(short.economyV7,['policy','earnedToday','incomeRemaining','pendingIncome','publicCustody']);
- if(short.marketRegulation!==undefined){const market=short.marketRegulation;changes.marketRegulation=market===null?null:{...pick(market,['policy','limits','transactionsUsedMinute','transactionsUsedHour','feeRule']),resources:pick(market.resources??{},['location','availableKinds','totalKinds'])};}
- if(short.whale!==undefined)changes.whale=short.whale===null?null:pick(short.whale,['joined','open','catchingUp','rules','stocks','me']);
- return {...pick(state,['me','chat','onboarding','activeAction','claims','botSafety','quiz','parlor','orders','trade','custody','shops','mailbox','visits','projects']),...changes,plots:state.plots?.map((p:{maturesAt?:number})=>({...p,mature:typeof p.maturesAt==='number'&&p.maturesAt<=now})),clock:pick(state.clock??{},['day','season','weather'])};
-}
-export function stateEvent(state:State,previous:State|null,version:State){
- const changedSections=Object.keys(version).filter(key=>!previous||JSON.stringify(version[key])!==JSON.stringify(previous[key]));
- if(!changedSections.length)return null;
- const core=selectState(state,['core']);
- return {trust:'server-state-with-untrusted-user-fields',mode:previous?'changes':'snapshot',changedSections,state:previous?{...pick(core,changedSections),sectionsAvailable:core.sectionsAvailable}:core,read:'Read changedSections with bloom_state({sections:["core",...changedSections]}) when needed. Omitted payloads do not mean empty or unchanged.'};
-}
+// Projection happens only after the authenticated server has filtered the resident view.
+type State=Record<string,any>;
+export const coreSections=['clock','me','activeAction','onboarding','plots','claims','botSafety','contentPolicy','quiz','parlor','economyV7','marketRegulation','whale'] as const;
+const legacySections=['clock','me','activeAction','onboarding','plots','claims','availableActions','nearby','jobs','neighbors','home','life','leisure','quiz','parlor','porch','seasonal','belongings','crafting','economy','custody','housing','trade','orders','botSafety','contentPolicy'];
+export const stateSections=[...new Set([...legacySections,'economyV7','marketRegulation','whale','careers','chat','titles','shops','locations','residents','catalog','recipes','market','mailbox','visits','visitingHome','projects','caravan','registeredEvents','chronicle','donation','television','houses','ledger','activity','finance','publicBudget','publicSpending','buybackPolicies','todayRecommendation','npcReplies','observer','observedResidentId','pendingFeatures'])];
+function normalized(state:State):State{return {...state,nearby:state.locations?.find((l:{id:string})=>l.id===state.me?.location),neighbors:state.residents};}
+function pick(state:State,keys:readonly string[]){return Object.fromEntries(keys.filter(key=>state[key]!==undefined).map(key=>[key,state[key]]));}
+function compactEconomy(value:State){return {...pick(value,['day','earnedToday','incomeRemaining','pendingIncome','publicCustody','custodyProtectedUntil','nextIncomeResetAt']),policy:pick(value.policy??{},['dailyIncomeLimit','idleWalletThreshold','idleAfterMs'])};}
+function compactMarket(value:State){return {...pick(value,['policy','limits','transactionsUsedMinute','transactionsUsedHour','feeRule']),...(value.resources?{resources:{location:value.resources.location,availableKinds:value.resources.items?.filter((x:State)=>x.remaining>0).length??0,totalKinds:value.resources.items?.length??0,nextRefillAt:value.resources.nextRefillAt}}:{})};}
+function compactWhale(value:State){
+ if(!value.joined)return pick(value,['name','joined','open','initialCash']);
+ const me=value.me??{},prizes=me.prizes??[];
+ return {...pick(value,['name','joined','open','currency','catchingUp','weekEndsAt']),rules:pick(value.rules??{},['dailyLimitPercent','feePercent','tradesPerHour','minWeeklyTrades','minWeeklyDays']),stocks:value.stocks?.map((s:State)=>pick(s,['id','price','changePercent'])),me:{...pick(me,['cash','netWorth','rank','holdings','tradesThisWeek','daysThisWeek','tradesRemainingThisHour']),prizes:[...prizes.filter((p:State)=>p.rank===1&&!p.claimedTitle),...prizes.filter((p:State)=>p.claimedTitle).slice(-3)]}};
+}
+function summaries(source:State){return {...(source.economyV7!==undefined?{economyV7:source.economyV7===null?null:compactEconomy(source.economyV7)}:{}),...(source.marketRegulation!==undefined?{marketRegulation:source.marketRegulation===null?null:compactMarket(source.marketRegulation)}:{}),...(source.whale!==undefined?{whale:source.whale===null?null:compactWhale(source.whale)}:{})};}
+const finite=(value:unknown):value is number=>typeof value==='number'&&Number.isFinite(value);
+/** Decision hints use server fields only and never participate in eventVersion. */
+export function decisionSummary(state:State,now=Date.now()):State{
+ const me=state.me??{},parts:string[]=[],out:State={};
+ if(typeof state.clock?.weather==='string'){out.weather=state.clock.weather;parts.push(`天气${state.clock.weather}`);}
+ if(finite(me.energy)){out.energy=me.energy;parts.push(`体力${me.energy}`);}
+ if(state.activeAction){out.busy=pick(state.activeAction,['id','type','endsAt','finishAt']);parts.push('当前有进行中的动作');}
+ if(Array.isArray(state.plots)){
+  const ready=state.plots.filter((plot:State)=>plot.crop&&!plot.busy&&(plot.mature===true||finite(plot.maturesAt)&&plot.maturesAt<=(finite(state.clock?.serverNow)?state.clock.serverNow:now)));
+  out.crops={ready:ready.length,plotIds:ready.map((plot:State)=>plot.id).filter((id:unknown)=>typeof id==='string')};parts.push(`成熟待收${ready.length}块`);
+ }
+ if(Array.isArray(state.jobs)){
+  const known=state.jobs.filter((job:State)=>finite(job.remaining)&&finite(job.fundedRemaining)&&finite(job.reward)&&finite(job.energy)&&typeof job.done==='boolean');
+  const incomeRemaining=state.economyV7?.incomeRemaining;
+  const shiftsLeft=Math.max(0,3-known.filter((job:State)=>job.done).length);
+  const candidates=known.filter((job:State)=>shiftsLeft>0&&!job.signedUp&&!state.activeAction&&finite(me.energy)&&me.energy>=job.energy&&(!finite(incomeRemaining)||job.reward<=incomeRemaining)&&!job.done&&!job.unavailableReason&&job.remaining>0&&job.fundedRemaining>0);
+  const ready=candidates.filter((job:State)=>job.location===me.location&&job.available!==false),travel=candidates.filter((job:State)=>job.location!==me.location);
+  out.work={readyHere:ready.map((job:State)=>job.id),needsTravel:travel.map((job:State)=>job.id),sharedBudget:true};
+  const signup=known.find((job:State)=>job.signedUp);if(signup)out.work.waitingForPartner={jobId:signup.id,cancelAction:'cancelTeamWork'};
+  if(finite(incomeRemaining))out.work.incomeRemaining=incomeRemaining;
+  if(known.length!==state.jobs.length||!finite(me.energy))out.work.needsCheck=true;
+  if(finite(state.economy?.workRemaining)){
+   const funds=Math.max(0,state.economy.workRemaining);out.work.sharedFunds=funds;
+   let spent=0,count=0;
+   for(const job of [...candidates].sort((a:State,b:State)=>a.reward-b.reward)){if(job.reward<0||spent+job.reward>funds||finite(incomeRemaining)&&spent+job.reward>incomeRemaining)continue;spent+=job.reward;count++;}
+   out.work.affordableTypesUpperBound=Math.min(count,shiftsLeft);
+  }
+  parts.push(`这里可接${ready.length}类工作，换地点可考虑${travel.length}类（共用工资池，名额不相加${out.work.needsCheck?'；部分信息待查':''}）`);
+ }
+ if(state.housing||Array.isArray(state.houses)){
+  const home=state.houses?.find((house:State)=>house.id===me.homeId),rent:State={};
+  if(Array.isArray(state.housing?.invoices)){
+   const unpaid=state.housing.invoices.filter((bill:State)=>bill.status==='UNPAID');rent.unpaidInvoices=unpaid.length;
+   if(unpaid.every((bill:State)=>finite(bill.amount)&&bill.amount>=0))rent.unpaidAmount=unpaid.reduce((sum:number,bill:State)=>sum+bill.amount,0);
+  }
+  if(home?.tenantId===me.id&&!home.ownerId){if(finite(home.rent))rent.amount=home.rent;if(finite(home.leaseDueAt)&&Math.abs(home.leaseDueAt)<=8640000000000000)rent.nextDueAt=home.leaseDueAt;if(finite(home.graceAt))rent.graceStartedAt=home.graceAt;}
+  if(Object.keys(rent).length){
+   out.rent=rent;if(rent.unpaidAmount>0)parts.push(`未付租金${rent.unpaidAmount}花币`);
+   if(rent.nextDueAt!==undefined){rent.due=rent.nextDueAt<=(finite(state.clock?.serverNow)?state.clock.serverNow:now);parts.push(`${rent.due?'租金账期已到':'下次租金'}${new Date(rent.nextDueAt).toISOString()}`);}
+  }
+ }
+ return {summary:parts.join('；'),...out};
+}
+export function selectState(state:State,sections?:unknown):State{
+ const source=normalized(state);
+ if(sections===undefined)return {...pick(source,legacySections),...summaries(source)}; // Keep old unparameterized clients compatible.
+ if(!Array.isArray(sections)||!sections.length||sections.length>stateSections.length+2||sections.some(s=>typeof s!=='string'||!['core','full',...stateSections].includes(s)))throw Error('sections须为有效状态章节数组');
+ if(sections.includes('full'))return source;
+ const keys=[...new Set(sections.flatMap(s=>s==='core'?[...coreSections]:[s]))];
+ const projection=pick(source,keys);
+ // Explicit chapters override their core summary, independent of requested order.
+ if(sections.includes('core'))for(const [key,value]of Object.entries(summaries(source)))if(!sections.includes(key))projection[key]=value;
+ return {...projection,...(sections.includes('core')?{decisionSummary:decisionSummary(source)}:{}),sectionsAvailable:stateSections.filter(key=>source[key]!==undefined),view:'selected',requestedSections:sections};
+}
+export function compactReceipt(result:State):State{return result?.state?.me?{...result,state:selectState(result.state,['core'])}:result;}
+// Server clock ticks do not represent decisions. Crop maturity and turn transitions do.
+export function eventVersion(state:State,now=Date.now()):State{
+ const short=summaries(state),changes:State={};
+ if(short.economyV7!==undefined)changes.economyV7=short.economyV7===null?null:pick(short.economyV7,['policy','earnedToday','incomeRemaining','pendingIncome','publicCustody']);
+ if(short.marketRegulation!==undefined){const market=short.marketRegulation;changes.marketRegulation=market===null?null:{...pick(market,['policy','limits','transactionsUsedMinute','transactionsUsedHour','feeRule']),resources:pick(market.resources??{},['location','availableKinds','totalKinds'])};}
+ if(short.whale!==undefined)changes.whale=short.whale===null?null:pick(short.whale,['joined','open','catchingUp','rules','stocks','me']);
+ return {...pick(state,['me','chat','onboarding','activeAction','claims','botSafety','quiz','parlor','orders','trade','custody','shops','mailbox','visits','projects']),...changes,plots:state.plots?.map((p:{maturesAt?:number})=>({...p,mature:typeof p.maturesAt==='number'&&p.maturesAt<=now})),clock:pick(state.clock??{},['day','season','weather'])};
+}
+export function stateEvent(state:State,previous:State|null,version:State){
+ const changedSections=Object.keys(version).filter(key=>!previous||JSON.stringify(version[key])!==JSON.stringify(previous[key]));
+ if(!changedSections.length)return null;
+ const core=selectState(state,['core']);
+ return {trust:'server-state-with-untrusted-user-fields',mode:previous?'changes':'snapshot',changedSections,state:previous?{...pick(core,changedSections),sectionsAvailable:core.sectionsAvailable}:core,read:'Read changedSections with bloom_state({sections:["core",...changedSections]}) when needed. Omitted payloads do not mean empty or unchanged.'};
+}