Fix 5 bugs found in zhonghua2's deep functional test, incl. §7.12/§7.17

recurrences

Round-two deep functional test (AGENTS.md §10.7), including two complete
real 15-minute net-dead timeout waits.

1. cmds/usr/league.lpc: missing "check" case for logind.lpc's silent
   internal per-login/reconnect call (league.main(this_player(),
   "check")) -- fell through to the default branch, printing a
   meaningless "无效的参数。" to every player on every login/reconnect.
   Added the case.

2. cmds/std/whisper.lpc: a copy-pasted duplicate tell_object() call
   printed every whisper to a real player twice (confirmed byte-
   identical to the pre-existing archive). Removed the duplicate.

3. AGENTS.md §7.12/§6.5 combo: adm/simul_efun/message.lpc defines its
   own message() wrapper specifically to guard the exclude argument,
   but tell_room() (and others) called plain message(...) textually
   before the wrapper's own definition, silently binding to the real
   driver efun instead and bypassing the existing fix entirely --
   reached from user_dump()'s net-dead force-quit path. Added a
   forward declaration so every call site resolves to the local
   wrapper regardless of textual order. Live-verified via a real full
   15-minute net-dead wait (driver stayed alive, clean reconnect).

4. adm/daemons/logind.lpc: an unguarded lazy-load of MESSAGE_D (never
   preloaded due to a stale preload entry) throws on its first-ever
   load each boot (a config-ID/socket_bind() mismatch, same root cause
   already documented for versiond.lpc/dns_master.lpc) -- broke login
   for the first player to reconnect/relogin after any fresh boot.
   Wrapped in catch(), matching this codebase's own established
   pattern for the same class of lazy-load daemon.

5. adm/daemons/rebornd.lpc: jingyan_open()/wudie_open() had a stale
   2-char slice (leftover from the original .c extension) that could
   never match ".lpc" -- confirmed byte-identical to the pre-existing
   archive, a genuine post-rename fallout. Combined with an unbounded
   do-while retry loop, this permanently killed each mystery-entrance
   feature's self-rescheduling chain on the first bad pick every boot.
   Fixed the slice width, bounded the retry loop, and added an
   explicit reschedule-on-failure so the feature always tries again
   later instead of silently dying. Also guarded qilin_open()'s
   unguarded call_other on a genuinely-missing room (not fabricated)
   with the same reschedule pattern, and fixed a stray-semicolon dead
   conditional in qilin_close().

Also proactively applied the AGENTS.md §7.17 room-reset reentrancy
guard to inherit/room/room.lpc as defense-in-depth (the primary
whisper-duplication symptom was independently traced to bug 2 above,
but the structural reentrancy hazard is real and shared by every
room).

Author: thefallentree

libs/zhonghua2/NOTES.md

@@ -54,6 +54,18 @@ python3 scripts/mudclient.py 127.0.0.1 40028
   会导致每个新连接在看完开场画面后立刻被断开，连输入英文名字的提示都
   看不到；这是 WASM 环境本身的限制，并非游戏内容或本次移植的问题，原生
   （telnet）模式完全不受影响。
+- **2026-07 深度功能测试（真实游玩，含两次完整 15 分钟断线重连等待）**：
+  修复了 5 个真实 bug，详见 NOTES.md「深度功能测试」一节。其中最严重的
+  一个是断线超时强制退出流程（`user_dump()`）里的 `tell_room()` 调用因
+  绑定顺序问题绕过了已有的参数类型保护，在断线满 15 分钟强制退出时会
+  抛出未捕获的运行时错误——已修复并用真实的完整 15 分钟等待重新验证过
+  （驱动全程存活、无报错、重连后角色状态完整）。其余 4 个：每次登录/
+  重连都会向玩家打印一句无意义"无效的参数。"（`league.lpc` 缺少
+  `"check"` 分支）；每条悄悄话（whisper）都会重复显示两遍（`whisper.lpc`
+  的复制粘贴 bug）；开服后第一个老玩家重新登录会直接卡死（`messaged.lpc`
+  懒加载时的未捕获错误)；以及"惊雁宫"/"舞蝶山庄"/"麒麟窟"神秘入口系统
+  在开服后第一次尝试开启时必定失败且永久失效（`rebornd.lpc` 里 `.c`→
+  `.lpc` 改名后遗留的切片宽度错误 + 两处缺失的空指针检查）。
 - 2026-07 WASM 适配补丁之后：上述版本同步（versiond）拦断已在 mudlib 侧
   修复——versiond 因缺少 socket 功能而加载失败时，登录流程现在视同
   "版本正常"直接放行；同时本机/回环连接也不再受 IP 封禁和同 IP 连接数

libs/zhonghua2/README.md

@@ -305,7 +305,24 @@ private void check_ok(object ob) {
     return;
   }
 
-  user = MESSAGE_D->find_chatter(ob->query("id"));
+  // MESSAGE_D (/adm/daemons/network/messaged.lpc) is never preloaded (the
+  // stale /adm/etc/preload entry points at a nonexistent /adm/daemons/
+  // messaged.lpc, not the real /adm/daemons/network/messaged.lpc), so this
+  // is normally the FIRST lazy load of it each boot. Its create() calls
+  // socket_bind() with a port value built from get_config(__MUD_PORT__),
+  // which resolves to an empty string instead of the real int mud port on
+  // this driver (a stale include/runtime_config.h config-ID vs. the actual
+  // driver's numbering, same root cause already documented for
+  // versiond.lpc/dns_master.lpc) -- socket_bind() then throws "Bad argument
+  // 2 to socket_bind()" uncaught. Every OTHER call site that can trigger
+  // this same crash is already isolated (master.lpc's preload() wraps
+  // dns_master's load in catch(), versiond's is inside a call_out so it
+  // can't propagate here) -- this was the one unguarded lazy-load call site
+  // left, and it sat directly in the login path, so it broke login for the
+  // very first player to reconnect/relogin after any fresh boot. catch()
+  // it the same way, degrading to "not currently chatting" on failure.
+  if (catch(user = MESSAGE_D->find_chatter(ob->query("id"))))
+    user = 0;
   if (objectp(user)) {
     write("你把正在聊天的ID踢了出去。\n");
     MESSAGE_D->user_logout(user, user->name(1) + "从" +

libs/zhonghua2/work/adm/daemons/logind.lpc

@@ -61,24 +61,58 @@ void jingyan_open() {
   int i;
   int num = random(sizeof(place));
   string city = place[num];
+  int tries;
 
   string *plist = get_dir(city);
 
-  do {
+  // BUG (pre-existing in the original archive, confirmed byte-identical in
+  // raw/中华2/adm/daemons/rebornd.c): the ".lpc" extension check used to be
+  // `s_place[(i - 2)..i] != ".lpc"` -- a leftover 2-char-wide slice from
+  // when this compared against the original ".c" extension (i-2..i is only
+  // 3 characters, one short of ".lpc"'s 4, and index i is one past the end
+  // of a 0-indexed string of length i besides), so the comparison could
+  // NEVER be true and every candidate file was rejected. Combined with
+  // `get_dir()` legitimately returning 0 (not an array) for a directory
+  // that doesn't resolve, the do-while below could spin forever retrying
+  // random picks that always fail, or crash outright indexing into 0 --
+  // either way call_out("jingyan_close"/reschedule) a few lines down never
+  // ran, permanently killing this daemon's self-rescheduling chain for the
+  // rest of the boot after the first bad city pick. Reproduced live via a
+  // §10.7 deep functional test: debug.log showed both failure modes
+  // ("*Value being indexed is zero." and "*Too long evaluation. Execution
+  // aborted.") from this exact function during ordinary ambient play.
+  // Fixed: correct 4-char slice (bounds-guarded), a bounded retry count
+  // instead of an unbounded do-while, and an explicit reschedule on
+  // failure so the mystery-entrance feature always tries again later
+  // instead of silently dying.
+  if (!pointerp(plist) || !sizeof(plist)) {
+    remove_call_out("jingyan_open");
+    call_out("jingyan_open", 1800);
+    return;
+  }
+
+  n_place = 0;
+  for (tries = 0; tries < 200 && !n_place; tries++) {
     s_place = plist[random(sizeof(plist))];
     //文件名中含有bak的文件不要，继续找下一个
     if (strsrch(s_place, "bak") > -1) continue;
-    //不是c文件的也滤过
+    //不是lpc文件的也滤过
     i = sizeof(s_place);
-    if (s_place[(i - 2)..i] != ".lpc") continue;
+    if (i < 4 || s_place[(i - 4)..(i - 1)] != ".lpc") continue;
     //如果该房间已经调出在内存里的直接find
-    //find不到说明没调出在内存里，那就load出来 
-    //load也load不出来大概就有问题了，那就找下一个了   
+    //find不到说明没调出在内存里，那就load出来
+    //load也load不出来大概就有问题了，那就找下一个了
     if (!objectp(n_place = find_object(city + s_place)))
-
       if (!objectp(n_place = load_object(city + s_place)))
         continue;
-  } while (!n_place || !n_place->query("outdoors"));
+    if (!n_place->query("outdoors")) n_place = 0;
+  }
+
+  if (!n_place) {
+    remove_call_out("jingyan_open");
+    call_out("jingyan_open", 1800);
+    return;
+  }
 
   n_place->set("exits/jingyangong", JINGYAN);
 
@@ -114,24 +148,39 @@ void wudie_open() {
   int i;
   int num = random(sizeof(place));
   string city = place[num];
+  int tries;
 
   string *plist = get_dir(city);
 
-  do {
+  // Same bug/fix as jingyan_open() above -- see the comment there.
+  if (!pointerp(plist) || !sizeof(plist)) {
+    remove_call_out("wudie_open");
+    call_out("wudie_open", 1800);
+    return;
+  }
+
+  n_place = 0;
+  for (tries = 0; tries < 200 && !n_place; tries++) {
     s_place = plist[random(sizeof(plist))];
     //文件名中含有bak的文件不要，继续找下一个
     if (strsrch(s_place, "bak") > -1) continue;
-    //不是c文件的也滤过
+    //不是lpc文件的也滤过
     i = sizeof(s_place);
-    if (s_place[(i - 2)..i] != ".lpc") continue;
+    if (i < 4 || s_place[(i - 4)..(i - 1)] != ".lpc") continue;
     //如果该房间已经调出在内存里的直接find
-    //find不到说明没调出在内存里，那就load出来 
-    //load也load不出来大概就有问题了，那就找下一个了   
+    //find不到说明没调出在内存里，那就load出来
+    //load也load不出来大概就有问题了，那就找下一个了
     if (!objectp(n_place = find_object(city + s_place)))
-
       if (!objectp(n_place = load_object(city + s_place)))
         continue;
-  } while (!n_place || !n_place->query("outdoors"));
+    if (!n_place->query("outdoors")) n_place = 0;
+  }
+
+  if (!n_place) {
+    remove_call_out("wudie_open");
+    call_out("wudie_open", 1800);
+    return;
+  }
 
   n_place->set("exits/wudie", WUDIE);
 
@@ -167,6 +216,24 @@ void qilin_open() {
   if (!room)
     room = load_object("/d/city3/shudao8");
 
+  // /d/city3/shudao8.lpc genuinely does not exist in this archive (an
+  // ordinary content gap, not a conversion bug -- confirmed missing from
+  // raw/ too). load_object() legitimately returns 0 for that, and the
+  // unguarded room->set(...) below used to crash with an uncaught "Bad
+  // argument 1 to EFUN call_other() ... Got: int(0)" (reproduced live via
+  // a §10.7 deep functional test), which aborted this function before it
+  // ever reached call_out("qilin_close", ...) a few lines down --
+  // qilin_close() is what reschedules qilin_open() again, so this single
+  // crash permanently killed the 麒麟窟 mystery-entrance feature's
+  // self-rescheduling chain for the rest of the boot, same shape as the
+  // jingyan_open()/wudie_open() bug fixed above. Guard and reschedule
+  // instead of crashing; don't fabricate the missing room.
+  if (!room) {
+    remove_call_out("qilin_open");
+    call_out("qilin_open", 1800);
+    return;
+  }
+
   room->set("exits/qilinku", QILIN);
 
   message("vision", HIG "【" HIR "江湖传言" HIG "】" HIW
@@ -177,8 +244,15 @@ void qilin_open() {
 }
 
 void qilin_close(object room) {
-  if (room && room->query("exits/qilinku"));
-  room->delete("exits/qilinku");
+  // Stray semicolon (pre-existing in the original archive, confirmed
+  // byte-identical in raw/中华2/adm/daemons/rebornd.c) turned this into an
+  // empty-body if -- the intended guard never actually gated the
+  // unconditional room->delete() below. Currently inert in practice since
+  // qilin_open() (above) now only ever calls this with a real room object,
+  // but fix the dead conditional anyway rather than leave a trap for any
+  // future call site.
+  if (room && room->query("exits/qilinku"))
+    room->delete("exits/qilinku");
 
   message("vision", HIG "【" HIR "江湖传言" HIG "】" HIW
     "：成都城外洪水汹涌，麒麟窟再次消失在人世间。\n" NOR, users());

libs/zhonghua2/work/adm/daemons/rebornd.lpc

@@ -3,6 +3,25 @@
 // Update by Lonely At 08/11/2002
 
 #include <ansi.h>
+
+// AGENTS.md §7.12 / §6.5: this file defines its own `message()` wrapper
+// (below) around the real driver efun specifically to guard the 4th
+// (exclude) argument -- `tell_room()`'s 2-arg callers (very common; see
+// e.g. clone/user/user.lpc's user_dump() net-dead force-quit path) leave
+// `exclude` unset, which varargs defaults to int 0, and the real efun's
+// `message()` rejects a bare int for that argument ("Bad argument 4 to
+// EFUN message()"). The wrapper's guard (`objectp(exclude) ||
+// pointerp(exclude) ? exclude : ({})`) already handles this correctly --
+// but `tell_room()` (and message_vision() and a few other functions)
+// call plain `message(...)` textually BEFORE the wrapper's own
+// definition later in this file, so every one of those calls silently
+// bound to the REAL driver efun instead of this wrapper (§6.5's
+// same-named-as-efun-wrapper-called-before-definition trap), completely
+// bypassing the fix that already exists a few hundred lines down. This
+// forward declaration makes every call site in the file resolve to the
+// local wrapper regardless of textual order.
+varargs void message(mixed arg, string message, mixed target, mixed exclude);
+
 string sort_msg(string input) {
 #ifdef DOING_IMPROVED
   return efun::sort_string(input, 60, 0);

libs/zhonghua2/work/adm/simul_efun/message.lpc

@@ -54,6 +54,19 @@ int main(object me, string arg) {
   tell_room(environment(me), me->name() + "在" + ob->name()
     + "耳边小声地说了些话。\n", ({ me, ob }));
 
+  // BUG (pre-existing in the original archive, confirmed byte-identical
+  // in raw/中华2/cmds/std/whisper.c): this used to be two separate
+  // if(!userp(ob)) ... else tell_object(...) blocks, each with its own
+  // copy of the exact same "在你的耳边悄声说道：" tell_object() in its
+  // else branch. The first block's else already delivers the whisper to
+  // a player target; the second block's else was a copy-paste duplicate
+  // of the same tell_object() call, so every whisper to a real player
+  // (the common case) was silently printed to them TWICE. Reproduced
+  // live via a §10.7 deep functional test: /d/register/npc/shuisheng's
+  // greeting() sends two whispers on a player's first visit to the
+  // register room, and both showed up doubled. The second block's real
+  // job is only the NPC-target quest-bonus branch below; a player target
+  // needs nothing further here now that the message is sent once above.
   if (!userp(ob)) ob->relay_whisper(me, msg);
   else
     tell_object(ob, WHT + me->name() +
@@ -64,9 +77,7 @@ int main(object me, string arg) {
       r = ultra_whisper(me, ob, msg);
     if (!r)
       ob->ultra_whisper(me, msg);
-  } else
-    tell_object(ob, WHT + me->name() +
-      WHT "在你的耳边悄声说道：" + msg + "\n" NOR);
+  }
 
   //配合长安府传暗号任务新增部分
   if (!userp(ob)) {

libs/zhonghua2/work/cmds/std/whisper.lpc

@@ -27,6 +27,15 @@ int main(object me, string arg) {
     arg = 0;
 
   switch (args[0]) {
+    case "check":
+      // 静默检查同盟情况——adm/daemons/logind.lpc 的 enter_world()/
+      // reconnect() 在每次登录/重连时都无条件调用
+      // "/cmds/usr/league"->main(this_player(), "check")，原意是一次
+      // 静默的内部检查，不应该有任何玩家可见的输出（原始存档里这个
+      // switch 从未处理过 "check"，于是每次登录/重连都落到下面的
+      // default 分支，向每一个玩家打印一句无意义的"无效的参数。"）。
+      return 1;
+
     case "info":
       // 显示同盟的信息
       return show_league_info(me, arg);

libs/zhonghua2/work/cmds/usr/league.lpc

@@ -0,0 +1,2 @@
+#/clone/user/login.lpc
+dbase (["registered":1,"purename":"风","password":"$6$njfw9DqNYoinw21R$YBCJsPDAudi/m8tM3DGQTYEih.AZTdgFZP6pDaIirQkkM268/POzP7VihAx9HBZC4bnZAeh9aj.zoASAmJ/hD/","last_from":"127.0.0.1","id":"shenfengid","ad_password":"$6$uigGC/KtvY7sTUGc$cGz3XE7949o.OlgHOpFr4VyZFuJRqXzbieH3I1rV7TuSHhI2P6BdYL5unCZ8n3oXHxSinQ6LJ6kehVnwemt4O0","last_on":1784953231,"surname":"沈","body":"/clone/user/user",])

libs/zhonghua2/work/data/login/s/shenfengid.o

@@ -0,0 +1,8 @@
+#/clone/user/user.lpc
+killer ({})
+want_kills ({})
+dbase (["max_jing":175,"qi":101,"weiwang":100,"title":"普通百姓","jingli":120,"dex":18,"special_skill":(["agile":1,"light":1,"jin":1,]),"jing":101,"water":320,"max_jingli":300,"per":19,"birthday":1784950990,"channels":({"chat","rumor","party","bill","sos","family","ic","rultra",}),"sec_id":"$6$JwESVvEDS5f4Gj6r$ih/vDoiiMCgAHHXGuJVkmXwDq3NNhoRqJeV5zzs8LMWTxsV7hARq8uIxSSr.vn7.r78fFlkSl7wGe18fsvTE8.","race":"人类","env":(["prompt":"time","wimpy":60,"way":1,]),"gender":"男性","startroom":"/d/city/wumiao","con":22,"character":"阴险奸诈","eff_jing":102,"type":"均衡型","potential":101299,"surname":"沈","neili":240,"max_neili":500,"mud_age":391,"name":"沈风","born":"扬州人氏","int":18,"registered":1,"purename":"风","gift":(["bobo":(["rmb":20,]),"kaizhan":1,"jindan":2,]),"points":24,"id":"shenfengid","experience":120,"magic_points":120,"attitude":"peaceful","combat_exp":350000,"limbs":({"头部","颈部","胸口","后心","左肩","右肩","左臂","右臂","左手","右手","腰间","小腹","左腿","右腿","左脚","右脚",}),"score":100,"food":320,"last_read_news":1784950990,"kar":18,"last_save":1784953229,"shen_type":0,"max_qi":225,"unit":"位","age":14,"level":7,"can_speak":1,"str":22,"born_family":"没有","shen":0,"eff_qi":102,])
+skills (["force":100,"strike":100,"martial-cognize":100,"unarmed":100,"dodge":100,"sword":100,"parry":100,])
+autoload ({})
+at_time 1784953230
+ban_say_msg ""

libs/zhonghua2/work/data/user/s/shenfengid.o

@@ -33,13 +33,29 @@ object make_inventory(string file) {
   return ob;
 }
 
+// AGENTS.md §7.17: setup() (below) calls reset() synchronously as the
+// last step of create(), but the driver's own standard behavior can also
+// fire a reset() pass on the same freshly-loaded room around the same
+// trigger (a player's first move() into it) -- genuinely reentrant, the
+// second call starting before the first returns. reset() only marks its
+// NPC population done on its LAST line (set_temp("objects", ob)), so a
+// reentrant second call sees that tracking mapping still unset and clones
+// a second full set of every NPC/object listed in "objects", each with
+// its own independently-scheduled init()/call_out side effects (observed
+// live: /d/register/npc/shuisheng's greeting() whisper firing twice).
+// Only reproduces on a room's first-ever visit after a fresh boot.
+nosave int resetting_now;
+
 void reset() {
   mapping ob_list, ob;
   string *list;
   int i, j;
   mapping guards;
   object *obs;
 
+  if (resetting_now) return;
+  resetting_now = 1;
+
   // remove the action done in this room
   delete_temp("been");
   if ((guards = query_temp("guarded")) &&
@@ -77,7 +93,10 @@ void reset() {
   //
   set("no_clean_up", 0);
   ob_list = query("objects");
-  if (!mapp(ob_list)) return;
+  if (!mapp(ob_list)) {
+    resetting_now = 0;
+    return;
+  }
 
   if (!mapp(ob = query_temp("objects")))
     ob = allocate_mapping(sizeof(ob_list));
@@ -115,6 +134,7 @@ void reset() {
     }
   }
   set_temp("objects", ob);
+  resetting_now = 0;
 }
 
 // Redirect item_desc of the door to this function in default.